From 04c40e3abf108e2eae6b42528b1886596b729961 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Jul 2015 15:08:01 -0700
Subject: [PATCH 001/865] (stable) Put the HeraldActionRecord table back on the
 shelf

Summary:
Fixes T8958. I renamed this class and table (in D13644), but the migration `20150606.mlist.1.php` needs to load records from the table before the table rename applies.

Put the table back and accept a tiny bit of cruft here to fix this problem. We can no-op the migration after a while.

I'll cherry-pick this to `stable`.

Test Plan: Applied migration. Created Herald rules. Reviewed existing Herald rules.

Reviewers: btrahan

Subscribers: epriestley

Maniphest Tasks: T8958

Differential Revision: https://secure.phabricator.com/D13736
---
 resources/sql/autopatches/20150727.heraldaction.1.sql  | 2 ++
 src/applications/herald/storage/HeraldActionRecord.php | 8 ++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 resources/sql/autopatches/20150727.heraldaction.1.sql

diff --git a/resources/sql/autopatches/20150727.heraldaction.1.sql b/resources/sql/autopatches/20150727.heraldaction.1.sql
new file mode 100644
index 0000000000..f4cbf19504
--- /dev/null
+++ b/resources/sql/autopatches/20150727.heraldaction.1.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_herald.herald_actionrecord
+  TO {$NAMESPACE}_herald.herald_action;
diff --git a/src/applications/herald/storage/HeraldActionRecord.php b/src/applications/herald/storage/HeraldActionRecord.php
index 1ad4721b21..dfbee3b79d 100644
--- a/src/applications/herald/storage/HeraldActionRecord.php
+++ b/src/applications/herald/storage/HeraldActionRecord.php
@@ -7,6 +7,14 @@ final class HeraldActionRecord extends HeraldDAO {
   protected $action;
   protected $target;
 
+  public function getTableName() {
+    // TODO: This class was renamed, but we have a migration which affects the
+    // table prior to to the rename. For now, having cruft here is cleaner than
+    // having it in the migration. We could rename this table again and no-op
+    // the migration after some time. See T8958.
+    return 'herald_action';
+  }
+
   protected function getConfiguration() {
     return array(
       self::CONFIG_SERIALIZATION => array(

From 535c1a5f255e0da69ea5fbfb230b699eb5a152b1 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Mon, 27 Jul 2015 15:12:03 -0700
Subject: [PATCH 002/865] (stable) Fix public/private profile edit note

Summary: Fixes T8976. Checks state of note before applying to box.

Test Plan: Set policy to login, edit profile.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T8976

Differential Revision: https://secure.phabricator.com/D13739
---
 .../controller/PhabricatorPeopleProfileEditController.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
index 65bf9df0d5..f53278b536 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
@@ -84,10 +84,13 @@ public function processRequest() {
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Edit Profile'))
-      ->setInfoView($note)
       ->setValidationException($validation_exception)
       ->setForm($form);
 
+    if ($note) {
+      $form_box->setInfoView($note);
+    }
+
     $nav = $this->buildIconNavView($user);
     $nav->selectFilter('/');
     $nav->appendChild($form_box);

From de2aa64acfda85fa8dc014bdeed0fb47298d42cf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 15 Aug 2015 06:59:18 -0700
Subject: [PATCH 003/865] (stable) Fix an issue with ClassMap handling of
 DivinerAtomizers

Fixes T9193.
---
 .../diviner/workflow/DivinerGenerateWorkflow.php             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/applications/diviner/workflow/DivinerGenerateWorkflow.php b/src/applications/diviner/workflow/DivinerGenerateWorkflow.php
index 78f43a826f..d448de69c0 100644
--- a/src/applications/diviner/workflow/DivinerGenerateWorkflow.php
+++ b/src/applications/diviner/workflow/DivinerGenerateWorkflow.php
@@ -420,9 +420,10 @@ private function getDivinerAtomWorldVersion() {
 
     $atomizer_versions = array();
     foreach ($atomizers as $atomizer) {
-      $atomizer_versions[$atomizer['name']] = call_user_func(
+      $name = get_class($atomizer);
+      $atomizer_versions[$name] = call_user_func(
         array(
-          $atomizer['name'],
+          $name,
           'getAtomizerVersion',
         ));
     }

From 9a651c18ec0bc00af11fe7ee80d7ab07ab8983fd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 22 Sep 2015 13:03:29 -0700
Subject: [PATCH 004/865] (stable) Recover gracefully from Conduit failure when
 building "Tags" field in commit mail

Summary:
Ref T9458. This is basically the same as D13319, but the "Tags" field didn't get covered in that change.

Specifically, the issue is:

  - We try to generate mail to a disabled user (later, we'll drop it without delivering it, but that filtering doesn't happen yet).
  - The disabled user doesn't have permission to use Conduit (or any other Conduit-related problem occurs).
  - We fail here, then retry generating the mail again later.

Instead, just degrade to not building the field and showing what went wrong.

Test Plan:
  - Pushed some commits, saw mail generate.
  - Added a fake exception to the field, saw the mail generate with an error message.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9458

Differential Revision: https://secure.phabricator.com/D14142
---
 .../PhabricatorCommitTagsField.php            | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/applications/repository/customfield/PhabricatorCommitTagsField.php b/src/applications/repository/customfield/PhabricatorCommitTagsField.php
index b69d246d85..001d81e960 100644
--- a/src/applications/repository/customfield/PhabricatorCommitTagsField.php
+++ b/src/applications/repository/customfield/PhabricatorCommitTagsField.php
@@ -29,18 +29,23 @@ public function updateTransactionMailBody(
       'callsign' => $this->getObject()->getRepository()->getCallsign(),
     );
 
-    $tags_raw = id(new ConduitCall('diffusion.tagsquery', $params))
-      ->setUser($this->getViewer())
-      ->execute();
-
-    $tags = DiffusionRepositoryTag::newFromConduit($tags_raw);
-    if (!$tags) {
-      return;
+    try {
+      $tags_raw = id(new ConduitCall('diffusion.tagsquery', $params))
+        ->setUser($this->getViewer())
+        ->execute();
+
+      $tags = DiffusionRepositoryTag::newFromConduit($tags_raw);
+      if (!$tags) {
+        return;
+      }
+      $tag_names = mpull($tags, 'getName');
+      sort($tag_names);
+      $tag_names = implode(', ', $tag_names);
+    } catch (Exception $ex) {
+      $tag_names = pht('<%s: %s>', get_class($ex), $ex->getMessage());
     }
-    $tag_names = mpull($tags, 'getName');
-    sort($tag_names);
 
-    $body->addTextSection(pht('TAGS'), implode(', ', $tag_names));
+    $body->addTextSection(pht('TAGS'), $tag_names);
   }
 
 }

From 6d7b78f791f0030236095b6236485585d3004d61 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 28 Sep 2015 11:17:04 -0700
Subject: [PATCH 005/865] (stable) Fix issue with "Publish/Notify" handling in
 repositories

Summary:
Fixes T8728. As far as I can tell, I simply got this wrong in D11826. This is not the proper name for the preference.

That change primarily focused on the "spammy junk during import" issue, and the code did get the importing flag right. It looks like my testing in D11827 focused on "during import" and just missed this case.

Test Plan: Grepped for `disable-herald`. Grepped for `herald-disable`.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T8728

Differential Revision: https://secure.phabricator.com/D14181
---
 src/applications/repository/storage/PhabricatorRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index d5b128292a..084f531a10 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -715,7 +715,7 @@ public function shouldPublish() {
       return false;
     }
 
-    if ($this->getDetail('disable-herald')) {
+    if ($this->getDetail('herald-disabled')) {
       return false;
     }
 

From 5194ff3db595e2dff678eee990584dfa50a1a04e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Oct 2015 15:57:41 -0700
Subject: [PATCH 006/865] (stable) Fix several error handling issues with
 Subversion commits in Diffusion

Summary:
Ref T9513. I checked this briefly but didn't do a very thorough job of it.

  - Don't try to query merges for Subversion, since it doesn't support them.
  - Fix up "existsquery" to work properly (and efficiently) for both hosted and imported repositories.
  - Fix up "parentsquery" to have similar behavior on invalid commits to other VCSes (throw an exception).

Test Plan:
  - No more merges warning on SVN.
  - Hosted SVN gets the right exists result now.
  - Visiting "r23980283789287" now 404's instead of "not parsed yet".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9513

Differential Revision: https://secure.phabricator.com/D14239
---
 .../DiffusionExistsQueryConduitAPIMethod.php  | 17 +++++++----------
 .../controller/DiffusionCommitController.php  | 19 +++++++++++--------
 .../DiffusionLowLevelParentsQuery.php         | 16 +++++++++++++++-
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
index 3c6d09ebda..4280230002 100644
--- a/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
@@ -33,16 +33,13 @@ protected function getGitResult(ConduitAPIRequest $request) {
   protected function getSVNResult(ConduitAPIRequest $request) {
     $repository = $this->getDiffusionRequest()->getRepository();
     $commit = $request->getValue('commit');
-    list($info) = $repository->execxRemoteCommand(
-      'info %s',
-      $repository->getRemoteURI());
-    $exists = false;
-    $matches = null;
-    if (preg_match('/^Revision: (\d+)$/m', $info, $matches)) {
-      $base_revision = $matches[1];
-      $exists = $base_revision >= $commit;
-    }
-    return $exists;
+
+    $refs = id(new DiffusionCachedResolveRefsQuery())
+      ->setRepository($repository)
+      ->withRefs(array($commit))
+      ->execute();
+
+    return (bool)$refs;
   }
 
   protected function getMercurialResult(ConduitAPIRequest $request) {
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index fe2f539f09..a698eba5c0 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -1136,14 +1136,17 @@ private function loadCommitState() {
     $merge_limit = $this->getMergeDisplayLimit();
 
     try {
-      $merges = $this->callConduitWithDiffusionRequest(
-        'diffusion.mergedcommitsquery',
-        array(
-          'commit' => $commit,
-          'limit' => $merge_limit + 1,
-        ));
-
-      $this->commitMerges = DiffusionPathChange::newFromConduit($merges);
+      if ($repository->isSVN()) {
+        $this->commitMerges = array();
+      } else {
+        $merges = $this->callConduitWithDiffusionRequest(
+          'diffusion.mergedcommitsquery',
+          array(
+            'commit' => $commit,
+            'limit' => $merge_limit + 1,
+          ));
+        $this->commitMerges = DiffusionPathChange::newFromConduit($merges);
+      }
     } catch (Exception $ex) {
       $this->commitMerges = false;
       $exceptions[] = $ex;
diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php
index 60ee4b5fe2..f49f828d79 100644
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php
@@ -70,7 +70,21 @@ private function loadMercurialParents() {
   }
 
   private function loadSubversionParents() {
-    $n = (int)$this->identifier;
+    $repository = $this->getRepository();
+    $identifier = $this->identifier;
+
+    $refs = id(new DiffusionCachedResolveRefsQuery())
+      ->setRepository($repository)
+      ->withRefs(array($identifier))
+      ->execute();
+    if (!$refs) {
+      throw new Exception(
+        pht(
+          'No commit "%s" in this repository.',
+          $identifier));
+    }
+
+    $n = (int)$identifier;
     if ($n > 1) {
       $ids = array($n - 1);
     } else {

From c0a52201a8991aa71e84b01932b984bb233fb96c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Oct 2015 08:41:49 -0700
Subject: [PATCH 007/865] (stable) Work around an issue with custom "users"
 fields in Maniphest

Summary:
Fixes T9558. The recent changes to validate PHID fields don't work cleanly with this gross hack.

This can probably be unwound now but it will definitely get fixed in T9132 so I may just wait for that.

Test Plan: Edited a custom "users" field in Maniphest. This should only affect Maniphest because it has a weird hack.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9558

Differential Revision: https://secure.phabricator.com/D14264
---
 .../maniphest/controller/ManiphestTaskEditController.php       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
index 703bb61768..5c4a3b4862 100644
--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
@@ -198,7 +198,8 @@ public function handleRequest(AphrontRequest $request) {
         // in a meaningful way. For now, build User objects. Once the Maniphest
         // objects exist, this will switch over automatically. This is a big
         // hack but shouldn't be long for this world.
-        $placeholder_editor = new PhabricatorUserProfileEditor();
+        $placeholder_editor = id(new PhabricatorUserProfileEditor())
+          ->setActor($viewer);
 
         $field_errors = $aux_field->validateApplicationTransactions(
           $placeholder_editor,

From 111c48b21024d0e113a147ac5bd453feff09aeaa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Nov 2015 05:21:54 -0800
Subject: [PATCH 008/865] (stable) Fix no-op transaction error on
 `paste.create` Conduit API method

Summary:
Fixes T9735. I changed how the TYPE_LANGUAGE transction works a little but that accidentally tripped an error condition in `paste.create`.

  - Don't bail on no-effect transactions to `paste.create` (like not setting a language).
  - When a transaction type has no tailored UI message, make it easier to figure out which transaction is problematic.

Test Plan: Ran `arc paste ...` locally. Got an error before the patch, clean paste creation afterward.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9735

Differential Revision: https://secure.phabricator.com/D14440
---
 .../paste/conduit/PasteCreateConduitAPIMethod.php             | 1 +
 .../storage/PhabricatorApplicationTransaction.php             | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/applications/paste/conduit/PasteCreateConduitAPIMethod.php b/src/applications/paste/conduit/PasteCreateConduitAPIMethod.php
index d5ce021f13..2dae0132d4 100644
--- a/src/applications/paste/conduit/PasteCreateConduitAPIMethod.php
+++ b/src/applications/paste/conduit/PasteCreateConduitAPIMethod.php
@@ -60,6 +60,7 @@ protected function execute(ConduitAPIRequest $request) {
 
     $editor = id(new PhabricatorPasteEditor())
       ->setActor($viewer)
+      ->setContinueOnNoEffect(true)
       ->setContentSourceFromConduitRequest($request);
 
     $xactions = $editor->applyTransactions($paste, $xactions);
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index a61de01978..9eb1609931 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -626,7 +626,9 @@ public function getNoEffectDescription() {
         return pht('Edges already exist; transaction has no effect.');
     }
 
-    return pht('Transaction has no effect.');
+    return pht(
+      'Transaction (of type "%s") has no effect.',
+      $this->getTransactionType());
   }
 
   public function getTitle() {

From ecaa45521c0617f709b0d432fa84294811930f16 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Sat, 7 Nov 2015 18:24:06 -0800
Subject: [PATCH 009/865] (stable) Fix PropertyList background color in
 PHUIDocumentView

Summary: Overzealous nuking.

Test Plan: Test Phriction, Phame, Diviner. All show property lists correctly.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14439
---
 resources/celerity/map.php              | 4 ++--
 webroot/rsrc/css/phui/phui-document.css | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 91b57e9f5d..8f8209b309 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -127,7 +127,7 @@
     'rsrc/css/phui/phui-button.css' => '16020a60',
     'rsrc/css/phui/phui-crumbs-view.css' => 'd842f867',
     'rsrc/css/phui/phui-document-pro.css' => '4f2b42e3',
-    'rsrc/css/phui/phui-document.css' => '9fa715d2',
+    'rsrc/css/phui/phui-document.css' => 'f841ad0a',
     'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
     'rsrc/css/phui/phui-fontkit.css' => 'c9d63950',
     'rsrc/css/phui/phui-form-view.css' => '621b21c5',
@@ -780,7 +780,7 @@
     'phui-calendar-list-css' => 'c1c7f338',
     'phui-calendar-month-css' => '476be7e0',
     'phui-crumbs-view-css' => 'd842f867',
-    'phui-document-view-css' => '9fa715d2',
+    'phui-document-view-css' => 'f841ad0a',
     'phui-document-view-pro-css' => '4f2b42e3',
     'phui-feed-story-css' => 'b7b26d23',
     'phui-font-icon-base-css' => 'ecbbb4c2',
diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css
index c13d99930c..eaf90dc468 100644
--- a/webroot/rsrc/css/phui/phui-document.css
+++ b/webroot/rsrc/css/phui/phui-document.css
@@ -89,7 +89,8 @@
 }
 
 .phui-document-content .phui-property-list-container {
-  border-color: {$thinblueborder};
+  border-bottom: 1px solid {$thinblueborder};
+  background-color: {$lightgreybackground};
 }
 
 .legalpad .phui-document-content .phui-property-list-view {

From cf10612438829e9f84e40602c106b0cef8b1edde Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 28 Nov 2015 12:45:17 -0800
Subject: [PATCH 010/865] (stable) Partially revert D14511 to fix "INLINE
 COMMENTS" in mail

Summary:
Ref T9845. In Differential, this is not a remarkup block -- it's a mail section. `addTextSection()` has special magic behavior when handed a prebuilt section since D9375.

Swapping to `addRemarkupSection()` causes the error in T9845 and renders nothing in the comment section.

Even if it were a block of text, it would not be appropriate to add it as remarkup. This would incorrectly render comments in files like `__init__.py`, which are common on Python (the filename would render as "__init__.py"). Okay that's a bad example since it works fine but, uh, a file named `T123` would be no good or whatever.

I'll realign T9845 to clean this up and fix it more durably.

Test Plan: Sent myself some mail with inline comments, saw them in the mail.

Reviewers: joshuaspence, chad

Reviewed By: chad

Maniphest Tasks: T9845

Differential Revision: https://secure.phabricator.com/D14589
---
 src/applications/audit/editor/PhabricatorAuditEditor.php        | 2 +-
 .../differential/editor/DifferentialTransactionEditor.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
index 47fa055388..51efdf175b 100644
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -660,7 +660,7 @@ protected function buildMailBody(
     }
 
     if ($inlines) {
-      $body->addRemarkupSection(
+      $body->addTextSection(
         pht('INLINE COMMENTS'),
         $this->renderInlineCommentsForMail($object, $inlines));
     }
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index b2e946cf7f..fabd2511ba 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1212,7 +1212,7 @@ protected function buildMailBody(
     }
 
     if ($inlines) {
-      $body->addRemarkupSection(
+      $body->addTextSection(
         pht('INLINE COMMENTS'),
         $this->renderInlineCommentsForMail($object, $inlines));
     }

From c4df4f62decdb20462dbf84a21263de320cf2139 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 15 Dec 2015 14:48:55 -0800
Subject: [PATCH 011/865] Allow login to be disabled for authentication
 providers

Summary:
Fixes T9997. This was in the database since v0, I just never hooked up the UI since it wasn't previously meaningful.

However, it now makes sense to have a provider like Asana with login disabled and use it only for integrations.

Test Plan: Disabled login on a provider, verified it was no longer available for login/registration but still linkable.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9997

Differential Revision: https://secure.phabricator.com/D14794
---
 .../config/PhabricatorAuthEditController.php  | 21 +++++++++++++++++++
 .../PhabricatorAuthProviderConfigEditor.php   |  7 +++++++
 .../auth/provider/PhabricatorAuthProvider.php |  4 ++++
 ...abricatorAuthProviderConfigTransaction.php | 12 +++++++++++
 4 files changed, 44 insertions(+)

diff --git a/src/applications/auth/controller/config/PhabricatorAuthEditController.php b/src/applications/auth/controller/config/PhabricatorAuthEditController.php
index 09742c3726..21ba6ef99a 100644
--- a/src/applications/auth/controller/config/PhabricatorAuthEditController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthEditController.php
@@ -79,6 +79,7 @@ public function handleRequest(AphrontRequest $request) {
 
     $errors = array();
 
+    $v_login = $config->getShouldAllowLogin();
     $v_registration = $config->getShouldAllowRegistration();
     $v_link = $config->getShouldAllowLink();
     $v_unlink = $config->getShouldAllowUnlink();
@@ -104,6 +105,11 @@ public function handleRequest(AphrontRequest $request) {
           }
         }
 
+        $xactions[] = id(new PhabricatorAuthProviderConfigTransaction())
+          ->setTransactionType(
+            PhabricatorAuthProviderConfigTransaction::TYPE_LOGIN)
+          ->setNewValue($request->getInt('allowLogin', 0));
+
         $xactions[] = id(new PhabricatorAuthProviderConfigTransaction())
           ->setTransactionType(
             PhabricatorAuthProviderConfigTransaction::TYPE_REGISTRATION)
@@ -199,6 +205,14 @@ public function handleRequest(AphrontRequest $request) {
         $config_name);
     }
 
+    $str_login = array(
+      phutil_tag('strong', array(), pht('Allow Login:')),
+      ' ',
+      pht(
+        'Allow users to log in using this provider. If you disable login, '.
+        'users can still use account integrations for this provider.'),
+    );
+
     $str_registration = array(
       phutil_tag('strong', array(), pht('Allow Registration:')),
       ' ',
@@ -268,6 +282,13 @@ public function handleRequest(AphrontRequest $request) {
       ->appendChild(
         id(new AphrontFormCheckboxControl())
           ->setLabel(pht('Allow'))
+          ->addCheckbox(
+            'allowLogin',
+            1,
+            $str_login,
+            $v_login))
+      ->appendChild(
+        id(new AphrontFormCheckboxControl())
           ->addCheckbox(
             'allowRegistration',
             1,
diff --git a/src/applications/auth/editor/PhabricatorAuthProviderConfigEditor.php b/src/applications/auth/editor/PhabricatorAuthProviderConfigEditor.php
index cdb021678a..5599ff5364 100644
--- a/src/applications/auth/editor/PhabricatorAuthProviderConfigEditor.php
+++ b/src/applications/auth/editor/PhabricatorAuthProviderConfigEditor.php
@@ -15,6 +15,7 @@ public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhabricatorAuthProviderConfigTransaction::TYPE_ENABLE;
+    $types[] = PhabricatorAuthProviderConfigTransaction::TYPE_LOGIN;
     $types[] = PhabricatorAuthProviderConfigTransaction::TYPE_REGISTRATION;
     $types[] = PhabricatorAuthProviderConfigTransaction::TYPE_LINK;
     $types[] = PhabricatorAuthProviderConfigTransaction::TYPE_UNLINK;
@@ -36,6 +37,8 @@ protected function getCustomTransactionOldValue(
         } else {
           return (int)$object->getIsEnabled();
         }
+      case PhabricatorAuthProviderConfigTransaction::TYPE_LOGIN:
+        return (int)$object->getShouldAllowLogin();
       case PhabricatorAuthProviderConfigTransaction::TYPE_REGISTRATION:
         return (int)$object->getShouldAllowRegistration();
       case PhabricatorAuthProviderConfigTransaction::TYPE_LINK:
@@ -59,6 +62,7 @@ protected function getCustomTransactionNewValue(
 
     switch ($xaction->getTransactionType()) {
       case PhabricatorAuthProviderConfigTransaction::TYPE_ENABLE:
+      case PhabricatorAuthProviderConfigTransaction::TYPE_LOGIN:
       case PhabricatorAuthProviderConfigTransaction::TYPE_REGISTRATION:
       case PhabricatorAuthProviderConfigTransaction::TYPE_LINK:
       case PhabricatorAuthProviderConfigTransaction::TYPE_UNLINK:
@@ -76,6 +80,8 @@ protected function applyCustomInternalTransaction(
     switch ($xaction->getTransactionType()) {
       case PhabricatorAuthProviderConfigTransaction::TYPE_ENABLE:
         return $object->setIsEnabled($v);
+      case PhabricatorAuthProviderConfigTransaction::TYPE_LOGIN:
+        return $object->setShouldAllowLogin($v);
       case PhabricatorAuthProviderConfigTransaction::TYPE_REGISTRATION:
         return $object->setShouldAllowRegistration($v);
       case PhabricatorAuthProviderConfigTransaction::TYPE_LINK:
@@ -106,6 +112,7 @@ protected function mergeTransactions(
     $type = $u->getTransactionType();
     switch ($type) {
       case PhabricatorAuthProviderConfigTransaction::TYPE_ENABLE:
+      case PhabricatorAuthProviderConfigTransaction::TYPE_LOGIN:
       case PhabricatorAuthProviderConfigTransaction::TYPE_REGISTRATION:
       case PhabricatorAuthProviderConfigTransaction::TYPE_LINK:
       case PhabricatorAuthProviderConfigTransaction::TYPE_UNLINK:
diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php
index 55e193f481..9484109943 100644
--- a/src/applications/auth/provider/PhabricatorAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorAuthProvider.php
@@ -121,6 +121,10 @@ public function shouldAllowLogin() {
   }
 
   public function shouldAllowRegistration() {
+    if (!$this->shouldAllowLogin()) {
+      return false;
+    }
+
     return $this->getProviderConfig()->getShouldAllowRegistration();
   }
 
diff --git a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
index 3853c31a66..8314b652ce 100644
--- a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
+++ b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
@@ -4,6 +4,7 @@ final class PhabricatorAuthProviderConfigTransaction
   extends PhabricatorApplicationTransaction {
 
   const TYPE_ENABLE         = 'config:enable';
+  const TYPE_LOGIN          = 'config:login';
   const TYPE_REGISTRATION   = 'config:registration';
   const TYPE_LINK           = 'config:link';
   const TYPE_UNLINK         = 'config:unlink';
@@ -90,6 +91,17 @@ public function getTitle() {
             $this->renderHandleLink($author_phid));
         }
         break;
+      case self::TYPE_LOGIN:
+        if ($new) {
+          return pht(
+            '%s enabled login.',
+            $this->renderHandleLink($author_phid));
+        } else {
+          return pht(
+            '%s disabled login.',
+            $this->renderHandleLink($author_phid));
+        }
+        break;
       case self::TYPE_REGISTRATION:
         if ($new) {
           return pht(

From 70079f47db3d47c7f03a89c5e72f00d8e5996295 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Jan 2016 16:33:09 -0800
Subject: [PATCH 012/865] (stable) Strip "Transfer-Encoding" headers from
 proxied HTTP responses

This is a likely fix for HTTP clones against proxied repositories in the
cluster, although I'm not 100% sure I'm replicating it correctly.

The issue appears to be that we're proxying all the headers, including the
"Transfer-Encoding" header, although the request will already have stripped
any encoding. This might cause us to emit a "chunked" header without a
chunked body.

Auditors: chad
---
 src/aphront/response/AphrontHTTPProxyResponse.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/aphront/response/AphrontHTTPProxyResponse.php b/src/aphront/response/AphrontHTTPProxyResponse.php
index c2e5bda603..fa629181ef 100644
--- a/src/aphront/response/AphrontHTTPProxyResponse.php
+++ b/src/aphront/response/AphrontHTTPProxyResponse.php
@@ -57,6 +57,20 @@ private function readRequest() {
 
     list($status, $body, $headers) = $this->future->resolve();
     $this->httpCode = $status->getStatusCode();
+
+    // Strip "Transfer-Encoding" headers. Particularly, the server we proxied
+    // may have chunked the response, but cURL will already have un-chunked it.
+    // If we emit the header and unchunked data, the response becomes invalid.
+    foreach ($headers as $key => $header) {
+      list($header_head, $header_body) = $header;
+      $header_head = phutil_utf8_strtolower($header_head);
+      switch ($header_head) {
+        case 'transfer-encoding':
+          unset($headers[$key]);
+          break;
+      }
+    }
+
     $this->headers = $headers;
 
     return $body;

From 35d90c3c4ac5f4d2dd488ada4460d9e876bf5279 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 8 Jan 2016 09:08:43 -0800
Subject: [PATCH 013/865] (stable) Fix an issue with the Phortune card disable
 route

I think this got clipped in modernization at some point.

Auditors: chad
---
 .../controller/PhortunePaymentMethodDisableController.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php b/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
index 4b8fb76010..659ae2f53e 100644
--- a/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
+++ b/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
@@ -5,7 +5,7 @@ final class PhortunePaymentMethodDisableController
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
-    $method_id = $request->getURIData('methodID');
+    $method_id = $request->getURIData('id');
 
     $method = id(new PhortunePaymentMethodQuery())
       ->setViewer($viewer)

From 9652ed74000aa4146172db577cba67c4a7549e40 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 8 Jan 2016 09:18:53 -0800
Subject: [PATCH 014/865] (stable) Use more reassuring UI and copy for removing
 payment methods

Summary:
The old treatment was fairly technical. Give this UI a more human-friendly flow:

  - Use language "remove" instead of "disable". We keep the record that the card existed around for auditing/historical purposes, but it is no longer a valid payment method going forward and can not be undone. I think this aligns with user expectation and actual behavior better than "disable".
  - Only show active methods on the profile screen.

Test Plan: {F1057153}

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D14973
---
 .../controller/PhortuneAccountViewController.php         | 4 ++++
 .../PhortunePaymentMethodDisableController.php           | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php
index f4791d8bb6..b5387b935e 100644
--- a/src/applications/phortune/controller/PhortuneAccountViewController.php
+++ b/src/applications/phortune/controller/PhortuneAccountViewController.php
@@ -132,6 +132,10 @@ private function buildPaymentMethodsSection(PhortuneAccount $account) {
     $methods = id(new PhortunePaymentMethodQuery())
       ->setViewer($viewer)
       ->withAccountPHIDs(array($account->getPHID()))
+      ->withStatuses(
+        array(
+          PhortunePaymentMethod::STATUS_ACTIVE,
+        ))
       ->execute();
 
     foreach ($methods as $method) {
diff --git a/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php b/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
index 659ae2f53e..d00db2725f 100644
--- a/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
+++ b/src/applications/phortune/controller/PhortunePaymentMethodDisableController.php
@@ -38,11 +38,10 @@ public function handleRequest(AphrontRequest $request) {
     }
 
     return $this->newDialog()
-      ->setTitle(pht('Disable Payment Method?'))
-      ->setShortTitle(pht('Disable Payment Method'))
+      ->setTitle(pht('Remove Payment Method'))
       ->appendParagraph(
         pht(
-          'Disable the payment method "%s"?',
+          'Remove the payment method "%s" from your account?',
           phutil_tag(
             'strong',
             array(),
@@ -50,9 +49,9 @@ public function handleRequest(AphrontRequest $request) {
       ->appendParagraph(
         pht(
           'You will no longer be able to make payments using this payment '.
-          'method. Disabled payment methods can not be reactivated.'))
+          'method.'))
       ->addCancelButton($account_uri)
-      ->addSubmitButton(pht('Disable Payment Method'));
+      ->addSubmitButton(pht('Remove Payment Method'));
   }
 
 }

From ba2215986639987b1e53995d3dbeaf605e78a82e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Jan 2016 09:32:54 -0800
Subject: [PATCH 015/865] (stable) Fix two issues with repository monogram
 regular expressions

Summary: Ref T4245. Fixes T10172. These regular expressions were simply incorrect: they intend `<start> (form one | form two) <end>` but were written as `(<start> form one) | (form two <end>)` which allowed stuff like "R2/R13" to be interpreted as a monogram because it matches `(<start> form one)`.

Test Plan: Parsed commit `ba46ffa6169c` from RTEMS repository, see T10172. Before patch, got an identical trace; after patch, clean import.

Reviewers: chad, avivey

Reviewed By: avivey

Maniphest Tasks: T4245, T10172

Differential Revision: https://secure.phabricator.com/D15049
---
 .../repository/phid/PhabricatorRepositoryRepositoryPHIDType.php | 2 +-
 .../repository/query/PhabricatorRepositoryQuery.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
index 203d17c3ba..c938b31a65 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
@@ -48,7 +48,7 @@ public function loadHandles(
   }
 
   public function canLoadNamedObject($name) {
-    return preg_match('/^r[A-Z]+|R[1-9]\d*\z/', $name);
+    return preg_match('/^(r[A-Z]+|R[1-9]\d*)\z/', $name);
   }
 
   public function loadNamedObjects(
diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php
index 0a5e44304f..cbb2b1b3e9 100644
--- a/src/applications/repository/query/PhabricatorRepositoryQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php
@@ -65,7 +65,7 @@ public function withIdentifiers(array $identifiers) {
         continue;
       }
 
-      if (preg_match('/^(r[A-Z]+)|(R[1-9]\d*)\z/', $identifier)) {
+      if (preg_match('/^(r[A-Z]+|R[1-9]\d*)\z/', $identifier)) {
         $monograms[$identifier] = $identifier;
         continue;
       }

From 482da7f5dfb332a117c75cb0868a5b203b84138c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 30 Jan 2016 16:03:13 -0800
Subject: [PATCH 016/865] (stable) Apply phutil_utf8ize() to stderr output from
 VCS commands prior to logging

Summary: Ref T10228. Commands like `git-http-backend` can emit errors with raw bytes in the output. Sanitize these if present so we can log them in JSON format.

Test Plan: Edited this into production. >_> sneaky sneaky <_<

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10228

Differential Revision: https://secure.phabricator.com/D15144
---
 .../diffusion/controller/DiffusionServeController.php        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index 1d41d62efa..13290b9f41 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -466,7 +466,10 @@ private function serveGitRequest(
     if ($err) {
       return new PhabricatorVCSResponse(
         500,
-        pht('Error %d: %s', $err, $stderr));
+        pht(
+          'Error %d: %s',
+          $err,
+          phutil_utf8ize($stderr)));
     }
 
     return id(new DiffusionGitResponse())->setGitData($stdout);

From 71bda66870d8ef832f4d048b11282f9ae0086f05 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 30 Jan 2016 16:44:33 -0800
Subject: [PATCH 017/865] (stable) Decode "Content-Encoding: gzip" content

Summary:
Fixes T10228. When we receive a gzipped request (rare, but `git` may send them), decode it before providing it to the application.

This fixes the issue with proxying certain requests described in T10228.

Test Plan:
  - Applied this fix in production.
  - Cloned a problem repository cleanly.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10228

Differential Revision: https://secure.phabricator.com/D15145
---
 support/PhabricatorStartup.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/support/PhabricatorStartup.php b/support/PhabricatorStartup.php
index 198cc1b244..bc7daf4ea6 100644
--- a/support/PhabricatorStartup.php
+++ b/support/PhabricatorStartup.php
@@ -129,7 +129,19 @@ public static function didStartup($start_time) {
 
     self::beginOutputCapture();
 
-    self::$rawInput = (string)file_get_contents('php://input');
+    if (isset($_SERVER['HTTP_CONTENT_ENCODING'])) {
+      $encoding = trim($_SERVER['HTTP_CONTENT_ENCODING']);
+    } else {
+      $encoding = null;
+    }
+
+    if ($encoding === 'gzip') {
+      $source_stream = 'compress.zlib://php://input';
+    } else {
+      $source_stream = 'php://input';
+    }
+
+    self::$rawInput = (string)file_get_contents($source_stream);
   }
 
 

From 9519625092a57ccfb63b2152c4eba7a30550ab20 Mon Sep 17 00:00:00 2001
From: Aviv Eyal <avivey@gmail.com>
Date: Tue, 9 Feb 2016 10:13:08 -0800
Subject: [PATCH 018/865] unbreak exception handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary: fix T10306

Test Plan: ¯\_(ツ)_/¯

Reviewers: chad, #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin

Maniphest Tasks: T10306

Differential Revision: https://secure.phabricator.com/D15229
---
 .../diffusion/controller/DiffusionServeController.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index 8f3eb364f6..8d131eca6d 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -100,7 +100,7 @@ public function handleRequest(AphrontRequest $request) {
           ->setResultCode(500)
           ->setProperties(
             array(
-              'exception.class' => $ex->getClass(),
+              'exception.class' => get_class($ex),
               'exception.message' => $ex->getMessage(),
             ));
       }

From 8b56e0082bff4807ea1ea275741d5f145804e0ee Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 9 Mar 2016 10:17:40 -0800
Subject: [PATCH 019/865] (stable) Fix an issue with the Herald engine field
 value cache

Summary:
To improve the performance of Herald, we attempt to generate the value for each field (e.g., a task title) only once.

For most field values this is cheap, but for some (like a commit's branches) it can be quite expensive. We only want to pay this cost once, so we cache field values.

However, D12957 accidentally added a check where we bypass the cache and generate the value for every field, before reading the cache. This causes us to generate each field for every rule that uses it, plus one extra time.

Instead, use the cache for this check, too. Also allow the cache to cache `null`, since it can be expensive to generate `null` even though the value isn't too interesting.

The value of this early hit isn't even used (we only care if it throws or not).

Test Plan:
  - Wrote a rule like "if any condition matches: branches contain a, branches contain b, branches contain c".
  - Put `phlog(new Exception())` in `DiffusionCommitBranchesHeraldField`.
  - Before patch, saw `bin/repository reparse --herald <any commit>` compute branches three times.
  - After patch, saw only one computation.
  - Verified field values in the transcript view

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D15451
---
 src/applications/herald/engine/HeraldEngine.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/applications/herald/engine/HeraldEngine.php b/src/applications/herald/engine/HeraldEngine.php
index 00c063131a..df81117b80 100644
--- a/src/applications/herald/engine/HeraldEngine.php
+++ b/src/applications/herald/engine/HeraldEngine.php
@@ -274,7 +274,7 @@ public function doesRuleMatch(
     } else {
       foreach ($conditions as $condition) {
         try {
-          $object->getHeraldField($condition->getFieldName());
+          $this->getConditionObjectValue($condition, $object);
         } catch (Exception $ex) {
           $reason = pht(
             'Field "%s" does not exist!',
@@ -366,14 +366,11 @@ protected function getConditionObjectValue(
   }
 
   public function getObjectFieldValue($field) {
-    if (isset($this->fieldCache[$field])) {
-      return $this->fieldCache[$field];
+    if (!array_key_exists($field, $this->fieldCache)) {
+      $this->fieldCache[$field] = $this->object->getHeraldField($field);
     }
 
-    $result = $this->object->getHeraldField($field);
-
-    $this->fieldCache[$field] = $result;
-    return $result;
+    return $this->fieldCache[$field];
   }
 
   protected function getRuleEffects(

From fea2389066edf3ad0a7547ae12d8e988428a4f5c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 2 Apr 2016 10:34:13 -0700
Subject: [PATCH 020/865] (stable) Improve error and header behaviors for
 Mailgun received mail webhook

Summary:
Ref T10709. Two issues:

  - If a user sends an invalid `!command`, we can throw, which means we don't return HTTP 200. This makes Mailgun re-send the mail later.
  - We don't parse headers of the modern API correctly, so the "Message-ID" failsafe doesn't work. Parse them correctly. I //believe// Mailgun's API changed at some point.

Test Plan:
This is difficult to test exhaustively in isolation. I used Mailgun's web tools to verify the format of the hook request, and faked some requests locally.

I'll keep an eye on this as it goes to production and make sure the fix is correct there.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10709

Differential Revision: https://secure.phabricator.com/D15575
---
 ...ricatorMetaMTAMailgunReceiveController.php | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
index af5ca34712..467995a186 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
@@ -28,14 +28,14 @@ public function handleRequest(AphrontRequest $request) {
         pht('Mail signature is not valid. Check your Mailgun API key.'));
     }
 
-    $user = $request->getUser();
-
-    $raw_headers = $request->getStr('headers');
-    $raw_headers = explode("\n", rtrim($raw_headers));
+    $raw_headers = $request->getStr('message-headers');
     $raw_dict = array();
-    foreach (array_filter($raw_headers) as $header) {
-      list($name, $value) = explode(':', $header, 2);
-      $raw_dict[$name] = ltrim($value);
+    if (strlen($raw_headers)) {
+      $raw_headers = phutil_json_decode($raw_headers);
+      foreach ($raw_headers as $raw_header) {
+        list($name, $value) = $raw_header;
+        $raw_dict[$name] = $value;
+      }
     }
 
     $headers = array(
@@ -65,9 +65,25 @@ public function handleRequest(AphrontRequest $request) {
       }
     }
     $received->setAttachments($file_phids);
-    $received->save();
 
-    $received->processReceivedMail();
+    try {
+      $received->save();
+      $received->processReceivedMail();
+    } catch (Exception $ex) {
+      // We can get exceptions here in two cases.
+
+      // First, saving the message may throw if we have already received a
+      // message with the same Message ID. In this case, we're declining to
+      // process a duplicate message, so failing silently is correct.
+
+      // Second, processing the message may throw (for example, if it contains
+      // an invalid !command). This will generate an email as a side effect,
+      // so we don't need to explicitly handle the exception here.
+
+      // In these cases, we want to return HTTP 200. If we do not, MailGun will
+      // re-transmit the message later.
+      phlog($ex);
+    }
 
     $response = new AphrontWebpageResponse();
     $response->setContent(pht("Got it! Thanks, Mailgun!\n"));

From 908c29cb974dcb39a0e931508e55ae017385b7cf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 9 Apr 2016 03:39:17 -0700
Subject: [PATCH 021/865] (stable) When proxying cluster HTTP requests, forward
 only selected headers

In the live cluster, some subset of the forwarded headers are creating
some issues for HTTP repository operations.
---
 src/aphront/AphrontRequest.php | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
index 3a95b0ebda..9305d6b48b 100644
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -754,14 +754,26 @@ public function newClusterProxyFuture($uri) {
     // NOTE: apache_request_headers() might provide a nicer way to do this,
     // but isn't available under FCGI until PHP 5.4.0.
     foreach ($_SERVER as $key => $value) {
-      if (preg_match('/^HTTP_/', $key)) {
-        // Unmangle the header as best we can.
-        $key = substr($key, strlen('HTTP_'));
-        $key = str_replace('_', ' ', $key);
-        $key = strtolower($key);
-        $key = ucwords($key);
-        $key = str_replace(' ', '-', $key);
+      if (!preg_match('/^HTTP_/', $key)) {
+        continue;
+      }
+
+      // Unmangle the header as best we can.
+      $key = substr($key, strlen('HTTP_'));
+      $key = str_replace('_', ' ', $key);
+      $key = strtolower($key);
+      $key = ucwords($key);
+      $key = str_replace(' ', '-', $key);
+
+      // By default, do not forward headers.
+      $should_forward = false;
+
+      // Forward "X-Hgarg-..." headers.
+      if (preg_match('/^X-Hgarg-/', $key)) {
+        $should_forward = true;
+      }
 
+      if ($should_forward) {
         $headers[] = array($key, $value);
         $seen[$key] = true;
       }

From 5ddaf5289862cce3957c5630eb11df31fb0786b8 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Sat, 9 Apr 2016 11:50:16 -0700
Subject: [PATCH 022/865] (stable) Set time and date on Calendar Date Control
 form

Summary: Recurring events will fatal a Calendar with this not set. `newDateTime` requires a date and time to be called property. I think this is correct fix? Fixes T10766

Test Plan: Build a recurring event, pull up /calendar/, see recurring events as expected. Previously, fatal.

Reviewers: lpriestley, epriestley

Reviewed By: epriestley

Subscribers: CodeMouse92, Korvin

Maniphest Tasks: T10766

Differential Revision: https://secure.phabricator.com/D15666
---
 src/view/form/control/AphrontFormDateControlValue.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/form/control/AphrontFormDateControlValue.php b/src/view/form/control/AphrontFormDateControlValue.php
index 114340006e..db2c7235c4 100644
--- a/src/view/form/control/AphrontFormDateControlValue.php
+++ b/src/view/form/control/AphrontFormDateControlValue.php
@@ -279,7 +279,7 @@ private function getFormatSeparator() {
   }
 
   public function getDateTime() {
-    return $this->newDateTime();
+    return $this->newDateTime($this->valueDate, $this->valueTime);
   }
 
   private function getTimezone() {

From ab63b1b2ae348be19ac3f7315de43bd2570a568b Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Tue, 12 Apr 2016 19:25:00 -0700
Subject: [PATCH 023/865] (stable) Fix Passphrase Credential dialog

Summary: Fixes T10772, not sure why this fails, but reverting the code back to old dialog call works.

Test Plan:
  - Try to add a new credential when importing a repository.
  - Also created a new credential normally, via Passphrase.
  - Also edited a credential.

Reviewers: chad

Reviewed By: chad

Subscribers: Korvin

Maniphest Tasks: T10772

Differential Revision: https://secure.phabricator.com/D15691
---
 .../controller/PassphraseCredentialEditController.php           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/applications/passphrase/controller/PassphraseCredentialEditController.php b/src/applications/passphrase/controller/PassphraseCredentialEditController.php
index 4aa687ddc1..a814b5dc72 100644
--- a/src/applications/passphrase/controller/PassphraseCredentialEditController.php
+++ b/src/applications/passphrase/controller/PassphraseCredentialEditController.php
@@ -21,6 +21,7 @@ public function handleRequest(AphrontRequest $request) {
       }
 
       $type = $this->getCredentialType($credential->getCredentialType());
+      $type_const = $type->getCredentialType();
 
       $is_new = false;
     } else {
@@ -228,6 +229,7 @@ public function handleRequest(AphrontRequest $request) {
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->addHiddenInput('isInitialized', true)
+      ->addHiddenInput('type', $type_const)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setName('name')

From f75b1cf562c0c3646324864851d693ef1069a068 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Apr 2016 05:38:09 -0700
Subject: [PATCH 024/865] (stable) Warn users about remote code execution in
 older Git

Summary: Ref T10832. Raise a setup warning for out-of-date versions of `git`.

Test Plan: {F1224632}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10832

Differential Revision: https://secure.phabricator.com/D15745
---
 .../check/PhabricatorBinariesSetupCheck.php   | 126 +++++++++---------
 1 file changed, 60 insertions(+), 66 deletions(-)

diff --git a/src/applications/config/check/PhabricatorBinariesSetupCheck.php b/src/applications/config/check/PhabricatorBinariesSetupCheck.php
index c33dcae36f..c3c0740cfa 100644
--- a/src/applications/config/check/PhabricatorBinariesSetupCheck.php
+++ b/src/applications/config/check/PhabricatorBinariesSetupCheck.php
@@ -102,15 +102,24 @@ protected function executeChecks() {
       $version = null;
       switch ($vcs['versionControlSystem']) {
         case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
-          $minimum_version = null;
-          $bad_versions = array();
+          $bad_versions = array(
+            '< 2.7.4' => pht(
+              'Prior to 2.7.4, Git contains two remote code execution '.
+              'vulnerabilities which allow an attacker to take control of a '.
+              'system by crafting a commit which affects very long paths, '.
+              'then pushing it or tricking a victim into fetching it. This '.
+              'is a severe security vulnerability.'),
+          );
           list($err, $stdout, $stderr) = exec_manual('git --version');
           $version = trim(substr($stdout, strlen('git version ')));
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
-          $minimum_version = '1.5';
           $bad_versions = array(
-            '1.7.1' => pht(
+            // We need 1.5 for "--depth", see T7228.
+            '< 1.5' => pht(
+              'The minimum supported version of Subversion is 1.5, which '.
+              'was released in 2008.'),
+            '= 1.7.1' => pht(
               'This version of Subversion has a bug where `%s` does not work '.
               'for files added in rN (Subversion issue #2873), fixed in 1.7.2.',
               'svn diff -c N'),
@@ -119,12 +128,15 @@ protected function executeChecks() {
           $version = trim($stdout);
           break;
         case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
-          $minimum_version = '1.9';
           $bad_versions = array(
-            '2.1' => pht(
+            // We need 1.9 for HTTP cloning, see T3046.
+            '< 1.9' => pht(
+              'The minimum supported version of Mercurial is 1.9, which was '.
+              'released in 2011.'),
+            '= 2.1' => pht(
               'This version of Mercurial returns a bad exit code '.
               'after a successful pull.'),
-            '2.2' => pht(
+            '= 2.2' => pht(
               'This version of Mercurial has a significant memory leak, fixed '.
               'in 2.2.1. Pushing fails with this version as well; see %s.',
               'T3046#54922'),
@@ -136,21 +148,26 @@ protected function executeChecks() {
       if ($version === null) {
         $this->raiseUnknownVersionWarning($binary);
       } else {
-        if ($minimum_version &&
-          version_compare($version, $minimum_version, '<')) {
-          $this->raiseMinimumVersionWarning(
-            $binary,
-            $minimum_version,
-            $version);
-        }
+        $version_details = array();
 
-        foreach ($bad_versions as $bad_version => $details) {
-          if ($bad_version === $version) {
-            $this->raiseBadVersionWarning(
-              $binary,
-              $bad_version);
+        foreach ($bad_versions as $spec => $details) {
+          list($operator, $bad_version) = explode(' ', $spec, 2);
+          $is_bad = version_compare($version, $bad_version, $operator);
+          if ($is_bad) {
+            $version_details[] = pht(
+              '(%s%s) %s',
+              $operator,
+              $bad_version,
+              $details);
           }
         }
+
+        if ($version_details) {
+          $this->raiseBadVersionWarning(
+            $binary,
+            $version,
+            $version_details);
+        }
       }
     }
 
@@ -223,57 +240,34 @@ private function raiseUnknownVersionWarning($binary) {
         pht('Report this Issue to the Upstream'));
   }
 
-  private function raiseMinimumVersionWarning(
-    $binary,
-    $minimum_version,
-    $version) {
+  private function raiseBadVersionWarning($binary, $version, array $problems) {
+    $summary = pht(
+      'This server has a known bad version of "%s".',
+      $binary);
 
-    switch ($binary) {
-      case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
-        break;
-      case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
-      case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
-        $summary = pht(
-          "The '%s' binary is version %s and Phabricator requires version ".
-          "%s or higher.",
-          $binary,
-          $version,
-          $minimum_version);
-        $message = pht(
-          "Please upgrade the '%s' binary to a more modern version.",
-          $binary);
-        $this->newIssue('bin.'.$binary)
-          ->setShortName(pht("Unsupported '%s' Version", $binary))
-          ->setName(pht("Unsupported '%s' Version", $binary))
-          ->setSummary($summary)
-          ->setMessage($summary.' '.$message);
-        break;
-      }
-  }
+    $message = array();
 
-  private function raiseBadVersionWarning($binary, $bad_version) {
-    switch ($binary) {
-      case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
-        break;
-      case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
-      case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
-        $summary = pht(
-          "The '%s' binary is version %s which has bugs that break ".
-          "Phabricator.",
-          $binary,
-          $bad_version);
-        $message = pht(
-          "Please upgrade the '%s' binary to a more modern version.",
-          $binary);
-        $this->newIssue('bin.'.$binary)
-          ->setShortName(pht("Unsupported '%s' Version", $binary))
-          ->setName(pht("Unsupported '%s' Version", $binary))
-          ->setSummary($summary)
-          ->setMessage($summary.' '.$message);
-        break;
-      }
+    $message[] = pht(
+      'This server has a known bad version of "%s" installed ("%s"). This '.
+      'version is not supported, or contains important bugs or security '.
+      'vulnerabilities which are fixed in a newer version.',
+      $binary,
+      $version);
 
+    $message[] = pht('You should upgrade this software.');
 
+    $message[] = pht('The known issues with this old version are:');
+
+    foreach ($problems as $problem) {
+      $message[] = $problem;
+    }
+
+    $message = implode("\n\n", $message);
+
+    $this->newIssue("bin.{$binary}.bad-version")
+      ->setName(pht('Unsupported/Insecure "%s" Version', $binary))
+      ->setSummary($summary)
+      ->setMessage($message);
   }
 
 }

From 08cc80cc5ce0fa90be81878bad6c3174f3a2b02a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 May 2016 10:42:05 -0700
Subject: [PATCH 025/865] (stable) Fix one more "Reviewers" wire format issue

Summary: Fixes T11010. This also needs to be inflated until we fix the whole client/server responsibility issue here.

Test Plan:
  - Created a revision while observing error log, no error.
  - Disabled "allow self accept", tried to make myself a reviewer, got rejected with an error message.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11010

Differential Revision: https://secure.phabricator.com/D15966
---
 .../differential/customfield/DifferentialReviewersField.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/differential/customfield/DifferentialReviewersField.php b/src/applications/differential/customfield/DifferentialReviewersField.php
index d23dac53d9..f77f8ab749 100644
--- a/src/applications/differential/customfield/DifferentialReviewersField.php
+++ b/src/applications/differential/customfield/DifferentialReviewersField.php
@@ -242,6 +242,7 @@ public function validateCommitMessageValue($value) {
     $config_self_accept_key = 'differential.allow-self-accept';
     $allow_self_accept = PhabricatorEnv::getEnvConfig($config_self_accept_key);
 
+    $value = $this->inflateReviewers($value);
     foreach ($value as $spec) {
       $phid = $spec['phid'];
 

From 70b194398e45e47a6b705eb5ef542113f5a274ad Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 May 2016 17:04:27 -0700
Subject: [PATCH 026/865] (stable) Fix "Reviewers" validation issue with empty
 reviewers

Summary: Fixes T11021.

Test Plan: Created a revision without reviewers.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11021

Differential Revision: https://secure.phabricator.com/D15968
---
 .../differential/customfield/DifferentialReviewersField.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/applications/differential/customfield/DifferentialReviewersField.php b/src/applications/differential/customfield/DifferentialReviewersField.php
index f77f8ab749..41a4cf8f26 100644
--- a/src/applications/differential/customfield/DifferentialReviewersField.php
+++ b/src/applications/differential/customfield/DifferentialReviewersField.php
@@ -237,6 +237,10 @@ public function renderCommitMessageValue(array $handles) {
   }
 
   public function validateCommitMessageValue($value) {
+    if (!$value) {
+      return;
+    }
+
     $author_phid = $this->getObject()->getAuthorPHID();
 
     $config_self_accept_key = 'differential.allow-self-accept';

From 9f399247b1b107e88f0abdf215b7b9bdf4cf0223 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 May 2016 17:13:12 -0700
Subject: [PATCH 027/865] (stable) Fix a possible fatal on the first push to a
 cluster repository

Summary:
Fixes T11020. I think this resolves things -- `$new_version` (set above) should be used, not `$new_log` directly.

Specifically, we would get into trouble if the initial push failed for some reason (working copy not initialized yet, commit hook rejected, etc).

Test Plan: Made a bad push to a new repository. Saw it freeze before the patch and succeed afterwards.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11020

Differential Revision: https://secure.phabricator.com/D15969
---
 .../diffusion/protocol/DiffusionRepositoryClusterEngine.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
index e3c70fecd9..b271c16741 100644
--- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
@@ -391,7 +391,7 @@ public function synchronizeWorkingCopyAfterWrite() {
           $repository_phid,
           $device_phid,
           $this->clusterWriteVersion,
-          $new_log->getID(),
+          $new_version,
           $this->clusterWriteOwner);
         $did_release = true;
         break;

From 1558175ec84c7b13ba3f692b897464901bc00578 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 11 Jun 2016 04:44:40 -0700
Subject: [PATCH 028/865] (stable) Promote 2016 Week 24


From b26ecb189e486998acf469db0cba87993ef6ad1b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Jun 2016 05:22:00 -0700
Subject: [PATCH 029/865] (stable) Remove all uses of PhutilGitURI in
 Phabricator

Summary:
Ref T11137. This class is removed in D16099. Depends on D16099.

`PhutilURI` now attempts to "just work" with Git-style URIs, so at least in theory we can just delete all of this code and pretend it does not exist.

(I've left "Display URI" and "Effective URI" as distinct, at least for now, because I think the distinction may be relevant in the future even though it isn't right now, and to keep this diff small, although I may go remove one after I think about this for a bit.)

Test Plan:
  - Created a new Git repository with a Git URI.
  - Pulled/updated it, which now works correctly and should resolve the original issue in T11137.
  - Verified that daemons now align the origin to a Git-style URI with a relative path, which should resolve the original issue in T11004.
  - Grepped for `PhutilGitURI`.
  - Also grepped in `arcanist/`, but found no matches, so no patch for that.
  - Checked display/conduit URIs.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11137

Differential Revision: https://secure.phabricator.com/D16100
---
 ...rmasterCircleCIBuildStepImplementation.php |  5 --
 .../PhabricatorRepositoryURINormalizer.php    | 20 +-----
 .../storage/PhabricatorRepository.php         | 45 +++----------
 .../storage/PhabricatorRepositoryURI.php      | 63 ++++++-------------
 4 files changed, 29 insertions(+), 104 deletions(-)

diff --git a/src/applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php
index 365cf657de..e74e25a395 100644
--- a/src/applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php
@@ -69,11 +69,6 @@ public static function getGitHubPath($uri) {
     $uri_object = new PhutilURI($uri);
     $domain = $uri_object->getDomain();
 
-    if (!strlen($domain)) {
-      $uri_object = new PhutilGitURI($uri);
-      $domain = $uri_object->getDomain();
-    }
-
     $domain = phutil_utf8_strtolower($domain);
     switch ($domain) {
       case 'github.com':
diff --git a/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php b/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php
index 42224c9553..27e93535ab 100644
--- a/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php
+++ b/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php
@@ -78,16 +78,7 @@ public function getPath() {
     switch ($this->type) {
       case self::TYPE_GIT:
         $uri = new PhutilURI($this->uri);
-        if ($uri->getProtocol()) {
-          return $uri->getPath();
-        }
-
-        $uri = new PhutilGitURI($this->uri);
-        if ($uri->getDomain()) {
-          return $uri->getPath();
-        }
-
-        return $this->uri;
+        return $uri->getPath();
       case self::TYPE_SVN:
       case self::TYPE_MERCURIAL:
         $uri = new PhutilURI($this->uri);
@@ -136,14 +127,7 @@ public function getNormalizedDomain() {
     $domain = null;
 
     $uri = new PhutilURI($this->uri);
-    if ($uri->getProtocol()) {
-      $domain = $uri->getDomain();
-    }
-
-    if (!strlen($domain)) {
-      $uri = new PhutilGitURI($this->uri);
-      $domain = $uri->getDomain();
-    }
+    $domain = $uri->getDomain();
 
     if (!strlen($domain)) {
       $domain = '<void>';
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 84c7cfd055..b771066ed6 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1201,27 +1201,19 @@ public function getPublicCloneURI() {
    */
   public function getRemoteProtocol() {
     $uri = $this->getRemoteURIObject();
-
-    if ($uri instanceof PhutilGitURI) {
-      return 'ssh';
-    } else {
-      return $uri->getProtocol();
-    }
+    return $uri->getProtocol();
   }
 
 
   /**
-   * Get a parsed object representation of the repository's remote URI. This
-   * may be a normal URI (returned as a @{class@libphutil:PhutilURI}) or a git
-   * URI (returned as a @{class@libphutil:PhutilGitURI}).
+   * Get a parsed object representation of the repository's remote URI..
    *
-   * @return wild A @{class@libphutil:PhutilURI} or
-   *              @{class@libphutil:PhutilGitURI}.
+   * @return wild A @{class@libphutil:PhutilURI}.
    * @task uri
    */
   public function getRemoteURIObject() {
     $raw_uri = $this->getDetail('remote-uri');
-    if (!$raw_uri) {
+    if (!strlen($raw_uri)) {
       return new PhutilURI('');
     }
 
@@ -1229,17 +1221,7 @@ public function getRemoteURIObject() {
       return new PhutilURI('file://'.$raw_uri);
     }
 
-    $uri = new PhutilURI($raw_uri);
-    if ($uri->getProtocol()) {
-      return $uri;
-    }
-
-    $uri = new PhutilGitURI($raw_uri);
-    if ($uri->getDomain()) {
-      return $uri;
-    }
-
-    throw new Exception(pht("Remote URI '%s' could not be parsed!", $raw_uri));
+    return new PhutilURI($raw_uri);
   }
 
 
@@ -1666,27 +1648,14 @@ public function writeStatusMessage(
     return $this;
   }
 
-  public static function getRemoteURIProtocol($raw_uri) {
-    $uri = new PhutilURI($raw_uri);
-    if ($uri->getProtocol()) {
-      return strtolower($uri->getProtocol());
-    }
-
-    $git_uri = new PhutilGitURI($raw_uri);
-    if (strlen($git_uri->getDomain()) && strlen($git_uri->getPath())) {
-      return 'ssh';
-    }
-
-    return null;
-  }
-
   public static function assertValidRemoteURI($uri) {
     if (trim($uri) != $uri) {
       throw new Exception(
         pht('The remote URI has leading or trailing whitespace.'));
     }
 
-    $protocol = self::getRemoteURIProtocol($uri);
+    $uri_object = new PhutilURI($uri);
+    $protocol = $uri_object->getProtocol();
 
     // Catch confusion between Git/SCP-style URIs and normal URIs. See T3619
     // for discussion. This is usually a user adding "ssh://" to an implicit
diff --git a/src/applications/repository/storage/PhabricatorRepositoryURI.php b/src/applications/repository/storage/PhabricatorRepositoryURI.php
index 853dcfa1b3..15e25205c8 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryURI.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryURI.php
@@ -191,11 +191,6 @@ public function getDefaultIOType() {
     return self::IO_NONE;
   }
 
-
-  public function getDisplayURI() {
-    return $this->getURIObject(false);
-  }
-
   public function getNormalizedURI() {
     $vcs = $this->getRepository()->getVersionControlSystem();
 
@@ -216,8 +211,12 @@ public function getNormalizedURI() {
     return $normal_uri->getNormalizedURI();
   }
 
+  public function getDisplayURI() {
+    return $this->getURIObject();
+  }
+
   public function getEffectiveURI() {
-    return $this->getURIObject(true);
+    return $this->getURIObject();
   }
 
   public function getURIEnvelope() {
@@ -243,11 +242,10 @@ public function getURIEnvelope() {
     return new PhutilOpaqueEnvelope((string)$uri);
   }
 
-  private function getURIObject($normalize) {
+  private function getURIObject() {
     // Users can provide Git/SCP-style URIs in the form "user@host:path".
-    // These are equivalent to "ssh://user@host/path". We use the more standard
-    // form internally, and convert to it if we need to specify a port number,
-    // but try to preserve what the user typed when displaying the URI.
+    // In the general case, these are not equivalent to any "ssh://..." form
+    // because the path is relative.
 
     if ($this->isBuiltin()) {
       $builtin_protocol = $this->getForcedProtocol();
@@ -271,43 +269,22 @@ private function getURIObject($normalize) {
     // with it; this should always be provided by the associated credential.
     $uri->setPass(null);
 
-    if (!$uri->getProtocol()) {
-      $git_uri = new PhutilGitURI($raw_uri);
-
-      // We must normalize this Git-style URI into a normal URI
-      $must_normalize = ($port && ($port != $default_ports['ssh']));
-      if ($must_normalize || $normalize) {
-        $domain = $git_uri->getDomain();
-
-
-        $uri = id(new PhutilURI("ssh://{$domain}"))
-          ->setUser($git_uri->getUser())
-          ->setPath($git_uri->getPath());
-      } else {
-        $uri = $git_uri;
-      }
+    $protocol = $this->getForcedProtocol();
+    if ($protocol) {
+      $uri->setProtocol($protocol);
     }
 
-    $is_normal = ($uri instanceof PhutilURI);
-
-    if ($is_normal) {
-      $protocol = $this->getForcedProtocol();
-      if ($protocol) {
-        $uri->setProtocol($protocol);
-      }
-
-      if ($port) {
-        $uri->setPort($port);
-      }
+    if ($port) {
+      $uri->setPort($port);
+    }
 
-      // Remove any explicitly set default ports.
-      $uri_port = $uri->getPort();
-      $uri_protocol = $uri->getProtocol();
+    // Remove any explicitly set default ports.
+    $uri_port = $uri->getPort();
+    $uri_protocol = $uri->getProtocol();
 
-      $uri_default = idx($default_ports, $uri_protocol);
-      if ($uri_default && ($uri_default == $uri_port)) {
-        $uri->setPort(null);
-      }
+    $uri_default = idx($default_ports, $uri_protocol);
+    if ($uri_default && ($uri_default == $uri_port)) {
+      $uri->setPort(null);
     }
 
     $user = $this->getForcedUser();

From 83121f78980be7d7089cc9cb5e8e3f2c0eb33573 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 20 Jun 2016 11:07:00 -0700
Subject: [PATCH 030/865] (stable) Handle tag tags properly in discovery

Summary:
Fixes T11180. In Git, it's possible to tag a tag (????). When you do, we try to log the tag-object, which automatically resolves to the commit and fails.

Just skip these. If "A" points at "B" which points at "C", it's fine to ignore "A" and "B" since we'll get the same stuff when we process "C".

Test Plan:
  - Tagged a tag.
  - Pushed it.
  - Discovered it.
  - Before patch: got exception similar to the one in T11180.
  - After patch: got tag-tag skipped. Also got slightly better error messages.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11180

Differential Revision: https://secure.phabricator.com/D16149
---
 .../daemon/PhabricatorGitGraphStream.php       | 18 ++++++++++++++----
 .../PhabricatorRepositoryDiscoveryEngine.php   | 16 +++++++++++++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/applications/repository/daemon/PhabricatorGitGraphStream.php b/src/applications/repository/daemon/PhabricatorGitGraphStream.php
index 669cf9c105..b175053528 100644
--- a/src/applications/repository/daemon/PhabricatorGitGraphStream.php
+++ b/src/applications/repository/daemon/PhabricatorGitGraphStream.php
@@ -5,6 +5,7 @@ final class PhabricatorGitGraphStream
 
   private $repository;
   private $iterator;
+  private $startCommit;
 
   private $parents        = array();
   private $dates          = array();
@@ -14,6 +15,7 @@ public function __construct(
     $start_commit = null) {
 
     $this->repository = $repository;
+    $this->startCommit = $start_commit;
 
     if ($start_commit !== null) {
       $future = $repository->getLocalCommandFuture(
@@ -82,10 +84,18 @@ private function parseUntil($commit) {
       }
     }
 
-    throw new Exception(
-      pht(
-        "No such commit '%s' in repository!",
-        $commit));
+    if ($this->startCommit !== null) {
+      throw new Exception(
+        pht(
+          'Commit "%s" is not a reachable ancestor of "%s".',
+          $commit,
+          $this->startCommit));
+    } else {
+      throw new Exception(
+        pht(
+          'Commit "%s" is not a reachable ancestor of any ref.',
+          $commit));
+    }
   }
 
   private function isParsed($commit) {
diff --git a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
index cdb7e11d03..fd8c57e9b4 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
@@ -157,7 +157,12 @@ private function discoverGitCommits() {
       $name = $ref->getShortName();
       $commit = $ref->getCommitIdentifier();
 
-      $this->log(pht('Examining ref "%s", at "%s".', $name, $commit));
+      $this->log(
+        pht(
+          'Examining "%s" (%s) at "%s".',
+          $name,
+          $ref->getRefType(),
+          $commit));
 
       if (!$repository->shouldTrackRef($ref)) {
         $this->log(pht('Skipping, ref is untracked.'));
@@ -169,6 +174,15 @@ private function discoverGitCommits() {
         continue;
       }
 
+      // In Git, it's possible to tag a tag. We just skip these, we'll discover
+      // them when we process the target tag. See T11180.
+      $fields = $ref->getRawFields();
+      $tag_type = idx($fields, '*objecttype');
+      if ($tag_type == 'tag') {
+        $this->log(pht('Skipping, this is a tag of a tag.'));
+        continue;
+      }
+
       $this->log(pht('Looking for new commits.'));
 
       $head_refs = $this->discoverStreamAncestry(

From fd33fbbfae8d980b8fd96d841a74d027752f396f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 2 Jul 2016 05:17:05 -0700
Subject: [PATCH 031/865] (stable) Fix an XSS issue where Diffusion files
 exceeding the highlighting byte limit were not properly escaped

Fixes T11257.

Auditors: chad
---
 .../controller/DiffusionBrowseController.php         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 30c2b8265d..2d0ea7770b 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -682,17 +682,21 @@ private function buildCorpus(
         $blame_commits,
         $show_blame);
     } else {
-      if ($can_highlight) {
-        require_celerity_resource('syntax-highlighting-css');
+      require_celerity_resource('syntax-highlighting-css');
 
+      if (!$can_highlight) {
         $highlighted = PhabricatorSyntaxHighlighter::highlightWithFilename(
           $path,
           $file_corpus);
-        $lines = phutil_split_lines($highlighted);
       } else {
-        $lines = phutil_split_lines($file_corpus);
+        // Highlight as plain text to escape the content properly.
+        $highlighted = PhabricatorSyntaxHighlighter::highlightWithLanguage(
+          'txt',
+          $file_corpus);
       }
 
+      $lines = phutil_split_lines($highlighted);
+
       $rows = $this->buildDisplayRows(
         $lines,
         $blame_list,

From 58375fa9e6db4a389fd6029ee1ad14ddb0dc9e90 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 2 Jul 2016 05:22:55 -0700
Subject: [PATCH 032/865] (stable) Fix a flipped higlight vs no-highlight
 condition

Ref T11257.

Auditors: chad
---
 .../diffusion/controller/DiffusionBrowseController.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 2d0ea7770b..3ae076a5d0 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -684,7 +684,7 @@ private function buildCorpus(
     } else {
       require_celerity_resource('syntax-highlighting-css');
 
-      if (!$can_highlight) {
+      if ($can_highlight) {
         $highlighted = PhabricatorSyntaxHighlighter::highlightWithFilename(
           $path,
           $file_corpus);

From 46ceba728fee8a775e2ddf0cdae332a0679413a4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 9 Jul 2016 05:55:45 -0700
Subject: [PATCH 033/865] (stable) Fix an issue with creating new Repository
 URIs via the Web UI

Summary I broke this in D16237: that made the CLI workflow work, but we attach the repository earlier in the web workflow and won't have one when we arrive here.

Test Plan: Created a new repository URI from the web UI.

Auditors: chad
---
 .../diffusion/editor/DiffusionURIEditor.php            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/applications/diffusion/editor/DiffusionURIEditor.php b/src/applications/diffusion/editor/DiffusionURIEditor.php
index 2ff0854a89..0b7096db3c 100644
--- a/src/applications/diffusion/editor/DiffusionURIEditor.php
+++ b/src/applications/diffusion/editor/DiffusionURIEditor.php
@@ -78,10 +78,12 @@ protected function applyCustomInternalTransaction(
         } else {
           $old_uri = null;
 
-          // When creating a URI, we may not have processed the repository
-          // transaction yet. Attach the repository here to make sure we
-          // have it for the calls below.
-          $object->attachRepository($this->repository);
+          // When creating a URI via the API, we may not have processed the
+          // repository transaction yet. Attach the repository here to make
+          // sure we have it for the calls below.
+          if ($this->repository) {
+            $object->attachRepository($this->repository);
+          }
         }
 
         $object->setURI($xaction->getNewValue());

From 83c857e6a6ca4af4f5ce50204d5e8ffbbcc5c035 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 10 Jul 2016 07:19:47 -0700
Subject: [PATCH 034/865] (stable) In Git, only use "--find-copies-harder" on
 small diffs

Summary:
Ref T10423. This flag can cause `git diff` to take an enormously long time (the problem case was a 5M line, 20K file commit).

Instead:

  - Run without the flag first.
  - If that shows that the diff is definitely small, try again with the flag.
  - If that works, return the slower, better output.
  - If the fast diff affects too many paths or generating the slow diff takes too long, return the faster, slightly worse output.

The quality of the output differs in how well Git is able to detect "M" and "C" (moves and copies of files).

For example, if you copy `src/` to `srcpro/`, the fast output may not show that you copied files. The slow output will.

I think this is rarely useful for large copies anyway: it's interesting if a 1-2 file diff is a copy, but usually obvious/uninteresting if a 500-file diff is a copy.

Test Plan:
  - Ran `bin/repository reparse --change rXnnn` on Git changes.
  - Saw fast and slow commands execute normally.
  - Tried on a large diff, saw only the fast command execute.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10423

Differential Revision: https://secure.phabricator.com/D16266
---
 ...nternalGitRawDiffQueryConduitAPIMethod.php | 71 ++++++++++++++++---
 1 file changed, 60 insertions(+), 11 deletions(-)

diff --git a/src/applications/diffusion/conduit/DiffusionInternalGitRawDiffQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionInternalGitRawDiffQueryConduitAPIMethod.php
index 1e4c906322..ac241a282f 100644
--- a/src/applications/diffusion/conduit/DiffusionInternalGitRawDiffQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionInternalGitRawDiffQueryConduitAPIMethod.php
@@ -28,6 +28,7 @@ protected function defineCustomParamTypes() {
   protected function getResult(ConduitAPIRequest $request) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
+    $commit = $request->getValue('commit');
 
     if (!$repository->isGit()) {
       throw new Exception(
@@ -44,30 +45,78 @@ protected function getResult(ConduitAPIRequest $request) {
     list($parents) = $repository->execxLocalCommand(
       'log -n1 --format=%s %s',
       '%P',
-      $request->getValue('commit'));
-
+      $commit);
     $use_log = !strlen(trim($parents));
+
+    // First, get a fast raw diff without "--find-copies-harder". This flag
+    // produces better results for moves and copies, but is explosively slow
+    // for large changes to large repositories. See T10423.
+    $raw = $this->getRawDiff($repository, $commit, $use_log, false);
+
+    // If we got a normal-sized diff (no more than 100 modified files), we'll
+    // try using "--find-copies-harder" to improve the output. This improved
+    // output is mostly useful for small changes anyway.
+    $try_harder = (substr_count($raw, "\n") <= 100);
+    if ($try_harder) {
+      try {
+        $raw = $this->getRawDiff($repository, $commit, $use_log, true);
+      } catch (Exception $ex) {
+        // Just ignore any exception we hit, we'll use the fast output
+        // instead.
+      }
+    }
+
+    return $raw;
+  }
+
+  private function getRawDiff(
+    PhabricatorRepository $repository,
+    $commit,
+    $use_log,
+    $try_harder) {
+
+    $flags = array(
+      '-n1',
+      '-M',
+      '-C',
+      '-B',
+      '--raw',
+      '-t',
+      '--abbrev=40',
+    );
+
+    if ($try_harder) {
+      $flags[] = '--find-copies-harder';
+    }
+
     if ($use_log) {
       // This is the first commit so we need to use "log". We know it's not a
       // merge commit because it couldn't be merging anything, so this is safe.
 
       // NOTE: "--pretty=format: " is to disable diff output, we only want the
       // part we get from "--raw".
-      list($raw) = $repository->execxLocalCommand(
-        'log -n1 -M -C -B --find-copies-harder --raw -t '.
-          '--pretty=format: --abbrev=40 %s',
-        $request->getValue('commit'));
+      $future = $repository->getLocalCommandFuture(
+        'log %Ls --pretty=format: %s',
+        $flags,
+        $commit);
     } else {
       // Otherwise, we can use "diff", which will give us output for merges.
       // We diff against the first parent, as this is generally the expectation
       // and results in sensible behavior.
-      list($raw) = $repository->execxLocalCommand(
-        'diff -n1 -M -C -B --find-copies-harder --raw -t '.
-          '--abbrev=40 %s^1 %s',
-        $request->getValue('commit'),
-        $request->getValue('commit'));
+      $future = $repository->getLocalCommandFuture(
+        'diff %Ls %s^1 %s',
+        $flags,
+        $commit,
+        $commit);
+    }
+
+    // Don't spend more than 30 seconds generating the slower output.
+    if ($try_harder) {
+      $future->setTimeout(30);
     }
 
+    list($raw) = $future->resolvex();
+
     return $raw;
   }
 

From 9da15fd7ab7071e3b7361463229abd4e918d9d94 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 9 Jul 2016 06:47:32 -0700
Subject: [PATCH 035/865] (stable) By default, do not save queries when
 executing Conduit "*.search" calls

Summary:
Fixes T11304. Prior to this change, we did an unnecessary write on every "*.search" call (this write didn't always actually write a row, since we only save //unique// saved queries, but still doesn't do anything useful ever, currently).

Instead, change this to not-write by default. We could add an "oh, and also I want you to do a write" option later, which would let us implement something like `arc query-stuff` which says "To see more results, view this URI in your browser: ...".

(It's possible to run one of these methods with an existing SavedQuery by using the key, so we still sometimes have a queryKey to return.)

Test Plan: Ran `almanac.service.search`, used DarkConsole to verify that no serachengine writes occurred.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11304

Differential Revision: https://secure.phabricator.com/D16263
---
 .../search/engine/PhabricatorApplicationSearchEngine.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index 96363ed947..d7268facb3 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1160,7 +1160,11 @@ public function buildConduitResponse(
       $saved_query->setParameter($field->getKey(), $value);
     }
 
-    $this->saveQuery($saved_query);
+    // NOTE: Currently, when running an ad-hoc query we never persist it into
+    // a saved query. We might want to add an option to do this in the future
+    // (for example, to enable a CLI-to-Web workflow where user can view more
+    // details about results by following a link), but have no use cases for
+    // it today. If we do identify a use case, we could save the query here.
 
     $query = $this->buildQueryFromSavedQuery($saved_query);
     $pager = $this->newPagerForSavedQuery($saved_query);
@@ -1234,6 +1238,7 @@ public function buildConduitResponse(
       'data' => $data,
       'maps' => $method->getQueryMaps($query),
       'query' => array(
+        // This may be `null` if we have not saved the query.
         'queryKey' => $saved_query->getQueryKey(),
       ),
       'cursor' => array(

From 3f7021e0d88b0c8de0357f346899bd7c66eba164 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 29 Aug 2016 20:09:43 -0700
Subject: [PATCH 036/865] (stable) Fix search results with tables, fatals in
 Phortune

Summary: Previously we collapsed all table search results, but the new UI doesn't need it. Remove unused methods and fix CSS.

Test Plan: Legalpad Signatures, Phortune Accounts.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D16469
---
 .../controller/PhortuneAccountListController.php       |  4 ++--
 .../controller/PhortuneProductListController.php       |  2 +-
 .../phortune/query/PhortuneMerchantSearchEngine.php    |  2 +-
 .../PhabricatorApplicationSearchController.php         |  3 ---
 .../view/PhabricatorApplicationSearchResultView.php    | 10 ----------
 .../css/application/search/application-search-view.css |  5 +++++
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/applications/phortune/controller/PhortuneAccountListController.php b/src/applications/phortune/controller/PhortuneAccountListController.php
index 4b7521ceaa..d95fd709d5 100644
--- a/src/applications/phortune/controller/PhortuneAccountListController.php
+++ b/src/applications/phortune/controller/PhortuneAccountListController.php
@@ -39,7 +39,7 @@ public function handleRequest(AphrontRequest $request) {
         ->setHeader($account->getName())
         ->setHref($this->getApplicationURI($account->getID().'/'))
         ->setObject($account)
-        ->setIcon('fa-credit-card');
+        ->setImageIcon('fa-credit-card');
 
       $payment_list->addItem($item);
     }
@@ -71,7 +71,7 @@ public function handleRequest(AphrontRequest $request) {
         ->setHeader($merchant->getName())
         ->setHref($this->getApplicationURI('/merchant/'.$merchant->getID().'/'))
         ->setObject($merchant)
-        ->setIcon('fa-bank');
+        ->setImageIcon('fa-bank');
 
       $merchant_list->addItem($item);
     }
diff --git a/src/applications/phortune/controller/PhortuneProductListController.php b/src/applications/phortune/controller/PhortuneProductListController.php
index eeb594d650..ee84581ae1 100644
--- a/src/applications/phortune/controller/PhortuneProductListController.php
+++ b/src/applications/phortune/controller/PhortuneProductListController.php
@@ -41,7 +41,7 @@ public function handleRequest(AphrontRequest $request) {
         ->setHeader($product->getProductName())
         ->setHref($view_uri)
         ->addAttribute($price->formatForDisplay())
-        ->setIcon('fa-gift');
+        ->setImageIcon('fa-gift');
 
       $product_list->addItem($item);
     }
diff --git a/src/applications/phortune/query/PhortuneMerchantSearchEngine.php b/src/applications/phortune/query/PhortuneMerchantSearchEngine.php
index 1806af371e..d37c1455b3 100644
--- a/src/applications/phortune/query/PhortuneMerchantSearchEngine.php
+++ b/src/applications/phortune/query/PhortuneMerchantSearchEngine.php
@@ -74,7 +74,7 @@ protected function renderResultList(
         ->setHeader($merchant->getName())
         ->setHref('/phortune/merchant/'.$merchant->getID().'/')
         ->setObject($merchant)
-        ->setIcon('fa-bank');
+        ->setImageIcon('fa-bank');
 
       $list->addItem($item);
     }
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index 164e9aabbc..a463e50471 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -270,9 +270,6 @@ private function processSearchRequest() {
           if ($list->getContent()) {
             $box->appendChild($list->getContent());
           }
-          if ($list->getCollapsed()) {
-            $box->setCollapsed(true);
-          }
 
           $result_header = $list->getHeader();
           if ($result_header) {
diff --git a/src/applications/search/view/PhabricatorApplicationSearchResultView.php b/src/applications/search/view/PhabricatorApplicationSearchResultView.php
index 5bcfdcf675..1c3f4aad65 100644
--- a/src/applications/search/view/PhabricatorApplicationSearchResultView.php
+++ b/src/applications/search/view/PhabricatorApplicationSearchResultView.php
@@ -12,7 +12,6 @@ final class PhabricatorApplicationSearchResultView extends Phobject {
   private $content = null;
   private $infoView = null;
   private $actions = array();
-  private $collapsed = null;
   private $noDataString;
   private $crumbs = array();
   private $header;
@@ -70,15 +69,6 @@ public function getActions() {
     return $this->actions;
   }
 
-  public function setCollapsed($collapsed) {
-    $this->collapsed = $collapsed;
-    return $this;
-  }
-
-  public function getCollapsed() {
-    return $this->collapsed;
-  }
-
   public function setNoDataString($nodata) {
     $this->noDataString = $nodata;
     return $this;
diff --git a/webroot/rsrc/css/application/search/application-search-view.css b/webroot/rsrc/css/application/search/application-search-view.css
index 24ee18c847..4a573f5111 100644
--- a/webroot/rsrc/css/application/search/application-search-view.css
+++ b/webroot/rsrc/css/application/search/application-search-view.css
@@ -16,6 +16,11 @@
   border-bottom: 1px solid {$thinblueborder};
 }
 
+.application-search-view .phui-object-box.phui-object-box-collapsed
+  .phui-header-shell {
+  padding: 20px 8px;
+}
+
 .application-search-results
   .phui-profile-header.phui-header-shell .phui-header-header {
   font-size: 20px;

From 492fd29a1bd4d48dac1acdf3c89475d333af863b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Aug 2016 07:37:19 -0700
Subject: [PATCH 037/865] (stable) Update the resource map on "stable".

---
 resources/celerity/map.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 9fd15abad3..097785c4da 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -100,7 +100,7 @@
     'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
     'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
     'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae',
-    'rsrc/css/application/search/application-search-view.css' => 'b3e0e5ef',
+    'rsrc/css/application/search/application-search-view.css' => 'be6454ec',
     'rsrc/css/application/search/search-results.css' => '7dea472c',
     'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
@@ -542,7 +542,7 @@
     'aphront-tokenizer-control-css' => '056da01b',
     'aphront-tooltip-css' => '1a07aea8',
     'aphront-typeahead-control-css' => 'd4f16145',
-    'application-search-view-css' => 'b3e0e5ef',
+    'application-search-view-css' => 'be6454ec',
     'auth-css' => '0877ed6e',
     'bulk-job-css' => 'df9c1d4a',
     'changeset-view-manager' => 'a2828756',

From ca30df847e4e99aec46dd97c7bd9b4f7d8542cab Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 2 Sep 2016 18:13:55 -0700
Subject: [PATCH 038/865] (stable) Rebuild Celerity map on stable.

---
 resources/celerity/map.php | 78 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 097785c4da..9cdac5d965 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,8 +7,8 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'ed7ae7bb',
-    'core.pkg.js' => 'b562c3db',
+    'core.pkg.css' => 'ad6a3591',
+    'core.pkg.js' => '2b8af4e4',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '3fb7f532',
     'differential.pkg.js' => '634399e9',
@@ -32,25 +32,26 @@
     'rsrc/css/aphront/typeahead.css' => 'd4f16145',
     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
     'rsrc/css/application/auth/auth.css' => '0877ed6e',
-    'rsrc/css/application/base/main-menu-view.css' => '3b0d39f7',
-    'rsrc/css/application/base/notification-menu.css' => 'f31c0bde',
+    'rsrc/css/application/base/main-menu-view.css' => 'e862571a',
+    'rsrc/css/application/base/notification-menu.css' => 'b3ab500d',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601',
     'rsrc/css/application/base/phui-theme.css' => '027ba77e',
-    'rsrc/css/application/base/standard-page-view.css' => 'e709f6d0',
+    'rsrc/css/application/base/standard-page-view.css' => '2b592894',
     'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
     'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
     'rsrc/css/application/config/config-options.css' => '0ede4c9b',
+    'rsrc/css/application/config/config-page.css' => '8798e14f',
     'rsrc/css/application/config/config-template.css' => '8e6c6fcd',
     'rsrc/css/application/config/config-welcome.css' => '035aa483',
     'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
     'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
     'rsrc/css/application/conpherence/durable-column.css' => '86396117',
-    'rsrc/css/application/conpherence/menu.css' => 'f99fee4c',
-    'rsrc/css/application/conpherence/message-pane.css' => '5897d3ac',
+    'rsrc/css/application/conpherence/menu.css' => '90bdf85c',
+    'rsrc/css/application/conpherence/message-pane.css' => '5c7b7b17',
     'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
     'rsrc/css/application/conpherence/transaction.css' => '85d0974c',
     'rsrc/css/application/conpherence/update.css' => 'faf6be09',
-    'rsrc/css/application/conpherence/widget-pane.css' => '775eaaba',
+    'rsrc/css/application/conpherence/widget-pane.css' => 'c5b74f9e',
     'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
     'rsrc/css/application/countdown/timer.css' => '16c52f5c',
     'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a',
@@ -70,7 +71,6 @@
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => '5c1b47c2',
     'rsrc/css/application/flag/flag.css' => '5337623f',
-    'rsrc/css/application/guides/guides.css' => '1d5414e5',
     'rsrc/css/application/harbormaster/harbormaster.css' => 'f491c9f4',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'dc31f6e9',
@@ -108,12 +108,12 @@
     'rsrc/css/core/core.css' => 'd0801452',
     'rsrc/css/core/remarkup.css' => '5ed06ed8',
     'rsrc/css/core/syntax.css' => '769d3498',
-    'rsrc/css/core/z-index.css' => '5b6fcf3f',
+    'rsrc/css/core/z-index.css' => '2b01a823',
     'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
     'rsrc/css/font/font-aleo.css' => '8bdb2835',
     'rsrc/css/font/font-awesome.css' => '2b7ebbcc',
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
-    'rsrc/css/font/phui-font-icon-base.css' => '4e8274c4',
+    'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
     'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983',
     'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893',
@@ -148,7 +148,7 @@
     'rsrc/css/phui/phui-info-view.css' => '28efab79',
     'rsrc/css/phui/phui-list.css' => '9da2aa00',
     'rsrc/css/phui/phui-object-box.css' => '6b487c57',
-    'rsrc/css/phui/phui-object-item-list-view.css' => '40010767',
+    'rsrc/css/phui/phui-object-item-list-view.css' => '87278fa0',
     'rsrc/css/phui/phui-pager.css' => 'bea33d23',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
     'rsrc/css/phui/phui-profile-menu.css' => '8a3fc181',
@@ -161,7 +161,7 @@
     'rsrc/css/phui/phui-timeline-view.css' => 'bc523970',
     'rsrc/css/phui/phui-two-column-view.css' => '5afdf637',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => 'ac6fe6a7',
-    'rsrc/css/phui/workboards/phui-workboard.css' => 'e6d89647',
+    'rsrc/css/phui/workboards/phui-workboard.css' => 'bda3ef58',
     'rsrc/css/phui/workboards/phui-workcard.css' => '0c62d7c5',
     'rsrc/css/phui/workboards/phui-workpanel.css' => '92197373',
     'rsrc/css/sprite-login.css' => '60e8560e',
@@ -358,7 +358,7 @@
     'rsrc/image/texture/table_header_hover.png' => '038ec3b9',
     'rsrc/image/texture/table_header_tall.png' => 'd56b434f',
     'rsrc/js/application/aphlict/Aphlict.js' => '5359e785',
-    'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => '031cee25',
+    'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => '49e20786',
     'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'fb20ac8d',
     'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761',
     'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => 'edd1ba66',
@@ -548,15 +548,16 @@
     'changeset-view-manager' => 'a2828756',
     'conduit-api-css' => '7bc725c4',
     'config-options-css' => '0ede4c9b',
+    'config-page-css' => '8798e14f',
     'config-welcome-css' => '035aa483',
     'conpherence-durable-column-view' => '86396117',
-    'conpherence-menu-css' => 'f99fee4c',
-    'conpherence-message-pane-css' => '5897d3ac',
+    'conpherence-menu-css' => '90bdf85c',
+    'conpherence-message-pane-css' => '5c7b7b17',
     'conpherence-notification-css' => '6cdcc253',
     'conpherence-thread-manager' => '01774ab2',
     'conpherence-transaction-css' => '85d0974c',
     'conpherence-update-css' => 'faf6be09',
-    'conpherence-widget-pane-css' => '775eaaba',
+    'conpherence-widget-pane-css' => 'c5b74f9e',
     'd3' => 'a11a5ff2',
     'differential-changeset-view-css' => '9ef7d354',
     'differential-core-view-css' => '5b7b8ff4',
@@ -574,7 +575,6 @@
     'font-fontawesome' => '2b7ebbcc',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => '5c1b47c2',
-    'guides-app-css' => '1d5414e5',
     'harbormaster-css' => 'f491c9f4',
     'herald-css' => 'dc31f6e9',
     'herald-rule-editor' => 'd6a7e717',
@@ -582,7 +582,7 @@
     'inline-comment-summary-css' => '51efda3a',
     'javelin-aphlict' => '5359e785',
     'javelin-behavior' => '61cbc29a',
-    'javelin-behavior-aphlict-dropdown' => '031cee25',
+    'javelin-behavior-aphlict-dropdown' => '49e20786',
     'javelin-behavior-aphlict-listen' => 'fb20ac8d',
     'javelin-behavior-aphlict-status' => 'ea681761',
     'javelin-behavior-aphront-basic-tokenizer' => 'b3a4b884',
@@ -786,11 +786,11 @@
     'phabricator-flag-css' => '5337623f',
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => '4a021c10',
-    'phabricator-main-menu-view' => '3b0d39f7',
+    'phabricator-main-menu-view' => 'e862571a',
     'phabricator-nav-view-css' => 'b29426e9',
     'phabricator-notification' => 'ccf1cbf8',
     'phabricator-notification-css' => '3f6c89c9',
-    'phabricator-notification-menu-css' => 'f31c0bde',
+    'phabricator-notification-menu-css' => 'b3ab500d',
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'cfd23f37',
@@ -799,7 +799,7 @@
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
     'phabricator-source-code-view-css' => 'cbeef983',
-    'phabricator-standard-page-view' => 'e709f6d0',
+    'phabricator-standard-page-view' => '2b592894',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => 'df5e11d2',
     'phabricator-tooltip' => '6323f942',
@@ -814,7 +814,7 @@
     'phabricator-uiexample-reactor-select' => 'a155550f',
     'phabricator-uiexample-reactor-sendclass' => '1def2711',
     'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
-    'phabricator-zindex-css' => '5b6fcf3f',
+    'phabricator-zindex-css' => '2b01a823',
     'phame-css' => '8efb0729',
     'pholio-css' => 'ca89d380',
     'pholio-edit-css' => '07676f51',
@@ -842,7 +842,7 @@
     'phui-document-view-css' => 'c32e8dec',
     'phui-document-view-pro-css' => 'dc3d46ed',
     'phui-feed-story-css' => 'aa49845d',
-    'phui-font-icon-base-css' => '4e8274c4',
+    'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '9cda225e',
     'phui-form-css' => 'aac1d51d',
     'phui-form-view-css' => '76b4a46c',
@@ -858,7 +858,7 @@
     'phui-inline-comment-view-css' => '5953c28e',
     'phui-list-view-css' => '9da2aa00',
     'phui-object-box-css' => '6b487c57',
-    'phui-object-item-list-view-css' => '40010767',
+    'phui-object-item-list-view-css' => '87278fa0',
     'phui-pager-css' => 'bea33d23',
     'phui-pinboard-view-css' => '2495140e',
     'phui-profile-menu-css' => '8a3fc181',
@@ -872,7 +872,7 @@
     'phui-timeline-view-css' => 'bc523970',
     'phui-two-column-view-css' => '5afdf637',
     'phui-workboard-color-css' => 'ac6fe6a7',
-    'phui-workboard-view-css' => 'e6d89647',
+    'phui-workboard-view-css' => 'bda3ef58',
     'phui-workcard-view-css' => '0c62d7c5',
     'phui-workpanel-view-css' => '92197373',
     'phuix-action-list-view' => 'b5c256b8',
@@ -933,16 +933,6 @@
       'javelin-dom',
       'phabricator-keyboard-shortcut',
     ),
-    '031cee25' => array(
-      'javelin-behavior',
-      'javelin-request',
-      'javelin-stratcom',
-      'javelin-vector',
-      'javelin-dom',
-      'javelin-uri',
-      'javelin-behavior-device',
-      'phabricator-title',
-    ),
     '05270951' => array(
       'javelin-util',
       'javelin-magical-init',
@@ -1166,9 +1156,6 @@
       'javelin-dom',
       'javelin-magical-init',
     ),
-    '3b0d39f7' => array(
-      'phui-theme-css',
-    ),
     '3cb0b2fc' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1244,6 +1231,16 @@
       'javelin-dom',
       'javelin-stratcom',
     ),
+    '49e20786' => array(
+      'javelin-behavior',
+      'javelin-request',
+      'javelin-stratcom',
+      'javelin-vector',
+      'javelin-dom',
+      'javelin-uri',
+      'javelin-behavior-device',
+      'phabricator-title',
+    ),
     '4a021c10' => array(
       'javelin-install',
       'javelin-util',
@@ -2099,6 +2096,9 @@
     'e6e25838' => array(
       'javelin-install',
     ),
+    'e862571a' => array(
+      'phui-theme-css',
+    ),
     'e9581f08' => array(
       'javelin-behavior',
       'javelin-stratcom',

From bac8562884c510bfa464f64f5553eb61028e5f68 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Sep 2016 06:58:35 -0700
Subject: [PATCH 039/865] (stable) Allow `bin/storage renamespace` to work with
 underscores

If the namespace is something like "test_example" we currently fail to
renamespace the dump.

(Cowboy committing this since this is currently blocking a data export.)

Test Plan:

  - Renamespaced a local dump, examined the output, saw 60 create / 60 use, reimported it.
  - Will export in production.

Auditors: chad
---
 ...catorStorageManagementRenamespaceWorkflow.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementRenamespaceWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementRenamespaceWorkflow.php
index ad5afac7fb..51d3dd1482 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementRenamespaceWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementRenamespaceWorkflow.php
@@ -138,9 +138,11 @@ public function didExecute(PhutilArgumentParser $args) {
           $output_name));
     }
 
+    $name_pattern = preg_quote($from, '@');
+
     $patterns = array(
-      'use' => '@^(USE `)([^_]+)(_.*)$@',
-      'create' => '@^(CREATE DATABASE /\*.*?\*/ `)([^_]+)(_.*)$@',
+      'use' => '@^(USE `)('.$name_pattern.')(_.*)$@',
+      'create' => '@^(CREATE DATABASE /\*.*?\*/ `)('.$name_pattern.')(_.*)$@',
     );
 
     $found = array_fill_keys(array_keys($patterns), 0);
@@ -151,16 +153,6 @@ public function didExecute(PhutilArgumentParser $args) {
 
         foreach ($patterns as $key => $pattern) {
           if (preg_match($pattern, $line, $matches)) {
-            $namespace = $matches[2];
-            if ($namespace != $from) {
-              throw new Exception(
-                pht(
-                  'Expected namespace "%s", found "%s": %s.',
-                  $from,
-                  $namespace,
-                  $line));
-            }
-
             $line = $matches[1].$to.$matches[3];
             $found[$key]++;
           }

From 6725f3719da3498670e07a1922762bbb4165764d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Sep 2016 07:29:59 -0700
Subject: [PATCH 040/865] (stable) Add a "--copy" flag to "bin/files migrate"

Summary:
Ref T11596. When exporting data from the Phacility cluster, we `bin/files migrate` data from S3 into a database dump on the `aux` tier.

With current semantics, this //moves// the data and destroys it in S3.

Add a `--copy` flag to //copy// the data instead. This leaves the old copy around, which is what we want for exports.

Test Plan:
  - Ran `bin/files migrate` to go from `blob` to `disk` with `--copy`. Verified a copy was left in the database.
  - Copied it back, verified a copy was left on disk (total: 2 database copies, 1 disk copy).
  - Moved it back without copy, verified database was destroyed and disk was created (total: 1 database copy, 2 disk copies).
  - Moved it back without copy, verified local disk was destroyed and blob was created (total: 2 datbabase copies, 1 disk copy).

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11596

Differential Revision: https://secure.phabricator.com/D16497
---
 .../PhabricatorFilesManagementMigrateWorkflow.php | 10 +++++++++-
 .../files/storage/PhabricatorFile.php             | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php b/src/applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php
index 83978d9764..eda43e2ef3 100644
--- a/src/applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php
+++ b/src/applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php
@@ -36,6 +36,12 @@ protected function didConstruct() {
             'name'      => 'all',
             'help'      => pht('Migrate all files.'),
           ),
+          array(
+            'name' => 'copy',
+            'help' => pht(
+              'Copy file data instead of moving it: after migrating, do not '.
+              'remove the old data even if it is no longer referenced.'),
+          ),
           array(
             'name'      => 'names',
             'wildcard'  => true,
@@ -70,6 +76,8 @@ public function execute(PhutilArgumentParser $args) {
     $min_size = (int)$args->getArg('min-size');
     $max_size = (int)$args->getArg('max-size');
 
+    $is_copy = $args->getArg('copy');
+
     $failed = array();
     $engines = PhabricatorFileStorageEngine::loadAllEngines();
     $total_bytes = 0;
@@ -158,7 +166,7 @@ public function execute(PhutilArgumentParser $args) {
         if ($is_dry_run) {
           // Do nothing, this is a dry run.
         } else {
-          $file->migrateToEngine($target_engine);
+          $file->migrateToEngine($target_engine, $is_copy);
         }
 
         $total_files += 1;
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index 8d81c3ae98..d301abceca 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -422,7 +422,10 @@ public static function newFromFileData($data, array $params = array()) {
     return self::buildFromFileData($data, $params);
   }
 
-  public function migrateToEngine(PhabricatorFileStorageEngine $engine) {
+  public function migrateToEngine(
+    PhabricatorFileStorageEngine $engine,
+    $make_copy) {
+
     if (!$this->getID() || !$this->getStorageHandle()) {
       throw new Exception(
         pht("You can not migrate a file which hasn't yet been saved."));
@@ -446,10 +449,12 @@ public function migrateToEngine(PhabricatorFileStorageEngine $engine) {
     $this->setStorageHandle($new_handle);
     $this->save();
 
-    $this->deleteFileDataIfUnused(
-      $old_engine,
-      $old_identifier,
-      $old_handle);
+    if (!$make_copy) {
+      $this->deleteFileDataIfUnused(
+        $old_engine,
+        $old_identifier,
+        $old_handle);
+    }
 
     return $this;
   }

From 89c0e47a60d30dd75d746fac0f185387522e857b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Sep 2016 11:03:17 -0700
Subject: [PATCH 041/865] (stable) Split setup checks into "preflight" and
 "normal" checks

Summary:
Ref T11589. Currently, initialization order is a bit tangled: we load configuration from the database, then later test if we can connect to the database.

Instead, I'm going to do: preflight checks ("PHP Version OK?", "Extensions installed?"), then configuration, then normal setup checks.

To prepare for this, flag core checks as "preflight" and add a setup panel to visually confirm that I didn't miss anything.

Test Plan: {F1803210}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11589

Differential Revision: https://secure.phabricator.com/D16499
---
 src/__phutil_library_map__.php                |  2 +
 .../check/PhabricatorDatabaseSetupCheck.php   |  2 +-
 .../check/PhabricatorExtensionsSetupCheck.php |  4 +-
 .../check/PhabricatorPHPConfigSetupCheck.php  |  4 +-
 .../config/check/PhabricatorSetupCheck.php    | 20 +++++++-
 .../PhabricatorConfigSetupCheckModule.php     | 49 +++++++++++++++++++
 6 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 src/applications/config/module/PhabricatorConfigSetupCheckModule.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f471313be8..9492d65df6 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2200,6 +2200,7 @@
     'PhabricatorConfigSchemaQuery' => 'applications/config/schema/PhabricatorConfigSchemaQuery.php',
     'PhabricatorConfigSchemaSpec' => 'applications/config/schema/PhabricatorConfigSchemaSpec.php',
     'PhabricatorConfigServerSchema' => 'applications/config/schema/PhabricatorConfigServerSchema.php',
+    'PhabricatorConfigSetupCheckModule' => 'applications/config/module/PhabricatorConfigSetupCheckModule.php',
     'PhabricatorConfigSiteModule' => 'applications/config/module/PhabricatorConfigSiteModule.php',
     'PhabricatorConfigSiteSource' => 'infrastructure/env/PhabricatorConfigSiteSource.php',
     'PhabricatorConfigSource' => 'infrastructure/env/PhabricatorConfigSource.php',
@@ -6954,6 +6955,7 @@
     'PhabricatorConfigSchemaQuery' => 'Phobject',
     'PhabricatorConfigSchemaSpec' => 'Phobject',
     'PhabricatorConfigServerSchema' => 'PhabricatorConfigStorageSchema',
+    'PhabricatorConfigSetupCheckModule' => 'PhabricatorConfigModule',
     'PhabricatorConfigSiteModule' => 'PhabricatorConfigModule',
     'PhabricatorConfigSiteSource' => 'PhabricatorConfigProxySource',
     'PhabricatorConfigSource' => 'Phobject',
diff --git a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
index dab9ad3b54..b99cd37adc 100644
--- a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
+++ b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
@@ -8,7 +8,7 @@ public function getDefaultGroup() {
 
   public function getExecutionOrder() {
     // This must run after basic PHP checks, but before most other checks.
-    return 0.5;
+    return 500;
   }
 
   protected function executeChecks() {
diff --git a/src/applications/config/check/PhabricatorExtensionsSetupCheck.php b/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
index fa723cc7da..0840e545e4 100644
--- a/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
@@ -6,8 +6,8 @@ public function getDefaultGroup() {
     return self::GROUP_PHP;
   }
 
-  public function getExecutionOrder() {
-    return 0;
+  public function isPreflightCheck() {
+    return true;
   }
 
   protected function executeChecks() {
diff --git a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
index ec61b4764d..86e885614a 100644
--- a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
@@ -6,8 +6,8 @@ public function getDefaultGroup() {
     return self::GROUP_PHP;
   }
 
-  public function getExecutionOrder() {
-    return 0;
+  public function isPreflightCheck() {
+    return true;
   }
 
   protected function executeChecks() {
diff --git a/src/applications/config/check/PhabricatorSetupCheck.php b/src/applications/config/check/PhabricatorSetupCheck.php
index a657c52799..5970b0ca81 100644
--- a/src/applications/config/check/PhabricatorSetupCheck.php
+++ b/src/applications/config/check/PhabricatorSetupCheck.php
@@ -12,7 +12,25 @@ abstract protected function executeChecks();
   const GROUP_IMPORTANT   = 'important';
 
   public function getExecutionOrder() {
-    return 1;
+    if ($this->isPreflightCheck()) {
+      return 0;
+    } else {
+      return 1000;
+    }
+  }
+
+  /**
+   * Should this check execute before we load configuration?
+   *
+   * The majority of checks (particularly, those checks which examine
+   * configuration) should run in the normal setup phase, after configuration
+   * loads. However, a small set of critical checks (mostly, tests for PHP
+   * setup and extensions) need to run before we can load configuration.
+   *
+   * @return bool True to execute before configuration is loaded.
+   */
+  public function isPreflightCheck() {
+    return false;
   }
 
   final protected function newIssue($key) {
diff --git a/src/applications/config/module/PhabricatorConfigSetupCheckModule.php b/src/applications/config/module/PhabricatorConfigSetupCheckModule.php
new file mode 100644
index 0000000000..886a2e659f
--- /dev/null
+++ b/src/applications/config/module/PhabricatorConfigSetupCheckModule.php
@@ -0,0 +1,49 @@
+<?php
+
+final class PhabricatorConfigSetupCheckModule
+  extends PhabricatorConfigModule {
+
+  public function getModuleKey() {
+    return 'setup';
+  }
+
+  public function getModuleName() {
+    return pht('Setup Checks');
+  }
+
+  public function renderModuleStatus(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+
+    $checks = PhabricatorSetupCheck::loadAllChecks();
+
+    $rows = array();
+    foreach ($checks as $key => $check) {
+      if ($check->isPreflightCheck()) {
+        $icon = id(new PHUIIconView())->setIcon('fa-plane blue');
+      } else {
+        $icon = id(new PHUIIconView())->setIcon('fa-times grey');
+      }
+
+      $rows[] = array(
+        $check->getExecutionOrder(),
+        $icon,
+        get_class($check),
+      );
+    }
+
+    return id(new AphrontTableView($rows))
+      ->setHeaders(
+        array(
+          pht('Order'),
+          pht('Preflight'),
+          pht('Class'),
+        ))
+      ->setColumnClasses(
+        array(
+          null,
+          null,
+          'pri wide',
+        ));
+  }
+
+}

From 445924a2a23c4e95a91b5fc20a48e60c60b1914e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Sep 2016 12:25:37 -0700
Subject: [PATCH 042/865] (stable) Split setup check phases into "preflight"
 and "post-config"

Summary:
Ref T11589. This runs:

  - preflight checks (critical checks: PHP version stuff, extensions);
  - configuration;
  - normal checks.

The PHP checks are split into critical ("bad version") and noncritical ("sub-optimal config").

I tidied up the extension checks slightly, we realistically depend on `cURL` nowadays.

Test Plan:
  - Faked a preflight failure.
  - Hit preflight check.
  - Got expected error screen.
  - Loaded normal pages.
  - Hit a normal setup check.
  - Used DarkConsole "Startup" tab to verify that preflight checks take <1ms to run (we run them on every page without caching, at least for now, but they only do trivial checks like PHP versions).

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11589

Differential Revision: https://secure.phabricator.com/D16500
---
 src/__phutil_library_map__.php                |   2 +
 .../AphrontApplicationConfiguration.php       |   9 +
 .../check/PhabricatorExtensionsSetupCheck.php |   6 +-
 .../check/PhabricatorPHPConfigSetupCheck.php  | 197 +----------------
 .../PhabricatorPHPPreflightSetupCheck.php     | 201 ++++++++++++++++++
 .../config/check/PhabricatorSetupCheck.php    |  41 +++-
 .../PhabricatorConfigIssueListController.php  |   2 +-
 .../PhabricatorConfigIssuePanelController.php |   2 +-
 .../PhabricatorConfigIssueViewController.php  |   2 +-
 src/infrastructure/env/PhabricatorEnv.php     |   9 +-
 10 files changed, 267 insertions(+), 204 deletions(-)
 create mode 100644 src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 9492d65df6..02b4dc5b92 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3000,6 +3000,7 @@
     'PhabricatorPHPASTApplication' => 'applications/phpast/application/PhabricatorPHPASTApplication.php',
     'PhabricatorPHPConfigSetupCheck' => 'applications/config/check/PhabricatorPHPConfigSetupCheck.php',
     'PhabricatorPHPMailerConfigOptions' => 'applications/config/option/PhabricatorPHPMailerConfigOptions.php',
+    'PhabricatorPHPPreflightSetupCheck' => 'applications/config/check/PhabricatorPHPPreflightSetupCheck.php',
     'PhabricatorPackagesApplication' => 'applications/packages/application/PhabricatorPackagesApplication.php',
     'PhabricatorPackagesController' => 'applications/packages/controller/PhabricatorPackagesController.php',
     'PhabricatorPackagesCreatePublisherCapability' => 'applications/packages/capability/PhabricatorPackagesCreatePublisherCapability.php',
@@ -7858,6 +7859,7 @@
     'PhabricatorPHPASTApplication' => 'PhabricatorApplication',
     'PhabricatorPHPConfigSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorPHPMailerConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorPHPPreflightSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorPackagesApplication' => 'PhabricatorApplication',
     'PhabricatorPackagesController' => 'PhabricatorController',
     'PhabricatorPackagesCreatePublisherCapability' => 'PhabricatorPolicyCapability',
diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
index dc32faedec..7c5c571b64 100644
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -69,6 +69,15 @@ public static function runHTTPRequest(AphrontHTTPSink $sink) {
     // request object first.
     $write_guard = new AphrontWriteGuard('id');
 
+    PhabricatorStartup::beginStartupPhase('preflight');
+
+    $response = PhabricatorSetupCheck::willPreflightRequest();
+    if ($response) {
+      PhabricatorStartup::endOutputCapture();
+      $sink->writeResponse($response);
+      return;
+    }
+
     PhabricatorStartup::beginStartupPhase('env.init');
     PhabricatorEnv::initializeWebEnvironment();
 
diff --git a/src/applications/config/check/PhabricatorExtensionsSetupCheck.php b/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
index 0840e545e4..973c80629b 100644
--- a/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtensionsSetupCheck.php
@@ -12,7 +12,6 @@ public function isPreflightCheck() {
 
   protected function executeChecks() {
     // TODO: Make 'mbstring' and 'iconv' soft requirements.
-    // TODO: Make 'curl' a soft requirement.
 
     $required = array(
       'hash',
@@ -22,9 +21,8 @@ protected function executeChecks() {
       'iconv',
       'ctype',
 
-      // There is a chance we might not need this, but some configurations (like
-      // OAuth or Amazon SES) will require it. Just mark it 'required' since
-      // it's widely available and relatively core.
+      // There is a tiny chance we might not need this, but a significant
+      // number of applications require it and it's widely available.
       'curl',
     );
 
diff --git a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
index 86e885614a..f286b46f9c 100644
--- a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
@@ -1,202 +1,17 @@
 <?php
 
+/**
+ * Noncritical PHP configuration checks.
+ *
+ * For critical checks, see @{class:PhabricatorPHPPreflightSetupCheck}.
+ */
 final class PhabricatorPHPConfigSetupCheck extends PhabricatorSetupCheck {
 
   public function getDefaultGroup() {
     return self::GROUP_PHP;
   }
 
-  public function isPreflightCheck() {
-    return true;
-  }
-
   protected function executeChecks() {
-    if (version_compare(phpversion(), 7, '>=')) {
-      $message = pht(
-        'This version of Phabricator does not support PHP 7. You '.
-        'are running PHP %s.',
-        phpversion());
-
-      $this->newIssue('php.version7')
-        ->setIsFatal(true)
-        ->setName(pht('PHP 7 Not Supported'))
-        ->setMessage($message)
-        ->addLink(
-          'https://phurl.io/u/php7',
-          pht('Phabricator PHP 7 Compatibility Information'));
-
-      return;
-    }
-
-    $safe_mode = ini_get('safe_mode');
-    if ($safe_mode) {
-      $message = pht(
-        "You have '%s' enabled in your PHP configuration, but Phabricator ".
-        "will not run in safe mode. Safe mode has been deprecated in PHP 5.3 ".
-        "and removed in PHP 5.4.\n\nDisable safe mode to continue.",
-        'safe_mode');
-
-      $this->newIssue('php.safe_mode')
-        ->setIsFatal(true)
-        ->setName(pht('Disable PHP %s', 'safe_mode'))
-        ->setMessage($message)
-        ->addPHPConfig('safe_mode');
-      return;
-    }
-
-    // Check for `disable_functions` or `disable_classes`. Although it's
-    // possible to disable a bunch of functions (say, `array_change_key_case()`)
-    // and classes and still have Phabricator work fine, it's unreasonably
-    // difficult for us to be sure we'll even survive setup if these options
-    // are enabled. Phabricator needs access to the most dangerous functions,
-    // so there is no reasonable configuration value here which actually
-    // provides a benefit while guaranteeing Phabricator will run properly.
-
-    $disable_options = array('disable_functions', 'disable_classes');
-    foreach ($disable_options as $disable_option) {
-      $disable_value = ini_get($disable_option);
-      if ($disable_value) {
-
-        // By default Debian installs the pcntl extension but disables all of
-        // its functions using configuration. Whitelist disabling these
-        // functions so that Debian PHP works out of the box (we do not need to
-        // call these functions from the web UI). This is pretty ridiculous but
-        // it's not the users' fault and they haven't done anything crazy to
-        // get here, so don't make them pay for Debian's unusual choices.
-        // See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605571
-        $fatal = true;
-        if ($disable_option == 'disable_functions') {
-          $functions = preg_split('/[, ]+/', $disable_value);
-          $functions = array_filter($functions);
-          foreach ($functions as $k => $function) {
-            if (preg_match('/^pcntl_/', $function)) {
-              unset($functions[$k]);
-            }
-          }
-          if (!$functions) {
-            $fatal = false;
-          }
-        }
-
-        if ($fatal) {
-          $message = pht(
-            "You have '%s' enabled in your PHP configuration.\n\n".
-            "This option is not compatible with Phabricator. Remove ".
-            "'%s' from your configuration to continue.",
-            $disable_option,
-            $disable_option);
-
-          $this->newIssue('php.'.$disable_option)
-            ->setIsFatal(true)
-            ->setName(pht('Remove PHP %s', $disable_option))
-            ->setMessage($message)
-            ->addPHPConfig($disable_option);
-        }
-      }
-    }
-
-    $overload_option = 'mbstring.func_overload';
-    $func_overload = ini_get($overload_option);
-    if ($func_overload) {
-      $message = pht(
-        "You have '%s' enabled in your PHP configuration.\n\n".
-        "This option is not compatible with Phabricator. Disable ".
-        "'%s' in your PHP configuration to continue.",
-        $overload_option,
-        $overload_option);
-
-      $this->newIssue('php'.$overload_option)
-        ->setIsFatal(true)
-        ->setName(pht('Disable PHP %s', $overload_option))
-        ->setMessage($message)
-        ->addPHPConfig($overload_option);
-    }
-
-    $open_basedir = ini_get('open_basedir');
-    if ($open_basedir) {
-
-      // 'open_basedir' restricts which files we're allowed to access with
-      // file operations. This might be okay -- we don't need to write to
-      // arbitrary places in the filesystem -- but we need to access certain
-      // resources. This setting is unlikely to be providing any real measure
-      // of security so warn even if things look OK.
-
-      $failures = array();
-
-      try {
-        $open_libphutil = class_exists('Future');
-      } catch (Exception $ex) {
-        $failures[] = $ex->getMessage();
-      }
-
-      try {
-        $open_arcanist = class_exists('ArcanistDiffParser');
-      } catch (Exception $ex) {
-        $failures[] = $ex->getMessage();
-      }
-
-      $open_urandom = false;
-      try {
-        Filesystem::readRandomBytes(1);
-        $open_urandom = true;
-      } catch (FilesystemException $ex) {
-        $failures[] = $ex->getMessage();
-      }
-
-      try {
-        $tmp = new TempFile();
-        file_put_contents($tmp, '.');
-        $open_tmp = @fopen((string)$tmp, 'r');
-        if (!$open_tmp) {
-          $failures[] = pht(
-            "Unable to read temporary file '%s'.",
-            (string)$tmp);
-        }
-      } catch (Exception $ex) {
-        $message = $ex->getMessage();
-        $dir = sys_get_temp_dir();
-        $failures[] = pht(
-          "Unable to open temp files from '%s': %s",
-          $dir,
-          $message);
-      }
-
-      $issue = $this->newIssue('php.open_basedir')
-        ->setName(pht('Disable PHP %s', 'open_basedir'))
-        ->addPHPConfig('open_basedir');
-
-      if ($failures) {
-        $message = pht(
-          "Your server is configured with '%s', which prevents Phabricator ".
-          "from opening files it requires access to.\n\n".
-          "Disable this setting to continue.\n\nFailures:\n\n%s",
-          'open_basedir',
-          implode("\n\n", $failures));
-
-        $issue
-          ->setIsFatal(true)
-          ->setMessage($message);
-
-        return;
-      } else {
-        $summary = pht(
-          "You have '%s' configured in your PHP settings, which ".
-          "may cause some features to fail.",
-          'open_basedir');
-
-        $message = pht(
-          "You have '%s' configured in your PHP settings. Although this ".
-          "setting appears permissive enough that Phabricator will work ".
-          "properly, you may still run into problems because of it.\n\n".
-          "Consider disabling '%s'.",
-          'open_basedir',
-          'open_basedir');
-
-        $issue
-          ->setSummary($summary)
-          ->setMessage($message);
-      }
-    }
 
     if (empty($_SERVER['REMOTE_ADDR'])) {
       $doc_href = PhabricatorEnv::getDocLink('Configuring a Preamble Script');
@@ -245,5 +60,7 @@ protected function executeChecks() {
         ->setMessage($message)
         ->addPHPConfig('always_populate_raw_post_data');
     }
+
   }
+
 }
diff --git a/src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php b/src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php
new file mode 100644
index 0000000000..65a582b29c
--- /dev/null
+++ b/src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php
@@ -0,0 +1,201 @@
+<?php
+
+final class PhabricatorPHPPreflightSetupCheck extends PhabricatorSetupCheck {
+
+  public function getDefaultGroup() {
+    return self::GROUP_PHP;
+  }
+
+  public function isPreflightCheck() {
+    return true;
+  }
+
+  protected function executeChecks() {
+    if (version_compare(phpversion(), 7, '>=')) {
+      $message = pht(
+        'This version of Phabricator does not support PHP 7. You '.
+        'are running PHP %s.',
+        phpversion());
+
+      $this->newIssue('php.version7')
+        ->setIsFatal(true)
+        ->setName(pht('PHP 7 Not Supported'))
+        ->setMessage($message)
+        ->addLink(
+          'https://phurl.io/u/php7',
+          pht('Phabricator PHP 7 Compatibility Information'));
+
+      return;
+    }
+
+    $safe_mode = ini_get('safe_mode');
+    if ($safe_mode) {
+      $message = pht(
+        "You have '%s' enabled in your PHP configuration, but Phabricator ".
+        "will not run in safe mode. Safe mode has been deprecated in PHP 5.3 ".
+        "and removed in PHP 5.4.\n\nDisable safe mode to continue.",
+        'safe_mode');
+
+      $this->newIssue('php.safe_mode')
+        ->setIsFatal(true)
+        ->setName(pht('Disable PHP %s', 'safe_mode'))
+        ->setMessage($message)
+        ->addPHPConfig('safe_mode');
+      return;
+    }
+
+    // Check for `disable_functions` or `disable_classes`. Although it's
+    // possible to disable a bunch of functions (say, `array_change_key_case()`)
+    // and classes and still have Phabricator work fine, it's unreasonably
+    // difficult for us to be sure we'll even survive setup if these options
+    // are enabled. Phabricator needs access to the most dangerous functions,
+    // so there is no reasonable configuration value here which actually
+    // provides a benefit while guaranteeing Phabricator will run properly.
+
+    $disable_options = array('disable_functions', 'disable_classes');
+    foreach ($disable_options as $disable_option) {
+      $disable_value = ini_get($disable_option);
+      if ($disable_value) {
+
+        // By default Debian installs the pcntl extension but disables all of
+        // its functions using configuration. Whitelist disabling these
+        // functions so that Debian PHP works out of the box (we do not need to
+        // call these functions from the web UI). This is pretty ridiculous but
+        // it's not the users' fault and they haven't done anything crazy to
+        // get here, so don't make them pay for Debian's unusual choices.
+        // See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605571
+        $fatal = true;
+        if ($disable_option == 'disable_functions') {
+          $functions = preg_split('/[, ]+/', $disable_value);
+          $functions = array_filter($functions);
+          foreach ($functions as $k => $function) {
+            if (preg_match('/^pcntl_/', $function)) {
+              unset($functions[$k]);
+            }
+          }
+          if (!$functions) {
+            $fatal = false;
+          }
+        }
+
+        if ($fatal) {
+          $message = pht(
+            "You have '%s' enabled in your PHP configuration.\n\n".
+            "This option is not compatible with Phabricator. Remove ".
+            "'%s' from your configuration to continue.",
+            $disable_option,
+            $disable_option);
+
+          $this->newIssue('php.'.$disable_option)
+            ->setIsFatal(true)
+            ->setName(pht('Remove PHP %s', $disable_option))
+            ->setMessage($message)
+            ->addPHPConfig($disable_option);
+        }
+      }
+    }
+
+    $overload_option = 'mbstring.func_overload';
+    $func_overload = ini_get($overload_option);
+    if ($func_overload) {
+      $message = pht(
+        "You have '%s' enabled in your PHP configuration.\n\n".
+        "This option is not compatible with Phabricator. Disable ".
+        "'%s' in your PHP configuration to continue.",
+        $overload_option,
+        $overload_option);
+
+      $this->newIssue('php'.$overload_option)
+        ->setIsFatal(true)
+        ->setName(pht('Disable PHP %s', $overload_option))
+        ->setMessage($message)
+        ->addPHPConfig($overload_option);
+    }
+
+    $open_basedir = ini_get('open_basedir');
+    if ($open_basedir) {
+
+      // 'open_basedir' restricts which files we're allowed to access with
+      // file operations. This might be okay -- we don't need to write to
+      // arbitrary places in the filesystem -- but we need to access certain
+      // resources. This setting is unlikely to be providing any real measure
+      // of security so warn even if things look OK.
+
+      $failures = array();
+
+      try {
+        $open_libphutil = class_exists('Future');
+      } catch (Exception $ex) {
+        $failures[] = $ex->getMessage();
+      }
+
+      try {
+        $open_arcanist = class_exists('ArcanistDiffParser');
+      } catch (Exception $ex) {
+        $failures[] = $ex->getMessage();
+      }
+
+      $open_urandom = false;
+      try {
+        Filesystem::readRandomBytes(1);
+        $open_urandom = true;
+      } catch (FilesystemException $ex) {
+        $failures[] = $ex->getMessage();
+      }
+
+      try {
+        $tmp = new TempFile();
+        file_put_contents($tmp, '.');
+        $open_tmp = @fopen((string)$tmp, 'r');
+        if (!$open_tmp) {
+          $failures[] = pht(
+            "Unable to read temporary file '%s'.",
+            (string)$tmp);
+        }
+      } catch (Exception $ex) {
+        $message = $ex->getMessage();
+        $dir = sys_get_temp_dir();
+        $failures[] = pht(
+          "Unable to open temp files from '%s': %s",
+          $dir,
+          $message);
+      }
+
+      $issue = $this->newIssue('php.open_basedir')
+        ->setName(pht('Disable PHP %s', 'open_basedir'))
+        ->addPHPConfig('open_basedir');
+
+      if ($failures) {
+        $message = pht(
+          "Your server is configured with '%s', which prevents Phabricator ".
+          "from opening files it requires access to.\n\n".
+          "Disable this setting to continue.\n\nFailures:\n\n%s",
+          'open_basedir',
+          implode("\n\n", $failures));
+
+        $issue
+          ->setIsFatal(true)
+          ->setMessage($message);
+
+        return;
+      } else {
+        $summary = pht(
+          "You have '%s' configured in your PHP settings, which ".
+          "may cause some features to fail.",
+          'open_basedir');
+
+        $message = pht(
+          "You have '%s' configured in your PHP settings. Although this ".
+          "setting appears permissive enough that Phabricator will work ".
+          "properly, you may still run into problems because of it.\n\n".
+          "Consider disabling '%s'.",
+          'open_basedir',
+          'open_basedir');
+
+        $issue
+          ->setSummary($summary)
+          ->setMessage($message);
+      }
+    }
+  }
+}
diff --git a/src/applications/config/check/PhabricatorSetupCheck.php b/src/applications/config/check/PhabricatorSetupCheck.php
index 5970b0ca81..b1f79bdd47 100644
--- a/src/applications/config/check/PhabricatorSetupCheck.php
+++ b/src/applications/config/check/PhabricatorSetupCheck.php
@@ -129,16 +129,39 @@ final public static function deleteSetupCheckCache() {
       ));
   }
 
+  final public static function willPreflightRequest() {
+    $checks = self::loadAllChecks();
+
+    foreach ($checks as $check) {
+      if (!$check->isPreflightCheck()) {
+        continue;
+      }
+
+      $check->runSetupChecks();
+
+      foreach ($check->getIssues() as $key => $issue) {
+        return self::newIssueResponse($issue);
+      }
+    }
+
+    return null;
+  }
+
+  private static function newIssueResponse(PhabricatorSetupIssue $issue) {
+    $view = id(new PhabricatorSetupIssueView())
+      ->setIssue($issue);
+
+    return id(new PhabricatorConfigResponse())
+      ->setView($view);
+  }
+
   final public static function willProcessRequest() {
     $issue_keys = self::getOpenSetupIssueKeys();
     if ($issue_keys === null) {
-      $issues = self::runAllChecks();
+      $issues = self::runNormalChecks();
       foreach ($issues as $issue) {
         if ($issue->getIsFatal()) {
-          $view = id(new PhabricatorSetupIssueView())
-            ->setIssue($issue);
-          return id(new PhabricatorConfigResponse())
-            ->setView($view);
+          return self::newIssueResponse($issue);
         }
       }
       $issue_keys = self::getUnignoredIssueKeys($issues);
@@ -176,9 +199,15 @@ final public static function loadAllChecks() {
       ->execute();
   }
 
-  final public static function runAllChecks() {
+  final public static function runNormalChecks() {
     $checks = self::loadAllChecks();
 
+    foreach ($checks as $key => $check) {
+      if ($check->isPreflightCheck()) {
+        unset($checks[$key]);
+      }
+    }
+
     $issues = array();
     foreach ($checks as $check) {
       $check->runSetupChecks();
diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
index 7f0b19af69..a5553a34bb 100644
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -9,7 +9,7 @@ public function handleRequest(AphrontRequest $request) {
     $nav = $this->buildSideNavView();
     $nav->selectFilter('issue/');
 
-    $issues = PhabricatorSetupCheck::runAllChecks();
+    $issues = PhabricatorSetupCheck::runNormalChecks();
     PhabricatorSetupCheck::setOpenSetupIssueKeys(
       PhabricatorSetupCheck::getUnignoredIssueKeys($issues),
       $update_database = true);
diff --git a/src/applications/config/controller/PhabricatorConfigIssuePanelController.php b/src/applications/config/controller/PhabricatorConfigIssuePanelController.php
index 16541d184b..3dd910f693 100644
--- a/src/applications/config/controller/PhabricatorConfigIssuePanelController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssuePanelController.php
@@ -6,7 +6,7 @@ final class PhabricatorConfigIssuePanelController
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $open_items = PhabricatorSetupCheck::getOpenSetupIssueKeys();
-    $issues = PhabricatorSetupCheck::runAllChecks();
+    $issues = PhabricatorSetupCheck::runNormalChecks();
     PhabricatorSetupCheck::setOpenSetupIssueKeys(
       PhabricatorSetupCheck::getUnignoredIssueKeys($issues),
       $update_database = true);
diff --git a/src/applications/config/controller/PhabricatorConfigIssueViewController.php b/src/applications/config/controller/PhabricatorConfigIssueViewController.php
index 4700e6315e..57d7b75137 100644
--- a/src/applications/config/controller/PhabricatorConfigIssueViewController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueViewController.php
@@ -7,7 +7,7 @@ public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $issue_key = $request->getURIData('key');
 
-    $issues = PhabricatorSetupCheck::runAllChecks();
+    $issues = PhabricatorSetupCheck::runNormalChecks();
     PhabricatorSetupCheck::setOpenSetupIssueKeys(
       PhabricatorSetupCheck::getUnignoredIssueKeys($issues),
       $update_database = true);
diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php
index d66e022465..221d553d2b 100644
--- a/src/infrastructure/env/PhabricatorEnv.php
+++ b/src/infrastructure/env/PhabricatorEnv.php
@@ -315,6 +315,14 @@ public static function getEnvConfig($key) {
       return self::$cache[$key];
     }
 
+    if (!self::$sourceStack) {
+      throw new Exception(
+        pht(
+          'Trying to read configuration "%s" before configuration has been '.
+          'initialized.',
+          $key));
+    }
+
     $result = self::$sourceStack->getKeys(array($key));
     if (array_key_exists($key, $result)) {
       self::$cache[$key] = $result[$key];
@@ -327,7 +335,6 @@ public static function getEnvConfig($key) {
     }
   }
 
-
   /**
    * Get the current configuration setting for a given key. If the key
    * does not exist, return a default value instead of throwing. This is

From a1338bd2d8897d4f763cd4e94287ebb39b92d201 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Sep 2016 12:52:03 -0700
Subject: [PATCH 043/865] (stable) Raise setup warnings immediately when
 failing to load configuration from the database

Summary:
Ref T11589. Previously, when we failed to load database configuration we just continued anyway, in order to get to setup checks so we could raise a better error.

There was a small chance that this could lead to pages running in a broken state, where ONLY that connection failed and everything else worked. This was accidentally fixed by narrowing the exceptions we continue on in D16489.

However, this "fix" meant that users no longer got helpful setup instructions. Instead:

  - Keep throwing these exceptions: it's bad to continue if we've failed to connect to the database.
  - However, catch them and turn them into setup errors.
  - Share all the setup code so these errors and setup check errors work the same way.

Test Plan:
  - Intentionally broke `mysql.host` and `mysql.pass`.
  - Loaded pages.
  - Got good setup errors.
  - Hit normal setup errors too.
  - Put everything back.
  - Swapped into cluster mode.
  - Intentionally broke cluster mode, saw failover to readonly.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11589

Differential Revision: https://secure.phabricator.com/D16501
---
 .../AphrontApplicationConfiguration.php       | 82 +++++++++++--------
 .../check/PhabricatorDatabaseSetupCheck.php   | 22 ++---
 .../config/check/PhabricatorSetupCheck.php    |  2 +-
 .../config/issue/PhabricatorSetupIssue.php    | 20 +++++
 4 files changed, 80 insertions(+), 46 deletions(-)

diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
index 7c5c571b64..5eeba52221 100644
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -73,13 +73,26 @@ public static function runHTTPRequest(AphrontHTTPSink $sink) {
 
     $response = PhabricatorSetupCheck::willPreflightRequest();
     if ($response) {
-      PhabricatorStartup::endOutputCapture();
-      $sink->writeResponse($response);
-      return;
+      return self::writeResponse($sink, $response);
     }
 
     PhabricatorStartup::beginStartupPhase('env.init');
-    PhabricatorEnv::initializeWebEnvironment();
+
+    try {
+      PhabricatorEnv::initializeWebEnvironment();
+      $database_exception = null;
+    } catch (AphrontInvalidCredentialsQueryException $ex) {
+      $database_exception = $ex;
+    } catch (AphrontConnectionQueryException $ex) {
+      $database_exception = $ex;
+    }
+
+    if ($database_exception) {
+      $issue = PhabricatorSetupIssue::newDatabaseConnectionIssue(
+        $database_exception);
+      $response = PhabricatorSetupCheck::newIssueResponse($issue);
+      return self::writeResponse($sink, $response);
+    }
 
     $multimeter->setSampleRate(
       PhabricatorEnv::getEnvConfig('debug.sample-rate'));
@@ -111,9 +124,7 @@ public static function runHTTPRequest(AphrontHTTPSink $sink) {
 
     $response = PhabricatorSetupCheck::willProcessRequest();
     if ($response) {
-      PhabricatorStartup::endOutputCapture();
-      $sink->writeResponse($response);
-      return;
+      return self::writeResponse($sink, $response);
     }
 
     $host = AphrontRequest::getHTTPHeader('Host');
@@ -256,31 +267,7 @@ public function processRequest(
       $response = $controller->willSendResponse($response);
       $response->setRequest($request);
 
-      $unexpected_output = PhabricatorStartup::endOutputCapture();
-      if ($unexpected_output) {
-        $unexpected_output = pht(
-          "Unexpected output:\n\n%s",
-          $unexpected_output);
-
-        phlog($unexpected_output);
-
-        if ($response instanceof AphrontWebpageResponse) {
-          echo phutil_tag(
-            'div',
-            array(
-              'style' =>
-                'background: #eeddff;'.
-                'white-space: pre-wrap;'.
-                'z-index: 200000;'.
-                'position: relative;'.
-                'padding: 8px;'.
-                'font-family: monospace',
-            ),
-            $unexpected_output);
-        }
-      }
-
-      $sink->writeResponse($response);
+      self::writeResponse($sink, $response);
     } catch (Exception $ex) {
       if ($original_exception) {
         throw $original_exception;
@@ -291,6 +278,37 @@ public function processRequest(
     return $response;
   }
 
+  private static function writeResponse(
+    AphrontHTTPSink $sink,
+    AphrontResponse $response) {
+
+    $unexpected_output = PhabricatorStartup::endOutputCapture();
+    if ($unexpected_output) {
+      $unexpected_output = pht(
+        "Unexpected output:\n\n%s",
+        $unexpected_output);
+
+      phlog($unexpected_output);
+
+      if ($response instanceof AphrontWebpageResponse) {
+        echo phutil_tag(
+          'div',
+          array(
+            'style' =>
+              'background: #eeddff;'.
+              'white-space: pre-wrap;'.
+              'z-index: 200000;'.
+              'position: relative;'.
+              'padding: 8px;'.
+              'font-family: monospace',
+          ),
+          $unexpected_output);
+      }
+    }
+
+    $sink->writeResponse($response);
+  }
+
 
 /* -(  URI Routing  )-------------------------------------------------------- */
 
diff --git a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
index b99cd37adc..fd318a5fa1 100644
--- a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
+++ b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
@@ -23,21 +23,17 @@ protected function executeChecks() {
 
     try {
       queryfx($conn_raw, 'SELECT 1');
+      $database_exception = null;
+    } catch (AphrontInvalidCredentialsQueryException $ex) {
+      $database_exception = $ex;
     } catch (AphrontConnectionQueryException $ex) {
-      $message = pht(
-        "Unable to connect to MySQL!\n\n".
-        "%s\n\n".
-        "Make sure Phabricator and MySQL are correctly configured.",
-        $ex->getMessage());
+      $database_exception = $ex;
+    }
 
-      $this->newIssue('mysql.connect')
-        ->setName(pht('Can Not Connect to MySQL'))
-        ->setMessage($message)
-        ->setIsFatal(true)
-        ->addRelatedPhabricatorConfig('mysql.host')
-        ->addRelatedPhabricatorConfig('mysql.port')
-        ->addRelatedPhabricatorConfig('mysql.user')
-        ->addRelatedPhabricatorConfig('mysql.pass');
+    if ($database_exception) {
+      $issue = PhabricatorSetupIssue::newDatabaseConnectionIssue(
+        $database_exception);
+      $this->addIssue($issue);
       return;
     }
 
diff --git a/src/applications/config/check/PhabricatorSetupCheck.php b/src/applications/config/check/PhabricatorSetupCheck.php
index b1f79bdd47..ad779ed63f 100644
--- a/src/applications/config/check/PhabricatorSetupCheck.php
+++ b/src/applications/config/check/PhabricatorSetupCheck.php
@@ -147,7 +147,7 @@ final public static function willPreflightRequest() {
     return null;
   }
 
-  private static function newIssueResponse(PhabricatorSetupIssue $issue) {
+  public static function newIssueResponse(PhabricatorSetupIssue $issue) {
     $view = id(new PhabricatorSetupIssueView())
       ->setIssue($issue);
 
diff --git a/src/applications/config/issue/PhabricatorSetupIssue.php b/src/applications/config/issue/PhabricatorSetupIssue.php
index 1c2ff0f99b..53bab14a85 100644
--- a/src/applications/config/issue/PhabricatorSetupIssue.php
+++ b/src/applications/config/issue/PhabricatorSetupIssue.php
@@ -20,6 +20,26 @@ final class PhabricatorSetupIssue extends Phobject {
   private $originalPHPConfigValues = array();
   private $links;
 
+  public static function newDatabaseConnectionIssue(
+    AphrontQueryException $ex) {
+
+    $message = pht(
+      "Unable to connect to MySQL!\n\n".
+      "%s\n\n".
+      "Make sure Phabricator and MySQL are correctly configured.",
+      $ex->getMessage());
+
+    return id(new self())
+      ->setIssueKey('mysql.connect')
+      ->setName(pht('Can Not Connect to MySQL'))
+      ->setMessage($message)
+      ->setIsFatal(true)
+      ->addRelatedPhabricatorConfig('mysql.host')
+      ->addRelatedPhabricatorConfig('mysql.port')
+      ->addRelatedPhabricatorConfig('mysql.user')
+      ->addRelatedPhabricatorConfig('mysql.pass');
+  }
+
   public function addCommand($command) {
     $this->commands[] = $command;
     return $this;

From 32a580c720e31b0e4d7c5e8846870e8ce9fe3978 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Sep 2016 13:20:31 -0700
Subject: [PATCH 044/865] (stable) Continue on bad database configuration from
 select scripts

Summary: Ref T11589. Provide a way for scripts to say "just continue if database config fails", and use it in `bin/config` and `bin/storage`.

Test Plan:
  - Broke database config.
  - Ran `bin/config`, worked fine.
  - Ran `bin/storage`, got helpful "set up the database" message.
  - Ran `bin/repository`, got fatal.
  - Ran normal site with valid/invalid config, got proper feedback.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11589

Differential Revision: https://secure.phabricator.com/D16502
---
 scripts/__init_script__.php               | 23 +----------------------
 scripts/init/init-script.php              | 10 ++++++++++
 scripts/init/init-setup.php               | 12 ++++++++++++
 scripts/init/lib.php                      | 23 +++++++++++++++++++++++
 scripts/setup/manage_config.php           |  2 +-
 scripts/sql/manage_storage.php            |  2 +-
 src/infrastructure/env/PhabricatorEnv.php | 20 ++++++++++++++------
 7 files changed, 62 insertions(+), 30 deletions(-)
 create mode 100644 scripts/init/init-script.php
 create mode 100644 scripts/init/init-setup.php
 create mode 100644 scripts/init/lib.php

diff --git a/scripts/__init_script__.php b/scripts/__init_script__.php
index 57ada96e64..b807ae68a4 100644
--- a/scripts/__init_script__.php
+++ b/scripts/__init_script__.php
@@ -1,24 +1,3 @@
 <?php
 
-function init_phabricator_script() {
-  error_reporting(E_ALL | E_STRICT);
-  ini_set('display_errors', 1);
-
-  $include_path = ini_get('include_path');
-  ini_set(
-    'include_path',
-    $include_path.PATH_SEPARATOR.dirname(__FILE__).'/../../');
-  @include_once 'libphutil/scripts/__init_script__.php';
-  if (!@constant('__LIBPHUTIL__')) {
-    echo "ERROR: Unable to load libphutil. Update your PHP 'include_path' to ".
-      "include the parent directory of libphutil/.\n";
-    exit(1);
-  }
-
-  phutil_load_library('arcanist/src');
-  phutil_load_library(dirname(__FILE__).'/../src/');
-
-  PhabricatorEnv::initializeScriptEnvironment();
-}
-
-init_phabricator_script();
+require_once dirname(__FILE__).'/init/init-script.php';
diff --git a/scripts/init/init-script.php b/scripts/init/init-script.php
new file mode 100644
index 0000000000..295e4b53cb
--- /dev/null
+++ b/scripts/init/init-script.php
@@ -0,0 +1,10 @@
+<?php
+
+// Initialize a standard script.
+
+require_once dirname(__FILE__).'/lib.php';
+
+init_phabricator_script(
+  array(
+    'config.optional' => false,
+  ));
diff --git a/scripts/init/init-setup.php b/scripts/init/init-setup.php
new file mode 100644
index 0000000000..fea975830d
--- /dev/null
+++ b/scripts/init/init-setup.php
@@ -0,0 +1,12 @@
+<?php
+
+// Initialize a setup script which may run before database connections have
+// been configured. Scripts initialized in this way ignore database errors
+// while building database configuration and continue.
+
+require_once dirname(__FILE__).'/lib.php';
+
+init_phabricator_script(
+  array(
+    'config.optional' => true,
+  ));
diff --git a/scripts/init/lib.php b/scripts/init/lib.php
new file mode 100644
index 0000000000..431d2c1373
--- /dev/null
+++ b/scripts/init/lib.php
@@ -0,0 +1,23 @@
+<?php
+
+function init_phabricator_script(array $options) {
+  error_reporting(E_ALL | E_STRICT);
+  ini_set('display_errors', 1);
+
+  $include_path = ini_get('include_path');
+  ini_set(
+    'include_path',
+    $include_path.PATH_SEPARATOR.dirname(__FILE__).'/../../../');
+  @include_once 'libphutil/scripts/__init_script__.php';
+  if (!@constant('__LIBPHUTIL__')) {
+    echo "ERROR: Unable to load libphutil. Update your PHP 'include_path' to ".
+      "include the parent directory of libphutil/.\n";
+    exit(1);
+  }
+
+  phutil_load_library('arcanist/src');
+  phutil_load_library(dirname(__FILE__).'/../../src/');
+
+  $config_optional = $options['config.optional'];
+  PhabricatorEnv::initializeScriptEnvironment($config_optional);
+}
diff --git a/scripts/setup/manage_config.php b/scripts/setup/manage_config.php
index a8d73e50c2..e33da20244 100755
--- a/scripts/setup/manage_config.php
+++ b/scripts/setup/manage_config.php
@@ -2,7 +2,7 @@
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once $root.'/scripts/init/init-setup.php';
 
 $args = new PhutilArgumentParser($argv);
 $args->setTagline(pht('manage configuration'));
diff --git a/scripts/sql/manage_storage.php b/scripts/sql/manage_storage.php
index 7ad94277f7..2ba1e9920c 100755
--- a/scripts/sql/manage_storage.php
+++ b/scripts/sql/manage_storage.php
@@ -2,7 +2,7 @@
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once $root.'/scripts/init/init-setup.php';
 
 $args = new PhutilArgumentParser($argv);
 $args->setTagline(pht('manage Phabricator storage and schemata'));
diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php
index 221d553d2b..7ea00957ff 100644
--- a/src/infrastructure/env/PhabricatorEnv.php
+++ b/src/infrastructure/env/PhabricatorEnv.php
@@ -68,11 +68,11 @@ final class PhabricatorEnv extends Phobject {
    * @phutil-external-symbol class PhabricatorStartup
    */
   public static function initializeWebEnvironment() {
-    self::initializeCommonEnvironment();
+    self::initializeCommonEnvironment(false);
   }
 
-  public static function initializeScriptEnvironment() {
-    self::initializeCommonEnvironment();
+  public static function initializeScriptEnvironment($config_optional) {
+    self::initializeCommonEnvironment($config_optional);
 
     // NOTE: This is dangerous in general, but we know we're in a script context
     // and are not vulnerable to CSRF.
@@ -88,11 +88,11 @@ public static function initializeScriptEnvironment() {
   }
 
 
-  private static function initializeCommonEnvironment() {
+  private static function initializeCommonEnvironment($config_optional) {
     PhutilErrorHandler::initialize();
 
     self::resetUmask();
-    self::buildConfigurationSourceStack();
+    self::buildConfigurationSourceStack($config_optional);
 
     // Force a valid timezone. If both PHP and Phabricator configuration are
     // invalid, use UTC.
@@ -174,7 +174,7 @@ public static function setLocaleCode($locale_code) {
     }
   }
 
-  private static function buildConfigurationSourceStack() {
+  private static function buildConfigurationSourceStack($config_optional) {
     self::dropConfigCache();
 
     $stack = new PhabricatorConfigStackSource();
@@ -235,6 +235,14 @@ private static function buildConfigurationSourceStack() {
       // If the database is not available, just skip this configuration
       // source. This happens during `bin/storage upgrade`, `bin/conf` before
       // schema setup, etc.
+    } catch (AphrontConnectionQueryException $ex) {
+      if (!$config_optional) {
+        throw $ex;
+      }
+    } catch (AphrontInvalidCredentialsQueryException $ex) {
+      if (!$config_optional) {
+        throw $ex;
+      }
     }
   }
 

From 699ba2d4abedae09f31217f468ea9bda6ece9172 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Sep 2016 14:43:00 -0700
Subject: [PATCH 045/865] (stable) Just fatal for any setting of open_basedir

Summary:
Fixes T11627.

Beyond being complex, I have no real reason to believe these checks even work (and they don't test repositories, file storage, logfiles, etc).

Test Plan:
Faked the error:

{F1813433}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11627

Differential Revision: https://secure.phabricator.com/D16544
---
 .../PhabricatorPHPPreflightSetupCheck.php     | 96 ++++---------------
 1 file changed, 17 insertions(+), 79 deletions(-)

diff --git a/src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php b/src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php
index 65a582b29c..82a13438d8 100644
--- a/src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php
+++ b/src/applications/config/check/PhabricatorPHPPreflightSetupCheck.php
@@ -113,89 +113,27 @@ protected function executeChecks() {
     }
 
     $open_basedir = ini_get('open_basedir');
-    if ($open_basedir) {
+    if (strlen($open_basedir)) {
+      // If `open_basedir` is set, just fatal. It's technically possible for
+      // us to run with certain values of `open_basedir`, but: we can only
+      // raise fatal errors from preflight steps, so we'd have to do this check
+      // in two parts to support fatal and advisory versions; it's much simpler
+      // to just fatal instead of trying to test all the different things we
+      // may need to access in the filesystem; and use of this option seems
+      // rare (particularly in supported environments).
 
-      // 'open_basedir' restricts which files we're allowed to access with
-      // file operations. This might be okay -- we don't need to write to
-      // arbitrary places in the filesystem -- but we need to access certain
-      // resources. This setting is unlikely to be providing any real measure
-      // of security so warn even if things look OK.
-
-      $failures = array();
-
-      try {
-        $open_libphutil = class_exists('Future');
-      } catch (Exception $ex) {
-        $failures[] = $ex->getMessage();
-      }
-
-      try {
-        $open_arcanist = class_exists('ArcanistDiffParser');
-      } catch (Exception $ex) {
-        $failures[] = $ex->getMessage();
-      }
-
-      $open_urandom = false;
-      try {
-        Filesystem::readRandomBytes(1);
-        $open_urandom = true;
-      } catch (FilesystemException $ex) {
-        $failures[] = $ex->getMessage();
-      }
-
-      try {
-        $tmp = new TempFile();
-        file_put_contents($tmp, '.');
-        $open_tmp = @fopen((string)$tmp, 'r');
-        if (!$open_tmp) {
-          $failures[] = pht(
-            "Unable to read temporary file '%s'.",
-            (string)$tmp);
-        }
-      } catch (Exception $ex) {
-        $message = $ex->getMessage();
-        $dir = sys_get_temp_dir();
-        $failures[] = pht(
-          "Unable to open temp files from '%s': %s",
-          $dir,
-          $message);
-      }
+      $message = pht(
+        "Your server is configured with '%s', which prevents Phabricator ".
+        "from opening files it requires access to.\n\n".
+        "Disable this setting to continue.",
+        'open_basedir');
 
       $issue = $this->newIssue('php.open_basedir')
         ->setName(pht('Disable PHP %s', 'open_basedir'))
-        ->addPHPConfig('open_basedir');
-
-      if ($failures) {
-        $message = pht(
-          "Your server is configured with '%s', which prevents Phabricator ".
-          "from opening files it requires access to.\n\n".
-          "Disable this setting to continue.\n\nFailures:\n\n%s",
-          'open_basedir',
-          implode("\n\n", $failures));
-
-        $issue
-          ->setIsFatal(true)
-          ->setMessage($message);
-
-        return;
-      } else {
-        $summary = pht(
-          "You have '%s' configured in your PHP settings, which ".
-          "may cause some features to fail.",
-          'open_basedir');
-
-        $message = pht(
-          "You have '%s' configured in your PHP settings. Although this ".
-          "setting appears permissive enough that Phabricator will work ".
-          "properly, you may still run into problems because of it.\n\n".
-          "Consider disabling '%s'.",
-          'open_basedir',
-          'open_basedir');
-
-        $issue
-          ->setSummary($summary)
-          ->setMessage($message);
-      }
+        ->addPHPConfig('open_basedir')
+        ->setIsFatal(true)
+        ->setMessage($message);
     }
+
   }
 }

From 554940b33f4fbe1a56a74a50c2159cd8fbb2c485 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 19 Sep 2016 16:20:33 -0700
Subject: [PATCH 046/865] (stable) Retain repository update cooldowns across
 daemon restarts

Summary:
Ref T11665. Fixes T7865. When we restart the daemons, the repository pull daemon currently resets the cooldowns on all of its pulls. This can generate a burst of initial load when restarting a lot of instance daemons (as in the Phacility cluster), described in T7865. This smooths things out so that recent pulls are considered, and any repositories which were waiting keep waiting.

Somewhat counterintuitively, hosted repositories write `TYPE_FETCH` status messages, so this should work equally well for hosted and observed repositories.

This also paves the way for better backoff behavior on repository errors, described in T11665. The error backoff now uses the same logic that the standard backoff does. The next change will make backoff computation consider recent errors.

(This is technically too large for repositories which have encountered one error and have a low commit rate, but I'll fix that in the following change; this is just a checkpoint on the way there.)

Test Plan: Ran `bin/phd debug pull`, saw the daemon compute reasonable windows based on previous pull activity.

Reviewers: chad

Maniphest Tasks: T7865, T11665

Differential Revision: https://secure.phabricator.com/D16574
---
 .../PhabricatorRepositoryPullLocalDaemon.php  | 99 ++++++++++++++-----
 .../storage/PhabricatorRepository.php         |  2 +-
 2 files changed, 73 insertions(+), 28 deletions(-)

diff --git a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
index bbd73d2d90..9cbb8db8e9 100644
--- a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
+++ b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
@@ -102,44 +102,59 @@ protected function run() {
         $retry_after,
         array_keys($pullable));
 
-
       // Figure out which repositories we need to queue for an update.
       foreach ($pullable as $id => $repository) {
-        $monogram = $repository->getMonogram();
+        $now = PhabricatorTime::getNow();
+        $display_name = $repository->getDisplayName();
 
         if (isset($futures[$id])) {
-          $this->log(pht('Repository "%s" is currently updating.', $monogram));
+          $this->log(
+            pht(
+              'Repository "%s" is currently updating.',
+              $display_name));
           continue;
         }
 
         if (isset($queue[$id])) {
-          $this->log(pht('Repository "%s" is already queued.', $monogram));
-          continue;
-        }
-
-        $after = idx($retry_after, $id, 0);
-        if ($after > time()) {
           $this->log(
             pht(
-              'Repository "%s" is not due for an update for %s second(s).',
-              $monogram,
-              new PhutilNumber($after - time())));
+              'Repository "%s" is already queued.',
+              $display_name));
           continue;
         }
 
+        $after = idx($retry_after, $id);
         if (!$after) {
+          $smart_wait = $repository->loadUpdateInterval($min_sleep);
+          $last_update = $this->loadLastUpdate($repository);
+
+          $after = $last_update + $smart_wait;
+          $retry_after[$id] = $after;
+
           $this->log(
             pht(
-              'Scheduling repository "%s" for an initial update.',
-              $monogram));
-        } else {
+              'Scheduling repository "%s" with an update window of %s '.
+              'second(s). Last update was %s second(s) ago.',
+              $display_name,
+              new PhutilNumber($smart_wait),
+              new PhutilNumber($now - $last_update)));
+        }
+
+        if ($after > time()) {
           $this->log(
             pht(
-              'Scheduling repository "%s" for an update (%s seconds overdue).',
-              $monogram,
-              new PhutilNumber(time() - $after)));
+              'Repository "%s" is not due for an update for %s second(s).',
+              $display_name,
+              new PhutilNumber($after - $now)));
+          continue;
         }
 
+        $this->log(
+          pht(
+            'Scheduling repository "%s" for an update (%s seconds overdue).',
+            $display_name,
+            new PhutilNumber($now - $after)));
+
         $queue[$id] = $after;
       }
 
@@ -157,8 +172,11 @@ protected function run() {
             continue;
           }
 
-          $monogram = $repository->getMonogram();
-          $this->log(pht('Starting update for repository "%s".', $monogram));
+          $display_name = $repository->getDisplayName();
+          $this->log(
+            pht(
+              'Starting update for repository "%s".',
+              $display_name));
 
           unset($queue[$id]);
           $futures[$id] = $this->buildUpdateFuture(
@@ -296,6 +314,32 @@ private function loadRepositoryUpdateMessages($consume = false) {
   }
 
 
+  /**
+   * @task pull
+   */
+  private function loadLastUpdate(PhabricatorRepository $repository) {
+    $table = new PhabricatorRepositoryStatusMessage();
+    $conn = $table->establishConnection('r');
+
+    $epoch = queryfx_one(
+      $conn,
+      'SELECT MAX(epoch) last_update FROM %T
+        WHERE repositoryID = %d
+          AND statusType IN (%Ls)',
+      $table->getTableName(),
+      $repository->getID(),
+      array(
+        PhabricatorRepositoryStatusMessage::TYPE_INIT,
+        PhabricatorRepositoryStatusMessage::TYPE_FETCH,
+      ));
+
+    if ($epoch) {
+      return (int)$epoch['last_update'];
+    }
+
+    return PhabricatorTime::getNow();
+  }
+
   /**
    * @task pull
    */
@@ -385,9 +429,9 @@ private function resolveUpdateFuture(
     ExecFuture $future,
     $min_sleep) {
 
-    $monogram = $repository->getMonogram();
+    $display_name = $repository->getDisplayName();
 
-    $this->log(pht('Resolving update for "%s".', $monogram));
+    $this->log(pht('Resolving update for "%s".', $display_name));
 
     try {
       list($stdout, $stderr) = $future->resolvex();
@@ -395,17 +439,18 @@ private function resolveUpdateFuture(
       $proxy = new PhutilProxyException(
         pht(
           'Error while updating the "%s" repository.',
-          $repository->getMonogram()),
+          $display_name),
         $ex);
       phlog($proxy);
 
-      return time() + $min_sleep;
+      $smart_wait = $repository->loadUpdateInterval($min_sleep);
+      return PhabricatorTime::getNow() + $smart_wait;
     }
 
     if (strlen($stderr)) {
       $stderr_msg = pht(
         'Unexpected output while updating repository "%s": %s',
-        $monogram,
+        $display_name,
         $stderr);
       phlog($stderr_msg);
     }
@@ -416,10 +461,10 @@ private function resolveUpdateFuture(
       pht(
         'Based on activity in repository "%s", considering a wait of %s '.
         'seconds before update.',
-        $repository->getMonogram(),
+        $display_name,
         new PhutilNumber($smart_wait)));
 
-    return time() + $smart_wait;
+    return PhabricatorTime::getNow() + $smart_wait;
   }
 
 
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 3e59c7c53d..3ab3912f2c 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1783,7 +1783,7 @@ public function loadUpdateInterval($minimum = 15) {
       $smart_wait = $minimum;
     }
 
-    return $smart_wait;
+    return (int)$smart_wait;
   }
 
 

From 894d0dc51bc3dcb3998d2c86eb62e83d3e4c741e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 19 Sep 2016 17:01:59 -0700
Subject: [PATCH 047/865] (stable) When repositories hit pull errors, stop
 updating them as frequently

Summary:
Ref T11665. Currently, when a repository hits an error, we retry it after 15s. This is correct if the error was temporary/transient/config-related (e.g., bad network or administrator setting up credentials) but not so great if the error is long-lasting (completely bad authentication, invalid URI, etc), as it can pile up to a meaningful amount of unnecessary load over time.

Instead, record how many times in a row we've hit an error and adjust backoff behavior: first error is 15s, then 30s, 45s, etc.

Additionally, when computing the backoff for an empty repository, use the repository creation time as though it was the most recent commit. This is a good proxy which gives us reasonable backoff behavior.

This required removing the `CODE_WORKING` messages, since they would have reset the error count. We could restore them (as a different type of message), but I think they aren't particularly useful since cloning usually doesn't take too long and there's more status information avilable now than there was when this stuff was written.

Test Plan:
  - Ran `bin/phd debug pull`.
  - Saw sensible, increasing backoffs selected for repositories with errors.
  - Saw sensible backoffs selected for empty repositories.

Reviewers: chad

Maniphest Tasks: T11665

Differential Revision: https://secure.phabricator.com/D16575
---
 .../20160919.repo.messagecount.sql            |  2 +
 ...ffusionRepositoryStatusManagementPanel.php |  9 +-
 .../PhabricatorRepositoryPullEngine.php       |  2 -
 .../storage/PhabricatorRepository.php         | 90 ++++++++++++++-----
 .../PhabricatorRepositoryStatusMessage.php    |  3 +-
 5 files changed, 71 insertions(+), 35 deletions(-)
 create mode 100644 resources/sql/autopatches/20160919.repo.messagecount.sql

diff --git a/resources/sql/autopatches/20160919.repo.messagecount.sql b/resources/sql/autopatches/20160919.repo.messagecount.sql
new file mode 100644
index 0000000000..a28bbb1e7e
--- /dev/null
+++ b/resources/sql/autopatches/20160919.repo.messagecount.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_statusmessage
+  ADD messageCount INT UNSIGNED NOT NULL;
diff --git a/src/applications/diffusion/management/DiffusionRepositoryStatusManagementPanel.php b/src/applications/diffusion/management/DiffusionRepositoryStatusManagementPanel.php
index 573162b927..0fb220c385 100644
--- a/src/applications/diffusion/management/DiffusionRepositoryStatusManagementPanel.php
+++ b/src/applications/diffusion/management/DiffusionRepositoryStatusManagementPanel.php
@@ -359,20 +359,13 @@ private function buildRepositoryStatus(
                 return $view;
               }
             break;
-          case PhabricatorRepositoryStatusMessage::CODE_WORKING:
+          default:
             $view->addItem(
               id(new PHUIStatusItemView())
                 ->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green')
                 ->setTarget(pht('Initializing Working Copy'))
                 ->setNote(pht('Daemons are initializing the working copy.')));
             return $view;
-          default:
-            $view->addItem(
-              id(new PHUIStatusItemView())
-                ->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
-                ->setTarget(pht('Unknown Init Status'))
-                ->setNote($message->getStatusCode()));
-            return $view;
         }
       } else {
         $view->addItem(
diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
index 08fe8ea224..d7a403acf8 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
@@ -172,8 +172,6 @@ private function abortPull($message, Exception $ex = null) {
   }
 
   private function logPull($message) {
-    $code_working = PhabricatorRepositoryStatusMessage::CODE_WORKING;
-    $this->updateRepositoryInitStatus($code_working, $message);
     $this->log('%s', $message);
   }
 
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 3ab3912f2c..ee8e0ad54d 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1649,21 +1649,33 @@ public function writeStatusMessage(
         $this->getID(),
         $status_type);
     } else {
+      // If the existing message has the same code (e.g., we just hit an
+      // error and also previously hit an error) we increment the message
+      // count by 1. This allows us to determine how many times in a row
+      // we've run into an error.
+
       queryfx(
         $conn_w,
         'INSERT INTO %T
-          (repositoryID, statusType, statusCode, parameters, epoch)
-          VALUES (%d, %s, %s, %s, %d)
+          (repositoryID, statusType, statusCode, parameters, epoch,
+            messageCount)
+          VALUES (%d, %s, %s, %s, %d, %d)
           ON DUPLICATE KEY UPDATE
             statusCode = VALUES(statusCode),
             parameters = VALUES(parameters),
-            epoch = VALUES(epoch)',
+            epoch = VALUES(epoch),
+            messageCount =
+              IF(
+                statusCode = VALUES(statusCode),
+                messageCount + 1,
+                VALUES(messageCount))',
         $table_name,
         $this->getID(),
         $status_type,
         $status_code,
         json_encode($parameters),
-        time());
+        time(),
+        1);
     }
 
     return $this;
@@ -1738,6 +1750,33 @@ public static function assertValidRemoteURI($uri) {
    * @return  int   Repository update interval, in seconds.
    */
   public function loadUpdateInterval($minimum = 15) {
+    // First, check if we've hit errors recently. If we have, wait one period
+    // for each consecutive error. Normally, this corresponds to a backoff of
+    // 15s, 30s, 45s, etc.
+
+    $message_table = new PhabricatorRepositoryStatusMessage();
+    $conn = $message_table->establishConnection('r');
+    $error_count = queryfx_one(
+      $conn,
+      'SELECT MAX(messageCount) error_count FROM %T
+        WHERE repositoryID = %d
+        AND statusType IN (%Ls)
+        AND statusCode IN (%Ls)',
+      $message_table->getTableName(),
+      $this->getID(),
+      array(
+        PhabricatorRepositoryStatusMessage::TYPE_INIT,
+        PhabricatorRepositoryStatusMessage::TYPE_FETCH,
+      ),
+      array(
+        PhabricatorRepositoryStatusMessage::CODE_ERROR,
+      ));
+
+    $error_count = (int)$error_count['error_count'];
+    if ($error_count > 0) {
+      return (int)($minimum * $error_count);
+    }
+
     // If a repository is still importing, always pull it as frequently as
     // possible. This prevents us from hanging for a long time at 99.9% when
     // importing an inactive repository.
@@ -1758,31 +1797,34 @@ public function loadUpdateInterval($minimum = 15) {
       $window_start);
     if ($last_commit) {
       $time_since_commit = ($window_start - $last_commit['epoch']);
+    } else {
+      // If the repository has no commits, treat the creation date as
+      // though it were the date of the last commit. This makes empty
+      // repositories update quickly at first but slow down over time
+      // if they don't see any activity.
+      $time_since_commit = ($window_start - $this->getDateCreated());
+    }
 
-      $last_few_days = phutil_units('3 days in seconds');
-
-      if ($time_since_commit <= $last_few_days) {
-        // For repositories with activity in the recent past, we wait one
-        // extra second for every 10 minutes since the last commit. This
-        // shorter backoff is intended to handle weekends and other short
-        // breaks from development.
-        $smart_wait = ($time_since_commit / 600);
-      } else {
-        // For repositories without recent activity, we wait one extra second
-        // for every 4 minutes since the last commit. This longer backoff
-        // handles rarely used repositories, up to the maximum.
-        $smart_wait = ($time_since_commit / 240);
-      }
-
-      // We'll never wait more than 6 hours to pull a repository.
-      $longest_wait = phutil_units('6 hours in seconds');
-      $smart_wait = min($smart_wait, $longest_wait);
+    $last_few_days = phutil_units('3 days in seconds');
 
-      $smart_wait = max($minimum, $smart_wait);
+    if ($time_since_commit <= $last_few_days) {
+      // For repositories with activity in the recent past, we wait one
+      // extra second for every 10 minutes since the last commit. This
+      // shorter backoff is intended to handle weekends and other short
+      // breaks from development.
+      $smart_wait = ($time_since_commit / 600);
     } else {
-      $smart_wait = $minimum;
+      // For repositories without recent activity, we wait one extra second
+      // for every 4 minutes since the last commit. This longer backoff
+      // handles rarely used repositories, up to the maximum.
+      $smart_wait = ($time_since_commit / 240);
     }
 
+    // We'll never wait more than 6 hours to pull a repository.
+    $longest_wait = phutil_units('6 hours in seconds');
+    $smart_wait = min($smart_wait, $longest_wait);
+    $smart_wait = max($minimum, $smart_wait);
+
     return (int)$smart_wait;
   }
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryStatusMessage.php b/src/applications/repository/storage/PhabricatorRepositoryStatusMessage.php
index 79d75cc50c..a9a1b1ae8c 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryStatusMessage.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryStatusMessage.php
@@ -8,7 +8,6 @@ final class PhabricatorRepositoryStatusMessage
   const TYPE_NEEDS_UPDATE = 'needs-update';
 
   const CODE_ERROR = 'error';
-  const CODE_WORKING = 'working';
   const CODE_OKAY = 'okay';
 
   protected $repositoryID;
@@ -16,6 +15,7 @@ final class PhabricatorRepositoryStatusMessage
   protected $statusCode;
   protected $parameters = array();
   protected $epoch;
+  protected $messageCount;
 
   protected function getConfiguration() {
     return array(
@@ -26,6 +26,7 @@ protected function getConfiguration() {
       self::CONFIG_COLUMN_SCHEMA => array(
         'statusType' => 'text32',
         'statusCode' => 'text32',
+        'messageCount' => 'uint32',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'repositoryID' => array(

From a768a252af3b3b278f2fc055ade3880d7fcb9c41 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 19 Sep 2016 19:43:24 -0700
Subject: [PATCH 048/865] (stable) Add a default value for messageCount so
 writes from old tiers survive the update query

Auditors: chad
---
 resources/sql/autopatches/20160919.repo.messagedefault.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 resources/sql/autopatches/20160919.repo.messagedefault.sql

diff --git a/resources/sql/autopatches/20160919.repo.messagedefault.sql b/resources/sql/autopatches/20160919.repo.messagedefault.sql
new file mode 100644
index 0000000000..0c8b84d44a
--- /dev/null
+++ b/resources/sql/autopatches/20160919.repo.messagedefault.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_statusmessage
+  CHANGE messageCount messageCount INT UNSIGNED NOT NULL DEFAULT 0;

From 25eea83bc05f17fb5f928f5bfbb4c746eecd1998 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 20 Sep 2016 05:57:52 -0700
Subject: [PATCH 049/865] (stable) Stop doing an excessive amount of work in
 `diffusion.rawdiffquery`

Ref T11665.

Without `-n 1`, this logs the ENTIRE history of the repository. We
actually get the right result, but this is egregiously slow. Add `-n 1`
to return only one result.

It appears that I wrote this wrong way back in 2011, in D953. This
query is rarely used (until recently) which is likely why it has
escaped notice for so long.

Test Plan: Used Conduit console to execute `diffusion.rawdiffquery`.
Got the same results but spent 8ms instead of 200ms executing this
command, in a very small repository.
---
 .../diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
index 18e5a9ec9a..41d91c00ca 100644
--- a/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
+++ b/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
@@ -23,7 +23,7 @@ protected function newQueryFuture() {
       // Check if this is the root commit by seeing if it has parents, since
       // `git diff X^ X` does not work if "X" is the initial commit.
       list($parents) = $repository->execxLocalCommand(
-        'log --format=%s %s --',
+        'log -n 1 --format=%s %s --',
         '%P',
         $commit);
 

From 921aab604ec759f2af997faf9b3822ce0e4ee340 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Sep 2016 14:49:30 -0700
Subject: [PATCH 050/865] (stable) Fix an issue where repository message counts
 would never reset

Summary:
Fixes T11705. I did not realize that `ON DUPLICATE KEY UPDATE` was order-dependent, so the "reset" clause of this `IF(...)` never actually worked.

Reorder it so we check if we're changing the message type //first//, then actually change the message type.

This makes the count reset properly when a failing repository succeeds, or a working repository fails.

Test Plan:
  - On `master`, forced a working repository to fail a `bin/repository update`, saw the message change types (expected) but keep the old count (wrong!).
  - With this patch, repeated the process and saw the count reset properly.
  - Ran the patch, verified counts reset to 0.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11705

Differential Revision: https://secure.phabricator.com/D16623
---
 .../autopatches/20160928.repo.messagecount.sql |  4 ++++
 .../storage/PhabricatorRepository.php          | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 resources/sql/autopatches/20160928.repo.messagecount.sql

diff --git a/resources/sql/autopatches/20160928.repo.messagecount.sql b/resources/sql/autopatches/20160928.repo.messagecount.sql
new file mode 100644
index 0000000000..e02b257c72
--- /dev/null
+++ b/resources/sql/autopatches/20160928.repo.messagecount.sql
@@ -0,0 +1,4 @@
+/* Reset message counts to fix the bug in T11705 which caused some of them to
+   become very large. */
+UPDATE {$NAMESPACE}_repository.repository_statusmessage
+  SET messageCount = 0;
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index ee8e0ad54d..c27f562864 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1651,8 +1651,12 @@ public function writeStatusMessage(
     } else {
       // If the existing message has the same code (e.g., we just hit an
       // error and also previously hit an error) we increment the message
-      // count by 1. This allows us to determine how many times in a row
-      // we've run into an error.
+      // count. This allows us to determine how many times in a row we've
+      // run into an error.
+
+      // NOTE: The assignments in "ON DUPLICATE KEY UPDATE" are evaluated
+      // in order, so the "messageCount" assignment must occur before the
+      // "statusCode" assignment. See T11705.
 
       queryfx(
         $conn_w,
@@ -1661,14 +1665,14 @@ public function writeStatusMessage(
             messageCount)
           VALUES (%d, %s, %s, %s, %d, %d)
           ON DUPLICATE KEY UPDATE
-            statusCode = VALUES(statusCode),
-            parameters = VALUES(parameters),
-            epoch = VALUES(epoch),
             messageCount =
               IF(
                 statusCode = VALUES(statusCode),
-                messageCount + 1,
-                VALUES(messageCount))',
+                messageCount + VALUES(messageCount),
+                VALUES(messageCount)),
+            statusCode = VALUES(statusCode),
+            parameters = VALUES(parameters),
+            epoch = VALUES(epoch)',
         $table_name,
         $this->getID(),
         $status_type,

From 8a3d6071a026774cd5de4f6a8d9c51bd22de1b22 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 13 Nov 2016 16:29:33 -0800
Subject: [PATCH 051/865] (stable) Allow bin/aphlict to start without a valid
 database connection

Summary:
Ref T11818. See that task for a description.

This is like a tiny pinch of hackiness but not really unreasonable. Basically, `aphlict` is already an "uber-server" and one copy can handle a ton of instances.

Test Plan: Started `bin/aphlict` without a valid database connection.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11818

Differential Revision: https://secure.phabricator.com/D16854
---
 scripts/init/init-aphlict.php               | 10 ++++++++++
 support/aphlict/server/aphlict_launcher.php |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 scripts/init/init-aphlict.php

diff --git a/scripts/init/init-aphlict.php b/scripts/init/init-aphlict.php
new file mode 100644
index 0000000000..e2029a0d2a
--- /dev/null
+++ b/scripts/init/init-aphlict.php
@@ -0,0 +1,10 @@
+<?php
+
+require_once dirname(__FILE__).'/lib.php';
+
+init_phabricator_script(
+  array(
+    // NOTE: We allow aphlict to start with no database, because it's
+    // reasonable to isolate the notification server from other hosts.
+    'config.optional' => true,
+  ));
diff --git a/support/aphlict/server/aphlict_launcher.php b/support/aphlict/server/aphlict_launcher.php
index f6173fbd6d..af644c58a1 100755
--- a/support/aphlict/server/aphlict_launcher.php
+++ b/support/aphlict/server/aphlict_launcher.php
@@ -2,7 +2,7 @@
 <?php
 
 $root = dirname(dirname(dirname(dirname(__FILE__))));
-require_once $root.'/scripts/__init_script__.php';
+require_once $root.'/scripts/init/init-aphlict.php';
 
 PhabricatorAphlictManagementWorkflow::requireExtensions();
 

From fc71a7e92dc26e0d93ec33d709391411d2bcd827 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 13 Nov 2016 16:38:54 -0800
Subject: [PATCH 052/865] (stable) Discard stdout/stderr from the aphlict
 subprocess when running in daemon (normal) mode

Summary:
Fixes T11818. We don't discard output, so once we read more than 2GB of output we'll exceed the maximum size of a string in an internal buffer.

Instead, configure the future so output is discarded.

Test Plan: Added logging to `libphutil/`, saw internal buffer grow steadily before this change and stay constant at 0 after this change.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11818

Differential Revision: https://secure.phabricator.com/D16855
---
 .../management/PhabricatorAphlictManagementWorkflow.php   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php b/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php
index b799d0ef90..8522f00421 100644
--- a/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php
+++ b/src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php
@@ -416,6 +416,14 @@ final protected function launch() {
       while (true) {
         global $g_future;
         $g_future = new ExecFuture('exec %C', $command);
+
+        // Discard all output the subprocess produces: it writes to the log on
+        // disk, so we don't need to send the output anywhere and can just
+        // throw it away.
+        $g_future
+          ->setStdoutSizeLimit(0)
+          ->setStderrSizeLimit(0);
+
         $g_future->resolve();
 
         // If the server exited, wait a couple of seconds and restart it.

From e053534c7e84b09e5f01ac3acb41352bb6a37e05 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 17 Nov 2016 09:34:54 -0800
Subject: [PATCH 053/865] (stable) Prevent typeahead sources from querying
 against empty tokens

Summary:
Certain unusual queries, like `[-]`, could tokenize into a list which included the empty string.

This would then convert into a query for `... LIKE "%"` which just joins the entire table.

Instead: tokenize smarter; never return the empty token; add some test cases.

Test Plan: Ran unit tests. Queried for `[[blah blah]]`, saw a reasonable query come out the other end.

Reviewers: chad

Reviewed By: chad

Subscribers: 20after4

Differential Revision: https://secure.phabricator.com/D16888
---
 PhabricatorTypeaheadDatasourceTestCase.php    | 39 +++++++++++++++++++
 .../PhabricatorTypeaheadDatasource.php        | 14 ++++++-
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 PhabricatorTypeaheadDatasourceTestCase.php

diff --git a/PhabricatorTypeaheadDatasourceTestCase.php b/PhabricatorTypeaheadDatasourceTestCase.php
new file mode 100644
index 0000000000..92544db4f7
--- /dev/null
+++ b/PhabricatorTypeaheadDatasourceTestCase.php
@@ -0,0 +1,39 @@
+<?php
+
+final class PhabricatorTypeaheadDatasourceTestCase
+  extends PhabricatorTestCase {
+
+  public function testTypeaheadTokenization() {
+    $this->assertTokenization(
+      'The quick brown fox',
+      array('the', 'quick', 'brown', 'fox'));
+
+    $this->assertTokenization(
+      'Quack quack QUACK',
+      array('quack'));
+
+    $this->assertTokenization(
+      '',
+      array());
+
+    $this->assertTokenization(
+      '  [ - ]  ',
+      array());
+
+    $this->assertTokenization(
+      'jury-rigged',
+      array('jury', 'rigged'));
+
+    $this->assertTokenization(
+      '[[ brackets ]] [-] ]-[ tie-fighters',
+      array('brackets', 'tie', 'fighters'));
+  }
+
+  private function assertTokenization($input, $expect) {
+    $this->assertEqual(
+      $expect,
+      PhabricatorTypeaheadDatasource::tokenizeString($input),
+      pht('Tokenization of "%s"', $input));
+  }
+
+}
diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
index 163b6c40b3..cfea3bd30c 100644
--- a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
@@ -141,8 +141,18 @@ public static function tokenizeString($string) {
       return array();
     }
 
-    $tokens = preg_split('/\s+|[-\[\]]/u', $string);
-    return array_unique($tokens);
+    $tokens = preg_split('/[\s\[\]-]+/u', $string);
+    $tokens = array_unique($tokens);
+
+    // Make sure we don't return the empty token, as this will boil down to a
+    // JOIN against every token.
+    foreach ($tokens as $key => $value) {
+      if (!strlen($value)) {
+        unset($tokens[$key]);
+      }
+    }
+
+    return array_values($tokens);
   }
 
   public function getTokens() {

From 7ebc47d906fecc5b7952baeb8f25c4d69f5604ba Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 17 Nov 2016 10:23:39 -0800
Subject: [PATCH 054/865] (stable) Fix an EditEngine issue with unlocking
 fields which can't be locked

Summary: This code should go inside the field-locking loop. Otherwise, it only applies to the last field, and fatals if there are no fields.

Test Plan: Carefuller inspection.

Reviewers: chad

Reviewed By: chad

Subscribers: 20after4

Differential Revision: https://secure.phabricator.com/D16889
---
 .../storage/PhabricatorEditEngineConfiguration.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php b/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
index fc778c65b7..c1b1308801 100644
--- a/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
+++ b/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
@@ -158,11 +158,11 @@ public function applyConfigurationToFields(
           // If we don't have an explicit value, don't make any adjustments.
           break;
       }
-    }
 
-    // If the field isn't lockable, remove any lock we applied.
-    if (!$field->getIsLockable()) {
-      $field->setIsLocked(false);
+      // If the field isn't lockable, remove any lock we applied.
+      if (!$field->getIsLockable()) {
+        $field->setIsLocked(false);
+      }
     }
 
     $fields = $this->reorderFields($fields);

From bb6bd8c8d034ecad3e95af27261b15cac0d78f1e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 17 Nov 2016 14:50:50 -0800
Subject: [PATCH 055/865] (stable) When a field isn't lockable, just freeze the
 lock status instead of removing any lock

Summary:
See downstream issue here: <https://phabricator.wikimedia.org/T150992>

In at least one case (project milestones) we have a locked, non-lockable field. This means "this is locked, and you can't change the fact that it is locked".

At least for now, preserve this behavior.

Test Plan: Created a new milestone of an existing project. This worked correctly with the patch.

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D16895
---
 .../PhabricatorEditEngineConfiguration.php      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php b/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
index c1b1308801..65359bb0dd 100644
--- a/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
+++ b/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
@@ -144,25 +144,26 @@ public function applyConfigurationToFields(
       switch (idx($locks, $key)) {
         case self::LOCK_LOCKED:
           $field->setIsHidden(false);
-          $field->setIsLocked(true);
+          if ($field->getIsLockable()) {
+            $field->setIsLocked(true);
+          }
           break;
         case self::LOCK_HIDDEN:
           $field->setIsHidden(true);
-          $field->setIsLocked(false);
+          if ($field->getIsLockable()) {
+            $field->setIsLocked(false);
+          }
           break;
         case self::LOCK_VISIBLE:
           $field->setIsHidden(false);
-          $field->setIsLocked(false);
+          if ($field->getIsLockable()) {
+            $field->setIsLocked(false);
+          }
           break;
         default:
           // If we don't have an explicit value, don't make any adjustments.
           break;
       }
-
-      // If the field isn't lockable, remove any lock we applied.
-      if (!$field->getIsLockable()) {
-        $field->setIsLocked(false);
-      }
     }
 
     $fields = $this->reorderFields($fields);

From 74a0e5cd7930ac06013ed6fafc4fd96e7730b40c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 19 Nov 2016 08:35:29 -0800
Subject: [PATCH 056/865] (stable) Respect user/pass flags to bin/storage for
 direct DatabaseRef-based queries

Summary:
Ref T11893. Previously, we excuted all `bin/storage` queries through `StorageManagementAPI` objects.

After D16848, we execute some queries through `PhabricatorDatabaseRef`. However, the refs we use weren't getting passed the `-u` / `-p` flags correctly, for specifying alternate administrative credentials.

Test Plan:
  - Created a second account (`trunk`).
  - Ran `bin/storage -u trunk`.
  - Made libphutil throw when not connecting as that user.
  - Before patch: some connections incorrectly used the default user, "root".
  - After patch: all connections correctly used the configured user, "trunk".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11893

Differential Revision: https://secure.phabricator.com/D16901
---
 scripts/sql/manage_storage.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/sql/manage_storage.php b/scripts/sql/manage_storage.php
index db21fc23f5..ec3f492e8c 100755
--- a/scripts/sql/manage_storage.php
+++ b/scripts/sql/manage_storage.php
@@ -206,6 +206,9 @@
     ->setDisableUTF8MB4($args->getArg('disable-utf8mb4'));
   PhabricatorEnv::overrideConfig('mysql.user', $api->getUser());
 
+  $ref->setUser($selected_user);
+  $ref->setPass($password);
+
   try {
     queryfx(
       $api->getConn(null),

From 3cd0001d8b95897d5efafa0c391a9e870fd35471 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 11 Dec 2016 07:15:32 -0800
Subject: [PATCH 057/865] (stable) Fix two cache issues (global settings;
 initial setup)

Summary:
  - Fixes T11995. This got moved but I missed renaming this callsite.
  - Fixes T11993. If you have valid credentials, but haven't run `storage upgrade` yet, we can hit this exception during setup. Just ignore it instead.

Test Plan:
  - Saved global settings, no more fatal.
  - Changed `storage-namespace` to junk, loaded web UI with valid database credentials.

{F2106358}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11993, T11995

Differential Revision: https://secure.phabricator.com/D17024
---
 src/applications/config/check/PhabricatorSetupCheck.php   | 8 ++------
 .../settings/editor/PhabricatorUserPreferencesEditor.php  | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/applications/config/check/PhabricatorSetupCheck.php b/src/applications/config/check/PhabricatorSetupCheck.php
index 0d9101efe3..e0574b7636 100644
--- a/src/applications/config/check/PhabricatorSetupCheck.php
+++ b/src/applications/config/check/PhabricatorSetupCheck.php
@@ -82,12 +82,12 @@ final public static function resetSetupState() {
       AphrontWriteGuard::allowDangerousUnguardedWrites(true);
     }
 
-    $caught = null;
     try {
       $db_cache = new PhabricatorKeyValueDatabaseCache();
       $db_cache->deleteKey('phabricator.setup.issue-keys');
     } catch (Exception $ex) {
-      $caught = $ex;
+      // If we hit an exception here, just ignore it. In particular, this can
+      // happen on initial startup before the databases are initialized.
     }
 
     if ($use_scope) {
@@ -95,10 +95,6 @@ final public static function resetSetupState() {
     } else {
       AphrontWriteGuard::allowDangerousUnguardedWrites(false);
     }
-
-    if ($caught) {
-      throw $caught;
-    }
   }
 
   final public static function setOpenSetupIssueKeys(
diff --git a/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php b/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
index c2ec0a7094..a927cc7475 100644
--- a/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
+++ b/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
@@ -159,7 +159,7 @@ protected function applyFinalEffects(
         $user_phid);
     } else {
       $cache = PhabricatorCaches::getMutableStructureCache();
-      $cache->deleteKey(PhabricatorUserPreferences::getGlobalCacheKey());
+      $cache->deleteKey(PhabricatorUser::getGlobalSettingsCacheKey());
 
       PhabricatorUserCache::clearCacheForAllUsers(
         PhabricatorUserPreferencesCacheType::KEY_PREFERENCES);

From 1cd64f9975d66a5fff516cd064cd076b0eb7b07f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Dec 2016 14:02:04 -0800
Subject: [PATCH 058/865] (stable) Don't combine automatic output compression
 with "Content-Length"

Summary:
Fixes T12013. Send either "Content-Length" or enable output compression, but not both.

Prefer compression for static resources (CSS, JS, etc).

Test Plan: Ran `curl -v ...`, no longer saw responses with both compression and `Content-Length`.

Reviewers: chad, avivey

Reviewed By: avivey

Subscribers: avivey

Maniphest Tasks: T12013

Differential Revision: https://secure.phabricator.com/D17045
---
 src/aphront/response/AphrontFileResponse.php   | 18 +++++++++++++++++-
 src/aphront/response/AphrontResponse.php       | 15 +++++++++++++++
 src/aphront/sink/AphrontHTTPSink.php           |  2 ++
 .../controller/CelerityResourceController.php  |  7 ++++---
 support/PhabricatorStartup.php                 |  5 -----
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/aphront/response/AphrontFileResponse.php b/src/aphront/response/AphrontFileResponse.php
index 4688e3bc8f..a8f673d218 100644
--- a/src/aphront/response/AphrontFileResponse.php
+++ b/src/aphront/response/AphrontFileResponse.php
@@ -5,6 +5,7 @@ final class AphrontFileResponse extends AphrontResponse {
   private $content;
   private $contentIterator;
   private $contentLength;
+  private $compressResponse;
 
   private $mimeType;
   private $download;
@@ -69,6 +70,15 @@ public function getContentLength() {
     return $this->contentLength;
   }
 
+  public function setCompressResponse($compress_response) {
+    $this->compressResponse = $compress_response;
+    return $this;
+  }
+
+  public function getCompressResponse() {
+    return $this->compressResponse;
+  }
+
   public function setRange($min, $max) {
     $this->rangeMin = $min;
     $this->rangeMax = $max;
@@ -94,7 +104,9 @@ public function getHeaders() {
       $content_len = $this->getContentLength();
     }
 
-    $headers[] = array('Content-Length', $this->getContentLength());
+    if (!$this->shouldCompressResponse()) {
+      $headers[] = array('Content-Length', $this->getContentLength());
+    }
 
     if (strlen($this->getDownload())) {
       $headers[] = array('X-Download-Options', 'noopen');
@@ -118,4 +130,8 @@ public function getHeaders() {
     return $headers;
   }
 
+  protected function shouldCompressResponse() {
+    return $this->getCompressResponse();
+  }
+
 }
diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index b213244f1c..6c52e417e3 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -242,6 +242,21 @@ private function formatEpochTimestampForHTTPHeader($epoch_timestamp) {
     return gmdate('D, d M Y H:i:s', $epoch_timestamp).' GMT';
   }
 
+  protected function shouldCompressResponse() {
+    return true;
+  }
+
+  public function willBeginWrite() {
+    if ($this->shouldCompressResponse()) {
+      // Enable automatic compression here. Webservers sometimes do this for
+      // us, but we now detect the absence of compression and warn users about
+      // it so try to cover our bases more thoroughly.
+      ini_set('zlib.output_compression', 1);
+    } else {
+      ini_set('zlib.output_compression', 0);
+    }
+  }
+
   public function didCompleteWrite($aborted) {
     return;
   }
diff --git a/src/aphront/sink/AphrontHTTPSink.php b/src/aphront/sink/AphrontHTTPSink.php
index 4a729da16e..11c6466cf1 100644
--- a/src/aphront/sink/AphrontHTTPSink.php
+++ b/src/aphront/sink/AphrontHTTPSink.php
@@ -96,6 +96,8 @@ final public function writeData($data) {
    * @return void
    */
   final public function writeResponse(AphrontResponse $response) {
+    $response->willBeginWrite();
+
     // Build the content iterator first, in case it throws. Ideally, we'd
     // prefer to handle exceptions before we emit the response status or any
     // HTTP headers.
diff --git a/src/applications/celerity/controller/CelerityResourceController.php b/src/applications/celerity/controller/CelerityResourceController.php
index 95d674c641..0f1478ec5c 100644
--- a/src/applications/celerity/controller/CelerityResourceController.php
+++ b/src/applications/celerity/controller/CelerityResourceController.php
@@ -103,9 +103,10 @@ protected function serveResource(array $spec) {
       }
     }
 
-    $response = new AphrontFileResponse();
-    $response->setContent($data);
-    $response->setMimeType($type_map[$type]);
+    $response = id(new AphrontFileResponse())
+      ->setContent($data)
+      ->setMimeType($type_map[$type])
+      ->setCompressResponse(true);
 
     // NOTE: This is a piece of magic required to make WOFF fonts work in
     // Firefox and IE. Possibly we should generalize this more.
diff --git a/support/PhabricatorStartup.php b/support/PhabricatorStartup.php
index 26c6b26a9c..0a27a616e3 100644
--- a/support/PhabricatorStartup.php
+++ b/support/PhabricatorStartup.php
@@ -395,11 +395,6 @@ private static function setupPHP() {
     if (function_exists('libxml_disable_entity_loader')) {
       libxml_disable_entity_loader(true);
     }
-
-    // Enable automatic compression here. Webservers sometimes do this for
-    // us, but we now detect the absence of compression and warn users about
-    // it so try to cover our bases more thoroughly.
-    ini_set('zlib.output_compression', 1);
   }
 
 

From 40be2d53743ca3da83b579985e0acad7d852b8d1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Jan 2017 10:53:35 -0800
Subject: [PATCH 059/865] (stable) Fix excessively strict "Can Use Application"
 policy filtering

Summary:
Ref T9058. The stricter filtering is over-filtering Handles. For example, in the Phacility cluster, users can not see Almanac services.

So this filtering happens:

  - The AlmanacServiceQuery filters the service beacuse they can't see the application.
  - The HandleQuery generates a "you can't see this" handle.
  - But then the HandleQuery filters that handle! It has a "service" PHID and the user can't see Almanac.

This violates the assumption that all application code makes about handles: it's OK to query handles for objects you can't see, and you'll get something back.

Instead, don't do application filtering on handles.

Test Plan:
  - Added a failing test and made it pass.
  - As a user who can not see Almanac, viewed an Instances timeline.
    - Before patch: fatal on trying to load a handle for a Service.
    - After patch: smooth sailing.

Reviewers: chad

Maniphest Tasks: T9058

Differential Revision: https://secure.phabricator.com/D17152
---
 .../policy/filter/PhabricatorPolicyFilter.php | 13 ++++++++++++
 .../PhabricatorProjectCoreTestCase.php        | 20 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/applications/policy/filter/PhabricatorPolicyFilter.php b/src/applications/policy/filter/PhabricatorPolicyFilter.php
index 855149f6b3..e0c223cd2c 100644
--- a/src/applications/policy/filter/PhabricatorPolicyFilter.php
+++ b/src/applications/policy/filter/PhabricatorPolicyFilter.php
@@ -874,6 +874,19 @@ private function applyApplicationChecks(array $objects) {
     $viewer = $this->viewer;
 
     foreach ($objects as $key => $object) {
+      // Don't filter handles: users are allowed to see handles from an
+      // application they can't see even if they can not see objects from
+      // that application. Note that the application policies still apply to
+      // the underlying object, so these will be "Restricted Object" handles.
+
+      // If we don't let these through, PhabricatorHandleQuery will completely
+      // fail to load results for PHIDs that are part of applications which
+      // the viewer can not see, but a fundamental property of handles is that
+      // we always load something and they can safely be assumed to load.
+      if ($object instanceof PhabricatorObjectHandle) {
+        continue;
+      }
+
       $phid = $object->getPHID();
       if (!$phid) {
         continue;
diff --git a/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php b/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php
index cb977dd681..71161b031e 100644
--- a/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php
+++ b/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php
@@ -51,6 +51,13 @@ public function testApplicationPolicy() {
         $proj,
         PhabricatorPolicyCapability::CAN_VIEW));
 
+    // This object is visible so its handle should load normally.
+    $handle = id(new PhabricatorHandleQuery())
+      ->setViewer($user)
+      ->withPHIDs(array($proj->getPHID()))
+      ->executeOne();
+    $this->assertEqual($proj->getPHID(), $handle->getPHID());
+
     // Change the "Can Use Application" policy for Projecs to "No One". This
     // should cause filtering checks to fail even when they are executed
     // directly rather than via a Query.
@@ -76,6 +83,19 @@ public function testApplicationPolicy() {
         $proj,
         PhabricatorPolicyCapability::CAN_VIEW));
 
+    // We should still be able to load a handle for the project, even if we
+    // can not see the application.
+    $handle = id(new PhabricatorHandleQuery())
+      ->setViewer($user)
+      ->withPHIDs(array($proj->getPHID()))
+      ->executeOne();
+
+    // The handle should load...
+    $this->assertEqual($proj->getPHID(), $handle->getPHID());
+
+    // ...but be policy filtered.
+    $this->assertTrue($handle->getPolicyFiltered());
+
     unset($env);
   }
 

From ab4355cde0f8913b9e12be345f813f5ba7e0e468 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 21 Jan 2017 08:11:19 -0800
Subject: [PATCH 060/865] (stable) Move Favorites and User menus to
 MenuBarExtensions

Summary:
Ref T12140. The major effect of this change is that uninstalling "Home" (as we do on admin.phacility.com) no longer uninstalls the user menu (which is required to access settings or log out).

This also simplifies the code a bit, by consolidating how menus are built into MenuBarExtensions instead of some in Applications and some in Extensions.

Test Plan:
  - While logged in and logged out, saw main menus in the correct order.
  - Uninstalled Favorites, saw the menu vanish.
  - Uninstalled Home, still had a user menu.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12140

Differential Revision: https://secure.phabricator.com/D17239
---
 src/__phutil_library_map__.php                |   4 +
 .../PhabricatorAuthMainMenuBarExtension.php   |   4 +
 .../base/PhabricatorApplication.php           |  17 ---
 .../PhabricatorFavoritesApplication.php       |  78 ------------
 ...abricatorFavoritesMainMenuBarExtension.php |  96 +++++++++++++++
 .../PhabricatorHomeApplication.php            | 110 -----------------
 .../PeopleMainMenuBarExtension.php            | 116 ++++++++++++++++++
 .../menu/PhabricatorMainMenuBarExtension.php  |   5 +
 .../page/menu/PhabricatorMainMenuView.php     |  21 +---
 9 files changed, 231 insertions(+), 220 deletions(-)
 create mode 100644 src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
 create mode 100644 src/applications/people/engineextension/PeopleMainMenuBarExtension.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c828c6b04e..7ce9b1c72d 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1785,6 +1785,7 @@
     'PeopleBrowseUserDirectoryCapability' => 'applications/people/capability/PeopleBrowseUserDirectoryCapability.php',
     'PeopleCreateUsersCapability' => 'applications/people/capability/PeopleCreateUsersCapability.php',
     'PeopleHovercardEngineExtension' => 'applications/people/engineextension/PeopleHovercardEngineExtension.php',
+    'PeopleMainMenuBarExtension' => 'applications/people/engineextension/PeopleMainMenuBarExtension.php',
     'PeopleUserLogGarbageCollector' => 'applications/people/garbagecollector/PeopleUserLogGarbageCollector.php',
     'Phabricator404Controller' => 'applications/base/controller/Phabricator404Controller.php',
     'PhabricatorAWSConfigOptions' => 'applications/config/option/PhabricatorAWSConfigOptions.php',
@@ -2671,6 +2672,7 @@
     'PhabricatorFavoritesApplication' => 'applications/favorites/application/PhabricatorFavoritesApplication.php',
     'PhabricatorFavoritesController' => 'applications/favorites/controller/PhabricatorFavoritesController.php',
     'PhabricatorFavoritesMainController' => 'applications/favorites/controller/PhabricatorFavoritesMainController.php',
+    'PhabricatorFavoritesMainMenuBarExtension' => 'applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php',
     'PhabricatorFavoritesMenuItemController' => 'applications/favorites/controller/PhabricatorFavoritesMenuItemController.php',
     'PhabricatorFavoritesProfileMenuEngine' => 'applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php',
     'PhabricatorFaxContentSource' => 'infrastructure/contentsource/PhabricatorFaxContentSource.php',
@@ -6662,6 +6664,7 @@
     'PeopleBrowseUserDirectoryCapability' => 'PhabricatorPolicyCapability',
     'PeopleCreateUsersCapability' => 'PhabricatorPolicyCapability',
     'PeopleHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
+    'PeopleMainMenuBarExtension' => 'PhabricatorMainMenuBarExtension',
     'PeopleUserLogGarbageCollector' => 'PhabricatorGarbageCollector',
     'Phabricator404Controller' => 'PhabricatorController',
     'PhabricatorAWSConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -7685,6 +7688,7 @@
     'PhabricatorFavoritesApplication' => 'PhabricatorApplication',
     'PhabricatorFavoritesController' => 'PhabricatorController',
     'PhabricatorFavoritesMainController' => 'PhabricatorFavoritesController',
+    'PhabricatorFavoritesMainMenuBarExtension' => 'PhabricatorMainMenuBarExtension',
     'PhabricatorFavoritesMenuItemController' => 'PhabricatorFavoritesController',
     'PhabricatorFavoritesProfileMenuEngine' => 'PhabricatorProfileMenuEngine',
     'PhabricatorFaxContentSource' => 'PhabricatorContentSource',
diff --git a/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php b/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
index 2757bec91c..d9d251ab07 100644
--- a/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
+++ b/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
@@ -9,6 +9,10 @@ public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
     return true;
   }
 
+  public function getExtensionOrder() {
+    return 900;
+  }
+
   public function buildMainMenus() {
     $viewer = $this->getViewer();
 
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index e50045b0e9..63ab9d2315 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -315,23 +315,6 @@ public function buildMainMenuItems(
   }
 
 
-  /**
-   * Build extra items for the main menu. Generally, this is used to render
-   * static dropdowns.
-   *
-   * @param  PhabricatorUser    The viewing user.
-   * @param  AphrontController  The current controller. May be null for special
-   *                            pages like 404, exception handlers, etc.
-   * @return view               List of menu items.
-   * @task ui
-   */
-  public function buildMainMenuExtraNodes(
-    PhabricatorUser $viewer,
-    PhabricatorController $controller = null) {
-    return array();
-  }
-
-
 /* -(  Application Management  )--------------------------------------------- */
 
 
diff --git a/src/applications/favorites/application/PhabricatorFavoritesApplication.php b/src/applications/favorites/application/PhabricatorFavoritesApplication.php
index 958355a2b5..1d5d3ae2aa 100644
--- a/src/applications/favorites/application/PhabricatorFavoritesApplication.php
+++ b/src/applications/favorites/application/PhabricatorFavoritesApplication.php
@@ -32,82 +32,4 @@ public function isLaunchable() {
     return false;
   }
 
-  public function buildMainMenuExtraNodes(
-    PhabricatorUser $viewer,
-    PhabricatorController $controller = null) {
-
-    $dropdown = $this->renderFavoritesDropdown($viewer);
-    if (!$dropdown) {
-      return null;
-    }
-
-    return id(new PHUIButtonView())
-      ->setTag('a')
-      ->setHref('#')
-      ->setIcon('fa-star')
-      ->addClass('phabricator-core-user-menu')
-      ->setNoCSS(true)
-      ->setDropdown(true)
-      ->setDropdownMenu($dropdown);
-  }
-
-  private function renderFavoritesDropdown(PhabricatorUser $viewer) {
-    $application = __CLASS__;
-
-    $applications = id(new PhabricatorApplicationQuery())
-      ->setViewer($viewer)
-      ->withClasses(array($application))
-      ->withInstalled(true)
-      ->execute();
-    $favorites = head($applications);
-    if (!$favorites) {
-      return null;
-    }
-
-    $menu_engine = id(new PhabricatorFavoritesProfileMenuEngine())
-      ->setViewer($viewer)
-      ->setProfileObject($favorites);
-
-    if ($viewer->getPHID()) {
-      $menu_engine
-        ->setCustomPHID($viewer->getPHID())
-        ->setMenuType(PhabricatorProfileMenuEngine::MENU_COMBINED);
-    } else {
-      $menu_engine
-        ->setMenuType(PhabricatorProfileMenuEngine::MENU_GLOBAL);
-    }
-
-    $filter_view = $menu_engine->buildNavigation();
-
-    $menu_view = $filter_view->getMenu();
-    $item_views = $menu_view->getItems();
-
-    $view = id(new PhabricatorActionListView())
-      ->setViewer($viewer);
-    foreach ($item_views as $item) {
-      $type = null;
-      if (!strlen($item->getName())) {
-        $type = PhabricatorActionView::TYPE_DIVIDER;
-      }
-      $action = id(new PhabricatorActionView())
-        ->setName($item->getName())
-        ->setHref($item->getHref())
-        ->setType($type);
-      $view->addAction($action);
-    }
-
-    // Build out edit interface
-    if ($viewer->isLoggedIn()) {
-      $view->addAction(
-        id(new PhabricatorActionView())
-          ->setType(PhabricatorActionView::TYPE_DIVIDER));
-      $view->addAction(
-        id(new PhabricatorActionView())
-          ->setName(pht('Edit Favorites'))
-          ->setHref('/favorites/'));
-    }
-
-    return $view;
-  }
-
 }
diff --git a/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php b/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
new file mode 100644
index 0000000000..990ecad993
--- /dev/null
+++ b/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
@@ -0,0 +1,96 @@
+<?php
+
+final class PhabricatorFavoritesMainMenuBarExtension
+  extends PhabricatorMainMenuBarExtension {
+
+  const MAINMENUBARKEY = 'favorites';
+
+  public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
+    return PhabricatorApplication::isClassInstalledForViewer(
+      'PhabricatorFavoritesApplication',
+      $viewer);
+  }
+
+  public function getExtensionOrder() {
+    return 1100;
+  }
+
+  public function buildMainMenus() {
+    $viewer = $this->getViewer();
+
+    $dropdown = $this->newDropdown($viewer);
+    if (!$dropdown) {
+      return null;
+    }
+
+    $favorites_menu = id(new PHUIButtonView())
+      ->setTag('a')
+      ->setHref('#')
+      ->setIcon('fa-star')
+      ->addClass('phabricator-core-user-menu')
+      ->setNoCSS(true)
+      ->setDropdown(true)
+      ->setDropdownMenu($dropdown);
+
+    return array(
+      $favorites_menu,
+    );
+  }
+
+  private function newDropdown(PhabricatorUser $viewer) {
+    $applications = id(new PhabricatorApplicationQuery())
+      ->setViewer($viewer)
+      ->withClasses(array('PhabricatorFavoritesApplication'))
+      ->withInstalled(true)
+      ->execute();
+    $favorites = head($applications);
+    if (!$favorites) {
+      return null;
+    }
+
+    $menu_engine = id(new PhabricatorFavoritesProfileMenuEngine())
+      ->setViewer($viewer)
+      ->setProfileObject($favorites);
+
+    if ($viewer->getPHID()) {
+      $menu_engine
+        ->setCustomPHID($viewer->getPHID())
+        ->setMenuType(PhabricatorProfileMenuEngine::MENU_COMBINED);
+    } else {
+      $menu_engine
+        ->setMenuType(PhabricatorProfileMenuEngine::MENU_GLOBAL);
+    }
+
+    $filter_view = $menu_engine->buildNavigation();
+
+    $menu_view = $filter_view->getMenu();
+    $item_views = $menu_view->getItems();
+
+    $view = id(new PhabricatorActionListView())
+      ->setViewer($viewer);
+    foreach ($item_views as $item) {
+      $type = null;
+      if (!strlen($item->getName())) {
+        $type = PhabricatorActionView::TYPE_DIVIDER;
+      }
+      $action = id(new PhabricatorActionView())
+        ->setName($item->getName())
+        ->setHref($item->getHref())
+        ->setType($type);
+      $view->addAction($action);
+    }
+
+    if ($viewer->isLoggedIn()) {
+      $view->addAction(
+        id(new PhabricatorActionView())
+          ->setType(PhabricatorActionView::TYPE_DIVIDER));
+      $view->addAction(
+        id(new PhabricatorActionView())
+          ->setName(pht('Edit Favorites'))
+          ->setHref('/favorites/'));
+    }
+
+    return $view;
+  }
+
+}
diff --git a/src/applications/home/application/PhabricatorHomeApplication.php b/src/applications/home/application/PhabricatorHomeApplication.php
index 20858e4931..a860bc8fb3 100644
--- a/src/applications/home/application/PhabricatorHomeApplication.php
+++ b/src/applications/home/application/PhabricatorHomeApplication.php
@@ -42,114 +42,4 @@ public function getApplicationOrder() {
     return 9;
   }
 
-  public function buildMainMenuExtraNodes(
-    PhabricatorUser $viewer,
-    PhabricatorController $controller = null) {
-
-    if (!$viewer->isLoggedIn()) {
-      return;
-    }
-
-    $image = $viewer->getProfileImageURI();
-
-    $profile_image = id(new PHUIIconView())
-      ->setImage($image)
-      ->setHeadSize(PHUIIconView::HEAD_SMALL);
-
-    if ($controller) {
-      $application = $controller->getCurrentApplication();
-    } else {
-      $application = null;
-    }
-    $dropdown_menu = $this->renderUserDropdown($viewer, $application);
-
-    $menu_id = celerity_generate_unique_node_id();
-
-    Javelin::initBehavior(
-      'user-menu',
-      array(
-        'menuID' => $menu_id,
-        'menu' => $dropdown_menu->getDropdownMenuMetadata(),
-      ));
-
-    return id(new PHUIButtonView())
-      ->setID($menu_id)
-      ->setTag('a')
-      ->setHref('/p/'.$viewer->getUsername().'/')
-      ->setIcon($profile_image)
-      ->addClass('phabricator-core-user-menu')
-      ->setHasCaret(true)
-      ->setNoCSS(true);
-  }
-
-  private function renderUserDropdown(
-    PhabricatorUser $viewer,
-    $application) {
-
-    $person_to_show = id(new PHUIObjectItemView())
-      ->setObjectName($viewer->getRealName())
-      ->setSubHead($viewer->getUsername())
-      ->setImageURI($viewer->getProfileImageURI());
-
-    $user_view = id(new PHUIObjectItemListView())
-      ->setViewer($viewer)
-      ->setFlush(true)
-      ->setSimple(true)
-      ->addItem($person_to_show)
-      ->addClass('phabricator-core-user-profile-object');
-
-    $view = id(new PhabricatorActionListView())
-      ->setViewer($viewer);
-
-    // User Menu
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->appendChild($user_view));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setType(PhabricatorActionView::TYPE_DIVIDER));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Profile'))
-        ->setHref('/p/'.$viewer->getUsername().'/'));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Settings'))
-        ->setHref('/settings/user/'.$viewer->getUsername().'/'));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Manage'))
-        ->setHref('/people/manage/'.$viewer->getID().'/'));
-
-    // Help Menus
-    if ($application) {
-      $help_links = $application->getHelpMenuItems($viewer);
-      if ($help_links) {
-        foreach ($help_links as $link) {
-          $view->addAction($link);
-        }
-      }
-    }
-
-    // Logout Menu
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->addSigil('logout-item')
-        ->setType(PhabricatorActionView::TYPE_DIVIDER));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Log Out %s', $viewer->getUsername()))
-        ->addSigil('logout-item')
-        ->setHref('/logout/')
-        ->setColor(PhabricatorActionView::RED)
-        ->setWorkflow(true));
-
-    return $view;
-  }
-
 }
diff --git a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
new file mode 100644
index 0000000000..cd1cffa7a2
--- /dev/null
+++ b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
@@ -0,0 +1,116 @@
+<?php
+
+final class PeopleMainMenuBarExtension
+  extends PhabricatorMainMenuBarExtension {
+
+  const MAINMENUBARKEY = 'user';
+
+  public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
+    return $viewer->isLoggedIn();
+  }
+
+  public function getExtensionOrder() {
+    return 1200;
+  }
+
+  public function buildMainMenus() {
+    $viewer = $this->getViewer();
+    $application = $this->getApplication();
+    $dropdown_menu = $this->newDropdown($viewer, $application);
+
+    $menu_id = celerity_generate_unique_node_id();
+
+    Javelin::initBehavior(
+      'user-menu',
+      array(
+        'menuID' => $menu_id,
+        'menu' => $dropdown_menu->getDropdownMenuMetadata(),
+      ));
+
+    $image = $viewer->getProfileImageURI();
+    $profile_image = id(new PHUIIconView())
+      ->setImage($image)
+      ->setHeadSize(PHUIIconView::HEAD_SMALL);
+
+    $user_menu = id(new PHUIButtonView())
+      ->setID($menu_id)
+      ->setTag('a')
+      ->setHref('/p/'.$viewer->getUsername().'/')
+      ->setIcon($profile_image)
+      ->addClass('phabricator-core-user-menu')
+      ->setHasCaret(true)
+      ->setNoCSS(true);
+
+    return array(
+      $user_menu,
+    );
+  }
+
+  private function newDropdown(
+    PhabricatorUser $viewer,
+    $application) {
+
+    $person_to_show = id(new PHUIObjectItemView())
+      ->setObjectName($viewer->getRealName())
+      ->setSubHead($viewer->getUsername())
+      ->setImageURI($viewer->getProfileImageURI());
+
+    $user_view = id(new PHUIObjectItemListView())
+      ->setViewer($viewer)
+      ->setFlush(true)
+      ->setSimple(true)
+      ->addItem($person_to_show)
+      ->addClass('phabricator-core-user-profile-object');
+
+    $view = id(new PhabricatorActionListView())
+      ->setViewer($viewer);
+
+    $view->addAction(
+      id(new PhabricatorActionView())
+        ->appendChild($user_view));
+
+    $view->addAction(
+      id(new PhabricatorActionView())
+        ->setType(PhabricatorActionView::TYPE_DIVIDER));
+
+    $view->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('Profile'))
+        ->setHref('/p/'.$viewer->getUsername().'/'));
+
+    $view->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('Settings'))
+        ->setHref('/settings/user/'.$viewer->getUsername().'/'));
+
+    $view->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('Manage'))
+        ->setHref('/people/manage/'.$viewer->getID().'/'));
+
+    if ($application) {
+      $help_links = $application->getHelpMenuItems($viewer);
+      if ($help_links) {
+        foreach ($help_links as $link) {
+          $view->addAction($link);
+        }
+      }
+    }
+
+    $view->addAction(
+      id(new PhabricatorActionView())
+        ->addSigil('logout-item')
+        ->setType(PhabricatorActionView::TYPE_DIVIDER));
+
+    $view->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('Log Out %s', $viewer->getUsername()))
+        ->addSigil('logout-item')
+        ->setHref('/logout/')
+        ->setColor(PhabricatorActionView::RED)
+        ->setWorkflow(true));
+
+    return $view;
+  }
+
+}
diff --git a/src/view/page/menu/PhabricatorMainMenuBarExtension.php b/src/view/page/menu/PhabricatorMainMenuBarExtension.php
index 8b863c835c..fede2fdb85 100644
--- a/src/view/page/menu/PhabricatorMainMenuBarExtension.php
+++ b/src/view/page/menu/PhabricatorMainMenuBarExtension.php
@@ -64,12 +64,17 @@ public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
     return true;
   }
 
+  public function getExtensionOrder() {
+    return 1000;
+  }
+
   abstract public function buildMainMenus();
 
   final public static function getAllExtensions() {
     return id(new PhutilClassMapQuery())
       ->setAncestorClass(__CLASS__)
       ->setUniqueMethod('getExtensionKey')
+      ->setSortMethod('getExtensionOrder')
       ->execute();
   }
 
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index 75071a9ee5..e923a5e348 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -82,20 +82,6 @@ public function render() {
         phutil_implode_html(' ', $aural));
     }
 
-    // Build out Header Menus
-    $applications = PhabricatorApplication::getAllInstalledApplications();
-
-    $menus = array();
-    $controller = $this->getController();
-    foreach ($applications as $application) {
-      $app_extra = $application->buildMainMenuExtraNodes(
-        $viewer,
-        $controller);
-      if ($app_extra !== null) {
-        $menus[] = $app_extra;
-      }
-    }
-
     $extensions = PhabricatorMainMenuBarExtension::getAllEnabledExtensions();
     foreach ($extensions as $extension) {
       $extension->setViewer($viewer);
@@ -116,13 +102,18 @@ public function render() {
       }
     }
 
-    // Builds out "login" button
+    $menus = array();
     foreach ($extensions as $extension) {
       foreach ($extension->buildMainMenus() as $menu) {
         $menus[] = $menu;
       }
     }
 
+    // Because we display these with "float: right", reverse their order before
+    // rendering them into the document so that the extension order and display
+    // order are the same.
+    $menus = array_reverse($menus);
+
     foreach ($menus as $menu) {
       $menu_bar[] = $menu;
     }

From 23c54262caf84abdad82974212170ff24d138f4d Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Sun, 22 Jan 2017 08:36:16 -0800
Subject: [PATCH 061/865] Fix fatal saving menu items without custom validation

Summary: Fixes T12142. Correct spelling of method.

Test Plan: Edit the name of a Details menu item in projects, or add a divider.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12142

Differential Revision: https://secure.phabricator.com/D17240
---
 src/applications/search/menuitem/PhabricatorProfileMenuItem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/search/menuitem/PhabricatorProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
index 05fa6543d3..6f1342d4c0 100644
--- a/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
@@ -70,7 +70,7 @@ protected function newItem() {
     return new PHUIListItemView();
   }
 
-  public function valdateTransactions(
+  public function validateTransactions(
     PhabricatorProfileMenuItemConfiguration $config,
     $field_key,
     $value,

From 2dc4692021c31cb4198541c6f15a59483022d3ee Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 26 Jan 2017 12:14:02 -0800
Subject: [PATCH 062/865] (stable) Allow menu items to render their own
 content; make Dashboard items render on-page

Summary:
Ref T11957. When you click a dashboard item, it now sends you to `/<app>/item/view/123/`, which renders the proper crumbs, navigation, etc., with the dashboard as page content.

This works as you'd expect in Projects:

{F2508568}

It's sliiiightly odd in Favorites since we nuke the nav menu, but seems basically fine?

{F2508571}

Test Plan:
  - Created a dashboard panel on a project.
  - Clicked it, saw it render.
  - Made it the default panel, viewed project default screen, saw dashboard.
  - Disabled every panel I could, still saw reasonable behavior (this is silly anyway).

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11957

Differential Revision: https://secure.phabricator.com/D17255
---
 .../PhabricatorFavoritesProfileMenuEngine.php |  2 +-
 .../PhabricatorHomeProfileMenuEngine.php      |  2 +-
 .../PhabricatorPeopleProfileMenuEngine.php    |  2 +-
 .../PhabricatorProjectViewController.php      |  3 +-
 .../PhabricatorProjectProfileMenuEngine.php   |  2 +-
 ...habricatorProjectManageProfileMenuItem.php |  5 --
 .../engine/PhabricatorProfileMenuEngine.php   | 55 +++++++++++++------
 .../PhabricatorDashboardProfileMenuItem.php   | 32 ++++++++++-
 .../menuitem/PhabricatorProfileMenuItem.php   | 24 ++++++++
 ...habricatorProfileMenuItemConfiguration.php | 13 +++++
 10 files changed, 113 insertions(+), 27 deletions(-)

diff --git a/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php b/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
index 3c86d19a58..87b59e3e0f 100644
--- a/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
+++ b/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
@@ -7,7 +7,7 @@ protected function isMenuEngineConfigurable() {
     return true;
   }
 
-  protected function getItemURI($path) {
+  public function getItemURI($path) {
     $object = $this->getProfileObject();
     $custom = $this->getCustomPHID();
 
diff --git a/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php b/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
index ebcc92b189..528edba697 100644
--- a/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
+++ b/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
@@ -7,7 +7,7 @@ protected function isMenuEngineConfigurable() {
     return true;
   }
 
-  protected function getItemURI($path) {
+  public function getItemURI($path) {
     $object = $this->getProfileObject();
     $custom = $this->getCustomPHID();
 
diff --git a/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
index 9965147a12..3d67872772 100644
--- a/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
+++ b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
@@ -10,7 +10,7 @@ protected function isMenuEngineConfigurable() {
     return false;
   }
 
-  protected function getItemURI($path) {
+  public function getItemURI($path) {
     $user = $this->getProfileObject();
     $username = $user->getUsername();
     $username = phutil_escape_uri($username);
diff --git a/src/applications/project/controller/PhabricatorProjectViewController.php b/src/applications/project/controller/PhabricatorProjectViewController.php
index d2f8d4f58d..7d5dc37e0b 100644
--- a/src/applications/project/controller/PhabricatorProjectViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectViewController.php
@@ -25,9 +25,10 @@ public function handleRequest(AphrontRequest $request) {
         $controller_object = new PhabricatorProjectBoardViewController();
         break;
       case PhabricatorProject::ITEM_PROFILE:
-      default:
         $controller_object = new PhabricatorProjectProfileController();
         break;
+      default:
+        return $engine->buildResponse();
     }
 
     return $this->delegateToController($controller_object);
diff --git a/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php b/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
index d3ea39e1e2..a39e7a8236 100644
--- a/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
+++ b/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
@@ -7,7 +7,7 @@ protected function isMenuEngineConfigurable() {
     return true;
   }
 
-  protected function getItemURI($path) {
+  public function getItemURI($path) {
     $project = $this->getProfileObject();
     $id = $project->getID();
     return "/project/{$id}/item/{$path}";
diff --git a/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php b/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
index 1bd7e796dc..ddb59ec095 100644
--- a/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
+++ b/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
@@ -18,11 +18,6 @@ public function canHideMenuItem(
     return false;
   }
 
-  public function canMakeDefault(
-    PhabricatorProfileMenuItemConfiguration $config) {
-    return true;
-  }
-
   public function getDisplayName(
     PhabricatorProfileMenuItemConfiguration $config) {
     $name = $config->getMenuItemProperty('name');
diff --git a/src/applications/search/engine/PhabricatorProfileMenuEngine.php b/src/applications/search/engine/PhabricatorProfileMenuEngine.php
index 3e11436ced..a6db1b2d2b 100644
--- a/src/applications/search/engine/PhabricatorProfileMenuEngine.php
+++ b/src/applications/search/engine/PhabricatorProfileMenuEngine.php
@@ -82,7 +82,7 @@ public function getShowNavigation() {
     return $this->showNavigation;
   }
 
-  abstract protected function getItemURI($path);
+  abstract public function getItemURI($path);
   abstract protected function isMenuEngineConfigurable();
 
   abstract protected function getBuiltinProfileItems($object);
@@ -102,6 +102,9 @@ public function buildResponse() {
     $request = $controller->getRequest();
 
     $item_action = $request->getURIData('itemAction');
+    if (!$item_action) {
+      $item_action = 'view';
+    }
 
     // If the engine is not configurable, don't respond to any of the editing
     // or configuration routes.
@@ -136,6 +139,12 @@ public function buildResponse() {
       }
     }
 
+    if (!$selected_item) {
+      if ($item_action == 'view') {
+        $selected_item = $this->getDefaultItem();
+      }
+    }
+
     switch ($item_action) {
       case 'view':
       case 'info':
@@ -159,21 +168,33 @@ public function buildResponse() {
     }
 
     $navigation = $this->buildNavigation();
-    $navigation->selectFilter('item.configure');
 
     $crumbs = $controller->buildApplicationCrumbsForEditEngine();
-    switch ($this->getMenuType()) {
-      case 'personal':
-        $crumbs->addTextCrumb(pht('Personal'));
-        break;
-      case 'global':
-        $crumbs->addTextCrumb(pht('Global'));
-      break;
+
+    // TODO: This stuff might need a little tweaking at some point, since it
+    // causes "Global"  and "Personal" to show up in contexts where they don't
+    // make sense, notably Projects.
+    if ($item_action != 'view') {
+      $navigation->selectFilter('item.configure');
+      switch ($this->getMenuType()) {
+        case 'personal':
+          $crumbs->addTextCrumb(pht('Personal'));
+          break;
+        case 'global':
+          $crumbs->addTextCrumb(pht('Global'));
+          break;
+      }
     }
 
     switch ($item_action) {
       case 'view':
+        $navigation->selectFilter($selected_item->getItemIdentifier());
+
         $content = $this->buildItemViewContent($selected_item);
+        $crumbs->addTextCrumb($selected_item->getDisplayName());
+        if (!$content) {
+          return new Aphront404Response();
+        }
         break;
       case 'configure':
         $content = $this->buildItemConfigureContent($item_list);
@@ -225,6 +246,7 @@ public function buildResponse() {
     if ($this->getShowNavigation()) {
       $page->setNavigation($navigation);
     }
+
     return $page;
   }
 
@@ -269,13 +291,8 @@ public function buildNavigation() {
       if (count($items) == 1) {
         $item = head($items);
         if ($item->getKey() === null) {
-          $builtin_key = $menu_item->getBuiltinKey();
-          $item_phid = $menu_item->getPHID();
-          if ($builtin_key !== null) {
-            $item->setKey($builtin_key);
-          } else if ($item_phid !== null) {
-            $item->setKey($item_phid);
-          }
+          $item_identifier = $menu_item->getItemIdentifier();
+          $item->setKey($item_identifier);
         }
       }
 
@@ -326,6 +343,7 @@ private function loadItems() {
     foreach ($stored_items as $stored_item) {
       $impl = $stored_item->getMenuItem();
       $impl->setViewer($viewer);
+      $impl->setEngine($this);
     }
 
     // Merge the stored items into the builtin items. If a builtin item has
@@ -442,6 +460,7 @@ private function loadBuiltinProfileItems() {
 
       $item = clone $item;
       $item->setViewer($viewer);
+      $item->setEngine($this);
 
       $builtin
         ->setProfilePHID($object->getPHID())
@@ -546,6 +565,10 @@ private function buildItemReorderContent(array $items) {
       ->setURI($this->getConfigureURI());
   }
 
+  private function buildItemViewContent(
+    PhabricatorProfileMenuItemConfiguration $item) {
+    return $item->newPageContent();
+  }
 
   private function buildItemConfigureContent(array $items) {
     $viewer = $this->getViewer();
diff --git a/src/applications/search/menuitem/PhabricatorDashboardProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorDashboardProfileMenuItem.php
index c9a13bd4ab..002e5778d5 100644
--- a/src/applications/search/menuitem/PhabricatorDashboardProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorDashboardProfileMenuItem.php
@@ -21,6 +21,11 @@ public function canAddToObject($object) {
     return true;
   }
 
+  public function canMakeDefault(
+    PhabricatorProfileMenuItemConfiguration $config) {
+    return true;
+  }
+
   public function attachDashboard($dashboard) {
     $this->dashboard = $dashboard;
     return $this;
@@ -28,14 +33,39 @@ public function attachDashboard($dashboard) {
 
   public function getDashboard() {
     $dashboard = $this->dashboard;
+
     if (!$dashboard) {
       return null;
     } else if ($dashboard->isArchived()) {
       return null;
     }
+
     return $dashboard;
   }
 
+  public function newPageContent(
+    PhabricatorProfileMenuItemConfiguration $config) {
+    $viewer = $this->getViewer();
+
+    $dashboard_phid = $config->getMenuItemProperty('dashboardPHID');
+
+    // Reload the dashboard to attach panels, which we need for rendering.
+    $dashboard = id(new PhabricatorDashboardQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($dashboard_phid))
+      ->needPanels(true)
+      ->executeOne();
+    if (!$dashboard) {
+      return null;
+    }
+
+    $engine = id(new PhabricatorDashboardRenderingEngine())
+        ->setViewer($viewer)
+        ->setDashboard($dashboard);
+
+    return $engine->renderDashboard();
+  }
+
   public function willBuildNavigationItems(array $items) {
     $viewer = $this->getViewer();
     $dashboard_phids = array();
@@ -100,7 +130,7 @@ protected function newNavigationMenuItems(
 
     $icon = $dashboard->getIcon();
     $name = $this->getDisplayName($config);
-    $href = $dashboard->getViewURI();
+    $href = $this->getItemViewURI($config);
 
     $item = $this->newItem()
       ->setHref($href)
diff --git a/src/applications/search/menuitem/PhabricatorProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
index 6f1342d4c0..061afc7fad 100644
--- a/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
@@ -3,6 +3,7 @@
 abstract class PhabricatorProfileMenuItem extends Phobject {
 
   private $viewer;
+  private $engine;
 
   final public function buildNavigationMenuItems(
     PhabricatorProfileMenuItemConfiguration $config) {
@@ -55,6 +56,15 @@ public function getViewer() {
     return $this->viewer;
   }
 
+  public function setEngine(PhabricatorProfileMenuEngine $engine) {
+    $this->engine = $engine;
+    return $this;
+  }
+
+  public function getEngine() {
+    return $this->engine;
+  }
+
   final public function getMenuItemKey() {
     return $this->getPhobjectClassConstant('MENUITEMKEY');
   }
@@ -70,6 +80,20 @@ protected function newItem() {
     return new PHUIListItemView();
   }
 
+  public function newPageContent(
+    PhabricatorProfileMenuItemConfiguration $config) {
+    return null;
+  }
+
+  public function getItemViewURI(
+    PhabricatorProfileMenuItemConfiguration $config) {
+
+    $engine = $this->getEngine();
+    $key = $config->getItemIdentifier();
+
+    return $engine->getItemURI("view/{$key}/");
+  }
+
   public function validateTransactions(
     PhabricatorProfileMenuItemConfiguration $config,
     $field_key,
diff --git a/src/applications/search/storage/PhabricatorProfileMenuItemConfiguration.php b/src/applications/search/storage/PhabricatorProfileMenuItemConfiguration.php
index 107fa63c72..f178cc49fe 100644
--- a/src/applications/search/storage/PhabricatorProfileMenuItemConfiguration.php
+++ b/src/applications/search/storage/PhabricatorProfileMenuItemConfiguration.php
@@ -185,6 +185,19 @@ public function isDefault() {
     return ($this->getVisibility() === self::VISIBILITY_DEFAULT);
   }
 
+  public function getItemIdentifier() {
+    $id = $this->getID();
+
+    if ($id) {
+      return (int)$id;
+    }
+
+    return $this->getBuiltinKey();
+  }
+
+  public function newPageContent() {
+    return $this->getMenuItem()->newPageContent($this);
+  }
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 

From 027de23970c071715d3e05544e6e59636c32a45d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 4 Feb 2017 07:08:49 -0800
Subject: [PATCH 063/865] Fix a policy error for restricted applications in a
 profile menu

Ref T12174. This could improperly raise a policy error. Instead, hide the menu item.

Auditors: chad
---
 .../menuitem/PhabricatorApplicationProfileMenuItem.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php
index 92477522ba..aa42d56cfb 100644
--- a/src/applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php
@@ -60,12 +60,12 @@ private function getApplication(
     $viewer = $this->getViewer();
     $phid = $config->getMenuItemProperty('application');
 
-    $app = id(new PhabricatorApplicationQuery())
+    $apps = id(new PhabricatorApplicationQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($phid))
-      ->executeOne();
+      ->execute();
 
-    return $app;
+    return head($apps);
   }
 
   protected function newNavigationMenuItems(

From eabb4072d03e0131532c1a55d627aee4eede05a4 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Sat, 4 Feb 2017 09:41:03 -0800
Subject: [PATCH 064/865] (stable) Add more color/CSS to phui-icon-selector

Summary: Fixes T12205. These got over-ridden at a global scale (correctly) and need to adjust local scopes better. Also make it more bluer.

Test Plan: Go to Edit Dashboard, and pick a new icon for a Dashboard.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12205

Differential Revision: https://secure.phabricator.com/D17312
---
 resources/celerity/map.php                    |  4 ++--
 .../rsrc/css/phui/phui-icon-set-selector.css  | 21 +++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 7bf3396ca8..750c4b0be4 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -151,7 +151,7 @@
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
     'rsrc/css/phui/phui-header-view.css' => '92935c02',
     'rsrc/css/phui/phui-hovercard.css' => 'e904f5dc',
-    'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
+    'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
     'rsrc/css/phui/phui-icon.css' => '09f46dd9',
     'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
@@ -864,7 +864,7 @@
     'phui-header-view-css' => '92935c02',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'e904f5dc',
-    'phui-icon-set-selector-css' => '1ab67aad',
+    'phui-icon-set-selector-css' => '87db8fee',
     'phui-icon-view-css' => '09f46dd9',
     'phui-image-mask-css' => 'a8498f9c',
     'phui-info-panel-css' => '27ea50a1',
diff --git a/webroot/rsrc/css/phui/phui-icon-set-selector.css b/webroot/rsrc/css/phui/phui-icon-set-selector.css
index 09a0362246..c66c2a6e55 100644
--- a/webroot/rsrc/css/phui/phui-icon-set-selector.css
+++ b/webroot/rsrc/css/phui/phui-icon-set-selector.css
@@ -3,8 +3,10 @@
  */
 
 button.icon-button {
-  background: #f7f7f7;
-  border: 1px solid {$lightblueborder};
+  background-color: #F7F7F9;
+  background-image: linear-gradient(to bottom, #ffffff, #f1f0f1);
+  border: 1px solid rgba({$alphablue},.2);
+  color: {$darkgreytext};
   position: relative;
   width: 16px;
   height: 16px;
@@ -15,6 +17,14 @@ button.icon-button {
   box-sizing: content-box;
 }
 
+button.icon-button:hover {
+  border: 1px solid rgba({$alphablue},.5);
+}
+
+button.icon-button .phui-icon-view {
+  color: {$darkbluetext};
+}
+
 .icon-grid {
   text-align: center;
 }
@@ -24,6 +34,9 @@ button.icon-button {
 }
 
 button.icon-button.selected {
-  background: {$bluebackground};
-  border: 1px solid {$blueborder};
+  border: 1px solid {$sky};
+}
+
+button.icon-button.selected .phui-icon-view {
+  color: {$sky};
 }

From c3bdcb4ca85487921909f0202aa760e8ed61404a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 4 Feb 2017 16:06:57 -0800
Subject: [PATCH 065/865] (stable) Allow users who can edit a dashboard to
 remove invalid / restricted panels

Summary:
Ref T12207. Currently, to remove a panel from a dashboard, it must be a valid panel which you can see.

Instead, only require that the panel PHID actually be listed somewhere in the dashboard's internal list of panels.

This interacts with the "multiple instances of a panel" issue described in some more depth in T12207. In particular:

  - Currently, you can sort of add multiple copies of a panel to a dashboard, sometimes? Maybe?
  - This leads to great tragedy.

This doesn't fix up the workflow with respect to multiple copies of a panel. We still remove by panel PHID (not by column/position or internal ID) so if a dashboard has multiple copies of the same panel for some reason, I think this workflow removes one of them arbitrarily (at best) or perhaps does something worse. I'm just treating this behavior as undefined for the moment.

Test Plan:
- Removed an invalid/hidden panel from a dashboard as a user with permission to edit that dashboard.
- Tried to remove a made-up panel with a totally bogus PHID, got 404'd.
- Viewed a dashboard with a restricted panel.
- Put a hidden panel inside a tab panel, viewed it as a user who could not see it and a user who could.

Reviewers: chad

Reviewed By: chad

Subscribers: swisspol

Maniphest Tasks: T12207

Differential Revision: https://secure.phabricator.com/D17314
---
 ...bricatorDashboardPanelRenderController.php |  1 +
 ...habricatorDashboardPanelViewController.php |  1 +
 ...bricatorDashboardRemovePanelController.php | 29 ++++++++---
 ...abricatorDashboardPanelRenderingEngine.php | 52 +++++++++++++------
 .../PhabricatorDashboardRenderingEngine.php   |  1 +
 .../PhabricatorDashboardTabsPanelType.php     |  1 +
 .../PhabricatorDashboardRemarkupRule.php      |  1 +
 7 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelRenderController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelRenderController.php
index 0a0e7e30c0..8f25a0f9bb 100644
--- a/src/applications/dashboard/controller/PhabricatorDashboardPanelRenderController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelRenderController.php
@@ -34,6 +34,7 @@ public function handleRequest(AphrontRequest $request) {
     $rendered_panel = id(new PhabricatorDashboardPanelRenderingEngine())
       ->setViewer($viewer)
       ->setPanel($panel)
+      ->setPanelPHID($panel->getPHID())
       ->setParentPanelPHIDs($parent_phids)
       ->setHeaderMode($request->getStr('headerMode'))
       ->setDashboardID($request->getInt('dashboardID'))
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
index 9fd9e1840d..4b5f1b45be 100644
--- a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
@@ -38,6 +38,7 @@ public function handleRequest(AphrontRequest $request) {
     $rendered_panel = id(new PhabricatorDashboardPanelRenderingEngine())
       ->setViewer($viewer)
       ->setPanel($panel)
+      ->setPanelPHID($panel->getPHID())
       ->setParentPanelPHIDs(array())
       ->renderPanel();
 
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardRemovePanelController.php b/src/applications/dashboard/controller/PhabricatorDashboardRemovePanelController.php
index 2fa8e83a10..c30b06c596 100644
--- a/src/applications/dashboard/controller/PhabricatorDashboardRemovePanelController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardRemovePanelController.php
@@ -20,12 +20,25 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
+    // NOTE: If you can edit a dashboard, you can remove panels from it even
+    // if you don't have permission to see them or they aren't valid. We only
+    // require that the panel be present on the dashboard.
+
     $v_panel = $request->getStr('panelPHID');
-    $panel = id(new PhabricatorDashboardPanelQuery())
-      ->setViewer($viewer)
-      ->withPHIDs(array($v_panel))
-      ->executeOne();
-    if (!$panel) {
+
+    $panel_on_dashboard = false;
+    $layout = $dashboard->getLayoutConfigObject();
+    $columns = $layout->getPanelLocations();
+    foreach ($columns as $column) {
+      foreach ($column as $column_panel_phid) {
+        if ($column_panel_phid == $v_panel) {
+          $panel_on_dashboard = true;
+          break;
+        }
+      }
+    }
+
+    if (!$panel_on_dashboard) {
       return new Aphront404Response();
     }
 
@@ -43,11 +56,11 @@ public function handleRequest(AphrontRequest $request) {
           ->setNewValue(
             array(
               '-' => array(
-                $panel->getPHID() => $panel->getPHID(),
+                $v_panel => $v_panel,
               ),
             ));
 
-      $layout_config->removePanel($panel->getPHID());
+      $layout_config->removePanel($v_panel);
       $dashboard->setLayoutConfigFromObject($layout_config);
 
       $editor = id(new PhabricatorDashboardTransactionEditor())
@@ -67,7 +80,7 @@ public function handleRequest(AphrontRequest $request) {
       ->appendChild(pht('Are you sure you want to remove this panel?'));
 
     return $this->newDialog()
-      ->setTitle(pht('Remove Panel %s', $panel->getMonogram()))
+      ->setTitle(pht('Remove Panel'))
       ->appendChild($form->buildLayoutView())
       ->addCancelButton($redirect_uri)
       ->addSubmitButton(pht('Remove Panel'));
diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
index 286d749a18..fbd5aaa2bb 100644
--- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
@@ -7,6 +7,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
   const HEADER_MODE_EDIT   = 'edit';
 
   private $panel;
+  private $panelPHID;
   private $viewer;
   private $enableAsyncRendering;
   private $parentPanelPHIDs;
@@ -66,6 +67,15 @@ public function getPanel() {
     return $this->panel;
   }
 
+  public function setPanelPHID($panel_phid) {
+    $this->panelPHID = $panel_phid;
+    return $this;
+  }
+
+  public function getPanelPHID() {
+    return $this->panelPHID;
+  }
+
   public function renderPanel() {
     $panel = $this->getPanel();
     $viewer = $this->getViewer();
@@ -255,32 +265,40 @@ private function addPanelHeaderActions(
     PHUIHeaderView $header) {
     $panel = $this->getPanel();
 
-    if (!$panel) {
-      return $header;
-    }
-
     $dashboard_id = $this->getDashboardID();
-    $edit_uri = id(new PhutilURI(
-      '/dashboard/panel/edit/'.$panel->getID().'/'));
-    if ($dashboard_id) {
-      $edit_uri->setQueryParam('dashboardID', $dashboard_id);
+
+    if ($panel) {
+      $panel_id = $panel->getID();
+
+      $edit_uri = "/dashboard/panel/edit/{$panel_id}/";
+      $edit_uri = new PhutilURI($edit_uri);
+      if ($dashboard_id) {
+        $edit_uri->setQueryParam('dashboardID', $dashboard_id);
+      }
+
+      $action_edit = id(new PHUIIconView())
+        ->setIcon('fa-pencil')
+        ->setWorkflow(true)
+        ->setHref((string)$edit_uri);
+
+      $header->addActionItem($action_edit);
     }
-    $action_edit = id(new PHUIIconView())
-      ->setIcon('fa-pencil')
-      ->setWorkflow(true)
-      ->setHref((string)$edit_uri);
-    $header->addActionItem($action_edit);
 
     if ($dashboard_id) {
-      $uri = id(new PhutilURI(
-        '/dashboard/removepanel/'.$dashboard_id.'/'))
-        ->setQueryParam('panelPHID', $panel->getPHID());
+      $panel_phid = $this->getPanelPHID();
+
+      $remove_uri = "/dashboard/removepanel/{$dashboard_id}/";
+      $remove_uri = id(new PhutilURI($remove_uri))
+        ->setQueryParam('panelPHID', $panel_phid);
+
       $action_remove = id(new PHUIIconView())
         ->setIcon('fa-trash-o')
-        ->setHref((string)$uri)
+        ->setHref((string)$remove_uri)
         ->setWorkflow(true);
+
       $header->addActionItem($action_remove);
     }
+
     return $header;
   }
 
diff --git a/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
index f9af84973e..d1e1d3111c 100644
--- a/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
@@ -55,6 +55,7 @@ public function renderDashboard() {
           ->setViewer($viewer)
           ->setDashboardID($dashboard->getID())
           ->setEnableAsyncRendering(true)
+          ->setPanelPHID($panel_phid)
           ->setParentPanelPHIDs(array())
           ->setHeaderMode($h_mode);
 
diff --git a/src/applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php b/src/applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php
index 4a0dae02f1..3cb758a11a 100644
--- a/src/applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php
+++ b/src/applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php
@@ -91,6 +91,7 @@ public function renderPanelContent(
           ->setEnableAsyncRendering(true)
           ->setParentPanelPHIDs($parent_phids)
           ->setPanel($panel)
+          ->setPanelPHID($panel->getPHID())
           ->setHeaderMode($no_headers)
           ->renderPanel();
       } else {
diff --git a/src/applications/dashboard/remarkup/PhabricatorDashboardRemarkupRule.php b/src/applications/dashboard/remarkup/PhabricatorDashboardRemarkupRule.php
index 6b0a48dc01..d96852b10e 100644
--- a/src/applications/dashboard/remarkup/PhabricatorDashboardRemarkupRule.php
+++ b/src/applications/dashboard/remarkup/PhabricatorDashboardRemarkupRule.php
@@ -32,6 +32,7 @@ protected function renderObjectEmbed(
     return id(new PhabricatorDashboardPanelRenderingEngine())
       ->setViewer($viewer)
       ->setPanel($object)
+      ->setPanelPHID($object->getPHID())
       ->setParentPanelPHIDs($parent_phids)
       ->renderPanel();
 

From 3e10f69570c0eb007f85917e16a249ea70d2dda8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 17 Feb 2017 17:44:47 -0800
Subject: [PATCH 066/865] (stable) Update Celerity map for the stable branch.

---
 resources/celerity/map.php | 122 ++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 750c4b0be4..d2953c72dd 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,9 +7,9 @@
  */
 return array(
   'names' => array(
-    'conpherence.pkg.css' => 'e25569a9',
+    'conpherence.pkg.css' => 'a520d619',
     'conpherence.pkg.js' => '6249a1cf',
-    'core.pkg.css' => '867a3ad4',
+    'core.pkg.css' => '0d7ecd3b',
     'core.pkg.js' => '1fa7c0c5',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '4815647b',
@@ -26,15 +26,15 @@
     'rsrc/css/aphront/multi-column.css' => '84cc6640',
     'rsrc/css/aphront/notification.css' => '3f6c89c9',
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
-    'rsrc/css/aphront/phabricator-nav-view.css' => 'b29426e9',
-    'rsrc/css/aphront/table-view.css' => '213a5981',
+    'rsrc/css/aphront/phabricator-nav-view.css' => 'e58a4a30',
+    'rsrc/css/aphront/table-view.css' => '6ca8e057',
     'rsrc/css/aphront/tokenizer.css' => '9a8cb501',
     'rsrc/css/aphront/tooltip.css' => '173b9431',
     'rsrc/css/aphront/typeahead-browse.css' => '8904346a',
-    'rsrc/css/aphront/typeahead.css' => 'd4f16145',
+    'rsrc/css/aphront/typeahead.css' => '8a84cc7d',
     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
     'rsrc/css/application/auth/auth.css' => '0877ed6e',
-    'rsrc/css/application/base/main-menu-view.css' => '62c04564',
+    'rsrc/css/application/base/main-menu-view.css' => '5294060f',
     'rsrc/css/application/base/notification-menu.css' => '6a697e43',
     'rsrc/css/application/base/phui-theme.css' => '9f261c6b',
     'rsrc/css/application/base/standard-page-view.css' => '894d8a25',
@@ -47,15 +47,15 @@
     'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
     'rsrc/css/application/conpherence/durable-column.css' => 'd82e130c',
     'rsrc/css/application/conpherence/header-pane.css' => 'db93ebc6',
-    'rsrc/css/application/conpherence/menu.css' => '4f51db5a',
+    'rsrc/css/application/conpherence/menu.css' => '3d8e5c9c',
     'rsrc/css/application/conpherence/message-pane.css' => 'b085d40d',
     'rsrc/css/application/conpherence/notification.css' => '965db05b',
-    'rsrc/css/application/conpherence/participant-pane.css' => 'ac1baaa8',
+    'rsrc/css/application/conpherence/participant-pane.css' => '604a8b02',
     'rsrc/css/application/conpherence/transaction.css' => '85129c68',
     'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
     'rsrc/css/application/countdown/timer.css' => '16c52f5c',
     'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a',
-    'rsrc/css/application/dashboard/dashboard.css' => 'bc6f2127',
+    'rsrc/css/application/dashboard/dashboard.css' => '0921c307',
     'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
     'rsrc/css/application/differential/changeset-view.css' => '6a9bdf9c',
@@ -81,8 +81,8 @@
     'rsrc/css/application/objectselector/object-selector.css' => '85ee8ce6',
     'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
     'rsrc/css/application/paste/paste.css' => '1898e534',
-    'rsrc/css/application/people/people-picture-menu-item.css' => '1ac65ef7',
-    'rsrc/css/application/people/people-profile.css' => '2473d929',
+    'rsrc/css/application/people/people-picture-menu-item.css' => 'a06f7f34',
+    'rsrc/css/application/people/people-profile.css' => '4df76faf',
     'rsrc/css/application/phame/phame.css' => '53fa6236',
     'rsrc/css/application/pholio/pholio-edit.css' => '07676f51',
     'rsrc/css/application/pholio/pholio-inline-comments.css' => '8e545e49',
@@ -97,21 +97,21 @@
     'rsrc/css/application/policy/policy.css' => '957ea14c',
     'rsrc/css/application/ponder/ponder-view.css' => 'fbd45f96',
     'rsrc/css/application/project/project-card-view.css' => 'f25746f5',
-    'rsrc/css/application/project/project-view.css' => 'ceabdbaa',
+    'rsrc/css/application/project/project-view.css' => '9f6ce0e1',
     'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733',
     'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
     'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
     'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae',
-    'rsrc/css/application/search/application-search-view.css' => '20ae9d85',
+    'rsrc/css/application/search/application-search-view.css' => '66ee5d46',
     'rsrc/css/application/search/search-results.css' => '64ad079a',
     'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
-    'rsrc/css/core/core.css' => '50dd5fa6',
+    'rsrc/css/core/core.css' => '9f4cb463',
     'rsrc/css/core/remarkup.css' => '4a2de2bb',
     'rsrc/css/core/syntax.css' => '769d3498',
     'rsrc/css/core/z-index.css' => '5e72c4e0',
-    'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
+    'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
     'rsrc/css/font/font-aleo.css' => '8bdb2835',
     'rsrc/css/font/font-awesome.css' => 'e838e088',
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
@@ -119,27 +119,27 @@
     'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
     'rsrc/css/layout/phabricator-source-code-view.css' => '4383192f',
     'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893',
-    'rsrc/css/phui/calendar/phui-calendar-list.css' => 'eb5c774b',
+    'rsrc/css/phui/calendar/phui-calendar-list.css' => '576be600',
     'rsrc/css/phui/calendar/phui-calendar-month.css' => '8e10e92c',
     'rsrc/css/phui/calendar/phui-calendar.css' => '477acfaa',
     'rsrc/css/phui/object-item/phui-oi-big-ui.css' => '19f9369b',
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
     'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => 'f12cbc9f',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
-    'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'bff632a4',
+    'rsrc/css/phui/object-item/phui-oi-list-view.css' => '5c383524',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
-    'rsrc/css/phui/phui-action-list.css' => '5679229f',
+    'rsrc/css/phui/phui-action-list.css' => 'f980c059',
     'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
     'rsrc/css/phui/phui-badge.css' => '3baef8db',
-    'rsrc/css/phui/phui-basic-nav-view.css' => '3d4b207b',
+    'rsrc/css/phui/phui-basic-nav-view.css' => 'a0705f53',
     'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
     'rsrc/css/phui/phui-box.css' => '269cbc99',
     'rsrc/css/phui/phui-button.css' => '7eaff361',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
-    'rsrc/css/phui/phui-cms.css' => 'be43c8a8',
+    'rsrc/css/phui/phui-cms.css' => '504b4b23',
     'rsrc/css/phui/phui-comment-form.css' => '48fbd65d',
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
-    'rsrc/css/phui/phui-crumbs-view.css' => 'f82868f2',
+    'rsrc/css/phui/phui-crumbs-view.css' => 'b743f73e',
     'rsrc/css/phui/phui-curtain-view.css' => '947bf1a4',
     'rsrc/css/phui/phui-document-pro.css' => 'f56738ed',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
@@ -149,7 +149,7 @@
     'rsrc/css/phui/phui-form-view.css' => 'adca31ce',
     'rsrc/css/phui/phui-form.css' => '5815af7b',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
-    'rsrc/css/phui/phui-header-view.css' => '92935c02',
+    'rsrc/css/phui/phui-header-view.css' => 'fef6a54e',
     'rsrc/css/phui/phui-hovercard.css' => 'e904f5dc',
     'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
     'rsrc/css/phui/phui-icon.css' => '09f46dd9',
@@ -170,7 +170,7 @@
     'rsrc/css/phui/phui-tag-view.css' => '84d65f26',
     'rsrc/css/phui/phui-timeline-view.css' => 'bc523970',
     'rsrc/css/phui/phui-two-column-view.css' => '8a1074c7',
-    'rsrc/css/phui/workboards/phui-workboard-color.css' => 'f0551a33',
+    'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
     'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
     'rsrc/css/phui/workboards/phui-workpanel.css' => 'a3a63478',
@@ -392,7 +392,7 @@
     'rsrc/js/application/countdown/timer.js' => 'e4cc26b3',
     'rsrc/js/application/daemon/behavior-bulk-job-reload.js' => 'edf8a145',
     'rsrc/js/application/dashboard/behavior-dashboard-async-panel.js' => '469c0d9e',
-    'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '019f36c4',
+    'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '408bf173',
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
@@ -433,7 +433,7 @@
     'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc',
     'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => 'bee502c8',
     'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => 'fbe497e7',
-    'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '3f5d6dbf',
+    'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => 'a6b98425',
     'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'fc91ab6c',
     'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef',
     'rsrc/js/application/policy/behavior-policy-control.js' => 'd0c516d5',
@@ -552,11 +552,11 @@
     'aphront-list-filter-view-css' => '5d6f0526',
     'aphront-multi-column-view-css' => '84cc6640',
     'aphront-panel-view-css' => '8427b78d',
-    'aphront-table-view-css' => '213a5981',
+    'aphront-table-view-css' => '6ca8e057',
     'aphront-tokenizer-control-css' => '9a8cb501',
     'aphront-tooltip-css' => '173b9431',
-    'aphront-typeahead-control-css' => 'd4f16145',
-    'application-search-view-css' => '20ae9d85',
+    'aphront-typeahead-control-css' => '8a84cc7d',
+    'application-search-view-css' => '66ee5d46',
     'auth-css' => '0877ed6e',
     'bulk-job-css' => 'df9c1d4a',
     'changeset-view-manager' => 'a2828756',
@@ -565,10 +565,10 @@
     'config-page-css' => 'c1d5121b',
     'conpherence-durable-column-view' => 'd82e130c',
     'conpherence-header-pane-css' => 'db93ebc6',
-    'conpherence-menu-css' => '4f51db5a',
+    'conpherence-menu-css' => '3d8e5c9c',
     'conpherence-message-pane-css' => 'b085d40d',
     'conpherence-notification-css' => '965db05b',
-    'conpherence-participant-pane-css' => 'ac1baaa8',
+    'conpherence-participant-pane-css' => '604a8b02',
     'conpherence-thread-manager' => 'c8b5ee6f',
     'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
@@ -583,7 +583,7 @@
     'diffusion-icons-css' => 'd678600a',
     'diffusion-readme-css' => '297373eb',
     'diffusion-source-css' => '750add59',
-    'diviner-shared-css' => 'aa3656aa',
+    'diviner-shared-css' => '896f1d43',
     'font-aleo' => '8bdb2835',
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
@@ -617,7 +617,7 @@
     'javelin-behavior-countdown-timer' => 'e4cc26b3',
     'javelin-behavior-dark-console' => 'f411b6ae',
     'javelin-behavior-dashboard-async-panel' => '469c0d9e',
-    'javelin-behavior-dashboard-move-panels' => '019f36c4',
+    'javelin-behavior-dashboard-move-panels' => '408bf173',
     'javelin-behavior-dashboard-query-panel-select' => '453c5375',
     'javelin-behavior-dashboard-tab-panel' => 'd4eecc63',
     'javelin-behavior-day-view' => '4b3c4443',
@@ -712,7 +712,7 @@
     'javelin-behavior-select-on-click' => '4e3e79a6',
     'javelin-behavior-setup-check-https' => '491416b3',
     'javelin-behavior-slowvote-embed' => '887ad43f',
-    'javelin-behavior-stripe-payment-form' => '3f5d6dbf',
+    'javelin-behavior-stripe-payment-form' => 'a6b98425',
     'javelin-behavior-test-payment-form' => 'fc91ab6c',
     'javelin-behavior-time-typeahead' => '522431f7',
     'javelin-behavior-toggle-class' => '92b9ec77',
@@ -778,15 +778,15 @@
     'owners-path-editor-css' => '2f00933b',
     'paste-css' => '1898e534',
     'path-typeahead' => 'f7fc67ec',
-    'people-picture-menu-item-css' => '1ac65ef7',
-    'people-profile-css' => '2473d929',
-    'phabricator-action-list-view-css' => '5679229f',
+    'people-picture-menu-item-css' => 'a06f7f34',
+    'people-profile-css' => '4df76faf',
+    'phabricator-action-list-view-css' => 'f980c059',
     'phabricator-busy' => '59a7976a',
     'phabricator-chatlog-css' => 'd295b020',
     'phabricator-content-source-view-css' => '4b8b05d4',
-    'phabricator-core-css' => '50dd5fa6',
+    'phabricator-core-css' => '9f4cb463',
     'phabricator-countdown-css' => '16c52f5c',
-    'phabricator-dashboard-css' => 'bc6f2127',
+    'phabricator-dashboard-css' => '0921c307',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -797,8 +797,8 @@
     'phabricator-flag-css' => 'bba8f811',
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => '4a021c10',
-    'phabricator-main-menu-view' => '62c04564',
-    'phabricator-nav-view-css' => 'b29426e9',
+    'phabricator-main-menu-view' => '5294060f',
+    'phabricator-nav-view-css' => 'e58a4a30',
     'phabricator-notification' => 'ccf1cbf8',
     'phabricator-notification-css' => '3f6c89c9',
     'phabricator-notification-menu-css' => '6a697e43',
@@ -838,19 +838,19 @@
     'phriction-document-css' => '4282e4ad',
     'phui-action-panel-css' => '91c7b835',
     'phui-badge-view-css' => '3baef8db',
-    'phui-basic-nav-view-css' => '3d4b207b',
+    'phui-basic-nav-view-css' => 'a0705f53',
     'phui-big-info-view-css' => 'bd903741',
     'phui-box-css' => '269cbc99',
     'phui-button-css' => '7eaff361',
     'phui-calendar-css' => '477acfaa',
     'phui-calendar-day-css' => '572b1893',
-    'phui-calendar-list-css' => 'eb5c774b',
+    'phui-calendar-list-css' => '576be600',
     'phui-calendar-month-css' => '8e10e92c',
     'phui-chart-css' => '6bf6f78e',
-    'phui-cms-css' => 'be43c8a8',
+    'phui-cms-css' => '504b4b23',
     'phui-comment-form-css' => '48fbd65d',
     'phui-comment-panel-css' => 'f50152ad',
-    'phui-crumbs-view-css' => 'f82868f2',
+    'phui-crumbs-view-css' => 'b743f73e',
     'phui-curtain-view-css' => '947bf1a4',
     'phui-document-summary-view-css' => '9ca48bdf',
     'phui-document-view-css' => 'c32e8dec',
@@ -861,7 +861,7 @@
     'phui-form-css' => '5815af7b',
     'phui-form-view-css' => 'adca31ce',
     'phui-head-thing-view-css' => 'fd311e5f',
-    'phui-header-view-css' => '92935c02',
+    'phui-header-view-css' => 'fef6a54e',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'e904f5dc',
     'phui-icon-set-selector-css' => '87db8fee',
@@ -878,7 +878,7 @@
     'phui-oi-color-css' => 'cd2b9b77',
     'phui-oi-drag-ui-css' => 'f12cbc9f',
     'phui-oi-flush-ui-css' => '9d9685d6',
-    'phui-oi-list-view-css' => 'bff632a4',
+    'phui-oi-list-view-css' => '5c383524',
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'bea33d23',
     'phui-pinboard-view-css' => '2495140e',
@@ -891,7 +891,7 @@
     'phui-theme-css' => '9f261c6b',
     'phui-timeline-view-css' => 'bc523970',
     'phui-two-column-view-css' => '8a1074c7',
-    'phui-workboard-color-css' => 'f0551a33',
+    'phui-workboard-color-css' => '783cdff5',
     'phui-workboard-view-css' => '3bc85455',
     'phui-workcard-view-css' => 'cca5fa92',
     'phui-workpanel-view-css' => 'a3a63478',
@@ -906,7 +906,7 @@
     'policy-transaction-detail-css' => '82100a43',
     'ponder-view-css' => 'fbd45f96',
     'project-card-view-css' => 'f25746f5',
-    'project-view-css' => 'ceabdbaa',
+    'project-view-css' => '9f6ce0e1',
     'releeph-core' => '9b3c5733',
     'releeph-preview-branch' => 'b7a6f4a5',
     'releeph-request-differential-create-dialog' => '8d8b92cd',
@@ -927,14 +927,6 @@
       'javelin-request',
       'javelin-typeahead-source',
     ),
-    '019f36c4' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'phabricator-draggable-list',
-    ),
     '01fca1f0' => array(
       'javelin-behavior',
       'javelin-workflow',
@@ -1161,10 +1153,13 @@
       'javelin-workflow',
       'javelin-stratcom',
     ),
-    '3f5d6dbf' => array(
+    '408bf173' => array(
       'javelin-behavior',
       'javelin-dom',
-      'phortune-credit-card-form',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'phabricator-draggable-list',
     ),
     '40a6a403' => array(
       'javelin-install',
@@ -1282,6 +1277,9 @@
       'javelin-vector',
       'javelin-typeahead-static-source',
     ),
+    '5294060f' => array(
+      'phui-theme-css',
+    ),
     '5359e785' => array(
       'javelin-install',
       'javelin-util',
@@ -1367,9 +1365,6 @@
       'javelin-magical-init',
       'javelin-util',
     ),
-    '62c04564' => array(
-      'phui-theme-css',
-    ),
     '62dfea03' => array(
       'javelin-install',
       'javelin-util',
@@ -1761,6 +1756,11 @@
       'phuix-icon-view',
       'phabricator-busy',
     ),
+    'a6b98425' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'phortune-credit-card-form',
+    ),
     'a6f7a73b' => array(
       'javelin-behavior',
       'javelin-stratcom',

From 216f6be11ece53cb1daafc8fff636dbdb0d7ef3d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Feb 2017 07:13:35 -0800
Subject: [PATCH 067/865] (stable) Add "--pool" and "--duration" flags to
 daemon CLI tools

Summary: Ref T12331. These changes are intended to make it easier to debug T12331 since I'm having difficulty reproducing the issue locally.

Test Plan:
  - Ran `bin/phd debug task --pool 4` and got an autoscaling pool.
  - Ran `bin/worker flood --duration 3` and got some 3-second-long tasks to execute with `bin/worker execute ...`.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12331

Differential Revision: https://secure.phabricator.com/D17431
---
 ...habricatorDaemonManagementDebugWorkflow.php |  7 +++++++
 .../__tests__/PhabricatorTestWorker.php        |  9 ++++++++-
 ...habricatorWorkerManagementFloodWorkflow.php | 18 ++++++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php
index 9a535af617..e861d238f2 100644
--- a/src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php
@@ -21,6 +21,12 @@ protected function didConstruct() {
             'name' => 'argv',
             'wildcard' => true,
           ),
+          array(
+            'name' => 'pool',
+            'param' => 'count',
+            'help' => pht('Maximum pool size.'),
+            'default' => 1,
+          ),
           array(
             'name' => 'as-current-user',
             'help' => pht(
@@ -43,6 +49,7 @@ public function execute(PhutilArgumentParser $args) {
     $config = array(
       'class' => array_shift($argv),
       'label' => 'debug',
+      'pool' => (int)$args->getArg('pool'),
       'argv' => $argv,
     );
 
diff --git a/src/infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php b/src/infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php
index 86e83acb82..f899ec1775 100644
--- a/src/infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php
+++ b/src/infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php
@@ -24,7 +24,14 @@ public function getWaitBeforeRetry(PhabricatorWorkerTask $task) {
   }
 
   protected function doWork() {
-    switch (idx($this->getTaskData(), 'doWork')) {
+    $data = $this->getTaskData();
+
+    $duration = idx($data, 'duration');
+    if ($duration) {
+      usleep($duration * 1000000);
+    }
+
+    switch (idx($data, 'doWork')) {
       case 'fail-temporary':
         throw new Exception(pht('Temporary failure!'));
       case 'fail-permanent':
diff --git a/src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php b/src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php
index 9bf52cfb71..fb067ddaac 100644
--- a/src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php
+++ b/src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php
@@ -11,12 +11,24 @@ protected function didConstruct() {
         pht(
           'Flood the queue with test tasks. This command is intended for '.
           'use when developing and debugging Phabricator.'))
-      ->setArguments(array());
+      ->setArguments(
+        array(
+          array(
+            'name' => 'duration',
+            'param' => 'seconds',
+            'help' => pht(
+              'Queue tasks which require a specific amount of wall time to '.
+              'complete. By default, tasks complete as quickly as possible.'),
+            'default' => 0,
+          ),
+        ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $console = PhutilConsole::getConsole();
 
+    $duration = (float)$args->getArg('duration');
+
     $console->writeOut(
       "%s\n",
       pht('Adding many test tasks to worker queue. Use ^C to exit.'));
@@ -25,7 +37,9 @@ public function execute(PhutilArgumentParser $args) {
     while (true) {
       PhabricatorWorker::scheduleTask(
         'PhabricatorTestWorker',
-        array());
+        array(
+          'duration' => $duration,
+        ));
 
       if (($n++ % 100) === 0) {
         $console->writeOut('.');

From 6f879559707c57006a1a95d839e2e2e6c64a5ff6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 16 Mar 2017 09:06:22 -0700
Subject: [PATCH 068/865] (stable) Correct an issue where "View Raw File" in
 Differential generated a file with overbroad permissions

Summary:
Via HackerOne. When you view a raw file in Differential, we currently generate a permanent file with default permissions. This may be incorrect: default permissions may be broader than the diff's permissions.

The other three methods of downloading/viewing raw files ("Download" in Diffusion and Differential, "View Raw" in Diffusion and Differential) already apply policies correctly and generate temporary files. However, this workflow was missed when other workflows were updated.

Beyond updating the workflow, delete any files we've generated in the past. This wipes the slate clean on any security issues and frees up a little disk space.

Test Plan:
  - Ran migration script, saw existing files get purged.
  - Did "View Raw File", got a new file.
  - Verified that the file was temporary and properly attached to the diff, with "NO ONE" permissions.
  - Double-checked that Diffusion already runs policy logic correctly and applies appropriate policies.
  - Double-checked that "Download Raw Diff" in Differential already runs policy logic correctly.
  - Double-chekced that "Download Raw Diff" in Diffusion already runs policy logic correctly.

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D17504
---
 .../sql/autopatches/20170316.rawfiles.01.php  | 53 +++++++++++++++++++
 .../DifferentialChangesetViewController.php   |  8 ++-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20170316.rawfiles.01.php

diff --git a/resources/sql/autopatches/20170316.rawfiles.01.php b/resources/sql/autopatches/20170316.rawfiles.01.php
new file mode 100644
index 0000000000..df2fa93c9a
--- /dev/null
+++ b/resources/sql/autopatches/20170316.rawfiles.01.php
@@ -0,0 +1,53 @@
+<?php
+
+// Previously, files generated by "View Raw File" were written as permanent
+// files with excessively wide view permissions. This destroys these files
+// so they are recreated as temporary files with correct permissions when
+// next accessed.
+
+$table = new DifferentialChangeset();
+$conn = $table->establishConnection('w');
+$viewer = PhabricatorUser::getOmnipotentUser();
+
+$iterator = new LiskRawMigrationIterator(
+  $conn,
+  $table->getTableName());
+
+echo tsprintf(
+  "%s\n",
+  pht('Purging old raw changeset file caches...'));
+
+$keys = array(
+  'raw:new:phid',
+  'raw:old:phid',
+);
+
+foreach ($iterator as $changeset) {
+  try {
+    $metadata = phutil_json_decode($changeset['metadata']);
+
+    $phids = array();
+    foreach ($keys as $key) {
+      if (isset($metadata[$key])) {
+        $phids[] = $metadata[$key];
+      }
+    }
+
+    foreach ($phids as $phid) {
+      $file = id(new PhabricatorFileQuery())
+        ->setViewer($viewer)
+        ->withPHIDs(array($phid))
+        ->executeOne();
+      if ($file) {
+        id(new PhabricatorDestructionEngine())
+          ->destroyObject($file);
+      }
+    }
+
+    // NOTE: We don't bother updating the changeset record itself: we already
+    // regenerate the cache properly if the stored value isn't valid.
+
+  } catch (Exception $ex) {
+    // Just move on if we run into trouble.
+  }
+}
diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php
index ff0da2f821..b5bfe7464d 100644
--- a/src/applications/differential/controller/DifferentialChangesetViewController.php
+++ b/src/applications/differential/controller/DifferentialChangesetViewController.php
@@ -350,13 +350,19 @@ private function buildRawFileResponse(
         $data = $changeset->makeOldFile();
       }
 
+      $diff = $changeset->getDiff();
+
       $file = PhabricatorFile::newFromFileData(
         $data,
         array(
-          'name'      => $changeset->getFilename(),
+          'name' => $changeset->getFilename(),
           'mime-type' => 'text/plain',
+          'ttl' => phutil_units('24 hours in seconds'),
+          'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
         ));
 
+      $file->attachToObject($diff->getPHID());
+
       $metadata[$key] = $file->getPHID();
       $changeset->setMetadata($metadata);
       $changeset->save();

From 56dd1b297c3e5cdbb477acc7435d6aa5749f33f2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 18 Mar 2017 17:29:44 -0700
Subject: [PATCH 069/865] (stable) Don't use "--" to separate flags and
 arguments in "git ls-remote"

Summary: Fixes T12416. See that task for discussion. Slightly older versions of `git` do not appear to support use of `--` to separate flags and arguments.

Test Plan:
  - Ran `bin/repository update PHABX`.
  - In T12416, had a user with Git 2.1.4 confirm that `git ls-remote X` worked while `git ls-remote -- X` failed.
  - Read `git help ls-remote` to look for any kind of suspicious `--destroy-the-world` flags, didn't see any that made me uneasy.

Reviewers: chad, avivey

Reviewed By: avivey

Maniphest Tasks: T12416

Differential Revision: https://secure.phabricator.com/D17508
---
 .../repository/engine/PhabricatorRepositoryPullEngine.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
index 1219e678d5..b144ecfd96 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
@@ -392,8 +392,11 @@ private function installGitHook() {
   private function loadGitRemoteRefs(PhabricatorRepository $repository) {
     $remote_envelope = $repository->getRemoteURIEnvelope();
 
+    // NOTE: "git ls-remote" does not support "--" until circa January 2016.
+    // See T12416. None of the flags to "ls-remote" appear dangerous, and
+    // other checks make it difficult to configure a suspicious remote URI.
     list($stdout) = $repository->execxRemoteCommand(
-      'ls-remote -- %P',
+      'ls-remote %P',
       $remote_envelope);
 
     $map = array();

From b2c029cbad5d966f7c4ce9aa90ca33881988f018 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 25 Mar 2017 04:14:32 -0700
Subject: [PATCH 070/865] (stable) Make the default Trigger hibernation 3
 minutes instead of 5 seconds

The `min()` vs `max()` fix in D17560 meant that the Trigger daemon only
hibernates for 5 seconds, so we do a full GC sweep every 5 seconds. This ends
up eating a fair amount of CPU for no real benefit.

The GC cursors should move to persistent storage, but just bump this default
up in the meantime.

Auditors: chad
---
 src/infrastructure/daemon/workers/PhabricatorTriggerDaemon.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infrastructure/daemon/workers/PhabricatorTriggerDaemon.php b/src/infrastructure/daemon/workers/PhabricatorTriggerDaemon.php
index 02ac55a160..9561f3d18a 100644
--- a/src/infrastructure/daemon/workers/PhabricatorTriggerDaemon.php
+++ b/src/infrastructure/daemon/workers/PhabricatorTriggerDaemon.php
@@ -275,7 +275,7 @@ private function executeTriggers() {
    * @return int Number of seconds to sleep for.
    */
   private function getSleepDuration() {
-    $sleep = 5;
+    $sleep = phutil_units('3 minutes in seconds');
 
     $next_triggers = id(new PhabricatorWorkerTriggerQuery())
       ->setViewer($this->getViewer())

From 8f7983a5be3a56db5b79dc7c3a0eb470f1d7ca02 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 25 Mar 2017 05:01:32 -0700
Subject: [PATCH 071/865] (stable) Only hibernate the Taskmaster after 15
 seconds of inactivity

Under some workloads, the taskmaster may hibernate and launch more rapidly
than it should. Require 15 seconds of inactivity before hibernating. Also
hibernate for longer.

Auditors: chad
---
 .../daemon/workers/PhabricatorTaskmasterDaemon.php         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php b/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
index 6cbbd8698e..57a69843a4 100644
--- a/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
+++ b/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
@@ -44,8 +44,11 @@ protected function run() {
         $sleep = 0;
       } else {
 
-        if ($this->shouldHibernate(60)) {
-          break;
+        if ($this->getIdleDuration() > 15) {
+          $hibernate_duration = phutil_units('3 minutes in seconds');
+          if ($this->shouldHibernate($hibernate_duration)) {
+            break;
+          }
         }
 
         // When there's no work, sleep for one second. The pool will

From 520d3b9392041893e10b43a133263c49b5d341aa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 3 Apr 2017 08:35:29 -0700
Subject: [PATCH 072/865] (stable) Don't downgrade accepts on update (fix
 "sticky accept")

Summary:
Fixes T12496. Sticky accept was accidentally impacted by the "void" changes in D17566.

Instead, don't always downgrade all accepts/rejects: on update, we only want to downgrade accepts.

Test Plan:
  - With sticky accept off, updated an accepted revision: new state is "needs review".
  - With sticky accept on, updated an accepted revision: new state is "accepted" (sticky accept working correctly).
  - Did "reject" + "request review" to make sure that still works, worked fine.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12496

Differential Revision: https://secure.phabricator.com/D17605
---
 .../editor/DifferentialTransactionEditor.php       | 14 ++++++++++++--
 .../DifferentialRevisionVoidTransaction.php        |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index bf7faa2700..f24bc7abda 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -339,12 +339,22 @@ protected function expandTransaction(
       }
     }
 
-    if ($downgrade_accepts || $downgrade_rejects) {
+    $downgrade = array();
+    if ($downgrade_accepts) {
+      $downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
+    }
+
+    if ($downgrade_accepts) {
+      $downgrade[] = DifferentialReviewerStatus::STATUS_REJECTED;
+    }
+
+    if ($downgrade) {
       $void_type = DifferentialRevisionVoidTransaction::TRANSACTIONTYPE;
+
       $results[] = id(new DifferentialTransaction())
         ->setTransactionType($void_type)
         ->setIgnoreOnNoEffect(true)
-        ->setNewValue(true);
+        ->setNewValue($downgrade);
     }
 
     $is_commandeer = false;
diff --git a/src/applications/differential/xaction/DifferentialRevisionVoidTransaction.php b/src/applications/differential/xaction/DifferentialRevisionVoidTransaction.php
index ae684d94fe..5073a9c464 100644
--- a/src/applications/differential/xaction/DifferentialRevisionVoidTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionVoidTransaction.php
@@ -28,7 +28,7 @@ public function generateNewValue($object, $value) {
           AND reviewerStatus IN (%Ls)',
       $table_name,
       $object->getPHID(),
-      $this->getVoidableStatuses());
+      $value);
 
     return ipull($rows, 'reviewerPHID');
   }
@@ -47,11 +47,11 @@ public function applyExternalEffects($object, $value) {
       'UPDATE %T SET voidedPHID = %s
         WHERE revisionPHID = %s
           AND voidedPHID IS NULL
-          AND reviewerStatus IN (%Ls)',
+          AND reviewerPHID IN (%Ls)',
       $table_name,
       $this->getActingAsPHID(),
       $object->getPHID(),
-      $this->getVoidableStatuses());
+      $value);
   }
 
   public function shouldHide() {

From 061375fde6525ea3e6eb701ddc570c5a422d7ffc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 4 Apr 2017 18:33:59 -0700
Subject: [PATCH 073/865] (stable) Fix a copy/paste typo with sticky accept

The root issue here is actually just that I cherry-picked stable locally
but did not push it. However, this is a minor issue I also caught while
double-checking things.

Auditors: chad
---
 .../differential/editor/DifferentialTransactionEditor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index f24bc7abda..dd6666c653 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -344,7 +344,7 @@ protected function expandTransaction(
       $downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
     }
 
-    if ($downgrade_accepts) {
+    if ($downgrade_rejects) {
       $downgrade[] = DifferentialReviewerStatus::STATUS_REJECTED;
     }
 

From 944f7da486708db3f4f4491cf7c6bc3ab919fa60 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 10 Apr 2017 15:46:35 -0700
Subject: [PATCH 074/865] (stable) Correct two parameter strictness issues with
 file uploads

Summary:
Fixes T12531. Strictness fallout from adding typechecking in D17616.

  - `chunkedHash` is not a real parameter, so the new typechecking was unhappy about it.
  - `mime-type` no longer allows `null`.

Test Plan:
  - Ran `arc upload --conduit-uri ... 12MB.zero` on a 12MB file full of zeroes.
  - Before patch: badness, failure, fallback to one-shot uploads.
  - After patch: success and glory.

Reviewers: chad

Subscribers: joshuaspence

Maniphest Tasks: T12531

Differential Revision: https://secure.phabricator.com/D17651
---
 .../conduit/FileUploadChunkConduitAPIMethod.php   | 15 ++++++++++-----
 .../files/storage/PhabricatorFile.php             |  5 +++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/applications/files/conduit/FileUploadChunkConduitAPIMethod.php b/src/applications/files/conduit/FileUploadChunkConduitAPIMethod.php
index 949bdde28a..b4d1a23a3f 100644
--- a/src/applications/files/conduit/FileUploadChunkConduitAPIMethod.php
+++ b/src/applications/files/conduit/FileUploadChunkConduitAPIMethod.php
@@ -61,15 +61,20 @@ protected function execute(ConduitAPIRequest $request) {
       $mime_type = 'application/octet-stream';
     }
 
+    $params = array(
+      'name' => $file->getMonogram().'.chunk-'.$chunk->getID(),
+      'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+    );
+
+    if ($mime_type !== null) {
+      $params['mime-type'] = 'application/octet-stream';
+    }
+
     // NOTE: These files have a view policy which prevents normal access. They
     // are only accessed through the storage engine.
     $chunk_data = PhabricatorFile::newFromFileData(
       $data,
-      array(
-        'name' => $file->getMonogram().'.chunk-'.$chunk->getID(),
-        'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
-        'mime-type' => $mime_type,
-      ));
+      $params);
 
     $chunk->setDataFilePHID($chunk_data->getPHID())->save();
 
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index 4faecbd557..db15fb43e0 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -251,6 +251,11 @@ public static function newChunkedFile(
     $file->setMimeType('application/octet-stream');
 
     $chunked_hash = idx($params, 'chunkedHash');
+
+    // Get rid of this parameter now; we aren't passing it any further down
+    // the stack.
+    unset($params['chunkedHash']);
+
     if ($chunked_hash) {
       $file->setContentHash($chunked_hash);
     } else {

From f624c8238123e2049c0893654df316505b67f2bd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Apr 2017 09:51:01 -0700
Subject: [PATCH 075/865] (stable) Fix an issue where rejecting reviewers
 weren't powerful enough

Summary:
Previously, "reject" and "reject older" were separate statuses. Now, they're both shades of "reject".

Set the "older reject" flag properly when we find a non-current reject.

Test Plan:
  - User A accepts a revision.
  - User B rejects it.
  - Author updates it.
  - Before patch: incorrectly transitions to "accepted" ("older" reject is ignored).
  - After patch: correctly transitions to "needs review".

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D17653
---
 .../differential/editor/DifferentialTransactionEditor.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index dd6666c653..0086c101e2 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -672,6 +672,8 @@ protected function applyFinalEffects(
               $active_phid = $active_diff->getPHID();
               if ($reviewer->isRejected($active_phid)) {
                 $has_rejecting_reviewer = true;
+              } else {
+                $has_rejecting_older_reviewer = true;
               }
               break;
             case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:

From 167e58479cd5fa20dcf9d225cb6370956cb2eb4b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Apr 2017 10:54:46 -0700
Subject: [PATCH 076/865] (stable) Remove 'isPartial' parameter with no effect

Summary: Fixes T12536. Nothing reads this parameter; `PhabricatorFile::newChunkedFile` sets the `isPartial` flag automatically.

Test Plan: Grepped for `isPartial`.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12536

Differential Revision: https://secure.phabricator.com/D17654
---
 .../files/uploadsource/PhabricatorFileUploadSource.php        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
index b4578e9e56..0ef33a2521 100644
--- a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
+++ b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
@@ -137,10 +137,6 @@ private function writeChunkedFile() {
 
     $parameters = $this->getNewFileParameters();
 
-    $parameters = array(
-      'isPartial' => true,
-    ) + $parameters;
-
     $data_length = $this->getDataLength();
     if ($data_length !== null) {
       $length = $data_length;

From 517372a1e0c48d0bc1961af06e132b8537776565 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Sat, 15 Apr 2017 06:08:00 -0700
Subject: [PATCH 077/865] (stable) Fix join and remove policy checks for
 Conpherence

Summary:
I think these got munged when I removed CAN_JOIN.

 - If you can view the room, you can join it.
 - ~~If you can view the room, you can add others to it.~~ This rule adjustment was removed, see discussion on the revision.
 - If you are a participant in the room, you can remove yourself.
 - If you can edit a room, you can remove anyone.

Test Plan:
Normal feature set:

 - Create a new room that only I can edit, viewable by all users.
 - Leave room (bye k thx)
 - Create another room, myself only
 - Join room from second account
 - See ability to only remove myself
 - Remove myself
 - Rejoin
 - Add third account
 - Log into first account
 - Boot off randos
 - Test joining by green button, message, and by + sign.

Policy consistency:

  - As a user who can not edit the room, tried to add other members. Received policy exception. The `+` button is currently visible and enabled for all users (even users who have not joined the room) but this is pre-existing.

Reviewers: chad

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D17696
---
 .../controller/ConpherenceViewController.php  |  3 ---
 .../conpherence/editor/ConpherenceEditor.php  | 24 +++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php
index 6b953b9de4..7a152a1e2e 100644
--- a/src/applications/conpherence/controller/ConpherenceViewController.php
+++ b/src/applications/conpherence/controller/ConpherenceViewController.php
@@ -147,9 +147,6 @@ private function renderFormContent() {
     $user = $this->getRequest()->getUser();
 
     $participating = $conpherence->getParticipantIfExists($user->getPHID());
-    if (!$participating && $user->isLoggedIn()) {
-      return null;
-    }
     $draft = PhabricatorDraft::newFromUserAndKey(
       $user,
       $conpherence->getPHID());
diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
index e358700348..c53aab7655 100644
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -341,13 +341,23 @@ protected function requireCapabilities(
         $add = array_keys(array_diff_key($new_map, $old_map));
         $rem = array_keys(array_diff_key($old_map, $new_map));
 
-        $actor_phid = $this->requireActor()->getPHID();
-
-        // You need CAN_EDIT to change participants other than yourself.
-        PhabricatorPolicyFilter::requireCapability(
-          $this->requireActor(),
-          $object,
-          PhabricatorPolicyCapability::CAN_EDIT);
+        $actor_phid = $this->getActingAsPHID();
+
+        $is_join = (($add === array($actor_phid)) && !$rem);
+        $is_leave = (($rem === array($actor_phid)) && !$add);
+
+        if ($is_join) {
+          // Anyone can join a thread they can see.
+        } else if ($is_leave) {
+          // Anyone can leave a thread.
+        } else {
+          // You need CAN_EDIT to add or remove participants. For additional
+          // discussion, see D17696 and T4411.
+          PhabricatorPolicyFilter::requireCapability(
+            $this->requireActor(),
+            $object,
+            PhabricatorPolicyCapability::CAN_EDIT);
+        }
 
         break;
       case ConpherenceThreadTitleTransaction::TRANSACTIONTYPE:

From ab3c81039c2f32f082cb5eb62711db6f7a5df68f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 17 Apr 2017 07:31:44 -0700
Subject: [PATCH 078/865] (stable) Fix a bad variable in global typehaead
 order/limit code

Summary: Ref T12538. I missed this in D17695, which renamed the variable. The logic was also a little off since `jj` is an index, not a count.

Test Plan: Typed `con` in global search, which hits "Con-pherence", "Con-duit" and "Con-fig", plus a bunch of other stuff. Got results after patch.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12538

Differential Revision: https://secure.phabricator.com/D17700
---
 resources/celerity/map.php                    | 28 +++++++++----------
 .../rsrc/js/core/behavior-search-typeahead.js |  5 ++--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d9eb3a42e0..fead6aa9dc 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => '437d3b5a',
     'conpherence.pkg.js' => '281b1a73',
     'core.pkg.css' => 'b2ad82f4',
-    'core.pkg.js' => 'bf3b5cdf',
+    'core.pkg.js' => 'deabcef7',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '90b30783',
     'differential.pkg.js' => 'ddfeb49b',
@@ -510,7 +510,7 @@
     'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
     'rsrc/js/core/behavior-reveal-content.js' => '60821bc7',
     'rsrc/js/core/behavior-scrollbar.js' => '834a1173',
-    'rsrc/js/core/behavior-search-typeahead.js' => '0f2a0820',
+    'rsrc/js/core/behavior-search-typeahead.js' => 'eded9ee8',
     'rsrc/js/core/behavior-select-content.js' => 'bf5374ef',
     'rsrc/js/core/behavior-select-on-click.js' => '4e3e79a6',
     'rsrc/js/core/behavior-setup-check-https.js' => '491416b3',
@@ -666,7 +666,7 @@
     'javelin-behavior-phabricator-oncopy' => '2926fff2',
     'javelin-behavior-phabricator-remarkup-assist' => '0ca788bd',
     'javelin-behavior-phabricator-reveal-content' => '60821bc7',
-    'javelin-behavior-phabricator-search-typeahead' => '0f2a0820',
+    'javelin-behavior-phabricator-search-typeahead' => 'eded9ee8',
     'javelin-behavior-phabricator-show-older-transactions' => '94c65b72',
     'javelin-behavior-phabricator-tooltips' => 'c420b0b9',
     'javelin-behavior-phabricator-transaction-comment-form' => 'b23b49e6',
@@ -988,17 +988,6 @@
       'phuix-autocomplete',
       'javelin-mask',
     ),
-    '0f2a0820' => array(
-      'javelin-behavior',
-      'javelin-typeahead-ondemand-source',
-      'javelin-typeahead',
-      'javelin-dom',
-      'javelin-uri',
-      'javelin-util',
-      'javelin-stratcom',
-      'phabricator-prefab',
-      'phuix-icon-view',
-    ),
     '0f764c35' => array(
       'javelin-install',
       'javelin-util',
@@ -2155,6 +2144,17 @@
       'javelin-dom',
       'phabricator-draggable-list',
     ),
+    'eded9ee8' => array(
+      'javelin-behavior',
+      'javelin-typeahead-ondemand-source',
+      'javelin-typeahead',
+      'javelin-dom',
+      'javelin-uri',
+      'javelin-util',
+      'javelin-stratcom',
+      'phabricator-prefab',
+      'phuix-icon-view',
+    ),
     'edf8a145' => array(
       'javelin-behavior',
       'javelin-uri',
diff --git a/webroot/rsrc/js/core/behavior-search-typeahead.js b/webroot/rsrc/js/core/behavior-search-typeahead.js
index 864d45ff29..fc752a6079 100644
--- a/webroot/rsrc/js/core/behavior-search-typeahead.js
+++ b/webroot/rsrc/js/core/behavior-search-typeahead.js
@@ -94,7 +94,6 @@ JX.behavior('phabricator-search-typeahead', function(config) {
     // If we have more results than fit, limit each type of result to 3, so
     // we show 3 applications, then 3 users, etc. For jump items, we show only
     // one result.
-
     var jj;
     var results = [];
     for (ii = 0; ii < type_order.length; ii++) {
@@ -108,8 +107,8 @@ JX.behavior('phabricator-search-typeahead', function(config) {
         //   - we have more items than will fit in the typeahead, and this
         //     is the 4..Nth result of its type.
 
-        var skip = ((current_type == 'jump') && (jj > 1)) ||
-                   ((list.length > config.limit) && (type_count > 3));
+        var skip = ((current_type == 'jump') && (jj >= 1)) ||
+                   ((list.length > config.limit) && (jj >= 3));
         if (skip) {
           continue;
         }

From 2d7a64783ca20f06e1a63163e893c366ccdb3a74 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 19 Apr 2017 08:56:35 -0700
Subject: [PATCH 079/865] (stable) Stem fulltext tokens before filtering them
 for stopwords

Summary:
Fixes T12596. A query for a token (like "having") which stems to a stopword (like "have") currently survives filtering. Stem it first so it gets caught.

Also, for InnoDB, a custom stopword table can be configured. If it is, read that instead of the default stopword list (I configured it locally, but the default list is reasonable so we never formally recommended installs configure it).

Test Plan:
Queried for words that stem to stopwords, saw them filtered:

{F4915843}

Queried for the original problem query and saw "having" caught with "have" in the stopword list:

{F4915844}

Fiddled with local InnoDB stopword table config and saw the stopword list get loaded correctly.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12596

Differential Revision: https://secure.phabricator.com/D17728
---
 .../PhabricatorMySQLFulltextStorageEngine.php | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
index 5bb9943e59..b22076cf92 100644
--- a/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
+++ b/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
@@ -228,6 +228,13 @@ private function newFulltextSubquery(
         $fulltext_tokens[$key] = $fulltext_token;
 
         $value = $token->getValue();
+
+        // If the value is unquoted, we'll stem it in the query, so stem it
+        // here before performing filtering tests. See T12596.
+        if (!$token->isQuoted()) {
+          $value = $stemmer->stemToken($value);
+        }
+
         if (phutil_utf8_strlen($value) < $min_length) {
           $fulltext_token->setIsShort(true);
           continue;
@@ -479,16 +486,32 @@ private function newEngineLimits(AphrontDatabaseConnection $conn) {
     try {
       $result = queryfx_one(
         $conn,
-        'SELECT @@innodb_ft_min_token_size innodb_max');
+        'SELECT @@innodb_ft_min_token_size innodb_max,
+          @@innodb_ft_server_stopword_table innodb_stopword_config');
     } catch (AphrontQueryException $ex) {
       $result = null;
     }
 
     if ($result) {
       $min_len = $result['innodb_max'];
+
+      $stopword_config = $result['innodb_stopword_config'];
+      if (preg_match('(/)', $stopword_config)) {
+        // If the setting is nonempty and contains a slash, query the
+        // table the user has configured.
+        $parts = explode('/', $stopword_config);
+        list($stopword_database, $stopword_table) = $parts;
+      } else {
+        // Otherwise, query the InnoDB default stopword table.
+        $stopword_database = 'INFORMATION_SCHEMA';
+        $stopword_table = 'INNODB_FT_DEFAULT_STOPWORD';
+      }
+
       $stopwords = queryfx_all(
         $conn,
-        'SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_DEFAULT_STOPWORD');
+        'SELECT * FROM %T.%T',
+        $stopword_database,
+        $stopword_table);
       $stopwords = ipull($stopwords, 'value');
       $stopwords = array_fuse($stopwords);
 

From a8729747f8e2c591b99edb9911f91653e9d30297 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 21 Apr 2017 16:55:00 -0700
Subject: [PATCH 080/865] (stable) Trivial edit to make `master` merge cleanly.

---
 src/applications/conpherence/editor/ConpherenceEditor.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
index c53aab7655..e8239821c6 100644
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -358,7 +358,6 @@ protected function requireCapabilities(
             $object,
             PhabricatorPolicyCapability::CAN_EDIT);
         }
-
         break;
       case ConpherenceThreadTitleTransaction::TRANSACTIONTYPE:
       case ConpherenceThreadTopicTransaction::TRANSACTIONTYPE:

From 033c4ace0de67c38fdfdfbf1da593cfd49aef61b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 21 Apr 2017 16:57:55 -0700
Subject: [PATCH 081/865] (stable) Rebuild Celerity map after merge.

---
 resources/celerity/map.php | 251 ++++++++++++++++++++-----------------
 1 file changed, 133 insertions(+), 118 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index fead6aa9dc..7937f6556e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,20 +7,25 @@
  */
 return array(
   'names' => array(
-    'conpherence.pkg.css' => '437d3b5a',
-    'conpherence.pkg.js' => '281b1a73',
-    'core.pkg.css' => 'b2ad82f4',
-    'core.pkg.js' => 'deabcef7',
-    'darkconsole.pkg.js' => 'e7393ebb',
+    'conpherence.pkg.css' => 'ff161f2d',
+    'conpherence.pkg.js' => 'b5b51108',
+    'core.pkg.css' => '005d943f',
+    'core.pkg.js' => '47a69358',
+    'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '90b30783',
     'differential.pkg.js' => 'ddfeb49b',
-    'diffusion.pkg.css' => '91c5d3a6',
+    'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
     'maniphest.pkg.css' => '4845691a',
     'maniphest.pkg.js' => '5ab2753f',
+    'rsrc/audio/basic/alert.mp3' => '98461568',
+    'rsrc/audio/basic/bing.mp3' => 'ab8603a5',
+    'rsrc/audio/basic/pock.mp3' => '0cc772f5',
+    'rsrc/audio/basic/tap.mp3' => 'fc2fd796',
+    'rsrc/audio/basic/ting.mp3' => '17660001',
     'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
-    'rsrc/css/aphront/dark-console.css' => 'f54bf286',
+    'rsrc/css/aphront/dark-console.css' => '53798a6d',
     'rsrc/css/aphront/dialog-view.css' => '685c7e2d',
     'rsrc/css/aphront/list-filter-view.css' => '5d6f0526',
     'rsrc/css/aphront/multi-column.css' => '84cc6640',
@@ -45,12 +50,13 @@
     'rsrc/css/application/config/config-template.css' => '8f18fa41',
     'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
     'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
+    'rsrc/css/application/conpherence/color.css' => 'abb4c358',
     'rsrc/css/application/conpherence/durable-column.css' => '89ea6bef',
-    'rsrc/css/application/conpherence/header-pane.css' => '4082233d',
-    'rsrc/css/application/conpherence/menu.css' => '3d8e5c9c',
-    'rsrc/css/application/conpherence/message-pane.css' => 'd1fc13e1',
+    'rsrc/css/application/conpherence/header-pane.css' => 'cb6f4e19',
+    'rsrc/css/application/conpherence/menu.css' => '6953e7ec',
+    'rsrc/css/application/conpherence/message-pane.css' => 'b0f55ecc',
     'rsrc/css/application/conpherence/notification.css' => 'cef0a3fc',
-    'rsrc/css/application/conpherence/participant-pane.css' => '604a8b02',
+    'rsrc/css/application/conpherence/participant-pane.css' => '26a3ce56',
     'rsrc/css/application/conpherence/transaction.css' => '85129c68',
     'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
     'rsrc/css/application/countdown/timer.css' => '16c52f5c',
@@ -65,8 +71,8 @@
     'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
     'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
     'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
-    'rsrc/css/application/diffusion/diffusion-icons.css' => 'd678600a',
-    'rsrc/css/application/diffusion/diffusion-readme.css' => '297373eb',
+    'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
+    'rsrc/css/application/diffusion/diffusion-readme.css' => '18bd3910',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => '5c1b47c2',
@@ -133,7 +139,7 @@
     'rsrc/css/phui/phui-basic-nav-view.css' => 'a0705f53',
     'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
     'rsrc/css/phui/phui-box.css' => '269cbc99',
-    'rsrc/css/phui/phui-button.css' => '96787bae',
+    'rsrc/css/phui/phui-button.css' => '8d23596a',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-cms.css' => '504b4b23',
     'rsrc/css/phui/phui-comment-form.css' => '57af2e14',
@@ -148,7 +154,7 @@
     'rsrc/css/phui/phui-form-view.css' => '6175808d',
     'rsrc/css/phui/phui-form.css' => 'a5570f70',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
-    'rsrc/css/phui/phui-header-view.css' => '9cf828ce',
+    'rsrc/css/phui/phui-header-view.css' => 'e082678d',
     'rsrc/css/phui/phui-hovercard.css' => 'ae091fc5',
     'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
     'rsrc/css/phui/phui-icon.css' => '12b387a1',
@@ -158,11 +164,11 @@
     'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0',
     'rsrc/css/phui/phui-lightbox.css' => '0a035e40',
     'rsrc/css/phui/phui-list.css' => '12eb8ce6',
-    'rsrc/css/phui/phui-object-box.css' => '8b289e3d',
+    'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => '77d8a794',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
     'rsrc/css/phui/phui-property-list-view.css' => '2dc7993f',
-    'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
+    'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
@@ -234,7 +240,7 @@
     'rsrc/externals/javelin/lib/DOM.js' => '805b806a',
     'rsrc/externals/javelin/lib/History.js' => 'd4505101',
     'rsrc/externals/javelin/lib/JSON.js' => '69adf288',
-    'rsrc/externals/javelin/lib/Leader.js' => 'fea0eb47',
+    'rsrc/externals/javelin/lib/Leader.js' => '7f243deb',
     'rsrc/externals/javelin/lib/Mask.js' => '8a41885b',
     'rsrc/externals/javelin/lib/Quicksand.js' => '6b8ef10b',
     'rsrc/externals/javelin/lib/Request.js' => '94b750d2',
@@ -245,7 +251,7 @@
     'rsrc/externals/javelin/lib/Sound.js' => '949c0fe5',
     'rsrc/externals/javelin/lib/URI.js' => 'c989ade3',
     'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
-    'rsrc/externals/javelin/lib/WebSocket.js' => 'e292eaf4',
+    'rsrc/externals/javelin/lib/WebSocket.js' => '3ffe32d6',
     'rsrc/externals/javelin/lib/Workflow.js' => '1e911d0f',
     'rsrc/externals/javelin/lib/__tests__/Cookie.js' => '5ed109e8',
     'rsrc/externals/javelin/lib/__tests__/DOM.js' => 'c984504b',
@@ -361,19 +367,19 @@
     'rsrc/image/texture/table_header.png' => '5c433037',
     'rsrc/image/texture/table_header_hover.png' => '038ec3b9',
     'rsrc/image/texture/table_header_tall.png' => 'd56b434f',
-    'rsrc/js/application/aphlict/Aphlict.js' => '5359e785',
+    'rsrc/js/application/aphlict/Aphlict.js' => 'e1d4b11a',
     'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => 'caade6f2',
-    'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'fb20ac8d',
+    'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => '3c547a81',
     'rsrc/js/application/aphlict/behavior-aphlict-status.js' => '5e2634b9',
     'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => 'd5a2d665',
     'rsrc/js/application/calendar/behavior-day-view.js' => '4b3c4443',
     'rsrc/js/application/calendar/behavior-event-all-day.js' => 'b41537c9',
     'rsrc/js/application/calendar/behavior-month-view.js' => 'fe33e256',
     'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408',
-    'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'c8b5ee6f',
+    'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '4d863052',
     'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '9bbf3762',
     'rsrc/js/application/conpherence/behavior-durable-column.js' => 'aa3bd034',
-    'rsrc/js/application/conpherence/behavior-menu.js' => '7524fcfa',
+    'rsrc/js/application/conpherence/behavior-menu.js' => 'c9b99b77',
     'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8',
     'rsrc/js/application/conpherence/behavior-pontificate.js' => '55616e04',
     'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
@@ -396,7 +402,7 @@
     'rsrc/js/application/differential/behavior-populate.js' => '8694b1df',
     'rsrc/js/application/differential/behavior-toggle-files.js' => 'ca3f91eb',
     'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
-    'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'b42eddc7',
+    'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'c93358e3',
     'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
     'rsrc/js/application/diffusion/behavior-commit-branches.js' => 'bdaf4d04',
     'rsrc/js/application/diffusion/behavior-commit-graph.js' => '49ae8328',
@@ -446,7 +452,7 @@
     'rsrc/js/application/transactions/behavior-reorder-fields.js' => 'b59e1e96',
     'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '94c65b72',
     'rsrc/js/application/transactions/behavior-transaction-comment-form.js' => 'b23b49e6',
-    'rsrc/js/application/transactions/behavior-transaction-list.js' => '13c739ea',
+    'rsrc/js/application/transactions/behavior-transaction-list.js' => '1f6794f6',
     'rsrc/js/application/typeahead/behavior-typeahead-browse.js' => '635de1ec',
     'rsrc/js/application/typeahead/behavior-typeahead-search.js' => '93d0c9e3',
     'rsrc/js/application/uiexample/JavelinViewExample.js' => 'd4a14807',
@@ -482,7 +488,6 @@
     'rsrc/js/core/behavior-autofocus.js' => '7319e029',
     'rsrc/js/core/behavior-badge-view.js' => '8ff5e24c',
     'rsrc/js/core/behavior-choose-control.js' => '327a00d1',
-    'rsrc/js/core/behavior-dark-console.js' => 'f411b6ae',
     'rsrc/js/core/behavior-detect-timezone.js' => '4c193c96',
     'rsrc/js/core/behavior-device.js' => 'bb1dd507',
     'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '484a6e22',
@@ -521,6 +526,9 @@
     'rsrc/js/core/behavior-user-menu.js' => '31420f77',
     'rsrc/js/core/behavior-watch-anchor.js' => '9f36c42d',
     'rsrc/js/core/behavior-workflow.js' => '0a3f3021',
+    'rsrc/js/core/darkconsole/DarkLog.js' => 'c8e1ffe3',
+    'rsrc/js/core/darkconsole/DarkMessage.js' => 'c48cccdd',
+    'rsrc/js/core/darkconsole/behavior-dark-console.js' => '17bb8539',
     'rsrc/js/core/phtize.js' => 'd254d646',
     'rsrc/js/phui/behavior-phui-dropdown-menu.js' => 'b95d6f7d',
     'rsrc/js/phui/behavior-phui-file-upload.js' => 'b003d4fb',
@@ -536,7 +544,7 @@
   'symbols' => array(
     'almanac-css' => 'dbb9b3af',
     'aphront-bars' => '231ac33c',
-    'aphront-dark-console-css' => 'f54bf286',
+    'aphront-dark-console-css' => '53798a6d',
     'aphront-dialog-view-css' => '685c7e2d',
     'aphront-list-filter-view-css' => '5d6f0526',
     'aphront-multi-column-view-css' => '84cc6640',
@@ -552,13 +560,14 @@
     'conduit-api-css' => '7bc725c4',
     'config-options-css' => '0ede4c9b',
     'config-page-css' => 'c1d5121b',
+    'conpherence-color-css' => 'abb4c358',
     'conpherence-durable-column-view' => '89ea6bef',
-    'conpherence-header-pane-css' => '4082233d',
-    'conpherence-menu-css' => '3d8e5c9c',
-    'conpherence-message-pane-css' => 'd1fc13e1',
+    'conpherence-header-pane-css' => 'cb6f4e19',
+    'conpherence-menu-css' => '6953e7ec',
+    'conpherence-message-pane-css' => 'b0f55ecc',
     'conpherence-notification-css' => 'cef0a3fc',
-    'conpherence-participant-pane-css' => '604a8b02',
-    'conpherence-thread-manager' => 'c8b5ee6f',
+    'conpherence-participant-pane-css' => '26a3ce56',
+    'conpherence-thread-manager' => '4d863052',
     'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
     'differential-changeset-view-css' => '41af6d25',
@@ -569,8 +578,8 @@
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-icons-css' => 'd678600a',
-    'diffusion-readme-css' => '297373eb',
+    'diffusion-icons-css' => 'a6a1e2ba',
+    'diffusion-readme-css' => '18bd3910',
     'diffusion-source-css' => '750add59',
     'diviner-shared-css' => '896f1d43',
     'font-fontawesome' => 'e838e088',
@@ -581,10 +590,10 @@
     'herald-rule-editor' => 'd6a7e717',
     'herald-test-css' => 'a52e323e',
     'inline-comment-summary-css' => '51efda3a',
-    'javelin-aphlict' => '5359e785',
+    'javelin-aphlict' => 'e1d4b11a',
     'javelin-behavior' => '61cbc29a',
     'javelin-behavior-aphlict-dropdown' => 'caade6f2',
-    'javelin-behavior-aphlict-listen' => 'fb20ac8d',
+    'javelin-behavior-aphlict-listen' => '3c547a81',
     'javelin-behavior-aphlict-status' => '5e2634b9',
     'javelin-behavior-aphront-basic-tokenizer' => 'b3a4b884',
     'javelin-behavior-aphront-drag-and-drop-textarea' => '484a6e22',
@@ -598,12 +607,12 @@
     'javelin-behavior-choose-control' => '327a00d1',
     'javelin-behavior-comment-actions' => '9a6dd75c',
     'javelin-behavior-config-reorder-fields' => 'b6993408',
-    'javelin-behavior-conpherence-menu' => '7524fcfa',
+    'javelin-behavior-conpherence-menu' => 'c9b99b77',
     'javelin-behavior-conpherence-participant-pane' => '8604caa8',
     'javelin-behavior-conpherence-pontificate' => '55616e04',
     'javelin-behavior-conpherence-search' => '9bbf3762',
     'javelin-behavior-countdown-timer' => 'e4cc26b3',
-    'javelin-behavior-dark-console' => 'f411b6ae',
+    'javelin-behavior-dark-console' => '17bb8539',
     'javelin-behavior-dashboard-async-panel' => '469c0d9e',
     'javelin-behavior-dashboard-move-panels' => '408bf173',
     'javelin-behavior-dashboard-query-panel-select' => '453c5375',
@@ -670,7 +679,7 @@
     'javelin-behavior-phabricator-show-older-transactions' => '94c65b72',
     'javelin-behavior-phabricator-tooltips' => 'c420b0b9',
     'javelin-behavior-phabricator-transaction-comment-form' => 'b23b49e6',
-    'javelin-behavior-phabricator-transaction-list' => '13c739ea',
+    'javelin-behavior-phabricator-transaction-list' => '1f6794f6',
     'javelin-behavior-phabricator-watch-anchor' => '9f36c42d',
     'javelin-behavior-pholio-mock-edit' => 'bee502c8',
     'javelin-behavior-pholio-mock-view' => 'fbe497e7',
@@ -712,7 +721,7 @@
     'javelin-behavior-workflow' => '0a3f3021',
     'javelin-color' => '7e41274a',
     'javelin-cookie' => '62dfea03',
-    'javelin-diffusion-locate-file-source' => 'b42eddc7',
+    'javelin-diffusion-locate-file-source' => 'c93358e3',
     'javelin-dom' => '805b806a',
     'javelin-dynval' => 'f6555212',
     'javelin-event' => '2ee659ce',
@@ -720,7 +729,7 @@
     'javelin-history' => 'd4505101',
     'javelin-install' => '05270951',
     'javelin-json' => '69adf288',
-    'javelin-leader' => 'fea0eb47',
+    'javelin-leader' => '7f243deb',
     'javelin-magical-init' => '3010e992',
     'javelin-mask' => '8a41885b',
     'javelin-quicksand' => '6b8ef10b',
@@ -751,7 +760,7 @@
     'javelin-view-interpreter' => 'f829edb3',
     'javelin-view-renderer' => '6c2b09a2',
     'javelin-view-visitor' => 'efe49472',
-    'javelin-websocket' => 'e292eaf4',
+    'javelin-websocket' => '3ffe32d6',
     'javelin-workboard-board' => '8935deef',
     'javelin-workboard-card' => 'c587b80f',
     'javelin-workboard-column' => '21df4ff5',
@@ -774,6 +783,8 @@
     'phabricator-content-source-view-css' => '4b8b05d4',
     'phabricator-core-css' => '9f4cb463',
     'phabricator-countdown-css' => '16c52f5c',
+    'phabricator-darklog' => 'c8e1ffe3',
+    'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
@@ -829,7 +840,7 @@
     'phui-basic-nav-view-css' => 'a0705f53',
     'phui-big-info-view-css' => 'bd903741',
     'phui-box-css' => '269cbc99',
-    'phui-button-css' => '96787bae',
+    'phui-button-css' => '8d23596a',
     'phui-calendar-css' => '477acfaa',
     'phui-calendar-day-css' => '572b1893',
     'phui-calendar-list-css' => '576be600',
@@ -849,7 +860,7 @@
     'phui-form-css' => 'a5570f70',
     'phui-form-view-css' => '6175808d',
     'phui-head-thing-view-css' => 'fd311e5f',
-    'phui-header-view-css' => '9cf828ce',
+    'phui-header-view-css' => 'e082678d',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'ae091fc5',
     'phui-icon-set-selector-css' => '87db8fee',
@@ -861,7 +872,7 @@
     'phui-invisible-character-view-css' => '6993d9f0',
     'phui-lightbox-css' => '0a035e40',
     'phui-list-view-css' => '12eb8ce6',
-    'phui-object-box-css' => '8b289e3d',
+    'phui-object-box-css' => '9cff003c',
     'phui-oi-big-ui-css' => '19f9369b',
     'phui-oi-color-css' => 'cd2b9b77',
     'phui-oi-drag-ui-css' => 'f12cbc9f',
@@ -871,7 +882,7 @@
     'phui-pager-css' => '77d8a794',
     'phui-pinboard-view-css' => '2495140e',
     'phui-property-list-view-css' => '2dc7993f',
-    'phui-remarkup-preview-css' => '1a8f2591',
+    'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
     'phui-status-list-view-css' => 'd5263e49',
@@ -998,19 +1009,21 @@
       'javelin-dom',
       'javelin-typeahead-normalizer',
     ),
-    '13c739ea' => array(
+    '1499a8cb' => array(
       'javelin-behavior',
       'javelin-stratcom',
-      'javelin-workflow',
       'javelin-dom',
-      'javelin-uri',
-      'phabricator-textareautils',
+      'javelin-history',
     ),
-    '1499a8cb' => array(
+    '17bb8539' => array(
       'javelin-behavior',
       'javelin-stratcom',
+      'javelin-util',
       'javelin-dom',
-      'javelin-history',
+      'javelin-request',
+      'phabricator-keyboard-shortcut',
+      'phabricator-darklog',
+      'phabricator-darkmessage',
     ),
     '185bbd53' => array(
       'javelin-install',
@@ -1052,6 +1065,14 @@
       'javelin-uri',
       'javelin-routable',
     ),
+    '1f6794f6' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-dom',
+      'javelin-uri',
+      'phabricator-textareautils',
+    ),
     '1fe2510c' => array(
       'javelin-install',
       'javelin-dom',
@@ -1126,6 +1147,20 @@
       'javelin-dom',
       'javelin-magical-init',
     ),
+    '3c547a81' => array(
+      'javelin-behavior',
+      'javelin-aphlict',
+      'javelin-stratcom',
+      'javelin-request',
+      'javelin-uri',
+      'javelin-dom',
+      'javelin-json',
+      'javelin-router',
+      'javelin-util',
+      'javelin-leader',
+      'javelin-sound',
+      'phabricator-notification',
+    ),
     '3cb0b2fc' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1141,6 +1176,9 @@
       'javelin-workflow',
       'javelin-stratcom',
     ),
+    '3ffe32d6' => array(
+      'javelin-install',
+    ),
     '408bf173' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1241,6 +1279,17 @@
       'javelin-uri',
       'phabricator-notification',
     ),
+    '4d863052' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-aphlict',
+      'javelin-workflow',
+      'javelin-router',
+      'javelin-behavior-device',
+      'javelin-vector',
+    ),
     '4e3e79a6' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1280,13 +1329,6 @@
     '5294060f' => array(
       'phui-theme-css',
     ),
-    '5359e785' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-websocket',
-      'javelin-leader',
-      'javelin-json',
-    ),
     '54b612ba' => array(
       'javelin-color',
       'javelin-install',
@@ -1430,20 +1472,6 @@
       'javelin-vector',
       'javelin-dom',
     ),
-    '7524fcfa' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-behavior-device',
-      'javelin-history',
-      'javelin-vector',
-      'javelin-scrollbar',
-      'phabricator-title',
-      'phabricator-shaped-request',
-      'conpherence-thread-manager',
-    ),
     '76b9fc3e' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1489,6 +1517,9 @@
       'javelin-behavior',
       'javelin-history',
     ),
+    '7f243deb' => array(
+      'javelin-install',
+    ),
     '8018ee50' => array(
       'javelin-install',
       'javelin-util',
@@ -1835,12 +1866,6 @@
     'b3e7d692' => array(
       'javelin-install',
     ),
-    'b42eddc7' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-typeahead-preloaded-source',
-      'javelin-util',
-    ),
     'b59e1e96' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1947,17 +1972,6 @@
     'c7ccd872' => array(
       'phui-fontkit-css',
     ),
-    'c8b5ee6f' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-aphlict',
-      'javelin-workflow',
-      'javelin-router',
-      'javelin-behavior-device',
-      'javelin-vector',
-    ),
     'c90a04fc' => array(
       'javelin-dom',
       'javelin-dynval',
@@ -1966,11 +1980,31 @@
       'javelin-install',
       'javelin-util',
     ),
+    'c93358e3' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-typeahead-preloaded-source',
+      'javelin-util',
+    ),
     'c989ade3' => array(
       'javelin-install',
       'javelin-util',
       'javelin-stratcom',
     ),
+    'c9b99b77' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-behavior-device',
+      'javelin-history',
+      'javelin-vector',
+      'javelin-scrollbar',
+      'phabricator-title',
+      'phabricator-shaped-request',
+      'conpherence-thread-manager',
+    ),
     'ca3f91eb' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2092,14 +2126,18 @@
       'javelin-dom',
       'phabricator-draggable-list',
     ),
+    'e1d4b11a' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-websocket',
+      'javelin-leader',
+      'javelin-json',
+    ),
     'e1ff79b1' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
-    'e292eaf4' => array(
-      'javelin-install',
-    ),
     'e2e0a072' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2173,14 +2211,6 @@
     'f12cbc9f' => array(
       'phui-oi-list-view-css',
     ),
-    'f411b6ae' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-request',
-      'phabricator-keyboard-shortcut',
-    ),
     'f50152ad' => array(
       'phui-timeline-view-css',
     ),
@@ -2203,20 +2233,6 @@
       'javelin-install',
       'javelin-dom',
     ),
-    'fb20ac8d' => array(
-      'javelin-behavior',
-      'javelin-aphlict',
-      'javelin-stratcom',
-      'javelin-request',
-      'javelin-uri',
-      'javelin-dom',
-      'javelin-json',
-      'javelin-router',
-      'javelin-util',
-      'javelin-leader',
-      'javelin-sound',
-      'phabricator-notification',
-    ),
     'fbe497e7' => array(
       'javelin-behavior',
       'javelin-util',
@@ -2242,14 +2258,12 @@
       'javelin-view-visitor',
       'javelin-util',
     ),
-    'fea0eb47' => array(
-      'javelin-install',
-    ),
   ),
   'packages' => array(
     'conpherence.pkg.css' => array(
       'conpherence-durable-column-view',
       'conpherence-menu-css',
+      'conpherence-color-css',
       'conpherence-message-pane-css',
       'conpherence-notification-css',
       'conpherence-transaction-css',
@@ -2370,6 +2384,7 @@
       'javelin-behavior-toggle-class',
       'javelin-behavior-lightbox-attachments',
       'phabricator-busy',
+      'javelin-sound',
       'javelin-aphlict',
       'phabricator-notification',
       'javelin-behavior-aphlict-listen',

From 72976909b1bfa0a3ddd05c3efc737dbb7275f321 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Sat, 22 Apr 2017 16:01:10 +0000
Subject: [PATCH 082/865] (stable) Fix variable name for theme_class

Summary: Fixes T12622. This variable is mis-named.

Test Plan: Visit a room I have not joined.

Reviewers: epriestley, amckinley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12622

Differential Revision: https://secure.phabricator.com/D17767
---
 src/applications/conpherence/storage/ConpherenceThread.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/conpherence/storage/ConpherenceThread.php b/src/applications/conpherence/storage/ConpherenceThread.php
index 7e4c3dc09f..0c70ef2cb5 100644
--- a/src/applications/conpherence/storage/ConpherenceThread.php
+++ b/src/applications/conpherence/storage/ConpherenceThread.php
@@ -204,7 +204,7 @@ public function getDisplayData(PhabricatorUser $viewer) {
     }
 
     $user_participation = $this->getParticipantIfExists($viewer->getPHID());
-    $theme = ConpherenceRoomSettings::COLOR_LIGHT;
+    $theme_class = ConpherenceRoomSettings::COLOR_LIGHT;
     if ($user_participation) {
       $user_seen_count = $user_participation->getSeenMessageCount();
       $participant = $this->getParticipant($viewer->getPHID());

From c65ef0401e20502eae73b2dbcd1b6c3a5bbc3a21 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 22 Apr 2017 09:21:40 -0700
Subject: [PATCH 083/865] (stable) Fix Conpherence theme variables for both
 logged-out and logged-in users

Summary: Ref T12622.

Test Plan: As a logged-out and logged-in user, loaded Conpherence threads.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12622

Differential Revision: https://secure.phabricator.com/D17768
---
 src/applications/conpherence/storage/ConpherenceThread.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/applications/conpherence/storage/ConpherenceThread.php b/src/applications/conpherence/storage/ConpherenceThread.php
index 0c70ef2cb5..bb355154a4 100644
--- a/src/applications/conpherence/storage/ConpherenceThread.php
+++ b/src/applications/conpherence/storage/ConpherenceThread.php
@@ -204,17 +204,18 @@ public function getDisplayData(PhabricatorUser $viewer) {
     }
 
     $user_participation = $this->getParticipantIfExists($viewer->getPHID());
-    $theme_class = ConpherenceRoomSettings::COLOR_LIGHT;
+    $theme = ConpherenceRoomSettings::COLOR_LIGHT;
     if ($user_participation) {
       $user_seen_count = $user_participation->getSeenMessageCount();
       $participant = $this->getParticipant($viewer->getPHID());
       $settings = $participant->getSettings();
       $theme = idx($settings, 'theme', $theme);
-      $theme_class = ConpherenceRoomSettings::getThemeClass($theme);
     } else {
       $user_seen_count = 0;
     }
+
     $unread_count = $this->getMessageCount() - $user_seen_count;
+    $theme_class = ConpherenceRoomSettings::getThemeClass($theme);
 
     $title = $this->getTitle();
     $topic = $this->getTopic();

From 46b50a5995cbdac49434aa2ced2b33155e748a3f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 26 Apr 2017 11:48:44 -0700
Subject: [PATCH 084/865] (stable) Reduce the impact of `bin/storage dump`

Summary:
Ref T12646.

  - Use "wb1" instead of "wb" to use level 1 gzip compression (faster, less compressy). Locally, this went about 2x faster and the output only grew 4% larger.
  - LinesOfALargeExecFuture does a lot of unnecessary string operations, and can boil down to a busy wait. The process is pretty saturated by I/O so this isn't the end of the world, but just use raw ExecFuture with FutureIterator so that we wait in `select()`.
  - Also, nice the process to +19 so we try to give other things CPU.

Test Plan:
  - Ran `bin/storage dump --compress --output ...`.
  - Saw CPU time for my local database drop from ~240s to ~90s, with a 4% larger output. Most of this was adding the `1`, but the ExecFuture thing helped a little, too.
  - I'm not sure what a great way to test `nice` in a local environment is and it's system dependent anyway, but nothing got worse / blew up.
  - Used `gzcat | head` and `gzcat | tail` on the result to sanity-check that everything was preserved.

Reviewers: chad, amckinley

Reviewed By: chad

Maniphest Tasks: T12646

Differential Revision: https://secure.phabricator.com/D17795
---
 ...abricatorStorageManagementDumpWorkflow.php | 49 +++++++++++++------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index 7195e735c6..4dc5c64042 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -138,6 +138,13 @@ public function didExecute(PhutilArgumentParser $args) {
       $command = csprintf('mysqldump %Ls', $argv);
     }
 
+    // Decrease the CPU priority of this process so it doesn't contend with
+    // other more important things.
+    if (function_exists('proc_nice')) {
+      proc_nice(19);
+    }
+
+
     // If we aren't writing to a file, just passthru the command.
     if ($output_file === null) {
       return phutil_passthru('%C', $command);
@@ -148,7 +155,7 @@ public function didExecute(PhutilArgumentParser $args) {
     // a full disk). See T6996 for discussion.
 
     if ($is_compress) {
-      $file = gzopen($output_file, 'wb');
+      $file = gzopen($output_file, 'wb1');
     } else {
       $file = fopen($output_file, 'wb');
     }
@@ -162,23 +169,35 @@ public function didExecute(PhutilArgumentParser $args) {
 
     $future = new ExecFuture('%C', $command);
 
-    $lines = new LinesOfALargeExecFuture($future);
-
     try {
-      foreach ($lines as $line) {
-        $line = $line."\n";
-        if ($is_compress) {
-          $ok = gzwrite($file, $line);
-        } else {
-          $ok = fwrite($file, $line);
+      $iterator = id(new FutureIterator(array($future)))
+        ->setUpdateInterval(0.100);
+      foreach ($iterator as $ready) {
+        list($stdout, $stderr) = $future->read();
+        $future->discardBuffers();
+
+        if (strlen($stderr)) {
+          fwrite(STDERR, $stderr);
         }
 
-        if ($ok !== strlen($line)) {
-          throw new Exception(
-            pht(
-              'Failed to write %d byte(s) to file "%s".',
-              new PhutilNumber(strlen($line)),
-              $output_file));
+        if (strlen($stdout)) {
+          if ($is_compress) {
+            $ok = gzwrite($file, $stdout);
+          } else {
+            $ok = fwrite($file, $stdout);
+          }
+
+          if ($ok !== strlen($stdout)) {
+            throw new Exception(
+              pht(
+                'Failed to write %d byte(s) to file "%s".',
+                new PhutilNumber(strlen($stdout)),
+                $output_file));
+          }
+        }
+
+        if ($ready !== null) {
+          $ready->resolvex();
         }
       }
 

From 733ae2a2e94c7713bea4cc8c71e3bb2f18a34615 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 4 May 2017 17:00:02 -0700
Subject: [PATCH 085/865] Explicitly quote "From" name part when submitting
 mail to the Mailgun API

Summary:
We are submitting `epriestley (Evan Priestley) <noreply@meta.phacility.com>`, but should be submitting `"epriestley (Evan Priestley)" <noreply@meta.phacility.com>`.

Add the missing quotes.

Test Plan: Locally, this makes the API calls work against the Mailgun sandbox domain.

Reviewers: chad, amckinley

Reviewed By: chad, amckinley

Differential Revision: https://secure.phabricator.com/D17831
---
 .../adapter/PhabricatorMailImplementationMailgunAdapter.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
index 0890ac3004..cfe6491fe0 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
@@ -86,7 +86,7 @@ public function send() {
 
     $from = idx($this->params, 'from');
     if (idx($this->params, 'from-name')) {
-      $params['from'] = "{$this->params['from-name']} <{$from}>";
+      $params['from'] = "\"{$this->params['from-name']}\" <{$from}>";
     } else {
       $params['from'] = $from;
     }

From 22c3e49b5176f97a18d2c51a4baf223d2ca05add Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 5 May 2017 19:50:05 -0700
Subject: [PATCH 086/865] (stable) Fix file attach bug in Macro

Summary: This was mis-tested by only using one account, which could always see the image. External transaction moved file attachment to the modular transaction for file and audio instead.

Test Plan: Test adding audio and a macro on a pleb account, visit with normal account and see macro fine.

Reviewers: epriestley, amckinley

Reviewed By: amckinley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D17836
---
 .../editor/PhabricatorMacroEditEngine.php     |  2 +-
 .../macro/editor/PhabricatorMacroEditor.php   | 38 -------------------
 .../PhabricatorMacroAudioTransaction.php      | 28 ++++++++++++++
 .../PhabricatorMacroFileTransaction.php       | 28 ++++++++++++++
 4 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/src/applications/macro/editor/PhabricatorMacroEditEngine.php b/src/applications/macro/editor/PhabricatorMacroEditEngine.php
index 3f472ff0ce..2cafea937f 100644
--- a/src/applications/macro/editor/PhabricatorMacroEditEngine.php
+++ b/src/applications/macro/editor/PhabricatorMacroEditEngine.php
@@ -6,7 +6,7 @@ final class PhabricatorMacroEditEngine
   const ENGINECONST = 'macro.image';
 
   public function getEngineName() {
-    return pht('Macro Imagea');
+    return pht('Macro Image');
   }
 
   public function getSummaryHeader() {
diff --git a/src/applications/macro/editor/PhabricatorMacroEditor.php b/src/applications/macro/editor/PhabricatorMacroEditor.php
index d9067c5367..5d28b78f5f 100644
--- a/src/applications/macro/editor/PhabricatorMacroEditor.php
+++ b/src/applications/macro/editor/PhabricatorMacroEditor.php
@@ -19,44 +19,6 @@ public function getCreateObjectTitleForFeed($author, $object) {
     return pht('%s created %s.', $author, $object);
   }
 
-  protected function applyCustomExternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case PhabricatorMacroFileTransaction::TRANSACTIONTYPE:
-      case PhabricatorMacroAudioTransaction::TRANSACTIONTYPE:
-        // When changing a macro's image or audio, attach the underlying files
-        // to the macro (and detach the old files).
-        $old = $xaction->getOldValue();
-        $new = $xaction->getNewValue();
-        $all = array();
-        if ($old) {
-          $all[] = $old;
-        }
-        if ($new) {
-          $all[] = $new;
-        }
-
-        $files = id(new PhabricatorFileQuery())
-          ->setViewer($this->requireActor())
-          ->withPHIDs($all)
-          ->execute();
-        $files = mpull($files, null, 'getPHID');
-
-        $old_file = idx($files, $old);
-        if ($old_file) {
-          $old_file->detachFromObject($object->getPHID());
-        }
-
-        $new_file = idx($files, $new);
-        if ($new_file) {
-          $new_file->attachToObject($object->getPHID());
-        }
-        break;
-    }
-  }
-
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
diff --git a/src/applications/macro/xaction/PhabricatorMacroAudioTransaction.php b/src/applications/macro/xaction/PhabricatorMacroAudioTransaction.php
index aacf9f4016..26dc64c1f3 100644
--- a/src/applications/macro/xaction/PhabricatorMacroAudioTransaction.php
+++ b/src/applications/macro/xaction/PhabricatorMacroAudioTransaction.php
@@ -13,6 +13,34 @@ public function applyInternalEffects($object, $value) {
     $object->setAudioPHID($value);
   }
 
+  public function applyExternalEffects($object, $value) {
+    $old = $this->generateOldValue($object);
+    $new = $value;
+    $all = array();
+    if ($old) {
+      $all[] = $old;
+    }
+    if ($new) {
+      $all[] = $new;
+    }
+
+    $files = id(new PhabricatorFileQuery())
+      ->setViewer($this->getActor())
+      ->withPHIDs($all)
+      ->execute();
+    $files = mpull($files, null, 'getPHID');
+
+    $old_file = idx($files, $old);
+    if ($old_file) {
+      $old_file->detachFromObject($object->getPHID());
+    }
+
+    $new_file = idx($files, $new);
+    if ($new_file) {
+      $new_file->attachToObject($object->getPHID());
+    }
+  }
+
   public function getTitle() {
     $new = $this->getNewValue();
     $old = $this->getOldValue();
diff --git a/src/applications/macro/xaction/PhabricatorMacroFileTransaction.php b/src/applications/macro/xaction/PhabricatorMacroFileTransaction.php
index 77c9f24dd9..35091cd585 100644
--- a/src/applications/macro/xaction/PhabricatorMacroFileTransaction.php
+++ b/src/applications/macro/xaction/PhabricatorMacroFileTransaction.php
@@ -13,6 +13,34 @@ public function applyInternalEffects($object, $value) {
     $object->setFilePHID($value);
   }
 
+  public function applyExternalEffects($object, $value) {
+    $old = $this->generateOldValue($object);
+    $new = $value;
+    $all = array();
+    if ($old) {
+      $all[] = $old;
+    }
+    if ($new) {
+      $all[] = $new;
+    }
+
+    $files = id(new PhabricatorFileQuery())
+      ->setViewer($this->getActor())
+      ->withPHIDs($all)
+      ->execute();
+    $files = mpull($files, null, 'getPHID');
+
+    $old_file = idx($files, $old);
+    if ($old_file) {
+      $old_file->detachFromObject($object->getPHID());
+    }
+
+    $new_file = idx($files, $new);
+    if ($new_file) {
+      $new_file->attachToObject($object->getPHID());
+    }
+  }
+
   public function getTitle() {
     return pht(
       '%s changed the image for this macro.',

From b0df33e6ecd715ae67552ce57030581b158f5623 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 5 May 2017 19:55:29 -0700
Subject: [PATCH 087/865] (stable) Don't apply patches or mark patches applied
 with `bin/storage upgrade --dryrun`

Summary: Fixes T12682.

Test Plan: Ran `bin/storage upgrade --dryrun` repeatedly with un-applied patches, saw it not apply them and not mark them applied.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12682

Differential Revision: https://secure.phabricator.com/D17837
---
 .../workflow/PhabricatorStorageManagementWorkflow.php     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
index e915cedb8d..48d753781d 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
@@ -1090,7 +1090,9 @@ final private function doUpgradeSchemata(
             }
 
             $t_begin = microtime(true);
-            $api->applyPatch($patch);
+            if (!$is_dryrun) {
+              $api->applyPatch($patch);
+            }
             $t_end = microtime(true);
 
             $duration = ($t_end - $t_begin);
@@ -1100,7 +1102,9 @@ final private function doUpgradeSchemata(
           // If we're explicitly reapplying this patch, we don't need to
           // mark it as applied.
           if (!isset($state_map[$ref_key][$key])) {
-            $api->markPatchApplied($key, ($t_end - $t_begin));
+            if (!$is_dryrun) {
+              $api->markPatchApplied($key, ($t_end - $t_begin));
+            }
             $applied_map[$ref_key][$key] = true;
           }
         }

From bc6d25ffc0594ccf49ab7e4a7e88e4a257de1eb1 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Sun, 14 May 2017 14:15:06 -0700
Subject: [PATCH 088/865] Move Board Manage actions up a level

Summary: Moves "reorder columns" and "change background" up a level, redesigns "manage" page to be a little cleaner.

Test Plan: Change colors, reorder columns, manage page, disable board, re-enable board.

Reviewers: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D17879
---
 ...icatorProjectBoardBackgroundController.php |   3 +-
 ...habricatorProjectBoardManageController.php | 103 +++++-------------
 ...abricatorProjectBoardReorderController.php |   4 +-
 .../PhabricatorProjectBoardViewController.php |  29 +++--
 4 files changed, 51 insertions(+), 88 deletions(-)

diff --git a/src/applications/project/controller/PhabricatorProjectBoardBackgroundController.php b/src/applications/project/controller/PhabricatorProjectBoardBackgroundController.php
index 3ba1f03a56..99260d1770 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardBackgroundController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardBackgroundController.php
@@ -28,6 +28,7 @@ public function handleRequest(AphrontRequest $request) {
     $this->setProject($board);
     $id = $board->getID();
 
+    $view_uri = $this->getApplicationURI("board/{$id}/");
     $manage_uri = $this->getApplicationURI("board/{$id}/manage/");
 
     if ($request->isFormPost()) {
@@ -47,7 +48,7 @@ public function handleRequest(AphrontRequest $request) {
         ->applyTransactions($board, $xactions);
 
       return id(new AphrontRedirectResponse())
-        ->setURI($manage_uri);
+        ->setURI($view_uri);
     }
 
     $nav = $this->getProfileMenu();
diff --git a/src/applications/project/controller/PhabricatorProjectBoardManageController.php b/src/applications/project/controller/PhabricatorProjectBoardManageController.php
index 75bff07106..aecb5aa42a 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardManageController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardManageController.php
@@ -31,112 +31,58 @@ public function handleRequest(AphrontRequest $request) {
     $board_id = $board->getID();
 
     $header = $this->buildHeaderView($board);
-    $actions = $this->buildActionView($board);
-    $properties = $this->buildPropertyView($board);
-
-    $properties->setActionList($actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Workboard'), "/project/board/{$board_id}/");
     $crumbs->addTextCrumb(pht('Manage'));
-
-    $box = id(new PHUIObjectBoxView())
-      ->setHeader($header)
-      ->addPropertyList($properties);
+    $crumbs->setBorder(true);
 
     $nav = $this->getProfileMenu();
+    $columns_list = $this->buildColumnsList($board, $columns);
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter($columns_list);
 
     $title = array(
       pht('Manage Workboard'),
       $board->getDisplayName(),
     );
 
-    $columns_list = $this->buildColumnsList($board, $columns);
-
     return $this->newPage()
       ->setTitle($title)
       ->setNavigation($nav)
       ->setCrumbs($crumbs)
-      ->appendChild(
-        array(
-          $box,
-          $columns_list,
-        ));
+      ->appendChild($view);
   }
 
   private function buildHeaderView(PhabricatorProject $board) {
-    $viewer = $this->getRequest()->getUser();
-
-    $header = id(new PHUIHeaderView())
-      ->setUser($viewer)
-      ->setHeader(pht('Workboard: %s', $board->getDisplayName()));
-
-    return $header;
-  }
-
-  private function buildActionView(PhabricatorProject $board) {
-    $viewer = $this->getRequest()->getUser();
-    $id = $board->getID();
-
-    $actions = id(new PhabricatorActionListView())
-      ->setUser($viewer);
+    $viewer = $this->getViewer();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $board,
       PhabricatorPolicyCapability::CAN_EDIT);
 
-    $reorder_uri = $this->getApplicationURI("board/{$id}/reorder/");
-
-    $actions->addAction(
-      id(new PhabricatorActionView())
-        ->setIcon('fa-exchange')
-        ->setName(pht('Reorder Columns'))
-        ->setHref($reorder_uri)
-        ->setDisabled(!$can_edit)
-        ->setWorkflow(true));
-
-    $background_uri = $this->getApplicationURI("board/{$id}/background/");
-
-    $actions->addAction(
-      id(new PhabricatorActionView())
-        ->setIcon('fa-paint-brush')
-        ->setName(pht('Change Background Color'))
-        ->setHref($background_uri)
-        ->setDisabled(!$can_edit)
-        ->setWorkflow(!$can_edit));
-
+    $id = $board->getID();
     $disable_uri = $this->getApplicationURI("board/{$id}/disable/");
 
-    $actions->addAction(
-      id(new PhabricatorActionView())
-        ->setIcon('fa-ban')
-        ->setName(pht('Disable Board'))
-        ->setHref($disable_uri)
-        ->setDisabled(!$can_edit)
-        ->setWorkflow(true));
+    $button = id(new PHUIButtonView())
+      ->setTag('a')
+      ->setIcon('fa-ban')
+      ->setText(pht('Disable Board'))
+      ->setHref($disable_uri)
+      ->setDisabled(!$can_edit)
+      ->setWorkflow(true);
 
-    return $actions;
-  }
-
-  private function buildPropertyView(
-    PhabricatorProject $board) {
-    $viewer = $this->getRequest()->getUser();
-
-    $properties = id(new PHUIPropertyListView())
+    $header = id(new PHUIHeaderView())
+      ->setHeader(pht('Workboard: %s', $board->getDisplayName()))
       ->setUser($viewer)
-      ->setObject($board);
-
-    $background = $board->getDisplayWorkboardBackgroundColor();
-    if ($background !== null) {
-      $map = PhabricatorProjectWorkboardBackgroundColor::getOptions();
-      $map = ipull($map, 'name');
+      ->setPolicyObject($board)
+      ->setProfileHeader(true)
+      ->addActionLink($button);
 
-      $name = idx($map, $background, $background);
-      $properties->addProperty(pht('Background Color'), $name);
-    }
-
-    return $properties;
+    return $header;
   }
 
   private function buildColumnsList(
@@ -165,6 +111,11 @@ private function buildColumnsList(
 
       if ($column->isHidden()) {
         $item->setDisabled(true);
+        $item->addAttribute(pht('Hidden'));
+        $item->setImageIcon('fa-columns grey');
+      } else {
+        $item->addAttribute(pht('Visible'));
+        $item->setImageIcon('fa-columns');
       }
 
       $view->addItem($item);
diff --git a/src/applications/project/controller/PhabricatorProjectBoardReorderController.php b/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
index 05f1dd2d43..fc348bb02f 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
@@ -23,13 +23,13 @@ public function handleRequest(AphrontRequest $request) {
     $this->setProject($project);
     $project_id = $project->getID();
 
-    $manage_uri = $this->getApplicationURI("board/{$project_id}/manage/");
+    $view_uri = $this->getApplicationURI("board/{$project_id}/");
     $reorder_uri = $this->getApplicationURI("board/{$project_id}/reorder/");
 
     if ($request->isFormPost()) {
       // User clicked "Done", make sure the page reloads to show the new
       // column order.
-      return id(new AphrontRedirectResponse())->setURI($manage_uri);
+      return id(new AphrontRedirectResponse())->setURI($view_uri);
     }
 
     $columns = id(new PhabricatorProjectColumnQuery())
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 3b117c747f..6a7083b10d 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -705,10 +705,21 @@ private function buildManageMenu(
       ->setDisabled(!$can_edit)
       ->setWorkflow(true);
 
+    $reorder_uri = $this->getApplicationURI("board/{$id}/reorder/");
     $manage_items[] = id(new PhabricatorActionView())
-      ->setIcon('fa-pencil')
-      ->setName(pht('Manage Board'))
-      ->setHref($manage_uri);
+      ->setIcon('fa-exchange')
+      ->setName(pht('Reorder Columns'))
+      ->setHref($reorder_uri)
+      ->setDisabled(!$can_edit)
+      ->setWorkflow(true);
+
+    $background_uri = $this->getApplicationURI("board/{$id}/background/");
+    $manage_items[] = id(new PhabricatorActionView())
+      ->setIcon('fa-paint-brush')
+      ->setName(pht('Change Background Color'))
+      ->setHref($background_uri)
+      ->setDisabled(!$can_edit)
+      ->setWorkflow(false);
 
     if ($show_hidden) {
       $hidden_uri = $this->getURIWithState()
@@ -727,6 +738,12 @@ private function buildManageMenu(
       ->setName($hidden_text)
       ->setHref($hidden_uri);
 
+    $manage_uri = $this->getApplicationURI("board/{$id}/manage/");
+    $manage_items[] = id(new PhabricatorActionView())
+      ->setIcon('fa-gear')
+      ->setName(pht('Manage Workboard'))
+      ->setHref($manage_uri);
+
     $batch_edit_uri = $request->getRequestURI();
     $batch_edit_uri->setQueryParam('batch', self::BATCH_EDIT_ALL);
     $can_batch_edit = PhabricatorPolicyFilter::hasCapability(
@@ -734,12 +751,6 @@ private function buildManageMenu(
       PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
       ManiphestBulkEditCapability::CAPABILITY);
 
-    $manage_items[] = id(new PhabricatorActionView())
-      ->setIcon('fa-list-ul')
-      ->setName(pht('Batch Edit Visible Tasks...'))
-      ->setHref($batch_edit_uri)
-      ->setDisabled(!$can_batch_edit);
-
     $manage_menu = id(new PhabricatorActionListView())
         ->setUser($viewer);
     foreach ($manage_items as $item) {

From 5fee24fa43119d531057af33415b30589373b601 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 15 May 2017 06:36:28 -0700
Subject: [PATCH 089/865] (stable) Add required needMembers/needWatchers calls
 to Project Profile/Subprojects tabs

Summary:
Fixes T12710. See that task for discussion. This is pretty ugly/redundant but not broken.

(Feel free to reject this and pursue something else.)

Test Plan:
  - For a project with active subprojects/milestones, viewed the project profile and subprojects tabs.
  - After patch: they're ugly, but no longer fatal.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12710

Differential Revision: https://secure.phabricator.com/D17882
---
 .../controller/PhabricatorProjectProfileController.php        | 2 ++
 .../controller/PhabricatorProjectSubprojectsController.php    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
index 4c726f5884..60254ddcca 100644
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -262,6 +262,8 @@ private function buildSubprojectList(PhabricatorProject $project) {
       ->setViewer($viewer)
       ->withParentProjectPHIDs(array($project->getPHID()))
       ->needImages(true)
+      ->needMembers(true)
+      ->needWatchers(true)
       ->withStatuses(
         array(
           PhabricatorProjectStatus::STATUS_ACTIVE,
diff --git a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
index 4a89bb4cde..a25a41fad0 100644
--- a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
+++ b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
@@ -31,6 +31,8 @@ public function handleRequest(AphrontRequest $request) {
         ->setViewer($viewer)
         ->withParentProjectPHIDs(array($project->getPHID()))
         ->needImages(true)
+        ->needMembers(true)
+        ->needWatchers(true)
         ->withIsMilestone(false)
         ->execute();
     } else {
@@ -42,6 +44,8 @@ public function handleRequest(AphrontRequest $request) {
         ->setViewer($viewer)
         ->withParentProjectPHIDs(array($project->getPHID()))
         ->needImages(true)
+        ->needMembers(true)
+        ->needWatchers(true)
         ->withIsMilestone(true)
         ->setOrderVector(array('milestoneNumber', 'id'))
         ->execute();

From 40228c56a9b7039dea72629ac8c4c55f516230e3 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Sun, 14 May 2017 17:32:24 -0700
Subject: [PATCH 090/865] (stable) Add Member/Watcher info to search results

Summary: Fixes T12707 Adds additional information to search results for if user is a member or a watcher of a project. Also removed the icon colors, which I'll find a better way to denote in future.

Test Plan: Join a project, watch a project, view results list in /projects/

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12707

Differential Revision: https://secure.phabricator.com/D17880
---
 .../query/PhabricatorProjectSearchEngine.php     |  4 +++-
 .../project/view/PhabricatorProjectListView.php  | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
index 75c2045f50..70931a8b00 100644
--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
@@ -13,7 +13,9 @@ public function getApplicationClassName() {
 
   public function newQuery() {
     return id(new PhabricatorProjectQuery())
-      ->needImages(true);
+      ->needImages(true)
+      ->needMembers(true)
+      ->needWatchers(true);
   }
 
   protected function buildCustomSearchFields() {
diff --git a/src/applications/project/view/PhabricatorProjectListView.php b/src/applications/project/view/PhabricatorProjectListView.php
index 3d6044f2b1..38c845167c 100644
--- a/src/applications/project/view/PhabricatorProjectListView.php
+++ b/src/applications/project/view/PhabricatorProjectListView.php
@@ -15,6 +15,7 @@ public function getProjects() {
 
   public function renderList() {
     $viewer = $this->getUser();
+    $viewer_phid = $viewer->getPHID();
     $projects = $this->getProjects();
 
     $handles = $viewer->loadHandles(mpull($projects, 'getPHID'));
@@ -26,10 +27,8 @@ public function renderList() {
       $id = $project->getID();
 
       $icon = $project->getDisplayIconIcon();
-      $color = $project->getColor();
-
       $icon_icon = id(new PHUIIconView())
-        ->setIcon("{$icon} {$color}");
+        ->setIcon($icon);
 
       $icon_name = $project->getDisplayIconName();
 
@@ -49,6 +48,17 @@ public function renderList() {
         $item->setDisabled(true);
       }
 
+      $is_member = $project->isUserMember($viewer_phid);
+      $is_watcher = $project->isUserWatcher($viewer_phid);
+
+      if ($is_member) {
+        $item->addIcon('fa-user', pht('Member'));
+      }
+
+      if ($is_watcher) {
+        $item->addIcon('fa-eye', pht('Watching'));
+      }
+
       $list->addItem($item);
     }
 

From fcebaa5097f326123254c912522cd18c71e32460 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 15 May 2017 09:02:39 -0700
Subject: [PATCH 091/865] (stable) Restrict watching and member project display
 better

Summary: Fixes T12713. We don't need to show watching and member info on other views other than ApplicationSearch (for now) so add a few methods to restrict the calls.

Test Plan: Visit project search, profile, project home, project home with subprojects

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12713

Differential Revision: https://secure.phabricator.com/D17883
---
 .../PhabricatorProjectProfileController.php   |  2 --
 ...habricatorProjectSubprojectsController.php |  4 ---
 .../query/PhabricatorProjectSearchEngine.php  |  2 ++
 .../view/PhabricatorProjectListView.php       | 29 ++++++++++++++-----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
index 60254ddcca..4c726f5884 100644
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -262,8 +262,6 @@ private function buildSubprojectList(PhabricatorProject $project) {
       ->setViewer($viewer)
       ->withParentProjectPHIDs(array($project->getPHID()))
       ->needImages(true)
-      ->needMembers(true)
-      ->needWatchers(true)
       ->withStatuses(
         array(
           PhabricatorProjectStatus::STATUS_ACTIVE,
diff --git a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
index a25a41fad0..4a89bb4cde 100644
--- a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
+++ b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
@@ -31,8 +31,6 @@ public function handleRequest(AphrontRequest $request) {
         ->setViewer($viewer)
         ->withParentProjectPHIDs(array($project->getPHID()))
         ->needImages(true)
-        ->needMembers(true)
-        ->needWatchers(true)
         ->withIsMilestone(false)
         ->execute();
     } else {
@@ -44,8 +42,6 @@ public function handleRequest(AphrontRequest $request) {
         ->setViewer($viewer)
         ->withParentProjectPHIDs(array($project->getPHID()))
         ->needImages(true)
-        ->needMembers(true)
-        ->needWatchers(true)
         ->withIsMilestone(true)
         ->setOrderVector(array('milestoneNumber', 'id'))
         ->execute();
diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
index 70931a8b00..df13278812 100644
--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
@@ -229,6 +229,8 @@ protected function renderResultList(
     $list = id(new PhabricatorProjectListView())
       ->setUser($viewer)
       ->setProjects($projects)
+      ->setShowWatching(true)
+      ->setShowMember(true)
       ->renderList();
 
     return id(new PhabricatorApplicationSearchResultView())
diff --git a/src/applications/project/view/PhabricatorProjectListView.php b/src/applications/project/view/PhabricatorProjectListView.php
index 38c845167c..994e78ce76 100644
--- a/src/applications/project/view/PhabricatorProjectListView.php
+++ b/src/applications/project/view/PhabricatorProjectListView.php
@@ -3,6 +3,8 @@
 final class PhabricatorProjectListView extends AphrontView {
 
   private $projects;
+  private $showMember;
+  private $showWatching;
 
   public function setProjects(array $projects) {
     $this->projects = $projects;
@@ -13,6 +15,16 @@ public function getProjects() {
     return $this->projects;
   }
 
+  public function setShowWatching($watching) {
+    $this->showWatching = $watching;
+    return $this;
+  }
+
+  public function setShowMember($member) {
+    $this->showMember = $member;
+    return $this;
+  }
+
   public function renderList() {
     $viewer = $this->getUser();
     $viewer_phid = $viewer->getPHID();
@@ -48,15 +60,18 @@ public function renderList() {
         $item->setDisabled(true);
       }
 
-      $is_member = $project->isUserMember($viewer_phid);
-      $is_watcher = $project->isUserWatcher($viewer_phid);
-
-      if ($is_member) {
-        $item->addIcon('fa-user', pht('Member'));
+      if ($this->showMember) {
+        $is_member = $project->isUserMember($viewer_phid);
+        if ($is_member) {
+          $item->addIcon('fa-user', pht('Member'));
+        }
       }
 
-      if ($is_watcher) {
-        $item->addIcon('fa-eye', pht('Watching'));
+      if ($this->showWatching) {
+        $is_watcher = $project->isUserWatcher($viewer_phid);
+        if ($is_watcher) {
+          $item->addIcon('fa-eye', pht('Watching'));
+        }
       }
 
       $list->addItem($item);

From 73ed316c5d2e5bb4092940729827f7877306394e Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Mon, 15 May 2017 13:22:05 -0700
Subject: [PATCH 092/865] (stable) Fix breakage of Pholio

Summary: Removal of `PholioMockEditor::applyCustomInternalTransaction()` in D17868 broke creation of new mocks in Pholio. Puts the empty method back until we finish migrating Pholio to modular transactions.

Test Plan: Created some mocks, observed lack of unhandled exception.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D17889
---
 src/applications/pholio/editor/PholioMockEditor.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/pholio/editor/PholioMockEditor.php b/src/applications/pholio/editor/PholioMockEditor.php
index 6f5bf1df2b..322eaa7267 100644
--- a/src/applications/pholio/editor/PholioMockEditor.php
+++ b/src/applications/pholio/editor/PholioMockEditor.php
@@ -184,6 +184,12 @@ private function getImageForXaction(
     return null;
   }
 
+  protected function applyCustomInternalTransaction(
+    PhabricatorLiskDAO $object,
+    PhabricatorApplicationTransaction $xaction) {
+    return;
+  }
+
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {

From 1d89c1ed24aee9183e9e66305c93f595b723c71d Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 19 May 2017 21:40:08 -0700
Subject: [PATCH 093/865] (stable) Add sound to logged out Conpherence

Summary: Fixes T12735. Adds a sound if the user is logged out, skips checking a setting.

Test Plan: set participants to null and verify sound plays, no exceptions1111

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12735

Differential Revision: https://secure.phabricator.com/D17973
---
 .../controller/ConpherenceUpdateController.php     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php
index a814c64452..a792a5a4d4 100644
--- a/src/applications/conpherence/controller/ConpherenceUpdateController.php
+++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php
@@ -369,9 +369,17 @@ private function loadAndRenderUpdates(
       ->setViewer($user);
     $dropdown_query->execute();
 
-    $sounds = $this->getSoundForParticipant($user, $participant);
-    $receive_sound = $sounds[ConpherenceRoomSettings::SOUND_RECEIVE];
-    $mention_sound = $sounds[ConpherenceRoomSettings::SOUND_MENTION];
+    $map = ConpherenceRoomSettings::getSoundMap();
+    $default_receive = ConpherenceRoomSettings::DEFAULT_RECEIVE_SOUND;
+    $receive_sound = $map[$default_receive]['rsrc'];
+    $mention_sound = null;
+
+    // Get the user's defaults if logged in
+    if ($participant) {
+      $sounds = $this->getSoundForParticipant($user, $participant);
+      $receive_sound = $sounds[ConpherenceRoomSettings::SOUND_RECEIVE];
+      $mention_sound = $sounds[ConpherenceRoomSettings::SOUND_MENTION];
+    }
 
     $content = array(
       'non_update' => $non_update,

From ab80d3ef0c6202c760e18ce14c2fa7b1b898ece1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 04:27:21 -0700
Subject: [PATCH 094/865] (stable) For the diff banner, detect the current
 changeset better

Summary:
Ref T12733. Currently, we detect the changeset which is in the middle of the screen as the current changeset.

This doesn't always get us the most intuitive changeset, particularly after a navigation from the scroll objective list: when you jump to changeset "X", you'd tend to expect "X" to be shown in the header, but the //next// changeset may be shown if "X" is too short.

Instead, select the changeset near the top of the screen (spanning an invisible line slightly below the banner).

Test Plan: Scrolled and jumped through a document with long and short changesets, saw a more intuitive changeset selected by the banner.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17976
---
 resources/celerity/map.php                       | 14 +++++++-------
 .../js/application/diff/DiffChangesetList.js     | 16 ++++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index e50d8bbd1a..019856296b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => 'e822b496',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '4d7dd14e',
-    'differential.pkg.js' => '68a4fa60',
+    'differential.pkg.js' => '6d05ad4c',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -391,7 +391,7 @@
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
-    'rsrc/js/application/diff/DiffChangesetList.js' => '5c68c40c',
+    'rsrc/js/application/diff/DiffChangesetList.js' => '541206ba',
     'rsrc/js/application/diff/DiffInline.js' => '77e14b60',
     'rsrc/js/application/diff/ScrollObjective.js' => '0eee7a00',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '1ca4d9db',
@@ -778,7 +778,7 @@
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'cf4e2140',
-    'phabricator-diff-changeset-list' => '5c68c40c',
+    'phabricator-diff-changeset-list' => '541206ba',
     'phabricator-diff-inline' => '77e14b60',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
@@ -1316,6 +1316,10 @@
     '5294060f' => array(
       'phui-theme-css',
     ),
+    '541206ba' => array(
+      'javelin-install',
+      'phabricator-scroll-objective-list',
+    ),
     '54774a28' => array(
       'phui-inline-comment-view-css',
     ),
@@ -1368,10 +1372,6 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
-    '5c68c40c' => array(
-      'javelin-install',
-      'phabricator-scroll-objective-list',
-    ),
     '5e2634b9' => array(
       'javelin-behavior',
       'javelin-aphlict',
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index e256372852..b615ca79eb 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -1358,16 +1358,20 @@ JX.install('DiffChangesetList', {
         return null;
       }
 
-      var v = JX.Vector.getViewport();
+      // We're going to find the changeset which spans an invisible line a
+      // little underneath the bottom of the banner. This makes the header
+      // tick over from "A.txt" to "B.txt" just as "A.txt" scrolls completely
+      // offscreen.
+      var detect_height = 64;
+
       for (var ii = 0; ii < this._changesets.length; ii++) {
         var changeset = this._changesets[ii];
         var c = changeset.getVectors();
 
-        // If the changeset starts above the upper half of the screen...
-        if (c.pos.y < (s.y + (v.y / 2))) {
-          // ...and ends below the lower half of the screen, this is the
-          // current visible changeset.
-          if ((c.pos.y + c.dim.y) > (s.y + (v.y / 2))) {
+        // If the changeset starts above the line...
+        if (c.pos.y <= (s.y + detect_height)) {
+          // ...and ends below the line, this is the current visible changeset.
+          if ((c.pos.y + c.dim.y) >= (s.y + detect_height)) {
             return changeset;
           }
         }

From 7ee20f573d4a5a751ec084adf780ef2df7cfa1ac Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 07:18:34 -0700
Subject: [PATCH 095/865] (stable) Show "objectives" UI only if prototypes are
 enabled

Summary: See D17955.

Test Plan: Loaded a revision, no longer saw annotations with prototypes off. Still saw annotations with prototypes on.

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D17983
---
 resources/celerity/map.php                    | 34 +++++++++----------
 .../view/DifferentialChangesetListView.php    |  4 +++
 .../js/application/diff/DiffChangesetList.js  | 10 +++++-
 .../differential/behavior-populate.js         |  3 +-
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 019856296b..5b6c54b2f1 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => 'e822b496',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '4d7dd14e',
-    'differential.pkg.js' => '6d05ad4c',
+    'differential.pkg.js' => '0dfe037d',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -391,14 +391,14 @@
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
-    'rsrc/js/application/diff/DiffChangesetList.js' => '541206ba',
+    'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
     'rsrc/js/application/diff/DiffInline.js' => '77e14b60',
     'rsrc/js/application/diff/ScrollObjective.js' => '0eee7a00',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '1ca4d9db',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
     'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
-    'rsrc/js/application/differential/behavior-populate.js' => '5e41c819',
+    'rsrc/js/application/differential/behavior-populate.js' => '1de8bf63',
     'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
     'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'c93358e3',
     'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
@@ -620,7 +620,7 @@
     'javelin-behavior-diff-preview-link' => '051c7832',
     'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
     'javelin-behavior-differential-feedback-preview' => '51c5ad07',
-    'javelin-behavior-differential-populate' => '5e41c819',
+    'javelin-behavior-differential-populate' => '1de8bf63',
     'javelin-behavior-differential-user-select' => 'a8d8459d',
     'javelin-behavior-diffusion-browse-file' => '054a0f0b',
     'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
@@ -778,7 +778,7 @@
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'cf4e2140',
-    'phabricator-diff-changeset-list' => '541206ba',
+    'phabricator-diff-changeset-list' => 'a716ca27',
     'phabricator-diff-inline' => '77e14b60',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
@@ -1042,6 +1042,14 @@
       'javelin-workflow',
       'phabricator-scroll-objective',
     ),
+    '1de8bf63' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'phabricator-tooltip',
+      'phabricator-diff-changeset-list',
+      'phabricator-diff-changeset',
+    ),
     '1def2711' => array(
       'javelin-install',
       'javelin-dom',
@@ -1316,10 +1324,6 @@
     '5294060f' => array(
       'phui-theme-css',
     ),
-    '541206ba' => array(
-      'javelin-install',
-      'phabricator-scroll-objective-list',
-    ),
     '54774a28' => array(
       'phui-inline-comment-view-css',
     ),
@@ -1378,14 +1382,6 @@
       'phabricator-phtize',
       'javelin-dom',
     ),
-    '5e41c819' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'phabricator-tooltip',
-      'phabricator-diff-changeset-list',
-      'phabricator-diff-changeset',
-    ),
     '5e9f347c' => array(
       'javelin-behavior',
       'multirow-row-manager',
@@ -1730,6 +1726,10 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
+    'a716ca27' => array(
+      'javelin-install',
+      'phabricator-scroll-objective-list',
+    ),
     'a80d0378' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
index 4ac2612ecd..ea8a5e42f1 100644
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -203,11 +203,15 @@ public function render() {
 
     $this->requireResource('aphront-tooltip-css');
 
+    $show_objectives =
+      PhabricatorEnv::getEnvConfig('phabricator.show-prototypes');
+
     $this->initBehavior(
       'differential-populate',
       array(
       'changesetViewIDs' => $ids,
       'inlineURI' => $this->inlineURI,
+      'showObjectives' => $show_objectives,
       'pht' => array(
         'Open in Editor' => pht('Open in Editor'),
         'Show All Context' => pht('Show All Context'),
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index b615ca79eb..8e35a92f80 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -120,6 +120,7 @@ JX.install('DiffChangesetList', {
     _rangeTarget: null,
 
     _bannerNode: null,
+    _showObjectives: false,
 
     sleep: function() {
       this._asleep = true;
@@ -137,7 +138,9 @@ JX.install('DiffChangesetList', {
       this._redrawFocus();
       this._redrawSelection();
 
-      this._objectives.show();
+      if (this._showObjectives) {
+        this._objectives.show();
+      }
 
       if (this._initialized) {
         return;
@@ -195,6 +198,11 @@ JX.install('DiffChangesetList', {
       this._installKey('q', label, this._onkeyhide);
     },
 
+    setShowObjectives: function(show) {
+      this._showObjectives = show;
+      return this;
+    },
+
     isAsleep: function() {
       return this._asleep;
     },
diff --git a/webroot/rsrc/js/application/differential/behavior-populate.js b/webroot/rsrc/js/application/differential/behavior-populate.js
index e5b0d5039d..b1b5bd415c 100644
--- a/webroot/rsrc/js/application/differential/behavior-populate.js
+++ b/webroot/rsrc/js/application/differential/behavior-populate.js
@@ -60,7 +60,8 @@ JX.behavior('differential-populate', function(config, statics) {
 
   var changeset_list = new JX.DiffChangesetList()
     .setTranslations(JX.phtize(config.pht))
-    .setInlineURI(config.inlineURI);
+    .setInlineURI(config.inlineURI)
+    .setShowObjectives(config.showObjectives);
 
   // Install and activate the current page.
   var page_id = JX.Quicksand.getCurrentPageID();

From 1495c80e62ea5f548749fe753f2c5445e6eb09ce Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 04:10:32 -0700
Subject: [PATCH 096/865] (stable) Hide the Differential scroll objective list
 on trackpad systems

Summary:
Ref T12733. In the longer run I'd like to just push this out from the edge, but that currently gets us into trouble since we start bumping into content. On my system, the trackpad scrollbar also expands in size when moused over, so the minimum number of pixels we need to push it out is approximatley 15px. This hits body content and the persistent chat.

For now, just disable this element on trackpad systems.

Test Plan:
Disconnected all USB peripherals, quit and relaunched Safari, saw no objective list.

Reconnected mouse, relaunched Safari, saw objective list.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17974
---
 resources/celerity/map.php                    | 47 ++++++++++---------
 .../differential/changeset-view.css           |  5 ++
 .../rsrc/externals/javelin/lib/Scrollbar.js   |  8 ++--
 .../application/diff/ScrollObjectiveList.js   |  6 +++
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 5b6c54b2f1..bf2fa84a72 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,10 +10,10 @@
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
     'core.pkg.css' => '5ffe8b79',
-    'core.pkg.js' => 'e822b496',
+    'core.pkg.js' => '6b2da600',
     'darkconsole.pkg.js' => '1f9a31bc',
-    'differential.pkg.css' => '4d7dd14e',
-    'differential.pkg.js' => '0dfe037d',
+    'differential.pkg.css' => 'bf87589e',
+    'differential.pkg.js' => 'ee4f14c5',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -64,7 +64,7 @@
     'rsrc/css/application/dashboard/dashboard.css' => 'fe5b1869',
     'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => '54774a28',
+    'rsrc/css/application/differential/changeset-view.css' => 'fa476ec0',
     'rsrc/css/application/differential/core.css' => '5b7b8ff4',
     'rsrc/css/application/differential/phui-inline-comment.css' => 'ffd1a542',
     'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
@@ -247,7 +247,7 @@
     'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
     'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
     'rsrc/externals/javelin/lib/Router.js' => '29274e2b',
-    'rsrc/externals/javelin/lib/Scrollbar.js' => '087e919c',
+    'rsrc/externals/javelin/lib/Scrollbar.js' => '9065f639',
     'rsrc/externals/javelin/lib/Sound.js' => '949c0fe5',
     'rsrc/externals/javelin/lib/URI.js' => 'c989ade3',
     'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
@@ -394,7 +394,7 @@
     'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
     'rsrc/js/application/diff/DiffInline.js' => '77e14b60',
     'rsrc/js/application/diff/ScrollObjective.js' => '0eee7a00',
-    'rsrc/js/application/diff/ScrollObjectiveList.js' => '1ca4d9db',
+    'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
     'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
@@ -567,7 +567,7 @@
     'conpherence-thread-manager' => '4d863052',
     'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
-    'differential-changeset-view-css' => '54774a28',
+    'differential-changeset-view-css' => 'fa476ec0',
     'differential-core-view-css' => '5b7b8ff4',
     'differential-revision-add-comment-css' => 'c47f8c40',
     'differential-revision-comment-css' => '14b8565a',
@@ -732,7 +732,7 @@
     'javelin-resource' => '44959b73',
     'javelin-routable' => 'b3e7d692',
     'javelin-router' => '29274e2b',
-    'javelin-scrollbar' => '087e919c',
+    'javelin-scrollbar' => '9065f639',
     'javelin-sound' => '949c0fe5',
     'javelin-stratcom' => '6ad39b6f',
     'javelin-tokenizer' => '8d3bc1b2',
@@ -800,7 +800,7 @@
     'phabricator-prefab' => 'c5af80a2',
     'phabricator-remarkup-css' => 'd1a5e11e',
     'phabricator-scroll-objective' => '0eee7a00',
-    'phabricator-scroll-objective-list' => '1ca4d9db',
+    'phabricator-scroll-objective-list' => '085dd101',
     'phabricator-search-results-css' => 'f87d23ad',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
@@ -956,11 +956,14 @@
       'javelin-stratcom',
       'javelin-util',
     ),
-    '087e919c' => array(
-      'javelin-install',
+    '085dd101' => array(
       'javelin-dom',
+      'javelin-util',
       'javelin-stratcom',
-      'javelin-vector',
+      'javelin-install',
+      'javelin-workflow',
+      'javelin-scrollbar',
+      'phabricator-scroll-objective',
     ),
     '08f4ccc3' => array(
       'phui-oi-list-view-css',
@@ -1034,14 +1037,6 @@
       'javelin-request',
       'javelin-uri',
     ),
-    '1ca4d9db' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-      'phabricator-scroll-objective',
-    ),
     '1de8bf63' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1324,9 +1319,6 @@
     '5294060f' => array(
       'phui-theme-css',
     ),
-    '54774a28' => array(
-      'phui-inline-comment-view-css',
-    ),
     '54b612ba' => array(
       'javelin-color',
       'javelin-install',
@@ -1611,6 +1603,12 @@
       'javelin-dom',
       'javelin-request',
     ),
+    '9065f639' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-vector',
+    ),
     '92b9ec77' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2208,6 +2206,9 @@
       'javelin-install',
       'javelin-dom',
     ),
+    'fa476ec0' => array(
+      'phui-inline-comment-view-css',
+    ),
     'fbe497e7' => array(
       'javelin-behavior',
       'javelin-util',
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
index eee0e167f3..6a2552fbd1 100644
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -423,6 +423,11 @@ tr.differential-inline-loading {
   overflow: hidden;
 }
 
+.scroll-objective-list.has-aesthetic-scrollbar {
+  /* For now, hide this element on systems with aesthetic scrollbars. */
+  display: none;
+}
+
 .scroll-objective {
   display: block;
   position: absolute;
diff --git a/webroot/rsrc/externals/javelin/lib/Scrollbar.js b/webroot/rsrc/externals/javelin/lib/Scrollbar.js
index 7596939581..cd69eb4def 100644
--- a/webroot/rsrc/externals/javelin/lib/Scrollbar.js
+++ b/webroot/rsrc/externals/javelin/lib/Scrollbar.js
@@ -34,7 +34,7 @@ JX.install('Scrollbar', {
     // width. If it doesn't, we're already in an environment with an aesthetic
     // scrollbar (like Safari on OSX with no mouse connected, or an iPhone)
     // and we don't need to do anything.
-    if (JX.Scrollbar._getScrollbarControlWidth() === 0) {
+    if (JX.Scrollbar.getScrollbarControlWidth() === 0) {
       return;
     }
 
@@ -104,7 +104,7 @@ JX.install('Scrollbar', {
     /**
      * Compute the width of the browser's scrollbar control, in pixels.
      */
-    _getScrollbarControlWidth: function() {
+    getScrollbarControlWidth: function() {
       var self = JX.Scrollbar;
 
       if (self._controlWidth === null) {
@@ -140,7 +140,7 @@ JX.install('Scrollbar', {
 
       // If this browser and OS don't render a real scrollbar control, we
       // need to leave a margin. Generally, this is OSX with no mouse attached.
-      if (self._getScrollbarControlWidth() === 0) {
+      if (self.getScrollbarControlWidth() === 0) {
         return 12;
       }
 
@@ -357,7 +357,7 @@ JX.install('Scrollbar', {
      */
     _resizeViewport: function() {
       var fdim = JX.Vector.getDim(this._frame);
-      fdim.x += JX.Scrollbar._getScrollbarControlWidth();
+      fdim.x += JX.Scrollbar.getScrollbarControlWidth();
       fdim.setDim(this._viewport);
     },
 
diff --git a/webroot/rsrc/js/application/diff/ScrollObjectiveList.js b/webroot/rsrc/js/application/diff/ScrollObjectiveList.js
index f5beb751e6..7aae1fb1b4 100644
--- a/webroot/rsrc/js/application/diff/ScrollObjectiveList.js
+++ b/webroot/rsrc/js/application/diff/ScrollObjectiveList.js
@@ -5,6 +5,7 @@
  *           javelin-stratcom
  *           javelin-install
  *           javelin-workflow
+ *           javelin-scrollbar
  *           phabricator-scroll-objective
  * @javelin
  */
@@ -81,6 +82,11 @@ JX.install('ScrollObjectiveList', {
 
       document.body.appendChild(node);
 
+      // If we're on OSX without a mouse or some other system with zero-width
+      // trackpad-style scrollbars, adjust the display appropriately.
+      var aesthetic = (JX.Scrollbar.getScrollbarControlWidth() === 0);
+      JX.DOM.alterClass(node, 'has-aesthetic-scrollbar', aesthetic);
+
       var d = JX.Vector.getDocument();
 
       var list_dimensions = JX.Vector.getDim(node);

From 1bccdd69cb924a73b3178b38a601d45a1d3d8ded Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 04:19:30 -0700
Subject: [PATCH 097/865] (stable) Stop long filenames in objective list
 tooltips from being cut off

Summary: Ref T12733. Currently, long filenames get cut off at 160px. Instead, don't cut them off.

Test Plan:
Before:

{F4968401}

After:

{F4968402}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17975
---
 resources/celerity/map.php                    | 38 +++++++++----------
 .../js/application/diff/ScrollObjective.js    |  1 +
 webroot/rsrc/js/core/ToolTip.js               |  6 ++-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index bf2fa84a72..bbd3c5e317 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,10 +10,10 @@
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
     'core.pkg.css' => '5ffe8b79',
-    'core.pkg.js' => '6b2da600',
+    'core.pkg.js' => 'a8eda64a',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => 'bf87589e',
-    'differential.pkg.js' => 'ee4f14c5',
+    'differential.pkg.js' => '24d1acf0',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -393,7 +393,7 @@
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
     'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
     'rsrc/js/application/diff/DiffInline.js' => '77e14b60',
-    'rsrc/js/application/diff/ScrollObjective.js' => '0eee7a00',
+    'rsrc/js/application/diff/ScrollObjective.js' => '2e069f79',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
@@ -480,7 +480,7 @@
     'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
     'rsrc/js/core/TextAreaUtils.js' => '320810c8',
     'rsrc/js/core/Title.js' => '485aaa6c',
-    'rsrc/js/core/ToolTip.js' => '8fadb715',
+    'rsrc/js/core/ToolTip.js' => '74caa17f',
     'rsrc/js/core/behavior-active-nav.js' => 'e379b58e',
     'rsrc/js/core/behavior-audio-source.js' => '59b251eb',
     'rsrc/js/core/behavior-autofocus.js' => '7319e029',
@@ -799,7 +799,7 @@
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'c5af80a2',
     'phabricator-remarkup-css' => 'd1a5e11e',
-    'phabricator-scroll-objective' => '0eee7a00',
+    'phabricator-scroll-objective' => '2e069f79',
     'phabricator-scroll-objective-list' => '085dd101',
     'phabricator-search-results-css' => 'f87d23ad',
     'phabricator-shaped-request' => '7cbe244b',
@@ -808,7 +808,7 @@
     'phabricator-standard-page-view' => 'eb5b80c5',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
-    'phabricator-tooltip' => '8fadb715',
+    'phabricator-tooltip' => '74caa17f',
     'phabricator-ui-example-css' => '528b19de',
     'phabricator-uiexample-javelin-view' => 'd4a14807',
     'phabricator-uiexample-reactor-button' => 'd19198c8',
@@ -980,13 +980,6 @@
       'javelin-dom',
       'javelin-router',
     ),
-    '0eee7a00' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-    ),
     '0f764c35' => array(
       'javelin-install',
       'javelin-util',
@@ -1120,6 +1113,13 @@
       'javelin-install',
       'javelin-event',
     ),
+    '2e069f79' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-workflow',
+    ),
     '2ee659ce' => array(
       'javelin-install',
     ),
@@ -1462,6 +1462,12 @@
       'javelin-vector',
       'javelin-dom',
     ),
+    '74caa17f' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-vector',
+    ),
     '76b9fc3e' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1587,12 +1593,6 @@
       'javelin-stratcom',
       'javelin-install',
     ),
-    '8fadb715' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-vector',
-    ),
     '8ff5e24c' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/diff/ScrollObjective.js b/webroot/rsrc/js/application/diff/ScrollObjective.js
index 4e6fa55d6a..c9fd4bb67e 100644
--- a/webroot/rsrc/js/application/diff/ScrollObjective.js
+++ b/webroot/rsrc/js/application/diff/ScrollObjective.js
@@ -100,6 +100,7 @@ JX.install('ScrollObjective', {
       JX.Stratcom.addSigil(node, 'has-tooltip');
       JX.Stratcom.getData(node).tip = tip;
       JX.Stratcom.getData(node).align = 'W';
+      JX.Stratcom.getData(node).size = 'auto';
       return this;
     },
 
diff --git a/webroot/rsrc/js/core/ToolTip.js b/webroot/rsrc/js/core/ToolTip.js
index 6fef44ab55..64a2deb301 100644
--- a/webroot/rsrc/js/core/ToolTip.js
+++ b/webroot/rsrc/js/core/ToolTip.js
@@ -50,7 +50,11 @@ JX.install('Tooltip', {
         { className: 'jx-tooltip-container' },
         node_inner);
 
-      node.style.maxWidth  = scale + 'px';
+      if (scale == 'auto') {
+        node.style.maxWidth = '';
+      } else {
+        node.style.maxWidth = scale + 'px';
+      }
 
       JX.Tooltip.hide();
       self._node = node;

From 429a0ce4e699b507165b7672bf4cdd42d65c5da6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 04:58:09 -0700
Subject: [PATCH 098/865] (stable) Make Differential objective markers show a
 brighter "editing" state

Summary:
Ref T12733.

  - While editing a comment, show a pink star ({icon star, color=pink}) with a tooltip.
  - Slight UI tweaks, including draft comments getting an indigo pencil ({icon pencil, color=indigo}).

Test Plan: {F4968470}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17977
---
 resources/celerity/map.php                    | 40 +++++++++----------
 .../view/DifferentialChangesetListView.php    |  2 +
 .../differential/changeset-view.css           |  5 ++-
 .../rsrc/js/application/diff/DiffInline.js    | 29 +++++++++++++-
 webroot/rsrc/js/core/ToolTip.js               |  4 ++
 5 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index bbd3c5e317..97b4f15a35 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,10 +10,10 @@
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
     'core.pkg.css' => '5ffe8b79',
-    'core.pkg.js' => 'a8eda64a',
+    'core.pkg.js' => '599698a7',
     'darkconsole.pkg.js' => '1f9a31bc',
-    'differential.pkg.css' => 'bf87589e',
-    'differential.pkg.js' => '24d1acf0',
+    'differential.pkg.css' => '7d4cfa59',
+    'differential.pkg.js' => 'f94e941c',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -64,7 +64,7 @@
     'rsrc/css/application/dashboard/dashboard.css' => 'fe5b1869',
     'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => 'fa476ec0',
+    'rsrc/css/application/differential/changeset-view.css' => 'acfd58f6',
     'rsrc/css/application/differential/core.css' => '5b7b8ff4',
     'rsrc/css/application/differential/phui-inline-comment.css' => 'ffd1a542',
     'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
@@ -392,7 +392,7 @@
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
     'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
-    'rsrc/js/application/diff/DiffInline.js' => '77e14b60',
+    'rsrc/js/application/diff/DiffInline.js' => 'fa07d36e',
     'rsrc/js/application/diff/ScrollObjective.js' => '2e069f79',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
@@ -480,7 +480,7 @@
     'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
     'rsrc/js/core/TextAreaUtils.js' => '320810c8',
     'rsrc/js/core/Title.js' => '485aaa6c',
-    'rsrc/js/core/ToolTip.js' => '74caa17f',
+    'rsrc/js/core/ToolTip.js' => '358b8c04',
     'rsrc/js/core/behavior-active-nav.js' => 'e379b58e',
     'rsrc/js/core/behavior-audio-source.js' => '59b251eb',
     'rsrc/js/core/behavior-autofocus.js' => '7319e029',
@@ -567,7 +567,7 @@
     'conpherence-thread-manager' => '4d863052',
     'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
-    'differential-changeset-view-css' => 'fa476ec0',
+    'differential-changeset-view-css' => 'acfd58f6',
     'differential-core-view-css' => '5b7b8ff4',
     'differential-revision-add-comment-css' => 'c47f8c40',
     'differential-revision-comment-css' => '14b8565a',
@@ -779,7 +779,7 @@
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'cf4e2140',
     'phabricator-diff-changeset-list' => 'a716ca27',
-    'phabricator-diff-inline' => '77e14b60',
+    'phabricator-diff-inline' => 'fa07d36e',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -808,7 +808,7 @@
     'phabricator-standard-page-view' => 'eb5b80c5',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
-    'phabricator-tooltip' => '74caa17f',
+    'phabricator-tooltip' => '358b8c04',
     'phabricator-ui-example-css' => '528b19de',
     'phabricator-uiexample-javelin-view' => 'd4a14807',
     'phabricator-uiexample-reactor-button' => 'd19198c8',
@@ -1137,6 +1137,12 @@
       'javelin-dom',
       'javelin-workflow',
     ),
+    '358b8c04' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-vector',
+    ),
     '3ab51e2c' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1462,12 +1468,6 @@
       'javelin-vector',
       'javelin-dom',
     ),
-    '74caa17f' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-vector',
-    ),
     '76b9fc3e' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1480,9 +1480,6 @@
       'javelin-reactor',
       'javelin-util',
     ),
-    '77e14b60' => array(
-      'javelin-dom',
-    ),
     '782ab6e7' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1788,6 +1785,9 @@
       'phuix-autocomplete',
       'javelin-mask',
     ),
+    'acfd58f6' => array(
+      'phui-inline-comment-view-css',
+    ),
     'ae95d984' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2206,8 +2206,8 @@
       'javelin-install',
       'javelin-dom',
     ),
-    'fa476ec0' => array(
-      'phui-inline-comment-view-css',
+    'fa07d36e' => array(
+      'javelin-dom',
     ),
     'fbe497e7' => array(
       'javelin-behavior',
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
index ea8a5e42f1..880fcb872d 100644
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -232,6 +232,8 @@ public function render() {
 
         'Loading...' => pht('Loading...'),
 
+        'Editing Comment' => pht('Editing Comment'),
+
         'Jump to next change.' => pht('Jump to next change.'),
         'Jump to previous change.' => pht('Jump to previous change.'),
         'Jump to next file.' => pht('Jump to next file.'),
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
index 6a2552fbd1..6a29e1269b 100644
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -419,7 +419,7 @@ tr.differential-inline-loading {
   border-style: solid;
   border-color: rgba(255, 255, 255, 0.95);
   border-width: 1px 0 1px 1px;
-  box-shadow: -1px 0 2px rgba(255, 255, 255, 0.25);
+  box-shadow: -1px 0 2px rgba(255, 255, 255, 0.10);
   overflow: hidden;
 }
 
@@ -433,7 +433,8 @@ tr.differential-inline-loading {
   position: absolute;
   box-sizing: border-box;
   cursor: pointer;
-  left: 8px;
+  text-align: middle;
+  left: 7px;
 }
 
 .scroll-objective .phui-icon-view {
diff --git a/webroot/rsrc/js/application/diff/DiffInline.js b/webroot/rsrc/js/application/diff/DiffInline.js
index e66fb544c5..32cf0ac5a1 100644
--- a/webroot/rsrc/js/application/diff/DiffInline.js
+++ b/webroot/rsrc/js/application/diff/DiffInline.js
@@ -32,6 +32,7 @@ JX.install('DiffInline', {
 
     _isDraft: null,
     _isFixed: null,
+    _isEditing: false,
 
     bindToRow: function(row) {
       this._row = row;
@@ -176,6 +177,12 @@ JX.install('DiffInline', {
       return this._changeset;
     },
 
+    setEditing: function(editing) {
+      this._isEditing = editing;
+      this.updateObjective();
+      return this;
+    },
+
     _onobjective: function() {
       this.getChangeset().getChangesetList().selectInline(this);
     },
@@ -194,12 +201,20 @@ JX.install('DiffInline', {
         return;
       }
 
+      var pht = changeset.getChangesetList().getTranslations();
+
       var icon = 'fa-comment';
       var color = 'bluegrey';
+      var tooltip = null;
 
-      if (this._isDraft) {
+      if (this._isEditing) {
+        icon = 'fa-star';
+        color = 'pink';
+        tooltip = pht('Editing Comment');
+      } else if (this._isDraft) {
         // This inline is an unsubmitted draft.
         icon = 'fa-pencil';
+        color = 'indigo';
       } else if (this._isFixed) {
         // This inline has been marked done.
         icon = 'fa-check';
@@ -212,6 +227,7 @@ JX.install('DiffInline', {
       objective
         .setIcon(icon)
         .setColor(color)
+        .setTooltip(tooltip)
         .show();
     },
 
@@ -511,7 +527,12 @@ JX.install('DiffInline', {
       this._undoRow = this._drawRows(template, cursor, mode, text);
     },
 
+    _drawContentRows: function(rows) {
+      return this._drawRows(rows, null, 'content');
+    },
+
     _drawEditRows: function(rows) {
+      this.setEditing(true);
       return this._drawRows(rows, null, 'edit');
     },
 
@@ -560,6 +581,8 @@ JX.install('DiffInline', {
               'click',
               'inline-edit-cancel',
               JX.bind(this, this._oncancel, row_meta)));
+        } else if (type == 'content') {
+          // No special listeners for these rows.
         } else {
           row_meta.listeners.push(
             JX.DOM.listen(
@@ -645,6 +668,7 @@ JX.install('DiffInline', {
       }
 
       this._removeRow(row);
+      this.setEditing(false);
 
       this.setInvisible(false);
 
@@ -670,6 +694,7 @@ JX.install('DiffInline', {
 
       this.setLoading(false);
       this.setInvisible(false);
+      this.setEditing(false);
 
       this._onupdate(response);
     },
@@ -677,7 +702,7 @@ JX.install('DiffInline', {
     _onupdate: function(response) {
       var new_row;
       if (response.markup) {
-        new_row = this._drawEditRows(JX.$H(response.markup).getNode()).node;
+        new_row = this._drawContentRows(JX.$H(response.markup).getNode()).node;
       }
 
       // TODO: Save the old row so the action it's undo-able if it was a
diff --git a/webroot/rsrc/js/core/ToolTip.js b/webroot/rsrc/js/core/ToolTip.js
index 64a2deb301..635c9466ad 100644
--- a/webroot/rsrc/js/core/ToolTip.js
+++ b/webroot/rsrc/js/core/ToolTip.js
@@ -21,6 +21,10 @@ JX.install('Tooltip', {
         return;
       }
 
+      if (content === null) {
+        return;
+      }
+
       if (__DEV__) {
         switch (align) {
           case 'N':

From 87a4940924bcf7e19b234cae2ad63f6ee1925b5d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 05:26:51 -0700
Subject: [PATCH 099/865] (stable) Fix a diff objective issue where objectives
 could appear in the wrong place

Summary:
Ref T12733. When creating a new comment, the objective could appear to far up in the scrollbar because we were anchoring it to an invisible row.

Instead, anchor to the "edit" row while editing.

Test Plan: Created a new comment at the very top of a file, saw "File, Star" icons instead of "Star, File".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17978
---
 resources/celerity/map.php                    | 30 +++++++++----------
 .../rsrc/js/application/diff/DiffInline.js    | 16 ++++++++--
 .../js/application/diff/ScrollObjective.js    |  1 +
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 97b4f15a35..968862b535 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '599698a7',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '7d4cfa59',
-    'differential.pkg.js' => 'f94e941c',
+    'differential.pkg.js' => 'fc6a23eb',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -392,8 +392,8 @@
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
     'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
-    'rsrc/js/application/diff/DiffInline.js' => 'fa07d36e',
-    'rsrc/js/application/diff/ScrollObjective.js' => '2e069f79',
+    'rsrc/js/application/diff/DiffInline.js' => '93cbb03f',
+    'rsrc/js/application/diff/ScrollObjective.js' => '9df4e4e2',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
@@ -779,7 +779,7 @@
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'cf4e2140',
     'phabricator-diff-changeset-list' => 'a716ca27',
-    'phabricator-diff-inline' => 'fa07d36e',
+    'phabricator-diff-inline' => '93cbb03f',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -799,7 +799,7 @@
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'c5af80a2',
     'phabricator-remarkup-css' => 'd1a5e11e',
-    'phabricator-scroll-objective' => '2e069f79',
+    'phabricator-scroll-objective' => '9df4e4e2',
     'phabricator-scroll-objective-list' => '085dd101',
     'phabricator-search-results-css' => 'f87d23ad',
     'phabricator-shaped-request' => '7cbe244b',
@@ -1113,13 +1113,6 @@
       'javelin-install',
       'javelin-event',
     ),
-    '2e069f79' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-    ),
     '2ee659ce' => array(
       'javelin-install',
     ),
@@ -1611,6 +1604,9 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
+    '93cbb03f' => array(
+      'javelin-dom',
+    ),
     '93d0c9e3' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1675,6 +1671,13 @@
     '9d9685d6' => array(
       'phui-oi-list-view-css',
     ),
+    '9df4e4e2' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-workflow',
+    ),
     '9f36c42d' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2206,9 +2209,6 @@
       'javelin-install',
       'javelin-dom',
     ),
-    'fa07d36e' => array(
-      'javelin-dom',
-    ),
     'fbe497e7' => array(
       'javelin-behavior',
       'javelin-util',
diff --git a/webroot/rsrc/js/application/diff/DiffInline.js b/webroot/rsrc/js/application/diff/DiffInline.js
index 32cf0ac5a1..77a0da3ec7 100644
--- a/webroot/rsrc/js/application/diff/DiffInline.js
+++ b/webroot/rsrc/js/application/diff/DiffInline.js
@@ -74,9 +74,10 @@ JX.install('DiffInline', {
 
       this._changesetID = data.changesetID;
 
-      this.updateObjective();
       this.setInvisible(false);
 
+      this.updateObjective();
+
       return this;
     },
 
@@ -166,9 +167,11 @@ JX.install('DiffInline', {
       this._changeset = changeset;
 
       var objectives = changeset.getChangesetList().getObjectives();
+
+      // Create this inline's objective, but don't show it yet.
       this._objective = objectives.newObjective()
-        .setCallback(JX.bind(this, this._onobjective));
-      this.updateObjective();
+        .setCallback(JX.bind(this, this._onobjective))
+        .hide();
 
       return this;
     },
@@ -206,11 +209,17 @@ JX.install('DiffInline', {
       var icon = 'fa-comment';
       var color = 'bluegrey';
       var tooltip = null;
+      var anchor = this._row;
 
       if (this._isEditing) {
         icon = 'fa-star';
         color = 'pink';
         tooltip = pht('Editing Comment');
+
+        // If we're editing, anchor to the row with the editor instead of the
+        // actual comment row (which is invisible and can have a misleading
+        // position).
+        anchor = this._row.nextSibling;
       } else if (this._isDraft) {
         // This inline is an unsubmitted draft.
         icon = 'fa-pencil';
@@ -225,6 +234,7 @@ JX.install('DiffInline', {
       }
 
       objective
+        .setAnchor(anchor)
         .setIcon(icon)
         .setColor(color)
         .setTooltip(tooltip)
diff --git a/webroot/rsrc/js/application/diff/ScrollObjective.js b/webroot/rsrc/js/application/diff/ScrollObjective.js
index c9fd4bb67e..b8fb169914 100644
--- a/webroot/rsrc/js/application/diff/ScrollObjective.js
+++ b/webroot/rsrc/js/application/diff/ScrollObjective.js
@@ -111,6 +111,7 @@ JX.install('ScrollObjective', {
 
     hide: function() {
       this._visible = false;
+      return this;
     },
 
     isVisible: function() {

From aabb791c174bc5f16f2cc0c783aa7fab8e3e3bc5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 05:33:59 -0700
Subject: [PATCH 100/865] (stable) When a user cancels a new inline, clear it
 from the objective list

Summary: Ref T12733. Currently, creating a new inline and then canceling it leaves a marker in the objective list. Instead, remove the marker.

Test Plan:
  - Created an empty inline, cancelled. Created a non-empty inline, cancelled. No objective marker in either case.
  - Created a new normal inline, objective marker.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17979
---
 resources/celerity/map.php                     | 12 ++++++------
 webroot/rsrc/js/application/diff/DiffInline.js | 11 +++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 968862b535..402ae9013e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '599698a7',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '7d4cfa59',
-    'differential.pkg.js' => 'fc6a23eb',
+    'differential.pkg.js' => 'd7e3edd5',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -392,7 +392,7 @@
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
     'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
-    'rsrc/js/application/diff/DiffInline.js' => '93cbb03f',
+    'rsrc/js/application/diff/DiffInline.js' => 'ca0fafde',
     'rsrc/js/application/diff/ScrollObjective.js' => '9df4e4e2',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
@@ -779,7 +779,7 @@
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'cf4e2140',
     'phabricator-diff-changeset-list' => 'a716ca27',
-    'phabricator-diff-inline' => '93cbb03f',
+    'phabricator-diff-inline' => 'ca0fafde',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -1604,9 +1604,6 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
-    '93cbb03f' => array(
-      'javelin-dom',
-    ),
     '93d0c9e3' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1979,6 +1976,9 @@
       'phabricator-shaped-request',
       'conpherence-thread-manager',
     ),
+    'ca0fafde' => array(
+      'javelin-dom',
+    ),
     'caade6f2' => array(
       'javelin-behavior',
       'javelin-request',
diff --git a/webroot/rsrc/js/application/diff/DiffInline.js b/webroot/rsrc/js/application/diff/DiffInline.js
index 77a0da3ec7..e7c18ef6ad 100644
--- a/webroot/rsrc/js/application/diff/DiffInline.js
+++ b/webroot/rsrc/js/application/diff/DiffInline.js
@@ -33,6 +33,7 @@ JX.install('DiffInline', {
     _isDraft: null,
     _isFixed: null,
     _isEditing: false,
+    _isNew: false,
 
     bindToRow: function(row) {
       this._row = row;
@@ -73,6 +74,7 @@ JX.install('DiffInline', {
       this._isGhost = data.isGhost;
 
       this._changesetID = data.changesetID;
+      this._isNew = false;
 
       this.setInvisible(false);
 
@@ -87,6 +89,7 @@ JX.install('DiffInline', {
       this._length = parseInt(data.length, 10);
       this._isNewFile = data.isNewFile;
       this._changesetID = data.changesetID;
+      this._isNew = true;
 
       // Insert the comment after any other comments which already appear on
       // the same row.
@@ -110,6 +113,7 @@ JX.install('DiffInline', {
       this._length = inline._length;
       this._isNewFile = inline._isNewFile;
       this._changesetID = inline._changesetID;
+      this._isNew = true;
 
       this._replyToCommentPHID = inline._phid;
 
@@ -198,6 +202,13 @@ JX.install('DiffInline', {
         return;
       }
 
+      // If this is a new comment which we aren't editing, don't show anything:
+      // the use started a comment or reply, then cancelled it.
+      if (this._isNew && !this._isEditing) {
+        objective.hide();
+        return;
+      }
+
       var changeset = this.getChangeset();
       if (!changeset.isVisible()) {
         objective.hide();

From 253f7b0bb9bdeb54281a2ab4b2655a1ec9bcf0cf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 05:39:07 -0700
Subject: [PATCH 101/865] (stable) Show a snippet when hovering inlines in the
 objective list

Summary: Ref T12733. Shows a comment snippet when hovering inlines in the objective list.

Test Plan: {F4968490}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17980
---
 resources/celerity/map.php                           | 12 ++++++------
 .../diff/view/PHUIDiffInlineCommentDetailView.php    |  9 +++++----
 webroot/rsrc/js/application/diff/DiffInline.js       |  4 +++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 402ae9013e..46443e7ecc 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '599698a7',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '7d4cfa59',
-    'differential.pkg.js' => 'd7e3edd5',
+    'differential.pkg.js' => '06cddcc0',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -392,7 +392,7 @@
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
     'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
-    'rsrc/js/application/diff/DiffInline.js' => 'ca0fafde',
+    'rsrc/js/application/diff/DiffInline.js' => '4478f8ac',
     'rsrc/js/application/diff/ScrollObjective.js' => '9df4e4e2',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
@@ -779,7 +779,7 @@
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'cf4e2140',
     'phabricator-diff-changeset-list' => 'a716ca27',
-    'phabricator-diff-inline' => 'ca0fafde',
+    'phabricator-diff-inline' => '4478f8ac',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -1203,6 +1203,9 @@
       'javelin-workflow',
       'javelin-workboard-controller',
     ),
+    '4478f8ac' => array(
+      'javelin-dom',
+    ),
     '44959b73' => array(
       'javelin-util',
       'javelin-uri',
@@ -1976,9 +1979,6 @@
       'phabricator-shaped-request',
       'conpherence-thread-manager',
     ),
-    'ca0fafde' => array(
-      'javelin-dom',
-    ),
     'caade6f2' => array(
       'javelin-behavior',
       'javelin-request',
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
index 9fc1e1bded..821834431a 100644
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
@@ -421,6 +421,11 @@ public function render() {
         $actions,
       ));
 
+    $snippet = id(new PhutilUTF8StringTruncator())
+      ->setMaximumGlyphs(96)
+      ->truncateString($inline->getContent());
+    $metadata['snippet'] = pht('%s: %s', $author, $snippet);
+
     $markup = javelin_tag(
       'div',
       array(
@@ -444,10 +449,6 @@ public function render() {
           phutil_tag_div('phabricator-remarkup', $content)),
       ));
 
-    $snippet = id(new PhutilUTF8StringTruncator())
-      ->setMaximumGlyphs(96)
-      ->truncateString($inline->getContent());
-
     $summary = phutil_tag(
       'div',
       array(
diff --git a/webroot/rsrc/js/application/diff/DiffInline.js b/webroot/rsrc/js/application/diff/DiffInline.js
index e7c18ef6ad..1f0d503b9f 100644
--- a/webroot/rsrc/js/application/diff/DiffInline.js
+++ b/webroot/rsrc/js/application/diff/DiffInline.js
@@ -22,6 +22,7 @@ JX.install('DiffInline', {
     _undoRow: null,
     _replyToCommentPHID: null,
     _originalText: null,
+    _snippet: null,
 
     _isDeleted: false,
     _isInvisible: false,
@@ -75,6 +76,7 @@ JX.install('DiffInline', {
 
       this._changesetID = data.changesetID;
       this._isNew = false;
+      this._snippet = data.snippet;
 
       this.setInvisible(false);
 
@@ -219,7 +221,7 @@ JX.install('DiffInline', {
 
       var icon = 'fa-comment';
       var color = 'bluegrey';
-      var tooltip = null;
+      var tooltip = this._snippet;
       var anchor = this._row;
 
       if (this._isEditing) {

From e6843b1c00f383dc5abae27adc7c1412866a9159 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 05:48:38 -0700
Subject: [PATCH 102/865] (stable) Show "reply" inlines as replies in the
 objective list

Summary: Ref T12733. Show a "reply" icon for replies, and make them stack directly under their parent.

Test Plan: {F4968500}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17981
---
 resources/celerity/map.php                    | 52 +++++++++----------
 .../rsrc/js/application/diff/DiffInline.js    |  5 ++
 .../js/application/diff/ScrollObjective.js    | 18 +++++++
 .../application/diff/ScrollObjectiveList.js   |  9 +++-
 4 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 46443e7ecc..1d430926a6 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '599698a7',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '7d4cfa59',
-    'differential.pkg.js' => '06cddcc0',
+    'differential.pkg.js' => '886eadff',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -392,9 +392,9 @@
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
     'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
-    'rsrc/js/application/diff/DiffInline.js' => '4478f8ac',
-    'rsrc/js/application/diff/ScrollObjective.js' => '9df4e4e2',
-    'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
+    'rsrc/js/application/diff/DiffInline.js' => '1478c3b2',
+    'rsrc/js/application/diff/ScrollObjective.js' => '7e8877e7',
+    'rsrc/js/application/diff/ScrollObjectiveList.js' => '6120e99a',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
     'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
@@ -779,7 +779,7 @@
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'cf4e2140',
     'phabricator-diff-changeset-list' => 'a716ca27',
-    'phabricator-diff-inline' => '4478f8ac',
+    'phabricator-diff-inline' => '1478c3b2',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -799,8 +799,8 @@
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'c5af80a2',
     'phabricator-remarkup-css' => 'd1a5e11e',
-    'phabricator-scroll-objective' => '9df4e4e2',
-    'phabricator-scroll-objective-list' => '085dd101',
+    'phabricator-scroll-objective' => '7e8877e7',
+    'phabricator-scroll-objective-list' => '6120e99a',
     'phabricator-search-results-css' => 'f87d23ad',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
@@ -956,15 +956,6 @@
       'javelin-stratcom',
       'javelin-util',
     ),
-    '085dd101' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-      'javelin-scrollbar',
-      'phabricator-scroll-objective',
-    ),
     '08f4ccc3' => array(
       'phui-oi-list-view-css',
     ),
@@ -990,6 +981,9 @@
       'javelin-dom',
       'javelin-typeahead-normalizer',
     ),
+    '1478c3b2' => array(
+      'javelin-dom',
+    ),
     '1499a8cb' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1203,9 +1197,6 @@
       'javelin-workflow',
       'javelin-workboard-controller',
     ),
-    '4478f8ac' => array(
-      'javelin-dom',
-    ),
     '44959b73' => array(
       'javelin-util',
       'javelin-uri',
@@ -1393,6 +1384,15 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
+    '6120e99a' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-workflow',
+      'javelin-scrollbar',
+      'phabricator-scroll-objective',
+    ),
     '61cbc29a' => array(
       'javelin-magical-init',
       'javelin-util',
@@ -1501,6 +1501,13 @@
     '7e41274a' => array(
       'javelin-install',
     ),
+    '7e8877e7' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-workflow',
+    ),
     '7ebaeed3' => array(
       'herald-rule-editor',
       'javelin-behavior',
@@ -1671,13 +1678,6 @@
     '9d9685d6' => array(
       'phui-oi-list-view-css',
     ),
-    '9df4e4e2' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-    ),
     '9f36c42d' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/diff/DiffInline.js b/webroot/rsrc/js/application/diff/DiffInline.js
index 1f0d503b9f..b0a8202e54 100644
--- a/webroot/rsrc/js/application/diff/DiffInline.js
+++ b/webroot/rsrc/js/application/diff/DiffInline.js
@@ -223,6 +223,7 @@ JX.install('DiffInline', {
       var color = 'bluegrey';
       var tooltip = this._snippet;
       var anchor = this._row;
+      var should_stack = false;
 
       if (this._isEditing) {
         icon = 'fa-star';
@@ -244,6 +245,9 @@ JX.install('DiffInline', {
       } else if (this._isGhost) {
         icon = 'fa-comment-o';
         color = 'grey';
+      } else if (this._replyToCommentPHID) {
+        icon = 'fa-reply';
+        should_stack = true;
       }
 
       objective
@@ -251,6 +255,7 @@ JX.install('DiffInline', {
         .setIcon(icon)
         .setColor(color)
         .setTooltip(tooltip)
+        .setShouldStack(should_stack)
         .show();
     },
 
diff --git a/webroot/rsrc/js/application/diff/ScrollObjective.js b/webroot/rsrc/js/application/diff/ScrollObjective.js
index b8fb169914..1e596bd816 100644
--- a/webroot/rsrc/js/application/diff/ScrollObjective.js
+++ b/webroot/rsrc/js/application/diff/ScrollObjective.js
@@ -26,6 +26,7 @@ JX.install('ScrollObjective', {
 
     _visible: false,
     _callback: false,
+    _stack: false,
 
     getNode: function() {
       if (!this._node) {
@@ -104,6 +105,23 @@ JX.install('ScrollObjective', {
       return this;
     },
 
+
+    /**
+     * Should this objective always stack immediately under the previous
+     * objective?
+     *
+     * This allows related objectives (like "comment, reply, reply") to be
+     * rendered in a tight sequence.
+     */
+    setShouldStack: function(stack) {
+      this._stack = stack;
+      return this;
+    },
+
+    shouldStack: function() {
+      return this._stack;
+    },
+
     show: function() {
       this._visible = true;
       return this;
diff --git a/webroot/rsrc/js/application/diff/ScrollObjectiveList.js b/webroot/rsrc/js/application/diff/ScrollObjectiveList.js
index 7aae1fb1b4..ce47877d1a 100644
--- a/webroot/rsrc/js/application/diff/ScrollObjectiveList.js
+++ b/webroot/rsrc/js/application/diff/ScrollObjectiveList.js
@@ -112,7 +112,8 @@ JX.install('ScrollObjectiveList', {
 
         items.push({
           offset: offset,
-          node: objective_node
+          node: objective_node,
+          objective: objective
         });
       }
 
@@ -130,7 +131,11 @@ JX.install('ScrollObjectiveList', {
         offset = item.offset;
 
         if (min !== null) {
-          offset = Math.max(offset, min);
+          if (item.objective.shouldStack()) {
+            offset = min;
+          } else {
+            offset = Math.max(offset, min);
+          }
         }
         min = offset + 15;
 

From 4d2c7e4d3d5d61e34b7e2af3df0e901d89d29433 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 May 2017 05:59:47 -0700
Subject: [PATCH 103/865] (stable) Show the curent selected inline in the
 objective list

Summary: Ref T12733. When an inline is selected, make it stand out so you can see where you are in the document more clearly.

Test Plan: {F4968509}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12733

Differential Revision: https://secure.phabricator.com/D17982
---
 resources/celerity/map.php                    | 24 +++++++++----------
 .../js/application/diff/DiffChangesetList.js  | 16 ++++++++++++-
 .../rsrc/js/application/diff/DiffInline.js    |  7 ++++++
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 1d430926a6..26ebc596f3 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '599698a7',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '7d4cfa59',
-    'differential.pkg.js' => '886eadff',
+    'differential.pkg.js' => '1d120743',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -391,8 +391,8 @@
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
-    'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
-    'rsrc/js/application/diff/DiffInline.js' => '1478c3b2',
+    'rsrc/js/application/diff/DiffChangesetList.js' => '7a184082',
+    'rsrc/js/application/diff/DiffInline.js' => '19582231',
     'rsrc/js/application/diff/ScrollObjective.js' => '7e8877e7',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '6120e99a',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
@@ -778,8 +778,8 @@
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'cf4e2140',
-    'phabricator-diff-changeset-list' => 'a716ca27',
-    'phabricator-diff-inline' => '1478c3b2',
+    'phabricator-diff-changeset-list' => '7a184082',
+    'phabricator-diff-inline' => '19582231',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -981,9 +981,6 @@
       'javelin-dom',
       'javelin-typeahead-normalizer',
     ),
-    '1478c3b2' => array(
-      'javelin-dom',
-    ),
     '1499a8cb' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1003,6 +1000,9 @@
     '185bbd53' => array(
       'javelin-install',
     ),
+    19582231 => array(
+      'javelin-dom',
+    ),
     '19f9369b' => array(
       'phui-oi-list-view-css',
     ),
@@ -1488,6 +1488,10 @@
       'javelin-behavior',
       'javelin-quicksand',
     ),
+    '7a184082' => array(
+      'javelin-install',
+      'phabricator-scroll-objective-list',
+    ),
     '7a68dda3' => array(
       'owners-path-editor',
       'javelin-behavior',
@@ -1724,10 +1728,6 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
-    'a716ca27' => array(
-      'javelin-install',
-      'phabricator-scroll-objective-list',
-    ),
     'a80d0378' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index 8e35a92f80..c344c96de8 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -538,10 +538,24 @@ JX.install('DiffChangesetList', {
     },
 
     _setSelectionState: function(item, manager) {
-      this._cursorItem = item;
+      // If we had an inline selected before, we need to update it after
+      // changing our selection to clear the selected state. Then, update the
+      // new one to add the selected state.
+      var old_inline = this.getSelectedInline();
 
+      this._cursorItem = item;
       this._redrawSelection(manager, true);
 
+      var new_inline = this.getSelectedInline();
+
+      if (old_inline) {
+        old_inline.updateObjective();
+      }
+
+      if (new_inline) {
+        new_inline.updateObjective();
+      }
+
       return this;
     },
 
diff --git a/webroot/rsrc/js/application/diff/DiffInline.js b/webroot/rsrc/js/application/diff/DiffInline.js
index b0a8202e54..bfc2a3e258 100644
--- a/webroot/rsrc/js/application/diff/DiffInline.js
+++ b/webroot/rsrc/js/application/diff/DiffInline.js
@@ -250,6 +250,13 @@ JX.install('DiffInline', {
         should_stack = true;
       }
 
+      if (changeset.getChangesetList().getSelectedInline() === this) {
+        // TODO: Maybe add some other kind of effect here, since we're only
+        // using color to show this?
+        color = 'yellow';
+      }
+
+
       objective
         .setAnchor(anchor)
         .setIcon(icon)

From e6825051c700066ad08c098bc152a67ca7d20d81 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 May 2017 16:05:04 -0700
Subject: [PATCH 104/865] (stable) Rebuild Celery map on "stable" after merges

Normally this isn't necessary, but there was an unusually large amount of
cherry-picking last week and things got a little out of sync.
---
 resources/celerity/map.php | 86 +++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 26ebc596f3..a2119c98a4 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,8 +9,8 @@
   'names' => array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => '5ffe8b79',
-    'core.pkg.js' => '599698a7',
+    'core.pkg.css' => '19f6f61f',
+    'core.pkg.js' => '21d34805',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '7d4cfa59',
     'differential.pkg.js' => '1d120743',
@@ -35,11 +35,11 @@
     'rsrc/css/aphront/table-view.css' => '34cf86b4',
     'rsrc/css/aphront/tokenizer.css' => '9a8cb501',
     'rsrc/css/aphront/tooltip.css' => '173b9431',
-    'rsrc/css/aphront/typeahead-browse.css' => '8904346a',
+    'rsrc/css/aphront/typeahead-browse.css' => '4f82e510',
     'rsrc/css/aphront/typeahead.css' => '8a84cc7d',
     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
     'rsrc/css/application/auth/auth.css' => '0877ed6e',
-    'rsrc/css/application/base/main-menu-view.css' => '5294060f',
+    'rsrc/css/application/base/main-menu-view.css' => 'de9fe8c4',
     'rsrc/css/application/base/notification-menu.css' => '6a697e43',
     'rsrc/css/application/base/phui-theme.css' => '9f261c6b',
     'rsrc/css/application/base/standard-page-view.css' => 'eb5b80c5',
@@ -71,6 +71,7 @@
     'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
     'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
     'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
+    'rsrc/css/application/diffusion/diffusion-history.css' => '0c596546',
     'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
     'rsrc/css/application/diffusion/diffusion-readme.css' => '18bd3910',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
@@ -109,7 +110,7 @@
     'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
     'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae',
     'rsrc/css/application/search/application-search-view.css' => '66ee5d46',
-    'rsrc/css/application/search/search-results.css' => 'f87d23ad',
+    'rsrc/css/application/search/search-results.css' => '8f8e08ed',
     'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
@@ -131,7 +132,7 @@
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
     'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
-    'rsrc/css/phui/object-item/phui-oi-list-view.css' => '412bef1a',
+    'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'ed19241b',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
     'rsrc/css/phui/phui-action-list.css' => 'c01858f4',
     'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
@@ -139,14 +140,14 @@
     'rsrc/css/phui/phui-basic-nav-view.css' => 'a0705f53',
     'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
     'rsrc/css/phui/phui-box.css' => '269cbc99',
-    'rsrc/css/phui/phui-button.css' => '8d23596a',
+    'rsrc/css/phui/phui-button.css' => 'ccd8c6c5',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-cms.css' => '504b4b23',
     'rsrc/css/phui/phui-comment-form.css' => '57af2e14',
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
     'rsrc/css/phui/phui-crumbs-view.css' => '6ece3bbb',
     'rsrc/css/phui/phui-curtain-view.css' => '55dd0e59',
-    'rsrc/css/phui/phui-document-pro.css' => '62c4dcbf',
+    'rsrc/css/phui/phui-document-pro.css' => 'bb18da6b',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
     'rsrc/css/phui/phui-document.css' => 'c32e8dec',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
@@ -154,10 +155,10 @@
     'rsrc/css/phui/phui-form-view.css' => '6175808d',
     'rsrc/css/phui/phui-form.css' => 'a5570f70',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
-    'rsrc/css/phui/phui-header-view.css' => 'e082678d',
+    'rsrc/css/phui/phui-header-view.css' => 'a3d1aecd',
     'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf',
     'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
-    'rsrc/css/phui/phui-icon.css' => '12b387a1',
+    'rsrc/css/phui/phui-icon.css' => '4c6d624c',
     'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
     'rsrc/css/phui/phui-info-view.css' => '6e217679',
@@ -172,7 +173,7 @@
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
-    'rsrc/css/phui/phui-tag-view.css' => 'cc4fd402',
+    'rsrc/css/phui/phui-tag-view.css' => '3fa7765e',
     'rsrc/css/phui/phui-timeline-view.css' => '313c7f22',
     'rsrc/css/phui/phui-two-column-view.css' => 'ce9fa0b7',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
@@ -433,7 +434,7 @@
     'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c',
     'rsrc/js/application/projects/WorkboardBoard.js' => '8935deef',
     'rsrc/js/application/projects/WorkboardCard.js' => 'c587b80f',
-    'rsrc/js/application/projects/WorkboardColumn.js' => '21df4ff5',
+    'rsrc/js/application/projects/WorkboardColumn.js' => '758b4758',
     'rsrc/js/application/projects/WorkboardController.js' => '26167537',
     'rsrc/js/application/projects/behavior-project-boards.js' => '4250a34e',
     'rsrc/js/application/projects/behavior-project-create.js' => '065227cc',
@@ -513,7 +514,7 @@
     'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
     'rsrc/js/core/behavior-reveal-content.js' => '60821bc7',
     'rsrc/js/core/behavior-scrollbar.js' => '834a1173',
-    'rsrc/js/core/behavior-search-typeahead.js' => 'eded9ee8',
+    'rsrc/js/core/behavior-search-typeahead.js' => 'd0a99ab4',
     'rsrc/js/core/behavior-select-content.js' => 'bf5374ef',
     'rsrc/js/core/behavior-select-on-click.js' => '4e3e79a6',
     'rsrc/js/core/behavior-setup-check-https.js' => '491416b3',
@@ -574,6 +575,7 @@
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
+    'diffusion-history-css' => '0c596546',
     'diffusion-icons-css' => 'a6a1e2ba',
     'diffusion-readme-css' => '18bd3910',
     'diffusion-source-css' => '750add59',
@@ -666,7 +668,7 @@
     'javelin-behavior-phabricator-oncopy' => '2926fff2',
     'javelin-behavior-phabricator-remarkup-assist' => 'acd29eee',
     'javelin-behavior-phabricator-reveal-content' => '60821bc7',
-    'javelin-behavior-phabricator-search-typeahead' => 'eded9ee8',
+    'javelin-behavior-phabricator-search-typeahead' => 'd0a99ab4',
     'javelin-behavior-phabricator-show-older-transactions' => 'ae95d984',
     'javelin-behavior-phabricator-tooltips' => 'c420b0b9',
     'javelin-behavior-phabricator-transaction-comment-form' => 'b23b49e6',
@@ -754,7 +756,7 @@
     'javelin-websocket' => '3ffe32d6',
     'javelin-workboard-board' => '8935deef',
     'javelin-workboard-card' => 'c587b80f',
-    'javelin-workboard-column' => '21df4ff5',
+    'javelin-workboard-column' => '758b4758',
     'javelin-workboard-controller' => '26167537',
     'javelin-workflow' => '1e911d0f',
     'maniphest-batch-editor' => 'b0f0b6d5',
@@ -790,7 +792,7 @@
     'phabricator-flag-css' => 'bba8f811',
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => 'c19dd9b9',
-    'phabricator-main-menu-view' => '5294060f',
+    'phabricator-main-menu-view' => 'de9fe8c4',
     'phabricator-nav-view-css' => 'faf6a6fc',
     'phabricator-notification' => 'ccf1cbf8',
     'phabricator-notification-css' => '3f6c89c9',
@@ -801,7 +803,7 @@
     'phabricator-remarkup-css' => 'd1a5e11e',
     'phabricator-scroll-objective' => '7e8877e7',
     'phabricator-scroll-objective-list' => '6120e99a',
-    'phabricator-search-results-css' => 'f87d23ad',
+    'phabricator-search-results-css' => '8f8e08ed',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
     'phabricator-source-code-view-css' => '4383192f',
@@ -836,7 +838,7 @@
     'phui-basic-nav-view-css' => 'a0705f53',
     'phui-big-info-view-css' => 'bd903741',
     'phui-box-css' => '269cbc99',
-    'phui-button-css' => '8d23596a',
+    'phui-button-css' => 'ccd8c6c5',
     'phui-calendar-css' => '477acfaa',
     'phui-calendar-day-css' => '572b1893',
     'phui-calendar-list-css' => '576be600',
@@ -849,18 +851,18 @@
     'phui-curtain-view-css' => '55dd0e59',
     'phui-document-summary-view-css' => '9ca48bdf',
     'phui-document-view-css' => 'c32e8dec',
-    'phui-document-view-pro-css' => '62c4dcbf',
+    'phui-document-view-pro-css' => 'bb18da6b',
     'phui-feed-story-css' => '44a9c8e9',
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
     'phui-form-css' => 'a5570f70',
     'phui-form-view-css' => '6175808d',
     'phui-head-thing-view-css' => 'fd311e5f',
-    'phui-header-view-css' => 'e082678d',
+    'phui-header-view-css' => 'a3d1aecd',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'f0592bcf',
     'phui-icon-set-selector-css' => '87db8fee',
-    'phui-icon-view-css' => '12b387a1',
+    'phui-icon-view-css' => '4c6d624c',
     'phui-image-mask-css' => 'a8498f9c',
     'phui-info-panel-css' => '27ea50a1',
     'phui-info-view-css' => '6e217679',
@@ -873,7 +875,7 @@
     'phui-oi-color-css' => 'cd2b9b77',
     'phui-oi-drag-ui-css' => '08f4ccc3',
     'phui-oi-flush-ui-css' => '9d9685d6',
-    'phui-oi-list-view-css' => '412bef1a',
+    'phui-oi-list-view-css' => 'ed19241b',
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => '77d8a794',
     'phui-pinboard-view-css' => '2495140e',
@@ -882,7 +884,7 @@
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
     'phui-status-list-view-css' => 'd5263e49',
-    'phui-tag-view-css' => 'cc4fd402',
+    'phui-tag-view-css' => '3fa7765e',
     'phui-theme-css' => '9f261c6b',
     'phui-timeline-view-css' => '313c7f22',
     'phui-two-column-view-css' => 'ce9fa0b7',
@@ -912,7 +914,7 @@
     'syntax-default-css' => '9923583c',
     'syntax-highlighting-css' => 'cae95e89',
     'tokens-css' => '3d0f239e',
-    'typeahead-browse-css' => '8904346a',
+    'typeahead-browse-css' => '4f82e510',
     'unhandled-exception-css' => '4c96257a',
   ),
   'requires' => array(
@@ -1060,10 +1062,6 @@
       'javelin-install',
       'javelin-dom',
     ),
-    '21df4ff5' => array(
-      'javelin-install',
-      'javelin-workboard-card',
-    ),
     '2290aeef' => array(
       'javelin-install',
       'javelin-dom',
@@ -1309,9 +1307,6 @@
       'javelin-vector',
       'javelin-typeahead-static-source',
     ),
-    '5294060f' => array(
-      'phui-theme-css',
-    ),
     '54b612ba' => array(
       'javelin-color',
       'javelin-install',
@@ -1464,6 +1459,10 @@
       'javelin-vector',
       'javelin-dom',
     ),
+    '758b4758' => array(
+      'javelin-install',
+      'javelin-workboard-card',
+    ),
     '76b9fc3e' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2014,6 +2013,17 @@
       'javelin-vector',
       'phabricator-diff-inline',
     ),
+    'd0a99ab4' => array(
+      'javelin-behavior',
+      'javelin-typeahead-ondemand-source',
+      'javelin-typeahead',
+      'javelin-dom',
+      'javelin-uri',
+      'javelin-util',
+      'javelin-stratcom',
+      'phabricator-prefab',
+      'phuix-icon-view',
+    ),
     'd0c516d5' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2086,6 +2096,9 @@
       'javelin-typeahead-ondemand-source',
       'javelin-dom',
     ),
+    'de9fe8c4' => array(
+      'phui-theme-css',
+    ),
     'e0ec7f2f' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2155,17 +2168,6 @@
       'javelin-dom',
       'phabricator-draggable-list',
     ),
-    'eded9ee8' => array(
-      'javelin-behavior',
-      'javelin-typeahead-ondemand-source',
-      'javelin-typeahead',
-      'javelin-dom',
-      'javelin-uri',
-      'javelin-util',
-      'javelin-stratcom',
-      'phabricator-prefab',
-      'phuix-icon-view',
-    ),
     'edf8a145' => array(
       'javelin-behavior',
       'javelin-uri',

From e632db4fc0e9d42ec7aa828ed47239b27ba98d8a Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 26 May 2017 18:54:21 -0700
Subject: [PATCH 105/865] (stable) Add needActiveDiffs to
 differential.createcomment method

Summary: Ref T12766. Adds missing attachment for stacking actions in differential

Test Plan: Asked end user to verify patch.

Reviewers: epriestley, amckinley

Reviewed By: epriestley, amckinley

Subscribers: reed, Korvin

Maniphest Tasks: T12766

Differential Revision: https://secure.phabricator.com/D18038
---
 .../conduit/DifferentialCreateCommentConduitAPIMethod.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
index 52736d6f3b..943c3e7702 100644
--- a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
@@ -49,6 +49,7 @@ protected function execute(ConduitAPIRequest $request) {
       ->withIDs(array($request->getValue('revision_id')))
       ->needReviewers(true)
       ->needReviewerAuthority(true)
+      ->needActiveDiffs(true)
       ->executeOne();
     if (!$revision) {
       throw new ConduitException('ERR_BAD_REVISION');

From d3b7a0f37c975397455d633254e9b4a1246023f9 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 26 May 2017 17:23:25 -0700
Subject: [PATCH 106/865] (stable) Fix lightbox circle icons

Summary: These are unfortunatly manually built so I missed them in testing circle view changes.

Test Plan: Test lightbox, conpherence, uiexamples

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18036
---
 resources/celerity/map.php                    | 24 +++++++++----------
 src/view/page/PhabricatorStandardPageView.php |  3 ++-
 .../js/core/behavior-lightbox-attachments.js  |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index a2119c98a4..241f9acf08 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
     'core.pkg.css' => '19f6f61f',
-    'core.pkg.js' => '21d34805',
+    'core.pkg.js' => '1475bd91',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '7d4cfa59',
     'differential.pkg.js' => '1d120743',
@@ -501,7 +501,7 @@
     'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
-    'rsrc/js/core/behavior-lightbox-attachments.js' => 'a5c57c24',
+    'rsrc/js/core/behavior-lightbox-attachments.js' => '560f41da',
     'rsrc/js/core/behavior-line-linker.js' => '1499a8cb',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => 'e0ec7f2f',
@@ -644,7 +644,7 @@
     'javelin-behavior-history-install' => '7ee2b591',
     'javelin-behavior-icon-composer' => '8499b6ab',
     'javelin-behavior-launch-icon-composer' => '48086888',
-    'javelin-behavior-lightbox-attachments' => 'a5c57c24',
+    'javelin-behavior-lightbox-attachments' => '560f41da',
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-editor' => '782ab6e7',
@@ -1332,6 +1332,15 @@
       'javelin-vector',
       'javelin-dom',
     ),
+    '560f41da' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-mask',
+      'javelin-util',
+      'phuix-icon-view',
+      'phabricator-busy',
+    ),
     '58dea2fa' => array(
       'javelin-install',
       'javelin-util',
@@ -1708,15 +1717,6 @@
       'javelin-uri',
       'phabricator-notification',
     ),
-    'a5c57c24' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-mask',
-      'javelin-util',
-      'phuix-icon-view',
-      'phabricator-busy',
-    ),
     'a6b98425' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index ffa82ab1b9..a138d077b5 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -268,7 +268,8 @@ protected function willRenderPage() {
       }
 
       $icon = id(new PHUIIconView())
-        ->setIcon('fa-download');
+        ->setIcon('fa-download')
+        ->addClass('phui-icon-circle-icon');
       $lightbox_id = celerity_generate_unique_node_id();
       $download_form = phabricator_form(
         $user,
diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
index 929222f2f9..b9ea0dd8db 100644
--- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js
+++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
@@ -169,7 +169,7 @@ JX.behavior('lightbox-attachments', function (config) {
       );
 
     var commentIcon = new JX.PHUIXIconView()
-      .setIcon('fa-comments')
+      .setIcon('fa-comments phui-icon-circle-icon')
       .getNode();
     var commentButton =
       JX.$N('a',
@@ -181,7 +181,7 @@ JX.behavior('lightbox-attachments', function (config) {
         commentIcon
       );
     var closeIcon = new JX.PHUIXIconView()
-      .setIcon('fa-times')
+      .setIcon('fa-times phui-icon-circle-icon')
       .getNode();
     var closeButton =
       JX.$N('a',

From 69369aebd30f1c0e7d54cfda0299f0b32284bfd7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 2 Jun 2017 13:29:14 -0700
Subject: [PATCH 107/865] (stable) Fix up the Celerity map on `stable`.

---
 resources/celerity/map.php | 253 +++++++++++++------------------------
 1 file changed, 91 insertions(+), 162 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 241f9acf08..702bc0e609 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,11 +9,11 @@
   'names' => array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => '19f6f61f',
+    'core.pkg.css' => 'ea94e844',
     'core.pkg.js' => '1475bd91',
     'darkconsole.pkg.js' => '1f9a31bc',
-    'differential.pkg.css' => '7d4cfa59',
-    'differential.pkg.js' => '1d120743',
+    'differential.pkg.css' => 'a2755617',
+    'differential.pkg.js' => '9cab3335',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -33,13 +33,13 @@
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
     'rsrc/css/aphront/phabricator-nav-view.css' => 'faf6a6fc',
     'rsrc/css/aphront/table-view.css' => '34cf86b4',
-    'rsrc/css/aphront/tokenizer.css' => '9a8cb501',
+    'rsrc/css/aphront/tokenizer.css' => '15d5ff71',
     'rsrc/css/aphront/tooltip.css' => '173b9431',
     'rsrc/css/aphront/typeahead-browse.css' => '4f82e510',
     'rsrc/css/aphront/typeahead.css' => '8a84cc7d',
     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
     'rsrc/css/application/auth/auth.css' => '0877ed6e',
-    'rsrc/css/application/base/main-menu-view.css' => 'de9fe8c4',
+    'rsrc/css/application/base/main-menu-view.css' => '16053029',
     'rsrc/css/application/base/notification-menu.css' => '6a697e43',
     'rsrc/css/application/base/phui-theme.css' => '9f261c6b',
     'rsrc/css/application/base/standard-page-view.css' => 'eb5b80c5',
@@ -64,14 +64,14 @@
     'rsrc/css/application/dashboard/dashboard.css' => 'fe5b1869',
     'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => 'acfd58f6',
+    'rsrc/css/application/differential/changeset-view.css' => '983751ee',
     'rsrc/css/application/differential/core.css' => '5b7b8ff4',
     'rsrc/css/application/differential/phui-inline-comment.css' => 'ffd1a542',
     'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
     'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
     'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
     'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
-    'rsrc/css/application/diffusion/diffusion-history.css' => '0c596546',
+    'rsrc/css/application/diffusion/diffusion-history.css' => 'de70e348',
     'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
     'rsrc/css/application/diffusion/diffusion-readme.css' => '18bd3910',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
@@ -114,16 +114,19 @@
     'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
-    'rsrc/css/core/core.css' => '9f4cb463',
+    'rsrc/css/core/core.css' => '23beb330',
     'rsrc/css/core/remarkup.css' => 'd1a5e11e',
     'rsrc/css/core/syntax.css' => 'cae95e89',
-    'rsrc/css/core/z-index.css' => '998f3ce1',
+    'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
     'rsrc/css/font/font-awesome.css' => 'e838e088',
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
     'rsrc/css/layout/phabricator-source-code-view.css' => '4383192f',
+    'rsrc/css/phui/button/phui-button-bar.css' => '39fe680c',
+    'rsrc/css/phui/button/phui-button-simple.css' => '081cfeea',
+    'rsrc/css/phui/button/phui-button.css' => '9f13ddcc',
     'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893',
     'rsrc/css/phui/calendar/phui-calendar-list.css' => '576be600',
     'rsrc/css/phui/calendar/phui-calendar-month.css' => '8e10e92c',
@@ -132,7 +135,7 @@
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
     'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
-    'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'ed19241b',
+    'rsrc/css/phui/object-item/phui-oi-list-view.css' => '43752968',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
     'rsrc/css/phui/phui-action-list.css' => 'c01858f4',
     'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
@@ -140,7 +143,6 @@
     'rsrc/css/phui/phui-basic-nav-view.css' => 'a0705f53',
     'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
     'rsrc/css/phui/phui-box.css' => '269cbc99',
-    'rsrc/css/phui/phui-button.css' => 'ccd8c6c5',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-cms.css' => '504b4b23',
     'rsrc/css/phui/phui-comment-form.css' => '57af2e14',
@@ -158,7 +160,7 @@
     'rsrc/css/phui/phui-header-view.css' => 'a3d1aecd',
     'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf',
     'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
-    'rsrc/css/phui/phui-icon.css' => '4c6d624c',
+    'rsrc/css/phui/phui-icon.css' => '4c46b6ba',
     'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
     'rsrc/css/phui/phui-info-view.css' => '6e217679',
@@ -391,15 +393,13 @@
     'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '408bf173',
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
-    'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
-    'rsrc/js/application/diff/DiffChangesetList.js' => '7a184082',
-    'rsrc/js/application/diff/DiffInline.js' => '19582231',
-    'rsrc/js/application/diff/ScrollObjective.js' => '7e8877e7',
-    'rsrc/js/application/diff/ScrollObjectiveList.js' => '6120e99a',
+    'rsrc/js/application/diff/DiffChangeset.js' => 'aaaf4cb5',
+    'rsrc/js/application/diff/DiffChangesetList.js' => '85abc805',
+    'rsrc/js/application/diff/DiffInline.js' => '1d17130f',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
     'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
-    'rsrc/js/application/differential/behavior-populate.js' => '1de8bf63',
+    'rsrc/js/application/differential/behavior-populate.js' => '5e41c819',
     'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
     'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'c93358e3',
     'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
@@ -454,17 +454,6 @@
     'rsrc/js/application/transactions/behavior-transaction-list.js' => '1f6794f6',
     'rsrc/js/application/typeahead/behavior-typeahead-browse.js' => '635de1ec',
     'rsrc/js/application/typeahead/behavior-typeahead-search.js' => '93d0c9e3',
-    'rsrc/js/application/uiexample/JavelinViewExample.js' => 'd4a14807',
-    'rsrc/js/application/uiexample/ReactorButtonExample.js' => 'd19198c8',
-    'rsrc/js/application/uiexample/ReactorCheckboxExample.js' => '519705ea',
-    'rsrc/js/application/uiexample/ReactorFocusExample.js' => '40a6a403',
-    'rsrc/js/application/uiexample/ReactorInputExample.js' => '886fd850',
-    'rsrc/js/application/uiexample/ReactorMouseoverExample.js' => '47c794d8',
-    'rsrc/js/application/uiexample/ReactorRadioExample.js' => '988040b4',
-    'rsrc/js/application/uiexample/ReactorSelectExample.js' => 'a155550f',
-    'rsrc/js/application/uiexample/ReactorSendClassExample.js' => '1def2711',
-    'rsrc/js/application/uiexample/ReactorSendPropertiesExample.js' => 'b1f0ccee',
-    'rsrc/js/application/uiexample/busy-example.js' => '60479091',
     'rsrc/js/application/uiexample/gesture-example.js' => '558829c2',
     'rsrc/js/application/uiexample/notification-example.js' => '8ce821c5',
     'rsrc/js/core/Busy.js' => '59a7976a',
@@ -487,6 +476,7 @@
     'rsrc/js/core/behavior-autofocus.js' => '7319e029',
     'rsrc/js/core/behavior-badge-view.js' => '8ff5e24c',
     'rsrc/js/core/behavior-choose-control.js' => '327a00d1',
+    'rsrc/js/core/behavior-copy.js' => 'b0b8f86d',
     'rsrc/js/core/behavior-detect-timezone.js' => '4c193c96',
     'rsrc/js/core/behavior-device.js' => 'bb1dd507',
     'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '484a6e22',
@@ -536,7 +526,9 @@
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => 'b3465b9b',
     'rsrc/js/phuix/PHUIXAutocomplete.js' => 'f6699267',
+    'rsrc/js/phuix/PHUIXButtonView.js' => '0f13520b',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '8018ee50',
+    'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
     'rsrc/js/phuix/PHUIXFormControl.js' => '83e03671',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
   ),
@@ -549,7 +541,7 @@
     'aphront-multi-column-view-css' => '84cc6640',
     'aphront-panel-view-css' => '8427b78d',
     'aphront-table-view-css' => '34cf86b4',
-    'aphront-tokenizer-control-css' => '9a8cb501',
+    'aphront-tokenizer-control-css' => '15d5ff71',
     'aphront-tooltip-css' => '173b9431',
     'aphront-typeahead-control-css' => '8a84cc7d',
     'application-search-view-css' => '66ee5d46',
@@ -568,14 +560,14 @@
     'conpherence-thread-manager' => '4d863052',
     'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
-    'differential-changeset-view-css' => 'acfd58f6',
+    'differential-changeset-view-css' => '983751ee',
     'differential-core-view-css' => '5b7b8ff4',
     'differential-revision-add-comment-css' => 'c47f8c40',
     'differential-revision-comment-css' => '14b8565a',
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-history-css' => '0c596546',
+    'diffusion-history-css' => 'de70e348',
     'diffusion-icons-css' => 'a6a1e2ba',
     'diffusion-readme-css' => '18bd3910',
     'diffusion-source-css' => '750add59',
@@ -622,7 +614,7 @@
     'javelin-behavior-diff-preview-link' => '051c7832',
     'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
     'javelin-behavior-differential-feedback-preview' => '51c5ad07',
-    'javelin-behavior-differential-populate' => '1de8bf63',
+    'javelin-behavior-differential-populate' => '5e41c819',
     'javelin-behavior-differential-user-select' => 'a8d8459d',
     'javelin-behavior-diffusion-browse-file' => '054a0f0b',
     'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
@@ -655,7 +647,7 @@
     'javelin-behavior-passphrase-credential-control' => '3cb0b2fc',
     'javelin-behavior-phabricator-active-nav' => 'e379b58e',
     'javelin-behavior-phabricator-autofocus' => '7319e029',
-    'javelin-behavior-phabricator-busy-example' => '60479091',
+    'javelin-behavior-phabricator-clipboard-copy' => 'b0b8f86d',
     'javelin-behavior-phabricator-file-tree' => '88236f00',
     'javelin-behavior-phabricator-gesture' => '3ab51e2c',
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
@@ -681,6 +673,7 @@
     'javelin-behavior-phui-hovercards' => 'bcaccd64',
     'javelin-behavior-phui-submenu' => 'a6f7a73b',
     'javelin-behavior-phui-tab-group' => '0a0b10e9',
+    'javelin-behavior-phuix-example' => '68af71ca',
     'javelin-behavior-policy-control' => 'd0c516d5',
     'javelin-behavior-policy-rule-editor' => '5e9f347c',
     'javelin-behavior-project-boards' => '4250a34e',
@@ -774,14 +767,14 @@
     'phabricator-busy' => '59a7976a',
     'phabricator-chatlog-css' => 'd295b020',
     'phabricator-content-source-view-css' => '4b8b05d4',
-    'phabricator-core-css' => '9f4cb463',
+    'phabricator-core-css' => '23beb330',
     'phabricator-countdown-css' => '16c52f5c',
     'phabricator-darklog' => 'c8e1ffe3',
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
-    'phabricator-diff-changeset' => 'cf4e2140',
-    'phabricator-diff-changeset-list' => '7a184082',
-    'phabricator-diff-inline' => '19582231',
+    'phabricator-diff-changeset' => 'aaaf4cb5',
+    'phabricator-diff-changeset-list' => '85abc805',
+    'phabricator-diff-inline' => '1d17130f',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -792,7 +785,7 @@
     'phabricator-flag-css' => 'bba8f811',
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => 'c19dd9b9',
-    'phabricator-main-menu-view' => 'de9fe8c4',
+    'phabricator-main-menu-view' => '16053029',
     'phabricator-nav-view-css' => 'faf6a6fc',
     'phabricator-notification' => 'ccf1cbf8',
     'phabricator-notification-css' => '3f6c89c9',
@@ -801,8 +794,6 @@
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'c5af80a2',
     'phabricator-remarkup-css' => 'd1a5e11e',
-    'phabricator-scroll-objective' => '7e8877e7',
-    'phabricator-scroll-objective-list' => '6120e99a',
     'phabricator-search-results-css' => '8f8e08ed',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
@@ -812,17 +803,7 @@
     'phabricator-title' => '485aaa6c',
     'phabricator-tooltip' => '358b8c04',
     'phabricator-ui-example-css' => '528b19de',
-    'phabricator-uiexample-javelin-view' => 'd4a14807',
-    'phabricator-uiexample-reactor-button' => 'd19198c8',
-    'phabricator-uiexample-reactor-checkbox' => '519705ea',
-    'phabricator-uiexample-reactor-focus' => '40a6a403',
-    'phabricator-uiexample-reactor-input' => '886fd850',
-    'phabricator-uiexample-reactor-mouseover' => '47c794d8',
-    'phabricator-uiexample-reactor-radio' => '988040b4',
-    'phabricator-uiexample-reactor-select' => 'a155550f',
-    'phabricator-uiexample-reactor-sendclass' => '1def2711',
-    'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
-    'phabricator-zindex-css' => '998f3ce1',
+    'phabricator-zindex-css' => '9d8f7c4b',
     'phame-css' => 'b3a0b3a3',
     'pholio-css' => 'ca89d380',
     'pholio-edit-css' => '07676f51',
@@ -838,7 +819,9 @@
     'phui-basic-nav-view-css' => 'a0705f53',
     'phui-big-info-view-css' => 'bd903741',
     'phui-box-css' => '269cbc99',
-    'phui-button-css' => 'ccd8c6c5',
+    'phui-button-bar-css' => '39fe680c',
+    'phui-button-css' => '9f13ddcc',
+    'phui-button-simple-css' => '081cfeea',
     'phui-calendar-css' => '477acfaa',
     'phui-calendar-day-css' => '572b1893',
     'phui-calendar-list-css' => '576be600',
@@ -862,7 +845,7 @@
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'f0592bcf',
     'phui-icon-set-selector-css' => '87db8fee',
-    'phui-icon-view-css' => '4c6d624c',
+    'phui-icon-view-css' => '4c46b6ba',
     'phui-image-mask-css' => 'a8498f9c',
     'phui-info-panel-css' => '27ea50a1',
     'phui-info-view-css' => '6e217679',
@@ -875,7 +858,7 @@
     'phui-oi-color-css' => 'cd2b9b77',
     'phui-oi-drag-ui-css' => '08f4ccc3',
     'phui-oi-flush-ui-css' => '9d9685d6',
-    'phui-oi-list-view-css' => 'ed19241b',
+    'phui-oi-list-view-css' => '43752968',
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => '77d8a794',
     'phui-pinboard-view-css' => '2495140e',
@@ -895,6 +878,7 @@
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => 'b3465b9b',
     'phuix-autocomplete' => 'f6699267',
+    'phuix-button-view' => '0f13520b',
     'phuix-dropdown-menu' => '8018ee50',
     'phuix-form-control-view' => '83e03671',
     'phuix-icon-view' => 'bff6884b',
@@ -952,6 +936,9 @@
       'javelin-stratcom',
       'javelin-workflow',
     ),
+    '081cfeea' => array(
+      'phui-button-css',
+    ),
     '0825c27a' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -973,6 +960,10 @@
       'javelin-dom',
       'javelin-router',
     ),
+    '0f13520b' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     '0f764c35' => array(
       'javelin-install',
       'javelin-util',
@@ -989,6 +980,13 @@
       'javelin-dom',
       'javelin-history',
     ),
+    '15d5ff71' => array(
+      'aphront-typeahead-control-css',
+      'phui-tag-view-css',
+    ),
+    16053029 => array(
+      'phui-theme-css',
+    ),
     '17bb8539' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1002,9 +1000,6 @@
     '185bbd53' => array(
       'javelin-install',
     ),
-    19582231 => array(
-      'javelin-dom',
-    ),
     '19f9369b' => array(
       'phui-oi-list-view-css',
     ),
@@ -1026,18 +1021,8 @@
       'javelin-request',
       'javelin-uri',
     ),
-    '1de8bf63' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'phabricator-tooltip',
-      'phabricator-diff-changeset-list',
-      'phabricator-diff-changeset',
-    ),
-    '1def2711' => array(
-      'javelin-install',
+    '1d17130f' => array(
       'javelin-dom',
-      'javelin-reactor-dom',
     ),
     '1e911d0f' => array(
       'javelin-stratcom',
@@ -1128,6 +1113,10 @@
       'javelin-dom',
       'javelin-vector',
     ),
+    '39fe680c' => array(
+      'phui-button-css',
+      'phui-button-simple-css',
+    ),
     '3ab51e2c' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1176,11 +1165,6 @@
       'javelin-workflow',
       'phabricator-draggable-list',
     ),
-    '40a6a403' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-reactor-dom',
-    ),
     42126667 => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1215,11 +1199,6 @@
       'javelin-view-renderer',
       'javelin-install',
     ),
-    '47c794d8' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-reactor-dom',
-    ),
     48086888 => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1286,11 +1265,6 @@
       'javelin-typeahead-source',
       'javelin-util',
     ),
-    '519705ea' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-reactor-dom',
-    ),
     '51c5ad07' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1371,6 +1345,14 @@
       'phabricator-phtize',
       'javelin-dom',
     ),
+    '5e41c819' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'phabricator-tooltip',
+      'phabricator-diff-changeset-list',
+      'phabricator-diff-changeset',
+    ),
     '5e9f347c' => array(
       'javelin-behavior',
       'multirow-row-manager',
@@ -1379,24 +1361,11 @@
       'phabricator-prefab',
       'javelin-json',
     ),
-    60479091 => array(
-      'phabricator-busy',
-      'javelin-behavior',
-    ),
     '60821bc7' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
-    '6120e99a' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-      'javelin-scrollbar',
-      'phabricator-scroll-objective',
-    ),
     '61cbc29a' => array(
       'javelin-magical-init',
       'javelin-util',
@@ -1419,6 +1388,11 @@
     '6882e80a' => array(
       'javelin-dom',
     ),
+    '68af71ca' => array(
+      'javelin-install',
+      'javelin-dom',
+      'phuix-button-view',
+    ),
     '69adf288' => array(
       'javelin-install',
     ),
@@ -1496,10 +1470,6 @@
       'javelin-behavior',
       'javelin-quicksand',
     ),
-    '7a184082' => array(
-      'javelin-install',
-      'phabricator-scroll-objective-list',
-    ),
     '7a68dda3' => array(
       'owners-path-editor',
       'javelin-behavior',
@@ -1513,13 +1483,6 @@
     '7e41274a' => array(
       'javelin-install',
     ),
-    '7e8877e7' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-    ),
     '7ebaeed3' => array(
       'herald-rule-editor',
       'javelin-behavior',
@@ -1551,6 +1514,9 @@
       'javelin-dom',
       'javelin-stratcom',
     ),
+    '85abc805' => array(
+      'javelin-install',
+    ),
     '85ee8ce6' => array(
       'aphront-dialog-view-css',
     ),
@@ -1568,13 +1534,6 @@
       'phabricator-keyboard-shortcut',
       'javelin-stratcom',
     ),
-    '886fd850' => array(
-      'javelin-install',
-      'javelin-reactor-dom',
-      'javelin-view-html',
-      'javelin-view-interpreter',
-      'javelin-view-renderer',
-    ),
     '887ad43f' => array(
       'javelin-behavior',
       'javelin-request',
@@ -1662,10 +1621,8 @@
       'javelin-mask',
       'phabricator-drag-and-drop-file-upload',
     ),
-    '988040b4' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-reactor-dom',
+    '983751ee' => array(
+      'phui-inline-comment-view-css',
     ),
     '9a6dd75c' => array(
       'javelin-behavior',
@@ -1676,10 +1633,6 @@
       'phuix-icon-view',
       'javelin-behavior-phabricator-gesture',
     ),
-    '9a8cb501' => array(
-      'aphront-typeahead-control-css',
-      'phui-tag-view-css',
-    ),
     '9bbf3762' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1704,11 +1657,6 @@
       'javelin-util',
       'phabricator-keyboard-shortcut',
     ),
-    'a155550f' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-reactor-dom',
-    ),
     'a3a63478' => array(
       'phui-workcard-view-css',
     ),
@@ -1768,6 +1716,17 @@
       'javelin-util',
       'phabricator-prefab',
     ),
+    'aaaf4cb5' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-workflow',
+      'javelin-router',
+      'javelin-behavior-device',
+      'javelin-vector',
+      'phabricator-diff-inline',
+    ),
     'ab2f381b' => array(
       'javelin-request',
       'javelin-behavior',
@@ -1787,9 +1746,6 @@
       'phuix-autocomplete',
       'javelin-mask',
     ),
-    'acfd58f6' => array(
-      'phui-inline-comment-view-css',
-    ),
     'ae95d984' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1802,10 +1758,10 @@
       'javelin-dom',
       'phuix-dropdown-menu',
     ),
-    'b1f0ccee' => array(
-      'javelin-install',
+    'b0b8f86d' => array(
+      'javelin-behavior',
       'javelin-dom',
-      'javelin-reactor-dom',
+      'javelin-stratcom',
     ),
     'b23b49e6' => array(
       'javelin-behavior',
@@ -2002,17 +1958,6 @@
     'cd2b9b77' => array(
       'phui-oi-list-view-css',
     ),
-    'cf4e2140' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-      'javelin-router',
-      'javelin-behavior-device',
-      'javelin-vector',
-      'phabricator-diff-inline',
-    ),
     'd0a99ab4' => array(
       'javelin-behavior',
       'javelin-typeahead-ondemand-source',
@@ -2034,13 +1979,6 @@
       'javelin-workflow',
       'phuix-icon-view',
     ),
-    'd19198c8' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-util',
-      'javelin-dynval',
-      'javelin-reactor-dom',
-    ),
     'd254d646' => array(
       'javelin-util',
     ),
@@ -2050,11 +1988,6 @@
       'javelin-uri',
       'javelin-util',
     ),
-    'd4a14807' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-view',
-    ),
     'd4eecc63' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2096,9 +2029,6 @@
       'javelin-typeahead-ondemand-source',
       'javelin-dom',
     ),
-    'de9fe8c4' => array(
-      'phui-theme-css',
-    ),
     'e0ec7f2f' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2258,6 +2188,7 @@
       'phabricator-core-css',
       'phabricator-zindex-css',
       'phui-button-css',
+      'phui-button-simple-css',
       'phui-theme-css',
       'phabricator-standard-page-view',
       'aphront-dialog-view-css',
@@ -2435,8 +2366,6 @@
       'javelin-behavior-load-blame',
       'javelin-behavior-differential-user-select',
       'javelin-behavior-aphront-more',
-      'phabricator-scroll-objective',
-      'phabricator-scroll-objective-list',
       'phabricator-diff-inline',
       'phabricator-diff-changeset',
       'phabricator-diff-changeset-list',

From acaa2e148f578dff279fc8b2614aaafe30026d72 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 2 Jun 2017 16:10:59 -0700
Subject: [PATCH 108/865] (stable) Fix an issue where Phriction moves to new
 locations would fail with a "content required" error

Summary:
Ref T12793. I'd like to understand exactly when we broke this, but this seems to be a minimal fix that shouldn't do anything surprising.

When you move document `/a/` to `/a/b/` and that path doesn't exist yet, the Content transaction currently fails because there's "no content". The content gets added later by the "move" transaction but this is implicit.

To make this work, just ignore the "missing field" error. This is a little roundabout but unlikely to break anything in weird ways.

Test Plan:
  - Moved document `/a/b/` to `/a/b/c/`.
  - Before patch: error about missing content.
  - After patch: move worked properly.

Reviewers: chad, amckinley

Reviewed By: amckinley

Maniphest Tasks: T12793

Differential Revision: https://secure.phabricator.com/D18069
---
 .../phriction/controller/PhrictionMoveController.php             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/phriction/controller/PhrictionMoveController.php b/src/applications/phriction/controller/PhrictionMoveController.php
index f25465c3c0..b82681f0a7 100644
--- a/src/applications/phriction/controller/PhrictionMoveController.php
+++ b/src/applications/phriction/controller/PhrictionMoveController.php
@@ -60,6 +60,7 @@ public function handleRequest(AphrontRequest $request) {
         ->setActor($viewer)
         ->setContentSourceFromRequest($request)
         ->setContinueOnNoEffect(true)
+        ->setContinueOnMissingFields(true)
         ->setDescription($v_note);
 
       $xactions = array();

From 5885704800a97aadf47aee5654ff2647b40fb4ad Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 9 Jun 2017 22:17:36 +0000
Subject: [PATCH 109/865] (stable) Clean up spacing on diff-banner

Summary: Adds spacing to the buttons, line-height for aligning text vertically.

Test Plan: Leave comments on a diff.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18110
---
 resources/celerity/map.php                           | 12 ++++++------
 .../css/application/differential/changeset-view.css  |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 1c0fb7fb3c..2209dffea7 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -12,7 +12,7 @@
     'core.pkg.css' => 'ab24402f',
     'core.pkg.js' => '1475bd91',
     'darkconsole.pkg.js' => '1f9a31bc',
-    'differential.pkg.css' => '1ccbf3a9',
+    'differential.pkg.css' => '4e99863c',
     'differential.pkg.js' => 'b7504037',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '6134c5a1',
@@ -64,7 +64,7 @@
     'rsrc/css/application/dashboard/dashboard.css' => 'fe5b1869',
     'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => 'c3f44655',
+    'rsrc/css/application/differential/changeset-view.css' => 'c72dba88',
     'rsrc/css/application/differential/core.css' => '5b7b8ff4',
     'rsrc/css/application/differential/phui-inline-comment.css' => 'ffd1a542',
     'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
@@ -562,7 +562,7 @@
     'conpherence-thread-manager' => '4d863052',
     'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
-    'differential-changeset-view-css' => 'c3f44655',
+    'differential-changeset-view-css' => 'c72dba88',
     'differential-core-view-css' => '5b7b8ff4',
     'differential-revision-add-comment-css' => 'c47f8c40',
     'differential-revision-comment-css' => '14b8565a',
@@ -1872,9 +1872,6 @@
       'javelin-dom',
       'javelin-vector',
     ),
-    'c3f44655' => array(
-      'phui-inline-comment-view-css',
-    ),
     'c420b0b9' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1896,6 +1893,9 @@
       'javelin-stratcom',
       'javelin-util',
     ),
+    'c72dba88' => array(
+      'phui-inline-comment-view-css',
+    ),
     'c7ccd872' => array(
       'phui-fontkit-css',
     ),
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
index 33dcea1213..bfde532c44 100644
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -392,13 +392,14 @@ tr.differential-inline-loading {
   top: 0;
   left: 0;
   right: 0;
-  background: rgba(255, 255, 255, 0.95);
+  background: #fff;
   box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1);
   border-bottom: 1px solid {$lightgreyborder};
-  padding: 12px 18px;
+  padding: 8px 18px;
   vertical-align: middle;
   font-weight: bold;
   font-size: {$biggerfontsize};
+  line-height: 28px;
 }
 
 .diff-banner .phui-icon-view {
@@ -409,6 +410,10 @@ tr.differential-inline-loading {
   color: {$greytext};
 }
 
+.diff-banner-buttons .button {
+  margin-left: 8px;
+}
+
 .diff-banner-has-unsaved,
 .diff-banner-has-unsubmitted {
   background: {$sh-yellowbackground};

From 314723d309cbea57051a257d75e301e7e26ec8f8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Jun 2017 16:54:56 -0700
Subject: [PATCH 110/865] (stable) Rebuild Celerity map on stable.

---
 resources/celerity/map.php | 116 ++++++++++++++++++-------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 2209dffea7..0619fc34f8 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,11 +9,11 @@
   'names' => array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => 'ab24402f',
-    'core.pkg.js' => '1475bd91',
+    'core.pkg.css' => '37dd219b',
+    'core.pkg.js' => '5d80e0db',
     'darkconsole.pkg.js' => '1f9a31bc',
-    'differential.pkg.css' => '4e99863c',
-    'differential.pkg.js' => 'b7504037',
+    'differential.pkg.css' => '4ec4a37a',
+    'differential.pkg.js' => 'd4ab0e81',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -64,14 +64,14 @@
     'rsrc/css/application/dashboard/dashboard.css' => 'fe5b1869',
     'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => 'c72dba88',
+    'rsrc/css/application/differential/changeset-view.css' => 'b5e6be7f',
     'rsrc/css/application/differential/core.css' => '5b7b8ff4',
     'rsrc/css/application/differential/phui-inline-comment.css' => 'ffd1a542',
     'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
     'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
     'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
     'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
-    'rsrc/css/application/diffusion/diffusion-history.css' => '6870e8c1',
+    'rsrc/css/application/diffusion/diffusion-history.css' => '4540f568',
     'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
@@ -115,7 +115,7 @@
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '23beb330',
-    'rsrc/css/core/remarkup.css' => '509fb36e',
+    'rsrc/css/core/remarkup.css' => 'eb37bd0d',
     'rsrc/css/core/syntax.css' => 'cae95e89',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
@@ -166,7 +166,7 @@
     'rsrc/css/phui/phui-info-view.css' => '6e217679',
     'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0',
     'rsrc/css/phui/phui-lightbox.css' => '0a035e40',
-    'rsrc/css/phui/phui-list.css' => '12eb8ce6',
+    'rsrc/css/phui/phui-list.css' => 'dcafb463',
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
@@ -177,7 +177,7 @@
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
     'rsrc/css/phui/phui-tag-view.css' => '93b084cf',
     'rsrc/css/phui/phui-timeline-view.css' => '313c7f22',
-    'rsrc/css/phui/phui-two-column-view.css' => 'ce9fa0b7',
+    'rsrc/css/phui/phui-two-column-view.css' => '5b8cd553',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
     'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
@@ -395,13 +395,13 @@
     'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '408bf173',
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
-    'rsrc/js/application/diff/DiffChangeset.js' => 'd498bddb',
-    'rsrc/js/application/diff/DiffChangesetList.js' => '29bbc02c',
-    'rsrc/js/application/diff/DiffInline.js' => '20553f71',
+    'rsrc/js/application/diff/DiffChangeset.js' => '99abf4cd',
+    'rsrc/js/application/diff/DiffChangesetList.js' => '79de07c6',
+    'rsrc/js/application/diff/DiffInline.js' => '1bfa31c7',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
     'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
-    'rsrc/js/application/differential/behavior-populate.js' => '5e41c819',
+    'rsrc/js/application/differential/behavior-populate.js' => '419998ab',
     'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
     'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'c93358e3',
     'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
@@ -526,7 +526,7 @@
     'rsrc/js/phui/behavior-phui-submenu.js' => 'a6f7a73b',
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
-    'rsrc/js/phuix/PHUIXActionView.js' => 'b3465b9b',
+    'rsrc/js/phuix/PHUIXActionView.js' => '442efd08',
     'rsrc/js/phuix/PHUIXAutocomplete.js' => 'f6699267',
     'rsrc/js/phuix/PHUIXButtonView.js' => 'a37126bd',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '8018ee50',
@@ -562,14 +562,14 @@
     'conpherence-thread-manager' => '4d863052',
     'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
-    'differential-changeset-view-css' => 'c72dba88',
+    'differential-changeset-view-css' => 'b5e6be7f',
     'differential-core-view-css' => '5b7b8ff4',
     'differential-revision-add-comment-css' => 'c47f8c40',
     'differential-revision-comment-css' => '14b8565a',
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-history-css' => '6870e8c1',
+    'diffusion-history-css' => '4540f568',
     'diffusion-icons-css' => 'a6a1e2ba',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-source-css' => '750add59',
@@ -616,7 +616,7 @@
     'javelin-behavior-diff-preview-link' => '051c7832',
     'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
     'javelin-behavior-differential-feedback-preview' => '51c5ad07',
-    'javelin-behavior-differential-populate' => '5e41c819',
+    'javelin-behavior-differential-populate' => '419998ab',
     'javelin-behavior-differential-user-select' => 'a8d8459d',
     'javelin-behavior-diffusion-browse-file' => '054a0f0b',
     'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
@@ -774,9 +774,9 @@
     'phabricator-darklog' => 'c8e1ffe3',
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
-    'phabricator-diff-changeset' => 'd498bddb',
-    'phabricator-diff-changeset-list' => '29bbc02c',
-    'phabricator-diff-inline' => '20553f71',
+    'phabricator-diff-changeset' => '99abf4cd',
+    'phabricator-diff-changeset-list' => '79de07c6',
+    'phabricator-diff-inline' => '1bfa31c7',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
     'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -795,7 +795,7 @@
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'c5af80a2',
-    'phabricator-remarkup-css' => '509fb36e',
+    'phabricator-remarkup-css' => 'eb37bd0d',
     'phabricator-search-results-css' => '8f8e08ed',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
@@ -854,7 +854,7 @@
     'phui-inline-comment-view-css' => 'ffd1a542',
     'phui-invisible-character-view-css' => '6993d9f0',
     'phui-lightbox-css' => '0a035e40',
-    'phui-list-view-css' => '12eb8ce6',
+    'phui-list-view-css' => 'dcafb463',
     'phui-object-box-css' => '9cff003c',
     'phui-oi-big-ui-css' => '19f9369b',
     'phui-oi-color-css' => 'cd2b9b77',
@@ -872,13 +872,13 @@
     'phui-tag-view-css' => '93b084cf',
     'phui-theme-css' => '9f261c6b',
     'phui-timeline-view-css' => '313c7f22',
-    'phui-two-column-view-css' => 'ce9fa0b7',
+    'phui-two-column-view-css' => '5b8cd553',
     'phui-workboard-color-css' => '783cdff5',
     'phui-workboard-view-css' => '3bc85455',
     'phui-workcard-view-css' => 'cca5fa92',
     'phui-workpanel-view-css' => 'a3a63478',
     'phuix-action-list-view' => 'b5c256b8',
-    'phuix-action-view' => 'b3465b9b',
+    'phuix-action-view' => '442efd08',
     'phuix-autocomplete' => 'f6699267',
     'phuix-button-view' => 'a37126bd',
     'phuix-dropdown-menu' => '8018ee50',
@@ -1016,6 +1016,9 @@
       'javelin-request',
       'javelin-uri',
     ),
+    '1bfa31c7' => array(
+      'javelin-dom',
+    ),
     '1e911d0f' => array(
       'javelin-stratcom',
       'javelin-request',
@@ -1039,9 +1042,6 @@
       'javelin-install',
       'javelin-dom',
     ),
-    '20553f71' => array(
-      'javelin-dom',
-    ),
     '2290aeef' => array(
       'javelin-install',
       'javelin-dom',
@@ -1067,10 +1067,6 @@
       'javelin-install',
       'javelin-util',
     ),
-    '29bbc02c' => array(
-      'javelin-install',
-      'phuix-button-view',
-    ),
     '2ae077e1' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1164,6 +1160,14 @@
       'javelin-workflow',
       'phabricator-draggable-list',
     ),
+    '419998ab' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'phabricator-tooltip',
+      'phabricator-diff-changeset-list',
+      'phabricator-diff-changeset',
+    ),
     42126667 => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1178,6 +1182,11 @@
       'javelin-workflow',
       'javelin-workboard-controller',
     ),
+    '442efd08' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-util',
+    ),
     '44959b73' => array(
       'javelin-util',
       'javelin-uri',
@@ -1339,14 +1348,6 @@
       'phabricator-phtize',
       'javelin-dom',
     ),
-    '5e41c819' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'phabricator-tooltip',
-      'phabricator-diff-changeset-list',
-      'phabricator-diff-changeset',
-    ),
     '5e9f347c' => array(
       'javelin-behavior',
       'multirow-row-manager',
@@ -1475,6 +1476,10 @@
       'javelin-behavior',
       'javelin-quicksand',
     ),
+    '79de07c6' => array(
+      'javelin-install',
+      'phuix-button-view',
+    ),
     '7a68dda3' => array(
       'owners-path-editor',
       'javelin-behavior',
@@ -1626,6 +1631,17 @@
       'javelin-mask',
       'phabricator-drag-and-drop-file-upload',
     ),
+    '99abf4cd' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-workflow',
+      'javelin-router',
+      'javelin-behavior-device',
+      'javelin-vector',
+      'phabricator-diff-inline',
+    ),
     '9a6dd75c' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1771,11 +1787,6 @@
       'javelin-uri',
       'javelin-request',
     ),
-    'b3465b9b' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-util',
-    ),
     'b3a4b884' => array(
       'javelin-behavior',
       'phabricator-prefab',
@@ -1800,6 +1811,9 @@
       'javelin-dom',
       'javelin-util',
     ),
+    'b5e6be7f' => array(
+      'phui-inline-comment-view-css',
+    ),
     'b6993408' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1893,9 +1907,6 @@
       'javelin-stratcom',
       'javelin-util',
     ),
-    'c72dba88' => array(
-      'phui-inline-comment-view-css',
-    ),
     'c7ccd872' => array(
       'phui-fontkit-css',
     ),
@@ -1986,17 +1997,6 @@
       'javelin-uri',
       'javelin-util',
     ),
-    'd498bddb' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-      'javelin-router',
-      'javelin-behavior-device',
-      'javelin-vector',
-      'phabricator-diff-inline',
-    ),
     'd4eecc63' => array(
       'javelin-behavior',
       'javelin-dom',

From 7cb67dc7257e2a90be00b1e8cefd331a8402662a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 26 Jun 2017 06:45:42 -0700
Subject: [PATCH 111/865] (stable) Restore "Land Revision" action to UI

Summary: This was accidentally caught in the crossfire in D18150. This is stable enough to formalize instead of adding with an event hook.

Test Plan: Looked at a candidate revision, saw "Land Revision" appear in UI again.

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D18154
---
 .../DifferentialRevisionViewController.php    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index f19ff37360..ab03ee6d81 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -615,6 +615,29 @@ private function buildCurtain(DifferentialRevision $revision) {
       $curtain->addAction($relationship_submenu);
     }
 
+    $repository = $revision->getRepository();
+    if ($repository && $repository->canPerformAutomation()) {
+      $revision_id = $revision->getID();
+
+      $op = new DrydockLandRepositoryOperation();
+      $barrier = $op->getBarrierToLanding($viewer, $revision);
+
+      if ($barrier) {
+        $can_land = false;
+      } else {
+        $can_land = true;
+      }
+
+      $action = id(new PhabricatorActionView())
+        ->setName(pht('Land Revision'))
+        ->setIcon('fa-fighter-jet')
+        ->setHref("/differential/revision/operation/{$revision_id}/")
+        ->setWorkflow(true)
+        ->setDisabled(!$can_land);
+
+      $curtain->addAction($action);
+    }
+
     return $curtain;
   }
 

From 3480b3e7ef00ff8a42f78f2be31bda8aab318353 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Sun, 9 Jul 2017 06:40:51 -0700
Subject: [PATCH 112/865] (stable) Fix comparison check for SVN in browsing
 Diffusion

Summary: Fixes T12905. Missed setting this variable.

Test Plan: Browse an SVN repository.

Reviewers: epriestley

Subscribers: Korvin

Maniphest Tasks: T12905

Differential Revision: https://secure.phabricator.com/D18190
---
 .../diffusion/controller/DiffusionBrowseController.php       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 3fa9e62948..06c8336f5c 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1667,6 +1667,7 @@ protected function getActions(DiffusionRequest $drequest) {
     $repository = $drequest->getRepository();
     $history_uri = $drequest->generateURI(array('action' => 'history'));
     $behind_head = $drequest->getSymbolicCommit();
+    $compare = null;
     $head_uri = $drequest->generateURI(
       array(
         'commit' => '',
@@ -1771,11 +1772,11 @@ private function buildOpenRevisions() {
     }
 
     $header = id(new PHUIHeaderView())
-      ->setHeader(pht('Recently Open Revisions'))
-      ->setHeaderIcon('fa-gear');
+      ->setHeader(pht('Recently Open Revisions'));
 
     $view = id(new DifferentialRevisionListView())
       ->setHeader($header)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setRevisions($revisions)
       ->setUser($viewer);
 

From 57a584e270a703113431068e77ffcea122fdeb6c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 28 Jul 2017 10:37:53 -0700
Subject: [PATCH 113/865] (stable) Don't fatal when viewing tags pointing at
 commits we haven't imported/parsed yet

Summary:
In Diffusion, the "Tags" view may read commits which haven't imported or parsed yet, and thus don't have loadable objects.

Most of this logic tests for `if ($commit)`, but the author part did not. Instead, don't render author information if `$commit` is not present.

Test Plan:
  - Loaded tags view with commits present.
  - Faked `$commit = null;`, loaded tag view, got this instead of a fatal:

{F5068432}

Reviewers: chad, amckinley

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D18290
---
 .../diffusion/view/DiffusionTagListView.php   | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/applications/diffusion/view/DiffusionTagListView.php b/src/applications/diffusion/view/DiffusionTagListView.php
index abab9003c3..0f8cbeae71 100644
--- a/src/applications/diffusion/view/DiffusionTagListView.php
+++ b/src/applications/diffusion/view/DiffusionTagListView.php
@@ -52,24 +52,12 @@ public function render() {
           'commit' => $tag->getCommitIdentifier(),
         ));
 
-      $author = null;
-      if ($commit && $commit->getAuthorPHID()) {
-        $author = $this->handles[$commit->getAuthorPHID()]->renderLink();
-      } else if ($commit && $commit->getCommitData()) {
-        $author = self::renderName($commit->getCommitData()->getAuthorName());
+      if ($commit) {
+        $author = $this->renderAuthor($tag, $commit);
       } else {
-        $author = self::renderName($tag->getAuthor());
+        $author = null;
       }
 
-      $committed = phabricator_datetime($commit->getEpoch(), $viewer);
-      $author_name = phutil_tag(
-        'strong',
-        array(
-          'class' => 'diffusion-history-author-name',
-        ),
-        $author);
-      $authored = pht('%s on %s.', $author_name, $committed);
-
       $description = null;
       if ($tag->getType() == 'git/tag') {
         // In Git, a tag may be a "real" tag, or just a reference to a commit.
@@ -139,16 +127,43 @@ public function render() {
         ->setHref($tag_href)
         ->addAttribute(array($commit_tag))
         ->addAttribute($description)
-        ->addAttribute($authored)
         ->setSideColumn(array(
           $build_view,
           $button_bar,
         ));
 
+      if ($author) {
+        $item->addAttribute($author);
+      }
+
       $list->addItem($item);
     }
 
     return $list;
   }
 
+  private function renderAuthor(
+    DiffusionRepositoryTag $tag,
+    PhabricatorRepositoryCommit $commit) {
+    $viewer = $this->getViewer();
+
+    if ($commit->getAuthorPHID()) {
+      $author = $this->handles[$commit->getAuthorPHID()]->renderLink();
+    } else if ($commit->getCommitData()) {
+      $author = self::renderName($commit->getCommitData()->getAuthorName());
+    } else {
+      $author = self::renderName($tag->getAuthor());
+    }
+
+    $committed = phabricator_datetime($commit->getEpoch(), $viewer);
+    $author_name = phutil_tag(
+      'strong',
+      array(
+        'class' => 'diffusion-history-author-name',
+      ),
+      $author);
+
+    return pht('%s on %s.', $author_name, $committed);
+  }
+
 }

From 77e4e6fdb44f7c4584fb5d6b638f1094bfe5315e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 10 Aug 2017 17:04:11 -0700
Subject: [PATCH 114/865] (stable) Pass SSH wrappers to VCS commands
 unconditonally, not just if there's an SSH remote

Summary:
Ref T12961. In Mercurial, it's possible to have "subrepos" which may use a different protocol than the main repository.

By putting an SSH repository inside an HTTP repository, an attacker can theoretically get us to execute `hg` without overriding `ui.ssh`, then execute code via the SSH hostname attack.

As an immediate mitigation to this attack, specify `ui.ssh` unconditionally. Normally, this will have no effect (it will just be ignored). In the specific case of an SSH repo inside an HTTP repo, it will defuse the `ssh` protocol.

For good measure and consistency, do the same for Subversion and Git. However, we don't normally maintain working copies for either Subversion or Git so it's unlikely that similar attacks exist there.

Test Plan:
  - Put an SSH subrepo with an attack URI inside an HTTP outer repo in Mercurial.
  - Ran `hg up` with and without `ui.ssh` specified.
  - Got dangerous badness without `ui.ssh` and safe `ssh` subprocesses with `ui.ssh`.

I'm not yet able to confirm that `hg pull -u -- <uri>` can actually trigger this, but this can't hurt and our SSH wrapper is safer than the native behavior for all Subversion, Git and Mercurial versions released prior to today.

Reviewers: chad

Reviewed By: chad

Subscribers: cspeckmim

Maniphest Tasks: T12961

Differential Revision: https://secure.phabricator.com/D18389
---
 .../protocol/DiffusionGitCommandEngine.php         |  4 +---
 .../protocol/DiffusionMercurialCommandEngine.php   | 14 ++++++++------
 .../protocol/DiffusionSubversionCommandEngine.php  |  4 +---
 .../__tests__/DiffusionCommandEngineTestCase.php   |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php b/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
index a16416ae1d..168b18caa5 100644
--- a/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
@@ -26,9 +26,7 @@ protected function newCustomEnvironment() {
 
     $env['HOME'] = PhabricatorEnv::getEmptyCWD();
 
-    if ($this->isAnySSHProtocol()) {
-      $env['GIT_SSH'] = $this->getSSHWrapper();
-    }
+    $env['GIT_SSH'] = $this->getSSHWrapper();
 
     if ($this->isAnyHTTPProtocol()) {
       $uri = $this->getURI();
diff --git a/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php b/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php
index 49c618b085..9499b8f5f1 100644
--- a/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php
@@ -11,12 +11,14 @@ protected function canBuildForRepository(
   protected function newFormattedCommand($pattern, array $argv) {
     $args = array();
 
-    if ($this->isAnySSHProtocol()) {
-      $pattern = "hg --config ui.ssh=%s {$pattern}";
-      $args[] = $this->getSSHWrapper();
-    } else {
-      $pattern = "hg {$pattern}";
-    }
+    // NOTE: Here, and in Git and Subversion, we override the SSH command even
+    // if the repository does not use an SSH remote, since our SSH wrapper
+    // defuses an attack against older versions of Mercurial, Git and
+    // Subversion (see T12961) and it's possible to execute this attack
+    // in indirect ways, like by using an SSH subrepo inside an HTTP repo.
+
+    $pattern = "hg --config ui.ssh=%s {$pattern}";
+    $args[] = $this->getSSHWrapper();
 
     return array($pattern, array_merge($args, $argv));
   }
diff --git a/src/applications/diffusion/protocol/DiffusionSubversionCommandEngine.php b/src/applications/diffusion/protocol/DiffusionSubversionCommandEngine.php
index d8e9e6ff17..75b8785a6e 100644
--- a/src/applications/diffusion/protocol/DiffusionSubversionCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionSubversionCommandEngine.php
@@ -44,9 +44,7 @@ protected function newFormattedCommand($pattern, array $argv) {
   protected function newCustomEnvironment() {
     $env = array();
 
-    if ($this->isAnySSHProtocol()) {
-      $env['SVN_SSH'] = $this->getSSHWrapper();
-    }
+    $env['SVN_SSH'] = $this->getSSHWrapper();
 
     return $env;
   }
diff --git a/src/applications/diffusion/protocol/__tests__/DiffusionCommandEngineTestCase.php b/src/applications/diffusion/protocol/__tests__/DiffusionCommandEngineTestCase.php
index 76d9ad9170..1df3ea3522 100644
--- a/src/applications/diffusion/protocol/__tests__/DiffusionCommandEngineTestCase.php
+++ b/src/applications/diffusion/protocol/__tests__/DiffusionCommandEngineTestCase.php
@@ -26,7 +26,7 @@ public function testCommandEngine() {
       ));
 
     $this->assertCommandEngineFormat(
-      'hg xyz',
+      (string)csprintf('hg --config ui.ssh=%s xyz', $ssh_wrapper),
       array(
         'LANG' => 'en_US.UTF-8',
         'HGPLAIN' => '1',
@@ -102,7 +102,7 @@ public function testCommandEngine() {
       ));
 
     $this->assertCommandEngineFormat(
-      'hg xyz',
+      (string)csprintf('hg --config ui.ssh=%s xyz', $ssh_wrapper),
       array(
         'LANG' => 'en_US.UTF-8',
         'HGPLAIN' => '1',

From 41e823796ac1a80295c14a07faf331dd5e2aeb28 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 10 Aug 2017 17:22:32 -0700
Subject: [PATCH 115/865] (stable) Stop populating or updating working copies
 in observed Mercurial repositories

Summary:
Ref T12961. Fixes T4416. Currently, for observed Mercurial repositories, we build a working copy with `pull -u` (for "update").

This should be unnecessary, and we don't do it for hosted Mercurial repositories. We also stopped doing it years ago for Git repositories. We also don't clone Mercurial repositories with a working copy.

It's possible something has slipped through the cracks here so I'll hold this until after the release cut, but I believe there are no actual technical blockers here.

Test Plan:
  - Observed a public Mercurial repository on Bitbucket.
  - Let it import.
  - Browsed commits, branches, file content, etc., without any apparent issues.

Reviewers: chad

Reviewed By: chad

Subscribers: cspeckmim

Maniphest Tasks: T12961, T4416

Differential Revision: https://secure.phabricator.com/D18390
---
 .../repository/engine/PhabricatorRepositoryPullEngine.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
index 32e99e619d..10eddd38d4 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
@@ -529,7 +529,7 @@ private function executeMercurialUpdate() {
 
     // This is a local command, but needs credentials.
     $remote = $repository->getRemoteURIEnvelope();
-    $future = $repository->getRemoteCommandFuture('pull -u -- %P', $remote);
+    $future = $repository->getRemoteCommandFuture('pull -- %P', $remote);
     $future->setCWD($path);
 
     try {

From ea4e33261e499b183558e7ef58837970d6de3b7a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 09:47:30 -0700
Subject: [PATCH 116/865] (stable) Fix an inverted condition for the "Reopen
 Revision" action

Summary: Ref T2543. I converted this condition the wrong way, missing a `!`. I'll cherry-pick this to `stable`.

Test Plan: No more "Reopen Revision" action available on open revisions.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18399
---
 .../xaction/DifferentialRevisionReopenTransaction.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
index e2b217603a..7ba20772c7 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
@@ -39,7 +39,7 @@ public function applyInternalEffects($object, $value) {
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
-    if ($object->isPublished()) {
+    if (!$object->isPublished()) {
       throw new Exception(
         pht(
           'You can not reopen this revision because it is not closed. '.

From 017125598631b394fd4bb05c52a0ad1180a42587 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 29 Aug 2017 09:54:03 -0700
Subject: [PATCH 117/865] (stable) Fix an issue where "Close Revision" did not
 appear in the UI

Summary:
Ref T2543. When called from the UI to build the dropdown, there's no Editor, since we aren't actually in an edit flow.

This logic worked for actually performing the edits, just not for getting the option into the dropdown.

Test Plan: Used the dropdown to close an "Accepted" revision which I authored.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18490
---
 .../xaction/DifferentialRevisionCloseTransaction.php   | 10 ++++++----
 .../storage/PhabricatorModularTransactionType.php      |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
index 8d01f48eff..d71b30950a 100644
--- a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
@@ -46,10 +46,12 @@ public function applyInternalEffects($object, $value) {
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
-    if ($this->getEditor()->getIsCloseByCommit()) {
-      // If we're closing a revision because we discovered a commit, we don't
-      // care what state it was in.
-      return;
+    if ($this->hasEditor()) {
+      if ($this->getEditor()->getIsCloseByCommit()) {
+        // If we're closing a revision because we discovered a commit, we don't
+        // care what state it was in.
+        return;
+      }
     }
 
     if ($object->isClosed()) {
diff --git a/src/applications/transactions/storage/PhabricatorModularTransactionType.php b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
index 119bfedd32..f2b59c8a2b 100644
--- a/src/applications/transactions/storage/PhabricatorModularTransactionType.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
@@ -134,6 +134,10 @@ final protected function getEditor() {
     return $this->editor;
   }
 
+  final protected function hasEditor() {
+    return (bool)$this->editor;
+  }
+
   final protected function getAuthorPHID() {
     return $this->getStorage()->getAuthorPHID();
   }

From 70ebdd2694553f480cab6f4b3db86f5b82eba277 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 29 Aug 2017 12:42:58 -0700
Subject: [PATCH 118/865] (stable) Make legacy revision statuses from
 "differential.query" have type "string" again

Summary:
Ref T2543. The type on these got changed by accident, it should be "string" (crazy nonsense, compatible) not "int" (sensible, not compatible).

(New API uses sensible strings like "accepted" only.)

Test Plan: Called `differential.query` from web UI, saw `"2"` and similar statuses.

Reviewers: chad, jmeador, lvital

Reviewed By: jmeador, lvital

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18493
---
 .../conduit/DifferentialQueryConduitAPIMethod.php           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
index 0b26db0655..eeef36ee69 100644
--- a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
@@ -218,7 +218,11 @@ protected function execute(ConduitAPIRequest $request) {
         'dateCreated'         => $revision->getDateCreated(),
         'dateModified'        => $revision->getDateModified(),
         'authorPHID'          => $revision->getAuthorPHID(),
-        'status'              => $revision->getLegacyRevisionStatus(),
+
+        // NOTE: For backward compatibility this is explicitly a string, like
+        // "2", even though the value of the string is an integer. See PHI14.
+        'status'              => (string)$revision->getLegacyRevisionStatus(),
+
         'statusName'          => $revision->getStatusDisplayName(),
         'properties' => $revision->getProperties(),
         'branch'              => $diff->getBranch(),

From 89a70bf56c93a86e9ead9b664ff95227cbb77644 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 5 Sep 2017 11:33:22 -0700
Subject: [PATCH 119/865] (stable) Fix credential control logic for restricted
 credentials

Summary: Fixes T12975. This logic didn't deal with PolicyException correctly.

Test Plan: {F5167549}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12975

Differential Revision: https://secure.phabricator.com/D18537
---
 .../view/PassphraseCredentialControl.php      | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/applications/passphrase/view/PassphraseCredentialControl.php b/src/applications/passphrase/view/PassphraseCredentialControl.php
index 1c189e30e7..9c9706fe3f 100644
--- a/src/applications/passphrase/view/PassphraseCredentialControl.php
+++ b/src/applications/passphrase/view/PassphraseCredentialControl.php
@@ -53,13 +53,22 @@ protected function renderInput() {
     if (strlen($current_phid) && empty($options_map[$current_phid])) {
       $viewer = $this->getViewer();
 
-      $user_credential = id(new PassphraseCredentialQuery())
-        ->setViewer($viewer)
-        ->withPHIDs(array($current_phid))
-        ->executeOne();
-      if (!$user_credential) {
+      $current_name = null;
+      try {
+        $user_credential = id(new PassphraseCredentialQuery())
+          ->setViewer($viewer)
+          ->withPHIDs(array($current_phid))
+          ->executeOne();
+
+        if ($user_credential) {
+          $current_name = pht(
+            '%s %s',
+            $user_credential->getMonogram(),
+            $user_credential->getName());
+        }
+      } catch (PhabricatorPolicyException $policy_exception) {
         // Pull the credential with the ominipotent viewer so we can look up
-        // the ID and tell if it's restricted or invalid.
+        // the ID and provide the monogram.
         $omnipotent_credential = id(new PassphraseCredentialQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withPHIDs(array($current_phid))
@@ -68,16 +77,13 @@ protected function renderInput() {
           $current_name = pht(
             '%s (Restricted Credential)',
             $omnipotent_credential->getMonogram());
-        } else {
-          $current_name = pht(
-            'Invalid Credential ("%s")',
-            $current_phid);
         }
-      } else {
+      }
+
+      if ($current_name === null) {
         $current_name = pht(
-          '%s %s',
-          $user_credential->getMonogram(),
-          $user_credential->getName());
+          'Invalid Credential ("%s")',
+          $current_phid);
       }
 
       $options_map = array(

From 97f0103a80fe7a0190f2104e07be18007834f1e0 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 11:17:58 -0700
Subject: [PATCH 120/865] Update Spaces for new edit UI

Summary: New edit ui

Test Plan: create a space

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18558
---
 .../controller/PhabricatorSpacesEditController.php       | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/applications/spaces/controller/PhabricatorSpacesEditController.php b/src/applications/spaces/controller/PhabricatorSpacesEditController.php
index faca39d634..cf3b6578b6 100644
--- a/src/applications/spaces/controller/PhabricatorSpacesEditController.php
+++ b/src/applications/spaces/controller/PhabricatorSpacesEditController.php
@@ -165,8 +165,8 @@ public function handleRequest(AphrontRequest $request) {
           ->addCancelButton($cancel_uri));
 
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Space'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setHeaderText($title)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setValidationException($validation_exception)
       ->appendChild($form);
 
@@ -179,12 +179,7 @@ public function handleRequest(AphrontRequest $request) {
     $crumbs->addTextCrumb($title);
     $crumbs->setBorder(true);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($header_text)
-      ->setHeaderIcon('fa-pencil');
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter(array(
           $box,
         ));

From d3db3fff59de592768030171959b5439e6f69afa Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 11:12:45 -0700
Subject: [PATCH 121/865] Update file edit UI

Summary: New white box

Test Plan: /file/upload/

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18557
---
 .../files/controller/PhabricatorFileUploadController.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/applications/files/controller/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php
index 3be0ca3968..c06e0e6d89 100644
--- a/src/applications/files/controller/PhabricatorFileUploadController.php
+++ b/src/applications/files/controller/PhabricatorFileUploadController.php
@@ -90,17 +90,12 @@ public function handleRequest(AphrontRequest $request) {
       ->setShowIfSupportedID($support_id);
 
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('File'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-upload');
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter(array(
         $form_box,
         $global_upload,

From a5232e015afa6fe65086563806288d0df9f2bcb7 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 12:01:44 -0700
Subject: [PATCH 122/865] Update herald edit for new UI

Summary: Updates herald update, create

Test Plan: Create some rulez

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18563
---
 .../herald/controller/HeraldNewController.php             | 8 ++------
 .../herald/controller/HeraldRuleController.php            | 7 ++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/applications/herald/controller/HeraldNewController.php b/src/applications/herald/controller/HeraldNewController.php
index e9fa1e66bd..fbaf1aeb9e 100644
--- a/src/applications/herald/controller/HeraldNewController.php
+++ b/src/applications/herald/controller/HeraldNewController.php
@@ -194,8 +194,9 @@ public function handleRequest(AphrontRequest $request) {
           ->addCancelButton($cancel_uri, $cancel_text));
 
     $form_box = id(new PHUIObjectBoxView())
+      ->setHeaderText($title)
       ->setFormErrors($errors)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
     $crumbs = $this
@@ -203,12 +204,7 @@ public function handleRequest(AphrontRequest $request) {
       ->addTextCrumb(pht('Create Rule'))
       ->setBorder(true);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-plus-square');
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter($form_box);
 
     return $this->newPage()
diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
index 0e7f6b0aa5..d338f6a57e 100644
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -241,6 +241,8 @@ public function handleRequest(AphrontRequest $request) {
     $icon = $rule->getID() ? 'fa-pencil' : 'fa-plus-square';
 
     $form_box = id(new PHUIObjectBoxView())
+      ->setHeaderText($title)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setFormErrors($errors)
       ->setForm($form);
 
@@ -249,12 +251,7 @@ public function handleRequest(AphrontRequest $request) {
       ->addTextCrumb($title)
       ->setBorder(true);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-plus-square');
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter($form_box);
 
     return $this->newPage()

From d6bb0d1bfa83a9a25d01dec717f149ecdd8370bb Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 11:49:10 -0700
Subject: [PATCH 123/865] Update people edit pages UI

Summary: Updates and clarifies UI

Test Plan: New peoples, new bots, new mailing list

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18562
---
 .../PhabricatorPeopleCreateController.php         |  9 ++-------
 .../controller/PhabricatorPeopleNewController.php | 15 +++++----------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/applications/people/controller/PhabricatorPeopleCreateController.php b/src/applications/people/controller/PhabricatorPeopleCreateController.php
index 04b2f4a8a4..c0b232645b 100644
--- a/src/applications/people/controller/PhabricatorPeopleCreateController.php
+++ b/src/applications/people/controller/PhabricatorPeopleCreateController.php
@@ -92,13 +92,9 @@ public function handleRequest(AphrontRequest $request) {
     $crumbs->addTextCrumb($title);
     $crumbs->setBorder(true);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-user');
-
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('User'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setHeaderText($title)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
     $guidance_context = new PhabricatorPeopleCreateGuidanceContext();
@@ -109,7 +105,6 @@ public function handleRequest(AphrontRequest $request) {
       ->newInfoView();
 
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter(
         array(
           $guidance,
diff --git a/src/applications/people/controller/PhabricatorPeopleNewController.php b/src/applications/people/controller/PhabricatorPeopleNewController.php
index 60f9f47b5d..9f52cf567a 100644
--- a/src/applications/people/controller/PhabricatorPeopleNewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleNewController.php
@@ -132,12 +132,15 @@ public function handleRequest(AphrontRequest $request) {
       ->setUser($admin);
 
     if ($is_bot) {
+      $title = pht('Create New Bot');
       $form->appendRemarkupInstructions(
         pht('You are creating a new **bot** user account.'));
     } else if ($is_list) {
+      $title = pht('Create New Mailing List');
       $form->appendRemarkupInstructions(
         pht('You are creating a new **mailing list** user account.'));
     } else {
+      $title = pht('Create New User');
       $form->appendRemarkupInstructions(
         pht('You are creating a new **standard** user account.'));
     }
@@ -205,25 +208,17 @@ public function handleRequest(AphrontRequest $request) {
             "`bot@yourcompany.com` if you prefer."));
     }
 
-
-    $title = pht('Create New User');
-
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('User'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb($title);
     $crumbs->setBorder(true);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-user');
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter($box);
 
     return $this->newPage()

From 98185730df8dfa45256d63622d644626f53634ca Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 11:41:23 -0700
Subject: [PATCH 124/865] Update Phlux edit UI

Summary: Updates

Test Plan: Phlux edit page

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18561
---
 .../phlux/controller/PhluxEditController.php          | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/applications/phlux/controller/PhluxEditController.php b/src/applications/phlux/controller/PhluxEditController.php
index f37795a754..e2bb7719f7 100644
--- a/src/applications/phlux/controller/PhluxEditController.php
+++ b/src/applications/phlux/controller/PhluxEditController.php
@@ -154,26 +154,19 @@ public function handleRequest(AphrontRequest $request) {
     if ($is_new) {
       $title = pht('Create Variable');
       $crumbs->addTextCrumb($title, $request->getRequestURI());
-      $header_icon = 'fa-plus-square';
     } else {
       $title = pht('Edit Variable: %s', $key);
-      $header_icon = 'fa-pencil';
       $crumbs->addTextCrumb($title, $request->getRequestURI());
     }
     $crumbs->setBorder(true);
 
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Variable'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon($header_icon);
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter(array(
         $box,
       ));

From 3720b28c6c27919005c22b160cdec899747260b8 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 11:20:48 -0700
Subject: [PATCH 125/865] Update slowvote for new edit UI

Summary: Updates UI

Test Plan: open new poll

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18560
---
 .../controller/PhabricatorSlowvoteEditController.php     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
index ebf09ec929..44927fedea 100644
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
@@ -269,17 +269,12 @@ public function handleRequest(AphrontRequest $request) {
     $crumbs->setBorder(true);
 
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Poll'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon($header_icon);
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter($form_box);
 
     return $this->newPage()

From 8059db894d640946f580ef2af6c0933e2bfd7d9a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 08:33:20 -0700
Subject: [PATCH 126/865] Use the Ferret engine fulltext document table to
 drive auxiliary fulltext constraints

Summary:
Ref T12819. I started trying to get individual engines to drive these constraints (e.g., `ManiphestTaskQuery` can do most of the work) but this is a big pain, especially since most engines don't support "any owner" or "no owner", and not everything has an owner, and so on and so on. Going down this path would have meant a huge pile of stub functions everywhere, I think.

Instead, drive these through the main engine using the fulltext document table, which already has everything we need to apply these constraints in a uniform way.

Also tweak some parts of query construction and result ordering.

Test Plan: Searched for documents by author, owner, unowned, any owner, tags, subscribers, fulltext in global search. Got sensible results without any application-specific code.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18550
---
 .../DifferentialRevisionFerretEngine.php      |   2 +-
 .../search/ManiphestTaskFerretEngine.php      |   2 +-
 ...abricatorFerretFulltextEngineExtension.php |  32 ++++-
 .../ferret/PhabricatorFerretDocument.php      |  12 ++
 .../search/ferret/PhabricatorFerretEngine.php |  56 +--------
 ...PhabricatorFerretFulltextStorageEngine.php |  30 +++--
 ...PhabricatorCursorPagedPolicyAwareQuery.php | 114 ++++++++++++++++--
 7 files changed, 171 insertions(+), 77 deletions(-)

diff --git a/src/applications/differential/search/DifferentialRevisionFerretEngine.php b/src/applications/differential/search/DifferentialRevisionFerretEngine.php
index b51a486ef5..ebe59c2780 100644
--- a/src/applications/differential/search/DifferentialRevisionFerretEngine.php
+++ b/src/applications/differential/search/DifferentialRevisionFerretEngine.php
@@ -15,7 +15,7 @@ public function newFieldObject() {
     return new DifferentialRevisionFerretField();
   }
 
-  protected function newSearchEngine() {
+  public function newSearchEngine() {
     return new DifferentialRevisionSearchEngine();
   }
 
diff --git a/src/applications/maniphest/search/ManiphestTaskFerretEngine.php b/src/applications/maniphest/search/ManiphestTaskFerretEngine.php
index 2eab7db74c..7de368402a 100644
--- a/src/applications/maniphest/search/ManiphestTaskFerretEngine.php
+++ b/src/applications/maniphest/search/ManiphestTaskFerretEngine.php
@@ -15,7 +15,7 @@ public function newFieldObject() {
     return new ManiphestTaskFerretField();
   }
 
-  protected function newSearchEngine() {
+  public function newSearchEngine() {
     return new ManiphestTaskSearchEngine();
   }
 
diff --git a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
index 8d1b6070e6..27694e3a01 100644
--- a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
@@ -23,11 +23,37 @@ public function indexFulltextObject(
     $phid = $document->getPHID();
     $engine = $object->newFerretEngine();
 
+    $is_closed = 0;
+    $author_phid = null;
+    $owner_phid = null;
+    foreach ($document->getRelationshipData() as $relationship) {
+      list($related_type, $related_phid) = $relationship;
+      switch ($related_type) {
+        case PhabricatorSearchRelationship::RELATIONSHIP_OPEN:
+          $is_closed = 0;
+          break;
+        case PhabricatorSearchRelationship::RELATIONSHIP_CLOSED:
+          $is_closed = 1;
+          break;
+        case PhabricatorSearchRelationship::RELATIONSHIP_OWNER:
+          $owner_phid = $related_phid;
+          break;
+        case PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED:
+          $owner_phid = null;
+          break;
+        case PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR:
+          $author_phid = $related_phid;
+          break;
+      }
+    }
+
     $ferret_document = $engine->newDocumentObject()
       ->setObjectPHID($phid)
-      ->setIsClosed(0)
-      ->setEpochCreated(0)
-      ->setEpochModified(0);
+      ->setIsClosed($is_closed)
+      ->setEpochCreated($document->getDocumentCreated())
+      ->setEpochModified($document->getDocumentModified())
+      ->setAuthorPHID($author_phid)
+      ->setOwnerPHID($owner_phid);
 
     $stemmer = $engine->newStemmer();
 
diff --git a/src/applications/search/ferret/PhabricatorFerretDocument.php b/src/applications/search/ferret/PhabricatorFerretDocument.php
index fa816c8d17..6f25eb93b6 100644
--- a/src/applications/search/ferret/PhabricatorFerretDocument.php
+++ b/src/applications/search/ferret/PhabricatorFerretDocument.php
@@ -27,6 +27,18 @@ protected function getConfiguration() {
           'columns' => array('objectPHID'),
           'unique' => true,
         ),
+        'key_author' => array(
+          'columns' => array('authorPHID'),
+        ),
+        'key_owner' => array(
+          'columns' => array('ownerPHID'),
+        ),
+        'key_created' => array(
+          'columns' => array('epochCreated'),
+        ),
+        'key_modified' => array(
+          'columns' => array('epochModified'),
+        ),
       ),
     ) + parent::getConfiguration();
   }
diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index 7e30189fb8..7b8520ac71 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -5,7 +5,7 @@ abstract class PhabricatorFerretEngine extends Phobject {
   abstract public function newNgramsObject();
   abstract public function newDocumentObject();
   abstract public function newFieldObject();
-  abstract protected function newSearchEngine();
+  abstract public function newSearchEngine();
 
   public function getDefaultFunctionKey() {
     return 'all';
@@ -70,60 +70,6 @@ public function newStemmer() {
     return new PhutilSearchStemmer();
   }
 
-  public function newConfiguredFulltextQuery(
-    $object,
-    PhabricatorSavedQuery $query,
-    PhabricatorUser $viewer) {
-
-    $local_query = new PhabricatorSavedQuery();
-    $local_query->setParameter('query', $query->getParameter('query'));
-
-    // TODO: Modularize this piece.
-    $project_phids = $query->getParameter('projectPHIDs');
-    if ($project_phids) {
-      $local_query->setParameter('projectPHIDs', $project_phids);
-    }
-
-    $subscriber_phids = $query->getParameter('subscriberPHIDs');
-    if ($subscriber_phids) {
-      $local_query->setParameter('subscriberPHIDs', $subscriber_phids);
-    }
-
-    $author_phids = $query->getParameter('authorPHIDs');
-    if ($author_phids) {
-      $local_query->setParameter('authorPHIDs', $author_phids);
-    }
-
-    $owner_phids = $query->getParameter('ownerPHIDs');
-    if ($owner_phids) {
-      $local_query->setParameter('ownerPHIDs', $owner_phids);
-    }
-
-    $rel_open = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
-    $rel_closed = PhabricatorSearchRelationship::RELATIONSHIP_CLOSED;
-
-    $statuses = $query->getParameter('statuses');
-    if ($statuses) {
-      $statuses = array_fuse($statuses);
-      if (count($statuses) == 1) {
-        if (isset($statuses[$rel_open])) {
-          $local_query->setParameter('statuses', array('open()'));
-        }
-        if (isset($statuses[$rel_closed])) {
-          $local_query->setParameter('statuses', array('closed()'));
-        }
-      }
-    }
-
-    $search_engine = $this->newSearchEngine()
-      ->setViewer($viewer);
-
-    $engine_query = $search_engine->buildQueryFromSavedQuery($local_query)
-      ->setViewer($viewer);
-
-    return $engine_query;
-  }
-
   public function tokenizeString($value) {
     $value = trim($value, ' ');
     $value = preg_split('/ +/', $value);
diff --git a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
index 0036ca928b..b67cd7d43c 100644
--- a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
+++ b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
@@ -47,6 +47,8 @@ public function executeSearch(PhabricatorSavedQuery $query) {
     $offset = (int)$query->getParameter('offset', 0);
     $limit  = (int)$query->getParameter('limit', 25);
 
+    // NOTE: For now, it's okay to query with the omnipotent viewer here
+    // because we're just returning PHIDs which we'll filter later.
     $viewer = PhabricatorUser::getOmnipotentUser();
 
     $type_results = array();
@@ -54,19 +56,31 @@ public function executeSearch(PhabricatorSavedQuery $query) {
       $engine = $spec['engine'];
       $object = $spec['object'];
 
-      // NOTE: For now, it's okay to query with the omnipotent viewer here
-      // because we're just returning PHIDs which we'll filter later.
+      $local_query = new PhabricatorSavedQuery();
+      $local_query->setParameter('query', $query->getParameter('query'));
 
-      $type_query = $engine->newConfiguredFulltextQuery(
-        $object,
-        $query,
-        $viewer);
+      $project_phids = $query->getParameter('projectPHIDs');
+      if ($project_phids) {
+        $local_query->setParameter('projectPHIDs', $project_phids);
+      }
 
-      $type_query
+      $subscriber_phids = $query->getParameter('subscriberPHIDs');
+      if ($subscriber_phids) {
+        $local_query->setParameter('subscriberPHIDs', $subscriber_phids);
+      }
+
+      $search_engine = $engine->newSearchEngine()
+        ->setViewer($viewer);
+
+      $engine_query = $search_engine->buildQueryFromSavedQuery($local_query)
+        ->setViewer($viewer);
+
+      $engine_query
+        ->withFerretQuery($engine, $query)
         ->setOrder('relevance')
         ->setLimit($offset + $limit);
 
-      $results = $type_query->execute();
+      $results = $engine_query->execute();
       $results = mpull($results, null, 'getPHID');
       $type_results[$type] = $results;
     }
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 1411095f36..569f79d824 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -28,8 +28,9 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
   private $spaceIsArchived;
   private $ngrams = array();
   private $ferretEngine;
-  private $ferretTokens;
-  private $ferretTables;
+  private $ferretTokens = array();
+  private $ferretTables = array();
+  private $ferretQuery;
 
   protected function getPageCursors(array $page) {
     return array(
@@ -772,7 +773,7 @@ public function getBuiltinOrders() {
 
     if ($this->supportsFerretEngine()) {
       $orders['relevance'] = array(
-        'vector' => array('rank', 'id'),
+        'vector' => array('rank', 'fulltext-modified', 'id'),
         'name' => pht('Relevence'),
       );
     }
@@ -975,6 +976,16 @@ public function getOrderableColumns() {
         'column' => '_ft_rank',
         'type' => 'int',
       );
+      $columns['fulltext-created'] = array(
+        'table' => 'ft_doc',
+        'column' => 'epochCreated',
+        'type' => 'int',
+      );
+      $columns['fulltext-modified'] = array(
+        'table' => 'ft_doc',
+        'column' => 'epochModified',
+        'type' => 'int',
+      );
     }
 
     $cache->setKey($cache_key, $columns);
@@ -1406,6 +1417,22 @@ public function supportsFerretEngine() {
     return ($object instanceof PhabricatorFerretInterface);
   }
 
+  public function withFerretQuery(
+    PhabricatorFerretEngine $engine,
+    PhabricatorSavedQuery $query) {
+
+    if (!$this->supportsFerretEngine()) {
+      throw new Exception(
+        pht(
+          'Query ("%s") does not support the Ferret fulltext engine.',
+          get_class($this)));
+    }
+
+    $this->ferretEngine = $engine;
+    $this->ferretQuery = $query;
+
+    return $this;
+  }
 
   public function withFerretConstraint(
     PhabricatorFerretEngine $engine,
@@ -1538,10 +1565,10 @@ protected function buildFerretSelectClause(AphrontDatabaseConnection $conn) {
           $table_alias,
           $stem_value);
       }
-
-      $parts[] = '0';
     }
 
+    $parts[] = '0';
+
     $select[] = qsprintf(
       $conn,
       '%Q _ft_rank',
@@ -1646,7 +1673,7 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
     $joins = array();
     $joins[] = qsprintf(
       $conn,
-      'JOIN %T ftdoc ON ftdoc.objectPHID = %Q',
+      'JOIN %T ft_doc ON ft_doc.objectPHID = %Q',
       $document_table->getTableName(),
       $phid_column);
 
@@ -1655,11 +1682,11 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
       $table = $spec['table'];
       $ngram = $spec['ngram'];
 
-      $alias = 'ft'.$idx++;
+      $alias = 'ftngram_'.$idx++;
 
       $joins[] = qsprintf(
         $conn,
-        'JOIN %T %T ON %T.documentID = ftdoc.id AND %T.ngram = %s',
+        'JOIN %T %T ON %T.documentID = ft_doc.id AND %T.ngram = %s',
         $table,
         $alias,
         $alias,
@@ -1672,7 +1699,7 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
 
       $joins[] = qsprintf(
         $conn,
-        'JOIN %T %T ON ftdoc.id = %T.documentID
+        'JOIN %T %T ON ft_doc.id = %T.documentID
           AND %T.fieldKey = %s',
         $field_table->getTableName(),
         $alias,
@@ -1801,6 +1828,75 @@ protected function buildFerretWhereClause(AphrontDatabaseConnection $conn) {
       }
     }
 
+    if ($this->ferretQuery) {
+      $query = $this->ferretQuery;
+
+      $author_phids = $query->getParameter('authorPHIDs');
+      if ($author_phids) {
+        $where[] = qsprintf(
+          $conn,
+          'ft_doc.authorPHID IN (%Ls)',
+          $author_phids);
+      }
+
+      $with_unowned = $query->getParameter('withUnowned');
+      $with_any = $query->getParameter('withAnyOwner');
+
+      if ($with_any && $with_unowned) {
+        throw new PhabricatorEmptyQueryException(
+          pht(
+            'This query matches only unowned documents owned by anyone, '.
+            'which is impossible.'));
+      }
+
+      $owner_phids = $query->getParameter('ownerPHIDs');
+      if ($owner_phids && !$with_any) {
+        if ($with_unowned) {
+          $where[] = qsprintf(
+            $conn,
+            'ft_doc.ownerPHID IN (%Ls) OR ft_doc.ownerPHID IS NULL',
+            $owner_phids);
+        } else {
+          $where[] = qsprintf(
+            $conn,
+            'ft_doc.ownerPHID IN (%Ls)',
+            $owner_phids);
+        }
+      } else if ($with_unowned) {
+        $where[] = qsprintf(
+          $conn,
+          'ft_doc.ownerPHID IS NULL');
+      }
+
+      if ($with_any) {
+        $where[] = qsprintf(
+          $conn,
+          'ft_doc.ownerPHID IS NOT NULL');
+      }
+
+      $rel_open = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
+
+      $statuses = $query->getParameter('statuses');
+      $is_closed = null;
+      if ($statuses) {
+        $statuses = array_fuse($statuses);
+        if (count($statuses) == 1) {
+          if (isset($statuses[$rel_open])) {
+            $is_closed = 0;
+          } else {
+            $is_closed = 1;
+          }
+        }
+      }
+
+      if ($is_closed !== null) {
+        $where[] = qsprintf(
+          $conn,
+          'ft_doc.isClosed = %d',
+          $is_closed);
+      }
+    }
+
     return $where;
   }
 

From a2a2b3f7f4b590ce211f8e02f8a76060313729cb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 09:09:39 -0700
Subject: [PATCH 127/865] Sort global fulltext results by overall relevance

Summary:
Ref T12819. Currently, under the Ferret engine, we query each application's index separately and then aggregate the results.

At the moment, results are aggregated by type first, then by actual rank. For example, all the revisions appear first, then all the tasks.

Instead, surface the internal ranking data from the underlying query and sort by it.

Test Plan: Searched for "A B" with a task named "A B" and a revision named "A". Saw task first. Broadly, saw mixed task and revision order in result sets.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18551
---
 src/__phutil_library_map__.php                |  2 +
 .../query/DifferentialRevisionQuery.php       |  2 +-
 .../maniphest/query/ManiphestTaskQuery.php    |  1 +
 .../ferret/PhabricatorFerretMetadata.php      | 41 +++++++++++++++++++
 ...PhabricatorFerretFulltextStorageEngine.php | 13 ++++++
 ...PhabricatorCursorPagedPolicyAwareQuery.php | 35 ++++++++++++++++
 6 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/search/ferret/PhabricatorFerretMetadata.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e81239f9c0..ce3a86b98c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2840,6 +2840,7 @@
     'PhabricatorFerretFulltextEngineExtension' => 'applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php',
     'PhabricatorFerretFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php',
     'PhabricatorFerretInterface' => 'applications/search/ferret/PhabricatorFerretInterface.php',
+    'PhabricatorFerretMetadata' => 'applications/search/ferret/PhabricatorFerretMetadata.php',
     'PhabricatorFerretNgrams' => 'applications/search/ferret/PhabricatorFerretNgrams.php',
     'PhabricatorFerretSearchEngineExtension' => 'applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php',
     'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.php',
@@ -8175,6 +8176,7 @@
     'PhabricatorFerretField' => 'PhabricatorSearchDAO',
     'PhabricatorFerretFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
     'PhabricatorFerretFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine',
+    'PhabricatorFerretMetadata' => 'Phobject',
     'PhabricatorFerretNgrams' => 'PhabricatorSearchDAO',
     'PhabricatorFerretSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
     'PhabricatorFile' => array(
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index 622eba564a..8fd91cbd7e 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -320,7 +320,7 @@ public function newResultObject() {
    */
   protected function loadPage() {
     $data = $this->loadData();
-
+    $data = $this->didLoadRawRows($data);
     $table = $this->newResultObject();
     return $table->loadAllFromArray($data);
   }
diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php
index 704a67f548..f009e5c2ef 100644
--- a/src/applications/maniphest/query/ManiphestTaskQuery.php
+++ b/src/applications/maniphest/query/ManiphestTaskQuery.php
@@ -247,6 +247,7 @@ protected function loadPage() {
         break;
     }
 
+    $data = $this->didLoadRawRows($data);
     $tasks = $task_dao->loadAllFromArray($data);
 
     switch ($this->groupBy) {
diff --git a/src/applications/search/ferret/PhabricatorFerretMetadata.php b/src/applications/search/ferret/PhabricatorFerretMetadata.php
new file mode 100644
index 0000000000..8ab5e37e45
--- /dev/null
+++ b/src/applications/search/ferret/PhabricatorFerretMetadata.php
@@ -0,0 +1,41 @@
+<?php
+
+final class PhabricatorFerretMetadata extends Phobject {
+
+  private $phid;
+  private $engine;
+  private $relevance;
+
+  public function setEngine($engine) {
+    $this->engine = $engine;
+    return $this;
+  }
+
+  public function getEngine() {
+    return $this->engine;
+  }
+
+  public function setPHID($phid) {
+    $this->phid = $phid;
+    return $this;
+  }
+
+  public function getPHID() {
+    return $this->phid;
+  }
+
+  public function setRelevance($relevance) {
+    $this->relevance = $relevance;
+    return $this;
+  }
+
+  public function getRelevance() {
+    return $this->relevance;
+  }
+
+  public function getRelevanceSortVector() {
+    return id(new PhutilSortVector())
+      ->addInt(-$this->getRelevance());
+  }
+
+}
diff --git a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
index b67cd7d43c..74e8771de7 100644
--- a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
+++ b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
@@ -52,6 +52,7 @@ public function executeSearch(PhabricatorSavedQuery $query) {
     $viewer = PhabricatorUser::getOmnipotentUser();
 
     $type_results = array();
+    $metadata = array();
     foreach ($type_map as $type => $spec) {
       $engine = $spec['engine'];
       $object = $spec['object'];
@@ -83,6 +84,8 @@ public function executeSearch(PhabricatorSavedQuery $query) {
       $results = $engine_query->execute();
       $results = mpull($results, null, 'getPHID');
       $type_results[$type] = $results;
+
+      $metadata += $engine_query->getFerretMetadata();
     }
 
     $list = array();
@@ -90,6 +93,16 @@ public function executeSearch(PhabricatorSavedQuery $query) {
       $list += $results;
     }
 
+    // Currently, the list is grouped by object type. For example, all the
+    // tasks might be first, then all the revisions, and so on. In each group,
+    // the results are ordered properly.
+
+    // Reorder the results so that the highest-ranking results come first,
+    // no matter which object types they belong to.
+
+    $metadata = msort($metadata, 'getRelevanceSortVector');
+    $list = array_select_keys($list, array_keys($metadata)) + $list;
+
     $result_slice = array_slice($list, $offset, $limit, true);
     return array_keys($result_slice);
   }
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 569f79d824..42e6ed7b4e 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -31,6 +31,7 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
   private $ferretTokens = array();
   private $ferretTables = array();
   private $ferretQuery;
+  private $ferretMetadata = array();
 
   protected function getPageCursors(array $page) {
     return array(
@@ -82,6 +83,18 @@ final protected function getBeforeID() {
     return $this->beforeID;
   }
 
+  final public function getFerretMetadata() {
+    if (!$this->supportsFerretEngine()) {
+      throw new Exception(
+        pht(
+          'Unable to retrieve Ferret engine metadata, this class ("%s") does '.
+          'not support the Ferret engine.',
+          get_class($this)));
+    }
+
+    return $this->ferretMetadata;
+  }
+
   protected function loadStandardPage(PhabricatorLiskDAO $table) {
     $rows = $this->loadStandardPageRows($table);
     return $table->loadAllFromArray($rows);
@@ -111,6 +124,27 @@ protected function loadStandardPageRowsWithConnection(
       $this->buildOrderClause($conn),
       $this->buildLimitClause($conn));
 
+    $rows = $this->didLoadRawRows($rows);
+
+    return $rows;
+  }
+
+  protected function didLoadRawRows(array $rows) {
+    if ($this->ferretEngine) {
+      foreach ($rows as $row) {
+        $phid = $row['phid'];
+
+        $metadata = id(new PhabricatorFerretMetadata())
+          ->setPHID($phid)
+          ->setEngine($this->ferretEngine)
+          ->setRelevance(idx($row, '_ft_rank'));
+
+        $this->ferretMetadata[$phid] = $metadata;
+
+        unset($row['_ft_rank']);
+      }
+    }
+
     return $rows;
   }
 
@@ -172,6 +206,7 @@ final protected function didLoadResults(array $results) {
     if ($this->beforeID) {
       $results = array_reverse($results, $preserve_keys = true);
     }
+
     return $results;
   }
 

From 3ff9d4a4cab39fcd84cb4706139486c0c85218be Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 09:38:19 -0700
Subject: [PATCH 128/865] Support Ferret engine for searching users

Summary:
Ref T12819. Adds support for indexing user accounts so they appear in global fulltext results.

Also, always rank users ahead of other results.

Test Plan: Indexed users. Searched for a user, got that user.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18552
---
 .../20170907.ferret.01.user.doc.sql           |  9 ++++++
 .../20170907.ferret.02.user.field.sql         |  8 +++++
 .../20170907.ferret.03.user.ngrams.sql        |  5 ++++
 src/__phutil_library_map__.php                |  9 ++++++
 .../search/PhabricatorUserFerretEngine.php    | 29 +++++++++++++++++++
 .../people/storage/PhabricatorUser.php        |  9 ++++++
 .../storage/PhabricatorUserFerretDocument.php | 14 +++++++++
 .../storage/PhabricatorUserFerretField.php    | 14 +++++++++
 .../storage/PhabricatorUserFerretNgrams.php   | 14 +++++++++
 .../search/ferret/PhabricatorFerretEngine.php |  4 +++
 .../ferret/PhabricatorFerretMetadata.php      |  3 ++
 11 files changed, 118 insertions(+)
 create mode 100644 resources/sql/autopatches/20170907.ferret.01.user.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.02.user.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.03.user.ngrams.sql
 create mode 100644 src/applications/people/search/PhabricatorUserFerretEngine.php
 create mode 100644 src/applications/people/storage/PhabricatorUserFerretDocument.php
 create mode 100644 src/applications/people/storage/PhabricatorUserFerretField.php
 create mode 100644 src/applications/people/storage/PhabricatorUserFerretNgrams.php

diff --git a/resources/sql/autopatches/20170907.ferret.01.user.doc.sql b/resources/sql/autopatches/20170907.ferret.01.user.doc.sql
new file mode 100644
index 0000000000..39496a0de0
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.01.user.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_user.user_user_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.02.user.field.sql b/resources/sql/autopatches/20170907.ferret.02.user.field.sql
new file mode 100644
index 0000000000..3179e58e5b
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.02.user.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_user.user_user_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.03.user.ngrams.sql b/resources/sql/autopatches/20170907.ferret.03.user.ngrams.sql
new file mode 100644
index 0000000000..2105a7b7af
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.03.user.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_user.user_user_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index ce3a86b98c..854a96366e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4257,6 +4257,10 @@
     'PhabricatorUserEditorTestCase' => 'applications/people/editor/__tests__/PhabricatorUserEditorTestCase.php',
     'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php',
     'PhabricatorUserEmailTestCase' => 'applications/people/storage/__tests__/PhabricatorUserEmailTestCase.php',
+    'PhabricatorUserFerretDocument' => 'applications/people/storage/PhabricatorUserFerretDocument.php',
+    'PhabricatorUserFerretEngine' => 'applications/people/search/PhabricatorUserFerretEngine.php',
+    'PhabricatorUserFerretField' => 'applications/people/storage/PhabricatorUserFerretField.php',
+    'PhabricatorUserFerretNgrams' => 'applications/people/storage/PhabricatorUserFerretNgrams.php',
     'PhabricatorUserFulltextEngine' => 'applications/people/search/PhabricatorUserFulltextEngine.php',
     'PhabricatorUserIconField' => 'applications/people/customfield/PhabricatorUserIconField.php',
     'PhabricatorUserLog' => 'applications/people/storage/PhabricatorUserLog.php',
@@ -9840,6 +9844,7 @@
       'PhabricatorFlaggableInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
       'PhabricatorConduitResultInterface',
     ),
     'PhabricatorUserBadgesCacheType' => 'PhabricatorUserCacheType',
@@ -9862,6 +9867,10 @@
     'PhabricatorUserEditorTestCase' => 'PhabricatorTestCase',
     'PhabricatorUserEmail' => 'PhabricatorUserDAO',
     'PhabricatorUserEmailTestCase' => 'PhabricatorTestCase',
+    'PhabricatorUserFerretDocument' => 'PhabricatorFerretDocument',
+    'PhabricatorUserFerretEngine' => 'PhabricatorFerretEngine',
+    'PhabricatorUserFerretField' => 'PhabricatorFerretField',
+    'PhabricatorUserFerretNgrams' => 'PhabricatorFerretNgrams',
     'PhabricatorUserFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhabricatorUserIconField' => 'PhabricatorUserCustomField',
     'PhabricatorUserLog' => array(
diff --git a/src/applications/people/search/PhabricatorUserFerretEngine.php b/src/applications/people/search/PhabricatorUserFerretEngine.php
new file mode 100644
index 0000000000..1f44bf4289
--- /dev/null
+++ b/src/applications/people/search/PhabricatorUserFerretEngine.php
@@ -0,0 +1,29 @@
+<?php
+
+final class PhabricatorUserFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function newNgramsObject() {
+    return new PhabricatorUserFerretNgrams();
+  }
+
+  public function newDocumentObject() {
+    return new PhabricatorUserFerretDocument();
+  }
+
+  public function newFieldObject() {
+    return new PhabricatorUserFerretField();
+  }
+
+  public function newSearchEngine() {
+    return new PhabricatorPeopleSearchEngine();
+  }
+
+  public function getObjectTypeRelevance() {
+    // Always sort users above other documents, regardless of relevance
+    // metrics. A user profile is very likely to be the best hit for a query
+    // which matches a user.
+    return 500;
+  }
+
+}
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 2a1c1394a6..a3ec42213a 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -19,6 +19,7 @@ final class PhabricatorUser
     PhabricatorFlaggableInterface,
     PhabricatorApplicationTransactionInterface,
     PhabricatorFulltextInterface,
+    PhabricatorFerretInterface,
     PhabricatorConduitResultInterface {
 
   const SESSION_TABLE = 'phabricator_session';
@@ -1434,6 +1435,14 @@ public function newFulltextEngine() {
   }
 
 
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PhabricatorUserFerretEngine();
+  }
+
+
 /* -(  PhabricatorConduitResultInterface  )---------------------------------- */
 
 
diff --git a/src/applications/people/storage/PhabricatorUserFerretDocument.php b/src/applications/people/storage/PhabricatorUserFerretDocument.php
new file mode 100644
index 0000000000..9ccf210008
--- /dev/null
+++ b/src/applications/people/storage/PhabricatorUserFerretDocument.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PhabricatorUserFerretDocument
+  extends PhabricatorFerretDocument {
+
+  public function getApplicationName() {
+    return 'user';
+  }
+
+  public function getIndexKey() {
+    return 'user';
+  }
+
+}
diff --git a/src/applications/people/storage/PhabricatorUserFerretField.php b/src/applications/people/storage/PhabricatorUserFerretField.php
new file mode 100644
index 0000000000..8b2698128b
--- /dev/null
+++ b/src/applications/people/storage/PhabricatorUserFerretField.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PhabricatorUserFerretField
+  extends PhabricatorFerretField {
+
+  public function getApplicationName() {
+    return 'user';
+  }
+
+  public function getIndexKey() {
+    return 'user';
+  }
+
+}
diff --git a/src/applications/people/storage/PhabricatorUserFerretNgrams.php b/src/applications/people/storage/PhabricatorUserFerretNgrams.php
new file mode 100644
index 0000000000..2024cc9d7d
--- /dev/null
+++ b/src/applications/people/storage/PhabricatorUserFerretNgrams.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PhabricatorUserFerretNgrams
+  extends PhabricatorFerretNgrams {
+
+  public function getApplicationName() {
+    return 'user';
+  }
+
+  public function getIndexKey() {
+    return 'user';
+  }
+
+}
diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index 7b8520ac71..eb40b70e58 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -11,6 +11,10 @@ public function getDefaultFunctionKey() {
     return 'all';
   }
 
+  public function getObjectTypeRelevance() {
+    return 1000;
+  }
+
   public function getFieldForFunction($function) {
     $function = phutil_utf8_strtolower($function);
 
diff --git a/src/applications/search/ferret/PhabricatorFerretMetadata.php b/src/applications/search/ferret/PhabricatorFerretMetadata.php
index 8ab5e37e45..0f9337ce32 100644
--- a/src/applications/search/ferret/PhabricatorFerretMetadata.php
+++ b/src/applications/search/ferret/PhabricatorFerretMetadata.php
@@ -34,7 +34,10 @@ public function getRelevance() {
   }
 
   public function getRelevanceSortVector() {
+    $engine = $this->getEngine();
+
     return id(new PhutilSortVector())
+      ->addInt($engine->getObjectTypeRelevance())
       ->addInt(-$this->getRelevance());
   }
 

From 60deec36d8ed922938223f7771c21c62f5689d88 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 09:53:15 -0700
Subject: [PATCH 129/865] Lightly modernize FundInitiativeQuery

Summary: Ref T12819. Prepares Fund to move to Ferret.

Test Plan: Searched for initiatives in Fund.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18553
---
 .../fund/query/FundInitiativeQuery.php        | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/applications/fund/query/FundInitiativeQuery.php b/src/applications/fund/query/FundInitiativeQuery.php
index 66f87a883c..9efbcfbf27 100644
--- a/src/applications/fund/query/FundInitiativeQuery.php
+++ b/src/applications/fund/query/FundInitiativeQuery.php
@@ -35,19 +35,12 @@ public function needProjectPHIDs($need) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new FundInitiative();
+  }
+
   protected function loadPage() {
-    $table = new FundInitiative();
-    $conn_r = $table->establishConnection('r');
-
-    $rows = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($rows);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function didFilterPage(array $initiatives) {
@@ -73,40 +66,38 @@ protected function didFilterPage(array $initiatives) {
     return $initiatives;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
-
-    $where[] = $this->buildPagingClause($conn_r);
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->ownerPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'ownerPHID IN (%Ls)',
         $this->ownerPHIDs);
     }
 
     if ($this->statuses !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'status IN (%Ls)',
         $this->statuses);
     }
 
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {

From cf0bc32e18a9aac85ccfdda74c36b040cbf4fe74 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 10:05:48 -0700
Subject: [PATCH 130/865] Lightly modernize FundInitiativeSearchEngine

Summary: Ref T12819. Prepares for Ferret engine support.

Test Plan: Queried for various initiatives.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18554
---
 .../fund/query/FundInitiativeQuery.php        |  30 -----
 .../fund/query/FundInitiativeSearchEngine.php | 122 +++++++-----------
 2 files changed, 50 insertions(+), 102 deletions(-)

diff --git a/src/applications/fund/query/FundInitiativeQuery.php b/src/applications/fund/query/FundInitiativeQuery.php
index 9efbcfbf27..aeeb0942b9 100644
--- a/src/applications/fund/query/FundInitiativeQuery.php
+++ b/src/applications/fund/query/FundInitiativeQuery.php
@@ -8,8 +8,6 @@ final class FundInitiativeQuery
   private $ownerPHIDs;
   private $statuses;
 
-  private $needProjectPHIDs;
-
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
@@ -30,11 +28,6 @@ public function withStatuses(array $statuses) {
     return $this;
   }
 
-  public function needProjectPHIDs($need) {
-    $this->needProjectPHIDs = $need;
-    return $this;
-  }
-
   public function newResultObject() {
     return new FundInitiative();
   }
@@ -43,29 +36,6 @@ protected function loadPage() {
     return $this->loadStandardPage($this->newResultObject());
   }
 
-  protected function didFilterPage(array $initiatives) {
-
-    if ($this->needProjectPHIDs) {
-      $edge_query = id(new PhabricatorEdgeQuery())
-        ->withSourcePHIDs(mpull($initiatives, 'getPHID'))
-        ->withEdgeTypes(
-          array(
-            PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
-          ));
-      $edge_query->execute();
-
-      foreach ($initiatives as $initiative) {
-        $phids = $edge_query->getDestinationPHIDs(
-          array(
-            $initiative->getPHID(),
-          ));
-        $initiative->attachProjectPHIDs($phids);
-      }
-    }
-
-    return $initiatives;
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/fund/query/FundInitiativeSearchEngine.php b/src/applications/fund/query/FundInitiativeSearchEngine.php
index 3c339c1a64..e075fe5063 100644
--- a/src/applications/fund/query/FundInitiativeSearchEngine.php
+++ b/src/applications/fund/query/FundInitiativeSearchEngine.php
@@ -11,67 +11,37 @@ public function getApplicationClassName() {
     return 'PhabricatorFundApplication';
   }
 
-  public function buildSavedQueryFromRequest(AphrontRequest $request) {
-    $saved = new PhabricatorSavedQuery();
-
-    $saved->setParameter(
-      'ownerPHIDs',
-      $this->readUsersFromRequest($request, 'owners'));
-
-    $saved->setParameter(
-      'statuses',
-      $this->readListFromRequest($request, 'statuses'));
+  public function newQuery() {
+    return new FundInitiativeQuery();
+  }
 
-    return $saved;
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorUsersSearchField())
+        ->setKey('ownerPHIDs')
+        ->setAliases(array('owner', 'ownerPHID', 'owners'))
+        ->setLabel(pht('Owners')),
+      id(new PhabricatorSearchCheckboxesField())
+        ->setKey('statuses')
+        ->setLabel(pht('Statuses'))
+        ->setOptions(FundInitiative::getStatusNameMap()),
+    );
   }
 
-  public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
-    $query = id(new FundInitiativeQuery())
-      ->needProjectPHIDs(true);
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
 
-    $owner_phids = $saved->getParameter('ownerPHIDs');
-    if ($owner_phids) {
-      $query->withOwnerPHIDs($owner_phids);
+    if ($map['ownerPHIDs']) {
+      $query->withOwnerPHIDs($map['ownerPHIDs']);
     }
 
-    $statuses = $saved->getParameter('statuses');
-    if ($statuses) {
-      $query->withStatuses($statuses);
+    if ($map['statuses']) {
+      $query->withStatuses($map['statuses']);
     }
 
     return $query;
   }
 
-  public function buildSearchForm(
-    AphrontFormView $form,
-    PhabricatorSavedQuery $saved) {
-
-    $statuses = $saved->getParameter('statuses', array());
-    $statuses = array_fuse($statuses);
-
-    $owner_phids = $saved->getParameter('ownerPHIDs', array());
-
-    $status_map = FundInitiative::getStatusNameMap();
-    $status_control = id(new AphrontFormCheckboxControl())
-      ->setLabel(pht('Statuses'));
-    foreach ($status_map as $status => $name) {
-      $status_control->addCheckbox(
-        'statuses[]',
-        $status,
-        $name,
-        isset($statuses[$status]));
-    }
-
-    $form
-      ->appendControl(
-        id(new AphrontFormTokenizerControl())
-          ->setLabel(pht('Owners'))
-          ->setName('owners')
-          ->setDatasource(new PhabricatorPeopleDatasource())
-          ->setValue($owner_phids))
-      ->appendChild($status_control);
-  }
-
   protected function getURI($path) {
     return '/fund/'.$path;
   }
@@ -112,21 +82,6 @@ public function buildSavedQueryFromBuiltin($query_key) {
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
-  protected function getRequiredHandlePHIDsForResultList(
-    array $initiatives,
-    PhabricatorSavedQuery $query) {
-
-    $phids = array();
-    foreach ($initiatives as $initiative) {
-      $phids[] = $initiative->getOwnerPHID();
-      foreach ($initiative->getProjectPHIDs() as $project_phid) {
-        $phids[] = $project_phid;
-      }
-    }
-
-    return $phids;
-  }
-
   protected function renderResultList(
     array $initiatives,
     PhabricatorSavedQuery $query,
@@ -135,7 +90,30 @@ protected function renderResultList(
 
     $viewer = $this->requireViewer();
 
-    $list = id(new PHUIObjectItemListView());
+    $load_phids = array();
+    foreach ($initiatives as $initiative) {
+      $load_phids[] = $initiative->getOwnerPHID();
+    }
+
+    if ($initiatives) {
+      $edge_query = id(new PhabricatorEdgeQuery())
+        ->withSourcePHIDs(mpull($initiatives, 'getPHID'))
+        ->withEdgeTypes(
+          array(
+            PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
+          ));
+
+      $edge_query->execute();
+
+      foreach ($edge_query->getDestinationPHIDs() as $phid) {
+        $load_phids[] = $phid;
+      }
+    }
+
+    $handles = $viewer->loadHandles($load_phids);
+    $handles = iterator_to_array($handles);
+
+    $list = new PHUIObjectItemListView();
     foreach ($initiatives as $initiative) {
       $owner_handle = $handles[$initiative->getOwnerPHID()];
 
@@ -149,9 +127,12 @@ protected function renderResultList(
         $item->setDisabled(true);
       }
 
-      $project_handles = array_select_keys(
-        $handles,
-        $initiative->getProjectPHIDs());
+      $project_phids = $edge_query->getDestinationPHIDs(
+        array(
+          $initiative->getPHID(),
+        ));
+
+      $project_handles = array_select_keys($handles, $project_phids);
       if ($project_handles) {
         $item->addAttribute(
           id(new PHUIHandleTagListView())
@@ -168,9 +149,6 @@ protected function renderResultList(
     $result->setNoDataString(pht('No initiatives found.'));
 
     return $result;
-
-
-    return $list;
   }
 
 }

From f23717b416fe08e579752ca361ee18b612822812 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 10:20:31 -0700
Subject: [PATCH 131/865] Support Ferret engine in Fund initiatives

Summary: Ref T12819. Adds Ferret engine support to initiatives.

Test Plan: Indexed and searched for initiatives.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18555
---
 .../20170907.ferret.04.fund.doc.sql           |  9 ++++++++
 .../20170907.ferret.05.fund.field.sql         |  8 +++++++
 .../20170907.ferret.06.fund.ngrams.sql        |  5 +++++
 src/__phutil_library_map__.php                |  9 ++++++++
 .../fund/query/FundInitiativeQuery.php        | 12 ++++++----
 .../search/FundInitiativeFerretEngine.php     | 22 +++++++++++++++++++
 .../fund/storage/FundInitiative.php           | 11 +++++++++-
 .../storage/FundInitiativeFerretDocument.php  | 14 ++++++++++++
 .../storage/FundInitiativeFerretField.php     | 14 ++++++++++++
 .../storage/FundInitiativeFerretNgrams.php    | 14 ++++++++++++
 10 files changed, 113 insertions(+), 5 deletions(-)
 create mode 100644 resources/sql/autopatches/20170907.ferret.04.fund.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.05.fund.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.06.fund.ngrams.sql
 create mode 100644 src/applications/fund/search/FundInitiativeFerretEngine.php
 create mode 100644 src/applications/fund/storage/FundInitiativeFerretDocument.php
 create mode 100644 src/applications/fund/storage/FundInitiativeFerretField.php
 create mode 100644 src/applications/fund/storage/FundInitiativeFerretNgrams.php

diff --git a/resources/sql/autopatches/20170907.ferret.04.fund.doc.sql b/resources/sql/autopatches/20170907.ferret.04.fund.doc.sql
new file mode 100644
index 0000000000..a7f8324594
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.04.fund.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_fund.fund_initiative_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.05.fund.field.sql b/resources/sql/autopatches/20170907.ferret.05.fund.field.sql
new file mode 100644
index 0000000000..b8c544c2a7
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.05.fund.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_fund.fund_initiative_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.06.fund.ngrams.sql b/resources/sql/autopatches/20170907.ferret.06.fund.ngrams.sql
new file mode 100644
index 0000000000..a509087bae
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.06.fund.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_fund.fund_initiative_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 854a96366e..2d415173bb 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1153,6 +1153,10 @@
     'FundInitiativeEditController' => 'applications/fund/controller/FundInitiativeEditController.php',
     'FundInitiativeEditEngine' => 'applications/fund/editor/FundInitiativeEditEngine.php',
     'FundInitiativeEditor' => 'applications/fund/editor/FundInitiativeEditor.php',
+    'FundInitiativeFerretDocument' => 'applications/fund/storage/FundInitiativeFerretDocument.php',
+    'FundInitiativeFerretEngine' => 'applications/fund/search/FundInitiativeFerretEngine.php',
+    'FundInitiativeFerretField' => 'applications/fund/storage/FundInitiativeFerretField.php',
+    'FundInitiativeFerretNgrams' => 'applications/fund/storage/FundInitiativeFerretNgrams.php',
     'FundInitiativeFulltextEngine' => 'applications/fund/search/FundInitiativeFulltextEngine.php',
     'FundInitiativeListController' => 'applications/fund/controller/FundInitiativeListController.php',
     'FundInitiativeMerchantTransaction' => 'applications/fund/xaction/FundInitiativeMerchantTransaction.php',
@@ -6231,6 +6235,7 @@
       'PhabricatorTokenReceiverInterface',
       'PhabricatorDestructibleInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
     ),
     'FundInitiativeBackController' => 'FundController',
     'FundInitiativeBackerTransaction' => 'FundInitiativeTransactionType',
@@ -6239,6 +6244,10 @@
     'FundInitiativeEditController' => 'FundController',
     'FundInitiativeEditEngine' => 'PhabricatorEditEngine',
     'FundInitiativeEditor' => 'PhabricatorApplicationTransactionEditor',
+    'FundInitiativeFerretDocument' => 'PhabricatorFerretDocument',
+    'FundInitiativeFerretEngine' => 'PhabricatorFerretEngine',
+    'FundInitiativeFerretField' => 'PhabricatorFerretField',
+    'FundInitiativeFerretNgrams' => 'PhabricatorFerretNgrams',
     'FundInitiativeFulltextEngine' => 'PhabricatorFulltextEngine',
     'FundInitiativeListController' => 'FundController',
     'FundInitiativeMerchantTransaction' => 'FundInitiativeTransactionType',
diff --git a/src/applications/fund/query/FundInitiativeQuery.php b/src/applications/fund/query/FundInitiativeQuery.php
index aeeb0942b9..bbb4ef2746 100644
--- a/src/applications/fund/query/FundInitiativeQuery.php
+++ b/src/applications/fund/query/FundInitiativeQuery.php
@@ -42,28 +42,28 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->ids !== null) {
       $where[] = qsprintf(
         $conn,
-        'id IN (%Ld)',
+        'i.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
         $conn,
-        'phid IN (%Ls)',
+        'i.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->ownerPHIDs !== null) {
       $where[] = qsprintf(
         $conn,
-        'ownerPHID IN (%Ls)',
+        'i.ownerPHID IN (%Ls)',
         $this->ownerPHIDs);
     }
 
     if ($this->statuses !== null) {
       $where[] = qsprintf(
         $conn,
-        'status IN (%Ls)',
+        'i.status IN (%Ls)',
         $this->statuses);
     }
 
@@ -74,4 +74,8 @@ public function getQueryApplicationClass() {
     return 'PhabricatorFundApplication';
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'i';
+  }
+
 }
diff --git a/src/applications/fund/search/FundInitiativeFerretEngine.php b/src/applications/fund/search/FundInitiativeFerretEngine.php
new file mode 100644
index 0000000000..fd9ce1313d
--- /dev/null
+++ b/src/applications/fund/search/FundInitiativeFerretEngine.php
@@ -0,0 +1,22 @@
+<?php
+
+final class FundInitiativeFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function newNgramsObject() {
+    return new FundInitiativeFerretNgrams();
+  }
+
+  public function newDocumentObject() {
+    return new FundInitiativeFerretDocument();
+  }
+
+  public function newFieldObject() {
+    return new FundInitiativeFerretField();
+  }
+
+  public function newSearchEngine() {
+    return new FundInitiativeSearchEngine();
+  }
+
+}
diff --git a/src/applications/fund/storage/FundInitiative.php b/src/applications/fund/storage/FundInitiative.php
index a200a77b23..2b9fbf1f71 100644
--- a/src/applications/fund/storage/FundInitiative.php
+++ b/src/applications/fund/storage/FundInitiative.php
@@ -10,7 +10,8 @@ final class FundInitiative extends FundDAO
     PhabricatorFlaggableInterface,
     PhabricatorTokenReceiverInterface,
     PhabricatorDestructibleInterface,
-    PhabricatorFulltextInterface {
+    PhabricatorFulltextInterface,
+    PhabricatorFerretInterface {
 
   protected $name;
   protected $ownerPHID;
@@ -212,4 +213,12 @@ public function newFulltextEngine() {
     return new FundInitiativeFulltextEngine();
   }
 
+
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new FundInitiativeFerretEngine();
+  }
+
 }
diff --git a/src/applications/fund/storage/FundInitiativeFerretDocument.php b/src/applications/fund/storage/FundInitiativeFerretDocument.php
new file mode 100644
index 0000000000..077e0c0138
--- /dev/null
+++ b/src/applications/fund/storage/FundInitiativeFerretDocument.php
@@ -0,0 +1,14 @@
+<?php
+
+final class FundInitiativeFerretDocument
+  extends PhabricatorFerretDocument {
+
+  public function getApplicationName() {
+    return 'fund';
+  }
+
+  public function getIndexKey() {
+    return 'initiative';
+  }
+
+}
diff --git a/src/applications/fund/storage/FundInitiativeFerretField.php b/src/applications/fund/storage/FundInitiativeFerretField.php
new file mode 100644
index 0000000000..05cb7b3873
--- /dev/null
+++ b/src/applications/fund/storage/FundInitiativeFerretField.php
@@ -0,0 +1,14 @@
+<?php
+
+final class FundInitiativeFerretField
+  extends PhabricatorFerretField {
+
+  public function getApplicationName() {
+    return 'fund';
+  }
+
+  public function getIndexKey() {
+    return 'initiative';
+  }
+
+}
diff --git a/src/applications/fund/storage/FundInitiativeFerretNgrams.php b/src/applications/fund/storage/FundInitiativeFerretNgrams.php
new file mode 100644
index 0000000000..2cedde1172
--- /dev/null
+++ b/src/applications/fund/storage/FundInitiativeFerretNgrams.php
@@ -0,0 +1,14 @@
+<?php
+
+final class FundInitiativeFerretNgrams
+  extends PhabricatorFerretNgrams {
+
+  public function getApplicationName() {
+    return 'fund';
+  }
+
+  public function getIndexKey() {
+    return 'initiative';
+  }
+
+}

From 2020c1e7bd22b8cda76be922010bd1afb096f6fb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 10:27:10 -0700
Subject: [PATCH 132/865] Support Ferret engine for Passphrase credentials

Summary: Ref T12819. Adds Ferret support to Passphrase.

Test Plan: Indexed credentials, searched for credentials.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18556
---
 .../20170907.ferret.07.passphrase.doc.sql     |  9 ++++++++
 .../20170907.ferret.08.passphrase.field.sql   |  8 +++++++
 .../20170907.ferret.09.passphrase.ngrams.sql  |  5 +++++
 src/__phutil_library_map__.php                |  9 ++++++++
 .../query/PassphraseCredentialQuery.php       | 18 +++++++++------
 .../PassphraseCredentialFerretEngine.php      | 22 +++++++++++++++++++
 .../storage/PassphraseCredential.php          | 11 +++++++++-
 .../PassphraseCredentialFerretDocument.php    | 14 ++++++++++++
 .../PassphraseCredentialFerretField.php       | 14 ++++++++++++
 .../PassphraseCredentialFerretNgrams.php      | 14 ++++++++++++
 10 files changed, 116 insertions(+), 8 deletions(-)
 create mode 100644 resources/sql/autopatches/20170907.ferret.07.passphrase.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.08.passphrase.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.09.passphrase.ngrams.sql
 create mode 100644 src/applications/passphrase/search/PassphraseCredentialFerretEngine.php
 create mode 100644 src/applications/passphrase/storage/PassphraseCredentialFerretDocument.php
 create mode 100644 src/applications/passphrase/storage/PassphraseCredentialFerretField.php
 create mode 100644 src/applications/passphrase/storage/PassphraseCredentialFerretNgrams.php

diff --git a/resources/sql/autopatches/20170907.ferret.07.passphrase.doc.sql b/resources/sql/autopatches/20170907.ferret.07.passphrase.doc.sql
new file mode 100644
index 0000000000..6787528d0e
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.07.passphrase.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_passphrase.passphrase_credential_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.08.passphrase.field.sql b/resources/sql/autopatches/20170907.ferret.08.passphrase.field.sql
new file mode 100644
index 0000000000..6dc62d477e
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.08.passphrase.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_passphrase.passphrase_credential_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.09.passphrase.ngrams.sql b/resources/sql/autopatches/20170907.ferret.09.passphrase.ngrams.sql
new file mode 100644
index 0000000000..2b64beb7ed
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.09.passphrase.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_passphrase.passphrase_credential_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2d415173bb..3e498d6273 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1840,6 +1840,10 @@
     'PassphraseCredentialDestroyController' => 'applications/passphrase/controller/PassphraseCredentialDestroyController.php',
     'PassphraseCredentialDestroyTransaction' => 'applications/passphrase/xaction/PassphraseCredentialDestroyTransaction.php',
     'PassphraseCredentialEditController' => 'applications/passphrase/controller/PassphraseCredentialEditController.php',
+    'PassphraseCredentialFerretDocument' => 'applications/passphrase/storage/PassphraseCredentialFerretDocument.php',
+    'PassphraseCredentialFerretEngine' => 'applications/passphrase/search/PassphraseCredentialFerretEngine.php',
+    'PassphraseCredentialFerretField' => 'applications/passphrase/storage/PassphraseCredentialFerretField.php',
+    'PassphraseCredentialFerretNgrams' => 'applications/passphrase/storage/PassphraseCredentialFerretNgrams.php',
     'PassphraseCredentialFulltextEngine' => 'applications/passphrase/search/PassphraseCredentialFulltextEngine.php',
     'PassphraseCredentialListController' => 'applications/passphrase/controller/PassphraseCredentialListController.php',
     'PassphraseCredentialLockController' => 'applications/passphrase/controller/PassphraseCredentialLockController.php',
@@ -7034,6 +7038,7 @@
       'PhabricatorDestructibleInterface',
       'PhabricatorSpacesInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
     ),
     'PassphraseCredentialAuthorPolicyRule' => 'PhabricatorPolicyRule',
     'PassphraseCredentialConduitController' => 'PassphraseController',
@@ -7044,6 +7049,10 @@
     'PassphraseCredentialDestroyController' => 'PassphraseController',
     'PassphraseCredentialDestroyTransaction' => 'PassphraseCredentialTransactionType',
     'PassphraseCredentialEditController' => 'PassphraseController',
+    'PassphraseCredentialFerretDocument' => 'PhabricatorFerretDocument',
+    'PassphraseCredentialFerretEngine' => 'PhabricatorFerretEngine',
+    'PassphraseCredentialFerretField' => 'PhabricatorFerretField',
+    'PassphraseCredentialFerretNgrams' => 'PhabricatorFerretNgrams',
     'PassphraseCredentialFulltextEngine' => 'PhabricatorFulltextEngine',
     'PassphraseCredentialListController' => 'PassphraseController',
     'PassphraseCredentialLockController' => 'PassphraseController',
diff --git a/src/applications/passphrase/query/PassphraseCredentialQuery.php b/src/applications/passphrase/query/PassphraseCredentialQuery.php
index 3a78ac0d13..2518ad44e5 100644
--- a/src/applications/passphrase/query/PassphraseCredentialQuery.php
+++ b/src/applications/passphrase/query/PassphraseCredentialQuery.php
@@ -109,49 +109,49 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->ids !== null) {
       $where[] = qsprintf(
         $conn,
-        'id IN (%Ld)',
+        'c.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
         $conn,
-        'phid IN (%Ls)',
+        'c.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->credentialTypes !== null) {
       $where[] = qsprintf(
         $conn,
-        'credentialType in (%Ls)',
+        'c.credentialType in (%Ls)',
         $this->credentialTypes);
     }
 
     if ($this->providesTypes !== null) {
       $where[] = qsprintf(
         $conn,
-        'providesType IN (%Ls)',
+        'c.providesType IN (%Ls)',
         $this->providesTypes);
     }
 
     if ($this->isDestroyed !== null) {
       $where[] = qsprintf(
         $conn,
-        'isDestroyed = %d',
+        'c.isDestroyed = %d',
         (int)$this->isDestroyed);
     }
 
     if ($this->allowConduit !== null) {
       $where[] = qsprintf(
         $conn,
-        'allowConduit = %d',
+        'c.allowConduit = %d',
         (int)$this->allowConduit);
     }
 
     if (strlen($this->nameContains)) {
       $where[] = qsprintf(
         $conn,
-        'LOWER(name) LIKE %~',
+        'LOWER(c.name) LIKE %~',
         phutil_utf8_strtolower($this->nameContains));
     }
 
@@ -162,4 +162,8 @@ public function getQueryApplicationClass() {
     return 'PhabricatorPassphraseApplication';
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'c';
+  }
+
 }
diff --git a/src/applications/passphrase/search/PassphraseCredentialFerretEngine.php b/src/applications/passphrase/search/PassphraseCredentialFerretEngine.php
new file mode 100644
index 0000000000..3caba16371
--- /dev/null
+++ b/src/applications/passphrase/search/PassphraseCredentialFerretEngine.php
@@ -0,0 +1,22 @@
+<?php
+
+final class PassphraseCredentialFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function newNgramsObject() {
+    return new PassphraseCredentialFerretNgrams();
+  }
+
+  public function newDocumentObject() {
+    return new PassphraseCredentialFerretDocument();
+  }
+
+  public function newFieldObject() {
+    return new PassphraseCredentialFerretField();
+  }
+
+  public function newSearchEngine() {
+    return new PassphraseCredentialSearchEngine();
+  }
+
+}
diff --git a/src/applications/passphrase/storage/PassphraseCredential.php b/src/applications/passphrase/storage/PassphraseCredential.php
index d57c7405d5..737a20c1e9 100644
--- a/src/applications/passphrase/storage/PassphraseCredential.php
+++ b/src/applications/passphrase/storage/PassphraseCredential.php
@@ -8,7 +8,8 @@ final class PassphraseCredential extends PassphraseDAO
     PhabricatorSubscribableInterface,
     PhabricatorDestructibleInterface,
     PhabricatorSpacesInterface,
-    PhabricatorFulltextInterface {
+    PhabricatorFulltextInterface,
+    PhabricatorFerretInterface {
 
   protected $name;
   protected $credentialType;
@@ -197,4 +198,12 @@ public function newFulltextEngine() {
   }
 
 
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PassphraseCredentialFerretEngine();
+  }
+
+
 }
diff --git a/src/applications/passphrase/storage/PassphraseCredentialFerretDocument.php b/src/applications/passphrase/storage/PassphraseCredentialFerretDocument.php
new file mode 100644
index 0000000000..1ad082f99e
--- /dev/null
+++ b/src/applications/passphrase/storage/PassphraseCredentialFerretDocument.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PassphraseCredentialFerretDocument
+  extends PhabricatorFerretDocument {
+
+  public function getApplicationName() {
+    return 'passphrase';
+  }
+
+  public function getIndexKey() {
+    return 'credential';
+  }
+
+}
diff --git a/src/applications/passphrase/storage/PassphraseCredentialFerretField.php b/src/applications/passphrase/storage/PassphraseCredentialFerretField.php
new file mode 100644
index 0000000000..04888681bd
--- /dev/null
+++ b/src/applications/passphrase/storage/PassphraseCredentialFerretField.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PassphraseCredentialFerretField
+  extends PhabricatorFerretField {
+
+  public function getApplicationName() {
+    return 'passphrase';
+  }
+
+  public function getIndexKey() {
+    return 'credential';
+  }
+
+}
diff --git a/src/applications/passphrase/storage/PassphraseCredentialFerretNgrams.php b/src/applications/passphrase/storage/PassphraseCredentialFerretNgrams.php
new file mode 100644
index 0000000000..09a9a610fc
--- /dev/null
+++ b/src/applications/passphrase/storage/PassphraseCredentialFerretNgrams.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PassphraseCredentialFerretNgrams
+  extends PhabricatorFerretNgrams {
+
+  public function getApplicationName() {
+    return 'passphrase';
+  }
+
+  public function getIndexKey() {
+    return 'credential';
+  }
+
+}

From 2218caee0f504f461557ecd0b518ede957172472 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 11:03:39 -0700
Subject: [PATCH 133/865] Reduce the amount of boilerplate that implementing
 FerretInterface requires

Summary:
See brief discussion in D18554. All the index tables are the same for every application (and, at this point, seem unlikely to change) and we never actually pass these objects around (they're only used internally).

In some other cases (like Transactions) not every application has the same tables (for example, Differential has extra field for inline comments), and/or we pass the objects around (lots of stuff uses `$xactions` directly).

However, in this case, and in Edges, we don't interact with any representation of the database state directly in much of the code, and it doesn't change from application to application.

Just automatically define document, field, and ngram tables for anything which implements `FerretInterface`. This makes the query and index logic a tiny bit messier but lets us delete a ton of boilerplate classes.

Test Plan: Indexed objects, searched for objects. Same results as before with much less code. Ran `bin/storage upgrade`, got a clean bill of health.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18559
---
 src/__phutil_library_map__.php                |  36 ------
 .../PhabricatorConfigCoreSchemaSpec.php       |   8 ++
 .../schema/PhabricatorConfigSchemaSpec.php    |  20 ++++
 .../DifferentialRevisionFerretEngine.php      |  12 +-
 .../DifferentialRevisionFerretDocument.php    |  14 ---
 .../DifferentialRevisionFerretField.php       |  14 ---
 .../DifferentialRevisionFerretNgrams.php      |  14 ---
 .../search/FundInitiativeFerretEngine.php     |  12 +-
 .../storage/FundInitiativeFerretDocument.php  |  14 ---
 .../storage/FundInitiativeFerretField.php     |  14 ---
 .../storage/FundInitiativeFerretNgrams.php    |  14 ---
 .../search/ManiphestTaskFerretEngine.php      |  12 +-
 .../storage/ManiphestTaskFerretDocument.php   |  14 ---
 .../storage/ManiphestTaskFerretField.php      |  14 ---
 .../storage/ManiphestTaskFerretNgrams.php     |  14 ---
 .../PassphraseCredentialFerretEngine.php      |  12 +-
 .../PassphraseCredentialFerretDocument.php    |  14 ---
 .../PassphraseCredentialFerretField.php       |  14 ---
 .../PassphraseCredentialFerretNgrams.php      |  14 ---
 .../search/PhabricatorUserFerretEngine.php    |  12 +-
 .../storage/PhabricatorUserFerretDocument.php |  14 ---
 .../storage/PhabricatorUserFerretField.php    |  14 ---
 .../storage/PhabricatorUserFerretNgrams.php   |  14 ---
 ...abricatorFerretFulltextEngineExtension.php |  79 ++++++------
 .../ferret/PhabricatorFerretDocument.php      |  52 --------
 .../search/ferret/PhabricatorFerretEngine.php | 112 +++++++++++++++++-
 .../search/ferret/PhabricatorFerretField.php  |  39 ------
 .../search/ferret/PhabricatorFerretNgrams.php |  35 ------
 ...PhabricatorCursorPagedPolicyAwareQuery.php |  13 +-
 29 files changed, 208 insertions(+), 456 deletions(-)
 delete mode 100644 src/applications/differential/storage/DifferentialRevisionFerretDocument.php
 delete mode 100644 src/applications/differential/storage/DifferentialRevisionFerretField.php
 delete mode 100644 src/applications/differential/storage/DifferentialRevisionFerretNgrams.php
 delete mode 100644 src/applications/fund/storage/FundInitiativeFerretDocument.php
 delete mode 100644 src/applications/fund/storage/FundInitiativeFerretField.php
 delete mode 100644 src/applications/fund/storage/FundInitiativeFerretNgrams.php
 delete mode 100644 src/applications/maniphest/storage/ManiphestTaskFerretDocument.php
 delete mode 100644 src/applications/maniphest/storage/ManiphestTaskFerretField.php
 delete mode 100644 src/applications/maniphest/storage/ManiphestTaskFerretNgrams.php
 delete mode 100644 src/applications/passphrase/storage/PassphraseCredentialFerretDocument.php
 delete mode 100644 src/applications/passphrase/storage/PassphraseCredentialFerretField.php
 delete mode 100644 src/applications/passphrase/storage/PassphraseCredentialFerretNgrams.php
 delete mode 100644 src/applications/people/storage/PhabricatorUserFerretDocument.php
 delete mode 100644 src/applications/people/storage/PhabricatorUserFerretField.php
 delete mode 100644 src/applications/people/storage/PhabricatorUserFerretNgrams.php
 delete mode 100644 src/applications/search/ferret/PhabricatorFerretDocument.php
 delete mode 100644 src/applications/search/ferret/PhabricatorFerretField.php
 delete mode 100644 src/applications/search/ferret/PhabricatorFerretNgrams.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3e498d6273..1ffe418b5c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -532,10 +532,7 @@
     'DifferentialRevisionEditConduitAPIMethod' => 'applications/differential/conduit/DifferentialRevisionEditConduitAPIMethod.php',
     'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php',
     'DifferentialRevisionEditEngine' => 'applications/differential/editor/DifferentialRevisionEditEngine.php',
-    'DifferentialRevisionFerretDocument' => 'applications/differential/storage/DifferentialRevisionFerretDocument.php',
     'DifferentialRevisionFerretEngine' => 'applications/differential/search/DifferentialRevisionFerretEngine.php',
-    'DifferentialRevisionFerretField' => 'applications/differential/storage/DifferentialRevisionFerretField.php',
-    'DifferentialRevisionFerretNgrams' => 'applications/differential/storage/DifferentialRevisionFerretNgrams.php',
     'DifferentialRevisionFulltextEngine' => 'applications/differential/search/DifferentialRevisionFulltextEngine.php',
     'DifferentialRevisionGraph' => 'infrastructure/graph/DifferentialRevisionGraph.php',
     'DifferentialRevisionHasChildRelationship' => 'applications/differential/relationships/DifferentialRevisionHasChildRelationship.php',
@@ -1153,10 +1150,7 @@
     'FundInitiativeEditController' => 'applications/fund/controller/FundInitiativeEditController.php',
     'FundInitiativeEditEngine' => 'applications/fund/editor/FundInitiativeEditEngine.php',
     'FundInitiativeEditor' => 'applications/fund/editor/FundInitiativeEditor.php',
-    'FundInitiativeFerretDocument' => 'applications/fund/storage/FundInitiativeFerretDocument.php',
     'FundInitiativeFerretEngine' => 'applications/fund/search/FundInitiativeFerretEngine.php',
-    'FundInitiativeFerretField' => 'applications/fund/storage/FundInitiativeFerretField.php',
-    'FundInitiativeFerretNgrams' => 'applications/fund/storage/FundInitiativeFerretNgrams.php',
     'FundInitiativeFulltextEngine' => 'applications/fund/search/FundInitiativeFulltextEngine.php',
     'FundInitiativeListController' => 'applications/fund/controller/FundInitiativeListController.php',
     'FundInitiativeMerchantTransaction' => 'applications/fund/xaction/FundInitiativeMerchantTransaction.php',
@@ -1539,10 +1533,7 @@
     'ManiphestTaskEditBulkJobType' => 'applications/maniphest/bulk/ManiphestTaskEditBulkJobType.php',
     'ManiphestTaskEditController' => 'applications/maniphest/controller/ManiphestTaskEditController.php',
     'ManiphestTaskEditEngineLock' => 'applications/maniphest/editor/ManiphestTaskEditEngineLock.php',
-    'ManiphestTaskFerretDocument' => 'applications/maniphest/storage/ManiphestTaskFerretDocument.php',
     'ManiphestTaskFerretEngine' => 'applications/maniphest/search/ManiphestTaskFerretEngine.php',
-    'ManiphestTaskFerretField' => 'applications/maniphest/storage/ManiphestTaskFerretField.php',
-    'ManiphestTaskFerretNgrams' => 'applications/maniphest/storage/ManiphestTaskFerretNgrams.php',
     'ManiphestTaskFulltextEngine' => 'applications/maniphest/search/ManiphestTaskFulltextEngine.php',
     'ManiphestTaskGraph' => 'infrastructure/graph/ManiphestTaskGraph.php',
     'ManiphestTaskHasCommitEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasCommitEdgeType.php',
@@ -1840,10 +1831,7 @@
     'PassphraseCredentialDestroyController' => 'applications/passphrase/controller/PassphraseCredentialDestroyController.php',
     'PassphraseCredentialDestroyTransaction' => 'applications/passphrase/xaction/PassphraseCredentialDestroyTransaction.php',
     'PassphraseCredentialEditController' => 'applications/passphrase/controller/PassphraseCredentialEditController.php',
-    'PassphraseCredentialFerretDocument' => 'applications/passphrase/storage/PassphraseCredentialFerretDocument.php',
     'PassphraseCredentialFerretEngine' => 'applications/passphrase/search/PassphraseCredentialFerretEngine.php',
-    'PassphraseCredentialFerretField' => 'applications/passphrase/storage/PassphraseCredentialFerretField.php',
-    'PassphraseCredentialFerretNgrams' => 'applications/passphrase/storage/PassphraseCredentialFerretNgrams.php',
     'PassphraseCredentialFulltextEngine' => 'applications/passphrase/search/PassphraseCredentialFulltextEngine.php',
     'PassphraseCredentialListController' => 'applications/passphrase/controller/PassphraseCredentialListController.php',
     'PassphraseCredentialLockController' => 'applications/passphrase/controller/PassphraseCredentialLockController.php',
@@ -2841,15 +2829,12 @@
     'PhabricatorFeedStoryNotification' => 'applications/notification/storage/PhabricatorFeedStoryNotification.php',
     'PhabricatorFeedStoryPublisher' => 'applications/feed/PhabricatorFeedStoryPublisher.php',
     'PhabricatorFeedStoryReference' => 'applications/feed/storage/PhabricatorFeedStoryReference.php',
-    'PhabricatorFerretDocument' => 'applications/search/ferret/PhabricatorFerretDocument.php',
     'PhabricatorFerretEngine' => 'applications/search/ferret/PhabricatorFerretEngine.php',
     'PhabricatorFerretEngineTestCase' => 'applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php',
-    'PhabricatorFerretField' => 'applications/search/ferret/PhabricatorFerretField.php',
     'PhabricatorFerretFulltextEngineExtension' => 'applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php',
     'PhabricatorFerretFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php',
     'PhabricatorFerretInterface' => 'applications/search/ferret/PhabricatorFerretInterface.php',
     'PhabricatorFerretMetadata' => 'applications/search/ferret/PhabricatorFerretMetadata.php',
-    'PhabricatorFerretNgrams' => 'applications/search/ferret/PhabricatorFerretNgrams.php',
     'PhabricatorFerretSearchEngineExtension' => 'applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php',
     'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.php',
     'PhabricatorFileAES256StorageFormat' => 'applications/files/format/PhabricatorFileAES256StorageFormat.php',
@@ -4265,10 +4250,7 @@
     'PhabricatorUserEditorTestCase' => 'applications/people/editor/__tests__/PhabricatorUserEditorTestCase.php',
     'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php',
     'PhabricatorUserEmailTestCase' => 'applications/people/storage/__tests__/PhabricatorUserEmailTestCase.php',
-    'PhabricatorUserFerretDocument' => 'applications/people/storage/PhabricatorUserFerretDocument.php',
     'PhabricatorUserFerretEngine' => 'applications/people/search/PhabricatorUserFerretEngine.php',
-    'PhabricatorUserFerretField' => 'applications/people/storage/PhabricatorUserFerretField.php',
-    'PhabricatorUserFerretNgrams' => 'applications/people/storage/PhabricatorUserFerretNgrams.php',
     'PhabricatorUserFulltextEngine' => 'applications/people/search/PhabricatorUserFulltextEngine.php',
     'PhabricatorUserIconField' => 'applications/people/customfield/PhabricatorUserIconField.php',
     'PhabricatorUserLog' => 'applications/people/storage/PhabricatorUserLog.php',
@@ -5564,10 +5546,7 @@
     'DifferentialRevisionEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'DifferentialRevisionEditController' => 'DifferentialController',
     'DifferentialRevisionEditEngine' => 'PhabricatorEditEngine',
-    'DifferentialRevisionFerretDocument' => 'PhabricatorFerretDocument',
     'DifferentialRevisionFerretEngine' => 'PhabricatorFerretEngine',
-    'DifferentialRevisionFerretField' => 'PhabricatorFerretField',
-    'DifferentialRevisionFerretNgrams' => 'PhabricatorFerretNgrams',
     'DifferentialRevisionFulltextEngine' => 'PhabricatorFulltextEngine',
     'DifferentialRevisionGraph' => 'PhabricatorObjectGraph',
     'DifferentialRevisionHasChildRelationship' => 'DifferentialRevisionRelationship',
@@ -6248,10 +6227,7 @@
     'FundInitiativeEditController' => 'FundController',
     'FundInitiativeEditEngine' => 'PhabricatorEditEngine',
     'FundInitiativeEditor' => 'PhabricatorApplicationTransactionEditor',
-    'FundInitiativeFerretDocument' => 'PhabricatorFerretDocument',
     'FundInitiativeFerretEngine' => 'PhabricatorFerretEngine',
-    'FundInitiativeFerretField' => 'PhabricatorFerretField',
-    'FundInitiativeFerretNgrams' => 'PhabricatorFerretNgrams',
     'FundInitiativeFulltextEngine' => 'PhabricatorFulltextEngine',
     'FundInitiativeListController' => 'FundController',
     'FundInitiativeMerchantTransaction' => 'FundInitiativeTransactionType',
@@ -6719,10 +6695,7 @@
     'ManiphestTaskEditBulkJobType' => 'PhabricatorWorkerBulkJobType',
     'ManiphestTaskEditController' => 'ManiphestController',
     'ManiphestTaskEditEngineLock' => 'PhabricatorEditEngineLock',
-    'ManiphestTaskFerretDocument' => 'PhabricatorFerretDocument',
     'ManiphestTaskFerretEngine' => 'PhabricatorFerretEngine',
-    'ManiphestTaskFerretField' => 'PhabricatorFerretField',
-    'ManiphestTaskFerretNgrams' => 'PhabricatorFerretNgrams',
     'ManiphestTaskFulltextEngine' => 'PhabricatorFulltextEngine',
     'ManiphestTaskGraph' => 'PhabricatorObjectGraph',
     'ManiphestTaskHasCommitEdgeType' => 'PhabricatorEdgeType',
@@ -7049,10 +7022,7 @@
     'PassphraseCredentialDestroyController' => 'PassphraseController',
     'PassphraseCredentialDestroyTransaction' => 'PassphraseCredentialTransactionType',
     'PassphraseCredentialEditController' => 'PassphraseController',
-    'PassphraseCredentialFerretDocument' => 'PhabricatorFerretDocument',
     'PassphraseCredentialFerretEngine' => 'PhabricatorFerretEngine',
-    'PassphraseCredentialFerretField' => 'PhabricatorFerretField',
-    'PassphraseCredentialFerretNgrams' => 'PhabricatorFerretNgrams',
     'PassphraseCredentialFulltextEngine' => 'PhabricatorFulltextEngine',
     'PassphraseCredentialListController' => 'PassphraseController',
     'PassphraseCredentialLockController' => 'PassphraseController',
@@ -8192,14 +8162,11 @@
     'PhabricatorFeedStoryNotification' => 'PhabricatorFeedDAO',
     'PhabricatorFeedStoryPublisher' => 'Phobject',
     'PhabricatorFeedStoryReference' => 'PhabricatorFeedDAO',
-    'PhabricatorFerretDocument' => 'PhabricatorSearchDAO',
     'PhabricatorFerretEngine' => 'Phobject',
     'PhabricatorFerretEngineTestCase' => 'PhabricatorTestCase',
-    'PhabricatorFerretField' => 'PhabricatorSearchDAO',
     'PhabricatorFerretFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
     'PhabricatorFerretFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine',
     'PhabricatorFerretMetadata' => 'Phobject',
-    'PhabricatorFerretNgrams' => 'PhabricatorSearchDAO',
     'PhabricatorFerretSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
     'PhabricatorFile' => array(
       'PhabricatorFileDAO',
@@ -9885,10 +9852,7 @@
     'PhabricatorUserEditorTestCase' => 'PhabricatorTestCase',
     'PhabricatorUserEmail' => 'PhabricatorUserDAO',
     'PhabricatorUserEmailTestCase' => 'PhabricatorTestCase',
-    'PhabricatorUserFerretDocument' => 'PhabricatorFerretDocument',
     'PhabricatorUserFerretEngine' => 'PhabricatorFerretEngine',
-    'PhabricatorUserFerretField' => 'PhabricatorFerretField',
-    'PhabricatorUserFerretNgrams' => 'PhabricatorFerretNgrams',
     'PhabricatorUserFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhabricatorUserIconField' => 'PhabricatorUserCustomField',
     'PhabricatorUserLog' => array(
diff --git a/src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php b/src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php
index 4219ad2cb4..0d8d743649 100644
--- a/src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php
+++ b/src/applications/config/schema/PhabricatorConfigCoreSchemaSpec.php
@@ -42,5 +42,13 @@ public function buildSchemata() {
         ));
     }
 
+    $ferret_objects = id(new PhutilClassMapQuery())
+      ->setAncestorClass('PhabricatorFerretInterface')
+      ->execute();
+
+    foreach ($ferret_objects as $ferret_object) {
+      $engine = $ferret_object->newFerretEngine();
+      $this->buildFerretIndexSchema($engine);
+    }
   }
 }
diff --git a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
index 49a99ab03a..b24adf27cd 100644
--- a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
+++ b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
@@ -55,6 +55,26 @@ protected function buildLiskObjectSchema(PhabricatorLiskDAO $object) {
       $object->getSchemaKeys());
   }
 
+  protected function buildFerretIndexSchema(PhabricatorFerretEngine $engine) {
+    $this->buildRawSchema(
+      $engine->getApplicationName(),
+      $engine->getDocumentTableName(),
+      $engine->getDocumentSchemaColumns(),
+      $engine->getDocumentSchemaKeys());
+
+    $this->buildRawSchema(
+      $engine->getApplicationName(),
+      $engine->getFieldTableName(),
+      $engine->getFieldSchemaColumns(),
+      $engine->getFieldSchemaKeys());
+
+    $this->buildRawSchema(
+      $engine->getApplicationName(),
+      $engine->getNgramsTableName(),
+      $engine->getNgramsSchemaColumns(),
+      $engine->getNgramsSchemaKeys());
+  }
+
   protected function buildRawSchema(
     $database_name,
     $table_name,
diff --git a/src/applications/differential/search/DifferentialRevisionFerretEngine.php b/src/applications/differential/search/DifferentialRevisionFerretEngine.php
index ebe59c2780..2fc7d5905e 100644
--- a/src/applications/differential/search/DifferentialRevisionFerretEngine.php
+++ b/src/applications/differential/search/DifferentialRevisionFerretEngine.php
@@ -3,16 +3,12 @@
 final class DifferentialRevisionFerretEngine
   extends PhabricatorFerretEngine {
 
-  public function newNgramsObject() {
-    return new DifferentialRevisionFerretNgrams();
+  public function getApplicationName() {
+    return 'differential';
   }
 
-  public function newDocumentObject() {
-    return new DifferentialRevisionFerretDocument();
-  }
-
-  public function newFieldObject() {
-    return new DifferentialRevisionFerretField();
+  public function getScopeName() {
+    return 'revision';
   }
 
   public function newSearchEngine() {
diff --git a/src/applications/differential/storage/DifferentialRevisionFerretDocument.php b/src/applications/differential/storage/DifferentialRevisionFerretDocument.php
deleted file mode 100644
index ae8571f625..0000000000
--- a/src/applications/differential/storage/DifferentialRevisionFerretDocument.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class DifferentialRevisionFerretDocument
-  extends PhabricatorFerretDocument {
-
-  public function getApplicationName() {
-    return 'differential';
-  }
-
-  public function getIndexKey() {
-    return 'revision';
-  }
-
-}
diff --git a/src/applications/differential/storage/DifferentialRevisionFerretField.php b/src/applications/differential/storage/DifferentialRevisionFerretField.php
deleted file mode 100644
index 050039c4b2..0000000000
--- a/src/applications/differential/storage/DifferentialRevisionFerretField.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class DifferentialRevisionFerretField
-  extends PhabricatorFerretField {
-
-  public function getApplicationName() {
-    return 'differential';
-  }
-
-  public function getIndexKey() {
-    return 'revision';
-  }
-
-}
diff --git a/src/applications/differential/storage/DifferentialRevisionFerretNgrams.php b/src/applications/differential/storage/DifferentialRevisionFerretNgrams.php
deleted file mode 100644
index b0e1c0f316..0000000000
--- a/src/applications/differential/storage/DifferentialRevisionFerretNgrams.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class DifferentialRevisionFerretNgrams
-  extends PhabricatorFerretNgrams {
-
-  public function getApplicationName() {
-    return 'differential';
-  }
-
-  public function getIndexKey() {
-    return 'revision';
-  }
-
-}
diff --git a/src/applications/fund/search/FundInitiativeFerretEngine.php b/src/applications/fund/search/FundInitiativeFerretEngine.php
index fd9ce1313d..785b40b06f 100644
--- a/src/applications/fund/search/FundInitiativeFerretEngine.php
+++ b/src/applications/fund/search/FundInitiativeFerretEngine.php
@@ -3,16 +3,12 @@
 final class FundInitiativeFerretEngine
   extends PhabricatorFerretEngine {
 
-  public function newNgramsObject() {
-    return new FundInitiativeFerretNgrams();
+  public function getApplicationName() {
+    return 'fund';
   }
 
-  public function newDocumentObject() {
-    return new FundInitiativeFerretDocument();
-  }
-
-  public function newFieldObject() {
-    return new FundInitiativeFerretField();
+  public function getScopeName() {
+    return 'initiative';
   }
 
   public function newSearchEngine() {
diff --git a/src/applications/fund/storage/FundInitiativeFerretDocument.php b/src/applications/fund/storage/FundInitiativeFerretDocument.php
deleted file mode 100644
index 077e0c0138..0000000000
--- a/src/applications/fund/storage/FundInitiativeFerretDocument.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class FundInitiativeFerretDocument
-  extends PhabricatorFerretDocument {
-
-  public function getApplicationName() {
-    return 'fund';
-  }
-
-  public function getIndexKey() {
-    return 'initiative';
-  }
-
-}
diff --git a/src/applications/fund/storage/FundInitiativeFerretField.php b/src/applications/fund/storage/FundInitiativeFerretField.php
deleted file mode 100644
index 05cb7b3873..0000000000
--- a/src/applications/fund/storage/FundInitiativeFerretField.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class FundInitiativeFerretField
-  extends PhabricatorFerretField {
-
-  public function getApplicationName() {
-    return 'fund';
-  }
-
-  public function getIndexKey() {
-    return 'initiative';
-  }
-
-}
diff --git a/src/applications/fund/storage/FundInitiativeFerretNgrams.php b/src/applications/fund/storage/FundInitiativeFerretNgrams.php
deleted file mode 100644
index 2cedde1172..0000000000
--- a/src/applications/fund/storage/FundInitiativeFerretNgrams.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class FundInitiativeFerretNgrams
-  extends PhabricatorFerretNgrams {
-
-  public function getApplicationName() {
-    return 'fund';
-  }
-
-  public function getIndexKey() {
-    return 'initiative';
-  }
-
-}
diff --git a/src/applications/maniphest/search/ManiphestTaskFerretEngine.php b/src/applications/maniphest/search/ManiphestTaskFerretEngine.php
index 7de368402a..45b90471ea 100644
--- a/src/applications/maniphest/search/ManiphestTaskFerretEngine.php
+++ b/src/applications/maniphest/search/ManiphestTaskFerretEngine.php
@@ -3,16 +3,12 @@
 final class ManiphestTaskFerretEngine
   extends PhabricatorFerretEngine {
 
-  public function newNgramsObject() {
-    return new ManiphestTaskFerretNgrams();
+  public function getApplicationName() {
+    return 'maniphest';
   }
 
-  public function newDocumentObject() {
-    return new ManiphestTaskFerretDocument();
-  }
-
-  public function newFieldObject() {
-    return new ManiphestTaskFerretField();
+  public function getScopeName() {
+    return 'task';
   }
 
   public function newSearchEngine() {
diff --git a/src/applications/maniphest/storage/ManiphestTaskFerretDocument.php b/src/applications/maniphest/storage/ManiphestTaskFerretDocument.php
deleted file mode 100644
index 240523a85a..0000000000
--- a/src/applications/maniphest/storage/ManiphestTaskFerretDocument.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class ManiphestTaskFerretDocument
-  extends PhabricatorFerretDocument {
-
-  public function getApplicationName() {
-    return 'maniphest';
-  }
-
-  public function getIndexKey() {
-    return 'task';
-  }
-
-}
diff --git a/src/applications/maniphest/storage/ManiphestTaskFerretField.php b/src/applications/maniphest/storage/ManiphestTaskFerretField.php
deleted file mode 100644
index 4db6c1ac93..0000000000
--- a/src/applications/maniphest/storage/ManiphestTaskFerretField.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class ManiphestTaskFerretField
-  extends PhabricatorFerretField {
-
-  public function getApplicationName() {
-    return 'maniphest';
-  }
-
-  public function getIndexKey() {
-    return 'task';
-  }
-
-}
diff --git a/src/applications/maniphest/storage/ManiphestTaskFerretNgrams.php b/src/applications/maniphest/storage/ManiphestTaskFerretNgrams.php
deleted file mode 100644
index c389526643..0000000000
--- a/src/applications/maniphest/storage/ManiphestTaskFerretNgrams.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class ManiphestTaskFerretNgrams
-  extends PhabricatorFerretNgrams {
-
-  public function getApplicationName() {
-    return 'maniphest';
-  }
-
-  public function getIndexKey() {
-    return 'task';
-  }
-
-}
diff --git a/src/applications/passphrase/search/PassphraseCredentialFerretEngine.php b/src/applications/passphrase/search/PassphraseCredentialFerretEngine.php
index 3caba16371..cb9aa99abb 100644
--- a/src/applications/passphrase/search/PassphraseCredentialFerretEngine.php
+++ b/src/applications/passphrase/search/PassphraseCredentialFerretEngine.php
@@ -3,16 +3,12 @@
 final class PassphraseCredentialFerretEngine
   extends PhabricatorFerretEngine {
 
-  public function newNgramsObject() {
-    return new PassphraseCredentialFerretNgrams();
+  public function getApplicationName() {
+    return 'passphrase';
   }
 
-  public function newDocumentObject() {
-    return new PassphraseCredentialFerretDocument();
-  }
-
-  public function newFieldObject() {
-    return new PassphraseCredentialFerretField();
+  public function getScopeName() {
+    return 'credential';
   }
 
   public function newSearchEngine() {
diff --git a/src/applications/passphrase/storage/PassphraseCredentialFerretDocument.php b/src/applications/passphrase/storage/PassphraseCredentialFerretDocument.php
deleted file mode 100644
index 1ad082f99e..0000000000
--- a/src/applications/passphrase/storage/PassphraseCredentialFerretDocument.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class PassphraseCredentialFerretDocument
-  extends PhabricatorFerretDocument {
-
-  public function getApplicationName() {
-    return 'passphrase';
-  }
-
-  public function getIndexKey() {
-    return 'credential';
-  }
-
-}
diff --git a/src/applications/passphrase/storage/PassphraseCredentialFerretField.php b/src/applications/passphrase/storage/PassphraseCredentialFerretField.php
deleted file mode 100644
index 04888681bd..0000000000
--- a/src/applications/passphrase/storage/PassphraseCredentialFerretField.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class PassphraseCredentialFerretField
-  extends PhabricatorFerretField {
-
-  public function getApplicationName() {
-    return 'passphrase';
-  }
-
-  public function getIndexKey() {
-    return 'credential';
-  }
-
-}
diff --git a/src/applications/passphrase/storage/PassphraseCredentialFerretNgrams.php b/src/applications/passphrase/storage/PassphraseCredentialFerretNgrams.php
deleted file mode 100644
index 09a9a610fc..0000000000
--- a/src/applications/passphrase/storage/PassphraseCredentialFerretNgrams.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class PassphraseCredentialFerretNgrams
-  extends PhabricatorFerretNgrams {
-
-  public function getApplicationName() {
-    return 'passphrase';
-  }
-
-  public function getIndexKey() {
-    return 'credential';
-  }
-
-}
diff --git a/src/applications/people/search/PhabricatorUserFerretEngine.php b/src/applications/people/search/PhabricatorUserFerretEngine.php
index 1f44bf4289..c29d4001db 100644
--- a/src/applications/people/search/PhabricatorUserFerretEngine.php
+++ b/src/applications/people/search/PhabricatorUserFerretEngine.php
@@ -3,16 +3,12 @@
 final class PhabricatorUserFerretEngine
   extends PhabricatorFerretEngine {
 
-  public function newNgramsObject() {
-    return new PhabricatorUserFerretNgrams();
+  public function getApplicationName() {
+    return 'user';
   }
 
-  public function newDocumentObject() {
-    return new PhabricatorUserFerretDocument();
-  }
-
-  public function newFieldObject() {
-    return new PhabricatorUserFerretField();
+  public function getScopeName() {
+    return 'user';
   }
 
   public function newSearchEngine() {
diff --git a/src/applications/people/storage/PhabricatorUserFerretDocument.php b/src/applications/people/storage/PhabricatorUserFerretDocument.php
deleted file mode 100644
index 9ccf210008..0000000000
--- a/src/applications/people/storage/PhabricatorUserFerretDocument.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class PhabricatorUserFerretDocument
-  extends PhabricatorFerretDocument {
-
-  public function getApplicationName() {
-    return 'user';
-  }
-
-  public function getIndexKey() {
-    return 'user';
-  }
-
-}
diff --git a/src/applications/people/storage/PhabricatorUserFerretField.php b/src/applications/people/storage/PhabricatorUserFerretField.php
deleted file mode 100644
index 8b2698128b..0000000000
--- a/src/applications/people/storage/PhabricatorUserFerretField.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class PhabricatorUserFerretField
-  extends PhabricatorFerretField {
-
-  public function getApplicationName() {
-    return 'user';
-  }
-
-  public function getIndexKey() {
-    return 'user';
-  }
-
-}
diff --git a/src/applications/people/storage/PhabricatorUserFerretNgrams.php b/src/applications/people/storage/PhabricatorUserFerretNgrams.php
deleted file mode 100644
index 2024cc9d7d..0000000000
--- a/src/applications/people/storage/PhabricatorUserFerretNgrams.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-final class PhabricatorUserFerretNgrams
-  extends PhabricatorFerretNgrams {
-
-  public function getApplicationName() {
-    return 'user';
-  }
-
-  public function getIndexKey() {
-    return 'user';
-  }
-
-}
diff --git a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
index 27694e3a01..4344fe1623 100644
--- a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
@@ -47,14 +47,6 @@ public function indexFulltextObject(
       }
     }
 
-    $ferret_document = $engine->newDocumentObject()
-      ->setObjectPHID($phid)
-      ->setIsClosed($is_closed)
-      ->setEpochCreated($document->getDocumentCreated())
-      ->setEpochModified($document->getDocumentModified())
-      ->setAuthorPHID($author_phid)
-      ->setOwnerPHID($owner_phid);
-
     $stemmer = $engine->newStemmer();
 
     // Copy all of the "title" and "body" fields to create new "core" fields.
@@ -133,33 +125,49 @@ public function indexFulltextObject(
         $ngrams_source[] = $term_corpus;
       }
 
-      $ferret_fields[] = $engine->newFieldObject()
-        ->setFieldKey($key)
-        ->setRawCorpus($raw_corpus)
-        ->setTermCorpus($term_corpus)
-        ->setNormalCorpus($normal_corpus);
+      $ferret_fields[] = array(
+        'fieldKey' => $key,
+        'rawCorpus' => $raw_corpus,
+        'termCorpus' => $term_corpus,
+        'normalCorpus' => $normal_corpus,
+      );
     }
     $ngrams_source = implode("\n", $ngrams_source);
 
     $ngrams = $engine->getTermNgramsFromString($ngrams_source);
 
-    $ferret_document->openTransaction();
+    $object->openTransaction();
 
     try {
+      $conn = $object->establishConnection('w');
       $this->deleteOldDocument($engine, $object, $document);
 
-      $ferret_document->save();
-
-      $document_id = $ferret_document->getID();
+      queryfx(
+        $conn,
+        'INSERT INTO %T (objectPHID, isClosed, epochCreated, epochModified,
+          authorPHID, ownerPHID) VALUES (%s, %d, %d, %d, %ns, %ns)',
+        $engine->getDocumentTableName(),
+        $object->getPHID(),
+        $is_closed,
+        $document->getDocumentCreated(),
+        $document->getDocumentModified(),
+        $author_phid,
+        $owner_phid);
+
+      $document_id = $conn->getInsertID();
       foreach ($ferret_fields as $ferret_field) {
-        $ferret_field
-          ->setDocumentID($document_id)
-          ->save();
+        queryfx(
+          $conn,
+          'INSERT INTO %T (documentID, fieldKey, rawCorpus, termCorpus,
+            normalCorpus) VALUES (%d, %s, %s, %s, %s)',
+            $engine->getFieldTableName(),
+            $document_id,
+            $ferret_field['fieldKey'],
+            $ferret_field['rawCorpus'],
+            $ferret_field['termCorpus'],
+            $ferret_field['normalCorpus']);
       }
 
-      $ferret_ngrams = $engine->newNgramsObject();
-      $conn = $ferret_ngrams->establishConnection('w');
-
       $sql = array();
       foreach ($ngrams as $ngram) {
         $sql[] = qsprintf(
@@ -173,15 +181,15 @@ public function indexFulltextObject(
         queryfx(
           $conn,
           'INSERT INTO %T (documentID, ngram) VALUES %Q',
-          $ferret_ngrams->getTableName(),
+          $engine->getNgramsTableName(),
           $chunk);
       }
     } catch (Exception $ex) {
-      $ferret_document->killTransaction();
+      $object->killTransaction();
       throw $ex;
     }
 
-    $ferret_document->saveTransaction();
+    $object->saveTransaction();
   }
 
 
@@ -190,32 +198,35 @@ private function deleteOldDocument(
     $object,
     PhabricatorSearchAbstractDocument $document) {
 
-    $old_document = $engine->newDocumentObject()->loadOneWhere(
-      'objectPHID = %s',
-      $document->getPHID());
+    $conn = $object->establishConnection('w');
+
+    $old_document = queryfx_one(
+      $conn,
+      'SELECT * FROM %T WHERE objectPHID = %s',
+      $engine->getDocumentTableName(),
+      $object->getPHID());
     if (!$old_document) {
       return;
     }
 
-    $conn = $old_document->establishConnection('w');
-    $old_id = $old_document->getID();
+    $old_id = $old_document['id'];
 
     queryfx(
       $conn,
       'DELETE FROM %T WHERE id = %d',
-      $engine->newDocumentObject()->getTableName(),
+      $engine->getDocumentTableName(),
       $old_id);
 
     queryfx(
       $conn,
       'DELETE FROM %T WHERE documentID = %d',
-      $engine->newFieldObject()->getTableName(),
+      $engine->getFieldTableName(),
       $old_id);
 
     queryfx(
       $conn,
       'DELETE FROM %T WHERE documentID = %d',
-      $engine->newNgramsObject()->getTableName(),
+      $engine->getNgramsTableName(),
       $old_id);
   }
 
diff --git a/src/applications/search/ferret/PhabricatorFerretDocument.php b/src/applications/search/ferret/PhabricatorFerretDocument.php
deleted file mode 100644
index 6f25eb93b6..0000000000
--- a/src/applications/search/ferret/PhabricatorFerretDocument.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-abstract class PhabricatorFerretDocument
-  extends PhabricatorSearchDAO {
-
-  protected $objectPHID;
-  protected $isClosed;
-  protected $authorPHID;
-  protected $ownerPHID;
-  protected $epochCreated;
-  protected $epochModified;
-
-  abstract public function getIndexKey();
-
-  protected function getConfiguration() {
-    return array(
-      self::CONFIG_TIMESTAMPS => false,
-      self::CONFIG_COLUMN_SCHEMA => array(
-        'isClosed' => 'bool',
-        'authorPHID' => 'phid?',
-        'ownerPHID' => 'phid?',
-        'epochCreated' => 'epoch',
-        'epochModified' => 'epoch',
-      ),
-      self::CONFIG_KEY_SCHEMA => array(
-        'key_object' => array(
-          'columns' => array('objectPHID'),
-          'unique' => true,
-        ),
-        'key_author' => array(
-          'columns' => array('authorPHID'),
-        ),
-        'key_owner' => array(
-          'columns' => array('ownerPHID'),
-        ),
-        'key_created' => array(
-          'columns' => array('epochCreated'),
-        ),
-        'key_modified' => array(
-          'columns' => array('epochModified'),
-        ),
-      ),
-    ) + parent::getConfiguration();
-  }
-
-  public function getTableName() {
-    $application = $this->getApplicationName();
-    $key = $this->getIndexKey();
-    return "{$application}_{$key}_fdocument";
-  }
-
-}
diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index eb40b70e58..219130c02c 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -2,9 +2,8 @@
 
 abstract class PhabricatorFerretEngine extends Phobject {
 
-  abstract public function newNgramsObject();
-  abstract public function newDocumentObject();
-  abstract public function newFieldObject();
+  abstract public function getApplicationName();
+  abstract public function getScopeName();
   abstract public function newSearchEngine();
 
   public function getDefaultFunctionKey() {
@@ -168,4 +167,111 @@ public function newTermsCorpus($raw_corpus) {
     return $term_corpus;
   }
 
+/* -(  Schema  )------------------------------------------------------------- */
+
+  public function getDocumentTableName() {
+    $application = $this->getApplicationName();
+    $scope = $this->getScopeName();
+
+    return "{$application}_{$scope}_fdocument";
+  }
+
+  public function getDocumentSchemaColumns() {
+    return array(
+      'id' => 'auto',
+      'objectPHID' => 'phid',
+      'isClosed' => 'bool',
+      'authorPHID' => 'phid?',
+      'ownerPHID' => 'phid?',
+      'epochCreated' => 'epoch',
+      'epochModified' => 'epoch',
+    );
+  }
+
+  public function getDocumentSchemaKeys() {
+    return array(
+      'PRIMARY' => array(
+        'columns' => array('id'),
+        'unique' => true,
+      ),
+      'key_object' => array(
+        'columns' => array('objectPHID'),
+        'unique' => true,
+      ),
+      'key_author' => array(
+        'columns' => array('authorPHID'),
+      ),
+      'key_owner' => array(
+        'columns' => array('ownerPHID'),
+      ),
+      'key_created' => array(
+        'columns' => array('epochCreated'),
+      ),
+      'key_modified' => array(
+        'columns' => array('epochModified'),
+      ),
+    );
+  }
+
+  public function getFieldTableName() {
+    $application = $this->getApplicationName();
+    $scope = $this->getScopeName();
+
+    return "{$application}_{$scope}_ffield";
+  }
+
+  public function getFieldSchemaColumns() {
+    return array(
+      'id' => 'auto',
+      'documentID' => 'uint32',
+      'fieldKey' => 'text4',
+      'rawCorpus' => 'sort',
+      'termCorpus' => 'sort',
+      'normalCorpus' => 'sort',
+    );
+  }
+
+  public function getFieldSchemaKeys() {
+    return array(
+      'PRIMARY' => array(
+        'columns' => array('id'),
+        'unique' => true,
+      ),
+      'key_documentfield' => array(
+        'columns' => array('documentID', 'fieldKey'),
+        'unique' => true,
+      ),
+    );
+  }
+
+  public function getNgramsTableName() {
+    $application = $this->getApplicationName();
+    $scope = $this->getScopeName();
+
+    return "{$application}_{$scope}_fngrams";
+  }
+
+  public function getNgramsSchemaColumns() {
+    return array(
+      'id' => 'auto',
+      'documentID' => 'uint32',
+      'ngram' => 'char3',
+    );
+  }
+
+  public function getNgramsSchemaKeys() {
+    return array(
+      'PRIMARY' => array(
+        'columns' => array('id'),
+        'unique' => true,
+      ),
+      'key_ngram' => array(
+        'columns' => array('ngram', 'documentID'),
+      ),
+      'key_object' => array(
+        'columns' => array('documentID'),
+      ),
+    );
+  }
+
 }
diff --git a/src/applications/search/ferret/PhabricatorFerretField.php b/src/applications/search/ferret/PhabricatorFerretField.php
deleted file mode 100644
index be39e745ed..0000000000
--- a/src/applications/search/ferret/PhabricatorFerretField.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-abstract class PhabricatorFerretField
-  extends PhabricatorSearchDAO {
-
-  protected $documentID;
-  protected $fieldKey;
-  protected $rawCorpus;
-  protected $termCorpus;
-  protected $normalCorpus;
-
-  abstract public function getIndexKey();
-
-  protected function getConfiguration() {
-    return array(
-      self::CONFIG_TIMESTAMPS => false,
-      self::CONFIG_COLUMN_SCHEMA => array(
-        'documentID' => 'uint32',
-        'fieldKey' => 'text4',
-        'rawCorpus' => 'sort',
-        'termCorpus' => 'sort',
-        'normalCorpus' => 'sort',
-      ),
-      self::CONFIG_KEY_SCHEMA => array(
-        'key_documentfield' => array(
-          'columns' => array('documentID', 'fieldKey'),
-          'unique' => true,
-        ),
-      ),
-    ) + parent::getConfiguration();
-  }
-
-  public function getTableName() {
-    $application = $this->getApplicationName();
-    $key = $this->getIndexKey();
-    return "{$application}_{$key}_ffield";
-  }
-
-}
diff --git a/src/applications/search/ferret/PhabricatorFerretNgrams.php b/src/applications/search/ferret/PhabricatorFerretNgrams.php
deleted file mode 100644
index 9e28f96cb6..0000000000
--- a/src/applications/search/ferret/PhabricatorFerretNgrams.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-abstract class PhabricatorFerretNgrams
-  extends PhabricatorSearchDAO {
-
-  protected $documentID;
-  protected $ngram;
-
-  abstract public function getIndexKey();
-
-  protected function getConfiguration() {
-    return array(
-      self::CONFIG_TIMESTAMPS => false,
-      self::CONFIG_COLUMN_SCHEMA => array(
-        'documentID' => 'uint32',
-        'ngram' => 'char3',
-      ),
-      self::CONFIG_KEY_SCHEMA => array(
-        'key_ngram' => array(
-          'columns' => array('ngram', 'documentID'),
-        ),
-        'key_object' => array(
-          'columns' => array('documentID'),
-        ),
-      ),
-    ) + parent::getConfiguration();
-  }
-
-  public function getTableName() {
-    $application = $this->getApplicationName();
-    $key = $this->getIndexKey();
-    return "{$application}_{$key}_fngrams";
-  }
-
-}
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 42e6ed7b4e..18e860ebb9 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -1623,8 +1623,7 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
     $engine = $this->ferretEngine;
     $stemmer = $engine->newStemmer();
 
-    $ngram_table = $engine->newNgramsObject();
-    $ngram_table_name = $ngram_table->getTableName();
+    $ngram_table = $engine->getNgramsTableName();
 
     $flat = array();
     foreach ($this->ferretTokens as $fulltext_token) {
@@ -1680,7 +1679,7 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
 
       foreach ($ngrams as $ngram) {
         $flat[] = array(
-          'table' => $ngram_table_name,
+          'table' => $ngram_table,
           'ngram' => $ngram,
         );
       }
@@ -1702,14 +1701,14 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
       $phid_column = qsprintf($conn, '%T', 'phid');
     }
 
-    $document_table = $engine->newDocumentObject();
-    $field_table = $engine->newFieldObject();
+    $document_table = $engine->getDocumentTableName();
+    $field_table = $engine->getFieldTableName();
 
     $joins = array();
     $joins[] = qsprintf(
       $conn,
       'JOIN %T ft_doc ON ft_doc.objectPHID = %Q',
-      $document_table->getTableName(),
+      $document_table,
       $phid_column);
 
     $idx = 1;
@@ -1736,7 +1735,7 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
         $conn,
         'JOIN %T %T ON ft_doc.id = %T.documentID
           AND %T.fieldKey = %s',
-        $field_table->getTableName(),
+        $field_table,
         $alias,
         $alias,
         $alias,

From c9152b586b64a2e9f552f6f5348126b64a9adce8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 12:02:53 -0700
Subject: [PATCH 134/865] Support Ferret engine in Owners

Summary: Ref T12819. Same deal as before, but smaller diffs after D18559.

Test Plan: Indexed and searched for packages.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18564
---
 .../20170907.ferret.10.owners.doc.sql          |  9 +++++++++
 .../20170907.ferret.11.owners.field.sql        |  8 ++++++++
 .../20170907.ferret.12.owners.ngrams.sql       |  5 +++++
 src/__phutil_library_map__.php                 |  5 ++++-
 .../PhabricatorOwnersPackageFerretEngine.php   | 18 ++++++++++++++++++
 .../PhabricatorOwnersPackageFulltextEngine.php |  0
 .../storage/PhabricatorOwnersPackage.php       |  9 +++++++++
 7 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20170907.ferret.10.owners.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.11.owners.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.12.owners.ngrams.sql
 create mode 100644 src/applications/owners/search/PhabricatorOwnersPackageFerretEngine.php
 rename src/applications/owners/{query => search}/PhabricatorOwnersPackageFulltextEngine.php (100%)

diff --git a/resources/sql/autopatches/20170907.ferret.10.owners.doc.sql b/resources/sql/autopatches/20170907.ferret.10.owners.doc.sql
new file mode 100644
index 0000000000..aaaa36623b
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.10.owners.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_owners.owners_package_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.11.owners.field.sql b/resources/sql/autopatches/20170907.ferret.11.owners.field.sql
new file mode 100644
index 0000000000..ebd72806f4
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.11.owners.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_owners.owners_package_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.12.owners.ngrams.sql b/resources/sql/autopatches/20170907.ferret.12.owners.ngrams.sql
new file mode 100644
index 0000000000..0f8c6865bf
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.12.owners.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_owners.owners_package_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1ffe418b5c..266993bfb7 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3317,7 +3317,8 @@
     'PhabricatorOwnersPackageDescriptionTransaction' => 'applications/owners/xaction/PhabricatorOwnersPackageDescriptionTransaction.php',
     'PhabricatorOwnersPackageDominionTransaction' => 'applications/owners/xaction/PhabricatorOwnersPackageDominionTransaction.php',
     'PhabricatorOwnersPackageEditEngine' => 'applications/owners/editor/PhabricatorOwnersPackageEditEngine.php',
-    'PhabricatorOwnersPackageFulltextEngine' => 'applications/owners/query/PhabricatorOwnersPackageFulltextEngine.php',
+    'PhabricatorOwnersPackageFerretEngine' => 'applications/owners/search/PhabricatorOwnersPackageFerretEngine.php',
+    'PhabricatorOwnersPackageFulltextEngine' => 'applications/owners/search/PhabricatorOwnersPackageFulltextEngine.php',
     'PhabricatorOwnersPackageFunctionDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageFunctionDatasource.php',
     'PhabricatorOwnersPackageNameNgrams' => 'applications/owners/storage/PhabricatorOwnersPackageNameNgrams.php',
     'PhabricatorOwnersPackageNameTransaction' => 'applications/owners/xaction/PhabricatorOwnersPackageNameTransaction.php',
@@ -8714,6 +8715,7 @@
       'PhabricatorDestructibleInterface',
       'PhabricatorConduitResultInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
       'PhabricatorNgramsInterface',
     ),
     'PhabricatorOwnersPackageAuditingTransaction' => 'PhabricatorOwnersPackageTransactionType',
@@ -8723,6 +8725,7 @@
     'PhabricatorOwnersPackageDescriptionTransaction' => 'PhabricatorOwnersPackageTransactionType',
     'PhabricatorOwnersPackageDominionTransaction' => 'PhabricatorOwnersPackageTransactionType',
     'PhabricatorOwnersPackageEditEngine' => 'PhabricatorEditEngine',
+    'PhabricatorOwnersPackageFerretEngine' => 'PhabricatorFerretEngine',
     'PhabricatorOwnersPackageFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhabricatorOwnersPackageFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorOwnersPackageNameNgrams' => 'PhabricatorSearchNgrams',
diff --git a/src/applications/owners/search/PhabricatorOwnersPackageFerretEngine.php b/src/applications/owners/search/PhabricatorOwnersPackageFerretEngine.php
new file mode 100644
index 0000000000..684fe10969
--- /dev/null
+++ b/src/applications/owners/search/PhabricatorOwnersPackageFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhabricatorOwnersPackageFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'owners';
+  }
+
+  public function getScopeName() {
+    return 'package';
+  }
+
+  public function newSearchEngine() {
+    return new PhabricatorOwnersPackageSearchEngine();
+  }
+
+}
diff --git a/src/applications/owners/query/PhabricatorOwnersPackageFulltextEngine.php b/src/applications/owners/search/PhabricatorOwnersPackageFulltextEngine.php
similarity index 100%
rename from src/applications/owners/query/PhabricatorOwnersPackageFulltextEngine.php
rename to src/applications/owners/search/PhabricatorOwnersPackageFulltextEngine.php
diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
index 5f7b4f28c1..a09137c4df 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
@@ -9,6 +9,7 @@ final class PhabricatorOwnersPackage
     PhabricatorDestructibleInterface,
     PhabricatorConduitResultInterface,
     PhabricatorFulltextInterface,
+    PhabricatorFerretInterface,
     PhabricatorNgramsInterface {
 
   protected $name;
@@ -615,6 +616,14 @@ public function newFulltextEngine() {
   }
 
 
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PhabricatorOwnersPackageFerretEngine();
+  }
+
+
 /* -(  PhabricatorNgramsInterface  )----------------------------------------- */
 
 

From b1703c8801f4448cf13666b3b8ef49674f791f9d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 12:14:05 -0700
Subject: [PATCH 135/865] Support Ferret engine in Phame

Summary: Ref T12819. Mostly straightforward, with a couple of minor query modernization things.

Test Plan: Indexed and searched for posts and blogs.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18565
---
 .../20170907.ferret.13.blog.doc.sql           |  9 +++++++
 .../20170907.ferret.14.blog.field.sql         |  8 ++++++
 .../20170907.ferret.15.blog.ngrams.sql        |  5 ++++
 .../20170907.ferret.16.post.doc.sql           |  9 +++++++
 .../20170907.ferret.17.post.field.sql         |  8 ++++++
 .../20170907.ferret.18.post.ngrams.sql        |  5 ++++
 src/__phutil_library_map__.php                |  6 +++++
 .../phame/query/PhameBlogQuery.php            | 12 ++++++---
 .../phame/query/PhamePostQuery.php            | 25 +++++++++++--------
 .../phame/search/PhameBlogFerretEngine.php    | 18 +++++++++++++
 .../phame/search/PhamePostFerretEngine.php    | 18 +++++++++++++
 src/applications/phame/storage/PhameBlog.php  | 11 +++++++-
 src/applications/phame/storage/PhamePost.php  | 11 +++++++-
 13 files changed, 129 insertions(+), 16 deletions(-)
 create mode 100644 resources/sql/autopatches/20170907.ferret.13.blog.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.14.blog.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.15.blog.ngrams.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.16.post.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.17.post.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.18.post.ngrams.sql
 create mode 100644 src/applications/phame/search/PhameBlogFerretEngine.php
 create mode 100644 src/applications/phame/search/PhamePostFerretEngine.php

diff --git a/resources/sql/autopatches/20170907.ferret.13.blog.doc.sql b/resources/sql/autopatches/20170907.ferret.13.blog.doc.sql
new file mode 100644
index 0000000000..d75232fae1
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.13.blog.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_phame.phame_blog_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.14.blog.field.sql b/resources/sql/autopatches/20170907.ferret.14.blog.field.sql
new file mode 100644
index 0000000000..9982914229
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.14.blog.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_phame.phame_blog_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.15.blog.ngrams.sql b/resources/sql/autopatches/20170907.ferret.15.blog.ngrams.sql
new file mode 100644
index 0000000000..b20bb8fcbb
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.15.blog.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_phame.phame_blog_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.16.post.doc.sql b/resources/sql/autopatches/20170907.ferret.16.post.doc.sql
new file mode 100644
index 0000000000..9f9155aa49
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.16.post.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_phame.phame_post_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.17.post.field.sql b/resources/sql/autopatches/20170907.ferret.17.post.field.sql
new file mode 100644
index 0000000000..26d729d05d
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.17.post.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_phame.phame_post_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.18.post.ngrams.sql b/resources/sql/autopatches/20170907.ferret.18.post.ngrams.sql
new file mode 100644
index 0000000000..18e534e948
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.18.post.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_phame.phame_post_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 266993bfb7..7a26123482 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4371,6 +4371,7 @@
     'PhameBlogEditEngine' => 'applications/phame/editor/PhameBlogEditEngine.php',
     'PhameBlogEditor' => 'applications/phame/editor/PhameBlogEditor.php',
     'PhameBlogFeedController' => 'applications/phame/controller/blog/PhameBlogFeedController.php',
+    'PhameBlogFerretEngine' => 'applications/phame/search/PhameBlogFerretEngine.php',
     'PhameBlogFullDomainTransaction' => 'applications/phame/xaction/PhameBlogFullDomainTransaction.php',
     'PhameBlogFulltextEngine' => 'applications/phame/search/PhameBlogFulltextEngine.php',
     'PhameBlogHeaderImageTransaction' => 'applications/phame/xaction/PhameBlogHeaderImageTransaction.php',
@@ -4411,6 +4412,7 @@
     'PhamePostEditController' => 'applications/phame/controller/post/PhamePostEditController.php',
     'PhamePostEditEngine' => 'applications/phame/editor/PhamePostEditEngine.php',
     'PhamePostEditor' => 'applications/phame/editor/PhamePostEditor.php',
+    'PhamePostFerretEngine' => 'applications/phame/search/PhamePostFerretEngine.php',
     'PhamePostFulltextEngine' => 'applications/phame/search/PhamePostFulltextEngine.php',
     'PhamePostHeaderImageTransaction' => 'applications/phame/xaction/PhamePostHeaderImageTransaction.php',
     'PhamePostHeaderPictureController' => 'applications/phame/controller/post/PhamePostHeaderPictureController.php',
@@ -9995,6 +9997,7 @@
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorConduitResultInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
     ),
     'PhameBlog404Controller' => 'PhameLiveController',
     'PhameBlogArchiveController' => 'PhameBlogController',
@@ -10007,6 +10010,7 @@
     'PhameBlogEditEngine' => 'PhabricatorEditEngine',
     'PhameBlogEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhameBlogFeedController' => 'PhameBlogController',
+    'PhameBlogFerretEngine' => 'PhabricatorFerretEngine',
     'PhameBlogFullDomainTransaction' => 'PhameBlogTransactionType',
     'PhameBlogFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhameBlogHeaderImageTransaction' => 'PhameBlogTransactionType',
@@ -10050,6 +10054,7 @@
       'PhabricatorTokenReceiverInterface',
       'PhabricatorConduitResultInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
     ),
     'PhamePostArchiveController' => 'PhamePostController',
     'PhamePostBlogTransaction' => 'PhamePostTransactionType',
@@ -10059,6 +10064,7 @@
     'PhamePostEditController' => 'PhamePostController',
     'PhamePostEditEngine' => 'PhabricatorEditEngine',
     'PhamePostEditor' => 'PhabricatorApplicationTransactionEditor',
+    'PhamePostFerretEngine' => 'PhabricatorFerretEngine',
     'PhamePostFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhamePostHeaderImageTransaction' => 'PhamePostTransactionType',
     'PhamePostHeaderPictureController' => 'PhamePostController',
diff --git a/src/applications/phame/query/PhameBlogQuery.php b/src/applications/phame/query/PhameBlogQuery.php
index bd34255bd0..b4018c78eb 100644
--- a/src/applications/phame/query/PhameBlogQuery.php
+++ b/src/applications/phame/query/PhameBlogQuery.php
@@ -55,28 +55,28 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->statuses !== null) {
       $where[] = qsprintf(
         $conn,
-        'status IN (%Ls)',
+        'b.status IN (%Ls)',
         $this->statuses);
     }
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
         $conn,
-        'id IN (%Ls)',
+        'b.id IN (%Ls)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
         $conn,
-        'phid IN (%Ls)',
+        'b.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->domain !== null) {
       $where[] = qsprintf(
         $conn,
-        'domain = %s',
+        'b.domain = %s',
         $this->domain);
     }
 
@@ -143,4 +143,8 @@ public function getQueryApplicationClass() {
     return null;
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'b';
+  }
+
 }
diff --git a/src/applications/phame/query/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php
index 357418cfb3..85ef470cea 100644
--- a/src/applications/phame/query/PhamePostQuery.php
+++ b/src/applications/phame/query/PhamePostQuery.php
@@ -106,45 +106,45 @@ protected function willFilterPage(array $posts) {
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
-    if ($this->ids) {
+    if ($this->ids !== null) {
       $where[] = qsprintf(
         $conn,
-        'id IN (%Ld)',
+        'p.id IN (%Ld)',
         $this->ids);
     }
 
-    if ($this->phids) {
+    if ($this->phids !== null) {
       $where[] = qsprintf(
         $conn,
-        'phid IN (%Ls)',
+        'p.phid IN (%Ls)',
         $this->phids);
     }
 
-    if ($this->bloggerPHIDs) {
+    if ($this->bloggerPHIDs !== null) {
       $where[] = qsprintf(
         $conn,
-        'bloggerPHID IN (%Ls)',
+        'p.bloggerPHID IN (%Ls)',
         $this->bloggerPHIDs);
     }
 
-    if ($this->visibility) {
+    if ($this->visibility !== null) {
       $where[] = qsprintf(
         $conn,
-        'visibility IN (%Ld)',
+        'p.visibility IN (%Ld)',
         $this->visibility);
     }
 
     if ($this->publishedAfter !== null) {
       $where[] = qsprintf(
         $conn,
-        'datePublished > %d',
+        'p.datePublished > %d',
         $this->publishedAfter);
     }
 
     if ($this->blogPHIDs !== null) {
       $where[] = qsprintf(
         $conn,
-        'blogPHID in (%Ls)',
+        'p.blogPHID in (%Ls)',
         $this->blogPHIDs);
     }
 
@@ -163,6 +163,7 @@ public function getBuiltinOrders() {
   public function getOrderableColumns() {
     return parent::getOrderableColumns() + array(
       'datePublished' => array(
+        'table' => $this->getPrimaryTableAlias(),
         'column' => 'datePublished',
         'type' => 'int',
         'reverse' => false,
@@ -186,4 +187,8 @@ public function getQueryApplicationClass() {
     return null;
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'p';
+  }
+
 }
diff --git a/src/applications/phame/search/PhameBlogFerretEngine.php b/src/applications/phame/search/PhameBlogFerretEngine.php
new file mode 100644
index 0000000000..76901f915c
--- /dev/null
+++ b/src/applications/phame/search/PhameBlogFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhameBlogFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'phame';
+  }
+
+  public function getScopeName() {
+    return 'blog';
+  }
+
+  public function newSearchEngine() {
+    return new PhameBlogSearchEngine();
+  }
+
+}
diff --git a/src/applications/phame/search/PhamePostFerretEngine.php b/src/applications/phame/search/PhamePostFerretEngine.php
new file mode 100644
index 0000000000..de8838b529
--- /dev/null
+++ b/src/applications/phame/search/PhamePostFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhamePostFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'phame';
+  }
+
+  public function getScopeName() {
+    return 'post';
+  }
+
+  public function newSearchEngine() {
+    return new PhamePostSearchEngine();
+  }
+
+}
diff --git a/src/applications/phame/storage/PhameBlog.php b/src/applications/phame/storage/PhameBlog.php
index b72fc4bcfe..fa2ac00454 100644
--- a/src/applications/phame/storage/PhameBlog.php
+++ b/src/applications/phame/storage/PhameBlog.php
@@ -10,7 +10,8 @@ final class PhameBlog extends PhameDAO
     PhabricatorDestructibleInterface,
     PhabricatorApplicationTransactionInterface,
     PhabricatorConduitResultInterface,
-    PhabricatorFulltextInterface {
+    PhabricatorFulltextInterface,
+    PhabricatorFerretInterface {
 
   const MARKUP_FIELD_DESCRIPTION = 'markup:description';
 
@@ -392,4 +393,12 @@ public function newFulltextEngine() {
     return new PhameBlogFulltextEngine();
   }
 
+
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PhameBlogFerretEngine();
+  }
+
 }
diff --git a/src/applications/phame/storage/PhamePost.php b/src/applications/phame/storage/PhamePost.php
index a9525e0be7..8380a18f4d 100644
--- a/src/applications/phame/storage/PhamePost.php
+++ b/src/applications/phame/storage/PhamePost.php
@@ -11,7 +11,8 @@ final class PhamePost extends PhameDAO
     PhabricatorDestructibleInterface,
     PhabricatorTokenReceiverInterface,
     PhabricatorConduitResultInterface,
-    PhabricatorFulltextInterface {
+    PhabricatorFulltextInterface,
+    PhabricatorFerretInterface {
 
   const MARKUP_FIELD_BODY    = 'markup:body';
   const MARKUP_FIELD_SUMMARY = 'markup:summary';
@@ -387,4 +388,12 @@ public function newFulltextEngine() {
     return new PhamePostFulltextEngine();
   }
 
+
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PhamePostFerretEngine();
+  }
+
 }

From 184f201ce29a1bc7bfd1b849ac11f91aec89edd7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 12:20:47 -0700
Subject: [PATCH 136/865] Support Ferret engine in Projects

Summary: Ref T12819. Adds support for projects.

Test Plan: Indexed and searched for projects.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18566
---
 .../20170907.ferret.19.project.doc.sql         |  9 +++++++++
 .../20170907.ferret.20.project.field.sql       |  8 ++++++++
 .../20170907.ferret.21.project.ngrams.sql      |  5 +++++
 src/__phutil_library_map__.php                 |  3 +++
 .../search/PhabricatorProjectFerretEngine.php  | 18 ++++++++++++++++++
 .../project/storage/PhabricatorProject.php     |  9 +++++++++
 6 files changed, 52 insertions(+)
 create mode 100644 resources/sql/autopatches/20170907.ferret.19.project.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.20.project.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.21.project.ngrams.sql
 create mode 100644 src/applications/project/search/PhabricatorProjectFerretEngine.php

diff --git a/resources/sql/autopatches/20170907.ferret.19.project.doc.sql b/resources/sql/autopatches/20170907.ferret.19.project.doc.sql
new file mode 100644
index 0000000000..26272439cf
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.19.project.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_project.project_project_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.20.project.field.sql b/resources/sql/autopatches/20170907.ferret.20.project.field.sql
new file mode 100644
index 0000000000..36514eb55d
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.20.project.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_project.project_project_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.21.project.ngrams.sql b/resources/sql/autopatches/20170907.ferret.21.project.ngrams.sql
new file mode 100644
index 0000000000..dec12b0e56
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.21.project.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_project.project_project_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7a26123482..2513480fa3 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3666,6 +3666,7 @@
     'PhabricatorProjectEditController' => 'applications/project/controller/PhabricatorProjectEditController.php',
     'PhabricatorProjectEditEngine' => 'applications/project/engine/PhabricatorProjectEditEngine.php',
     'PhabricatorProjectEditPictureController' => 'applications/project/controller/PhabricatorProjectEditPictureController.php',
+    'PhabricatorProjectFerretEngine' => 'applications/project/search/PhabricatorProjectFerretEngine.php',
     'PhabricatorProjectFilterTransaction' => 'applications/project/xaction/PhabricatorProjectFilterTransaction.php',
     'PhabricatorProjectFulltextEngine' => 'applications/project/search/PhabricatorProjectFulltextEngine.php',
     'PhabricatorProjectHeraldAction' => 'applications/project/herald/PhabricatorProjectHeraldAction.php',
@@ -9105,6 +9106,7 @@
       'PhabricatorCustomFieldInterface',
       'PhabricatorDestructibleInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
       'PhabricatorConduitResultInterface',
       'PhabricatorColumnProxyInterface',
     ),
@@ -9164,6 +9166,7 @@
     'PhabricatorProjectEditController' => 'PhabricatorProjectController',
     'PhabricatorProjectEditEngine' => 'PhabricatorEditEngine',
     'PhabricatorProjectEditPictureController' => 'PhabricatorProjectController',
+    'PhabricatorProjectFerretEngine' => 'PhabricatorFerretEngine',
     'PhabricatorProjectFilterTransaction' => 'PhabricatorProjectTransactionType',
     'PhabricatorProjectFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhabricatorProjectHeraldAction' => 'HeraldAction',
diff --git a/src/applications/project/search/PhabricatorProjectFerretEngine.php b/src/applications/project/search/PhabricatorProjectFerretEngine.php
new file mode 100644
index 0000000000..459fc24026
--- /dev/null
+++ b/src/applications/project/search/PhabricatorProjectFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhabricatorProjectFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'project';
+  }
+
+  public function getScopeName() {
+    return 'project';
+  }
+
+  public function newSearchEngine() {
+    return new PhabricatorProjectSearchEngine();
+  }
+
+}
diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
index e1258829ac..4ec4b63675 100644
--- a/src/applications/project/storage/PhabricatorProject.php
+++ b/src/applications/project/storage/PhabricatorProject.php
@@ -9,6 +9,7 @@ final class PhabricatorProject extends PhabricatorProjectDAO
     PhabricatorCustomFieldInterface,
     PhabricatorDestructibleInterface,
     PhabricatorFulltextInterface,
+    PhabricatorFerretInterface,
     PhabricatorConduitResultInterface,
     PhabricatorColumnProxyInterface {
 
@@ -729,6 +730,14 @@ public function newFulltextEngine() {
   }
 
 
+/* -(  PhabricatorFerretInterface  )--------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PhabricatorProjectFerretEngine();
+  }
+
+
 /* -(  PhabricatorConduitResultInterface  )---------------------------------- */
 
 

From a25bbc1dcab43c3a1cea4f59478e89bafc06f78c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 12:38:11 -0700
Subject: [PATCH 137/865] Support Ferret engine in Phriction

Summary: Ref T12819. Adds Ferret engine support.

Test Plan: Indexed and searched for documents.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18567
---
 .../20170907.ferret.22.phriction.doc.sql       |  9 +++++++++
 .../20170907.ferret.23.phriction.field.sql     |  8 ++++++++
 .../20170907.ferret.24.phriction.ngrams.sql    |  5 +++++
 src/__phutil_library_map__.php                 |  3 +++
 .../search/PhrictionDocumentFerretEngine.php   | 18 ++++++++++++++++++
 .../phriction/storage/PhrictionDocument.php    |  9 +++++++++
 6 files changed, 52 insertions(+)
 create mode 100644 resources/sql/autopatches/20170907.ferret.22.phriction.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.23.phriction.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.24.phriction.ngrams.sql
 create mode 100644 src/applications/phriction/search/PhrictionDocumentFerretEngine.php

diff --git a/resources/sql/autopatches/20170907.ferret.22.phriction.doc.sql b/resources/sql/autopatches/20170907.ferret.22.phriction.doc.sql
new file mode 100644
index 0000000000..9de7124255
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.22.phriction.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_phriction.phriction_document_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.23.phriction.field.sql b/resources/sql/autopatches/20170907.ferret.23.phriction.field.sql
new file mode 100644
index 0000000000..0fc5b959d1
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.23.phriction.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_phriction.phriction_document_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.24.phriction.ngrams.sql b/resources/sql/autopatches/20170907.ferret.24.phriction.ngrams.sql
new file mode 100644
index 0000000000..abbb90a1e4
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.24.phriction.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_phriction.phriction_document_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2513480fa3..c22e4314c0 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4694,6 +4694,7 @@
     'PhrictionDocumentContentTransaction' => 'applications/phriction/xaction/PhrictionDocumentContentTransaction.php',
     'PhrictionDocumentController' => 'applications/phriction/controller/PhrictionDocumentController.php',
     'PhrictionDocumentDeleteTransaction' => 'applications/phriction/xaction/PhrictionDocumentDeleteTransaction.php',
+    'PhrictionDocumentFerretEngine' => 'applications/phriction/search/PhrictionDocumentFerretEngine.php',
     'PhrictionDocumentFulltextEngine' => 'applications/phriction/search/PhrictionDocumentFulltextEngine.php',
     'PhrictionDocumentHeraldAdapter' => 'applications/phriction/herald/PhrictionDocumentHeraldAdapter.php',
     'PhrictionDocumentHeraldField' => 'applications/phriction/herald/PhrictionDocumentHeraldField.php',
@@ -10420,6 +10421,7 @@
       'PhabricatorTokenReceiverInterface',
       'PhabricatorDestructibleInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
       'PhabricatorProjectInterface',
       'PhabricatorApplicationTransactionInterface',
     ),
@@ -10428,6 +10430,7 @@
     'PhrictionDocumentContentTransaction' => 'PhrictionDocumentTransactionType',
     'PhrictionDocumentController' => 'PhrictionController',
     'PhrictionDocumentDeleteTransaction' => 'PhrictionDocumentTransactionType',
+    'PhrictionDocumentFerretEngine' => 'PhabricatorFerretEngine',
     'PhrictionDocumentFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhrictionDocumentHeraldAdapter' => 'HeraldAdapter',
     'PhrictionDocumentHeraldField' => 'HeraldField',
diff --git a/src/applications/phriction/search/PhrictionDocumentFerretEngine.php b/src/applications/phriction/search/PhrictionDocumentFerretEngine.php
new file mode 100644
index 0000000000..76802391e7
--- /dev/null
+++ b/src/applications/phriction/search/PhrictionDocumentFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhrictionDocumentFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'phriction';
+  }
+
+  public function getScopeName() {
+    return 'document';
+  }
+
+  public function newSearchEngine() {
+    return new PhrictionSearchEngine();
+  }
+
+}
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index b18f6bab9e..7a3e178882 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -8,6 +8,7 @@ final class PhrictionDocument extends PhrictionDAO
     PhabricatorTokenReceiverInterface,
     PhabricatorDestructibleInterface,
     PhabricatorFulltextInterface,
+    PhabricatorFerretInterface,
     PhabricatorProjectInterface,
     PhabricatorApplicationTransactionInterface {
 
@@ -255,4 +256,12 @@ public function newFulltextEngine() {
     return new PhrictionDocumentFulltextEngine();
   }
 
+
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PhrictionDocumentFerretEngine();
+  }
+
 }

From e0f3de9c6495b0f8f5ba37cd8ff69f86bb6d8e2a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 13:01:26 -0700
Subject: [PATCH 138/865] Support Ferret engine in Calendar

Summary: Ref T12819. Adds ferret engine support for Calendar events.

Test Plan: Indexed and queried calendar events.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18568
---
 .../20170907.ferret.25.event.doc.sql           |  9 +++++++++
 .../20170907.ferret.26.event.field.sql         |  8 ++++++++
 .../20170907.ferret.27.event.ngrams.sql        |  5 +++++
 src/__phutil_library_map__.php                 |  3 +++
 .../PhabricatorCalendarEventFerretEngine.php   | 18 ++++++++++++++++++
 .../storage/PhabricatorCalendarEvent.php       |  9 +++++++++
 6 files changed, 52 insertions(+)
 create mode 100644 resources/sql/autopatches/20170907.ferret.25.event.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.26.event.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.27.event.ngrams.sql
 create mode 100644 src/applications/calendar/search/PhabricatorCalendarEventFerretEngine.php

diff --git a/resources/sql/autopatches/20170907.ferret.25.event.doc.sql b/resources/sql/autopatches/20170907.ferret.25.event.doc.sql
new file mode 100644
index 0000000000..d7298fad31
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.25.event.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_calendar.calendar_event_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.26.event.field.sql b/resources/sql/autopatches/20170907.ferret.26.event.field.sql
new file mode 100644
index 0000000000..2ec76c3511
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.26.event.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_calendar.calendar_event_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.27.event.ngrams.sql b/resources/sql/autopatches/20170907.ferret.27.event.ngrams.sql
new file mode 100644
index 0000000000..e802e2d97e
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.27.event.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_calendar.calendar_event_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c22e4314c0..67bb9b73f3 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2208,6 +2208,7 @@
     'PhabricatorCalendarEventEmailCommand' => 'applications/calendar/command/PhabricatorCalendarEventEmailCommand.php',
     'PhabricatorCalendarEventEndDateTransaction' => 'applications/calendar/xaction/PhabricatorCalendarEventEndDateTransaction.php',
     'PhabricatorCalendarEventExportController' => 'applications/calendar/controller/PhabricatorCalendarEventExportController.php',
+    'PhabricatorCalendarEventFerretEngine' => 'applications/calendar/search/PhabricatorCalendarEventFerretEngine.php',
     'PhabricatorCalendarEventForkTransaction' => 'applications/calendar/xaction/PhabricatorCalendarEventForkTransaction.php',
     'PhabricatorCalendarEventFrequencyTransaction' => 'applications/calendar/xaction/PhabricatorCalendarEventFrequencyTransaction.php',
     'PhabricatorCalendarEventFulltextEngine' => 'applications/calendar/search/PhabricatorCalendarEventFulltextEngine.php',
@@ -7446,6 +7447,7 @@
       'PhabricatorFlaggableInterface',
       'PhabricatorSpacesInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
       'PhabricatorConduitResultInterface',
     ),
     'PhabricatorCalendarEventAcceptTransaction' => 'PhabricatorCalendarEventReplyTransaction',
@@ -7466,6 +7468,7 @@
     'PhabricatorCalendarEventEmailCommand' => 'MetaMTAEmailTransactionCommand',
     'PhabricatorCalendarEventEndDateTransaction' => 'PhabricatorCalendarEventDateTransaction',
     'PhabricatorCalendarEventExportController' => 'PhabricatorCalendarController',
+    'PhabricatorCalendarEventFerretEngine' => 'PhabricatorFerretEngine',
     'PhabricatorCalendarEventForkTransaction' => 'PhabricatorCalendarEventTransactionType',
     'PhabricatorCalendarEventFrequencyTransaction' => 'PhabricatorCalendarEventTransactionType',
     'PhabricatorCalendarEventFulltextEngine' => 'PhabricatorFulltextEngine',
diff --git a/src/applications/calendar/search/PhabricatorCalendarEventFerretEngine.php b/src/applications/calendar/search/PhabricatorCalendarEventFerretEngine.php
new file mode 100644
index 0000000000..70e456e034
--- /dev/null
+++ b/src/applications/calendar/search/PhabricatorCalendarEventFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhabricatorCalendarEventFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'calendar';
+  }
+
+  public function getScopeName() {
+    return 'event';
+  }
+
+  public function newSearchEngine() {
+    return new PhabricatorCalendarEventSearchEngine();
+  }
+
+}
diff --git a/src/applications/calendar/storage/PhabricatorCalendarEvent.php b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
index 3a09d2e021..501d02efa9 100644
--- a/src/applications/calendar/storage/PhabricatorCalendarEvent.php
+++ b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
@@ -15,6 +15,7 @@ final class PhabricatorCalendarEvent extends PhabricatorCalendarDAO
     PhabricatorFlaggableInterface,
     PhabricatorSpacesInterface,
     PhabricatorFulltextInterface,
+    PhabricatorFerretInterface,
     PhabricatorConduitResultInterface {
 
   protected $name;
@@ -1380,6 +1381,14 @@ public function newFulltextEngine() {
   }
 
 
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PhabricatorCalendarEventFerretEngine();
+  }
+
+
 /* -(  PhabricatorConduitResultInterface  )---------------------------------- */
 
 

From d8132db75b83da39a64d974a6e5f7eca450a81f8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 13:05:24 -0700
Subject: [PATCH 139/865] Support Ferret engine in Pholio

Summary: Ref T12819. Support for Pholio.

Test Plan: Indexed and searched mocks.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18569
---
 .../20170907.ferret.28.mock.doc.sql            |  9 +++++++++
 .../20170907.ferret.29.mock.field.sql          |  8 ++++++++
 .../20170907.ferret.30.mock.ngrams.sql         |  5 +++++
 src/__phutil_library_map__.php                 |  3 +++
 .../pholio/search/PholioMockFerretEngine.php   | 18 ++++++++++++++++++
 src/applications/pholio/storage/PholioMock.php | 10 +++++++++-
 6 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20170907.ferret.28.mock.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.29.mock.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.30.mock.ngrams.sql
 create mode 100644 src/applications/pholio/search/PholioMockFerretEngine.php

diff --git a/resources/sql/autopatches/20170907.ferret.28.mock.doc.sql b/resources/sql/autopatches/20170907.ferret.28.mock.doc.sql
new file mode 100644
index 0000000000..eb80ef3937
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.28.mock.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_pholio.pholio_mock_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.29.mock.field.sql b/resources/sql/autopatches/20170907.ferret.29.mock.field.sql
new file mode 100644
index 0000000000..0cb0e97d05
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.29.mock.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_pholio.pholio_mock_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.30.mock.ngrams.sql b/resources/sql/autopatches/20170907.ferret.30.mock.ngrams.sql
new file mode 100644
index 0000000000..e343ccf83b
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.30.mock.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_pholio.pholio_mock_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 67bb9b73f3..f42f815f1f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4475,6 +4475,7 @@
     'PholioMockEditController' => 'applications/pholio/controller/PholioMockEditController.php',
     'PholioMockEditor' => 'applications/pholio/editor/PholioMockEditor.php',
     'PholioMockEmbedView' => 'applications/pholio/view/PholioMockEmbedView.php',
+    'PholioMockFerretEngine' => 'applications/pholio/search/PholioMockFerretEngine.php',
     'PholioMockFulltextEngine' => 'applications/pholio/search/PholioMockFulltextEngine.php',
     'PholioMockHasTaskEdgeType' => 'applications/pholio/edge/PholioMockHasTaskEdgeType.php',
     'PholioMockHasTaskRelationship' => 'applications/pholio/relationships/PholioMockHasTaskRelationship.php',
@@ -10145,6 +10146,7 @@
       'PhabricatorSpacesInterface',
       'PhabricatorMentionableInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
     ),
     'PholioMockArchiveController' => 'PholioController',
     'PholioMockAuthorHeraldField' => 'PholioMockHeraldField',
@@ -10154,6 +10156,7 @@
     'PholioMockEditController' => 'PholioController',
     'PholioMockEditor' => 'PhabricatorApplicationTransactionEditor',
     'PholioMockEmbedView' => 'AphrontView',
+    'PholioMockFerretEngine' => 'PhabricatorFerretEngine',
     'PholioMockFulltextEngine' => 'PhabricatorFulltextEngine',
     'PholioMockHasTaskEdgeType' => 'PhabricatorEdgeType',
     'PholioMockHasTaskRelationship' => 'PholioMockRelationship',
diff --git a/src/applications/pholio/search/PholioMockFerretEngine.php b/src/applications/pholio/search/PholioMockFerretEngine.php
new file mode 100644
index 0000000000..f4f9b4610f
--- /dev/null
+++ b/src/applications/pholio/search/PholioMockFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PholioMockFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'pholio';
+  }
+
+  public function getScopeName() {
+    return 'mock';
+  }
+
+  public function newSearchEngine() {
+    return new PholioMockSearchEngine();
+  }
+
+}
diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php
index 7f58a95511..4aa9ef4055 100644
--- a/src/applications/pholio/storage/PholioMock.php
+++ b/src/applications/pholio/storage/PholioMock.php
@@ -12,7 +12,8 @@ final class PholioMock extends PholioDAO
     PhabricatorDestructibleInterface,
     PhabricatorSpacesInterface,
     PhabricatorMentionableInterface,
-    PhabricatorFulltextInterface {
+    PhabricatorFulltextInterface,
+    PhabricatorFerretInterface {
 
   const MARKUP_FIELD_DESCRIPTION  = 'markup:description';
 
@@ -320,4 +321,11 @@ public function newFulltextEngine() {
   }
 
 
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+  public function newFerretEngine() {
+    return new PholioMockFerretEngine();
+  }
+
+
 }

From b1b638bd14aeb798b74ff54a05322d7f54b027c3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 13:11:34 -0700
Subject: [PATCH 140/865] Support the Ferret engine in Diffusion

Summary: Ref T12819. More ferret engine support.

Test Plan: Indexed and searched commits and repositories.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18572
---
 .../20170907.ferret.31.repo.doc.sql            |  9 +++++++++
 .../20170907.ferret.32.repo.field.sql          |  8 ++++++++
 .../20170907.ferret.33.repo.ngrams.sql         |  5 +++++
 .../20170907.ferret.34.commit.doc.sql          |  9 +++++++++
 .../20170907.ferret.35.commit.field.sql        |  8 ++++++++
 .../20170907.ferret.36.commit.ngrams.sql       |  5 +++++
 src/__phutil_library_map__.php                 |  6 ++++++
 .../search/DiffusionCommitFerretEngine.php     | 18 ++++++++++++++++++
 .../PhabricatorRepositoryFerretEngine.php      | 18 ++++++++++++++++++
 .../storage/PhabricatorRepository.php          | 11 ++++++++++-
 .../storage/PhabricatorRepositoryCommit.php    |  9 +++++++++
 11 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20170907.ferret.31.repo.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.32.repo.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.33.repo.ngrams.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.34.commit.doc.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.35.commit.field.sql
 create mode 100644 resources/sql/autopatches/20170907.ferret.36.commit.ngrams.sql
 create mode 100644 src/applications/repository/search/DiffusionCommitFerretEngine.php
 create mode 100644 src/applications/repository/search/PhabricatorRepositoryFerretEngine.php

diff --git a/resources/sql/autopatches/20170907.ferret.31.repo.doc.sql b/resources/sql/autopatches/20170907.ferret.31.repo.doc.sql
new file mode 100644
index 0000000000..4f37de60be
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.31.repo.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_repository_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.32.repo.field.sql b/resources/sql/autopatches/20170907.ferret.32.repo.field.sql
new file mode 100644
index 0000000000..c7d75eb29d
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.32.repo.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_repository_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.33.repo.ngrams.sql b/resources/sql/autopatches/20170907.ferret.33.repo.ngrams.sql
new file mode 100644
index 0000000000..db7ad4f3a0
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.33.repo.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_repository_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.34.commit.doc.sql b/resources/sql/autopatches/20170907.ferret.34.commit.doc.sql
new file mode 100644
index 0000000000..9c275b09b7
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.34.commit.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_commit_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.35.commit.field.sql b/resources/sql/autopatches/20170907.ferret.35.commit.field.sql
new file mode 100644
index 0000000000..c2520b693b
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.35.commit.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_commit_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20170907.ferret.36.commit.ngrams.sql b/resources/sql/autopatches/20170907.ferret.36.commit.ngrams.sql
new file mode 100644
index 0000000000..32ed2275c3
--- /dev/null
+++ b/resources/sql/autopatches/20170907.ferret.36.commit.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_commit_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f42f815f1f..6c18759cb9 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -652,6 +652,7 @@
     'DiffusionCommitEditConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCommitEditConduitAPIMethod.php',
     'DiffusionCommitEditController' => 'applications/diffusion/controller/DiffusionCommitEditController.php',
     'DiffusionCommitEditEngine' => 'applications/diffusion/editor/DiffusionCommitEditEngine.php',
+    'DiffusionCommitFerretEngine' => 'applications/repository/search/DiffusionCommitFerretEngine.php',
     'DiffusionCommitFulltextEngine' => 'applications/repository/search/DiffusionCommitFulltextEngine.php',
     'DiffusionCommitHasPackageEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasPackageEdgeType.php',
     'DiffusionCommitHasRevisionEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php',
@@ -3807,6 +3808,7 @@
     'PhabricatorRepositoryDiscoveryEngine' => 'applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php',
     'PhabricatorRepositoryEditor' => 'applications/repository/editor/PhabricatorRepositoryEditor.php',
     'PhabricatorRepositoryEngine' => 'applications/repository/engine/PhabricatorRepositoryEngine.php',
+    'PhabricatorRepositoryFerretEngine' => 'applications/repository/search/PhabricatorRepositoryFerretEngine.php',
     'PhabricatorRepositoryFulltextEngine' => 'applications/repository/search/PhabricatorRepositoryFulltextEngine.php',
     'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php',
     'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php',
@@ -5673,6 +5675,7 @@
     'DiffusionCommitEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'DiffusionCommitEditController' => 'DiffusionController',
     'DiffusionCommitEditEngine' => 'PhabricatorEditEngine',
+    'DiffusionCommitFerretEngine' => 'PhabricatorFerretEngine',
     'DiffusionCommitFulltextEngine' => 'PhabricatorFulltextEngine',
     'DiffusionCommitHasPackageEdgeType' => 'PhabricatorEdgeType',
     'DiffusionCommitHasRevisionEdgeType' => 'PhabricatorEdgeType',
@@ -9308,6 +9311,7 @@
       'PhabricatorSpacesInterface',
       'PhabricatorConduitResultInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
     ),
     'PhabricatorRepositoryAuditRequest' => array(
       'PhabricatorRepositoryDAO',
@@ -9328,6 +9332,7 @@
       'PhabricatorCustomFieldInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
       'PhabricatorConduitResultInterface',
       'PhabricatorDraftInterface',
     ),
@@ -9350,6 +9355,7 @@
     'PhabricatorRepositoryDiscoveryEngine' => 'PhabricatorRepositoryEngine',
     'PhabricatorRepositoryEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorRepositoryEngine' => 'Phobject',
+    'PhabricatorRepositoryFerretEngine' => 'PhabricatorFerretEngine',
     'PhabricatorRepositoryFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
     'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
diff --git a/src/applications/repository/search/DiffusionCommitFerretEngine.php b/src/applications/repository/search/DiffusionCommitFerretEngine.php
new file mode 100644
index 0000000000..a6c5ce42c8
--- /dev/null
+++ b/src/applications/repository/search/DiffusionCommitFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class DiffusionCommitFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'repository';
+  }
+
+  public function getScopeName() {
+    return 'commit';
+  }
+
+  public function newSearchEngine() {
+    return new PhabricatorCommitSearchEngine();
+  }
+
+}
diff --git a/src/applications/repository/search/PhabricatorRepositoryFerretEngine.php b/src/applications/repository/search/PhabricatorRepositoryFerretEngine.php
new file mode 100644
index 0000000000..bb62fe9c63
--- /dev/null
+++ b/src/applications/repository/search/PhabricatorRepositoryFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhabricatorRepositoryFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'repository';
+  }
+
+  public function getScopeName() {
+    return 'repository';
+  }
+
+  public function newSearchEngine() {
+    return new PhabricatorRepositorySearchEngine();
+  }
+
+}
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index b660ff9aa7..09fb239bf0 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -16,7 +16,8 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
     PhabricatorProjectInterface,
     PhabricatorSpacesInterface,
     PhabricatorConduitResultInterface,
-    PhabricatorFulltextInterface {
+    PhabricatorFulltextInterface,
+    PhabricatorFerretInterface {
 
   /**
    * Shortest hash we'll recognize in raw "a829f32" form.
@@ -2633,4 +2634,12 @@ public function newFulltextEngine() {
     return new PhabricatorRepositoryFulltextEngine();
   }
 
+
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PhabricatorRepositoryFerretEngine();
+  }
+
 }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index c6ddece457..31a06dcbd4 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -15,6 +15,7 @@ final class PhabricatorRepositoryCommit
     PhabricatorCustomFieldInterface,
     PhabricatorApplicationTransactionInterface,
     PhabricatorFulltextInterface,
+    PhabricatorFerretInterface,
     PhabricatorConduitResultInterface,
     PhabricatorDraftInterface {
 
@@ -712,6 +713,14 @@ public function newFulltextEngine() {
   }
 
 
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new DiffusionCommitFerretEngine();
+  }
+
+
 /* -(  PhabricatorConduitResultInterface  )---------------------------------- */
 
   public function getFieldSpecificationsForConduit() {

From f9b109dc0d2ecb2927a42118e8d65122c702efe7 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 13:15:07 -0700
Subject: [PATCH 141/865] Fix info view error layout in config boxes

Summary: Adds some side margin here.

Test Plan: error out a form field in a white box

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18571
---
 resources/celerity/map.php               | 6 +++---
 webroot/rsrc/css/phui/phui-info-view.css | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index aef701f7bc..2093e3e70e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => 'b2235af0',
+    'core.pkg.css' => 'e9473020',
     'core.pkg.js' => '6c085267',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -162,7 +162,7 @@
     'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
     'rsrc/css/phui/phui-icon.css' => '5c4a5de6',
     'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
-    'rsrc/css/phui/phui-info-view.css' => '04e071d7',
+    'rsrc/css/phui/phui-info-view.css' => 'e929f98c',
     'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0',
     'rsrc/css/phui/phui-left-right.css' => '75227a4d',
     'rsrc/css/phui/phui-lightbox.css' => '0a035e40',
@@ -849,7 +849,7 @@
     'phui-icon-set-selector-css' => '87db8fee',
     'phui-icon-view-css' => '5c4a5de6',
     'phui-image-mask-css' => 'a8498f9c',
-    'phui-info-view-css' => '04e071d7',
+    'phui-info-view-css' => 'e929f98c',
     'phui-inline-comment-view-css' => '65ae3bc2',
     'phui-invisible-character-view-css' => '6993d9f0',
     'phui-left-right-css' => '75227a4d',
diff --git a/webroot/rsrc/css/phui/phui-info-view.css b/webroot/rsrc/css/phui/phui-info-view.css
index 7b20c63ccf..55400956e4 100644
--- a/webroot/rsrc/css/phui/phui-info-view.css
+++ b/webroot/rsrc/css/phui/phui-info-view.css
@@ -139,3 +139,7 @@ h1.phui-info-view-head {
 div.phui-object-box .phui-header-shell + .phui-info-view {
   margin: 16px 0 8px;
 }
+
+div.phui-object-box.phui-box-white-config .phui-header-shell + .phui-info-view {
+  margin: 20px 16px 8px;
+}

From f1193afa94bfeeebe8491b0e89a2b68d286c7f81 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 13:08:10 -0700
Subject: [PATCH 142/865] Update passphrase edit UI

Summary: Updates creating credentials

Test Plan: create some notes

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18570
---
 .../herald/controller/HeraldRuleController.php  |  2 --
 .../PassphraseCredentialCreateController.php    |  9 ++-------
 .../PassphraseCredentialEditController.php      | 17 +++--------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
index d338f6a57e..eaf352a0a7 100644
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -238,8 +238,6 @@ public function handleRequest(AphrontRequest $request) {
         ? pht('Edit Herald Rule: %s', $rule->getName())
         : pht('Create Herald Rule: %s', idx($content_type_map, $content_type));
 
-    $icon = $rule->getID() ? 'fa-pencil' : 'fa-plus-square';
-
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
diff --git a/src/applications/passphrase/controller/PassphraseCredentialCreateController.php b/src/applications/passphrase/controller/PassphraseCredentialCreateController.php
index 87afe22cc6..b237ef378b 100644
--- a/src/applications/passphrase/controller/PassphraseCredentialCreateController.php
+++ b/src/applications/passphrase/controller/PassphraseCredentialCreateController.php
@@ -52,17 +52,12 @@ public function handleRequest(AphrontRequest $request) {
     $crumbs->setBorder(true);
 
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Credential'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-plus-square');
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter($box);
 
     return $this->newPage()
diff --git a/src/applications/passphrase/controller/PassphraseCredentialEditController.php b/src/applications/passphrase/controller/PassphraseCredentialEditController.php
index a35bd3479e..91c8d93883 100644
--- a/src/applications/passphrase/controller/PassphraseCredentialEditController.php
+++ b/src/applications/passphrase/controller/PassphraseCredentialEditController.php
@@ -249,10 +249,6 @@ public function handleRequest(AphrontRequest $request) {
           ->setName('description')
           ->setLabel(pht('Description'))
           ->setValue($v_desc))
-      ->appendChild(
-        id(new AphrontFormMarkupControl())
-          ->setLabel(pht('Credential Type'))
-          ->setValue($type->getCredentialTypeName()))
       ->appendChild(
         id(new AphrontFormDividerControl()))
       ->appendControl(
@@ -322,10 +318,9 @@ public function handleRequest(AphrontRequest $request) {
     $crumbs->setBorder(true);
 
     if ($is_new) {
-      $title = pht('Create New Credential');
+      $title = pht('New Credential: %s', $type->getCredentialTypeName());
       $crumbs->addTextCrumb(pht('Create'));
       $cancel_uri = $this->getApplicationURI();
-      $header_icon = 'fa-plus-square';
     } else {
       $title = pht('Edit Credential: %s', $credential->getName());
       $crumbs->addTextCrumb(
@@ -333,7 +328,6 @@ public function handleRequest(AphrontRequest $request) {
         '/K'.$credential->getID());
       $crumbs->addTextCrumb(pht('Edit'));
       $cancel_uri = '/K'.$credential->getID();
-      $header_icon = 'fa-pencil';
     }
 
     if ($request->isAjax()) {
@@ -356,18 +350,13 @@ public function handleRequest(AphrontRequest $request) {
         ->addCancelButton($cancel_uri));
 
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Credential'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setValidationException($validation_exception)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon($header_icon);
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter(array(
         $box,
       ));

From 8e9f0496266a3d328507ad79ee4e34402ac171dd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 13:37:41 -0700
Subject: [PATCH 143/865] Provide "bin/storage analyze" and make "bin/storage
 upgrade" run analysis automatically

Summary:
Ref T12819. Normallly "ANALYZE TABLE" is like sprinkling magic pixie dust on the database and hoping it will make "good vibes" that cause it to go faster, but in at least some concrete cases with the ngrams tables there really was a key cardinality issue which ANALYZE TABLE corrected, fixing bogus query plans.

Add `bin/storage analyze` to analyze all tables, and make `bin/storage upgrade` run it after adjustment if `--no-adjust` is not specified, and make `bin/storage adjust` run it always.

This runs in a couple seconds and should never hurt anything, so it should be fine to sprinkle lots of pixie dust into the `bin/storage` workflow.

Test Plan: Ran `bin/storage analyze`. Ran `bin/storage upgrade`, saw analyze run. Totally felt great vibes and really aligned chakras on the database.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18573
---
 src/__phutil_library_map__.php                |  2 +
 ...icatorStorageManagementAnalyzeWorkflow.php | 19 ++++++
 .../PhabricatorStorageManagementWorkflow.php  | 58 +++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 src/infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 6c18759cb9..83714d4e13 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4088,6 +4088,7 @@
     'PhabricatorStorageFixtureScopeGuard' => 'infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php',
     'PhabricatorStorageManagementAPI' => 'infrastructure/storage/management/PhabricatorStorageManagementAPI.php',
     'PhabricatorStorageManagementAdjustWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementAdjustWorkflow.php',
+    'PhabricatorStorageManagementAnalyzeWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php',
     'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php',
     'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php',
     'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php',
@@ -9679,6 +9680,7 @@
     'PhabricatorStorageFixtureScopeGuard' => 'Phobject',
     'PhabricatorStorageManagementAPI' => 'Phobject',
     'PhabricatorStorageManagementAdjustWorkflow' => 'PhabricatorStorageManagementWorkflow',
+    'PhabricatorStorageManagementAnalyzeWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementDatabasesWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementDestroyWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementDumpWorkflow' => 'PhabricatorStorageManagementWorkflow',
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php
new file mode 100644
index 0000000000..54a4bf3d36
--- /dev/null
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php
@@ -0,0 +1,19 @@
+<?php
+
+final class PhabricatorStorageManagementAnalyzeWorkflow
+  extends PhabricatorStorageManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('analyze')
+      ->setExamples('**analyze**')
+      ->setSynopsis(
+        pht('Run "ANALYZE TABLE" on tables to improve performance.'));
+  }
+
+  public function didExecute(PhutilArgumentParser $args) {
+    $this->analyzeTables();
+    return 0;
+  }
+
+}
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
index 48d753781d..85d0c09c73 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
@@ -137,6 +137,15 @@ final protected function adjustSchemata(
 
     try {
       $err = $this->doAdjustSchemata($api, $unsafe);
+
+      // Analyze tables if we're not doing a dry run and adjustments are either
+      // all clear or have minor errors like surplus tables.
+      if (!$this->dryRun) {
+        $should_analyze = (($err == 0) || ($err == 2));
+        if ($should_analyze) {
+          $this->analyzeTables();
+        }
+      }
     } catch (Exception $ex) {
       $lock->unlock();
       throw $ex;
@@ -1163,4 +1172,53 @@ final protected function lock(PhabricatorStorageManagementAPI $api) {
       ->lock();
   }
 
+  final protected function analyzeTables() {
+    // Analyzing tables can sometimes have a significant effect on query
+    // performance, particularly for the fulltext ngrams tables. See T12819
+    // for some specific examples.
+
+    $api = $this->getSingleAPI();
+    $conn = $api->getConn(null);
+
+    $patches = $this->getPatches();
+    $databases = $api->getDatabaseList($patches, true);
+
+    $this->logInfo(
+      pht('ANALYZE'),
+      pht('Analyzing tables...'));
+
+    $targets = array();
+    foreach ($databases as $database) {
+      queryfx($conn, 'USE %C', $database);
+      $tables = queryfx_all($conn, 'SHOW TABLE STATUS');
+      foreach ($tables as $table) {
+        $table_name = $table['Name'];
+
+        $targets[] = array(
+          'database' => $database,
+          'table' => $table_name,
+        );
+      }
+    }
+
+    $bar = id(new PhutilConsoleProgressBar())
+      ->setTotal(count($targets));
+    foreach ($targets as $target) {
+      queryfx(
+        $conn,
+        'ANALYZE TABLE %T.%T',
+        $target['database'],
+        $target['table']);
+
+      $bar->update(1);
+    }
+    $bar->done();
+
+    $this->logOkay(
+      pht('ANALYZED'),
+      pht(
+        'Analyzed %d table(s).',
+        count($targets)));
+  }
+
 }

From a46a9ff165bd0254b31a7ede38b474e9f7897531 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 15:38:33 -0700
Subject: [PATCH 144/865] Update VCS password UI

Summary: Miss this with earlier pass, updates the VCS password page.

Test Plan: Try to set a vcs password

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18574
---
 .../diffusion/panel/DiffusionSetPasswordSettingsPanel.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
index a41f322a3d..ccfa0df4a4 100644
--- a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
+++ b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
@@ -233,7 +233,7 @@ public function processRequest(AphrontRequest $request) {
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form)
       ->setFormErrors($errors);
 
@@ -259,7 +259,7 @@ public function processRequest(AphrontRequest $request) {
 
     $remove_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Remove VCS Password'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($remove_form);
 
     $saved = null;

From 4cae4a3b767fb505c32efd7ab7d8c6c185c59b96 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 7 Sep 2017 14:52:38 -0700
Subject: [PATCH 145/865] Correct `bin/storage analyze` internal API for
 cluster environments

Summary:
Ref T12819. This worked right in a non-cluster environment, but `bin/storage upgrade` iterates over each master in a partitioned cluster environment.

Tweak the API so `bin/storage analyze` targets a single host but `bin/storage upgrade` can hit all the masters.

Test Plan: Will run `bin/storage upgrade` in production again. Ran `upgrade` and `analyze` locally, still work fine.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18576
---
 .../PhabricatorStorageManagementAnalyzeWorkflow.php        | 3 ++-
 .../workflow/PhabricatorStorageManagementWorkflow.php      | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php
index 54a4bf3d36..6fe3e60926 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementAnalyzeWorkflow.php
@@ -12,7 +12,8 @@ protected function didConstruct() {
   }
 
   public function didExecute(PhutilArgumentParser $args) {
-    $this->analyzeTables();
+    $api = $this->getSingleAPI();
+    $this->analyzeTables($api);
     return 0;
   }
 
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
index 85d0c09c73..a03ef41c4d 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
@@ -143,7 +143,7 @@ final protected function adjustSchemata(
       if (!$this->dryRun) {
         $should_analyze = (($err == 0) || ($err == 2));
         if ($should_analyze) {
-          $this->analyzeTables();
+          $this->analyzeTables($api);
         }
       }
     } catch (Exception $ex) {
@@ -1172,12 +1172,13 @@ final protected function lock(PhabricatorStorageManagementAPI $api) {
       ->lock();
   }
 
-  final protected function analyzeTables() {
+  final protected function analyzeTables(
+    PhabricatorStorageManagementAPI $api) {
+
     // Analyzing tables can sometimes have a significant effect on query
     // performance, particularly for the fulltext ngrams tables. See T12819
     // for some specific examples.
 
-    $api = $this->getSingleAPI();
     $conn = $api->getConn(null);
 
     $patches = $this->getPatches();

From 7ea6de6e9c9da3ce818ac65c78da8065b73e6d67 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 8 Sep 2017 08:06:16 -0700
Subject: [PATCH 146/865] Split Ferret engine strings for tokenization on any
 sequence of whitespace

Summary:
Ref T12819. Currently, strings are split only on spaces, but newlines (and, if they exist, tabs) should also split strings.

Without this, we can fail to get the proper term boundary tokens for words which begin at the start of a line or end at the end of a line.

Test Plan: Reindexed a document with "xyz\nabc", saw `"yz "` and `" ab"` term boundary tokens generate properly.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18579
---
 src/applications/search/ferret/PhabricatorFerretEngine.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index 219130c02c..3c8098c54f 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -75,7 +75,7 @@ public function newStemmer() {
 
   public function tokenizeString($value) {
     $value = trim($value, ' ');
-    $value = preg_split('/ +/', $value);
+    $value = preg_split('/\s+/u', $value);
     return $value;
   }
 

From d67cc8e5c59c435bca027ac3e5f377aeab23412d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 8 Sep 2017 08:13:08 -0700
Subject: [PATCH 147/865] Remove some redundant information from the Ferret
 engine index

Summary:
Ref T12819. The "full" field has all other fields, and the "core" field has "title" and "body". Due to the way the "full" and "core" fields were being built, the "core" field also got included in the "full" field, so the "full" field has two copies of the title, two copies of the body, and then one copy of everything else.

Put only one copy of each distinct thing in each "full" and "core". Also, simplify the logic a little bit so we build these virtual fields in a more consistent way.

Test Plan: Ran `bin/search index` and looked at the fields in the database, saw less redundant information.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18580
---
 .../PhabricatorFerretFulltextEngineExtension.php  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
index 4344fe1623..6903072345 100644
--- a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
@@ -66,9 +66,12 @@ public function indexFulltextObject(
           );
           break;
       }
-    }
 
-    $key_all = PhabricatorSearchDocumentFieldType::FIELD_ALL;
+      $virtual_fields[] = array(
+        PhabricatorSearchDocumentFieldType::FIELD_ALL,
+        $raw_corpus,
+      );
+    }
 
     $empty_template = array(
       'raw' => array(),
@@ -76,9 +79,7 @@ public function indexFulltextObject(
       'normal' => array(),
     );
 
-    $ferret_corpus_map = array(
-      $key_all => $empty_template,
-    );
+    $ferret_corpus_map = array();
 
     foreach ($virtual_fields as $field) {
       list($key, $raw_corpus) = $field;
@@ -98,10 +99,6 @@ public function indexFulltextObject(
       $ferret_corpus_map[$key]['raw'][] = $raw_corpus;
       $ferret_corpus_map[$key]['term'][] = $term_corpus;
       $ferret_corpus_map[$key]['normal'][] = $normal_corpus;
-
-      $ferret_corpus_map[$key_all]['raw'][] = $raw_corpus;
-      $ferret_corpus_map[$key_all]['term'][] = $term_corpus;
-      $ferret_corpus_map[$key_all]['normal'][] = $normal_corpus;
     }
 
     $ferret_fields = array();

From c662dda0f17d886fb864ecfde0e8b37b4fe090f8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 8 Sep 2017 09:03:32 -0700
Subject: [PATCH 148/865] When selecting Ferret ngrams, select term ngrams (not
 raw ngrams) for term search

Summary:
Ref T12819. For queries like `v0.2`, we would incorrectly search for ngrams including `0.2`, but this is only a substring ngram: the term corpus splits this into `v0` and `2`, so `0.2` is not in the ngrams table.

When executing term queries, search for term ngrams instead. This makes "v0.2" work properly again.

Test Plan: Searched for "v0.2", found a task with "v0.2" in the title.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18581
---
 .../query/policy/PhabricatorCursorPagedPolicyAwareQuery.php  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 18e860ebb9..0488ba6133 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -1666,12 +1666,13 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
       if ($is_substring) {
         $ngrams = $engine->getSubstringNgramsFromString($value);
       } else {
-        $ngrams = $engine->getTermNgramsFromString($value);
+        $terms_value = $engine->newTermsCorpus($value);
+        $ngrams = $engine->getTermNgramsFromString($terms_value);
 
         // If this is a stemmed term, only look for ngrams present in both the
         // unstemmed and stemmed variations.
         if ($is_stemmed) {
-          $stem_value = $stemmer->stemToken($value);
+          $stem_value = $stemmer->stemToken($terms_value);
           $stem_ngrams = $engine->getTermNgramsFromString($stem_value);
           $ngrams = array_intersect($ngrams, $stem_ngrams);
         }

From d15fb20fe6a9108f36970194b2f4b54803bde3f5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 11 Sep 2017 08:08:19 -0700
Subject: [PATCH 149/865] Support storage of Differential hunk data in Files

Summary:
Ref T12932. For long-lived installs, one of the largest tables tends to be the hunk data table. Although it doesn't grow tremendously fast, it's also well suited to storage in Files instead of the database (infrequent access, relatively large blobs of data, mostly one-at-a-time access), and earlier work anticipated eventually adding support for Files storage.

Make Files storage work, and provide `bin/differential migrate-hunk` to manually test/migrate hunks. This is currently the only way hunks get moved to file storage, but I expect to add a GC step which moves them to File storage after 30 days shortly.

The immediate motivation for this is to relieve storage pressure on db001/db002 so we have more headroom for deploying the Ferret engine and its larger indexes (see also T12819).

Test Plan:
  - Used `bin/differential migrate-hunk` to move a hunk to and from file storage, verified it survived intact.
  - Downloaded the actual stored file, sanity-checked it. Verified permissions.
  - Destroyed a diff with `bin/remove destroy`, saw the hunk and file storage destroyed.
  - Verified that going from file -> text destroys the old file properly with `migrate-hunk --trace ...`.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12932

Differential Revision: https://secure.phabricator.com/D18584
---
 src/__phutil_library_map__.php                |   4 +
 ...ricatorDifferentialMigrateHunkWorkflow.php |  86 ++++++++++++
 .../storage/DifferentialChangeset.php         |  28 +++-
 .../differential/storage/DifferentialDiff.php |   2 +-
 .../differential/storage/DifferentialHunk.php |  17 ++-
 .../storage/DifferentialModernHunk.php        | 125 ++++++++++++++++++
 6 files changed, 257 insertions(+), 5 deletions(-)
 create mode 100644 src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 83714d4e13..925dfc66c6 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2667,6 +2667,7 @@
     'PhabricatorDifferentialConfigOptions' => 'applications/differential/config/PhabricatorDifferentialConfigOptions.php',
     'PhabricatorDifferentialExtractWorkflow' => 'applications/differential/management/PhabricatorDifferentialExtractWorkflow.php',
     'PhabricatorDifferentialManagementWorkflow' => 'applications/differential/management/PhabricatorDifferentialManagementWorkflow.php',
+    'PhabricatorDifferentialMigrateHunkWorkflow' => 'applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php',
     'PhabricatorDifferentialRevisionTestDataGenerator' => 'applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php',
     'PhabricatorDiffusionApplication' => 'applications/diffusion/application/PhabricatorDiffusionApplication.php',
     'PhabricatorDiffusionBlameSetting' => 'applications/settings/setting/PhabricatorDiffusionBlameSetting.php',
@@ -5367,6 +5368,7 @@
     'DifferentialChangeset' => array(
       'DifferentialDAO',
       'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'DifferentialChangesetDetailView' => 'AphrontView',
     'DifferentialChangesetFileTreeSideNavBuilder' => 'Phobject',
@@ -5461,6 +5463,7 @@
     'DifferentialHunk' => array(
       'DifferentialDAO',
       'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'DifferentialHunkParser' => 'Phobject',
     'DifferentialHunkParserTestCase' => 'PhabricatorTestCase',
@@ -7999,6 +8002,7 @@
     'PhabricatorDifferentialConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorDifferentialExtractWorkflow' => 'PhabricatorDifferentialManagementWorkflow',
     'PhabricatorDifferentialManagementWorkflow' => 'PhabricatorManagementWorkflow',
+    'PhabricatorDifferentialMigrateHunkWorkflow' => 'PhabricatorDifferentialManagementWorkflow',
     'PhabricatorDifferentialRevisionTestDataGenerator' => 'PhabricatorTestDataGenerator',
     'PhabricatorDiffusionApplication' => 'PhabricatorApplication',
     'PhabricatorDiffusionBlameSetting' => 'PhabricatorInternalSetting',
diff --git a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
new file mode 100644
index 0000000000..9c0e0071e4
--- /dev/null
+++ b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
@@ -0,0 +1,86 @@
+<?php
+
+final class PhabricatorDifferentialMigrateHunkWorkflow
+  extends PhabricatorDifferentialManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('migrate-hunk')
+      ->setExamples('**migrate-hunk** --id __hunk__ --to __storage__')
+      ->setSynopsis(pht('Migrate storage engines for a hunk.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'id',
+            'param' => 'id',
+            'help' => pht('Hunk ID to migrate.'),
+          ),
+          array(
+            'name' => 'to',
+            'param' => 'storage',
+            'help' => pht('Storage engine to migrate to.'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $id = $args->getArg('id');
+    if (!$id) {
+      throw new PhutilArgumentUsageException(
+        pht('Specify a hunk to migrate with --id.'));
+    }
+
+    $storage = $args->getArg('to');
+    switch ($storage) {
+      case DifferentialModernHunk::DATATYPE_TEXT:
+      case DifferentialModernHunk::DATATYPE_FILE:
+        break;
+      default:
+        throw new PhutilArgumentUsageException(
+          pht('Specify a hunk storage engine with --to.'));
+    }
+
+    $hunk = $this->loadHunk($id);
+    $old_data = $hunk->getChanges();
+
+    switch ($storage) {
+      case DifferentialModernHunk::DATATYPE_TEXT:
+        $hunk->saveAsText();
+        $this->logOkay(
+          pht('TEXT'),
+          pht('Convereted hunk to text storage.'));
+        break;
+      case DifferentialModernHunk::DATATYPE_FILE:
+        $hunk->saveAsFile();
+        $this->logOkay(
+          pht('FILE'),
+          pht('Convereted hunk to file storage.'));
+        break;
+    }
+
+    $hunk = $this->loadHunk($id);
+    $new_data = $hunk->getChanges();
+
+    if ($old_data !== $new_data) {
+      throw new Exception(
+        pht(
+          'Integrity check failed: new file data differs fom old data!'));
+    }
+
+    return 0;
+  }
+
+  private function loadHunk($id) {
+    $hunk = id(new DifferentialModernHunk())->load($id);
+    if (!$hunk) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'No hunk exists with ID "%s".',
+          $id));
+    }
+
+    return $hunk;
+  }
+
+
+}
diff --git a/src/applications/differential/storage/DifferentialChangeset.php b/src/applications/differential/storage/DifferentialChangeset.php
index 9c718a8765..3656fe6507 100644
--- a/src/applications/differential/storage/DifferentialChangeset.php
+++ b/src/applications/differential/storage/DifferentialChangeset.php
@@ -1,7 +1,10 @@
 <?php
 
-final class DifferentialChangeset extends DifferentialDAO
-  implements PhabricatorPolicyInterface {
+final class DifferentialChangeset
+  extends DifferentialDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface {
 
   protected $diffID;
   protected $oldFile;
@@ -236,4 +239,25 @@ public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getDiff()->hasAutomaticCapability($capability, $viewer);
   }
 
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $this->openTransaction();
+
+      $hunks = id(new DifferentialModernHunk())->loadAllWhere(
+        'changesetID = %d',
+        $this->getID());
+      foreach ($hunks as $hunk) {
+        $engine->destroyObject($hunk);
+      }
+
+      $this->delete();
+
+    $this->saveTransaction();
+  }
+
+
 }
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
index 8976fdd8f0..f7e85cd835 100644
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -727,7 +727,7 @@ public function destroyObjectPermanently(
       $this->delete();
 
       foreach ($this->loadChangesets() as $changeset) {
-        $changeset->delete();
+        $engine->destroyObject($changeset);
       }
 
       $properties = id(new DifferentialDiffProperty())->loadAllWhere(
diff --git a/src/applications/differential/storage/DifferentialHunk.php b/src/applications/differential/storage/DifferentialHunk.php
index fcc7926590..a57d0035eb 100644
--- a/src/applications/differential/storage/DifferentialHunk.php
+++ b/src/applications/differential/storage/DifferentialHunk.php
@@ -1,7 +1,10 @@
 <?php
 
-abstract class DifferentialHunk extends DifferentialDAO
-  implements PhabricatorPolicyInterface {
+abstract class DifferentialHunk
+  extends DifferentialDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface {
 
   protected $changesetID;
   protected $oldOffset;
@@ -228,4 +231,14 @@ public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return $this->getChangeset()->hasAutomaticCapability($capability, $viewer);
   }
 
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $this->delete();
+  }
+
+
 }
diff --git a/src/applications/differential/storage/DifferentialModernHunk.php b/src/applications/differential/storage/DifferentialModernHunk.php
index 9f0242ce5f..6f63f680a1 100644
--- a/src/applications/differential/storage/DifferentialModernHunk.php
+++ b/src/applications/differential/storage/DifferentialModernHunk.php
@@ -15,6 +15,7 @@ final class DifferentialModernHunk extends DifferentialHunk {
 
   private $rawData;
   private $forcedEncoding;
+  private $fileData;
 
   public function getTableName() {
     return 'differential_hunk_modern';
@@ -87,6 +88,57 @@ public function save() {
     return parent::save();
   }
 
+  public function saveAsText() {
+    $old_type = $this->getDataType();
+    $old_data = $this->getData();
+
+    if ($old_type == self::DATATYPE_TEXT) {
+      return $this;
+    }
+
+    $raw_data = $this->getRawData();
+
+    $this->setDataType(self::DATATYPE_TEXT);
+    $this->setData($raw_data);
+
+    $result = $this->save();
+
+    $this->destroyData($old_type, $old_data);
+
+    return $result;
+  }
+
+  public function saveAsFile() {
+    $old_type = $this->getDataType();
+    $old_data = $this->getData();
+
+    if ($old_type == self::DATATYPE_FILE) {
+      return $this;
+    }
+
+    $raw_data = $this->getRawData();
+
+    $file = PhabricatorFile::newFromFileData(
+      $raw_data,
+      array(
+        'name' => 'differential-hunk',
+        'mime-type' => 'application/octet-stream',
+        'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+      ));
+
+    $this->setDataType(self::DATATYPE_FILE);
+    $this->setData($file->getPHID());
+
+    // NOTE: Because hunks don't have a PHID and we just load hunk data with
+    // the ominipotent viewer, we do not need to attach the file to anything.
+
+    $result = $this->save();
+
+    $this->destroyData($old_type, $old_data);
+
+    return $result;
+  }
+
   private function getRawData() {
     if ($this->rawData === null) {
       $type = $this->getDataType();
@@ -98,6 +150,8 @@ private function getRawData() {
           $data = $data;
           break;
         case self::DATATYPE_FILE:
+          $data = $this->loadFileData();
+          break;
         default:
           throw new Exception(
             pht('Hunk has unsupported data type "%s"!', $type));
@@ -123,4 +177,75 @@ private function getRawData() {
     return $this->rawData;
   }
 
+  private function loadFileData() {
+    if ($this->fileData === null) {
+      $type = $this->getDataType();
+      if ($type !== self::DATATYPE_FILE) {
+        throw new Exception(
+          pht(
+            'Unable to load file data for hunk with wrong data type ("%s").',
+            $type));
+      }
+
+      $file_phid = $this->getData();
+
+      $file = $this->loadRawFile($file_phid);
+      $data = $file->loadFileData();
+
+      $this->fileData = $data;
+    }
+
+    return $this->fileData;
+  }
+
+  private function loadRawFile($file_phid) {
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+
+    $files = id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($file_phid))
+      ->execute();
+    if (!$files) {
+      throw new Exception(
+        pht(
+          'Failed to load file ("%s") with hunk data.',
+          $file_phid));
+    }
+
+    $file = head($files);
+
+    return $file;
+  }
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+
+    $type = $this->getDataType();
+    $data = $this->getData();
+
+    $this->destroyData($type, $data, $engine);
+
+    return parent::destroyObjectPermanently($engine);
+  }
+
+
+  private function destroyData(
+    $type,
+    $data,
+    PhabricatorDestructionEngine $engine = null) {
+
+    if (!$engine) {
+      $engine = new PhabricatorDestructionEngine();
+    }
+
+    switch ($type) {
+      case self::DATATYPE_FILE:
+        $file = $this->loadRawFile($data);
+        $engine->destroyObject($file);
+        break;
+    }
+  }
+
 }

From 495ab7363b5bfbf92da3e66acd4edb580bdbb714 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 11 Sep 2017 16:14:10 -0700
Subject: [PATCH 150/865] Remove "Contains Words" constraint from Maniphest

Summary:
Ref T12819. Obsoleted by the Ferret engine, which is unprototyping shortly.

This breaks compatibility in two ways:

  - `maniphest.query` no longer supports "fullText" (now throws an explicit exception).
  - Existing saved searches with a "Contains Words" constraint will no longer have that constraint.

It seems unlikely (?) that either of these are seeing too much use, and they should be easy to fix. I'll note them in the changelog.

Test Plan: Viewed Maniphest, no more "Contains Words" field. Called `maniphest.query` with "fullText", got explicit exception.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18586
---
 .../ManiphestQueryConduitAPIMethod.php        |  5 ++-
 .../maniphest/query/ManiphestTaskQuery.php    | 38 -------------------
 .../query/ManiphestTaskSearchEngine.php       |  8 ----
 3 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/src/applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php b/src/applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php
index 45373d2587..7ddf3b03eb 100644
--- a/src/applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php
+++ b/src/applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php
@@ -102,7 +102,10 @@ protected function execute(ConduitAPIRequest $request) {
 
     $full_text = $request->getValue('fullText');
     if ($full_text) {
-      $query->withFullTextSearch($full_text);
+      throw new Exception(
+        pht(
+          'Parameter "fullText" is no longer supported. Use method '.
+          '"maniphest.search" with the "query" constraint instead.'));
     }
 
     $status = $request->getValue('status');
diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php
index f009e5c2ef..cfc69722d8 100644
--- a/src/applications/maniphest/query/ManiphestTaskQuery.php
+++ b/src/applications/maniphest/query/ManiphestTaskQuery.php
@@ -24,8 +24,6 @@ final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery {
   private $subtaskIDs;
   private $subtypes;
 
-  private $fullTextSearch   = '';
-
   private $status           = 'status-any';
   const STATUS_ANY          = 'status-any';
   const STATUS_OPEN         = 'status-open';
@@ -115,11 +113,6 @@ public function withSubscribers(array $subscribers) {
     return $this;
   }
 
-  public function withFullTextSearch($fulltext_search) {
-    $this->fullTextSearch = $fulltext_search;
-    return $this;
-  }
-
   public function setGroupBy($group) {
     $this->groupBy = $group;
 
@@ -329,7 +322,6 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
 
     $where[] = $this->buildStatusWhereClause($conn);
     $where[] = $this->buildOwnerWhereClause($conn);
-    $where[] = $this->buildFullTextWhereClause($conn);
 
     if ($this->taskIDs !== null) {
       $where[] = qsprintf(
@@ -481,36 +473,6 @@ private function buildOwnerWhereClause(AphrontDatabaseConnection $conn) {
     return '('.implode(') OR (', $subclause).')';
   }
 
-  private function buildFullTextWhereClause(AphrontDatabaseConnection $conn) {
-    if (!strlen($this->fullTextSearch)) {
-      return null;
-    }
-
-    // In doing a fulltext search, we first find all the PHIDs that match the
-    // fulltext search, and then use that to limit the rest of the search
-    $fulltext_query = id(new PhabricatorSavedQuery())
-      ->setEngineClassName('PhabricatorSearchApplicationSearchEngine')
-      ->setParameter('query', $this->fullTextSearch);
-
-    // NOTE: Setting this to something larger than 10,000 will raise errors in
-    // Elasticsearch, and billions of results won't fit in memory anyway.
-    $fulltext_query->setParameter('limit', 10000);
-    $fulltext_query->setParameter('types',
-      array(ManiphestTaskPHIDType::TYPECONST));
-
-    $fulltext_results = PhabricatorSearchService::executeSearch(
-      $fulltext_query);
-
-    if (empty($fulltext_results)) {
-      $fulltext_results = array(null);
-    }
-
-    return qsprintf(
-      $conn,
-      'task.phid IN (%Ls)',
-      $fulltext_results);
-  }
-
   protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
     $open_statuses = ManiphestTaskStatus::getOpenStatusConstants();
     $edge_table = PhabricatorEdgeConfig::TABLE_NAME_EDGE;
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index 150ec81def..ec1956bd8e 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -86,9 +86,6 @@ protected function buildCustomSearchFields() {
           pht('Search for tasks with given subtypes.'))
         ->setDatasource(new ManiphestTaskSubtypeDatasource())
         ->setIsHidden($hide_subtypes),
-      id(new PhabricatorSearchTextField())
-        ->setLabel(pht('Contains Words'))
-        ->setKey('fulltext'),
       id(new PhabricatorSearchThreeStateField())
         ->setLabel(pht('Open Parents'))
         ->setKey('hasParents')
@@ -144,7 +141,6 @@ protected function getDefaultFieldOrder() {
       'statuses',
       'priorities',
       'subtypes',
-      'fulltext',
       'hasParents',
       'hasSubtasks',
       'parentIDs',
@@ -220,10 +216,6 @@ protected function buildQueryFromParameters(array $map) {
       $query->withOpenSubtasks($map['hasSubtasks']);
     }
 
-    if (strlen($map['fulltext'])) {
-      $query->withFullTextSearch($map['fulltext']);
-    }
-
     if ($map['parentIDs']) {
       $query->withParentTaskIDs($map['parentIDs']);
     }

From 6edf98eb3b8a30f9805f50775394d1eb57733dae Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 11 Sep 2017 16:22:39 -0700
Subject: [PATCH 151/865] Unprototype the Ferret UI fields

Summary:
Ref T12819. Show the new Ferret engine fields (and enable the indexer) unconditionally.

Also pull them to the top since they're fairly general-purpose and appear more broadly now, and also they actually work correctly (WOW).

Some redundant fields (like "Name Contains" in Repositories and Owners) could probably be removed now, I may clean those up in a followup.

Test Plan: Browsed around, saw Ferret fields in UI without "(Prototype)" suffix.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18587
---
 .../search/engine/PhabricatorApplicationSearchEngine.php      | 3 +++
 .../PhabricatorFerretSearchEngineExtension.php                | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index 6122e66e23..f4c460ce34 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -324,6 +324,9 @@ private function adjustFieldsForDisplay(array $field_map) {
 
     $result = $head + $body + $tail;
 
+    // Force the fulltext "query" field to the top unconditionally.
+    $result = array_select_keys($result, array('query')) + $result;
+
     foreach ($this->getHiddenFields() as $hidden_key) {
       unset($result[$hidden_key]);
     }
diff --git a/src/applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php b/src/applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php
index 02aadf7336..65822b0a32 100644
--- a/src/applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorFerretSearchEngineExtension.php
@@ -6,7 +6,7 @@ final class PhabricatorFerretSearchEngineExtension
   const EXTENSIONKEY = 'ferret';
 
   public function isExtensionEnabled() {
-    return PhabricatorEnv::getEnvConfig('phabricator.show-prototypes');
+    return true;
   }
 
   public function getExtensionName() {
@@ -56,7 +56,7 @@ public function getSearchFields($object) {
 
     $fields[] = id(new PhabricatorSearchTextField())
       ->setKey('query')
-      ->setLabel(pht('Query (Prototype)'))
+      ->setLabel(pht('Query'))
       ->setDescription(pht('Fulltext search.'));
 
     return $fields;

From dd3f05ec2503cd92deb005639209b4b55c927b10 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 11 Sep 2017 16:30:35 -0700
Subject: [PATCH 152/865] Remove "Name Contains" query constraint from
 Diffusion for Repositories

Summary:
Ref T12819. Obsoleted by the Ferret engine "Query" field.

This is a compatibility break, I'll note it in the changelog.

Test Plan: Searched for repositories by name with "Query" instead of "Name Contains".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18588
---
 .../repository/query/PhabricatorRepositoryQuery.php | 13 -------------
 .../query/PhabricatorRepositorySearchEngine.php     |  7 -------
 2 files changed, 20 deletions(-)

diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php
index 85b2ea0f0d..ffa9fa1b59 100644
--- a/src/applications/repository/query/PhabricatorRepositoryQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php
@@ -8,7 +8,6 @@ final class PhabricatorRepositoryQuery
   private $callsigns;
   private $types;
   private $uuids;
-  private $nameContains;
   private $uris;
   private $datasourceQuery;
   private $slugs;
@@ -116,11 +115,6 @@ public function withUUIDs(array $uuids) {
     return $this;
   }
 
-  public function withNameContains($contains) {
-    $this->nameContains = $contains;
-    return $this;
-  }
-
   public function withURIs(array $uris) {
     $this->uris = $uris;
     return $this;
@@ -661,13 +655,6 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->uuids);
     }
 
-    if (strlen($this->nameContains)) {
-      $where[] = qsprintf(
-        $conn,
-        'r.name LIKE %~',
-        $this->nameContains);
-    }
-
     if (strlen($this->datasourceQuery)) {
       // This handles having "rP" match callsigns starting with "P...".
       $query = trim($this->datasourceQuery);
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
index f321a112d9..5cd88183e1 100644
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -24,9 +24,6 @@ protected function buildCustomSearchFields() {
       id(new PhabricatorSearchStringListField())
         ->setLabel(pht('Callsigns'))
         ->setKey('callsigns'),
-      id(new PhabricatorSearchTextField())
-        ->setLabel(pht('Name Contains'))
-        ->setKey('name'),
       id(new PhabricatorSearchSelectField())
         ->setLabel(pht('Status'))
         ->setKey('status')
@@ -72,10 +69,6 @@ protected function buildQueryFromParameters(array $map) {
       $query->withTypes($map['types']);
     }
 
-    if (strlen($map['name'])) {
-      $query->withNameContains($map['name']);
-    }
-
     if ($map['uris']) {
       $query->withURIs($map['uris']);
     }

From 39b74572e6f73cee600c1af71f104aec90577a0c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 11 Sep 2017 16:35:09 -0700
Subject: [PATCH 153/865] Return fulltext tokens from the Ferret fulltext
 engine

Summary:
Ref T12819. These render the little "Searched For: X, Y, U V" hint about how something was parsed.

(This might get a "substring" color or "title only" color or something in the future.)

Test Plan: {F5178807}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18589
---
 .../PhabricatorFerretFulltextStorageEngine.php        |  4 ++++
 .../policy/PhabricatorCursorPagedPolicyAwareQuery.php | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
index 74e8771de7..b3618db5ff 100644
--- a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
+++ b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
@@ -86,6 +86,10 @@ public function executeSearch(PhabricatorSavedQuery $query) {
       $type_results[$type] = $results;
 
       $metadata += $engine_query->getFerretMetadata();
+
+      if (!$this->fulltextTokens) {
+        $this->fulltextTokens = $engine_query->getFerretTokens();
+      }
     }
 
     $list = array();
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 0488ba6133..5cacd66d06 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -1469,6 +1469,17 @@ public function withFerretQuery(
     return $this;
   }
 
+  public function getFerretTokens() {
+    if (!$this->supportsFerretEngine()) {
+      throw new Exception(
+        pht(
+          'Query ("%s") does not support the Ferret fulltext engine.',
+          get_class($this)));
+    }
+
+    return $this->ferretTokens;
+  }
+
   public function withFerretConstraint(
     PhabricatorFerretEngine $engine,
     array $fulltext_tokens) {

From da0a08a7e13e01d5e34bb0a12706a7b4f9e348d6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 11 Sep 2017 16:40:52 -0700
Subject: [PATCH 154/865] Make "mysql" mean "Ferret engine" in Fulltext search

Summary: Ref T12819. Swaps constants so existing configurations that use a "mysql" engine now use the Ferret engine, not an InnoDB/MyISAM FULLTEXT engine.

Test Plan: Swapped my local config back to "mysql" (the default), saw Ferret engine results in the UI.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18590
---
 src/__phutil_library_map__.php                |   2 -
 ...PhabricatorFerretFulltextStorageEngine.php |   2 +-
 .../PhabricatorMySQLFulltextStorageEngine.php | 504 ------------------
 3 files changed, 1 insertion(+), 507 deletions(-)
 delete mode 100644 src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 925dfc66c6..97f5b480a4 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3197,7 +3197,6 @@
     'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/PhabricatorMustVerifyEmailController.php',
     'PhabricatorMySQLConfigOptions' => 'applications/config/option/PhabricatorMySQLConfigOptions.php',
     'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/PhabricatorMySQLFileStorageEngine.php',
-    'PhabricatorMySQLFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php',
     'PhabricatorMySQLSearchHost' => 'infrastructure/cluster/search/PhabricatorMySQLSearchHost.php',
     'PhabricatorMySQLSetupCheck' => 'applications/config/check/PhabricatorMySQLSetupCheck.php',
     'PhabricatorNamedQuery' => 'applications/search/storage/PhabricatorNamedQuery.php',
@@ -8588,7 +8587,6 @@
     'PhabricatorMustVerifyEmailController' => 'PhabricatorAuthController',
     'PhabricatorMySQLConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorMySQLFileStorageEngine' => 'PhabricatorFileStorageEngine',
-    'PhabricatorMySQLFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine',
     'PhabricatorMySQLSearchHost' => 'PhabricatorSearchHost',
     'PhabricatorMySQLSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorNamedQuery' => array(
diff --git a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
index b3618db5ff..a7d9570c57 100644
--- a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
+++ b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
@@ -7,7 +7,7 @@ final class PhabricatorFerretFulltextStorageEngine
   private $engineLimits;
 
   public function getEngineIdentifier() {
-    return 'ferret';
+    return 'mysql';
   }
 
   public function getHostType() {
diff --git a/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
deleted file mode 100644
index c2e38d2db7..0000000000
--- a/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-
-final class PhabricatorMySQLFulltextStorageEngine
-  extends PhabricatorFulltextStorageEngine {
-
-  private $fulltextTokens = array();
-  private $engineLimits;
-
-  public function getEngineIdentifier() {
-    return 'mysql';
-  }
-
-  public function getHostType() {
-    return new PhabricatorMySQLSearchHost($this);
-  }
-
-  public function reindexAbstractDocument(
-    PhabricatorSearchAbstractDocument $doc) {
-
-    $phid = $doc->getPHID();
-    if (!$phid) {
-      throw new Exception(pht('Document has no PHID!'));
-    }
-
-    $store = new PhabricatorSearchDocument();
-    $store->setPHID($doc->getPHID());
-    $store->setDocumentType($doc->getDocumentType());
-    $store->setDocumentTitle($doc->getDocumentTitle());
-    $store->setDocumentCreated($doc->getDocumentCreated());
-    $store->setDocumentModified($doc->getDocumentModified());
-    $store->replace();
-
-    $conn_w = $store->establishConnection('w');
-
-    $stemmer = new PhutilSearchStemmer();
-
-    $field_dao = new PhabricatorSearchDocumentField();
-    queryfx(
-      $conn_w,
-      'DELETE FROM %T WHERE phid = %s',
-      $field_dao->getTableName(),
-      $phid);
-    foreach ($doc->getFieldData() as $field) {
-      list($ftype, $corpus, $aux_phid) = $field;
-
-      $stemmed_corpus = $stemmer->stemCorpus($corpus);
-
-      queryfx(
-        $conn_w,
-        'INSERT INTO %T
-          (phid, phidType, field, auxPHID, corpus, stemmedCorpus) '.
-        'VALUES (%s, %s, %s, %ns, %s, %s)',
-        $field_dao->getTableName(),
-        $phid,
-        $doc->getDocumentType(),
-        $ftype,
-        $aux_phid,
-        $corpus,
-        $stemmed_corpus);
-    }
-
-
-    $sql = array();
-    foreach ($doc->getRelationshipData() as $relationship) {
-      list($rtype, $to_phid, $to_type, $time) = $relationship;
-      $sql[] = qsprintf(
-        $conn_w,
-        '(%s, %s, %s, %s, %d)',
-        $phid,
-        $to_phid,
-        $rtype,
-        $to_type,
-        $time);
-    }
-
-    $rship_dao = new PhabricatorSearchDocumentRelationship();
-    queryfx(
-      $conn_w,
-      'DELETE FROM %T WHERE phid = %s',
-      $rship_dao->getTableName(),
-      $phid);
-    if ($sql) {
-      queryfx(
-        $conn_w,
-        'INSERT INTO %T '.
-        '(phid, relatedPHID, relation, relatedType, relatedTime) '.
-        'VALUES %Q',
-        $rship_dao->getTableName(),
-        implode(', ', $sql));
-    }
-
-  }
-
-  public function executeSearch(PhabricatorSavedQuery $query) {
-    $table = new PhabricatorSearchDocument();
-    $document_table = $table->getTableName();
-    $conn = $table->establishConnection('r');
-
-    $subquery = $this->newFulltextSubquery($query, $conn);
-
-    $offset = (int)$query->getParameter('offset', 0);
-    $limit  = (int)$query->getParameter('limit', 25);
-
-    // NOTE: We must JOIN the subquery in order to apply a limit.
-    $results = queryfx_all(
-      $conn,
-      'SELECT
-        documentPHID,
-        MAX(fieldScore) AS documentScore
-        FROM (%Q) query
-        JOIN %T root ON query.documentPHID = root.phid
-        GROUP BY documentPHID
-        ORDER BY documentScore DESC
-        LIMIT %d, %d',
-      $subquery,
-      $document_table,
-      $offset,
-      $limit);
-
-    return ipull($results, 'documentPHID');
-  }
-
-  private function newFulltextSubquery(
-    PhabricatorSavedQuery $query,
-    AphrontDatabaseConnection $conn) {
-
-    $field = new PhabricatorSearchDocumentField();
-    $field_table = $field->getTableName();
-
-    $document = new PhabricatorSearchDocument();
-    $document_table = $document->getTableName();
-
-    $select = array();
-    $select[] = 'document.phid AS documentPHID';
-
-    $join = array();
-    $where = array();
-
-    $title_field = PhabricatorSearchDocumentFieldType::FIELD_TITLE;
-    $title_boost = 1024;
-
-    $stemmer = new PhutilSearchStemmer();
-
-    $raw_query = $query->getParameter('query');
-    $raw_query = trim($raw_query);
-    if (strlen($raw_query)) {
-      $compiler = PhabricatorSearchDocument::newQueryCompiler()
-        ->setStemmer($stemmer);
-
-      $tokens = $compiler->newTokens($raw_query);
-
-      list($min_length, $stopword_list) = $this->getEngineLimits($conn);
-
-      // Process all the parts of the user's query so we can show them which
-      // parts we searched for and which ones we ignored.
-      $fulltext_tokens = array();
-      foreach ($tokens as $key => $token) {
-        $fulltext_token = id(new PhabricatorFulltextToken())
-          ->setToken($token);
-
-        $fulltext_tokens[$key] = $fulltext_token;
-
-        $value = $token->getValue();
-
-        // If the value is unquoted, we'll stem it in the query, so stem it
-        // here before performing filtering tests. See T12596.
-        if (!$token->isQuoted()) {
-          $value = $stemmer->stemToken($value);
-        }
-
-        if ($this->isShortToken($value, $min_length)) {
-          $fulltext_token->setIsShort(true);
-          continue;
-        }
-
-        if (isset($stopword_list[phutil_utf8_strtolower($value)])) {
-          $fulltext_token->setIsStopword(true);
-          continue;
-        }
-      }
-      $this->fulltextTokens = $fulltext_tokens;
-
-      // Remove tokens which aren't queryable from the query. This is mostly
-      // a workaround for the peculiar behaviors described in T12137.
-      foreach ($this->fulltextTokens as $key => $fulltext_token) {
-        if (!$fulltext_token->isQueryable()) {
-          unset($tokens[$key]);
-        }
-      }
-
-      if (!$tokens) {
-        throw new PhutilSearchQueryCompilerSyntaxException(
-          pht(
-            'All of your search terms are too short or too common to '.
-            'appear in the search index. Search for longer or more '.
-            'distinctive terms.'));
-      }
-
-      $queries = array();
-      $queries[] = $compiler->compileLiteralQuery($tokens);
-      $queries[] = $compiler->compileStemmedQuery($tokens);
-      $compiled_query = implode(' ', array_filter($queries));
-    } else {
-      $compiled_query = null;
-    }
-
-    if (strlen($compiled_query)) {
-      $select[] = qsprintf(
-        $conn,
-        'IF(field.field = %s, %d, 0) +
-          MATCH(corpus, stemmedCorpus) AGAINST (%s IN BOOLEAN MODE)
-            AS fieldScore',
-        $title_field,
-        $title_boost,
-        $compiled_query);
-
-      $join[] = qsprintf(
-        $conn,
-        '%T field ON field.phid = document.phid',
-        $field_table);
-
-      $where[] = qsprintf(
-        $conn,
-        'MATCH(corpus, stemmedCorpus) AGAINST (%s IN BOOLEAN MODE)',
-        $compiled_query);
-
-      if ($query->getParameter('field')) {
-        $where[] = qsprintf(
-          $conn,
-          'field.field = %s',
-          $field);
-      }
-    } else {
-      $select[] = qsprintf(
-        $conn,
-        'document.documentCreated AS fieldScore');
-    }
-
-    $exclude = $query->getParameter('exclude');
-    if ($exclude) {
-      $where[] = qsprintf(
-        $conn,
-        'document.phid != %s',
-        $exclude);
-    }
-
-    $types = $query->getParameter('types');
-    if ($types) {
-      if (strlen($compiled_query)) {
-        $where[] = qsprintf(
-          $conn,
-          'field.phidType IN (%Ls)',
-          $types);
-      }
-
-      $where[] = qsprintf(
-        $conn,
-        'document.documentType IN (%Ls)',
-        $types);
-    }
-
-    $join[] = $this->joinRelationship(
-      $conn,
-      $query,
-      'authorPHIDs',
-      PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR);
-
-    $statuses = $query->getParameter('statuses', array());
-    $statuses = array_fuse($statuses);
-    $open_rel = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
-    $closed_rel = PhabricatorSearchRelationship::RELATIONSHIP_CLOSED;
-    $include_open = !empty($statuses[$open_rel]);
-    $include_closed = !empty($statuses[$closed_rel]);
-
-    if ($include_open && !$include_closed) {
-      $join[] = $this->joinRelationship(
-        $conn,
-        $query,
-        'statuses',
-        $open_rel,
-        true);
-    } else if ($include_closed && !$include_open) {
-      $join[] = $this->joinRelationship(
-        $conn,
-        $query,
-        'statuses',
-        $closed_rel,
-        true);
-    }
-
-    if ($query->getParameter('withAnyOwner')) {
-      $join[] = $this->joinRelationship(
-        $conn,
-        $query,
-        'withAnyOwner',
-        PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
-        true);
-    } else if ($query->getParameter('withUnowned')) {
-      $join[] = $this->joinRelationship(
-        $conn,
-        $query,
-        'withUnowned',
-        PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
-        true);
-    } else {
-      $join[] = $this->joinRelationship(
-        $conn,
-        $query,
-        'ownerPHIDs',
-        PhabricatorSearchRelationship::RELATIONSHIP_OWNER);
-    }
-
-    $join[] = $this->joinRelationship(
-      $conn,
-      $query,
-      'subscriberPHIDs',
-      PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER);
-
-    $join[] = $this->joinRelationship(
-      $conn,
-      $query,
-      'projectPHIDs',
-      PhabricatorSearchRelationship::RELATIONSHIP_PROJECT);
-
-    $join[] = $this->joinRelationship(
-      $conn,
-      $query,
-      'repository',
-      PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY);
-
-    $select = implode(', ', $select);
-
-    $join = array_filter($join);
-    foreach ($join as $key => $clause) {
-      $join[$key] = ' JOIN '.$clause;
-    }
-    $join = implode(' ', $join);
-
-    if ($where) {
-      $where = 'WHERE '.implode(' AND ', $where);
-    } else {
-      $where = '';
-    }
-
-    if (strlen($compiled_query)) {
-      $order = '';
-    } else {
-      // When not executing a query, order by document creation date. This
-      // is the default view in object browser dialogs, like "Close Duplicate".
-      $order = qsprintf(
-        $conn,
-        'ORDER BY document.documentCreated DESC');
-    }
-
-    return qsprintf(
-      $conn,
-      'SELECT %Q FROM %T document %Q %Q %Q LIMIT 1000',
-      $select,
-      $document_table,
-      $join,
-      $where,
-      $order);
-  }
-
-  protected function joinRelationship(
-    AphrontDatabaseConnection $conn,
-    PhabricatorSavedQuery $query,
-    $field,
-    $type,
-    $is_existence = false) {
-
-    $sql = qsprintf(
-      $conn,
-      '%T AS %C ON %C.phid = document.phid AND %C.relation = %s',
-      id(new PhabricatorSearchDocumentRelationship())->getTableName(),
-      $field,
-      $field,
-      $field,
-      $type);
-
-    if (!$is_existence) {
-      $phids = $query->getParameter($field, array());
-      if (!$phids) {
-        return null;
-      }
-      $sql .= qsprintf(
-        $conn,
-        ' AND %C.relatedPHID in (%Ls)',
-        $field,
-        $phids);
-    }
-
-    return $sql;
-  }
-
-  public function indexExists() {
-    return true;
-  }
-
-  public function getIndexStats() {
-    return false;
-  }
-
-  public function getFulltextTokens() {
-    return $this->fulltextTokens;
-  }
-
-  private function getEngineLimits(AphrontDatabaseConnection $conn) {
-    if ($this->engineLimits === null) {
-      $this->engineLimits = $this->newEngineLimits($conn);
-    }
-    return $this->engineLimits;
-  }
-
-  private function newEngineLimits(AphrontDatabaseConnection $conn) {
-    // First, try InnoDB. Some database may not have both table engines, so
-    // selecting variables from missing table engines can fail and throw.
-
-    try {
-      $result = queryfx_one(
-        $conn,
-        'SELECT @@innodb_ft_min_token_size innodb_max,
-          @@innodb_ft_server_stopword_table innodb_stopword_config');
-    } catch (AphrontQueryException $ex) {
-      $result = null;
-    }
-
-    if ($result) {
-      $min_len = $result['innodb_max'];
-
-      $stopword_config = $result['innodb_stopword_config'];
-      if (preg_match('(/)', $stopword_config)) {
-        // If the setting is nonempty and contains a slash, query the
-        // table the user has configured.
-        $parts = explode('/', $stopword_config);
-        list($stopword_database, $stopword_table) = $parts;
-      } else {
-        // Otherwise, query the InnoDB default stopword table.
-        $stopword_database = 'INFORMATION_SCHEMA';
-        $stopword_table = 'INNODB_FT_DEFAULT_STOPWORD';
-      }
-
-      $stopwords = queryfx_all(
-        $conn,
-        'SELECT * FROM %T.%T',
-        $stopword_database,
-        $stopword_table);
-      $stopwords = ipull($stopwords, 'value');
-      $stopwords = array_fuse($stopwords);
-
-      return array($min_len, $stopwords);
-    }
-
-    // If InnoDB fails, try MyISAM.
-    $result = queryfx_one(
-      $conn,
-      'SELECT
-        @@ft_min_word_len myisam_max,
-        @@ft_stopword_file myisam_stopwords');
-
-    $min_len = $result['myisam_max'];
-
-    $file = $result['myisam_stopwords'];
-    if (preg_match('(/resources/sql/stopwords\.txt\z)', $file)) {
-      // If this is set to something that looks like the Phabricator
-      // stopword file, read that.
-      $file = 'stopwords.txt';
-    } else {
-      // Otherwise, just use the default stopwords. This might be wrong
-      // but we can't read the actual value dynamically and reading
-      // whatever file the variable is set to could be a big headache
-      // to get right from a security perspective.
-      $file = 'stopwords_myisam.txt';
-    }
-
-    $root = dirname(phutil_get_library_root('phabricator'));
-    $data = Filesystem::readFile($root.'/resources/sql/'.$file);
-    $stopwords = explode("\n", $data);
-    $stopwords = array_filter($stopwords);
-    $stopwords = array_fuse($stopwords);
-
-    return array($min_len, $stopwords);
-  }
-
-  private function isShortToken($value, $min_length) {
-    // NOTE: The engine tokenizes internally on periods, so terms in the form
-    // "ab.cd", where short substrings are separated by periods, do not produce
-    // any queryable tokens. These terms are meaningful if at least one
-    // substring is longer than the minimum length, like "example.py". See
-    // T12928. This also applies to words with intermediate apostrophes, like
-    // "to's".
-
-    $parts = preg_split('/[.\']+/', $value);
-
-    foreach ($parts as $part) {
-      if (phutil_utf8_strlen($part) >= $min_length) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-}

From e6f0f865187a4429eca5deafebe198203e9a6fcc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 12 Sep 2017 07:35:15 -0700
Subject: [PATCH 155/865] Document Ferret engine fulltext search features

Summary: Ref T12819. Adds some documentation for `-term`, `~term`, `title:term`, etc.

Test Plan: Read documentation.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18592
---
 src/docs/user/userguide/search.diviner | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/docs/user/userguide/search.diviner b/src/docs/user/userguide/search.diviner
index f2d564bc75..875edc6d0f 100644
--- a/src/docs/user/userguide/search.diviner
+++ b/src/docs/user/userguide/search.diviner
@@ -123,3 +123,53 @@ Another useful function is the `viewer()` function, which works as though you'd
 typed your own username when you run the query. However, if you send the query
 to someone else, it will show results for //their// username when they run it.
 This can be particularly useful when creating dashboard panels.
+
+
+Fulltext Search
+===============
+
+Global search and some applications provide **fulltext search**. In
+applications, this is a field called {nav Query}.
+
+Fulltext search allows you to search the text content of objects and supports
+some special syntax. These features are supported:
+
+  - Substring search with `~platypus`.
+  - Field search with `title:platypus`.
+  - Filtering out matches with `-platypus`.
+  - Quoted terms with `"platypus attorney"`.
+  - Combining features with `title:~"platypus attorney"`.
+
+See below for more detail.
+
+**Substrings**: Normally, query terms are searched for as words, so searching
+for `read` won't find documents which only contain the word `threaded`, even
+though "read" is a substring of "threaded". With the substring operator, `~`,
+you can search for substrings instead: the query `~read` will match documents
+which contain that text anywhere, even in the middle of a word.
+
+**Quoted Terms**: When you search for multiple terms, documents which match
+each term will be returned, even if the terms are not adjacent in the document.
+For example, the query `void star` will match a document titled `A star in the
+void`, because it matches both `void` and `star`. To search for an exact
+sequence of terms, quote them: `"void star"`. This query will only match
+documents which use those terms as written.
+
+**Stemming**: Searching for a term like `rearming` will find documents which
+contain variations of the word, like `rearm`, `rearms`, and `rearmed`. To
+search for an an exact word, quote the term: `"rearming"`.
+
+**Field Search**: By default, query terms are searched for in the title, body,
+and comments. If you only want to search for a term in titles, use `title:`.
+For example, `title:platypus` only finds documents with that term in the
+title. This can be combined with other operators, for example `title:~platypus`
+or `title:"platypus attorney"`. These scopes are also supported:
+
+  - `title:...` searches titles.
+  - `body:...` searches bodies (descriptions or summaries).
+  - `core:...` searches titles and bodies, but not comments.
+  - `comments:...` searches only comments.
+
+**Filtering Matches**: You can remove documents which match certain terms from
+the result set with `-`. For example: `platypus -mammal`. Documents which match
+negated terms will be filtered out of the result set.

From fdc0d8c2f6f3543de6a68fe26bdeda2bf9c530ed Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 12 Sep 2017 07:44:29 -0700
Subject: [PATCH 156/865] Fix an issue with selecting the right stemmed ngrams
 with Ferret engine queries

Summary:
Ref T12819. In D18581, I corrected one bug (ngram selection for terms) but introduced a minor new bug. We now pass `' query '` (term corpus with boundary spaces) to the stemmer, but it bails out on this since English words don't start with spaces.

Trim these extra boundary spaces off before invoking the stemmer.

The practical effect of this is that searching for non-stem variations of a word ("detection") now finds stemmed variations again ("detect"). Prior to fixing this bug, the stem could find longer variations but not the other way around.

Test Plan: Searched for "detection", found results matching "detect" after patch (and saw same results for "detect" and "detection").

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18593
---
 .../query/policy/PhabricatorCursorPagedPolicyAwareQuery.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 5cacd66d06..cd4ccf30b5 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -1683,6 +1683,9 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
         // If this is a stemmed term, only look for ngrams present in both the
         // unstemmed and stemmed variations.
         if ($is_stemmed) {
+          // Trim the boundary space characters so the stemmer recognizes this
+          // is (or, at least, may be) a normal word and activates.
+          $terms_value = trim($terms_value, ' ');
           $stem_value = $stemmer->stemToken($terms_value);
           $stem_ngrams = $engine->getTermNgramsFromString($stem_value);
           $ngrams = array_intersect($ngrams, $stem_ngrams);

From 124e580f6ec776fcb03d74883f27f998430bad09 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 12 Sep 2017 08:16:28 -0700
Subject: [PATCH 157/865] Issue upgrade guidance to rebuild indexes for the
 Ferret engine

Summary:
Ref T12819. This is shipping, so issue upgrade guidance to instruct installs to rebuild the index.

Also generate a new `quickstart.sql` since we haven't regenerated in a bit and there's been a large amount of table churn fairly recently.

Test Plan: Ran `bin/storage upgrade`, saw guidance notification in UI.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12819

Differential Revision: https://secure.phabricator.com/D18594
---
 .../20170912.ferret.01.activity.php           |  19 +
 resources/sql/quickstart.sql                  | 552 +++++++++++++++++-
 2 files changed, 549 insertions(+), 22 deletions(-)
 create mode 100644 resources/sql/autopatches/20170912.ferret.01.activity.php

diff --git a/resources/sql/autopatches/20170912.ferret.01.activity.php b/resources/sql/autopatches/20170912.ferret.01.activity.php
new file mode 100644
index 0000000000..cafd60c928
--- /dev/null
+++ b/resources/sql/autopatches/20170912.ferret.01.activity.php
@@ -0,0 +1,19 @@
+<?php
+
+// Advise installs to perform a reindex in order to rebuild the Ferret engine
+// indexes.
+
+// If the install is completely empty with no user accounts, don't require
+// a rebuild. In particular, this happens when rebuilding the quickstart file.
+$users = id(new PhabricatorUser())->loadAllWhere('1 = 1 LIMIT 1');
+if (!$users) {
+  return;
+}
+
+try {
+  id(new PhabricatorConfigManualActivity())
+    ->setActivityType(PhabricatorConfigManualActivity::TYPE_REINDEX)
+    ->save();
+} catch (AphrontDuplicateKeyQueryException $ex) {
+  // If we've already noted that this activity is required, just move on.
+}
diff --git a/resources/sql/quickstart.sql b/resources/sql/quickstart.sql
index b992c03522..e9ae4465a4 100644
--- a/resources/sql/quickstart.sql
+++ b/resources/sql/quickstart.sql
@@ -95,6 +95,42 @@ CREATE TABLE `calendar_event` (
   KEY `key_space` (`spacePHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `calendar_event_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `calendar_event_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `calendar_event_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `calendar_eventinvitee` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `eventPHID` varbinary(64) NOT NULL,
@@ -452,7 +488,7 @@ CREATE TABLE `daemon_log` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `key_daemonID` (`daemonID`),
   KEY `status` (`status`),
-  KEY `dateCreated` (`dateCreated`)
+  KEY `key_modified` (`dateModified`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
 CREATE TABLE `daemon_logevent` (
@@ -602,17 +638,6 @@ CREATE TABLE `differential_difftransaction` (
   KEY `key_object` (`objectPHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
-CREATE TABLE `differential_draft` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `objectPHID` varbinary(64) NOT NULL,
-  `authorPHID` varbinary(64) NOT NULL,
-  `draftKey` varchar(64) COLLATE {$COLLATE_TEXT} NOT NULL,
-  `dateCreated` int(10) unsigned NOT NULL,
-  `dateModified` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key_unique` (`objectPHID`,`authorPHID`,`draftKey`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
-
 CREATE TABLE `differential_hiddencomment` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `userPHID` varbinary(64) NOT NULL,
@@ -697,6 +722,42 @@ CREATE TABLE `differential_revision` (
   KEY `key_status` (`status`,`phid`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `differential_revision_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `differential_revision_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `differential_revision_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `differential_revisionhash` (
   `revisionID` int(10) unsigned NOT NULL,
   `type` binary(4) NOT NULL,
@@ -1767,7 +1828,7 @@ CREATE TABLE `maniphest_task` (
   `phid` varbinary(64) NOT NULL,
   `authorPHID` varbinary(64) NOT NULL,
   `ownerPHID` varbinary(64) DEFAULT NULL,
-  `status` varchar(12) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `status` varchar(64) COLLATE {$COLLATE_TEXT} NOT NULL,
   `priority` int(10) unsigned NOT NULL,
   `title` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
   `originalTitle` longtext COLLATE {$COLLATE_TEXT} NOT NULL,
@@ -1801,6 +1862,42 @@ CREATE TABLE `maniphest_task` (
   KEY `key_space` (`spacePHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `maniphest_task_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `maniphest_task_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `maniphest_task_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `maniphest_transaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
@@ -1857,7 +1954,7 @@ CREATE TABLE `patch_status` (
   PRIMARY KEY (`patch`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
-INSERT INTO `patch_status` VALUES ('phabricator:000.project.sql',1492953699,NULL),('phabricator:0000.legacy.sql',1492953699,NULL),('phabricator:001.maniphest_projects.sql',1492953699,NULL),('phabricator:002.oauth.sql',1492953699,NULL),('phabricator:003.more_oauth.sql',1492953699,NULL),('phabricator:004.daemonrepos.sql',1492953699,NULL),('phabricator:005.workers.sql',1492953699,NULL),('phabricator:006.repository.sql',1492953699,NULL),('phabricator:007.daemonlog.sql',1492953699,NULL),('phabricator:008.repoopt.sql',1492953699,NULL),('phabricator:009.repo_summary.sql',1492953699,NULL),('phabricator:010.herald.sql',1492953699,NULL),('phabricator:011.badcommit.sql',1492953699,NULL),('phabricator:012.dropphidtype.sql',1492953699,NULL),('phabricator:013.commitdetail.sql',1492953699,NULL),('phabricator:014.shortcuts.sql',1492953699,NULL),('phabricator:015.preferences.sql',1492953699,NULL),('phabricator:016.userrealnameindex.sql',1492953699,NULL),('phabricator:017.sessionkeys.sql',1492953700,NULL),('phabricator:018.owners.sql',1492953700,NULL),('phabricator:019.arcprojects.sql',1492953700,NULL),('phabricator:020.pathcapital.sql',1492953700,NULL),('phabricator:021.xhpastview.sql',1492953700,NULL),('phabricator:022.differentialcommit.sql',1492953700,NULL),('phabricator:023.dxkeys.sql',1492953700,NULL),('phabricator:024.mlistkeys.sql',1492953700,NULL),('phabricator:025.commentopt.sql',1492953700,NULL),('phabricator:026.diffpropkey.sql',1492953700,NULL),('phabricator:027.metamtakeys.sql',1492953700,NULL),('phabricator:028.systemagent.sql',1492953700,NULL),('phabricator:029.cursors.sql',1492953700,NULL),('phabricator:030.imagemacro.sql',1492953700,NULL),('phabricator:031.workerrace.sql',1492953700,NULL),('phabricator:032.viewtime.sql',1492953700,NULL),('phabricator:033.privtest.sql',1492953700,NULL),('phabricator:034.savedheader.sql',1492953700,NULL),('phabricator:035.proxyimage.sql',1492953700,NULL),('phabricator:036.mailkey.sql',1492953700,NULL),('phabricator:037.setuptest.sql',1492953700,NULL),('phabricator:038.admin.sql',1492953700,NULL),('phabricator:039.userlog.sql',1492953700,NULL),('phabricator:040.transform.sql',1492953700,NULL),('phabricator:041.heraldrepetition.sql',1492953700,NULL),('phabricator:042.commentmetadata.sql',1492953700,NULL),('phabricator:043.pastebin.sql',1492953700,NULL),('phabricator:044.countdown.sql',1492953700,NULL),('phabricator:045.timezone.sql',1492953700,NULL),('phabricator:046.conduittoken.sql',1492953700,NULL),('phabricator:047.projectstatus.sql',1492953700,NULL),('phabricator:048.relationshipkeys.sql',1492953700,NULL),('phabricator:049.projectowner.sql',1492953700,NULL),('phabricator:050.taskdenormal.sql',1492953700,NULL),('phabricator:051.projectfilter.sql',1492953700,NULL),('phabricator:052.pastelanguage.sql',1492953700,NULL),('phabricator:053.feed.sql',1492953700,NULL),('phabricator:054.subscribers.sql',1492953700,NULL),('phabricator:055.add_author_to_files.sql',1492953700,NULL),('phabricator:056.slowvote.sql',1492953700,NULL),('phabricator:057.parsecache.sql',1492953701,NULL),('phabricator:058.missingkeys.sql',1492953701,NULL),('phabricator:059.engines.php',1492953701,NULL),('phabricator:060.phriction.sql',1492953701,NULL),('phabricator:061.phrictioncontent.sql',1492953701,NULL),('phabricator:062.phrictionmenu.sql',1492953701,NULL),('phabricator:063.pasteforks.sql',1492953701,NULL),('phabricator:064.subprojects.sql',1492953701,NULL),('phabricator:065.sshkeys.sql',1492953701,NULL),('phabricator:066.phrictioncontent.sql',1492953701,NULL),('phabricator:067.preferences.sql',1492953701,NULL),('phabricator:068.maniphestauxiliarystorage.sql',1492953701,NULL),('phabricator:069.heraldxscript.sql',1492953701,NULL),('phabricator:070.differentialaux.sql',1492953701,NULL),('phabricator:071.contentsource.sql',1492953701,NULL),('phabricator:072.blamerevert.sql',1492953701,NULL),('phabricator:073.reposymbols.sql',1492953701,NULL),('phabricator:074.affectedpath.sql',1492953701,NULL),('phabricator:075.revisionhash.sql',1492953701,NULL),('phabricator:076.indexedlanguages.sql',1492953701,NULL),('phabricator:077.originalemail.sql',1492953701,NULL),('phabricator:078.nametoken.sql',1492953701,NULL),('phabricator:079.nametokenindex.php',1492953701,NULL),('phabricator:080.filekeys.sql',1492953701,NULL),('phabricator:081.filekeys.php',1492953701,NULL),('phabricator:082.xactionkey.sql',1492953701,NULL),('phabricator:083.dxviewtime.sql',1492953701,NULL),('phabricator:084.pasteauthorkey.sql',1492953701,NULL),('phabricator:085.packagecommitrelationship.sql',1492953701,NULL),('phabricator:086.formeraffil.sql',1492953701,NULL),('phabricator:087.phrictiondelete.sql',1492953701,NULL),('phabricator:088.audit.sql',1492953701,NULL),('phabricator:089.projectwiki.sql',1492953701,NULL),('phabricator:090.forceuniqueprojectnames.php',1492953701,NULL),('phabricator:091.uniqueslugkey.sql',1492953701,NULL),('phabricator:092.dropgithubnotification.sql',1492953701,NULL),('phabricator:093.gitremotes.php',1492953701,NULL),('phabricator:094.phrictioncolumn.sql',1492953701,NULL),('phabricator:095.directory.sql',1492953701,NULL),('phabricator:096.filename.sql',1492953701,NULL),('phabricator:097.heraldruletypes.sql',1492953701,NULL),('phabricator:098.heraldruletypemigration.php',1492953701,NULL),('phabricator:099.drydock.sql',1492953701,NULL),('phabricator:100.projectxaction.sql',1492953701,NULL),('phabricator:101.heraldruleapplied.sql',1492953701,NULL),('phabricator:102.heraldcleanup.php',1492953701,NULL),('phabricator:103.heraldedithistory.sql',1492953701,NULL),('phabricator:104.searchkey.sql',1492953702,NULL),('phabricator:105.mimetype.sql',1492953702,NULL),('phabricator:106.chatlog.sql',1492953702,NULL),('phabricator:107.oauthserver.sql',1492953702,NULL),('phabricator:108.oauthscope.sql',1492953702,NULL),('phabricator:109.oauthclientphidkey.sql',1492953702,NULL),('phabricator:110.commitaudit.sql',1492953702,NULL),('phabricator:111.commitauditmigration.php',1492953702,NULL),('phabricator:112.oauthaccesscoderedirecturi.sql',1492953702,NULL),('phabricator:113.lastreviewer.sql',1492953702,NULL),('phabricator:114.auditrequest.sql',1492953702,NULL),('phabricator:115.prepareutf8.sql',1492953702,NULL),('phabricator:116.utf8-backup-first-expect-wait.sql',1492953704,NULL),('phabricator:117.repositorydescription.php',1492953704,NULL),('phabricator:118.auditinline.sql',1492953704,NULL),('phabricator:119.filehash.sql',1492953704,NULL),('phabricator:120.noop.sql',1492953704,NULL),('phabricator:121.drydocklog.sql',1492953704,NULL),('phabricator:122.flag.sql',1492953704,NULL),('phabricator:123.heraldrulelog.sql',1492953704,NULL),('phabricator:124.subpriority.sql',1492953704,NULL),('phabricator:125.ipv6.sql',1492953704,NULL),('phabricator:126.edges.sql',1492953704,NULL),('phabricator:127.userkeybody.sql',1492953704,NULL),('phabricator:128.phabricatorcom.sql',1492953704,NULL),('phabricator:129.savedquery.sql',1492953704,NULL),('phabricator:130.denormalrevisionquery.sql',1492953704,NULL),('phabricator:131.migraterevisionquery.php',1492953704,NULL),('phabricator:132.phame.sql',1492953704,NULL),('phabricator:133.imagemacro.sql',1492953704,NULL),('phabricator:134.emptysearch.sql',1492953704,NULL),('phabricator:135.datecommitted.sql',1492953704,NULL),('phabricator:136.sex.sql',1492953704,NULL),('phabricator:137.auditmetadata.sql',1492953704,NULL),('phabricator:138.notification.sql',1492953704,NULL),('phabricator:20121209.pholioxactions.sql',1492953705,NULL),('phabricator:20121209.xmacroadd.sql',1492953705,NULL),('phabricator:20121209.xmacromigrate.php',1492953705,NULL),('phabricator:20121209.xmacromigratekey.sql',1492953705,NULL),('phabricator:20121220.generalcache.sql',1492953705,NULL),('phabricator:20121226.config.sql',1492953705,NULL),('phabricator:20130101.confxaction.sql',1492953705,NULL),('phabricator:20130102.metamtareceivedmailmessageidhash.sql',1492953705,NULL),('phabricator:20130103.filemetadata.sql',1492953705,NULL),('phabricator:20130111.conpherence.sql',1492953705,NULL),('phabricator:20130127.altheraldtranscript.sql',1492953705,NULL),('phabricator:20130131.conpherencepics.sql',1492953705,NULL),('phabricator:20130201.revisionunsubscribed.php',1492953705,NULL),('phabricator:20130201.revisionunsubscribed.sql',1492953705,NULL),('phabricator:20130214.chatlogchannel.sql',1492953705,NULL),('phabricator:20130214.chatlogchannelid.sql',1492953705,NULL),('phabricator:20130214.token.sql',1492953705,NULL),('phabricator:20130215.phabricatorfileaddttl.sql',1492953705,NULL),('phabricator:20130217.cachettl.sql',1492953705,NULL),('phabricator:20130218.longdaemon.sql',1492953705,NULL),('phabricator:20130218.updatechannelid.php',1492953705,NULL),('phabricator:20130219.commitsummary.sql',1492953705,NULL),('phabricator:20130219.commitsummarymig.php',1492953705,NULL),('phabricator:20130222.dropchannel.sql',1492953705,NULL),('phabricator:20130226.commitkey.sql',1492953705,NULL),('phabricator:20130304.lintauthor.sql',1492953705,NULL),('phabricator:20130310.xactionmeta.sql',1492953705,NULL),('phabricator:20130317.phrictionedge.sql',1492953705,NULL),('phabricator:20130319.conpherence.sql',1492953705,NULL),('phabricator:20130319.phabricatorfileexplicitupload.sql',1492953705,NULL),('phabricator:20130320.phlux.sql',1492953705,NULL),('phabricator:20130321.token.sql',1492953705,NULL),('phabricator:20130322.phortune.sql',1492953705,NULL),('phabricator:20130323.phortunepayment.sql',1492953705,NULL),('phabricator:20130324.phortuneproduct.sql',1492953705,NULL),('phabricator:20130330.phrequent.sql',1492953705,NULL),('phabricator:20130403.conpherencecache.sql',1492953705,NULL),('phabricator:20130403.conpherencecachemig.php',1492953705,NULL),('phabricator:20130409.commitdrev.php',1492953705,NULL),('phabricator:20130417.externalaccount.sql',1492953705,NULL),('phabricator:20130423.conpherenceindices.sql',1492953706,NULL),('phabricator:20130423.phortunepaymentrevised.sql',1492953706,NULL),('phabricator:20130423.updateexternalaccount.sql',1492953705,NULL),('phabricator:20130426.search_savedquery.sql',1492953706,NULL),('phabricator:20130502.countdownrevamp1.sql',1492953706,NULL),('phabricator:20130502.countdownrevamp2.php',1492953706,NULL),('phabricator:20130502.countdownrevamp3.sql',1492953706,NULL),('phabricator:20130507.releephrqmailkey.sql',1492953706,NULL),('phabricator:20130507.releephrqmailkeypop.php',1492953706,NULL),('phabricator:20130507.releephrqsimplifycols.sql',1492953706,NULL),('phabricator:20130508.releephtransactions.sql',1492953706,NULL),('phabricator:20130508.releephtransactionsmig.php',1492953706,NULL),('phabricator:20130508.search_namedquery.sql',1492953706,NULL),('phabricator:20130513.receviedmailstatus.sql',1492953706,NULL),('phabricator:20130519.diviner.sql',1492953706,NULL),('phabricator:20130521.dropconphimages.sql',1492953706,NULL),('phabricator:20130523.maniphest_owners.sql',1492953706,NULL),('phabricator:20130524.repoxactions.sql',1492953706,NULL),('phabricator:20130529.macroauthor.sql',1492953706,NULL),('phabricator:20130529.macroauthormig.php',1492953706,NULL),('phabricator:20130530.macrodatekey.sql',1492953706,NULL),('phabricator:20130530.pastekeys.sql',1492953706,NULL),('phabricator:20130530.sessionhash.php',1492953706,NULL),('phabricator:20130531.filekeys.sql',1492953706,NULL),('phabricator:20130602.morediviner.sql',1492953706,NULL),('phabricator:20130602.namedqueries.sql',1492953706,NULL),('phabricator:20130606.userxactions.sql',1492953706,NULL),('phabricator:20130607.xaccount.sql',1492953706,NULL),('phabricator:20130611.migrateoauth.php',1492953706,NULL),('phabricator:20130611.nukeldap.php',1492953706,NULL),('phabricator:20130613.authdb.sql',1492953706,NULL),('phabricator:20130619.authconf.php',1492953706,NULL),('phabricator:20130620.diffxactions.sql',1492953706,NULL),('phabricator:20130621.diffcommentphid.sql',1492953706,NULL),('phabricator:20130621.diffcommentphidmig.php',1492953706,NULL),('phabricator:20130621.diffcommentunphid.sql',1492953706,NULL),('phabricator:20130622.doorkeeper.sql',1492953706,NULL),('phabricator:20130628.legalpadv0.sql',1492953706,NULL),('phabricator:20130701.conduitlog.sql',1492953706,NULL),('phabricator:20130703.legalpaddocdenorm.php',1492953707,NULL),('phabricator:20130703.legalpaddocdenorm.sql',1492953707,NULL),('phabricator:20130709.droptimeline.sql',1492953707,NULL),('phabricator:20130709.legalpadsignature.sql',1492953707,NULL),('phabricator:20130711.pholioimageobsolete.php',1492953707,NULL),('phabricator:20130711.pholioimageobsolete.sql',1492953707,NULL),('phabricator:20130711.pholioimageobsolete2.sql',1492953707,NULL),('phabricator:20130711.trimrealnames.php',1492953707,NULL),('phabricator:20130714.votexactions.sql',1492953707,NULL),('phabricator:20130715.votecomments.php',1492953707,NULL),('phabricator:20130715.voteedges.sql',1492953707,NULL),('phabricator:20130716.archivememberlessprojects.php',1492953707,NULL),('phabricator:20130722.pholioreplace.sql',1492953707,NULL),('phabricator:20130723.taskstarttime.sql',1492953707,NULL),('phabricator:20130726.ponderxactions.sql',1492953707,NULL),('phabricator:20130727.ponderquestionstatus.sql',1492953707,NULL),('phabricator:20130728.ponderunique.php',1492953707,NULL),('phabricator:20130728.ponderuniquekey.sql',1492953707,NULL),('phabricator:20130728.ponderxcomment.php',1492953707,NULL),('phabricator:20130731.releephcutpointidentifier.sql',1492953707,NULL),('phabricator:20130731.releephproject.sql',1492953707,NULL),('phabricator:20130731.releephrepoid.sql',1492953707,NULL),('phabricator:20130801.pastexactions.php',1492953707,NULL),('phabricator:20130801.pastexactions.sql',1492953707,NULL),('phabricator:20130802.heraldphid.sql',1492953707,NULL),('phabricator:20130802.heraldphids.php',1492953707,NULL),('phabricator:20130802.heraldphidukey.sql',1492953707,NULL),('phabricator:20130802.heraldxactions.sql',1492953707,NULL),('phabricator:20130805.pasteedges.sql',1492953707,NULL),('phabricator:20130805.pastemailkey.sql',1492953707,NULL),('phabricator:20130805.pastemailkeypop.php',1492953707,NULL),('phabricator:20130814.usercustom.sql',1492953707,NULL),('phabricator:20130820.file-mailkey-populate.php',1492953707,NULL),('phabricator:20130820.filemailkey.sql',1492953707,NULL),('phabricator:20130820.filexactions.sql',1492953707,NULL),('phabricator:20130820.releephxactions.sql',1492953707,NULL),('phabricator:20130826.divinernode.sql',1492953707,NULL),('phabricator:20130912.maniphest.1.touch.sql',1492953707,NULL),('phabricator:20130912.maniphest.2.created.sql',1492953707,NULL),('phabricator:20130912.maniphest.3.nameindex.sql',1492953707,NULL),('phabricator:20130912.maniphest.4.fillindex.php',1492953707,NULL),('phabricator:20130913.maniphest.1.migratesearch.php',1492953707,NULL),('phabricator:20130914.usercustom.sql',1492953707,NULL),('phabricator:20130915.maniphestcustom.sql',1492953707,NULL),('phabricator:20130915.maniphestmigrate.php',1492953707,NULL),('phabricator:20130915.maniphestqdrop.sql',1492953708,NULL),('phabricator:20130919.mfieldconf.php',1492953707,NULL),('phabricator:20130920.repokeyspolicy.sql',1492953707,NULL),('phabricator:20130921.mtransactions.sql',1492953707,NULL),('phabricator:20130921.xmigratemaniphest.php',1492953707,NULL),('phabricator:20130923.mrename.sql',1492953707,NULL),('phabricator:20130924.mdraftkey.sql',1492953707,NULL),('phabricator:20130925.mpolicy.sql',1492953707,NULL),('phabricator:20130925.xpolicy.sql',1492953707,NULL),('phabricator:20130926.dcustom.sql',1492953707,NULL),('phabricator:20130926.dinkeys.sql',1492953707,NULL),('phabricator:20130926.dinline.php',1492953708,NULL),('phabricator:20130927.audiomacro.sql',1492953708,NULL),('phabricator:20130929.filepolicy.sql',1492953708,NULL),('phabricator:20131004.dxedgekey.sql',1492953708,NULL),('phabricator:20131004.dxreviewers.php',1492953708,NULL),('phabricator:20131006.hdisable.sql',1492953708,NULL),('phabricator:20131010.pstorage.sql',1492953708,NULL),('phabricator:20131015.cpolicy.sql',1492953708,NULL),('phabricator:20131020.col1.sql',1492953708,NULL),('phabricator:20131020.harbormaster.sql',1492953708,NULL),('phabricator:20131020.pcustom.sql',1492953708,NULL),('phabricator:20131020.pxaction.sql',1492953708,NULL),('phabricator:20131020.pxactionmig.php',1492953708,NULL),('phabricator:20131025.repopush.sql',1492953708,NULL),('phabricator:20131026.commitstatus.sql',1492953708,NULL),('phabricator:20131030.repostatusmessage.sql',1492953708,NULL),('phabricator:20131031.vcspassword.sql',1492953708,NULL),('phabricator:20131105.buildstep.sql',1492953708,NULL),('phabricator:20131106.diffphid.1.col.sql',1492953708,NULL),('phabricator:20131106.diffphid.2.mig.php',1492953708,NULL),('phabricator:20131106.diffphid.3.key.sql',1492953708,NULL),('phabricator:20131106.nuance-v0.sql',1492953708,NULL),('phabricator:20131107.buildlog.sql',1492953708,NULL),('phabricator:20131112.userverified.1.col.sql',1492953708,NULL),('phabricator:20131112.userverified.2.mig.php',1492953708,NULL),('phabricator:20131118.ownerorder.php',1492953708,NULL),('phabricator:20131119.passphrase.sql',1492953708,NULL),('phabricator:20131120.nuancesourcetype.sql',1492953708,NULL),('phabricator:20131121.passphraseedge.sql',1492953708,NULL),('phabricator:20131121.repocredentials.1.col.sql',1492953708,NULL),('phabricator:20131121.repocredentials.2.mig.php',1492953708,NULL),('phabricator:20131122.repomirror.sql',1492953708,NULL),('phabricator:20131123.drydockblueprintpolicy.sql',1492953708,NULL),('phabricator:20131129.drydockresourceblueprint.sql',1492953708,NULL),('phabricator:20131204.pushlog.sql',1492953708,NULL),('phabricator:20131205.buildsteporder.sql',1492953708,NULL),('phabricator:20131205.buildstepordermig.php',1492953708,NULL),('phabricator:20131205.buildtargets.sql',1492953708,NULL),('phabricator:20131206.phragment.sql',1492953708,NULL),('phabricator:20131206.phragmentnull.sql',1492953708,NULL),('phabricator:20131208.phragmentsnapshot.sql',1492953708,NULL),('phabricator:20131211.phragmentedges.sql',1492953708,NULL),('phabricator:20131217.pushlogphid.1.col.sql',1492953708,NULL),('phabricator:20131217.pushlogphid.2.mig.php',1492953708,NULL),('phabricator:20131217.pushlogphid.3.key.sql',1492953708,NULL),('phabricator:20131219.pxdrop.sql',1492953708,NULL),('phabricator:20131224.harbormanual.sql',1492953708,NULL),('phabricator:20131227.heraldobject.sql',1492953708,NULL),('phabricator:20131231.dropshortcut.sql',1492953708,NULL),('phabricator:20131302.maniphestvalue.sql',1492953705,NULL),('phabricator:20140104.harbormastercmd.sql',1492953709,NULL),('phabricator:20140106.macromailkey.1.sql',1492953709,NULL),('phabricator:20140106.macromailkey.2.php',1492953709,NULL),('phabricator:20140108.ddbpname.1.sql',1492953709,NULL),('phabricator:20140108.ddbpname.2.php',1492953709,NULL),('phabricator:20140109.ddxactions.sql',1492953709,NULL),('phabricator:20140109.projectcolumnsdates.sql',1492953709,NULL),('phabricator:20140113.legalpadsig.1.sql',1492953709,NULL),('phabricator:20140113.legalpadsig.2.php',1492953709,NULL),('phabricator:20140115.auth.1.id.sql',1492953709,NULL),('phabricator:20140115.auth.2.expires.sql',1492953709,NULL),('phabricator:20140115.auth.3.unlimit.php',1492953709,NULL),('phabricator:20140115.legalpadsigkey.sql',1492953709,NULL),('phabricator:20140116.reporefcursor.sql',1492953709,NULL),('phabricator:20140126.diff.1.parentrevisionid.sql',1492953709,NULL),('phabricator:20140126.diff.2.repositoryphid.sql',1492953709,NULL),('phabricator:20140130.dash.1.board.sql',1492953709,NULL),('phabricator:20140130.dash.2.panel.sql',1492953709,NULL),('phabricator:20140130.dash.3.boardxaction.sql',1492953709,NULL),('phabricator:20140130.dash.4.panelxaction.sql',1492953709,NULL),('phabricator:20140130.mail.1.retry.sql',1492953709,NULL),('phabricator:20140130.mail.2.next.sql',1492953709,NULL),('phabricator:20140201.gc.1.mailsent.sql',1492953709,NULL),('phabricator:20140201.gc.2.mailreceived.sql',1492953709,NULL),('phabricator:20140205.cal.1.rename.sql',1492953709,NULL),('phabricator:20140205.cal.2.phid-col.sql',1492953709,NULL),('phabricator:20140205.cal.3.phid-mig.php',1492953709,NULL),('phabricator:20140205.cal.4.phid-key.sql',1492953709,NULL),('phabricator:20140210.herald.rule-condition-mig.php',1492953709,NULL),('phabricator:20140210.projcfield.1.blurb.php',1492953709,NULL),('phabricator:20140210.projcfield.2.piccol.sql',1492953709,NULL),('phabricator:20140210.projcfield.3.picmig.sql',1492953709,NULL),('phabricator:20140210.projcfield.4.memmig.sql',1492953709,NULL),('phabricator:20140210.projcfield.5.dropprofile.sql',1492953709,NULL),('phabricator:20140211.dx.1.nullablechangesetid.sql',1492953709,NULL),('phabricator:20140211.dx.2.migcommenttext.php',1492953709,NULL),('phabricator:20140211.dx.3.migsubscriptions.sql',1492953709,NULL),('phabricator:20140211.dx.999.drop.relationships.sql',1492953709,NULL),('phabricator:20140212.dx.1.armageddon.php',1492953709,NULL),('phabricator:20140214.clean.1.legacycommentid.sql',1492953709,NULL),('phabricator:20140214.clean.2.dropcomment.sql',1492953709,NULL),('phabricator:20140214.clean.3.dropinline.sql',1492953709,NULL),('phabricator:20140218.differentialdraft.sql',1492953709,NULL),('phabricator:20140218.passwords.1.extend.sql',1492953709,NULL),('phabricator:20140218.passwords.2.prefix.sql',1492953709,NULL),('phabricator:20140218.passwords.3.vcsextend.sql',1492953709,NULL),('phabricator:20140218.passwords.4.vcs.php',1492953709,NULL),('phabricator:20140223.bigutf8scratch.sql',1492953709,NULL),('phabricator:20140224.dxclean.1.datecommitted.sql',1492953709,NULL),('phabricator:20140226.dxcustom.1.fielddata.php',1492953709,NULL),('phabricator:20140226.dxcustom.99.drop.sql',1492953709,NULL),('phabricator:20140228.dxcomment.1.sql',1492953709,NULL),('phabricator:20140305.diviner.1.slugcol.sql',1492953709,NULL),('phabricator:20140305.diviner.2.slugkey.sql',1492953709,NULL),('phabricator:20140311.mdroplegacy.sql',1492953709,NULL),('phabricator:20140314.projectcolumn.1.statuscol.sql',1492953709,NULL),('phabricator:20140314.projectcolumn.2.statuskey.sql',1492953709,NULL),('phabricator:20140317.mupdatedkey.sql',1492953709,NULL),('phabricator:20140321.harbor.1.bxaction.sql',1492953709,NULL),('phabricator:20140321.mstatus.1.col.sql',1492953709,NULL),('phabricator:20140321.mstatus.2.mig.php',1492953709,NULL),('phabricator:20140323.harbor.1.renames.php',1492953709,NULL),('phabricator:20140323.harbor.2.message.sql',1492953709,NULL),('phabricator:20140325.push.1.event.sql',1492953709,NULL),('phabricator:20140325.push.2.eventphid.sql',1492953709,NULL),('phabricator:20140325.push.3.groups.php',1492953709,NULL),('phabricator:20140325.push.4.prune.sql',1492953709,NULL),('phabricator:20140326.project.1.colxaction.sql',1492953709,NULL),('phabricator:20140328.releeph.1.productxaction.sql',1492953709,NULL),('phabricator:20140330.flagtext.sql',1492953709,NULL),('phabricator:20140402.actionlog.sql',1492953709,NULL),('phabricator:20140410.accountsecret.1.sql',1492953709,NULL),('phabricator:20140410.accountsecret.2.php',1492953709,NULL),('phabricator:20140416.harbor.1.sql',1492953710,NULL),('phabricator:20140420.rel.1.objectphid.sql',1492953710,NULL),('phabricator:20140420.rel.2.objectmig.php',1492953710,NULL),('phabricator:20140421.slowvotecolumnsisclosed.sql',1492953710,NULL),('phabricator:20140423.session.1.hisec.sql',1492953710,NULL),('phabricator:20140427.mfactor.1.sql',1492953710,NULL),('phabricator:20140430.auth.1.partial.sql',1492953710,NULL),('phabricator:20140430.dash.1.paneltype.sql',1492953710,NULL),('phabricator:20140430.dash.2.edge.sql',1492953710,NULL),('phabricator:20140501.passphraselockcredential.sql',1492953710,NULL),('phabricator:20140501.remove.1.dlog.sql',1492953710,NULL),('phabricator:20140507.smstable.sql',1492953710,NULL),('phabricator:20140509.coverage.1.sql',1492953710,NULL),('phabricator:20140509.dashboardlayoutconfig.sql',1492953710,NULL),('phabricator:20140512.dparents.1.sql',1492953710,NULL),('phabricator:20140514.harbormasterbuildabletransaction.sql',1492953710,NULL),('phabricator:20140514.pholiomockclose.sql',1492953710,NULL),('phabricator:20140515.trust-emails.sql',1492953710,NULL),('phabricator:20140517.dxbinarycache.sql',1492953710,NULL),('phabricator:20140518.dxmorebinarycache.sql',1492953710,NULL),('phabricator:20140519.dashboardinstall.sql',1492953710,NULL),('phabricator:20140520.authtemptoken.sql',1492953710,NULL),('phabricator:20140521.projectslug.1.create.sql',1492953710,NULL),('phabricator:20140521.projectslug.2.mig.php',1492953710,NULL),('phabricator:20140522.projecticon.sql',1492953710,NULL),('phabricator:20140524.auth.mfa.cache.sql',1492953710,NULL),('phabricator:20140525.hunkmodern.sql',1492953710,NULL),('phabricator:20140615.pholioedit.1.sql',1492953710,NULL),('phabricator:20140615.pholioedit.2.sql',1492953710,NULL),('phabricator:20140617.daemon.explicit-argv.sql',1492953710,NULL),('phabricator:20140617.daemonlog.sql',1492953710,NULL),('phabricator:20140624.projcolor.1.sql',1492953710,NULL),('phabricator:20140624.projcolor.2.sql',1492953710,NULL),('phabricator:20140629.dasharchive.1.sql',1492953710,NULL),('phabricator:20140629.legalsig.1.sql',1492953710,NULL),('phabricator:20140629.legalsig.2.php',1492953710,NULL),('phabricator:20140701.legalexemption.1.sql',1492953710,NULL),('phabricator:20140701.legalexemption.2.sql',1492953710,NULL),('phabricator:20140703.legalcorp.1.sql',1492953710,NULL),('phabricator:20140703.legalcorp.2.sql',1492953710,NULL),('phabricator:20140703.legalcorp.3.sql',1492953710,NULL),('phabricator:20140703.legalcorp.4.sql',1492953710,NULL),('phabricator:20140703.legalcorp.5.sql',1492953710,NULL),('phabricator:20140704.harbormasterstep.1.sql',1492953710,NULL),('phabricator:20140704.harbormasterstep.2.sql',1492953710,NULL),('phabricator:20140704.legalpreamble.1.sql',1492953710,NULL),('phabricator:20140706.harbormasterdepend.1.php',1492953710,NULL),('phabricator:20140706.pedge.1.sql',1492953710,NULL),('phabricator:20140711.pnames.1.sql',1492953710,NULL),('phabricator:20140711.pnames.2.php',1492953710,NULL),('phabricator:20140711.workerpriority.sql',1492953710,NULL),('phabricator:20140712.projcoluniq.sql',1492953710,NULL),('phabricator:20140721.phortune.1.cart.sql',1492953710,NULL),('phabricator:20140721.phortune.2.purchase.sql',1492953710,NULL),('phabricator:20140721.phortune.3.charge.sql',1492953710,NULL),('phabricator:20140721.phortune.4.cartstatus.sql',1492953710,NULL),('phabricator:20140721.phortune.5.cstatusdefault.sql',1492953710,NULL),('phabricator:20140721.phortune.6.onetimecharge.sql',1492953710,NULL),('phabricator:20140721.phortune.7.nullmethod.sql',1492953710,NULL),('phabricator:20140722.appname.php',1492953710,NULL),('phabricator:20140722.audit.1.xactions.sql',1492953710,NULL),('phabricator:20140722.audit.2.comments.sql',1492953710,NULL),('phabricator:20140722.audit.3.miginlines.php',1492953710,NULL),('phabricator:20140722.audit.4.migtext.php',1492953710,NULL),('phabricator:20140722.renameauth.php',1492953710,NULL),('phabricator:20140723.apprenamexaction.sql',1492953710,NULL),('phabricator:20140725.audit.1.migxactions.php',1492953710,NULL),('phabricator:20140731.audit.1.subscribers.php',1492953710,NULL),('phabricator:20140731.cancdn.php',1492953710,NULL),('phabricator:20140731.harbormasterstepdesc.sql',1492953710,NULL),('phabricator:20140805.boardcol.1.sql',1492953710,NULL),('phabricator:20140805.boardcol.2.php',1492953710,NULL),('phabricator:20140807.harbormastertargettime.sql',1492953711,NULL),('phabricator:20140808.boardprop.1.sql',1492953711,NULL),('phabricator:20140808.boardprop.2.sql',1492953711,NULL),('phabricator:20140808.boardprop.3.php',1492953711,NULL),('phabricator:20140811.blob.1.sql',1492953711,NULL),('phabricator:20140811.blob.2.sql',1492953711,NULL),('phabricator:20140812.projkey.1.sql',1492953711,NULL),('phabricator:20140812.projkey.2.sql',1492953711,NULL),('phabricator:20140814.passphrasecredentialconduit.sql',1492953711,NULL),('phabricator:20140815.cancdncase.php',1492953711,NULL),('phabricator:20140818.harbormasterindex.1.sql',1492953711,NULL),('phabricator:20140821.harbormasterbuildgen.1.sql',1492953711,NULL),('phabricator:20140822.daemonenvhash.sql',1492953711,NULL),('phabricator:20140902.almanacdevice.1.sql',1492953711,NULL),('phabricator:20140904.macroattach.php',1492953711,NULL),('phabricator:20140911.fund.1.initiative.sql',1492953711,NULL),('phabricator:20140911.fund.2.xaction.sql',1492953711,NULL),('phabricator:20140911.fund.3.edge.sql',1492953711,NULL),('phabricator:20140911.fund.4.backer.sql',1492953711,NULL),('phabricator:20140911.fund.5.backxaction.sql',1492953711,NULL),('phabricator:20140914.betaproto.php',1492953711,NULL),('phabricator:20140917.project.canlock.sql',1492953711,NULL),('phabricator:20140918.schema.1.dropaudit.sql',1492953711,NULL),('phabricator:20140918.schema.2.dropauditinline.sql',1492953711,NULL),('phabricator:20140918.schema.3.wipecache.sql',1492953711,NULL),('phabricator:20140918.schema.4.cachetype.sql',1492953711,NULL),('phabricator:20140918.schema.5.slowvote.sql',1492953711,NULL),('phabricator:20140919.schema.01.calstatus.sql',1492953711,NULL),('phabricator:20140919.schema.02.calname.sql',1492953711,NULL),('phabricator:20140919.schema.03.dropaux.sql',1492953711,NULL),('phabricator:20140919.schema.04.droptaskproj.sql',1492953711,NULL),('phabricator:20140926.schema.01.droprelev.sql',1492953711,NULL),('phabricator:20140926.schema.02.droprelreqev.sql',1492953711,NULL),('phabricator:20140926.schema.03.dropldapinfo.sql',1492953711,NULL),('phabricator:20140926.schema.04.dropoauthinfo.sql',1492953711,NULL),('phabricator:20140926.schema.05.dropprojaffil.sql',1492953711,NULL),('phabricator:20140926.schema.06.dropsubproject.sql',1492953711,NULL),('phabricator:20140926.schema.07.droppondcom.sql',1492953711,NULL),('phabricator:20140927.schema.01.dropsearchq.sql',1492953711,NULL),('phabricator:20140927.schema.02.pholio1.sql',1492953711,NULL),('phabricator:20140927.schema.03.pholio2.sql',1492953711,NULL),('phabricator:20140927.schema.04.pholio3.sql',1492953711,NULL),('phabricator:20140927.schema.05.phragment1.sql',1492953711,NULL),('phabricator:20140927.schema.06.releeph1.sql',1492953711,NULL),('phabricator:20141001.schema.01.version.sql',1492953711,NULL),('phabricator:20141001.schema.02.taskmail.sql',1492953711,NULL),('phabricator:20141002.schema.01.liskcounter.sql',1492953711,NULL),('phabricator:20141002.schema.02.draftnull.sql',1492953711,NULL),('phabricator:20141004.currency.01.sql',1492953711,NULL),('phabricator:20141004.currency.02.sql',1492953711,NULL),('phabricator:20141004.currency.03.sql',1492953711,NULL),('phabricator:20141004.currency.04.sql',1492953711,NULL),('phabricator:20141004.currency.05.sql',1492953711,NULL),('phabricator:20141004.currency.06.sql',1492953711,NULL),('phabricator:20141004.harborliskcounter.sql',1492953711,NULL),('phabricator:20141005.phortuneproduct.sql',1492953711,NULL),('phabricator:20141006.phortunecart.sql',1492953711,NULL),('phabricator:20141006.phortunemerchant.sql',1492953711,NULL),('phabricator:20141006.phortunemerchantx.sql',1492953711,NULL),('phabricator:20141007.fundmerchant.sql',1492953711,NULL),('phabricator:20141007.fundrisks.sql',1492953711,NULL),('phabricator:20141007.fundtotal.sql',1492953711,NULL),('phabricator:20141007.phortunecartmerchant.sql',1492953711,NULL),('phabricator:20141007.phortunecharge.sql',1492953711,NULL),('phabricator:20141007.phortunepayment.sql',1492953712,NULL),('phabricator:20141007.phortuneprovider.sql',1492953712,NULL),('phabricator:20141007.phortuneproviderx.sql',1492953712,NULL),('phabricator:20141008.phortunemerchdesc.sql',1492953712,NULL),('phabricator:20141008.phortuneprovdis.sql',1492953712,NULL),('phabricator:20141008.phortunerefund.sql',1492953712,NULL),('phabricator:20141010.fundmailkey.sql',1492953712,NULL),('phabricator:20141011.phortunemerchedit.sql',1492953712,NULL),('phabricator:20141012.phortunecartxaction.sql',1492953712,NULL),('phabricator:20141013.phortunecartkey.sql',1492953712,NULL),('phabricator:20141016.almanac.device.sql',1492953712,NULL),('phabricator:20141016.almanac.dxaction.sql',1492953712,NULL),('phabricator:20141016.almanac.interface.sql',1492953712,NULL),('phabricator:20141016.almanac.network.sql',1492953712,NULL),('phabricator:20141016.almanac.nxaction.sql',1492953712,NULL),('phabricator:20141016.almanac.service.sql',1492953712,NULL),('phabricator:20141016.almanac.sxaction.sql',1492953712,NULL),('phabricator:20141017.almanac.binding.sql',1492953712,NULL),('phabricator:20141017.almanac.bxaction.sql',1492953712,NULL),('phabricator:20141025.phriction.1.xaction.sql',1492953712,NULL),('phabricator:20141025.phriction.2.xaction.sql',1492953712,NULL),('phabricator:20141025.phriction.mailkey.sql',1492953712,NULL),('phabricator:20141103.almanac.1.delprop.sql',1492953712,NULL),('phabricator:20141103.almanac.2.addprop.sql',1492953712,NULL),('phabricator:20141104.almanac.3.edge.sql',1492953712,NULL),('phabricator:20141105.ssh.1.rename.sql',1492953712,NULL),('phabricator:20141106.dropold.sql',1492953712,NULL),('phabricator:20141106.uniqdrafts.php',1492953712,NULL),('phabricator:20141107.phriction.policy.1.sql',1492953712,NULL),('phabricator:20141107.phriction.policy.2.php',1492953712,NULL),('phabricator:20141107.phriction.popkeys.php',1492953712,NULL),('phabricator:20141107.ssh.1.colname.sql',1492953712,NULL),('phabricator:20141107.ssh.2.keyhash.sql',1492953712,NULL),('phabricator:20141107.ssh.3.keyindex.sql',1492953712,NULL),('phabricator:20141107.ssh.4.keymig.php',1492953712,NULL),('phabricator:20141107.ssh.5.indexnull.sql',1492953712,NULL),('phabricator:20141107.ssh.6.indexkey.sql',1492953712,NULL),('phabricator:20141107.ssh.7.colnull.sql',1492953712,NULL),('phabricator:20141113.auditdupes.php',1492953712,NULL),('phabricator:20141118.diffxaction.sql',1492953712,NULL),('phabricator:20141119.commitpedge.sql',1492953712,NULL),('phabricator:20141119.differential.diff.policy.sql',1492953712,NULL),('phabricator:20141119.sshtrust.sql',1492953712,NULL),('phabricator:20141123.taskpriority.1.sql',1492953712,NULL),('phabricator:20141123.taskpriority.2.sql',1492953712,NULL),('phabricator:20141210.maniphestsubscribersmig.1.sql',1492953712,NULL),('phabricator:20141210.maniphestsubscribersmig.2.sql',1492953712,NULL),('phabricator:20141210.reposervice.sql',1492953712,NULL),('phabricator:20141212.conduittoken.sql',1492953712,NULL),('phabricator:20141215.almanacservicetype.sql',1492953712,NULL),('phabricator:20141217.almanacdevicelock.sql',1492953712,NULL),('phabricator:20141217.almanaclock.sql',1492953712,NULL),('phabricator:20141218.maniphestcctxn.php',1492953712,NULL),('phabricator:20141222.maniphestprojtxn.php',1492953712,NULL),('phabricator:20141223.daemonloguser.sql',1492953712,NULL),('phabricator:20141223.daemonobjectphid.sql',1492953712,NULL),('phabricator:20141230.pasteeditpolicycolumn.sql',1492953712,NULL),('phabricator:20141230.pasteeditpolicyexisting.sql',1492953712,NULL),('phabricator:20150102.policyname.php',1492953712,NULL),('phabricator:20150102.tasksubscriber.sql',1492953712,NULL),('phabricator:20150105.conpsearch.sql',1492953712,NULL),('phabricator:20150114.oauthserver.client.policy.sql',1492953713,NULL),('phabricator:20150115.applicationemails.sql',1492953713,NULL),('phabricator:20150115.trigger.1.sql',1492953713,NULL),('phabricator:20150115.trigger.2.sql',1492953713,NULL),('phabricator:20150116.maniphestapplicationemails.php',1492953713,NULL),('phabricator:20150120.maniphestdefaultauthor.php',1492953713,NULL),('phabricator:20150124.subs.1.sql',1492953713,NULL),('phabricator:20150129.pastefileapplicationemails.php',1492953713,NULL),('phabricator:20150130.phortune.1.subphid.sql',1492953713,NULL),('phabricator:20150130.phortune.2.subkey.sql',1492953713,NULL),('phabricator:20150131.phortune.1.defaultpayment.sql',1492953713,NULL),('phabricator:20150205.authprovider.autologin.sql',1492953713,NULL),('phabricator:20150205.daemonenv.sql',1492953713,NULL),('phabricator:20150209.invite.sql',1492953713,NULL),('phabricator:20150209.oauthclient.trust.sql',1492953713,NULL),('phabricator:20150210.invitephid.sql',1492953713,NULL),('phabricator:20150212.legalpad.session.1.sql',1492953713,NULL),('phabricator:20150212.legalpad.session.2.sql',1492953713,NULL),('phabricator:20150219.scratch.nonmutable.sql',1492953713,NULL),('phabricator:20150223.daemon.1.id.sql',1492953713,NULL),('phabricator:20150223.daemon.2.idlegacy.sql',1492953713,NULL),('phabricator:20150223.daemon.3.idkey.sql',1492953713,NULL),('phabricator:20150312.filechunk.1.sql',1492953713,NULL),('phabricator:20150312.filechunk.2.sql',1492953713,NULL),('phabricator:20150312.filechunk.3.sql',1492953713,NULL),('phabricator:20150317.conpherence.isroom.1.sql',1492953713,NULL),('phabricator:20150317.conpherence.isroom.2.sql',1492953713,NULL),('phabricator:20150317.conpherence.policy.sql',1492953713,NULL),('phabricator:20150410.nukeruleedit.sql',1492953713,NULL),('phabricator:20150420.invoice.1.sql',1492953713,NULL),('phabricator:20150420.invoice.2.sql',1492953713,NULL),('phabricator:20150425.isclosed.sql',1492953713,NULL),('phabricator:20150427.calendar.1.edge.sql',1492953713,NULL),('phabricator:20150427.calendar.1.xaction.sql',1492953713,NULL),('phabricator:20150427.calendar.2.xaction.sql',1492953713,NULL),('phabricator:20150428.calendar.1.iscancelled.sql',1492953713,NULL),('phabricator:20150428.calendar.1.name.sql',1492953713,NULL),('phabricator:20150429.calendar.1.invitee.sql',1492953713,NULL),('phabricator:20150430.calendar.1.policies.sql',1492953713,NULL),('phabricator:20150430.multimeter.1.sql',1492953713,NULL),('phabricator:20150430.multimeter.2.host.sql',1492953713,NULL),('phabricator:20150430.multimeter.3.viewer.sql',1492953713,NULL),('phabricator:20150430.multimeter.4.context.sql',1492953713,NULL),('phabricator:20150430.multimeter.5.label.sql',1492953713,NULL),('phabricator:20150501.calendar.1.reply.sql',1492953713,NULL),('phabricator:20150501.calendar.2.reply.php',1492953713,NULL),('phabricator:20150501.conpherencepics.sql',1492953713,NULL),('phabricator:20150503.repositorysymbols.1.sql',1492953713,NULL),('phabricator:20150503.repositorysymbols.2.php',1492953713,NULL),('phabricator:20150503.repositorysymbols.3.sql',1492953713,NULL),('phabricator:20150504.symbolsproject.1.php',1492953713,NULL),('phabricator:20150504.symbolsproject.2.sql',1492953713,NULL),('phabricator:20150506.calendarunnamedevents.1.php',1492953713,NULL),('phabricator:20150507.calendar.1.isallday.sql',1492953713,NULL),('phabricator:20150513.user.cache.1.sql',1492953713,NULL),('phabricator:20150514.calendar.status.sql',1492953713,NULL),('phabricator:20150514.phame.blog.xaction.sql',1492953713,NULL),('phabricator:20150514.user.cache.2.sql',1492953713,NULL),('phabricator:20150515.phame.post.xaction.sql',1492953713,NULL),('phabricator:20150515.project.mailkey.1.sql',1492953713,NULL),('phabricator:20150515.project.mailkey.2.php',1492953713,NULL),('phabricator:20150519.calendar.calendaricon.sql',1492953713,NULL),('phabricator:20150521.releephrepository.sql',1492953713,NULL),('phabricator:20150525.diff.hidden.1.sql',1492953713,NULL),('phabricator:20150526.owners.mailkey.1.sql',1492953713,NULL),('phabricator:20150526.owners.mailkey.2.php',1492953713,NULL),('phabricator:20150526.owners.xaction.sql',1492953713,NULL),('phabricator:20150527.calendar.recurringevents.sql',1492953713,NULL),('phabricator:20150601.spaces.1.namespace.sql',1492953713,NULL),('phabricator:20150601.spaces.2.xaction.sql',1492953714,NULL),('phabricator:20150602.mlist.1.sql',1492953714,NULL),('phabricator:20150602.mlist.2.php',1492953714,NULL),('phabricator:20150604.spaces.1.sql',1492953714,NULL),('phabricator:20150605.diviner.edges.sql',1492953714,NULL),('phabricator:20150605.diviner.editPolicy.sql',1492953714,NULL),('phabricator:20150605.diviner.xaction.sql',1492953714,NULL),('phabricator:20150606.mlist.1.php',1492953714,NULL),('phabricator:20150609.inline.sql',1492953714,NULL),('phabricator:20150609.spaces.1.pholio.sql',1492953714,NULL),('phabricator:20150609.spaces.2.maniphest.sql',1492953714,NULL),('phabricator:20150610.spaces.1.desc.sql',1492953714,NULL),('phabricator:20150610.spaces.2.edge.sql',1492953714,NULL),('phabricator:20150610.spaces.3.archive.sql',1492953714,NULL),('phabricator:20150611.spaces.1.mailxaction.sql',1492953714,NULL),('phabricator:20150611.spaces.2.appmail.sql',1492953714,NULL),('phabricator:20150616.divinerrepository.sql',1492953714,NULL),('phabricator:20150617.harbor.1.lint.sql',1492953714,NULL),('phabricator:20150617.harbor.2.unit.sql',1492953714,NULL),('phabricator:20150618.harbor.1.planauto.sql',1492953714,NULL),('phabricator:20150618.harbor.2.stepauto.sql',1492953714,NULL),('phabricator:20150618.harbor.3.buildauto.sql',1492953714,NULL),('phabricator:20150619.conpherencerooms.1.sql',1492953714,NULL),('phabricator:20150619.conpherencerooms.2.sql',1492953714,NULL),('phabricator:20150619.conpherencerooms.3.sql',1492953714,NULL),('phabricator:20150621.phrase.1.sql',1492953714,NULL),('phabricator:20150621.phrase.2.sql',1492953714,NULL),('phabricator:20150622.bulk.1.job.sql',1492953714,NULL),('phabricator:20150622.bulk.2.task.sql',1492953714,NULL),('phabricator:20150622.bulk.3.xaction.sql',1492953714,NULL),('phabricator:20150622.bulk.4.edge.sql',1492953714,NULL),('phabricator:20150622.metamta.1.phid-col.sql',1492953714,NULL),('phabricator:20150622.metamta.2.phid-mig.php',1492953714,NULL),('phabricator:20150622.metamta.3.phid-key.sql',1492953714,NULL),('phabricator:20150622.metamta.4.actor-phid-col.sql',1492953714,NULL),('phabricator:20150622.metamta.5.actor-phid-mig.php',1492953714,NULL),('phabricator:20150622.metamta.6.actor-phid-key.sql',1492953714,NULL),('phabricator:20150624.spaces.1.repo.sql',1492953714,NULL),('phabricator:20150626.spaces.1.calendar.sql',1492953714,NULL),('phabricator:20150630.herald.1.sql',1492953714,NULL),('phabricator:20150630.herald.2.sql',1492953714,NULL),('phabricator:20150701.herald.1.sql',1492953714,NULL),('phabricator:20150701.herald.2.sql',1492953714,NULL),('phabricator:20150702.spaces.1.slowvote.sql',1492953714,NULL),('phabricator:20150706.herald.1.sql',1492953714,NULL),('phabricator:20150707.herald.1.sql',1492953714,NULL),('phabricator:20150708.arcanistproject.sql',1492953714,NULL),('phabricator:20150708.herald.1.sql',1492953714,NULL),('phabricator:20150708.herald.2.sql',1492953714,NULL),('phabricator:20150708.herald.3.sql',1492953714,NULL),('phabricator:20150712.badges.1.sql',1492953714,NULL),('phabricator:20150714.spaces.countdown.1.sql',1492953714,NULL),('phabricator:20150717.herald.1.sql',1492953714,NULL),('phabricator:20150719.countdown.1.sql',1492953714,NULL),('phabricator:20150719.countdown.2.sql',1492953714,NULL),('phabricator:20150719.countdown.3.sql',1492953714,NULL),('phabricator:20150721.phurl.1.url.sql',1492953714,NULL),('phabricator:20150721.phurl.2.xaction.sql',1492953714,NULL),('phabricator:20150721.phurl.3.xactioncomment.sql',1492953714,NULL),('phabricator:20150721.phurl.4.url.sql',1492953714,NULL),('phabricator:20150721.phurl.5.edge.sql',1492953714,NULL),('phabricator:20150721.phurl.6.alias.sql',1492953714,NULL),('phabricator:20150721.phurl.7.authorphid.sql',1492953714,NULL),('phabricator:20150722.dashboard.1.sql',1492953714,NULL),('phabricator:20150722.dashboard.2.sql',1492953714,NULL),('phabricator:20150723.countdown.1.sql',1492953714,NULL),('phabricator:20150724.badges.comments.1.sql',1492953714,NULL),('phabricator:20150724.countdown.comments.1.sql',1492953714,NULL),('phabricator:20150725.badges.mailkey.1.sql',1492953714,NULL),('phabricator:20150725.badges.mailkey.2.php',1492953714,NULL),('phabricator:20150725.badges.viewpolicy.3.sql',1492953714,NULL),('phabricator:20150725.countdown.mailkey.1.sql',1492953714,NULL),('phabricator:20150725.countdown.mailkey.2.php',1492953714,NULL),('phabricator:20150725.slowvote.mailkey.1.sql',1492953714,NULL),('phabricator:20150725.slowvote.mailkey.2.php',1492953714,NULL),('phabricator:20150727.heraldaction.1.sql',1492953715,NULL),('phabricator:20150730.herald.1.sql',1492953715,NULL),('phabricator:20150730.herald.2.sql',1492953715,NULL),('phabricator:20150730.herald.3.sql',1492953715,NULL),('phabricator:20150730.herald.4.sql',1492953715,NULL),('phabricator:20150730.herald.5.sql',1492953715,NULL),('phabricator:20150730.herald.6.sql',1492953715,NULL),('phabricator:20150730.herald.7.sql',1492953715,NULL),('phabricator:20150803.herald.1.sql',1492953715,NULL),('phabricator:20150803.herald.2.sql',1492953715,NULL),('phabricator:20150804.ponder.answer.mailkey.1.sql',1492953715,NULL),('phabricator:20150804.ponder.answer.mailkey.2.php',1492953715,NULL),('phabricator:20150804.ponder.question.1.sql',1492953715,NULL),('phabricator:20150804.ponder.question.2.sql',1492953715,NULL),('phabricator:20150804.ponder.question.3.sql',1492953715,NULL),('phabricator:20150804.ponder.spaces.4.sql',1492953715,NULL),('phabricator:20150805.paste.status.1.sql',1492953715,NULL),('phabricator:20150805.paste.status.2.sql',1492953715,NULL),('phabricator:20150806.ponder.answer.1.sql',1492953715,NULL),('phabricator:20150806.ponder.editpolicy.2.sql',1492953715,NULL),('phabricator:20150806.ponder.status.1.sql',1492953715,NULL),('phabricator:20150806.ponder.status.2.sql',1492953715,NULL),('phabricator:20150806.ponder.status.3.sql',1492953715,NULL),('phabricator:20150808.ponder.vote.1.sql',1492953715,NULL),('phabricator:20150808.ponder.vote.2.sql',1492953715,NULL),('phabricator:20150812.ponder.answer.1.sql',1492953715,NULL),('phabricator:20150812.ponder.answer.2.sql',1492953715,NULL),('phabricator:20150814.harbormater.artifact.phid.sql',1492953715,NULL),('phabricator:20150815.owners.status.1.sql',1492953715,NULL),('phabricator:20150815.owners.status.2.sql',1492953715,NULL),('phabricator:20150823.nuance.queue.1.sql',1492953715,NULL),('phabricator:20150823.nuance.queue.2.sql',1492953715,NULL),('phabricator:20150823.nuance.queue.3.sql',1492953715,NULL),('phabricator:20150823.nuance.queue.4.sql',1492953715,NULL),('phabricator:20150828.ponder.wiki.1.sql',1492953715,NULL),('phabricator:20150829.ponder.dupe.1.sql',1492953715,NULL),('phabricator:20150904.herald.1.sql',1492953715,NULL),('phabricator:20150906.mailinglist.sql',1492953715,NULL),('phabricator:20150910.owners.custom.1.sql',1492953715,NULL),('phabricator:20150916.drydock.slotlocks.1.sql',1492953715,NULL),('phabricator:20150922.drydock.commands.1.sql',1492953715,NULL),('phabricator:20150923.drydock.resourceid.1.sql',1492953715,NULL),('phabricator:20150923.drydock.resourceid.2.sql',1492953715,NULL),('phabricator:20150923.drydock.resourceid.3.sql',1492953715,NULL),('phabricator:20150923.drydock.taskid.1.sql',1492953715,NULL),('phabricator:20150924.drydock.disable.1.sql',1492953715,NULL),('phabricator:20150924.drydock.status.1.sql',1492953715,NULL),('phabricator:20150928.drydock.rexpire.1.sql',1492953715,NULL),('phabricator:20150930.drydock.log.1.sql',1492953715,NULL),('phabricator:20151001.drydock.rname.1.sql',1492953715,NULL),('phabricator:20151002.dashboard.status.1.sql',1492953715,NULL),('phabricator:20151002.harbormaster.bparam.1.sql',1492953715,NULL),('phabricator:20151009.drydock.auth.1.sql',1492953715,NULL),('phabricator:20151010.drydock.auth.2.sql',1492953715,NULL),('phabricator:20151013.drydock.op.1.sql',1492953715,NULL),('phabricator:20151023.harborpolicy.1.sql',1492953715,NULL),('phabricator:20151023.harborpolicy.2.php',1492953715,NULL),('phabricator:20151023.patchduration.sql',1492953715,13609),('phabricator:20151030.harbormaster.initiator.sql',1492953715,29433),('phabricator:20151106.editengine.1.table.sql',1492953715,8624),('phabricator:20151106.editengine.2.xactions.sql',1492953715,6593),('phabricator:20151106.phame.post.mailkey.1.sql',1492953715,19247),('phabricator:20151106.phame.post.mailkey.2.php',1492953715,1219),('phabricator:20151107.phame.blog.mailkey.1.sql',1492953715,37986),('phabricator:20151107.phame.blog.mailkey.2.php',1492953715,704),('phabricator:20151108.phame.blog.joinpolicy.sql',1492953715,44574),('phabricator:20151108.xhpast.stderr.sql',1492953715,43870),('phabricator:20151109.phame.post.comments.1.sql',1492953716,7807),('phabricator:20151109.repository.coverage.1.sql',1492953716,943),('phabricator:20151109.xhpast.db.1.sql',1492953716,1093),('phabricator:20151109.xhpast.db.2.sql',1492953716,490),('phabricator:20151110.daemonenvhash.sql',1492953716,34291),('phabricator:20151111.phame.blog.archive.1.sql',1492953716,17601),('phabricator:20151111.phame.blog.archive.2.sql',1492953716,398),('phabricator:20151112.herald.edge.sql',1492953716,15285),('phabricator:20151116.owners.edge.sql',1492953716,13252),('phabricator:20151128.phame.blog.picture.1.sql',1492953716,18001),('phabricator:20151130.phurl.mailkey.1.sql',1492953716,11335),('phabricator:20151130.phurl.mailkey.2.php',1492953716,992),('phabricator:20151202.versioneddraft.1.sql',1492953716,7153),('phabricator:20151207.editengine.1.sql',1492953716,72200),('phabricator:20151210.land.1.refphid.sql',1492953716,13730),('phabricator:20151210.land.2.refphid.php',1492953716,629),('phabricator:20151215.phame.1.autotitle.sql',1492953716,19593),('phabricator:20151218.key.1.keyphid.sql',1492953716,14029),('phabricator:20151218.key.2.keyphid.php',1492953716,375),('phabricator:20151219.proj.01.prislug.sql',1492953716,21886),('phabricator:20151219.proj.02.prislugkey.sql',1492953716,12589),('phabricator:20151219.proj.03.copyslug.sql',1492953716,388),('phabricator:20151219.proj.04.dropslugkey.sql',1492953716,6623),('phabricator:20151219.proj.05.dropslug.sql',1492953716,19905),('phabricator:20151219.proj.06.defaultpolicy.php',1492953716,795),('phabricator:20151219.proj.07.viewnull.sql',1492953716,17884),('phabricator:20151219.proj.08.editnull.sql',1492953716,10628),('phabricator:20151219.proj.09.joinnull.sql',1492953716,9450),('phabricator:20151219.proj.10.subcolumns.sql',1492953716,141357),('phabricator:20151219.proj.11.subprojectphids.sql',1492953716,22236),('phabricator:20151221.search.1.version.sql',1492953716,10587),('phabricator:20151221.search.2.ownersngrams.sql',1492953716,7323),('phabricator:20151221.search.3.reindex.php',1492953716,310),('phabricator:20151223.proj.01.paths.sql',1492953716,21893),('phabricator:20151223.proj.02.depths.sql',1492953716,28023),('phabricator:20151223.proj.03.pathkey.sql',1492953716,13779),('phabricator:20151223.proj.04.keycol.sql',1492953716,29651),('phabricator:20151223.proj.05.updatekeys.php',1492953716,375),('phabricator:20151223.proj.06.uniq.sql',1492953716,11845),('phabricator:20151226.reop.1.sql',1492953716,17667),('phabricator:20151227.proj.01.materialize.sql',1492953716,422),('phabricator:20151231.proj.01.icon.php',1492953716,1539),('phabricator:20160102.badges.award.sql',1492953716,8429),('phabricator:20160110.repo.01.slug.sql',1492953716,36030),('phabricator:20160110.repo.02.slug.php',1492953716,407),('phabricator:20160111.repo.01.slugx.sql',1492953716,639),('phabricator:20160112.repo.01.uri.sql',1492953716,9469),('phabricator:20160112.repo.02.uri.index.php',1492953716,80),('phabricator:20160113.propanel.1.storage.sql',1492953716,6940),('phabricator:20160113.propanel.2.xaction.sql',1492953716,7108),('phabricator:20160119.project.1.silence.sql',1492953716,457),('phabricator:20160122.project.1.boarddefault.php',1492953716,755),('phabricator:20160124.people.1.icon.sql',1492953716,12766),('phabricator:20160124.people.2.icondefault.sql',1492953716,351),('phabricator:20160128.repo.1.pull.sql',1492953716,9469),('phabricator:20160201.revision.properties.1.sql',1492953716,17863),('phabricator:20160201.revision.properties.2.sql',1492953716,370),('phabricator:20160202.board.1.proxy.sql',1492953716,18324),('phabricator:20160202.ipv6.1.sql',1492953716,18661),('phabricator:20160202.ipv6.2.php',1492953716,1141),('phabricator:20160206.cover.1.sql',1492953716,40105),('phabricator:20160208.task.1.sql',1492953716,35042),('phabricator:20160208.task.2.sql',1492953716,32770),('phabricator:20160208.task.3.sql',1492953716,34137),('phabricator:20160212.proj.1.sql',1492953717,29561),('phabricator:20160212.proj.2.sql',1492953717,314),('phabricator:20160215.owners.policy.1.sql',1492953717,18003),('phabricator:20160215.owners.policy.2.sql',1492953717,17598),('phabricator:20160215.owners.policy.3.sql',1492953717,387),('phabricator:20160215.owners.policy.4.sql',1492953717,291),('phabricator:20160218.callsigns.1.sql',1492953717,10721),('phabricator:20160221.almanac.1.devicen.sql',1492953717,8045),('phabricator:20160221.almanac.2.devicei.php',1492953717,965),('phabricator:20160221.almanac.3.servicen.sql',1492953717,5846),('phabricator:20160221.almanac.4.servicei.php',1492953717,510),('phabricator:20160221.almanac.5.networkn.sql',1492953717,6516),('phabricator:20160221.almanac.6.networki.php',1492953717,813),('phabricator:20160221.almanac.7.namespacen.sql',1492953717,6664),('phabricator:20160221.almanac.8.namespace.sql',1492953717,7358),('phabricator:20160221.almanac.9.namespacex.sql',1492953717,7375),('phabricator:20160222.almanac.1.properties.php',1492953717,1075),('phabricator:20160223.almanac.1.bound.sql',1492953717,15258),('phabricator:20160223.almanac.2.lockbind.sql',1492953717,363),('phabricator:20160223.almanac.3.devicelock.sql',1492953717,28139),('phabricator:20160223.almanac.4.servicelock.sql',1492953717,24328),('phabricator:20160223.paste.fileedges.php',1492953717,552),('phabricator:20160225.almanac.1.disablebinding.sql',1492953717,20577),('phabricator:20160225.almanac.2.stype.sql',1492953717,6572),('phabricator:20160225.almanac.3.stype.php',1492953717,402),('phabricator:20160227.harbormaster.1.plann.sql',1492953717,8121),('phabricator:20160227.harbormaster.2.plani.php',1492953717,346),('phabricator:20160303.drydock.1.bluen.sql',1492953717,7287),('phabricator:20160303.drydock.2.bluei.php',1492953717,355),('phabricator:20160303.drydock.3.edge.sql',1492953717,13334),('phabricator:20160308.nuance.01.disabled.sql',1492953717,16961),('phabricator:20160308.nuance.02.cursordata.sql',1492953717,7361),('phabricator:20160308.nuance.03.sourcen.sql',1492953717,6397),('phabricator:20160308.nuance.04.sourcei.php',1492953717,1144),('phabricator:20160308.nuance.05.sourcename.sql',1492953717,11455),('phabricator:20160308.nuance.06.label.sql',1492953717,18960),('phabricator:20160308.nuance.07.itemtype.sql',1492953717,22009),('phabricator:20160308.nuance.08.itemkey.sql',1492953717,21836),('phabricator:20160308.nuance.09.itemcontainer.sql',1492953717,21988),('phabricator:20160308.nuance.10.itemkeyu.sql',1492953717,366),('phabricator:20160308.nuance.11.requestor.sql',1492953717,11681),('phabricator:20160308.nuance.12.queue.sql',1492953717,22125),('phabricator:20160316.lfs.01.token.resource.sql',1492953717,19283),('phabricator:20160316.lfs.02.token.user.sql',1492953717,16100),('phabricator:20160316.lfs.03.token.properties.sql',1492953717,16663),('phabricator:20160316.lfs.04.token.default.sql',1492953717,369),('phabricator:20160317.lfs.01.ref.sql',1492953717,6665),('phabricator:20160321.nuance.01.taskbridge.sql',1492953717,29611),('phabricator:20160322.nuance.01.itemcommand.sql',1492953717,8177),('phabricator:20160323.badgemigrate.sql',1492953717,884),('phabricator:20160329.nuance.01.requestor.sql',1492953717,1317),('phabricator:20160329.nuance.02.requestorsource.sql',1492953717,1457),('phabricator:20160329.nuance.03.requestorxaction.sql',1492953717,1284),('phabricator:20160329.nuance.04.requestorcomment.sql',1492953717,1283),('phabricator:20160330.badges.migratequality.sql',1492953717,11262),('phabricator:20160330.badges.qualityxaction.mig.sql',1492953717,1541),('phabricator:20160331.fund.comments.1.sql',1492953717,6270),('phabricator:20160404.oauth.1.xaction.sql',1492953717,5694),('phabricator:20160405.oauth.2.disable.sql',1492953717,13715),('phabricator:20160406.badges.ngrams.php',1492953717,526),('phabricator:20160406.badges.ngrams.sql',1492953717,11583),('phabricator:20160406.columns.1.php',1492953717,524),('phabricator:20160411.repo.1.version.sql',1492953717,5926),('phabricator:20160418.repouri.1.sql',1492953717,5583),('phabricator:20160418.repouri.2.sql',1492953717,10524),('phabricator:20160418.repoversion.1.sql',1492953717,13780),('phabricator:20160419.pushlog.1.sql',1492953717,25781),('phabricator:20160424.locks.1.sql',1492953717,14645),('phabricator:20160426.searchedge.sql',1492953717,13370),('phabricator:20160428.repo.1.urixaction.sql',1492953717,7961),('phabricator:20160503.repo.01.lpath.sql',1492953717,62415),('phabricator:20160503.repo.02.lpathkey.sql',1492953717,25518),('phabricator:20160503.repo.03.lpathmigrate.php',1492953717,556),('phabricator:20160503.repo.04.mirrormigrate.php',1492953717,493),('phabricator:20160503.repo.05.urimigrate.php',1492953717,418),('phabricator:20160510.repo.01.uriindex.php',1492953717,4833),('phabricator:20160513.owners.01.autoreview.sql',1492953717,32054),('phabricator:20160513.owners.02.autoreviewnone.sql',1492953717,499),('phabricator:20160516.owners.01.dominion.sql',1492953717,14616),('phabricator:20160516.owners.02.dominionstrong.sql',1492953717,323),('phabricator:20160517.oauth.01.edge.sql',1492953717,11629),('phabricator:20160518.ssh.01.activecol.sql',1492953717,13262),('phabricator:20160518.ssh.02.activeval.sql',1492953717,282),('phabricator:20160518.ssh.03.activekey.sql',1492953717,21706),('phabricator:20160519.ssh.01.xaction.sql',1492953717,8147),('phabricator:20160531.pref.01.xaction.sql',1492953717,6483),('phabricator:20160531.pref.02.datecreatecol.sql',1492953717,12856),('phabricator:20160531.pref.03.datemodcol.sql',1492953717,14408),('phabricator:20160531.pref.04.datecreateval.sql',1492953717,367),('phabricator:20160531.pref.05.datemodval.sql',1492953717,298),('phabricator:20160531.pref.06.phidcol.sql',1492953717,16950),('phabricator:20160531.pref.07.phidval.php',1492953717,603),('phabricator:20160601.user.01.cache.sql',1492953717,8935),('phabricator:20160601.user.02.copyprefs.php',1492953717,1423),('phabricator:20160601.user.03.removetime.sql',1492953718,20344),('phabricator:20160601.user.04.removetranslation.sql',1492953718,21336),('phabricator:20160601.user.05.removesex.sql',1492953718,23471),('phabricator:20160603.user.01.removedcenabled.sql',1492953718,20090),('phabricator:20160603.user.02.removedctab.sql',1492953718,19685),('phabricator:20160603.user.03.removedcvisible.sql',1492953718,20696),('phabricator:20160604.user.01.stringmailprefs.php',1492953718,457),('phabricator:20160604.user.02.removeimagecache.sql',1492953718,19842),('phabricator:20160605.user.01.prefnulluser.sql',1492953718,12045),('phabricator:20160605.user.02.prefbuiltin.sql',1492953718,12871),('phabricator:20160605.user.03.builtinunique.sql',1492953718,10637),('phabricator:20160616.phame.blog.header.1.sql',1492953718,15672),('phabricator:20160616.repo.01.oldref.sql',1492953718,6173),('phabricator:20160617.harbormaster.01.arelease.sql',1492953718,15915),('phabricator:20160618.phame.blog.subtitle.sql',1492953718,15243),('phabricator:20160620.phame.blog.parentdomain.2.sql',1492953718,15398),('phabricator:20160620.phame.blog.parentsite.1.sql',1492953718,16059),('phabricator:20160623.phame.blog.fulldomain.1.sql',1492953718,16216),('phabricator:20160623.phame.blog.fulldomain.2.sql',1492953718,383),('phabricator:20160623.phame.blog.fulldomain.3.sql',1492953718,427),('phabricator:20160706.phame.blog.parentdomain.2.sql',1492953718,17416),('phabricator:20160706.phame.blog.parentsite.1.sql',1492953718,15821),('phabricator:20160707.calendar.01.stub.sql',1492953718,15805),('phabricator:20160711.files.01.builtin.sql',1492953718,23541),('phabricator:20160711.files.02.builtinkey.sql',1492953718,11421),('phabricator:20160713.event.01.host.sql',1492953718,11510),('phabricator:20160715.event.01.alldayfrom.sql',1492953718,17347),('phabricator:20160715.event.02.alldayto.sql',1492953718,16771),('phabricator:20160715.event.03.allday.php',1492953718,65),('phabricator:20160720.calendar.invitetxn.php',1492953718,1008),('phabricator:20160721.pack.01.pub.sql',1492953718,11271),('phabricator:20160721.pack.02.pubxaction.sql',1492953718,7364),('phabricator:20160721.pack.03.edge.sql',1492953718,13426),('phabricator:20160721.pack.04.pkg.sql',1492953718,7126),('phabricator:20160721.pack.05.pkgxaction.sql',1492953718,6996),('phabricator:20160721.pack.06.version.sql',1492953718,7508),('phabricator:20160721.pack.07.versionxaction.sql',1492953718,7013),('phabricator:20160722.pack.01.pubngrams.sql',1492953718,6915),('phabricator:20160722.pack.02.pkgngrams.sql',1492953718,7627),('phabricator:20160722.pack.03.versionngrams.sql',1492953718,7239),('phabricator:20160810.commit.01.summarylength.sql',1492953718,11762),('phabricator:20160824.connectionlog.sql',1492953718,1222),('phabricator:20160824.repohint.01.hint.sql',1492953718,6193),('phabricator:20160824.repohint.02.movebad.php',1492953718,459),('phabricator:20160824.repohint.03.nukebad.sql',1492953718,1167),('phabricator:20160825.ponder.sql',1492953718,719),('phabricator:20160829.pastebin.01.language.sql',1492953718,10809),('phabricator:20160829.pastebin.02.language.sql',1492953718,514),('phabricator:20160913.conpherence.topic.1.sql',1492953718,11994),('phabricator:20160919.repo.messagecount.sql',1492953718,13142),('phabricator:20160919.repo.messagedefault.sql',1492953718,7514),('phabricator:20160921.fileexternalrequest.sql',1492953718,6953),('phabricator:20160927.phurl.ngrams.php',1492953718,375),('phabricator:20160927.phurl.ngrams.sql',1492953718,7421),('phabricator:20160928.repo.messagecount.sql',1492953718,381),('phabricator:20160928.tokentoken.sql',1492953718,6865),('phabricator:20161003.cal.01.utcepoch.sql',1492953718,55561),('phabricator:20161003.cal.02.parameters.sql',1492953718,16511),('phabricator:20161004.cal.01.noepoch.php',1492953718,1626),('phabricator:20161005.cal.01.rrules.php',1492953718,276),('phabricator:20161005.cal.02.export.sql',1492953718,9626),('phabricator:20161005.cal.03.exportxaction.sql',1492953718,7148),('phabricator:20161005.conpherence.image.1.sql',1492953718,12044),('phabricator:20161005.conpherence.image.2.php',1492953718,340),('phabricator:20161011.conpherence.ngrams.php',1492953718,313),('phabricator:20161011.conpherence.ngrams.sql',1492953718,9940),('phabricator:20161012.cal.01.import.sql',1492953718,7387),('phabricator:20161012.cal.02.importxaction.sql',1492953718,6560),('phabricator:20161012.cal.03.eventimport.sql',1492953718,64748),('phabricator:20161013.cal.01.importlog.sql',1492953718,6363),('phabricator:20161016.conpherence.imagephids.sql',1492953718,11462),('phabricator:20161025.phortune.contact.1.sql',1492953718,13783),('phabricator:20161025.phortune.merchant.image.1.sql',1492953718,12905),('phabricator:20161026.calendar.01.importtriggers.sql',1492953718,29953),('phabricator:20161027.calendar.01.externalinvitee.sql',1492953718,7485),('phabricator:20161029.phortune.invoice.1.sql',1492953718,36760),('phabricator:20161031.calendar.01.seriesparent.sql',1492953718,18327),('phabricator:20161031.calendar.02.notifylog.sql',1492953718,8078),('phabricator:20161101.calendar.01.noholiday.sql',1492953718,1286),('phabricator:20161101.calendar.02.removecolumns.sql',1492953719,93220),('phabricator:20161104.calendar.01.availability.sql',1492953719,16257),('phabricator:20161104.calendar.02.availdefault.sql',1492953719,430),('phabricator:20161115.phamepost.01.subtitle.sql',1492953719,17588),('phabricator:20161115.phamepost.02.header.sql',1492953719,16388),('phabricator:20161121.cluster.01.hoststate.sql',1492953719,8311),('phabricator:20161124.search.01.stopwords.sql',1492953719,7121),('phabricator:20161125.search.01.stemmed.sql',1492953719,6287),('phabricator:20161130.search.01.manual.sql',1492953719,6232),('phabricator:20161130.search.02.rebuild.php',1492953719,2751),('phabricator:20161210.dashboards.01.author.sql',1492953719,12555),('phabricator:20161210.dashboards.02.author.php',1492953719,746),('phabricator:20161211.menu.01.itemkey.sql',1492953719,8205),('phabricator:20161211.menu.02.itemprops.sql',1492953719,6574),('phabricator:20161211.menu.03.order.sql',1492953719,5930),('phabricator:20161212.dashboardpanel.01.author.sql',1492953719,11841),('phabricator:20161212.dashboardpanel.02.author.php',1492953719,730),('phabricator:20161212.dashboards.01.icon.sql',1492953719,14194),('phabricator:20161213.diff.01.hunks.php',1492953719,542),('phabricator:20161216.dashboard.ngram.01.sql',1492953719,15640),('phabricator:20161216.dashboard.ngram.02.php',1492953719,675),('phabricator:20170106.menu.01.customphd.sql',1492953719,12003),('phabricator:20170109.diff.01.commit.sql',1492953719,16340),('phabricator:20170119.menuitem.motivator.01.php',1492953719,219),('phabricator:20170131.dashboard.personal.01.php',1492953719,672),('phabricator:20170301.subtype.01.col.sql',1492953719,16642),('phabricator:20170301.subtype.02.default.sql',1492953719,394),('phabricator:20170301.subtype.03.taskcol.sql',1492953719,28706),('phabricator:20170301.subtype.04.taskdefault.sql',1492953719,375),('phabricator:20170303.people.01.avatar.sql',1492953719,50756),('phabricator:20170313.reviewers.01.sql',1492953719,9787),('phabricator:20170316.rawfiles.01.php',1492953719,993),('phabricator:20170320.reviewers.01.lastaction.sql',1492953719,13463),('phabricator:20170320.reviewers.02.lastcomment.sql',1492953719,16623),('phabricator:20170320.reviewers.03.migrate.php',1492953719,787),('phabricator:20170322.reviewers.04.actor.sql',1492953719,19471),('phabricator:20170328.reviewers.01.void.sql',1492953719,15326),('phabricator:20170406.hmac.01.keystore.sql',1492953719,7476),('phabricator:20170410.calendar.01.repair.php',1492953719,445),('phabricator:20170412.conpherence.01.picturecrop.sql',1492953719,287),('phabricator:20170413.conpherence.01.recentparty.sql',1492953719,11813),('phabricator:20170417.files.ngrams.sql',1492953719,9145),('phabricator:20170418.1.application.01.xaction.sql',1492953719,6782),('phabricator:20170418.1.application.02.edge.sql',1492953719,12783),('phabricator:20170418.files.isDeleted.sql',1492953719,26882),('phabricator:20170419.app.01.table.sql',1492953719,9433),('phabricator:20170419.thread.01.behind.sql',1492953719,17501),('phabricator:20170419.thread.02.status.sql',1492953719,18503),('phabricator:20170419.thread.03.touched.sql',1492953719,20247),('phabricator:daemonstatus.sql',1492953704,NULL),('phabricator:daemonstatuskey.sql',1492953704,NULL),('phabricator:daemontaskarchive.sql',1492953705,NULL),('phabricator:db.almanac',1492953699,NULL),('phabricator:db.application',1492953699,NULL),('phabricator:db.audit',1492953699,NULL),('phabricator:db.auth',1492953699,NULL),('phabricator:db.badges',1492953699,NULL),('phabricator:db.cache',1492953699,NULL),('phabricator:db.calendar',1492953699,NULL),('phabricator:db.chatlog',1492953699,NULL),('phabricator:db.conduit',1492953699,NULL),('phabricator:db.config',1492953699,NULL),('phabricator:db.conpherence',1492953699,NULL),('phabricator:db.countdown',1492953699,NULL),('phabricator:db.daemon',1492953699,NULL),('phabricator:db.dashboard',1492953699,NULL),('phabricator:db.differential',1492953699,NULL),('phabricator:db.diviner',1492953699,NULL),('phabricator:db.doorkeeper',1492953699,NULL),('phabricator:db.draft',1492953699,NULL),('phabricator:db.drydock',1492953699,NULL),('phabricator:db.fact',1492953699,NULL),('phabricator:db.feed',1492953699,NULL),('phabricator:db.file',1492953699,NULL),('phabricator:db.flag',1492953699,NULL),('phabricator:db.fund',1492953699,NULL),('phabricator:db.harbormaster',1492953699,NULL),('phabricator:db.herald',1492953699,NULL),('phabricator:db.legalpad',1492953699,NULL),('phabricator:db.maniphest',1492953699,NULL),('phabricator:db.meta_data',1492953699,NULL),('phabricator:db.metamta',1492953699,NULL),('phabricator:db.multimeter',1492953699,NULL),('phabricator:db.nuance',1492953699,NULL),('phabricator:db.oauth_server',1492953699,NULL),('phabricator:db.owners',1492953699,NULL),('phabricator:db.packages',1492953699,NULL),('phabricator:db.passphrase',1492953699,NULL),('phabricator:db.pastebin',1492953699,NULL),('phabricator:db.phame',1492953699,NULL),('phabricator:db.phlux',1492953699,NULL),('phabricator:db.pholio',1492953699,NULL),('phabricator:db.phortune',1492953699,NULL),('phabricator:db.phragment',1492953699,NULL),('phabricator:db.phrequent',1492953699,NULL),('phabricator:db.phriction',1492953699,NULL),('phabricator:db.phurl',1492953699,NULL),('phabricator:db.policy',1492953699,NULL),('phabricator:db.ponder',1492953699,NULL),('phabricator:db.project',1492953699,NULL),('phabricator:db.releeph',1492953699,NULL),('phabricator:db.repository',1492953699,NULL),('phabricator:db.search',1492953699,NULL),('phabricator:db.slowvote',1492953699,NULL),('phabricator:db.spaces',1492953699,NULL),('phabricator:db.system',1492953699,NULL),('phabricator:db.timeline',1492953699,NULL),('phabricator:db.token',1492953699,NULL),('phabricator:db.user',1492953699,NULL),('phabricator:db.worker',1492953699,NULL),('phabricator:db.xhpast',1492953699,NULL),('phabricator:db.xhpastview',1492953699,NULL),('phabricator:db.xhprof',1492953699,NULL),('phabricator:differentialbookmarks.sql',1492953704,NULL),('phabricator:draft-metadata.sql',1492953704,NULL),('phabricator:dropfileproxyimage.sql',1492953705,NULL),('phabricator:drydockresoucetype.sql',1492953705,NULL),('phabricator:drydocktaskid.sql',1492953705,NULL),('phabricator:edgetype.sql',1492953704,NULL),('phabricator:emailtable.sql',1492953704,NULL),('phabricator:emailtableport.sql',1492953704,NULL),('phabricator:emailtableremove.sql',1492953704,NULL),('phabricator:fact-raw.sql',1492953704,NULL),('phabricator:harbormasterobject.sql',1492953704,NULL),('phabricator:holidays.sql',1492953704,NULL),('phabricator:ldapinfo.sql',1492953704,NULL),('phabricator:legalpad-mailkey-populate.php',1492953706,NULL),('phabricator:legalpad-mailkey.sql',1492953706,NULL),('phabricator:liskcounters-task.sql',1492953705,NULL),('phabricator:liskcounters.php',1492953705,NULL),('phabricator:liskcounters.sql',1492953705,NULL),('phabricator:maniphestxcache.sql',1492953704,NULL),('phabricator:markupcache.sql',1492953704,NULL),('phabricator:migrate-differential-dependencies.php',1492953704,NULL),('phabricator:migrate-maniphest-dependencies.php',1492953704,NULL),('phabricator:migrate-maniphest-revisions.php',1492953704,NULL),('phabricator:migrate-project-edges.php',1492953704,NULL),('phabricator:owners-exclude.sql',1492953705,NULL),('phabricator:pastepolicy.sql',1492953704,NULL),('phabricator:phameblog.sql',1492953704,NULL),('phabricator:phamedomain.sql',1492953704,NULL),('phabricator:phameoneblog.sql',1492953705,NULL),('phabricator:phamepolicy.sql',1492953704,NULL),('phabricator:phiddrop.sql',1492953704,NULL),('phabricator:pholio.sql',1492953705,NULL),('phabricator:policy-project.sql',1492953704,NULL),('phabricator:ponder-comments.sql',1492953704,NULL),('phabricator:ponder-mailkey-populate.php',1492953704,NULL),('phabricator:ponder-mailkey.sql',1492953704,NULL),('phabricator:ponder.sql',1492953704,NULL),('phabricator:releeph.sql',1492953705,NULL),('phabricator:repository-lint.sql',1492953705,NULL),('phabricator:statustxt.sql',1492953705,NULL),('phabricator:symbolcontexts.sql',1492953704,NULL),('phabricator:testdatabase.sql',1492953704,NULL),('phabricator:threadtopic.sql',1492953704,NULL),('phabricator:userstatus.sql',1492953704,NULL),('phabricator:usertranslation.sql',1492953704,NULL),('phabricator:xhprof.sql',1492953704,NULL);
+INSERT INTO `patch_status` VALUES ('phabricator:000.project.sql',1505229294,NULL),('phabricator:0000.legacy.sql',1505229294,NULL),('phabricator:001.maniphest_projects.sql',1505229294,NULL),('phabricator:002.oauth.sql',1505229294,NULL),('phabricator:003.more_oauth.sql',1505229294,NULL),('phabricator:004.daemonrepos.sql',1505229294,NULL),('phabricator:005.workers.sql',1505229294,NULL),('phabricator:006.repository.sql',1505229295,NULL),('phabricator:007.daemonlog.sql',1505229295,NULL),('phabricator:008.repoopt.sql',1505229295,NULL),('phabricator:009.repo_summary.sql',1505229295,NULL),('phabricator:010.herald.sql',1505229295,NULL),('phabricator:011.badcommit.sql',1505229295,NULL),('phabricator:012.dropphidtype.sql',1505229295,NULL),('phabricator:013.commitdetail.sql',1505229295,NULL),('phabricator:014.shortcuts.sql',1505229295,NULL),('phabricator:015.preferences.sql',1505229295,NULL),('phabricator:016.userrealnameindex.sql',1505229295,NULL),('phabricator:017.sessionkeys.sql',1505229295,NULL),('phabricator:018.owners.sql',1505229295,NULL),('phabricator:019.arcprojects.sql',1505229295,NULL),('phabricator:020.pathcapital.sql',1505229295,NULL),('phabricator:021.xhpastview.sql',1505229295,NULL),('phabricator:022.differentialcommit.sql',1505229295,NULL),('phabricator:023.dxkeys.sql',1505229295,NULL),('phabricator:024.mlistkeys.sql',1505229295,NULL),('phabricator:025.commentopt.sql',1505229295,NULL),('phabricator:026.diffpropkey.sql',1505229295,NULL),('phabricator:027.metamtakeys.sql',1505229295,NULL),('phabricator:028.systemagent.sql',1505229295,NULL),('phabricator:029.cursors.sql',1505229295,NULL),('phabricator:030.imagemacro.sql',1505229295,NULL),('phabricator:031.workerrace.sql',1505229295,NULL),('phabricator:032.viewtime.sql',1505229295,NULL),('phabricator:033.privtest.sql',1505229295,NULL),('phabricator:034.savedheader.sql',1505229295,NULL),('phabricator:035.proxyimage.sql',1505229295,NULL),('phabricator:036.mailkey.sql',1505229295,NULL),('phabricator:037.setuptest.sql',1505229295,NULL),('phabricator:038.admin.sql',1505229295,NULL),('phabricator:039.userlog.sql',1505229295,NULL),('phabricator:040.transform.sql',1505229295,NULL),('phabricator:041.heraldrepetition.sql',1505229295,NULL),('phabricator:042.commentmetadata.sql',1505229295,NULL),('phabricator:043.pastebin.sql',1505229295,NULL),('phabricator:044.countdown.sql',1505229295,NULL),('phabricator:045.timezone.sql',1505229295,NULL),('phabricator:046.conduittoken.sql',1505229295,NULL),('phabricator:047.projectstatus.sql',1505229295,NULL),('phabricator:048.relationshipkeys.sql',1505229296,NULL),('phabricator:049.projectowner.sql',1505229296,NULL),('phabricator:050.taskdenormal.sql',1505229296,NULL),('phabricator:051.projectfilter.sql',1505229296,NULL),('phabricator:052.pastelanguage.sql',1505229296,NULL),('phabricator:053.feed.sql',1505229296,NULL),('phabricator:054.subscribers.sql',1505229296,NULL),('phabricator:055.add_author_to_files.sql',1505229296,NULL),('phabricator:056.slowvote.sql',1505229296,NULL),('phabricator:057.parsecache.sql',1505229296,NULL),('phabricator:058.missingkeys.sql',1505229296,NULL),('phabricator:059.engines.php',1505229296,NULL),('phabricator:060.phriction.sql',1505229296,NULL),('phabricator:061.phrictioncontent.sql',1505229296,NULL),('phabricator:062.phrictionmenu.sql',1505229296,NULL),('phabricator:063.pasteforks.sql',1505229296,NULL),('phabricator:064.subprojects.sql',1505229296,NULL),('phabricator:065.sshkeys.sql',1505229296,NULL),('phabricator:066.phrictioncontent.sql',1505229296,NULL),('phabricator:067.preferences.sql',1505229296,NULL),('phabricator:068.maniphestauxiliarystorage.sql',1505229296,NULL),('phabricator:069.heraldxscript.sql',1505229296,NULL),('phabricator:070.differentialaux.sql',1505229296,NULL),('phabricator:071.contentsource.sql',1505229296,NULL),('phabricator:072.blamerevert.sql',1505229296,NULL),('phabricator:073.reposymbols.sql',1505229296,NULL),('phabricator:074.affectedpath.sql',1505229296,NULL),('phabricator:075.revisionhash.sql',1505229296,NULL),('phabricator:076.indexedlanguages.sql',1505229296,NULL),('phabricator:077.originalemail.sql',1505229296,NULL),('phabricator:078.nametoken.sql',1505229296,NULL),('phabricator:079.nametokenindex.php',1505229296,NULL),('phabricator:080.filekeys.sql',1505229296,NULL),('phabricator:081.filekeys.php',1505229296,NULL),('phabricator:082.xactionkey.sql',1505229296,NULL),('phabricator:083.dxviewtime.sql',1505229296,NULL),('phabricator:084.pasteauthorkey.sql',1505229296,NULL),('phabricator:085.packagecommitrelationship.sql',1505229296,NULL),('phabricator:086.formeraffil.sql',1505229296,NULL),('phabricator:087.phrictiondelete.sql',1505229296,NULL),('phabricator:088.audit.sql',1505229296,NULL),('phabricator:089.projectwiki.sql',1505229296,NULL),('phabricator:090.forceuniqueprojectnames.php',1505229296,NULL),('phabricator:091.uniqueslugkey.sql',1505229296,NULL),('phabricator:092.dropgithubnotification.sql',1505229296,NULL),('phabricator:093.gitremotes.php',1505229296,NULL),('phabricator:094.phrictioncolumn.sql',1505229296,NULL),('phabricator:095.directory.sql',1505229296,NULL),('phabricator:096.filename.sql',1505229296,NULL),('phabricator:097.heraldruletypes.sql',1505229297,NULL),('phabricator:098.heraldruletypemigration.php',1505229297,NULL),('phabricator:099.drydock.sql',1505229297,NULL),('phabricator:100.projectxaction.sql',1505229297,NULL),('phabricator:101.heraldruleapplied.sql',1505229297,NULL),('phabricator:102.heraldcleanup.php',1505229297,NULL),('phabricator:103.heraldedithistory.sql',1505229297,NULL),('phabricator:104.searchkey.sql',1505229297,NULL),('phabricator:105.mimetype.sql',1505229297,NULL),('phabricator:106.chatlog.sql',1505229297,NULL),('phabricator:107.oauthserver.sql',1505229297,NULL),('phabricator:108.oauthscope.sql',1505229297,NULL),('phabricator:109.oauthclientphidkey.sql',1505229297,NULL),('phabricator:110.commitaudit.sql',1505229297,NULL),('phabricator:111.commitauditmigration.php',1505229297,NULL),('phabricator:112.oauthaccesscoderedirecturi.sql',1505229297,NULL),('phabricator:113.lastreviewer.sql',1505229297,NULL),('phabricator:114.auditrequest.sql',1505229297,NULL),('phabricator:115.prepareutf8.sql',1505229297,NULL),('phabricator:116.utf8-backup-first-expect-wait.sql',1505229299,NULL),('phabricator:117.repositorydescription.php',1505229299,NULL),('phabricator:118.auditinline.sql',1505229299,NULL),('phabricator:119.filehash.sql',1505229299,NULL),('phabricator:120.noop.sql',1505229299,NULL),('phabricator:121.drydocklog.sql',1505229299,NULL),('phabricator:122.flag.sql',1505229299,NULL),('phabricator:123.heraldrulelog.sql',1505229299,NULL),('phabricator:124.subpriority.sql',1505229299,NULL),('phabricator:125.ipv6.sql',1505229299,NULL),('phabricator:126.edges.sql',1505229299,NULL),('phabricator:127.userkeybody.sql',1505229299,NULL),('phabricator:128.phabricatorcom.sql',1505229299,NULL),('phabricator:129.savedquery.sql',1505229299,NULL),('phabricator:130.denormalrevisionquery.sql',1505229299,NULL),('phabricator:131.migraterevisionquery.php',1505229299,NULL),('phabricator:132.phame.sql',1505229299,NULL),('phabricator:133.imagemacro.sql',1505229299,NULL),('phabricator:134.emptysearch.sql',1505229299,NULL),('phabricator:135.datecommitted.sql',1505229299,NULL),('phabricator:136.sex.sql',1505229299,NULL),('phabricator:137.auditmetadata.sql',1505229299,NULL),('phabricator:138.notification.sql',1505229299,NULL),('phabricator:20121209.pholioxactions.sql',1505229300,NULL),('phabricator:20121209.xmacroadd.sql',1505229300,NULL),('phabricator:20121209.xmacromigrate.php',1505229300,NULL),('phabricator:20121209.xmacromigratekey.sql',1505229300,NULL),('phabricator:20121220.generalcache.sql',1505229300,NULL),('phabricator:20121226.config.sql',1505229300,NULL),('phabricator:20130101.confxaction.sql',1505229300,NULL),('phabricator:20130102.metamtareceivedmailmessageidhash.sql',1505229300,NULL),('phabricator:20130103.filemetadata.sql',1505229300,NULL),('phabricator:20130111.conpherence.sql',1505229300,NULL),('phabricator:20130127.altheraldtranscript.sql',1505229300,NULL),('phabricator:20130131.conpherencepics.sql',1505229300,NULL),('phabricator:20130201.revisionunsubscribed.php',1505229300,NULL),('phabricator:20130201.revisionunsubscribed.sql',1505229300,NULL),('phabricator:20130214.chatlogchannel.sql',1505229300,NULL),('phabricator:20130214.chatlogchannelid.sql',1505229300,NULL),('phabricator:20130214.token.sql',1505229300,NULL),('phabricator:20130215.phabricatorfileaddttl.sql',1505229300,NULL),('phabricator:20130217.cachettl.sql',1505229300,NULL),('phabricator:20130218.longdaemon.sql',1505229300,NULL),('phabricator:20130218.updatechannelid.php',1505229300,NULL),('phabricator:20130219.commitsummary.sql',1505229300,NULL),('phabricator:20130219.commitsummarymig.php',1505229300,NULL),('phabricator:20130222.dropchannel.sql',1505229300,NULL),('phabricator:20130226.commitkey.sql',1505229301,NULL),('phabricator:20130304.lintauthor.sql',1505229301,NULL),('phabricator:20130310.xactionmeta.sql',1505229301,NULL),('phabricator:20130317.phrictionedge.sql',1505229301,NULL),('phabricator:20130319.conpherence.sql',1505229301,NULL),('phabricator:20130319.phabricatorfileexplicitupload.sql',1505229301,NULL),('phabricator:20130320.phlux.sql',1505229301,NULL),('phabricator:20130321.token.sql',1505229301,NULL),('phabricator:20130322.phortune.sql',1505229301,NULL),('phabricator:20130323.phortunepayment.sql',1505229301,NULL),('phabricator:20130324.phortuneproduct.sql',1505229301,NULL),('phabricator:20130330.phrequent.sql',1505229301,NULL),('phabricator:20130403.conpherencecache.sql',1505229301,NULL),('phabricator:20130403.conpherencecachemig.php',1505229301,NULL),('phabricator:20130409.commitdrev.php',1505229301,NULL),('phabricator:20130417.externalaccount.sql',1505229301,NULL),('phabricator:20130423.conpherenceindices.sql',1505229301,NULL),('phabricator:20130423.phortunepaymentrevised.sql',1505229301,NULL),('phabricator:20130423.updateexternalaccount.sql',1505229301,NULL),('phabricator:20130426.search_savedquery.sql',1505229301,NULL),('phabricator:20130502.countdownrevamp1.sql',1505229301,NULL),('phabricator:20130502.countdownrevamp2.php',1505229301,NULL),('phabricator:20130502.countdownrevamp3.sql',1505229301,NULL),('phabricator:20130507.releephrqmailkey.sql',1505229301,NULL),('phabricator:20130507.releephrqmailkeypop.php',1505229301,NULL),('phabricator:20130507.releephrqsimplifycols.sql',1505229301,NULL),('phabricator:20130508.releephtransactions.sql',1505229301,NULL),('phabricator:20130508.releephtransactionsmig.php',1505229301,NULL),('phabricator:20130508.search_namedquery.sql',1505229301,NULL),('phabricator:20130513.receviedmailstatus.sql',1505229301,NULL),('phabricator:20130519.diviner.sql',1505229301,NULL),('phabricator:20130521.dropconphimages.sql',1505229301,NULL),('phabricator:20130523.maniphest_owners.sql',1505229301,NULL),('phabricator:20130524.repoxactions.sql',1505229301,NULL),('phabricator:20130529.macroauthor.sql',1505229301,NULL),('phabricator:20130529.macroauthormig.php',1505229301,NULL),('phabricator:20130530.macrodatekey.sql',1505229301,NULL),('phabricator:20130530.pastekeys.sql',1505229301,NULL),('phabricator:20130530.sessionhash.php',1505229301,NULL),('phabricator:20130531.filekeys.sql',1505229301,NULL),('phabricator:20130602.morediviner.sql',1505229301,NULL),('phabricator:20130602.namedqueries.sql',1505229302,NULL),('phabricator:20130606.userxactions.sql',1505229302,NULL),('phabricator:20130607.xaccount.sql',1505229302,NULL),('phabricator:20130611.migrateoauth.php',1505229302,NULL),('phabricator:20130611.nukeldap.php',1505229302,NULL),('phabricator:20130613.authdb.sql',1505229302,NULL),('phabricator:20130619.authconf.php',1505229302,NULL),('phabricator:20130620.diffxactions.sql',1505229302,NULL),('phabricator:20130621.diffcommentphid.sql',1505229302,NULL),('phabricator:20130621.diffcommentphidmig.php',1505229302,NULL),('phabricator:20130621.diffcommentunphid.sql',1505229302,NULL),('phabricator:20130622.doorkeeper.sql',1505229302,NULL),('phabricator:20130628.legalpadv0.sql',1505229302,NULL),('phabricator:20130701.conduitlog.sql',1505229302,NULL),('phabricator:20130703.legalpaddocdenorm.php',1505229302,NULL),('phabricator:20130703.legalpaddocdenorm.sql',1505229302,NULL),('phabricator:20130709.droptimeline.sql',1505229302,NULL),('phabricator:20130709.legalpadsignature.sql',1505229302,NULL),('phabricator:20130711.pholioimageobsolete.php',1505229302,NULL),('phabricator:20130711.pholioimageobsolete.sql',1505229302,NULL),('phabricator:20130711.pholioimageobsolete2.sql',1505229302,NULL),('phabricator:20130711.trimrealnames.php',1505229302,NULL),('phabricator:20130714.votexactions.sql',1505229302,NULL),('phabricator:20130715.votecomments.php',1505229302,NULL),('phabricator:20130715.voteedges.sql',1505229302,NULL),('phabricator:20130716.archivememberlessprojects.php',1505229302,NULL),('phabricator:20130722.pholioreplace.sql',1505229302,NULL),('phabricator:20130723.taskstarttime.sql',1505229302,NULL),('phabricator:20130726.ponderxactions.sql',1505229302,NULL),('phabricator:20130727.ponderquestionstatus.sql',1505229302,NULL),('phabricator:20130728.ponderunique.php',1505229302,NULL),('phabricator:20130728.ponderuniquekey.sql',1505229302,NULL),('phabricator:20130728.ponderxcomment.php',1505229302,NULL),('phabricator:20130731.releephcutpointidentifier.sql',1505229302,NULL),('phabricator:20130731.releephproject.sql',1505229302,NULL),('phabricator:20130731.releephrepoid.sql',1505229302,NULL),('phabricator:20130801.pastexactions.php',1505229302,NULL),('phabricator:20130801.pastexactions.sql',1505229302,NULL),('phabricator:20130802.heraldphid.sql',1505229302,NULL),('phabricator:20130802.heraldphids.php',1505229302,NULL),('phabricator:20130802.heraldphidukey.sql',1505229302,NULL),('phabricator:20130802.heraldxactions.sql',1505229302,NULL),('phabricator:20130805.pasteedges.sql',1505229302,NULL),('phabricator:20130805.pastemailkey.sql',1505229302,NULL),('phabricator:20130805.pastemailkeypop.php',1505229302,NULL),('phabricator:20130814.usercustom.sql',1505229302,NULL),('phabricator:20130820.file-mailkey-populate.php',1505229303,NULL),('phabricator:20130820.filemailkey.sql',1505229303,NULL),('phabricator:20130820.filexactions.sql',1505229303,NULL),('phabricator:20130820.releephxactions.sql',1505229303,NULL),('phabricator:20130826.divinernode.sql',1505229303,NULL),('phabricator:20130912.maniphest.1.touch.sql',1505229303,NULL),('phabricator:20130912.maniphest.2.created.sql',1505229303,NULL),('phabricator:20130912.maniphest.3.nameindex.sql',1505229303,NULL),('phabricator:20130912.maniphest.4.fillindex.php',1505229303,NULL),('phabricator:20130913.maniphest.1.migratesearch.php',1505229303,NULL),('phabricator:20130914.usercustom.sql',1505229303,NULL),('phabricator:20130915.maniphestcustom.sql',1505229303,NULL),('phabricator:20130915.maniphestmigrate.php',1505229303,NULL),('phabricator:20130915.maniphestqdrop.sql',1505229303,NULL),('phabricator:20130919.mfieldconf.php',1505229303,NULL),('phabricator:20130920.repokeyspolicy.sql',1505229303,NULL),('phabricator:20130921.mtransactions.sql',1505229303,NULL),('phabricator:20130921.xmigratemaniphest.php',1505229303,NULL),('phabricator:20130923.mrename.sql',1505229303,NULL),('phabricator:20130924.mdraftkey.sql',1505229303,NULL),('phabricator:20130925.mpolicy.sql',1505229303,NULL),('phabricator:20130925.xpolicy.sql',1505229303,NULL),('phabricator:20130926.dcustom.sql',1505229303,NULL),('phabricator:20130926.dinkeys.sql',1505229303,NULL),('phabricator:20130926.dinline.php',1505229303,NULL),('phabricator:20130927.audiomacro.sql',1505229303,NULL),('phabricator:20130929.filepolicy.sql',1505229303,NULL),('phabricator:20131004.dxedgekey.sql',1505229303,NULL),('phabricator:20131004.dxreviewers.php',1505229303,NULL),('phabricator:20131006.hdisable.sql',1505229303,NULL),('phabricator:20131010.pstorage.sql',1505229303,NULL),('phabricator:20131015.cpolicy.sql',1505229303,NULL),('phabricator:20131020.col1.sql',1505229303,NULL),('phabricator:20131020.harbormaster.sql',1505229303,NULL),('phabricator:20131020.pcustom.sql',1505229303,NULL),('phabricator:20131020.pxaction.sql',1505229303,NULL),('phabricator:20131020.pxactionmig.php',1505229303,NULL),('phabricator:20131025.repopush.sql',1505229304,NULL),('phabricator:20131026.commitstatus.sql',1505229304,NULL),('phabricator:20131030.repostatusmessage.sql',1505229304,NULL),('phabricator:20131031.vcspassword.sql',1505229304,NULL),('phabricator:20131105.buildstep.sql',1505229304,NULL),('phabricator:20131106.diffphid.1.col.sql',1505229304,NULL),('phabricator:20131106.diffphid.2.mig.php',1505229304,NULL),('phabricator:20131106.diffphid.3.key.sql',1505229304,NULL),('phabricator:20131106.nuance-v0.sql',1505229304,NULL),('phabricator:20131107.buildlog.sql',1505229304,NULL),('phabricator:20131112.userverified.1.col.sql',1505229304,NULL),('phabricator:20131112.userverified.2.mig.php',1505229304,NULL),('phabricator:20131118.ownerorder.php',1505229304,NULL),('phabricator:20131119.passphrase.sql',1505229304,NULL),('phabricator:20131120.nuancesourcetype.sql',1505229304,NULL),('phabricator:20131121.passphraseedge.sql',1505229304,NULL),('phabricator:20131121.repocredentials.1.col.sql',1505229304,NULL),('phabricator:20131121.repocredentials.2.mig.php',1505229304,NULL),('phabricator:20131122.repomirror.sql',1505229304,NULL),('phabricator:20131123.drydockblueprintpolicy.sql',1505229304,NULL),('phabricator:20131129.drydockresourceblueprint.sql',1505229304,NULL),('phabricator:20131204.pushlog.sql',1505229304,NULL),('phabricator:20131205.buildsteporder.sql',1505229304,NULL),('phabricator:20131205.buildstepordermig.php',1505229304,NULL),('phabricator:20131205.buildtargets.sql',1505229304,NULL),('phabricator:20131206.phragment.sql',1505229304,NULL),('phabricator:20131206.phragmentnull.sql',1505229304,NULL),('phabricator:20131208.phragmentsnapshot.sql',1505229305,NULL),('phabricator:20131211.phragmentedges.sql',1505229305,NULL),('phabricator:20131217.pushlogphid.1.col.sql',1505229305,NULL),('phabricator:20131217.pushlogphid.2.mig.php',1505229305,NULL),('phabricator:20131217.pushlogphid.3.key.sql',1505229305,NULL),('phabricator:20131219.pxdrop.sql',1505229305,NULL),('phabricator:20131224.harbormanual.sql',1505229305,NULL),('phabricator:20131227.heraldobject.sql',1505229305,NULL),('phabricator:20131231.dropshortcut.sql',1505229305,NULL),('phabricator:20131302.maniphestvalue.sql',1505229301,NULL),('phabricator:20140104.harbormastercmd.sql',1505229305,NULL),('phabricator:20140106.macromailkey.1.sql',1505229305,NULL),('phabricator:20140106.macromailkey.2.php',1505229305,NULL),('phabricator:20140108.ddbpname.1.sql',1505229305,NULL),('phabricator:20140108.ddbpname.2.php',1505229305,NULL),('phabricator:20140109.ddxactions.sql',1505229305,NULL),('phabricator:20140109.projectcolumnsdates.sql',1505229305,NULL),('phabricator:20140113.legalpadsig.1.sql',1505229305,NULL),('phabricator:20140113.legalpadsig.2.php',1505229305,NULL),('phabricator:20140115.auth.1.id.sql',1505229305,NULL),('phabricator:20140115.auth.2.expires.sql',1505229305,NULL),('phabricator:20140115.auth.3.unlimit.php',1505229305,NULL),('phabricator:20140115.legalpadsigkey.sql',1505229305,NULL),('phabricator:20140116.reporefcursor.sql',1505229305,NULL),('phabricator:20140126.diff.1.parentrevisionid.sql',1505229305,NULL),('phabricator:20140126.diff.2.repositoryphid.sql',1505229305,NULL),('phabricator:20140130.dash.1.board.sql',1505229305,NULL),('phabricator:20140130.dash.2.panel.sql',1505229305,NULL),('phabricator:20140130.dash.3.boardxaction.sql',1505229305,NULL),('phabricator:20140130.dash.4.panelxaction.sql',1505229305,NULL),('phabricator:20140130.mail.1.retry.sql',1505229305,NULL),('phabricator:20140130.mail.2.next.sql',1505229305,NULL),('phabricator:20140201.gc.1.mailsent.sql',1505229305,NULL),('phabricator:20140201.gc.2.mailreceived.sql',1505229305,NULL),('phabricator:20140205.cal.1.rename.sql',1505229305,NULL),('phabricator:20140205.cal.2.phid-col.sql',1505229305,NULL),('phabricator:20140205.cal.3.phid-mig.php',1505229305,NULL),('phabricator:20140205.cal.4.phid-key.sql',1505229305,NULL),('phabricator:20140210.herald.rule-condition-mig.php',1505229305,NULL),('phabricator:20140210.projcfield.1.blurb.php',1505229305,NULL),('phabricator:20140210.projcfield.2.piccol.sql',1505229305,NULL),('phabricator:20140210.projcfield.3.picmig.sql',1505229305,NULL),('phabricator:20140210.projcfield.4.memmig.sql',1505229305,NULL),('phabricator:20140210.projcfield.5.dropprofile.sql',1505229305,NULL),('phabricator:20140211.dx.1.nullablechangesetid.sql',1505229305,NULL),('phabricator:20140211.dx.2.migcommenttext.php',1505229305,NULL),('phabricator:20140211.dx.3.migsubscriptions.sql',1505229305,NULL),('phabricator:20140211.dx.999.drop.relationships.sql',1505229305,NULL),('phabricator:20140212.dx.1.armageddon.php',1505229305,NULL),('phabricator:20140214.clean.1.legacycommentid.sql',1505229305,NULL),('phabricator:20140214.clean.2.dropcomment.sql',1505229305,NULL),('phabricator:20140214.clean.3.dropinline.sql',1505229305,NULL),('phabricator:20140218.differentialdraft.sql',1505229305,NULL),('phabricator:20140218.passwords.1.extend.sql',1505229305,NULL),('phabricator:20140218.passwords.2.prefix.sql',1505229305,NULL),('phabricator:20140218.passwords.3.vcsextend.sql',1505229305,NULL),('phabricator:20140218.passwords.4.vcs.php',1505229305,NULL),('phabricator:20140223.bigutf8scratch.sql',1505229305,NULL),('phabricator:20140224.dxclean.1.datecommitted.sql',1505229305,NULL),('phabricator:20140226.dxcustom.1.fielddata.php',1505229305,NULL),('phabricator:20140226.dxcustom.99.drop.sql',1505229305,NULL),('phabricator:20140228.dxcomment.1.sql',1505229305,NULL),('phabricator:20140305.diviner.1.slugcol.sql',1505229305,NULL),('phabricator:20140305.diviner.2.slugkey.sql',1505229306,NULL),('phabricator:20140311.mdroplegacy.sql',1505229306,NULL),('phabricator:20140314.projectcolumn.1.statuscol.sql',1505229306,NULL),('phabricator:20140314.projectcolumn.2.statuskey.sql',1505229306,NULL),('phabricator:20140317.mupdatedkey.sql',1505229306,NULL),('phabricator:20140321.harbor.1.bxaction.sql',1505229306,NULL),('phabricator:20140321.mstatus.1.col.sql',1505229306,NULL),('phabricator:20140321.mstatus.2.mig.php',1505229306,NULL),('phabricator:20140323.harbor.1.renames.php',1505229306,NULL),('phabricator:20140323.harbor.2.message.sql',1505229306,NULL),('phabricator:20140325.push.1.event.sql',1505229306,NULL),('phabricator:20140325.push.2.eventphid.sql',1505229306,NULL),('phabricator:20140325.push.3.groups.php',1505229306,NULL),('phabricator:20140325.push.4.prune.sql',1505229306,NULL),('phabricator:20140326.project.1.colxaction.sql',1505229306,NULL),('phabricator:20140328.releeph.1.productxaction.sql',1505229306,NULL),('phabricator:20140330.flagtext.sql',1505229306,NULL),('phabricator:20140402.actionlog.sql',1505229306,NULL),('phabricator:20140410.accountsecret.1.sql',1505229306,NULL),('phabricator:20140410.accountsecret.2.php',1505229306,NULL),('phabricator:20140416.harbor.1.sql',1505229306,NULL),('phabricator:20140420.rel.1.objectphid.sql',1505229306,NULL),('phabricator:20140420.rel.2.objectmig.php',1505229306,NULL),('phabricator:20140421.slowvotecolumnsisclosed.sql',1505229306,NULL),('phabricator:20140423.session.1.hisec.sql',1505229306,NULL),('phabricator:20140427.mfactor.1.sql',1505229306,NULL),('phabricator:20140430.auth.1.partial.sql',1505229306,NULL),('phabricator:20140430.dash.1.paneltype.sql',1505229306,NULL),('phabricator:20140430.dash.2.edge.sql',1505229306,NULL),('phabricator:20140501.passphraselockcredential.sql',1505229306,NULL),('phabricator:20140501.remove.1.dlog.sql',1505229306,NULL),('phabricator:20140507.smstable.sql',1505229306,NULL),('phabricator:20140509.coverage.1.sql',1505229306,NULL),('phabricator:20140509.dashboardlayoutconfig.sql',1505229306,NULL),('phabricator:20140512.dparents.1.sql',1505229306,NULL),('phabricator:20140514.harbormasterbuildabletransaction.sql',1505229306,NULL),('phabricator:20140514.pholiomockclose.sql',1505229306,NULL),('phabricator:20140515.trust-emails.sql',1505229306,NULL),('phabricator:20140517.dxbinarycache.sql',1505229306,NULL),('phabricator:20140518.dxmorebinarycache.sql',1505229306,NULL),('phabricator:20140519.dashboardinstall.sql',1505229306,NULL),('phabricator:20140520.authtemptoken.sql',1505229306,NULL),('phabricator:20140521.projectslug.1.create.sql',1505229306,NULL),('phabricator:20140521.projectslug.2.mig.php',1505229306,NULL),('phabricator:20140522.projecticon.sql',1505229306,NULL),('phabricator:20140524.auth.mfa.cache.sql',1505229306,NULL),('phabricator:20140525.hunkmodern.sql',1505229306,NULL),('phabricator:20140615.pholioedit.1.sql',1505229306,NULL),('phabricator:20140615.pholioedit.2.sql',1505229306,NULL),('phabricator:20140617.daemon.explicit-argv.sql',1505229306,NULL),('phabricator:20140617.daemonlog.sql',1505229306,NULL),('phabricator:20140624.projcolor.1.sql',1505229306,NULL),('phabricator:20140624.projcolor.2.sql',1505229306,NULL),('phabricator:20140629.dasharchive.1.sql',1505229306,NULL),('phabricator:20140629.legalsig.1.sql',1505229306,NULL),('phabricator:20140629.legalsig.2.php',1505229306,NULL),('phabricator:20140701.legalexemption.1.sql',1505229306,NULL),('phabricator:20140701.legalexemption.2.sql',1505229306,NULL),('phabricator:20140703.legalcorp.1.sql',1505229306,NULL),('phabricator:20140703.legalcorp.2.sql',1505229306,NULL),('phabricator:20140703.legalcorp.3.sql',1505229306,NULL),('phabricator:20140703.legalcorp.4.sql',1505229306,NULL),('phabricator:20140703.legalcorp.5.sql',1505229306,NULL),('phabricator:20140704.harbormasterstep.1.sql',1505229306,NULL),('phabricator:20140704.harbormasterstep.2.sql',1505229306,NULL),('phabricator:20140704.legalpreamble.1.sql',1505229307,NULL),('phabricator:20140706.harbormasterdepend.1.php',1505229307,NULL),('phabricator:20140706.pedge.1.sql',1505229307,NULL),('phabricator:20140711.pnames.1.sql',1505229307,NULL),('phabricator:20140711.pnames.2.php',1505229307,NULL),('phabricator:20140711.workerpriority.sql',1505229307,NULL),('phabricator:20140712.projcoluniq.sql',1505229307,NULL),('phabricator:20140721.phortune.1.cart.sql',1505229307,NULL),('phabricator:20140721.phortune.2.purchase.sql',1505229307,NULL),('phabricator:20140721.phortune.3.charge.sql',1505229307,NULL),('phabricator:20140721.phortune.4.cartstatus.sql',1505229307,NULL),('phabricator:20140721.phortune.5.cstatusdefault.sql',1505229307,NULL),('phabricator:20140721.phortune.6.onetimecharge.sql',1505229307,NULL),('phabricator:20140721.phortune.7.nullmethod.sql',1505229307,NULL),('phabricator:20140722.appname.php',1505229307,NULL),('phabricator:20140722.audit.1.xactions.sql',1505229307,NULL),('phabricator:20140722.audit.2.comments.sql',1505229307,NULL),('phabricator:20140722.audit.3.miginlines.php',1505229307,NULL),('phabricator:20140722.audit.4.migtext.php',1505229307,NULL),('phabricator:20140722.renameauth.php',1505229307,NULL),('phabricator:20140723.apprenamexaction.sql',1505229307,NULL),('phabricator:20140725.audit.1.migxactions.php',1505229307,NULL),('phabricator:20140731.audit.1.subscribers.php',1505229307,NULL),('phabricator:20140731.cancdn.php',1505229307,NULL),('phabricator:20140731.harbormasterstepdesc.sql',1505229307,NULL),('phabricator:20140805.boardcol.1.sql',1505229307,NULL),('phabricator:20140805.boardcol.2.php',1505229307,NULL),('phabricator:20140807.harbormastertargettime.sql',1505229307,NULL),('phabricator:20140808.boardprop.1.sql',1505229307,NULL),('phabricator:20140808.boardprop.2.sql',1505229307,NULL),('phabricator:20140808.boardprop.3.php',1505229307,NULL),('phabricator:20140811.blob.1.sql',1505229307,NULL),('phabricator:20140811.blob.2.sql',1505229307,NULL),('phabricator:20140812.projkey.1.sql',1505229307,NULL),('phabricator:20140812.projkey.2.sql',1505229307,NULL),('phabricator:20140814.passphrasecredentialconduit.sql',1505229307,NULL),('phabricator:20140815.cancdncase.php',1505229307,NULL),('phabricator:20140818.harbormasterindex.1.sql',1505229307,NULL),('phabricator:20140821.harbormasterbuildgen.1.sql',1505229307,NULL),('phabricator:20140822.daemonenvhash.sql',1505229307,NULL),('phabricator:20140902.almanacdevice.1.sql',1505229307,NULL),('phabricator:20140904.macroattach.php',1505229307,NULL),('phabricator:20140911.fund.1.initiative.sql',1505229307,NULL),('phabricator:20140911.fund.2.xaction.sql',1505229307,NULL),('phabricator:20140911.fund.3.edge.sql',1505229307,NULL),('phabricator:20140911.fund.4.backer.sql',1505229307,NULL),('phabricator:20140911.fund.5.backxaction.sql',1505229307,NULL),('phabricator:20140914.betaproto.php',1505229307,NULL),('phabricator:20140917.project.canlock.sql',1505229307,NULL),('phabricator:20140918.schema.1.dropaudit.sql',1505229307,NULL),('phabricator:20140918.schema.2.dropauditinline.sql',1505229307,NULL),('phabricator:20140918.schema.3.wipecache.sql',1505229307,NULL),('phabricator:20140918.schema.4.cachetype.sql',1505229307,NULL),('phabricator:20140918.schema.5.slowvote.sql',1505229307,NULL),('phabricator:20140919.schema.01.calstatus.sql',1505229307,NULL),('phabricator:20140919.schema.02.calname.sql',1505229307,NULL),('phabricator:20140919.schema.03.dropaux.sql',1505229307,NULL),('phabricator:20140919.schema.04.droptaskproj.sql',1505229307,NULL),('phabricator:20140926.schema.01.droprelev.sql',1505229307,NULL),('phabricator:20140926.schema.02.droprelreqev.sql',1505229307,NULL),('phabricator:20140926.schema.03.dropldapinfo.sql',1505229307,NULL),('phabricator:20140926.schema.04.dropoauthinfo.sql',1505229307,NULL),('phabricator:20140926.schema.05.dropprojaffil.sql',1505229307,NULL),('phabricator:20140926.schema.06.dropsubproject.sql',1505229307,NULL),('phabricator:20140926.schema.07.droppondcom.sql',1505229307,NULL),('phabricator:20140927.schema.01.dropsearchq.sql',1505229307,NULL),('phabricator:20140927.schema.02.pholio1.sql',1505229307,NULL),('phabricator:20140927.schema.03.pholio2.sql',1505229307,NULL),('phabricator:20140927.schema.04.pholio3.sql',1505229307,NULL),('phabricator:20140927.schema.05.phragment1.sql',1505229307,NULL),('phabricator:20140927.schema.06.releeph1.sql',1505229307,NULL),('phabricator:20141001.schema.01.version.sql',1505229307,NULL),('phabricator:20141001.schema.02.taskmail.sql',1505229307,NULL),('phabricator:20141002.schema.01.liskcounter.sql',1505229307,NULL),('phabricator:20141002.schema.02.draftnull.sql',1505229307,NULL),('phabricator:20141004.currency.01.sql',1505229307,NULL),('phabricator:20141004.currency.02.sql',1505229307,NULL),('phabricator:20141004.currency.03.sql',1505229307,NULL),('phabricator:20141004.currency.04.sql',1505229307,NULL),('phabricator:20141004.currency.05.sql',1505229307,NULL),('phabricator:20141004.currency.06.sql',1505229307,NULL),('phabricator:20141004.harborliskcounter.sql',1505229307,NULL),('phabricator:20141005.phortuneproduct.sql',1505229308,NULL),('phabricator:20141006.phortunecart.sql',1505229308,NULL),('phabricator:20141006.phortunemerchant.sql',1505229308,NULL),('phabricator:20141006.phortunemerchantx.sql',1505229308,NULL),('phabricator:20141007.fundmerchant.sql',1505229308,NULL),('phabricator:20141007.fundrisks.sql',1505229308,NULL),('phabricator:20141007.fundtotal.sql',1505229308,NULL),('phabricator:20141007.phortunecartmerchant.sql',1505229308,NULL),('phabricator:20141007.phortunecharge.sql',1505229308,NULL),('phabricator:20141007.phortunepayment.sql',1505229308,NULL),('phabricator:20141007.phortuneprovider.sql',1505229308,NULL),('phabricator:20141007.phortuneproviderx.sql',1505229308,NULL),('phabricator:20141008.phortunemerchdesc.sql',1505229308,NULL),('phabricator:20141008.phortuneprovdis.sql',1505229308,NULL),('phabricator:20141008.phortunerefund.sql',1505229308,NULL),('phabricator:20141010.fundmailkey.sql',1505229308,NULL),('phabricator:20141011.phortunemerchedit.sql',1505229308,NULL),('phabricator:20141012.phortunecartxaction.sql',1505229308,NULL),('phabricator:20141013.phortunecartkey.sql',1505229308,NULL),('phabricator:20141016.almanac.device.sql',1505229308,NULL),('phabricator:20141016.almanac.dxaction.sql',1505229308,NULL),('phabricator:20141016.almanac.interface.sql',1505229308,NULL),('phabricator:20141016.almanac.network.sql',1505229308,NULL),('phabricator:20141016.almanac.nxaction.sql',1505229308,NULL),('phabricator:20141016.almanac.service.sql',1505229308,NULL),('phabricator:20141016.almanac.sxaction.sql',1505229308,NULL),('phabricator:20141017.almanac.binding.sql',1505229308,NULL),('phabricator:20141017.almanac.bxaction.sql',1505229308,NULL),('phabricator:20141025.phriction.1.xaction.sql',1505229308,NULL),('phabricator:20141025.phriction.2.xaction.sql',1505229308,NULL),('phabricator:20141025.phriction.mailkey.sql',1505229308,NULL),('phabricator:20141103.almanac.1.delprop.sql',1505229308,NULL),('phabricator:20141103.almanac.2.addprop.sql',1505229308,NULL),('phabricator:20141104.almanac.3.edge.sql',1505229308,NULL),('phabricator:20141105.ssh.1.rename.sql',1505229308,NULL),('phabricator:20141106.dropold.sql',1505229308,NULL),('phabricator:20141106.uniqdrafts.php',1505229308,NULL),('phabricator:20141107.phriction.policy.1.sql',1505229308,NULL),('phabricator:20141107.phriction.policy.2.php',1505229308,NULL),('phabricator:20141107.phriction.popkeys.php',1505229308,NULL),('phabricator:20141107.ssh.1.colname.sql',1505229308,NULL),('phabricator:20141107.ssh.2.keyhash.sql',1505229308,NULL),('phabricator:20141107.ssh.3.keyindex.sql',1505229308,NULL),('phabricator:20141107.ssh.4.keymig.php',1505229308,NULL),('phabricator:20141107.ssh.5.indexnull.sql',1505229308,NULL),('phabricator:20141107.ssh.6.indexkey.sql',1505229308,NULL),('phabricator:20141107.ssh.7.colnull.sql',1505229308,NULL),('phabricator:20141113.auditdupes.php',1505229308,NULL),('phabricator:20141118.diffxaction.sql',1505229308,NULL),('phabricator:20141119.commitpedge.sql',1505229308,NULL),('phabricator:20141119.differential.diff.policy.sql',1505229308,NULL),('phabricator:20141119.sshtrust.sql',1505229308,NULL),('phabricator:20141123.taskpriority.1.sql',1505229308,NULL),('phabricator:20141123.taskpriority.2.sql',1505229308,NULL),('phabricator:20141210.maniphestsubscribersmig.1.sql',1505229308,NULL),('phabricator:20141210.maniphestsubscribersmig.2.sql',1505229308,NULL),('phabricator:20141210.reposervice.sql',1505229309,NULL),('phabricator:20141212.conduittoken.sql',1505229309,NULL),('phabricator:20141215.almanacservicetype.sql',1505229309,NULL),('phabricator:20141217.almanacdevicelock.sql',1505229309,NULL),('phabricator:20141217.almanaclock.sql',1505229309,NULL),('phabricator:20141218.maniphestcctxn.php',1505229309,NULL),('phabricator:20141222.maniphestprojtxn.php',1505229309,NULL),('phabricator:20141223.daemonloguser.sql',1505229309,NULL),('phabricator:20141223.daemonobjectphid.sql',1505229309,NULL),('phabricator:20141230.pasteeditpolicycolumn.sql',1505229309,NULL),('phabricator:20141230.pasteeditpolicyexisting.sql',1505229309,NULL),('phabricator:20150102.policyname.php',1505229309,NULL),('phabricator:20150102.tasksubscriber.sql',1505229309,NULL),('phabricator:20150105.conpsearch.sql',1505229309,NULL),('phabricator:20150114.oauthserver.client.policy.sql',1505229309,NULL),('phabricator:20150115.applicationemails.sql',1505229309,NULL),('phabricator:20150115.trigger.1.sql',1505229309,NULL),('phabricator:20150115.trigger.2.sql',1505229309,NULL),('phabricator:20150116.maniphestapplicationemails.php',1505229309,NULL),('phabricator:20150120.maniphestdefaultauthor.php',1505229309,NULL),('phabricator:20150124.subs.1.sql',1505229309,NULL),('phabricator:20150129.pastefileapplicationemails.php',1505229309,NULL),('phabricator:20150130.phortune.1.subphid.sql',1505229309,NULL),('phabricator:20150130.phortune.2.subkey.sql',1505229309,NULL),('phabricator:20150131.phortune.1.defaultpayment.sql',1505229309,NULL),('phabricator:20150205.authprovider.autologin.sql',1505229309,NULL),('phabricator:20150205.daemonenv.sql',1505229309,NULL),('phabricator:20150209.invite.sql',1505229309,NULL),('phabricator:20150209.oauthclient.trust.sql',1505229309,NULL),('phabricator:20150210.invitephid.sql',1505229309,NULL),('phabricator:20150212.legalpad.session.1.sql',1505229309,NULL),('phabricator:20150212.legalpad.session.2.sql',1505229309,NULL),('phabricator:20150219.scratch.nonmutable.sql',1505229309,NULL),('phabricator:20150223.daemon.1.id.sql',1505229309,NULL),('phabricator:20150223.daemon.2.idlegacy.sql',1505229309,NULL),('phabricator:20150223.daemon.3.idkey.sql',1505229309,NULL),('phabricator:20150312.filechunk.1.sql',1505229309,NULL),('phabricator:20150312.filechunk.2.sql',1505229309,NULL),('phabricator:20150312.filechunk.3.sql',1505229309,NULL),('phabricator:20150317.conpherence.isroom.1.sql',1505229309,NULL),('phabricator:20150317.conpherence.isroom.2.sql',1505229309,NULL),('phabricator:20150317.conpherence.policy.sql',1505229309,NULL),('phabricator:20150410.nukeruleedit.sql',1505229309,NULL),('phabricator:20150420.invoice.1.sql',1505229309,NULL),('phabricator:20150420.invoice.2.sql',1505229309,NULL),('phabricator:20150425.isclosed.sql',1505229309,NULL),('phabricator:20150427.calendar.1.edge.sql',1505229309,NULL),('phabricator:20150427.calendar.1.xaction.sql',1505229309,NULL),('phabricator:20150427.calendar.2.xaction.sql',1505229309,NULL),('phabricator:20150428.calendar.1.iscancelled.sql',1505229309,NULL),('phabricator:20150428.calendar.1.name.sql',1505229309,NULL),('phabricator:20150429.calendar.1.invitee.sql',1505229309,NULL),('phabricator:20150430.calendar.1.policies.sql',1505229309,NULL),('phabricator:20150430.multimeter.1.sql',1505229309,NULL),('phabricator:20150430.multimeter.2.host.sql',1505229309,NULL),('phabricator:20150430.multimeter.3.viewer.sql',1505229309,NULL),('phabricator:20150430.multimeter.4.context.sql',1505229309,NULL),('phabricator:20150430.multimeter.5.label.sql',1505229309,NULL),('phabricator:20150501.calendar.1.reply.sql',1505229309,NULL),('phabricator:20150501.calendar.2.reply.php',1505229309,NULL),('phabricator:20150501.conpherencepics.sql',1505229309,NULL),('phabricator:20150503.repositorysymbols.1.sql',1505229309,NULL),('phabricator:20150503.repositorysymbols.2.php',1505229309,NULL),('phabricator:20150503.repositorysymbols.3.sql',1505229309,NULL),('phabricator:20150504.symbolsproject.1.php',1505229309,NULL),('phabricator:20150504.symbolsproject.2.sql',1505229309,NULL),('phabricator:20150506.calendarunnamedevents.1.php',1505229309,NULL),('phabricator:20150507.calendar.1.isallday.sql',1505229309,NULL),('phabricator:20150513.user.cache.1.sql',1505229310,NULL),('phabricator:20150514.calendar.status.sql',1505229310,NULL),('phabricator:20150514.phame.blog.xaction.sql',1505229310,NULL),('phabricator:20150514.user.cache.2.sql',1505229310,NULL),('phabricator:20150515.phame.post.xaction.sql',1505229310,NULL),('phabricator:20150515.project.mailkey.1.sql',1505229310,NULL),('phabricator:20150515.project.mailkey.2.php',1505229310,NULL),('phabricator:20150519.calendar.calendaricon.sql',1505229310,NULL),('phabricator:20150521.releephrepository.sql',1505229310,NULL),('phabricator:20150525.diff.hidden.1.sql',1505229310,NULL),('phabricator:20150526.owners.mailkey.1.sql',1505229310,NULL),('phabricator:20150526.owners.mailkey.2.php',1505229310,NULL),('phabricator:20150526.owners.xaction.sql',1505229310,NULL),('phabricator:20150527.calendar.recurringevents.sql',1505229310,NULL),('phabricator:20150601.spaces.1.namespace.sql',1505229310,NULL),('phabricator:20150601.spaces.2.xaction.sql',1505229310,NULL),('phabricator:20150602.mlist.1.sql',1505229310,NULL),('phabricator:20150602.mlist.2.php',1505229310,NULL),('phabricator:20150604.spaces.1.sql',1505229310,NULL),('phabricator:20150605.diviner.edges.sql',1505229310,NULL),('phabricator:20150605.diviner.editPolicy.sql',1505229310,NULL),('phabricator:20150605.diviner.xaction.sql',1505229310,NULL),('phabricator:20150606.mlist.1.php',1505229310,NULL),('phabricator:20150609.inline.sql',1505229310,NULL),('phabricator:20150609.spaces.1.pholio.sql',1505229310,NULL),('phabricator:20150609.spaces.2.maniphest.sql',1505229310,NULL),('phabricator:20150610.spaces.1.desc.sql',1505229310,NULL),('phabricator:20150610.spaces.2.edge.sql',1505229310,NULL),('phabricator:20150610.spaces.3.archive.sql',1505229310,NULL),('phabricator:20150611.spaces.1.mailxaction.sql',1505229310,NULL),('phabricator:20150611.spaces.2.appmail.sql',1505229310,NULL),('phabricator:20150616.divinerrepository.sql',1505229310,NULL),('phabricator:20150617.harbor.1.lint.sql',1505229310,NULL),('phabricator:20150617.harbor.2.unit.sql',1505229310,NULL),('phabricator:20150618.harbor.1.planauto.sql',1505229310,NULL),('phabricator:20150618.harbor.2.stepauto.sql',1505229310,NULL),('phabricator:20150618.harbor.3.buildauto.sql',1505229310,NULL),('phabricator:20150619.conpherencerooms.1.sql',1505229310,NULL),('phabricator:20150619.conpherencerooms.2.sql',1505229310,NULL),('phabricator:20150619.conpherencerooms.3.sql',1505229310,NULL),('phabricator:20150621.phrase.1.sql',1505229310,NULL),('phabricator:20150621.phrase.2.sql',1505229310,NULL),('phabricator:20150622.bulk.1.job.sql',1505229310,NULL),('phabricator:20150622.bulk.2.task.sql',1505229310,NULL),('phabricator:20150622.bulk.3.xaction.sql',1505229310,NULL),('phabricator:20150622.bulk.4.edge.sql',1505229310,NULL),('phabricator:20150622.metamta.1.phid-col.sql',1505229310,NULL),('phabricator:20150622.metamta.2.phid-mig.php',1505229310,NULL),('phabricator:20150622.metamta.3.phid-key.sql',1505229310,NULL),('phabricator:20150622.metamta.4.actor-phid-col.sql',1505229310,NULL),('phabricator:20150622.metamta.5.actor-phid-mig.php',1505229310,NULL),('phabricator:20150622.metamta.6.actor-phid-key.sql',1505229310,NULL),('phabricator:20150624.spaces.1.repo.sql',1505229310,NULL),('phabricator:20150626.spaces.1.calendar.sql',1505229310,NULL),('phabricator:20150630.herald.1.sql',1505229310,NULL),('phabricator:20150630.herald.2.sql',1505229310,NULL),('phabricator:20150701.herald.1.sql',1505229310,NULL),('phabricator:20150701.herald.2.sql',1505229310,NULL),('phabricator:20150702.spaces.1.slowvote.sql',1505229310,NULL),('phabricator:20150706.herald.1.sql',1505229310,NULL),('phabricator:20150707.herald.1.sql',1505229310,NULL),('phabricator:20150708.arcanistproject.sql',1505229310,NULL),('phabricator:20150708.herald.1.sql',1505229310,NULL),('phabricator:20150708.herald.2.sql',1505229310,NULL),('phabricator:20150708.herald.3.sql',1505229310,NULL),('phabricator:20150712.badges.1.sql',1505229310,NULL),('phabricator:20150714.spaces.countdown.1.sql',1505229310,NULL),('phabricator:20150717.herald.1.sql',1505229310,NULL),('phabricator:20150719.countdown.1.sql',1505229311,NULL),('phabricator:20150719.countdown.2.sql',1505229311,NULL),('phabricator:20150719.countdown.3.sql',1505229311,NULL),('phabricator:20150721.phurl.1.url.sql',1505229311,NULL),('phabricator:20150721.phurl.2.xaction.sql',1505229311,NULL),('phabricator:20150721.phurl.3.xactioncomment.sql',1505229311,NULL),('phabricator:20150721.phurl.4.url.sql',1505229311,NULL),('phabricator:20150721.phurl.5.edge.sql',1505229311,NULL),('phabricator:20150721.phurl.6.alias.sql',1505229311,NULL),('phabricator:20150721.phurl.7.authorphid.sql',1505229311,NULL),('phabricator:20150722.dashboard.1.sql',1505229311,NULL),('phabricator:20150722.dashboard.2.sql',1505229311,NULL),('phabricator:20150723.countdown.1.sql',1505229311,NULL),('phabricator:20150724.badges.comments.1.sql',1505229311,NULL),('phabricator:20150724.countdown.comments.1.sql',1505229311,NULL),('phabricator:20150725.badges.mailkey.1.sql',1505229311,NULL),('phabricator:20150725.badges.mailkey.2.php',1505229311,NULL),('phabricator:20150725.badges.viewpolicy.3.sql',1505229311,NULL),('phabricator:20150725.countdown.mailkey.1.sql',1505229311,NULL),('phabricator:20150725.countdown.mailkey.2.php',1505229311,NULL),('phabricator:20150725.slowvote.mailkey.1.sql',1505229311,NULL),('phabricator:20150725.slowvote.mailkey.2.php',1505229311,NULL),('phabricator:20150727.heraldaction.1.sql',1505229311,NULL),('phabricator:20150730.herald.1.sql',1505229311,NULL),('phabricator:20150730.herald.2.sql',1505229311,NULL),('phabricator:20150730.herald.3.sql',1505229311,NULL),('phabricator:20150730.herald.4.sql',1505229311,NULL),('phabricator:20150730.herald.5.sql',1505229311,NULL),('phabricator:20150730.herald.6.sql',1505229311,NULL),('phabricator:20150730.herald.7.sql',1505229311,NULL),('phabricator:20150803.herald.1.sql',1505229311,NULL),('phabricator:20150803.herald.2.sql',1505229311,NULL),('phabricator:20150804.ponder.answer.mailkey.1.sql',1505229311,NULL),('phabricator:20150804.ponder.answer.mailkey.2.php',1505229311,NULL),('phabricator:20150804.ponder.question.1.sql',1505229311,NULL),('phabricator:20150804.ponder.question.2.sql',1505229311,NULL),('phabricator:20150804.ponder.question.3.sql',1505229311,NULL),('phabricator:20150804.ponder.spaces.4.sql',1505229311,NULL),('phabricator:20150805.paste.status.1.sql',1505229311,NULL),('phabricator:20150805.paste.status.2.sql',1505229311,NULL),('phabricator:20150806.ponder.answer.1.sql',1505229311,NULL),('phabricator:20150806.ponder.editpolicy.2.sql',1505229311,NULL),('phabricator:20150806.ponder.status.1.sql',1505229311,NULL),('phabricator:20150806.ponder.status.2.sql',1505229311,NULL),('phabricator:20150806.ponder.status.3.sql',1505229311,NULL),('phabricator:20150808.ponder.vote.1.sql',1505229311,NULL),('phabricator:20150808.ponder.vote.2.sql',1505229311,NULL),('phabricator:20150812.ponder.answer.1.sql',1505229311,NULL),('phabricator:20150812.ponder.answer.2.sql',1505229311,NULL),('phabricator:20150814.harbormater.artifact.phid.sql',1505229311,NULL),('phabricator:20150815.owners.status.1.sql',1505229311,NULL),('phabricator:20150815.owners.status.2.sql',1505229311,NULL),('phabricator:20150823.nuance.queue.1.sql',1505229311,NULL),('phabricator:20150823.nuance.queue.2.sql',1505229311,NULL),('phabricator:20150823.nuance.queue.3.sql',1505229311,NULL),('phabricator:20150823.nuance.queue.4.sql',1505229311,NULL),('phabricator:20150828.ponder.wiki.1.sql',1505229311,NULL),('phabricator:20150829.ponder.dupe.1.sql',1505229311,NULL),('phabricator:20150904.herald.1.sql',1505229311,NULL),('phabricator:20150906.mailinglist.sql',1505229311,NULL),('phabricator:20150910.owners.custom.1.sql',1505229311,NULL),('phabricator:20150916.drydock.slotlocks.1.sql',1505229311,NULL),('phabricator:20150922.drydock.commands.1.sql',1505229311,NULL),('phabricator:20150923.drydock.resourceid.1.sql',1505229311,NULL),('phabricator:20150923.drydock.resourceid.2.sql',1505229311,NULL),('phabricator:20150923.drydock.resourceid.3.sql',1505229311,NULL),('phabricator:20150923.drydock.taskid.1.sql',1505229311,NULL),('phabricator:20150924.drydock.disable.1.sql',1505229311,NULL),('phabricator:20150924.drydock.status.1.sql',1505229311,NULL),('phabricator:20150928.drydock.rexpire.1.sql',1505229311,NULL),('phabricator:20150930.drydock.log.1.sql',1505229311,NULL),('phabricator:20151001.drydock.rname.1.sql',1505229312,NULL),('phabricator:20151002.dashboard.status.1.sql',1505229312,NULL),('phabricator:20151002.harbormaster.bparam.1.sql',1505229312,NULL),('phabricator:20151009.drydock.auth.1.sql',1505229312,NULL),('phabricator:20151010.drydock.auth.2.sql',1505229312,NULL),('phabricator:20151013.drydock.op.1.sql',1505229312,NULL),('phabricator:20151023.harborpolicy.1.sql',1505229312,NULL),('phabricator:20151023.harborpolicy.2.php',1505229312,NULL),('phabricator:20151023.patchduration.sql',1505229312,14707),('phabricator:20151030.harbormaster.initiator.sql',1505229312,20087),('phabricator:20151106.editengine.1.table.sql',1505229312,9727),('phabricator:20151106.editengine.2.xactions.sql',1505229312,7307),('phabricator:20151106.phame.post.mailkey.1.sql',1505229312,20376),('phabricator:20151106.phame.post.mailkey.2.php',1505229312,1318),('phabricator:20151107.phame.blog.mailkey.1.sql',1505229312,17775),('phabricator:20151107.phame.blog.mailkey.2.php',1505229312,704),('phabricator:20151108.phame.blog.joinpolicy.sql',1505229312,15522),('phabricator:20151108.xhpast.stderr.sql',1505229312,23616),('phabricator:20151109.phame.post.comments.1.sql',1505229312,8078),('phabricator:20151109.repository.coverage.1.sql',1505229312,893),('phabricator:20151109.xhpast.db.1.sql',1505229312,1560),('phabricator:20151109.xhpast.db.2.sql',1505229312,558),('phabricator:20151110.daemonenvhash.sql',1505229312,35993),('phabricator:20151111.phame.blog.archive.1.sql',1505229312,19773),('phabricator:20151111.phame.blog.archive.2.sql',1505229312,403),('phabricator:20151112.herald.edge.sql',1505229312,14166),('phabricator:20151116.owners.edge.sql',1505229312,13334),('phabricator:20151128.phame.blog.picture.1.sql',1505229312,16713),('phabricator:20151130.phurl.mailkey.1.sql',1505229312,18587),('phabricator:20151130.phurl.mailkey.2.php',1505229312,1132),('phabricator:20151202.versioneddraft.1.sql',1505229312,10406),('phabricator:20151207.editengine.1.sql',1505229312,80862),('phabricator:20151210.land.1.refphid.sql',1505229312,14814),('phabricator:20151210.land.2.refphid.php',1505229312,561),('phabricator:20151215.phame.1.autotitle.sql',1505229312,21908),('phabricator:20151218.key.1.keyphid.sql',1505229312,19006),('phabricator:20151218.key.2.keyphid.php',1505229312,391),('phabricator:20151219.proj.01.prislug.sql',1505229312,23570),('phabricator:20151219.proj.02.prislugkey.sql',1505229312,15523),('phabricator:20151219.proj.03.copyslug.sql',1505229312,373),('phabricator:20151219.proj.04.dropslugkey.sql',1505229312,8731),('phabricator:20151219.proj.05.dropslug.sql',1505229312,21708),('phabricator:20151219.proj.06.defaultpolicy.php',1505229312,915),('phabricator:20151219.proj.07.viewnull.sql',1505229312,14940),('phabricator:20151219.proj.08.editnull.sql',1505229312,12472),('phabricator:20151219.proj.09.joinnull.sql',1505229312,12507),('phabricator:20151219.proj.10.subcolumns.sql',1505229312,147026),('phabricator:20151219.proj.11.subprojectphids.sql',1505229312,28646),('phabricator:20151221.search.1.version.sql',1505229312,13333),('phabricator:20151221.search.2.ownersngrams.sql',1505229312,8185),('phabricator:20151221.search.3.reindex.php',1505229312,451),('phabricator:20151223.proj.01.paths.sql',1505229312,22899),('phabricator:20151223.proj.02.depths.sql',1505229312,31535),('phabricator:20151223.proj.03.pathkey.sql',1505229312,13308),('phabricator:20151223.proj.04.keycol.sql',1505229312,27422),('phabricator:20151223.proj.05.updatekeys.php',1505229312,365),('phabricator:20151223.proj.06.uniq.sql',1505229312,13132),('phabricator:20151226.reop.1.sql',1505229312,17967),('phabricator:20151227.proj.01.materialize.sql',1505229312,417),('phabricator:20151231.proj.01.icon.php',1505229312,1594),('phabricator:20160102.badges.award.sql',1505229313,10025),('phabricator:20160110.repo.01.slug.sql',1505229313,31100),('phabricator:20160110.repo.02.slug.php',1505229313,476),('phabricator:20160111.repo.01.slugx.sql',1505229313,551),('phabricator:20160112.repo.01.uri.sql',1505229313,8069),('phabricator:20160112.repo.02.uri.index.php',1505229313,68),('phabricator:20160113.propanel.1.storage.sql',1505229313,7292),('phabricator:20160113.propanel.2.xaction.sql',1505229313,7204),('phabricator:20160119.project.1.silence.sql',1505229313,474),('phabricator:20160122.project.1.boarddefault.php',1505229313,779),('phabricator:20160124.people.1.icon.sql',1505229313,12923),('phabricator:20160124.people.2.icondefault.sql',1505229313,422),('phabricator:20160128.repo.1.pull.sql',1505229313,8863),('phabricator:20160201.revision.properties.1.sql',1505229313,16179),('phabricator:20160201.revision.properties.2.sql',1505229313,378),('phabricator:20160202.board.1.proxy.sql',1505229313,19176),('phabricator:20160202.ipv6.1.sql',1505229313,25051),('phabricator:20160202.ipv6.2.php',1505229313,1285),('phabricator:20160206.cover.1.sql',1505229313,27640),('phabricator:20160208.task.1.sql',1505229313,60422),('phabricator:20160208.task.2.sql',1505229313,58138),('phabricator:20160208.task.3.sql',1505229313,46890),('phabricator:20160212.proj.1.sql',1505229313,34169),('phabricator:20160212.proj.2.sql',1505229313,344),('phabricator:20160215.owners.policy.1.sql',1505229313,17217),('phabricator:20160215.owners.policy.2.sql',1505229313,15547),('phabricator:20160215.owners.policy.3.sql',1505229313,405),('phabricator:20160215.owners.policy.4.sql',1505229313,359),('phabricator:20160218.callsigns.1.sql',1505229313,11296),('phabricator:20160221.almanac.1.devicen.sql',1505229313,6896),('phabricator:20160221.almanac.2.devicei.php',1505229313,1178),('phabricator:20160221.almanac.3.servicen.sql',1505229313,6698),('phabricator:20160221.almanac.4.servicei.php',1505229313,600),('phabricator:20160221.almanac.5.networkn.sql',1505229313,6506),('phabricator:20160221.almanac.6.networki.php',1505229313,941),('phabricator:20160221.almanac.7.namespacen.sql',1505229313,7199),('phabricator:20160221.almanac.8.namespace.sql',1505229313,7093),('phabricator:20160221.almanac.9.namespacex.sql',1505229313,6710),('phabricator:20160222.almanac.1.properties.php',1505229313,1060),('phabricator:20160223.almanac.1.bound.sql',1505229313,17026),('phabricator:20160223.almanac.2.lockbind.sql',1505229313,375),('phabricator:20160223.almanac.3.devicelock.sql',1505229313,18835),('phabricator:20160223.almanac.4.servicelock.sql',1505229313,22200),('phabricator:20160223.paste.fileedges.php',1505229313,519),('phabricator:20160225.almanac.1.disablebinding.sql',1505229313,22641),('phabricator:20160225.almanac.2.stype.sql',1505229313,8017),('phabricator:20160225.almanac.3.stype.php',1505229313,427),('phabricator:20160227.harbormaster.1.plann.sql',1505229313,7807),('phabricator:20160227.harbormaster.2.plani.php',1505229313,378),('phabricator:20160303.drydock.1.bluen.sql',1505229313,6891),('phabricator:20160303.drydock.2.bluei.php',1505229313,396),('phabricator:20160303.drydock.3.edge.sql',1505229313,14275),('phabricator:20160308.nuance.01.disabled.sql',1505229313,16906),('phabricator:20160308.nuance.02.cursordata.sql',1505229313,8314),('phabricator:20160308.nuance.03.sourcen.sql',1505229313,6308),('phabricator:20160308.nuance.04.sourcei.php',1505229313,1217),('phabricator:20160308.nuance.05.sourcename.sql',1505229313,10566),('phabricator:20160308.nuance.06.label.sql',1505229313,19354),('phabricator:20160308.nuance.07.itemtype.sql',1505229313,27249),('phabricator:20160308.nuance.08.itemkey.sql',1505229313,20363),('phabricator:20160308.nuance.09.itemcontainer.sql',1505229313,24353),('phabricator:20160308.nuance.10.itemkeyu.sql',1505229313,376),('phabricator:20160308.nuance.11.requestor.sql',1505229313,12897),('phabricator:20160308.nuance.12.queue.sql',1505229313,19233),('phabricator:20160316.lfs.01.token.resource.sql',1505229313,16537),('phabricator:20160316.lfs.02.token.user.sql',1505229313,15671),('phabricator:20160316.lfs.03.token.properties.sql',1505229313,16678),('phabricator:20160316.lfs.04.token.default.sql',1505229313,377),('phabricator:20160317.lfs.01.ref.sql',1505229313,7480),('phabricator:20160321.nuance.01.taskbridge.sql',1505229313,30440),('phabricator:20160322.nuance.01.itemcommand.sql',1505229313,11935),('phabricator:20160323.badgemigrate.sql',1505229313,1027),('phabricator:20160329.nuance.01.requestor.sql',1505229313,1791),('phabricator:20160329.nuance.02.requestorsource.sql',1505229313,1816),('phabricator:20160329.nuance.03.requestorxaction.sql',1505229313,1772),('phabricator:20160329.nuance.04.requestorcomment.sql',1505229313,1425),('phabricator:20160330.badges.migratequality.sql',1505229313,11451),('phabricator:20160330.badges.qualityxaction.mig.sql',1505229313,1561),('phabricator:20160331.fund.comments.1.sql',1505229313,6923),('phabricator:20160404.oauth.1.xaction.sql',1505229313,8413),('phabricator:20160405.oauth.2.disable.sql',1505229313,15191),('phabricator:20160406.badges.ngrams.php',1505229313,578),('phabricator:20160406.badges.ngrams.sql',1505229313,7954),('phabricator:20160406.columns.1.php',1505229313,437),('phabricator:20160411.repo.1.version.sql',1505229313,6469),('phabricator:20160418.repouri.1.sql',1505229313,6484),('phabricator:20160418.repouri.2.sql',1505229314,23815),('phabricator:20160418.repoversion.1.sql',1505229314,15654),('phabricator:20160419.pushlog.1.sql',1505229314,25941),('phabricator:20160424.locks.1.sql',1505229314,20267),('phabricator:20160426.searchedge.sql',1505229314,17197),('phabricator:20160428.repo.1.urixaction.sql',1505229314,6462),('phabricator:20160503.repo.01.lpath.sql',1505229314,21613),('phabricator:20160503.repo.02.lpathkey.sql',1505229314,14346),('phabricator:20160503.repo.03.lpathmigrate.php',1505229314,414),('phabricator:20160503.repo.04.mirrormigrate.php',1505229314,485),('phabricator:20160503.repo.05.urimigrate.php',1505229314,311),('phabricator:20160510.repo.01.uriindex.php',1505229314,4235),('phabricator:20160513.owners.01.autoreview.sql',1505229314,16067),('phabricator:20160513.owners.02.autoreviewnone.sql',1505229314,365),('phabricator:20160516.owners.01.dominion.sql',1505229314,20175),('phabricator:20160516.owners.02.dominionstrong.sql',1505229314,423),('phabricator:20160517.oauth.01.edge.sql',1505229314,14825),('phabricator:20160518.ssh.01.activecol.sql',1505229314,15395),('phabricator:20160518.ssh.02.activeval.sql',1505229314,337),('phabricator:20160518.ssh.03.activekey.sql',1505229314,10601),('phabricator:20160519.ssh.01.xaction.sql',1505229314,7825),('phabricator:20160531.pref.01.xaction.sql',1505229314,7035),('phabricator:20160531.pref.02.datecreatecol.sql',1505229314,11831),('phabricator:20160531.pref.03.datemodcol.sql',1505229314,14881),('phabricator:20160531.pref.04.datecreateval.sql',1505229314,459),('phabricator:20160531.pref.05.datemodval.sql',1505229314,394),('phabricator:20160531.pref.06.phidcol.sql',1505229314,16492),('phabricator:20160531.pref.07.phidval.php',1505229314,744),('phabricator:20160601.user.01.cache.sql',1505229314,9486),('phabricator:20160601.user.02.copyprefs.php',1505229314,1253),('phabricator:20160601.user.03.removetime.sql',1505229314,23634),('phabricator:20160601.user.04.removetranslation.sql',1505229314,21819),('phabricator:20160601.user.05.removesex.sql',1505229314,23387),('phabricator:20160603.user.01.removedcenabled.sql',1505229314,21090),('phabricator:20160603.user.02.removedctab.sql',1505229314,25564),('phabricator:20160603.user.03.removedcvisible.sql',1505229314,19922),('phabricator:20160604.user.01.stringmailprefs.php',1505229314,494),('phabricator:20160604.user.02.removeimagecache.sql',1505229314,21502),('phabricator:20160605.user.01.prefnulluser.sql',1505229314,11987),('phabricator:20160605.user.02.prefbuiltin.sql',1505229314,11726),('phabricator:20160605.user.03.builtinunique.sql',1505229314,12112),('phabricator:20160616.phame.blog.header.1.sql',1505229314,16566),('phabricator:20160616.repo.01.oldref.sql',1505229314,8781),('phabricator:20160617.harbormaster.01.arelease.sql',1505229314,17884),('phabricator:20160618.phame.blog.subtitle.sql',1505229314,18739),('phabricator:20160620.phame.blog.parentdomain.2.sql',1505229314,15869),('phabricator:20160620.phame.blog.parentsite.1.sql',1505229314,16664),('phabricator:20160623.phame.blog.fulldomain.1.sql',1505229314,16500),('phabricator:20160623.phame.blog.fulldomain.2.sql',1505229314,397),('phabricator:20160623.phame.blog.fulldomain.3.sql',1505229314,396),('phabricator:20160706.phame.blog.parentdomain.2.sql',1505229314,16071),('phabricator:20160706.phame.blog.parentsite.1.sql',1505229314,16648),('phabricator:20160707.calendar.01.stub.sql',1505229314,16706),('phabricator:20160711.files.01.builtin.sql',1505229314,27703),('phabricator:20160711.files.02.builtinkey.sql',1505229314,11792),('phabricator:20160713.event.01.host.sql',1505229314,12444),('phabricator:20160715.event.01.alldayfrom.sql',1505229314,16604),('phabricator:20160715.event.02.alldayto.sql',1505229314,15977),('phabricator:20160715.event.03.allday.php',1505229314,56),('phabricator:20160720.calendar.invitetxn.php',1505229314,589),('phabricator:20160721.pack.01.pub.sql',1505229314,7385),('phabricator:20160721.pack.02.pubxaction.sql',1505229314,6493),('phabricator:20160721.pack.03.edge.sql',1505229314,12007),('phabricator:20160721.pack.04.pkg.sql',1505229314,6712),('phabricator:20160721.pack.05.pkgxaction.sql',1505229314,6539),('phabricator:20160721.pack.06.version.sql',1505229314,6797),('phabricator:20160721.pack.07.versionxaction.sql',1505229314,6317),('phabricator:20160722.pack.01.pubngrams.sql',1505229314,6296),('phabricator:20160722.pack.02.pkgngrams.sql',1505229314,6651),('phabricator:20160722.pack.03.versionngrams.sql',1505229314,7330),('phabricator:20160810.commit.01.summarylength.sql',1505229314,11365),('phabricator:20160824.connectionlog.sql',1505229314,1280),('phabricator:20160824.repohint.01.hint.sql',1505229314,6434),('phabricator:20160824.repohint.02.movebad.php',1505229314,428),('phabricator:20160824.repohint.03.nukebad.sql',1505229314,1191),('phabricator:20160825.ponder.sql',1505229314,709),('phabricator:20160829.pastebin.01.language.sql',1505229314,10111),('phabricator:20160829.pastebin.02.language.sql',1505229314,567),('phabricator:20160913.conpherence.topic.1.sql',1505229314,12573),('phabricator:20160919.repo.messagecount.sql',1505229314,14535),('phabricator:20160919.repo.messagedefault.sql',1505229314,7168),('phabricator:20160921.fileexternalrequest.sql',1505229314,6804),('phabricator:20160927.phurl.ngrams.php',1505229314,378),('phabricator:20160927.phurl.ngrams.sql',1505229314,6850),('phabricator:20160928.repo.messagecount.sql',1505229314,396),('phabricator:20160928.tokentoken.sql',1505229314,6945),('phabricator:20161003.cal.01.utcepoch.sql',1505229315,50814),('phabricator:20161003.cal.02.parameters.sql',1505229315,18699),('phabricator:20161004.cal.01.noepoch.php',1505229315,1559),('phabricator:20161005.cal.01.rrules.php',1505229315,313),('phabricator:20161005.cal.02.export.sql',1505229315,7026),('phabricator:20161005.cal.03.exportxaction.sql',1505229315,7513),('phabricator:20161005.conpherence.image.1.sql',1505229315,12660),('phabricator:20161005.conpherence.image.2.php',1505229315,62),('phabricator:20161011.conpherence.ngrams.php',1505229315,320),('phabricator:20161011.conpherence.ngrams.sql',1505229315,8482),('phabricator:20161012.cal.01.import.sql',1505229315,8265),('phabricator:20161012.cal.02.importxaction.sql',1505229315,6919),('phabricator:20161012.cal.03.eventimport.sql',1505229315,76721),('phabricator:20161013.cal.01.importlog.sql',1505229315,8173),('phabricator:20161016.conpherence.imagephids.sql',1505229315,14268),('phabricator:20161025.phortune.contact.1.sql',1505229315,53977),('phabricator:20161025.phortune.merchant.image.1.sql',1505229315,29422),('phabricator:20161026.calendar.01.importtriggers.sql',1505229315,47454),('phabricator:20161027.calendar.01.externalinvitee.sql',1505229315,8092),('phabricator:20161029.phortune.invoice.1.sql',1505229315,28242),('phabricator:20161031.calendar.01.seriesparent.sql',1505229315,18636),('phabricator:20161031.calendar.02.notifylog.sql',1505229315,7982),('phabricator:20161101.calendar.01.noholiday.sql',1505229315,1735),('phabricator:20161101.calendar.02.removecolumns.sql',1505229315,105662),('phabricator:20161104.calendar.01.availability.sql',1505229315,18003),('phabricator:20161104.calendar.02.availdefault.sql',1505229315,442),('phabricator:20161115.phamepost.01.subtitle.sql',1505229315,17700),('phabricator:20161115.phamepost.02.header.sql',1505229315,21438),('phabricator:20161121.cluster.01.hoststate.sql',1505229315,9268),('phabricator:20161124.search.01.stopwords.sql',1505229315,6479),('phabricator:20161125.search.01.stemmed.sql',1505229315,7807),('phabricator:20161130.search.01.manual.sql',1505229315,7039),('phabricator:20161130.search.02.rebuild.php',1505229315,1862),('phabricator:20161210.dashboards.01.author.sql',1505229315,12501),('phabricator:20161210.dashboards.02.author.php',1505229315,916),('phabricator:20161211.menu.01.itemkey.sql',1505229315,8485),('phabricator:20161211.menu.02.itemprops.sql',1505229315,6725),('phabricator:20161211.menu.03.order.sql',1505229315,6170),('phabricator:20161212.dashboardpanel.01.author.sql',1505229315,13290),('phabricator:20161212.dashboardpanel.02.author.php',1505229315,735),('phabricator:20161212.dashboards.01.icon.sql',1505229315,15462),('phabricator:20161213.diff.01.hunks.php',1505229315,731),('phabricator:20161216.dashboard.ngram.01.sql',1505229315,16242),('phabricator:20161216.dashboard.ngram.02.php',1505229315,527),('phabricator:20170106.menu.01.customphd.sql',1505229315,12809),('phabricator:20170109.diff.01.commit.sql',1505229315,20022),('phabricator:20170119.menuitem.motivator.01.php',1505229315,252),('phabricator:20170131.dashboard.personal.01.php',1505229315,814),('phabricator:20170301.subtype.01.col.sql',1505229315,16520),('phabricator:20170301.subtype.02.default.sql',1505229315,416),('phabricator:20170301.subtype.03.taskcol.sql',1505229315,31002),('phabricator:20170301.subtype.04.taskdefault.sql',1505229315,355),('phabricator:20170303.people.01.avatar.sql',1505229315,44589),('phabricator:20170313.reviewers.01.sql',1505229315,13846),('phabricator:20170316.rawfiles.01.php',1505229315,1162),('phabricator:20170320.reviewers.01.lastaction.sql',1505229315,14750),('phabricator:20170320.reviewers.02.lastcomment.sql',1505229315,16419),('phabricator:20170320.reviewers.03.migrate.php',1505229315,855),('phabricator:20170322.reviewers.04.actor.sql',1505229315,16195),('phabricator:20170328.reviewers.01.void.sql',1505229315,16793),('phabricator:20170404.files.retroactive-content-hash.sql',1505229315,16177),('phabricator:20170406.hmac.01.keystore.sql',1505229315,6617),('phabricator:20170410.calendar.01.repair.php',1505229315,524),('phabricator:20170412.conpherence.01.picturecrop.sql',1505229315,325),('phabricator:20170413.conpherence.01.recentparty.sql',1505229315,12114),('phabricator:20170417.files.ngrams.sql',1505229315,8328),('phabricator:20170418.1.application.01.xaction.sql',1505229315,7862),('phabricator:20170418.1.application.02.edge.sql',1505229315,13057),('phabricator:20170418.files.isDeleted.sql',1505229316,33550),('phabricator:20170419.app.01.table.sql',1505229316,12496),('phabricator:20170419.thread.01.behind.sql',1505229316,18329),('phabricator:20170419.thread.02.status.sql',1505229316,37811),('phabricator:20170419.thread.03.touched.sql',1505229316,20278),('phabricator:20170424.user.01.verify.php',1505229316,369),('phabricator:20170427.owners.01.long.sql',1505229316,23690),('phabricator:20170504.1.slowvote.shuffle.sql',1505229316,14509),('phabricator:20170522.nuance.01.itemkey.sql',1505229316,20530),('phabricator:20170524.nuance.01.command.sql',1505229316,44533),('phabricator:20170524.nuance.02.commandstatus.sql',1505229316,14130),('phabricator:20170526.dropdifferentialdrafts.sql',1505229316,1085),('phabricator:20170526.milestones.php',1505229316,380),('phabricator:20170528.maniphestdupes.php',1505229316,307),('phabricator:20170612.repository.image.01.sql',1505229316,25441),('phabricator:20170614.taskstatus.sql',1505229316,19933),('phabricator:20170725.legalpad.date.01.sql',1505229316,794),('phabricator:20170811.differential.01.status.php',1505229316,380),('phabricator:20170811.differential.02.modernstatus.sql',1505229316,854),('phabricator:20170811.differential.03.modernxaction.php',1505229316,988),('phabricator:20170814.search.01.qconfig.sql',1505229316,6870),('phabricator:20170820.phame.01.post.views.sql',1505229316,16670),('phabricator:20170820.phame.02.post.views.sql',1505229316,349),('phabricator:20170824.search.01.saved.php',1505229316,597),('phabricator:20170825.phame.01.post.views.sql',1505229316,20405),('phabricator:20170828.ferret.01.taskdoc.sql',1505229316,7658),('phabricator:20170828.ferret.02.taskfield.sql',1505229316,6337),('phabricator:20170828.ferret.03.taskngrams.sql',1505229316,6695),('phabricator:20170830.ferret.01.unique.sql',1505229316,13328),('phabricator:20170830.ferret.02.term.sql',1505229316,15215),('phabricator:20170905.ferret.01.diff.doc.sql',1505229316,10278),('phabricator:20170905.ferret.02.diff.field.sql',1505229316,8206),('phabricator:20170905.ferret.03.diff.ngrams.sql',1505229316,7430),('phabricator:20170907.ferret.01.user.doc.sql',1505229316,6356),('phabricator:20170907.ferret.02.user.field.sql',1505229316,6335),('phabricator:20170907.ferret.03.user.ngrams.sql',1505229316,6307),('phabricator:20170907.ferret.04.fund.doc.sql',1505229316,6319),('phabricator:20170907.ferret.05.fund.field.sql',1505229316,5897),('phabricator:20170907.ferret.06.fund.ngrams.sql',1505229316,6511),('phabricator:20170907.ferret.07.passphrase.doc.sql',1505229316,5758),('phabricator:20170907.ferret.08.passphrase.field.sql',1505229316,6319),('phabricator:20170907.ferret.09.passphrase.ngrams.sql',1505229316,7128),('phabricator:20170907.ferret.10.owners.doc.sql',1505229316,6814),('phabricator:20170907.ferret.11.owners.field.sql',1505229316,6241),('phabricator:20170907.ferret.12.owners.ngrams.sql',1505229316,6010),('phabricator:20170907.ferret.13.blog.doc.sql',1505229316,6643),('phabricator:20170907.ferret.14.blog.field.sql',1505229316,7260),('phabricator:20170907.ferret.15.blog.ngrams.sql',1505229316,6603),('phabricator:20170907.ferret.16.post.doc.sql',1505229316,6246),('phabricator:20170907.ferret.17.post.field.sql',1505229316,6483),('phabricator:20170907.ferret.18.post.ngrams.sql',1505229316,6941),('phabricator:20170907.ferret.19.project.doc.sql',1505229316,5891),('phabricator:20170907.ferret.20.project.field.sql',1505229316,6006),('phabricator:20170907.ferret.21.project.ngrams.sql',1505229316,6046),('phabricator:20170907.ferret.22.phriction.doc.sql',1505229316,7390),('phabricator:20170907.ferret.23.phriction.field.sql',1505229316,5842),('phabricator:20170907.ferret.24.phriction.ngrams.sql',1505229316,6742),('phabricator:20170907.ferret.25.event.doc.sql',1505229316,6395),('phabricator:20170907.ferret.26.event.field.sql',1505229316,6675),('phabricator:20170907.ferret.27.event.ngrams.sql',1505229316,6619),('phabricator:20170907.ferret.28.mock.doc.sql',1505229316,7358),('phabricator:20170907.ferret.29.mock.field.sql',1505229316,5954),('phabricator:20170907.ferret.30.mock.ngrams.sql',1505229316,6756),('phabricator:20170907.ferret.31.repo.doc.sql',1505229316,6597),('phabricator:20170907.ferret.32.repo.field.sql',1505229316,7493),('phabricator:20170907.ferret.33.repo.ngrams.sql',1505229316,6181),('phabricator:20170907.ferret.34.commit.doc.sql',1505229316,6161),('phabricator:20170907.ferret.35.commit.field.sql',1505229316,6439),('phabricator:20170907.ferret.36.commit.ngrams.sql',1505229316,7055),('phabricator:20170912.ferret.01.activity.php',1505229316,396),('phabricator:daemonstatus.sql',1505229299,NULL),('phabricator:daemonstatuskey.sql',1505229300,NULL),('phabricator:daemontaskarchive.sql',1505229300,NULL),('phabricator:db.almanac',1505229294,NULL),('phabricator:db.application',1505229294,NULL),('phabricator:db.audit',1505229294,NULL),('phabricator:db.auth',1505229294,NULL),('phabricator:db.badges',1505229294,NULL),('phabricator:db.cache',1505229294,NULL),('phabricator:db.calendar',1505229294,NULL),('phabricator:db.chatlog',1505229294,NULL),('phabricator:db.conduit',1505229294,NULL),('phabricator:db.config',1505229294,NULL),('phabricator:db.conpherence',1505229294,NULL),('phabricator:db.countdown',1505229294,NULL),('phabricator:db.daemon',1505229294,NULL),('phabricator:db.dashboard',1505229294,NULL),('phabricator:db.differential',1505229294,NULL),('phabricator:db.diviner',1505229294,NULL),('phabricator:db.doorkeeper',1505229294,NULL),('phabricator:db.draft',1505229294,NULL),('phabricator:db.drydock',1505229294,NULL),('phabricator:db.fact',1505229294,NULL),('phabricator:db.feed',1505229294,NULL),('phabricator:db.file',1505229294,NULL),('phabricator:db.flag',1505229294,NULL),('phabricator:db.fund',1505229294,NULL),('phabricator:db.harbormaster',1505229294,NULL),('phabricator:db.herald',1505229294,NULL),('phabricator:db.legalpad',1505229294,NULL),('phabricator:db.maniphest',1505229294,NULL),('phabricator:db.meta_data',1505229294,NULL),('phabricator:db.metamta',1505229294,NULL),('phabricator:db.multimeter',1505229294,NULL),('phabricator:db.nuance',1505229294,NULL),('phabricator:db.oauth_server',1505229294,NULL),('phabricator:db.owners',1505229294,NULL),('phabricator:db.packages',1505229294,NULL),('phabricator:db.passphrase',1505229294,NULL),('phabricator:db.pastebin',1505229294,NULL),('phabricator:db.phame',1505229294,NULL),('phabricator:db.phlux',1505229294,NULL),('phabricator:db.pholio',1505229294,NULL),('phabricator:db.phortune',1505229294,NULL),('phabricator:db.phragment',1505229294,NULL),('phabricator:db.phrequent',1505229294,NULL),('phabricator:db.phriction',1505229294,NULL),('phabricator:db.phurl',1505229294,NULL),('phabricator:db.policy',1505229294,NULL),('phabricator:db.ponder',1505229294,NULL),('phabricator:db.project',1505229294,NULL),('phabricator:db.releeph',1505229294,NULL),('phabricator:db.repository',1505229294,NULL),('phabricator:db.search',1505229294,NULL),('phabricator:db.slowvote',1505229294,NULL),('phabricator:db.spaces',1505229294,NULL),('phabricator:db.system',1505229294,NULL),('phabricator:db.timeline',1505229294,NULL),('phabricator:db.token',1505229294,NULL),('phabricator:db.user',1505229294,NULL),('phabricator:db.worker',1505229294,NULL),('phabricator:db.xhpast',1505229294,NULL),('phabricator:db.xhpastview',1505229294,NULL),('phabricator:db.xhprof',1505229294,NULL),('phabricator:differentialbookmarks.sql',1505229299,NULL),('phabricator:draft-metadata.sql',1505229300,NULL),('phabricator:dropfileproxyimage.sql',1505229300,NULL),('phabricator:drydockresoucetype.sql',1505229300,NULL),('phabricator:drydocktaskid.sql',1505229300,NULL),('phabricator:edgetype.sql',1505229300,NULL),('phabricator:emailtable.sql',1505229299,NULL),('phabricator:emailtableport.sql',1505229299,NULL),('phabricator:emailtableremove.sql',1505229299,NULL),('phabricator:fact-raw.sql',1505229299,NULL),('phabricator:harbormasterobject.sql',1505229299,NULL),('phabricator:holidays.sql',1505229299,NULL),('phabricator:ldapinfo.sql',1505229299,NULL),('phabricator:legalpad-mailkey-populate.php',1505229302,NULL),('phabricator:legalpad-mailkey.sql',1505229302,NULL),('phabricator:liskcounters-task.sql',1505229300,NULL),('phabricator:liskcounters.php',1505229300,NULL),('phabricator:liskcounters.sql',1505229300,NULL),('phabricator:maniphestxcache.sql',1505229299,NULL),('phabricator:markupcache.sql',1505229299,NULL),('phabricator:migrate-differential-dependencies.php',1505229299,NULL),('phabricator:migrate-maniphest-dependencies.php',1505229299,NULL),('phabricator:migrate-maniphest-revisions.php',1505229299,NULL),('phabricator:migrate-project-edges.php',1505229299,NULL),('phabricator:owners-exclude.sql',1505229300,NULL),('phabricator:pastepolicy.sql',1505229300,NULL),('phabricator:phameblog.sql',1505229299,NULL),('phabricator:phamedomain.sql',1505229300,NULL),('phabricator:phameoneblog.sql',1505229300,NULL),('phabricator:phamepolicy.sql',1505229300,NULL),('phabricator:phiddrop.sql',1505229299,NULL),('phabricator:pholio.sql',1505229300,NULL),('phabricator:policy-project.sql',1505229300,NULL),('phabricator:ponder-comments.sql',1505229300,NULL),('phabricator:ponder-mailkey-populate.php',1505229300,NULL),('phabricator:ponder-mailkey.sql',1505229300,NULL),('phabricator:ponder.sql',1505229299,NULL),('phabricator:releeph.sql',1505229301,NULL),('phabricator:repository-lint.sql',1505229300,NULL),('phabricator:statustxt.sql',1505229300,NULL),('phabricator:symbolcontexts.sql',1505229299,NULL),('phabricator:testdatabase.sql',1505229299,NULL),('phabricator:threadtopic.sql',1505229299,NULL),('phabricator:userstatus.sql',1505229299,NULL),('phabricator:usertranslation.sql',1505229299,NULL),('phabricator:xhprof.sql',1505229300,NULL);
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `{$NAMESPACE}_metamta` /*!40100 DEFAULT CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} */;
 
@@ -2139,8 +2236,7 @@ CREATE TABLE `owners_owner` (
 CREATE TABLE `owners_package` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
-  `name` varchar(128) CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
-  `originalName` varchar(255) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `name` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
   `description` longtext COLLATE {$COLLATE_TEXT} NOT NULL,
   `primaryOwnerPHID` varbinary(64) DEFAULT NULL,
   `auditingEnabled` tinyint(1) NOT NULL DEFAULT '0',
@@ -2154,6 +2250,42 @@ CREATE TABLE `owners_package` (
   UNIQUE KEY `key_phid` (`phid`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `owners_package_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `owners_package_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `owners_package_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `owners_packagetransaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
@@ -2319,6 +2451,42 @@ CREATE TABLE `phame_blog` (
   UNIQUE KEY `domain` (`domain`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `phame_blog_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `phame_blog_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `phame_blog_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `phame_blogtransaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
@@ -2361,6 +2529,42 @@ CREATE TABLE `phame_post` (
   KEY `bloggerPosts` (`bloggerPHID`,`visibility`,`datePublished`,`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `phame_post_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `phame_post_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `phame_post_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `phame_posttransaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
@@ -2457,6 +2661,42 @@ CREATE TABLE `phriction_document` (
   UNIQUE KEY `depth` (`depth`,`slug`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `phriction_document_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `phriction_document_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `phriction_document_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `phriction_transaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
@@ -2643,6 +2883,42 @@ CREATE TABLE `project_datasourcetoken` (
   KEY `projectID` (`projectID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `project_project_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `project_project_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `project_project_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `project_slug` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `projectPHID` varbinary(64) NOT NULL,
@@ -2715,6 +2991,7 @@ CREATE TABLE `repository` (
   `spacePHID` varbinary(64) DEFAULT NULL,
   `repositorySlug` varchar(64) CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} DEFAULT NULL,
   `localPath` varchar(128) COLLATE {$COLLATE_TEXT} DEFAULT NULL,
+  `profileImagePHID` varbinary(64) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `key_phid` (`phid`),
   UNIQUE KEY `callsign` (`callsign`),
@@ -2769,6 +3046,42 @@ CREATE TABLE `repository_commit` (
   KEY `key_author` (`authorPHID`,`epoch`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `repository_commit_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `repository_commit_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `repository_commit_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `repository_commitdata` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `commitID` int(10) unsigned NOT NULL,
@@ -2963,6 +3276,42 @@ CREATE TABLE `repository_refcursor` (
   KEY `key_cursor` (`repositoryPHID`,`refType`,`refNameHash`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `repository_repository_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `repository_repository_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `repository_repository_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `repository_statusmessage` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `repositoryID` int(10) unsigned NOT NULL,
@@ -3128,7 +3477,7 @@ CREATE TABLE `search_documentfield` (
   `stemmedCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT},
   KEY `phid` (`phid`),
   FULLTEXT KEY `key_corpus` (`corpus`,`stemmedCorpus`)
-) ENGINE=MyISAM DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
 CREATE TABLE `search_documentrelationship` (
   `phid` varbinary(64) NOT NULL,
@@ -3209,6 +3558,17 @@ CREATE TABLE `search_namedquery` (
   UNIQUE KEY `key_userquery` (`userPHID`,`engineClassName`,`queryKey`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `search_namedqueryconfig` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `engineClassName` varchar(128) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `scopePHID` varbinary(64) NOT NULL,
+  `properties` longtext COLLATE {$COLLATE_TEXT} NOT NULL,
+  `dateCreated` int(10) unsigned NOT NULL,
+  `dateModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_scope` (`engineClassName`,`scopePHID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `search_profilepanelconfiguration` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
@@ -3314,7 +3674,7 @@ CREATE TABLE `slowvote_poll` (
   `phid` varbinary(64) NOT NULL,
   `authorPHID` varbinary(64) NOT NULL,
   `responseVisibility` int(10) unsigned NOT NULL,
-  `shuffle` int(10) unsigned NOT NULL,
+  `shuffle` tinyint(1) NOT NULL DEFAULT '0',
   `method` int(10) unsigned NOT NULL,
   `dateCreated` int(10) unsigned NOT NULL,
   `dateModified` int(10) unsigned NOT NULL,
@@ -3627,6 +3987,42 @@ CREATE TABLE `user_transaction` (
   KEY `key_object` (`objectPHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `user_user_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `user_user_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `user_user_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `{$NAMESPACE}_worker` /*!40100 DEFAULT CHARACTER SET {$CHARSET} COLLATE {$COLLATE_TEXT} */;
 
 USE `{$NAMESPACE}_worker`;
@@ -3956,7 +4352,7 @@ CREATE TABLE `ponder_question` (
   KEY `authorPHID` (`authorPHID`),
   KEY `status` (`status`),
   KEY `key_space` (`spacePHID`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
 CREATE TABLE `ponder_questiontransaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -4076,6 +4472,42 @@ CREATE TABLE `pholio_mock` (
   KEY `key_space` (`spacePHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `pholio_mock_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `pholio_mock_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `pholio_mock_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `pholio_transaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
@@ -4136,7 +4568,7 @@ CREATE TABLE `conpherence_index` (
   UNIQUE KEY `key_previous` (`previousTransactionPHID`),
   KEY `key_thread` (`threadPHID`),
   FULLTEXT KEY `key_corpus` (`corpus`)
-) ENGINE=MyISAM DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
 CREATE TABLE `conpherence_participant` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -5249,7 +5681,7 @@ CREATE TABLE `nuance_item` (
   `dateModified` int(10) unsigned NOT NULL,
   `queuePHID` varbinary(64) DEFAULT NULL,
   `itemType` varchar(64) COLLATE {$COLLATE_TEXT} NOT NULL,
-  `itemKey` varchar(64) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `itemKey` varchar(64) COLLATE {$COLLATE_TEXT} DEFAULT NULL,
   `itemContainerKey` varchar(64) COLLATE {$COLLATE_TEXT} DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `key_phid` (`phid`),
@@ -5267,8 +5699,12 @@ CREATE TABLE `nuance_itemcommand` (
   `authorPHID` varbinary(64) NOT NULL,
   `command` varchar(64) COLLATE {$COLLATE_TEXT} NOT NULL,
   `parameters` longtext COLLATE {$COLLATE_TEXT} NOT NULL,
+  `dateCreated` int(10) unsigned NOT NULL,
+  `dateModified` int(10) unsigned NOT NULL,
+  `queuePHID` varbinary(64) DEFAULT NULL,
+  `status` varchar(64) COLLATE {$COLLATE_TEXT} NOT NULL,
   PRIMARY KEY (`id`),
-  KEY `key_item` (`itemPHID`)
+  KEY `key_pending` (`itemPHID`,`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
 CREATE TABLE `nuance_itemtransaction` (
@@ -5476,6 +5912,42 @@ CREATE TABLE `passphrase_credential` (
   KEY `key_space` (`spacePHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `passphrase_credential_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `passphrase_credential_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `passphrase_credential_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `passphrase_credentialtransaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,
@@ -5809,6 +6281,42 @@ CREATE TABLE `fund_initiative` (
   KEY `key_owner` (`ownerPHID`)
 ) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
+CREATE TABLE `fund_initiative_fdocument` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `objectPHID` varbinary(64) NOT NULL,
+  `isClosed` tinyint(1) NOT NULL,
+  `authorPHID` varbinary(64) DEFAULT NULL,
+  `ownerPHID` varbinary(64) DEFAULT NULL,
+  `epochCreated` int(10) unsigned NOT NULL,
+  `epochModified` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_object` (`objectPHID`),
+  KEY `key_author` (`authorPHID`),
+  KEY `key_owner` (`ownerPHID`),
+  KEY `key_created` (`epochCreated`),
+  KEY `key_modified` (`epochModified`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `fund_initiative_ffield` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `fieldKey` varchar(4) COLLATE {$COLLATE_TEXT} NOT NULL,
+  `rawCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `termCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  `normalCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT} NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_documentfield` (`documentID`,`fieldKey`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
+CREATE TABLE `fund_initiative_fngrams` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `documentID` int(10) unsigned NOT NULL,
+  `ngram` char(3) COLLATE {$COLLATE_TEXT} NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `key_ngram` (`ngram`,`documentID`),
+  KEY `key_object` (`documentID`)
+) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+
 CREATE TABLE `fund_initiativetransaction` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `phid` varbinary(64) NOT NULL,

From 6cedd4a95cfc23a1679400fb64863c49f24f2306 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 12 Sep 2017 12:24:23 -0700
Subject: [PATCH 158/865] Revert quickstart for tables with native FULLTEXT
 indexes to MyISAM

See D18594.
---
 resources/sql/quickstart.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/sql/quickstart.sql b/resources/sql/quickstart.sql
index e9ae4465a4..b29472d5e7 100644
--- a/resources/sql/quickstart.sql
+++ b/resources/sql/quickstart.sql
@@ -3477,7 +3477,7 @@ CREATE TABLE `search_documentfield` (
   `stemmedCorpus` longtext CHARACTER SET {$CHARSET_SORT} COLLATE {$COLLATE_SORT},
   KEY `phid` (`phid`),
   FULLTEXT KEY `key_corpus` (`corpus`,`stemmedCorpus`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+) ENGINE=MyISAM DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
 CREATE TABLE `search_documentrelationship` (
   `phid` varbinary(64) NOT NULL,
@@ -4568,7 +4568,7 @@ CREATE TABLE `conpherence_index` (
   UNIQUE KEY `key_previous` (`previousTransactionPHID`),
   KEY `key_thread` (`threadPHID`),
   FULLTEXT KEY `key_corpus` (`corpus`)
-) ENGINE=InnoDB DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
+) ENGINE=MyISAM DEFAULT CHARSET={$CHARSET} COLLATE={$COLLATE_TEXT};
 
 CREATE TABLE `conpherence_participant` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,

From 29f625ef6882939f277ff4f3ce7e0367313499f4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Sep 2017 14:51:34 -0700
Subject: [PATCH 159/865] Make "No Notifications" setting less broad, and fix a
 bug with default display behavior

Summary:
Fixes T12979. In D18457, we added a "No Notifications" setting to let users disable the blue and yellow pop-up notifications that alert you when an object has been updated, since some users found them distracting.

However, the change made "do nothing" the default, so all other `JX.Notification` callsites -- which never pass a preference -- were effectively turned off no matter what your setting was set to. This includes the "Read-Only" mode warning (grey), the "High Security" mode warning (purple), the "timezone" warning, and a few others.

Tweak things a little bit so the setting applies to ONLY blue and yellow ("object you're following was updated" / "this object was updated") notifications, not other types of popup notifications.

Test Plan:
  - With notifications on in settings, got blue notifications and "Read-only".
  - With notifications off in settings, got "Read-only" but no blue notifications.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12979

Differential Revision: https://secure.phabricator.com/D18600
---
 resources/celerity/map.php                    | 52 +++++++++----------
 .../PhabricatorNotificationBuilder.php        | 12 ++---
 ...icatorNotificationIndividualController.php |  8 +--
 .../aphlict/behavior-aphlict-listen.js        |  7 ++-
 webroot/rsrc/js/core/Notification.js          | 19 ++-----
 5 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 2093e3e70e..552fe22a68 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => 'b5b51108',
     'core.pkg.css' => 'e9473020',
-    'core.pkg.js' => '6c085267',
+    'core.pkg.js' => '28552e58',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
     'differential.pkg.js' => 'b71b8c5d',
@@ -374,7 +374,7 @@
     'rsrc/image/texture/table_header_tall.png' => 'd56b434f',
     'rsrc/js/application/aphlict/Aphlict.js' => 'e1d4b11a',
     'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => 'caade6f2',
-    'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'a14cbdfc',
+    'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => '4cc4f460',
     'rsrc/js/application/aphlict/behavior-aphlict-status.js' => '5e2634b9',
     'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => '27ca6289',
     'rsrc/js/application/calendar/behavior-day-view.js' => '4b3c4443',
@@ -467,7 +467,7 @@
     'rsrc/js/core/KeyboardShortcut.js' => '1ae869f2',
     'rsrc/js/core/KeyboardShortcutManager.js' => 'c19dd9b9',
     'rsrc/js/core/MultirowRowManager.js' => 'b5d57730',
-    'rsrc/js/core/Notification.js' => '5c3349b2',
+    'rsrc/js/core/Notification.js' => '008faf9c',
     'rsrc/js/core/Prefab.js' => 'c5af80a2',
     'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
     'rsrc/js/core/TextAreaUtils.js' => '320810c8',
@@ -585,7 +585,7 @@
     'javelin-aphlict' => 'e1d4b11a',
     'javelin-behavior' => '61cbc29a',
     'javelin-behavior-aphlict-dropdown' => 'caade6f2',
-    'javelin-behavior-aphlict-listen' => 'a14cbdfc',
+    'javelin-behavior-aphlict-listen' => '4cc4f460',
     'javelin-behavior-aphlict-status' => '5e2634b9',
     'javelin-behavior-aphront-basic-tokenizer' => 'b3a4b884',
     'javelin-behavior-aphront-drag-and-drop-textarea' => '484a6e22',
@@ -789,7 +789,7 @@
     'phabricator-keyboard-shortcut-manager' => 'c19dd9b9',
     'phabricator-main-menu-view' => '1802a242',
     'phabricator-nav-view-css' => 'faf6a6fc',
-    'phabricator-notification' => '5c3349b2',
+    'phabricator-notification' => '008faf9c',
     'phabricator-notification-css' => '457861ec',
     'phabricator-notification-menu-css' => '10685bd4',
     'phabricator-object-selector-css' => '85ee8ce6',
@@ -904,6 +904,13 @@
     'unhandled-exception-css' => '4c96257a',
   ),
   'requires' => array(
+    '008faf9c' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-util',
+      'phabricator-notification-css',
+    ),
     '013ffff9' => array(
       'javelin-install',
       'javelin-util',
@@ -1236,6 +1243,20 @@
       'javelin-uri',
       'phabricator-notification',
     ),
+    '4cc4f460' => array(
+      'javelin-behavior',
+      'javelin-aphlict',
+      'javelin-stratcom',
+      'javelin-request',
+      'javelin-uri',
+      'javelin-dom',
+      'javelin-json',
+      'javelin-router',
+      'javelin-util',
+      'javelin-leader',
+      'javelin-sound',
+      'phabricator-notification',
+    ),
     '4d863052' => array(
       'javelin-dom',
       'javelin-util',
@@ -1326,13 +1347,6 @@
       'javelin-vector',
       'javelin-dom',
     ),
-    '5c3349b2' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-util',
-      'phabricator-notification-css',
-    ),
     '5c54cbf3' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1684,20 +1698,6 @@
       'javelin-util',
       'phabricator-keyboard-shortcut',
     ),
-    'a14cbdfc' => array(
-      'javelin-behavior',
-      'javelin-aphlict',
-      'javelin-stratcom',
-      'javelin-request',
-      'javelin-uri',
-      'javelin-dom',
-      'javelin-json',
-      'javelin-router',
-      'javelin-util',
-      'javelin-leader',
-      'javelin-sound',
-      'phabricator-notification',
-    ),
     'a3a63478' => array(
       'phui-workcard-view-css',
     ),
diff --git a/src/applications/notification/builder/PhabricatorNotificationBuilder.php b/src/applications/notification/builder/PhabricatorNotificationBuilder.php
index 5691755cc7..026f55149c 100644
--- a/src/applications/notification/builder/PhabricatorNotificationBuilder.php
+++ b/src/applications/notification/builder/PhabricatorNotificationBuilder.php
@@ -153,8 +153,8 @@ public function buildDict() {
     foreach ($stories as $story) {
       if ($story instanceof PhabricatorApplicationTransactionFeedStory) {
         $dict[] = array(
-          'desktopReady' => $desktop_ready,
-          'webReady'     => $web_ready,
+          'showAnyNotification' => $web_ready,
+          'showDesktopNotification' => $desktop_ready,
           'title'        => $story->renderText(),
           'body'         => $story->renderTextBody(),
           'href'         => $story->getURI(),
@@ -162,8 +162,8 @@ public function buildDict() {
         );
       } else if ($story instanceof PhabricatorNotificationTestFeedStory) {
         $dict[] = array(
-          'desktopReady' => $desktop_ready,
-          'webReady'     => $web_ready,
+          'showAnyNotification' => $web_ready,
+          'showDesktopNotification' => $desktop_ready,
           'title'        => pht('Test Notification'),
           'body'         => $story->renderText(),
           'href'         => null,
@@ -171,8 +171,8 @@ public function buildDict() {
         );
       } else {
         $dict[] = array(
-          'desktopReady' => false,
-          'webReady'     => false,
+          'showWebNotification' => false,
+          'showDesktopNotification' => false,
           'title'        => null,
           'body'         => null,
           'href'         => null,
diff --git a/src/applications/notification/controller/PhabricatorNotificationIndividualController.php b/src/applications/notification/controller/PhabricatorNotificationIndividualController.php
index 8ef6286225..bac429288e 100644
--- a/src/applications/notification/controller/PhabricatorNotificationIndividualController.php
+++ b/src/applications/notification/controller/PhabricatorNotificationIndividualController.php
@@ -38,15 +38,9 @@ public function handleRequest(AphrontRequest $request) {
     $dict = $builder->buildDict();
     $data = $dict[0];
 
-    $response = array(
+    $response = $data + array(
       'pertinent'         => true,
       'primaryObjectPHID' => $story->getPrimaryObjectPHID(),
-      'desktopReady'      => $data['desktopReady'],
-      'webReady'          => $data['webReady'],
-      'href'              => $data['href'],
-      'icon'              => $data['icon'],
-      'title'             => $data['title'],
-      'body'              => $data['body'],
       'content'           => hsprintf('%s', $content),
       'uniqueID' => 'story/'.$story->getChronologicalKey(),
     );
diff --git a/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js b/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
index 2886aa0372..24571b5981 100644
--- a/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
+++ b/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
@@ -78,12 +78,15 @@ JX.behavior('aphlict-listen', function(config) {
     JX.Stratcom.invoke('notification-panel-update', null, {});
     var response = e.getData();
 
+    if (!response.showAnyNotification) {
+      return;
+    }
+
     // Show the notification itself.
     new JX.Notification()
       .setContent(JX.$H(response.content))
-      .setDesktopReady(response.desktopReady)
-      .setWebReady(response.webReady)
       .setKey(response.primaryObjectPHID)
+      .setShowAsDesktopNotification(response.showDesktopNotification)
       .setTitle(response.title)
       .setBody(response.body)
       .setHref(response.href)
diff --git a/webroot/rsrc/js/core/Notification.js b/webroot/rsrc/js/core/Notification.js
index 9e59ec1501..13e6cc47ae 100644
--- a/webroot/rsrc/js/core/Notification.js
+++ b/webroot/rsrc/js/core/Notification.js
@@ -26,8 +26,7 @@ JX.install('Notification', {
     _visible : false,
     _hideTimer : null,
     _duration : 12000,
-    _desktopReady : false,
-    _webReady : false,
+    _asDesktop : false,
     _key : null,
     _title : null,
     _body : null,
@@ -37,11 +36,6 @@ JX.install('Notification', {
     show : function() {
       var self = JX.Notification;
 
-      // This person doesn't like any real-time notification
-      if (!this._desktopReady && !this._webReady) {
-        return;
-      }
-
       if (!this._visible) {
         this._visible = true;
 
@@ -51,7 +45,7 @@ JX.install('Notification', {
 
       if (self.supportsDesktopNotifications() &&
           self.desktopNotificationsEnabled() &&
-          this._desktopReady) {
+          this._asDesktop) {
         // Note: specifying "tag" means that notifications with matching
         // keys will aggregate.
         var n = new window.Notification(this._title, {
@@ -94,13 +88,8 @@ JX.install('Notification', {
       return this;
     },
 
-    setDesktopReady : function(ready) {
-      this._desktopReady = ready;
-      return this;
-    },
-
-    setWebReady : function(ready) {
-      this._webReady = ready;
+    setShowAsDesktopNotification : function(mode) {
+      this._asDesktop = mode;
       return this;
     },
 

From 6fb3f857fb57bd902b826567d38c07eb131b008b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 12 Sep 2017 15:32:15 -0700
Subject: [PATCH 160/865] Stop the bleeding caused by attaching enormous
 patches to revision mail

Summary:
Ref T12033. This is a very narrow fix for this issue, but it should fix the major error: don't attach patches if they're bigger than the mail body limit (by default, 512KB).

Specifically, the logs from an install in T12033 show a 112MB patch being attached, and that's the biggest practical problem here.

I'll follow up on the tasks with more nuanced future work.

Test Plan: Enabled `differential.attach-patches`, saw a patch attached to email. Set the byte limit very low, saw patches get thrown away.

Reviewers: chad, amckinley

Reviewed By: amckinley

Maniphest Tasks: T12033

Differential Revision: https://secure.phabricator.com/D18598
---
 .../editor/DifferentialTransactionEditor.php         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index e916728c86..c6270013aa 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -766,10 +766,14 @@ protected function buildMailBody(
         }
 
         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));
+          // See T12033, T11767, and PHI55. This is a crude fix to stop the
+          // major concrete problems that lackluster email size limits cause.
+          if (strlen($patch) < $body_limit) {
+            $name = pht('D%s.%s.patch', $object->getID(), $diff->getID());
+            $mime_type = 'text/x-patch; charset=utf-8';
+            $body->addAttachment(
+              new PhabricatorMetaMTAAttachment($patch, $name, $mime_type));
+          }
         }
       }
     }

From c310f08b7a5cf7ae339a2d6c91955ba08560ce93 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Sep 2017 12:14:06 -0700
Subject: [PATCH 161/865] Work around workflow blocking error with duplicate
 "master" refs in "Land Revision"

Summary:
Ref T11823. See PHI68. T11823 has a full description of this issue and a plan to fix it, but the full plan is relatively complicated.

Until that can happen, provide a workaround for the biggest immediate issue, where multiple copies of a ref cursor can cause `executeOne()` to throw, since it expects a single result. In practice, these copies are always identical so we can just pick the first one.

This will get cleaned up once T11823 is fixed properly.

Test Plan:
Forced the table into a duplicate/ambiguous state, reproduced a similar-looking error:

{F5180999}

Applied the patch, got the "Land" to work as expected:

{F5181000}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T11823

Differential Revision: https://secure.phabricator.com/D18599
---
 .../DifferentialRevisionOperationController.php    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialRevisionOperationController.php b/src/applications/differential/controller/DifferentialRevisionOperationController.php
index feeb6770b8..593815f15b 100644
--- a/src/applications/differential/controller/DifferentialRevisionOperationController.php
+++ b/src/applications/differential/controller/DifferentialRevisionOperationController.php
@@ -137,9 +137,19 @@ private function loadDefaultRef(
       return null;
     }
 
-    return $this->newRefQuery($repository)
+    // NOTE: See PHI68. This is a workaround to make "Land Revision" work
+    // until T11823 is fixed properly. If we find multiple refs with the same
+    // name (normally, duplicate "master" refs), just pick the first one.
+
+    $refs = $this->newRefQuery($repository)
       ->withRefNames(array($default_name))
-      ->executeOne();
+      ->execute();
+
+    if ($refs) {
+      return head($refs);
+    }
+
+    return null;
   }
 
   private function getDefaultRefName(

From bc995048c913755e9a7b6f77e3b1d92c57610acd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Sep 2017 12:14:06 -0700
Subject: [PATCH 162/865] (stable) Work around workflow blocking error with
 duplicate "master" refs in "Land Revision"

Summary:
Ref T11823. See PHI68. T11823 has a full description of this issue and a plan to fix it, but the full plan is relatively complicated.

Until that can happen, provide a workaround for the biggest immediate issue, where multiple copies of a ref cursor can cause `executeOne()` to throw, since it expects a single result. In practice, these copies are always identical so we can just pick the first one.

This will get cleaned up once T11823 is fixed properly.

Test Plan:
Forced the table into a duplicate/ambiguous state, reproduced a similar-looking error:

{F5180999}

Applied the patch, got the "Land" to work as expected:

{F5181000}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T11823

Differential Revision: https://secure.phabricator.com/D18599
---
 .../DifferentialRevisionOperationController.php    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialRevisionOperationController.php b/src/applications/differential/controller/DifferentialRevisionOperationController.php
index feeb6770b8..593815f15b 100644
--- a/src/applications/differential/controller/DifferentialRevisionOperationController.php
+++ b/src/applications/differential/controller/DifferentialRevisionOperationController.php
@@ -137,9 +137,19 @@ private function loadDefaultRef(
       return null;
     }
 
-    return $this->newRefQuery($repository)
+    // NOTE: See PHI68. This is a workaround to make "Land Revision" work
+    // until T11823 is fixed properly. If we find multiple refs with the same
+    // name (normally, duplicate "master" refs), just pick the first one.
+
+    $refs = $this->newRefQuery($repository)
       ->withRefNames(array($default_name))
-      ->executeOne();
+      ->execute();
+
+    if ($refs) {
+      return head($refs);
+    }
+
+    return null;
   }
 
   private function getDefaultRefName(

From 939008e64c2661aa82d42514e043a4a3e8c4fe99 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 14 Sep 2017 04:23:53 -0700
Subject: [PATCH 163/865] Correct an issue where Maniphest's awful legacy
 "reports" UI was extra broken on merges

Summary:
See PHI66. See that issue for context. This UI is bad broken legacy junk, but was especially broken when reporting merges.

These do not currently generate a "status" transaction, so they were never counted as task closures. Pretend they're normal closures.

This is still wrong, but should be much closer to the real numbers. Specifically, if you merge a closed task into another task, it will incorrectly be counted as an extra close. This could result in negative tasks, but the numbers should be much closer to reality than they are today even so.

The "Facts" application (T1562) is the real pathway forward here in the longer term.

Test Plan:
  - Moved my `maniphest_transactions` table aside with `RENAME TABLE ...`.
  - Created a new empty table with `CREATE TABLE ... LIKE ...`.
  - Reloaded reports UI, saw empty chart.
  - Created, closed, and reopened tasks while reloading the chart, saw accurate reporting.
  - Merged an open task into another task, saw bad reporting.
  - Applied patch, saw the right chart again.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18601
---
 .../controller/ManiphestReportController.php  | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
index 3cc420a4c6..6a5b3ad50c 100644
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -88,23 +88,40 @@ public function renderBurn() {
 
     $data = queryfx_all(
       $conn,
-      'SELECT x.oldValue, x.newValue, x.dateCreated FROM %T x %Q
-        WHERE transactionType = %s
+      'SELECT x.transactionType, x.oldValue, x.newValue, x.dateCreated
+        FROM %T x %Q
+        WHERE transactionType IN (%Ls)
         ORDER BY x.dateCreated ASC',
       $table->getTableName(),
       $joins,
-      ManiphestTaskStatusTransaction::TRANSACTIONTYPE);
+      array(
+        ManiphestTaskStatusTransaction::TRANSACTIONTYPE,
+        ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE,
+      ));
 
     $stats = array();
     $day_buckets = array();
 
     $open_tasks = array();
 
+    $default_status = ManiphestTaskStatus::getDefaultStatus();
+    $duplicate_status = ManiphestTaskStatus::getDuplicateStatus();
     foreach ($data as $key => $row) {
-
-      // NOTE: Hack to avoid json_decode().
-      $oldv = trim($row['oldValue'], '"');
-      $newv = trim($row['newValue'], '"');
+      switch ($row['transactionType']) {
+        case ManiphestTaskStatusTransaction::TRANSACTIONTYPE:
+          // NOTE: Hack to avoid json_decode().
+          $oldv = trim($row['oldValue'], '"');
+          $newv = trim($row['newValue'], '"');
+          break;
+        case ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE:
+          // NOTE: Merging a task does not generate a "status" transaction.
+          // We pretend it did. Note that this is not always accurate: it is
+          // possble to merge a task which was previously closed, but this
+          // fake transaction always counts a merge as a closure.
+          $oldv = $default_status;
+          $newv = $duplicate_status;
+          break;
+      }
 
       if ($oldv == 'null') {
         $old_is_open = false;

From c71cb944a42851de00b2129f15899f7681b0f7ed Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Thu, 14 Sep 2017 13:18:40 -0700
Subject: [PATCH 164/865] Add edit methods for Almanac services and devices

Summary: See T12414. This just gets started; we still need edit endpoints for network interfaces and bindings.

Test Plan: Created some devices/services from the conduit UI.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18605
---
 src/__phutil_library_map__.php                |  4 ++++
 .../AlamancServiceEditConduitAPIMethod.php    | 19 +++++++++++++++++++
 .../AlmanacDeviceEditConduitAPIMethod.php     | 19 +++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 src/applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php
 create mode 100644 src/applications/almanac/conduit/AlmanacDeviceEditConduitAPIMethod.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 97f5b480a4..282e5aaf62 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -9,6 +9,7 @@
 phutil_register_library_map(array(
   '__library_version__' => 2,
   'class' => array(
+    'AlamancServiceEditConduitAPIMethod' => 'applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php',
     'AlmanacAddress' => 'applications/almanac/util/AlmanacAddress.php',
     'AlmanacBinding' => 'applications/almanac/storage/AlmanacBinding.php',
     'AlmanacBindingDisableController' => 'applications/almanac/controller/AlmanacBindingDisableController.php',
@@ -36,6 +37,7 @@
     'AlmanacDAO' => 'applications/almanac/storage/AlmanacDAO.php',
     'AlmanacDevice' => 'applications/almanac/storage/AlmanacDevice.php',
     'AlmanacDeviceController' => 'applications/almanac/controller/AlmanacDeviceController.php',
+    'AlmanacDeviceEditConduitAPIMethod' => 'applications/almanac/conduit/AlmanacDeviceEditConduitAPIMethod.php',
     'AlmanacDeviceEditController' => 'applications/almanac/controller/AlmanacDeviceEditController.php',
     'AlmanacDeviceEditEngine' => 'applications/almanac/editor/AlmanacDeviceEditEngine.php',
     'AlmanacDeviceEditor' => 'applications/almanac/editor/AlmanacDeviceEditor.php',
@@ -4930,6 +4932,7 @@
     'require_celerity_resource' => 'applications/celerity/api.php',
   ),
   'xmap' => array(
+    'AlamancServiceEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacAddress' => 'Phobject',
     'AlmanacBinding' => array(
       'AlmanacDAO',
@@ -4975,6 +4978,7 @@
       'PhabricatorExtendedPolicyInterface',
     ),
     'AlmanacDeviceController' => 'AlmanacController',
+    'AlmanacDeviceEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacDeviceEditController' => 'AlmanacDeviceController',
     'AlmanacDeviceEditEngine' => 'PhabricatorEditEngine',
     'AlmanacDeviceEditor' => 'AlmanacEditor',
diff --git a/src/applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php b/src/applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php
new file mode 100644
index 0000000000..d56b07a21d
--- /dev/null
+++ b/src/applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php
@@ -0,0 +1,19 @@
+<?php
+
+final class AlamancServiceEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.service.edit';
+  }
+
+  public function newEditEngine() {
+    return new AlmanacServiceEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'Apply transactions to create a new service or edit an existing one.');
+  }
+
+}
diff --git a/src/applications/almanac/conduit/AlmanacDeviceEditConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacDeviceEditConduitAPIMethod.php
new file mode 100644
index 0000000000..1ad93d9a1c
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacDeviceEditConduitAPIMethod.php
@@ -0,0 +1,19 @@
+<?php
+
+final class AlmanacDeviceEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.device.edit';
+  }
+
+  public function newEditEngine() {
+    return new AlmanacDeviceEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'Apply transactions to create a new device or edit an existing one.');
+  }
+
+}

From 5ae3af6691caa5d85cadf5f12e4ee845cf285988 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 05:33:08 -0700
Subject: [PATCH 165/865] Fix an outdated HTML anchor link in Diffusion table
 of contents

Summary:
See <https://discourse.phabricator-community.org/t/navigating-to-changed-files-in-diffusion-does-not-work-anymore/433>.

In D18465, I updated these but this hard-coded the anchor for some reason (???) and I missed it while `grep`-ing.

Test Plan: Viewed a commit (`/rXYZaaaa`) and clicked a file link in the table of contents. Got modern `#change-...` anchor and navigation into the document.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18609
---
 .../diffusion/controller/DiffusionCommitController.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 554ad64e5e..59a132b17d 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -946,7 +946,7 @@ private function buildTableOfContents(
 
     foreach ($changesets as $changeset_id => $changeset) {
       $path = $changeset->getFilename();
-      $anchor = substr(md5($path), 0, 8);
+      $anchor = $changeset->getAnchorName();
 
       $history_link = $diffusion_view->linkHistory($path);
       $browse_link = $diffusion_view->linkBrowse(

From bd923d1ce0914f587a8ef5ad1a4f171b52cc4925 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 05:46:41 -0700
Subject: [PATCH 166/865] Provide an explicit "-R" flag to "hg serve"

Summary:
See <https://discourse.phabricator-community.org/t/unable-to-use-current-mercurial-on-debian-stretch/391>.

The Mercurial commit is helpful in particular: <https://www.mercurial-scm.org/repo/hg/rev/77eaf9539499>

We weren't vulnerable to the security issue (users can not control any part of the command) but pass the working directory explicitly to get past the new safety check.

I left `setCWD()` in place (a few lines below) just because it can't hurt, and in some other contexts it sometimes matter (for example, if commit hooks execute, they might inherit the parent CWD here or in other VCSes).

Test Plan:
  - Cloned from a Mercurial repo locally over HTTP.
  - Verified that SSH cloning already uses `-R` (it does, see `DiffusionMercurialServeSSHWorkflow`).
  - Did not actually upgrade to Mercurial 4.0/4.1.3 to completely verify this, but a user in the Discourse thread asserted that a substantially similar fix worked correctly.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18611
---
 .../diffusion/controller/DiffusionServeController.php        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index 5e61ae3a7c..98942cf2e7 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -768,7 +768,10 @@ private function serveMercurialRequest(
       $input = strlen($input)."\n".$input."0\n";
     }
 
-    $command = csprintf('%s serve --stdio', $bin);
+    $command = csprintf(
+      '%s serve -R %s --stdio',
+      $bin,
+      $repository->getLocalPath());
     $command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);
 
     list($err, $stdout, $stderr) = id(new ExecFuture('%C', $command))

From 9d5a2b3b4f6808cd8172104e221b9217315d8313 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 14 Sep 2017 05:08:35 -0700
Subject: [PATCH 167/865] Add a RefPosition table to hold branch/tag positions
 once the RefCursor table is split

Summary:
Ref T11823. Currently, we have a "RefCursor" table which stores rows like `<branch or tag name, commit it is pointing at>` with some more data.

Because Mercurial can have a single branch pointing at several different places, this table must allow multiple rows with the same branch or tag name.

Among other things, this means there isn't a single PHID which can be used to identify a branch name in a stable way. However, we have several UIs where we want to be able to do this.

Some specific examples where we run into trouble: in Mercurial, if there are 5 heads for "default", that means there are 5 phids. And currently, if someone deletes a branch, we lose the PHID for it. Instead, we'd rather retain it so the whole world doesn't break if you accidentally delete a branch and then fix it a little later.

(I'll likely hold this until the rest of the logic is fleshed out a little more in followup changes.)

Test Plan: Ran `bin/storage upgrade`, saw the table get created without warnings.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T11823

Differential Revision: https://secure.phabricator.com/D18602
---
 .../autopatches/20170914.ref.01.position.sql  |  6 +++++
 src/__phutil_library_map__.php                |  2 ++
 .../PhabricatorRepositoryRefPosition.php      | 26 +++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 resources/sql/autopatches/20170914.ref.01.position.sql
 create mode 100644 src/applications/repository/storage/PhabricatorRepositoryRefPosition.php

diff --git a/resources/sql/autopatches/20170914.ref.01.position.sql b/resources/sql/autopatches/20170914.ref.01.position.sql
new file mode 100644
index 0000000000..2d0a505d17
--- /dev/null
+++ b/resources/sql/autopatches/20170914.ref.01.position.sql
@@ -0,0 +1,6 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_refposition (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  cursorID INT UNSIGNED NOT NULL,
+  commitIdentifier VARCHAR(40) NOT NULL COLLATE {$COLLATE_TEXT},
+  isClosed BOOL NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 282e5aaf62..c535d46322 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3863,6 +3863,7 @@
     'PhabricatorRepositoryRefCursorPHIDType' => 'applications/repository/phid/PhabricatorRepositoryRefCursorPHIDType.php',
     'PhabricatorRepositoryRefCursorQuery' => 'applications/repository/query/PhabricatorRepositoryRefCursorQuery.php',
     'PhabricatorRepositoryRefEngine' => 'applications/repository/engine/PhabricatorRepositoryRefEngine.php',
+    'PhabricatorRepositoryRefPosition' => 'applications/repository/storage/PhabricatorRepositoryRefPosition.php',
     'PhabricatorRepositoryRepositoryPHIDType' => 'applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php',
     'PhabricatorRepositorySchemaSpec' => 'applications/repository/storage/PhabricatorRepositorySchemaSpec.php',
     'PhabricatorRepositorySearchEngine' => 'applications/repository/query/PhabricatorRepositorySearchEngine.php',
@@ -9434,6 +9435,7 @@
     'PhabricatorRepositoryRefCursorPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorRepositoryRefCursorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorRepositoryRefEngine' => 'PhabricatorRepositoryEngine',
+    'PhabricatorRepositoryRefPosition' => 'PhabricatorRepositoryDAO',
     'PhabricatorRepositoryRepositoryPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorRepositorySchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'PhabricatorRepositorySearchEngine' => 'PhabricatorApplicationSearchEngine',
diff --git a/src/applications/repository/storage/PhabricatorRepositoryRefPosition.php b/src/applications/repository/storage/PhabricatorRepositoryRefPosition.php
new file mode 100644
index 0000000000..838037b1a0
--- /dev/null
+++ b/src/applications/repository/storage/PhabricatorRepositoryRefPosition.php
@@ -0,0 +1,26 @@
+<?php
+
+final class PhabricatorRepositoryRefPosition
+  extends PhabricatorRepositoryDAO {
+
+  protected $cursorID;
+  protected $commitIdentifier;
+  protected $isClosed = 0;
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_TIMESTAMPS => false,
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'commitIdentifier' => 'text40',
+        'isClosed' => 'bool',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_position' => array(
+          'columns' => array('cursorID', 'commitIdentifier'),
+          'unique' => true,
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+}

From 782b18e7e2ed17ede8f707bd68839a3f652c4df4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 08:21:15 -0700
Subject: [PATCH 168/865] Migrate RefCursor data to RefPosition table

Summary:
Ref T11823. This populates the new RefPosition table based on the existing RefCursor table, and deletes now-duplicate rows in the RefCursor table so the next change can add a unique key.

This change is not standalone, and there need to be separate code updates. I have a rough version of that written, but this migration needs to happen first to test it.

I'll hold this whole series of changes until after the release cut and until the code is updated.

Test Plan: Ran migration, spot-checked database tables. Saw redundant rows remove and correct-looking rows populated into the new RefPosition table.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T11823

Differential Revision: https://secure.phabricator.com/D18612
---
 .../autopatches/20170915.ref.01.migrate.php   | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 resources/sql/autopatches/20170915.ref.01.migrate.php

diff --git a/resources/sql/autopatches/20170915.ref.01.migrate.php b/resources/sql/autopatches/20170915.ref.01.migrate.php
new file mode 100644
index 0000000000..21102fa4ab
--- /dev/null
+++ b/resources/sql/autopatches/20170915.ref.01.migrate.php
@@ -0,0 +1,71 @@
+<?php
+
+$table = new PhabricatorRepositoryRefCursor();
+$conn = $table->establishConnection('w');
+
+$map = array();
+foreach (new LiskMigrationIterator($table) as $ref) {
+  $repository_phid = $ref->getRepositoryPHID();
+  $ref_type = $ref->getRefType();
+  $ref_hash = $ref->getRefNameHash();
+
+  $ref_key = "{$repository_phid}/{$ref_type}/{$ref_hash}";
+
+  if (!isset($map[$ref_key])) {
+    $map[$ref_key] = array(
+      'id' => $ref->getID(),
+      'type' => $ref_type,
+      'hash' => $ref_hash,
+      'repositoryPHID' => $repository_phid,
+      'positions' => array(),
+    );
+  }
+
+  // NOTE: When this migration runs, the table will have "commitIdentifier" and
+  // "isClosed" fields. Later, it won't. Since they'll be removed, we can't
+  // rely on being able to access them via the object. Instead, run a separate
+  // raw query to read them.
+
+  $row = queryfx_one(
+    $conn,
+    'SELECT commitIdentifier, isClosed FROM %T WHERE id = %d',
+    $ref->getTableName(),
+    $ref->getID());
+
+  $map[$ref_key]['positions'][] = array(
+    'identifier' => $row['commitIdentifier'],
+    'isClosed' => (int)$row['isClosed'],
+  );
+}
+
+// Now, write all the position rows.
+$position_table = new PhabricatorRepositoryRefPosition();
+foreach ($map as $ref_key => $spec) {
+  $id = $spec['id'];
+  foreach ($spec['positions'] as $position) {
+    queryfx(
+      $conn,
+      'INSERT IGNORE INTO %T (cursorID, commitIdentifier, isClosed)
+        VALUES (%d, %s, %d)',
+      $position_table->getTableName(),
+      $id,
+      $position['identifier'],
+      $position['isClosed']);
+  }
+}
+
+// Finally, delete all the redundant RefCursor rows (rows with the same name)
+// so we can add proper unique keys in the next migration.
+foreach ($map as $ref_key => $spec) {
+  queryfx(
+    $conn,
+    'DELETE FROM %T WHERE refType = %s
+      AND refNameHash = %s
+      AND repositoryPHID = %s
+      AND id != %d',
+    $table->getTableName(),
+    $spec['type'],
+    $spec['hash'],
+    $spec['repositoryPHID'],
+    $spec['id']);
+}

From 5cf62f86d7283bde6348b1b8ef84c4737b2cfedc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 08:34:20 -0700
Subject: [PATCH 169/865] Remove obsolete columns from RefCursor table

Summary:
Ref T11823. This change isn't standalone, but prepares for the more involved code change by dropping obsolete columns from the RefCursor table and adding the unique key we need to prevent the ambiguous/duplicate refs issue.

This data was moved to the RefPosition table in D18612.

Test Plan: Ran storage upgrade. See next revision for more substantial testing of this change series.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T11823

Differential Revision: https://secure.phabricator.com/D18613
---
 resources/sql/autopatches/20170915.ref.02.drop.id.sql      | 2 ++
 resources/sql/autopatches/20170915.ref.03.drop.closed.sql  | 2 ++
 resources/sql/autopatches/20170915.ref.04.uniq.sql         | 2 ++
 .../repository/storage/PhabricatorRepositoryRefCursor.php  | 7 ++-----
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 resources/sql/autopatches/20170915.ref.02.drop.id.sql
 create mode 100644 resources/sql/autopatches/20170915.ref.03.drop.closed.sql
 create mode 100644 resources/sql/autopatches/20170915.ref.04.uniq.sql

diff --git a/resources/sql/autopatches/20170915.ref.02.drop.id.sql b/resources/sql/autopatches/20170915.ref.02.drop.id.sql
new file mode 100644
index 0000000000..177fde3b6a
--- /dev/null
+++ b/resources/sql/autopatches/20170915.ref.02.drop.id.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_refcursor
+  DROP COLUMN commitIdentifier;
diff --git a/resources/sql/autopatches/20170915.ref.03.drop.closed.sql b/resources/sql/autopatches/20170915.ref.03.drop.closed.sql
new file mode 100644
index 0000000000..927ee04b65
--- /dev/null
+++ b/resources/sql/autopatches/20170915.ref.03.drop.closed.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_refcursor
+  DROP COLUMN isClosed;
diff --git a/resources/sql/autopatches/20170915.ref.04.uniq.sql b/resources/sql/autopatches/20170915.ref.04.uniq.sql
new file mode 100644
index 0000000000..0bef69fc4a
--- /dev/null
+++ b/resources/sql/autopatches/20170915.ref.04.uniq.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_refcursor
+  ADD UNIQUE KEY `key_ref` (repositoryPHID, refType, refNameHash);
diff --git a/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php b/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
index febbed3ee6..ec0c90744c 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
@@ -19,8 +19,6 @@ final class PhabricatorRepositoryRefCursor
   protected $refNameHash;
   protected $refNameRaw;
   protected $refNameEncoding;
-  protected $commitIdentifier;
-  protected $isClosed = 0;
 
   private $repository = self::ATTACHABLE;
 
@@ -34,13 +32,12 @@ protected function getConfiguration() {
       self::CONFIG_COLUMN_SCHEMA => array(
         'refType' => 'text32',
         'refNameHash' => 'bytes12',
-        'commitIdentifier' => 'text40',
         'refNameEncoding' => 'text16?',
-        'isClosed' => 'bool',
       ),
       self::CONFIG_KEY_SCHEMA => array(
-        'key_cursor' => array(
+        'key_ref' => array(
           'columns' => array('repositoryPHID', 'refType', 'refNameHash'),
+          'unique' => true,
         ),
       ),
     ) + parent::getConfiguration();

From 8982e3e52dd81d0a6a4825b015c2dee4b5004b85 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 14 Sep 2017 10:09:36 -0700
Subject: [PATCH 170/865] Update major RefCursor callsites to work properly
 with RefPosition

Summary:
Ref T11823. This is the meaty part of the change, and updates `RefEngine` to use separate RefCursor (for names) and RefPosition (for actual commit positions) tables.

I'll hold this whole series until after the release cut so it has some time to bake on `secure` to look for issues. It's also not a huge problem if there are bugs here since these tables are just caches anyway, although they do feed into some other things, and obviously it's never good to have bugs.

Test Plan:
  - This logic can be invoked directly with `bin/repository refs <repository> --trace --verbose`.
  - Ran that on unchanged repositories, new branches, removed branches, and modified branches. Saw appropriate output and cursor positions.
  - Ran on a mercurial repository to test the close/open logic, saw it correct open/closed state of incorrect positions.
  - Browed around Diffusion in various repositories.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T11823

Differential Revision: https://secure.phabricator.com/D18614
---
 ...ifferentialRevisionOperationController.php |  14 +-
 .../query/DiffusionCachedResolveRefsQuery.php |   6 +-
 .../engine/PhabricatorRepositoryRefEngine.php | 264 +++++++++++++-----
 .../PhabricatorRepositoryRefCursorQuery.php   |  22 ++
 .../PhabricatorRepositoryRefCursor.php        |  15 +
 5 files changed, 234 insertions(+), 87 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialRevisionOperationController.php b/src/applications/differential/controller/DifferentialRevisionOperationController.php
index 593815f15b..feeb6770b8 100644
--- a/src/applications/differential/controller/DifferentialRevisionOperationController.php
+++ b/src/applications/differential/controller/DifferentialRevisionOperationController.php
@@ -137,19 +137,9 @@ private function loadDefaultRef(
       return null;
     }
 
-    // NOTE: See PHI68. This is a workaround to make "Land Revision" work
-    // until T11823 is fixed properly. If we find multiple refs with the same
-    // name (normally, duplicate "master" refs), just pick the first one.
-
-    $refs = $this->newRefQuery($repository)
+    return $this->newRefQuery($repository)
       ->withRefNames(array($default_name))
-      ->execute();
-
-    if ($refs) {
-      return head($refs);
-    }
-
-    return null;
+      ->executeOne();
   }
 
   private function getDefaultRefName(
diff --git a/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php b/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php
index 55e86ce879..22ff1d61f0 100644
--- a/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php
+++ b/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php
@@ -106,9 +106,11 @@ private function resolveGitAndMercurialRefs() {
 
     $cursors = queryfx_all(
       $conn_r,
-      'SELECT refNameHash, refType, commitIdentifier, isClosed FROM %T
-        WHERE repositoryPHID = %s AND refNameHash IN (%Ls)',
+      'SELECT c.refNameHash, c.refType, p.commitIdentifier, p.isClosed
+        FROM %T c JOIN %T p ON p.cursorID = c.id
+        WHERE c.repositoryPHID = %s AND c.refNameHash IN (%Ls)',
       id(new PhabricatorRepositoryRefCursor())->getTableName(),
+      id(new PhabricatorRepositoryRefPosition())->getTableName(),
       $repository->getPHID(),
       array_keys($name_hashes));
 
diff --git a/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php b/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php
index af07ea052a..4b1cd829d5 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryRefEngine.php
@@ -7,17 +7,18 @@
 final class PhabricatorRepositoryRefEngine
   extends PhabricatorRepositoryEngine {
 
-  private $newRefs = array();
-  private $deadRefs = array();
+  private $newPositions = array();
+  private $deadPositions = array();
   private $closeCommits = array();
   private $hasNoCursors;
 
   public function updateRefs() {
-    $this->newRefs = array();
-    $this->deadRefs = array();
+    $this->newPositions = array();
+    $this->deadPositions = array();
     $this->closeCommits = array();
 
     $repository = $this->getRepository();
+    $viewer = $this->getViewer();
 
     $branches_may_close = false;
 
@@ -53,8 +54,9 @@ public function updateRefs() {
     );
 
     $all_cursors = id(new PhabricatorRepositoryRefCursorQuery())
-      ->setViewer(PhabricatorUser::getOmnipotentUser())
+      ->setViewer($viewer)
       ->withRepositoryPHIDs(array($repository->getPHID()))
+      ->needPositions(true)
       ->execute();
     $cursor_groups = mgroup($all_cursors, 'getRefType');
 
@@ -63,8 +65,15 @@ public function updateRefs() {
     // Find all the heads of closing refs.
     $all_closing_heads = array();
     foreach ($all_cursors as $cursor) {
-      if ($this->shouldCloseRef($cursor->getRefType(), $cursor->getRefName())) {
-        $all_closing_heads[] = $cursor->getCommitIdentifier();
+      $should_close = $this->shouldCloseRef(
+        $cursor->getRefType(),
+        $cursor->getRefName());
+      if (!$should_close) {
+        continue;
+      }
+
+      foreach ($cursor->getPositionIdentifiers() as $identifier) {
+        $all_closing_heads[] = $identifier;
       }
     }
     $all_closing_heads = array_unique($all_closing_heads);
@@ -79,25 +88,13 @@ public function updateRefs() {
       $this->setCloseFlagOnCommits($this->closeCommits);
     }
 
-    if ($this->newRefs || $this->deadRefs) {
+    if ($this->newPositions || $this->deadPositions) {
       $repository->openTransaction();
-        foreach ($this->newRefs as $ref) {
-          $ref->save();
-        }
-        foreach ($this->deadRefs as $ref) {
-          // Shove this ref into the old refs table so the discovery engine
-          // can check if any commits have been rendered unreachable.
-          id(new PhabricatorRepositoryOldRef())
-            ->setRepositoryPHID($repository->getPHID())
-            ->setCommitIdentifier($ref->getCommitIdentifier())
-            ->save();
-
-          $ref->delete();
-        }
-      $repository->saveTransaction();
 
-      $this->newRefs = array();
-      $this->deadRefs = array();
+        $this->saveNewPositions();
+        $this->deleteDeadPositions();
+
+      $repository->saveTransaction();
     }
 
     $branches = $maps[PhabricatorRepositoryRefCursor::TYPE_BRANCH];
@@ -111,10 +108,12 @@ private function updateBranchStates(
     array $branches) {
 
     assert_instances_of($branches, 'DiffusionRepositoryRef');
+    $viewer = $this->getViewer();
 
     $all_cursors = id(new PhabricatorRepositoryRefCursorQuery())
-      ->setViewer(PhabricatorUser::getOmnipotentUser())
+      ->setViewer($viewer)
       ->withRepositoryPHIDs(array($repository->getPHID()))
+      ->needPositions(true)
       ->execute();
 
     $state_map = array();
@@ -124,36 +123,57 @@ private function updateBranchStates(
         continue;
       }
       $raw_name = $cursor->getRefNameRaw();
-      $hash = $cursor->getCommitIdentifier();
 
-      $state_map[$raw_name][$hash] = $cursor;
+      foreach ($cursor->getPositions() as $position) {
+        $hash = $position->getCommitIdentifier();
+        $state_map[$raw_name][$hash] = $position;
+      }
     }
 
+    $updates = array();
     foreach ($branches as $branch) {
-      $cursor = idx($state_map, $branch->getShortName(), array());
-      $cursor = idx($cursor, $branch->getCommitIdentifier());
-      if (!$cursor) {
+      $position = idx($state_map, $branch->getShortName(), array());
+      $position = idx($position, $branch->getCommitIdentifier());
+      if (!$position) {
         continue;
       }
 
       $fields = $branch->getRawFields();
 
-      $cursor_state = (bool)$cursor->getIsClosed();
+      $position_state = (bool)$position->getIsClosed();
       $branch_state = (bool)idx($fields, 'closed');
 
-      if ($cursor_state != $branch_state) {
-        $cursor->setIsClosed((int)$branch_state)->save();
+      if ($position_state != $branch_state) {
+        $updates[$position->getID()] = (int)$branch_state;
       }
     }
+
+    if ($updates) {
+      $position_table = id(new PhabricatorRepositoryRefPosition());
+      $conn = $position_table->establishConnection('w');
+
+      $position_table->openTransaction();
+        foreach ($updates as $position_id => $branch_state) {
+          queryfx(
+            $conn,
+            'UPDATE %T SET isClosed = %d WHERE id = %d',
+            $position_table->getTableName(),
+            $branch_state,
+            $position_id);
+        }
+      $position_table->saveTransaction();
+    }
   }
 
-  private function markRefNew(PhabricatorRepositoryRefCursor $cursor) {
-    $this->newRefs[] = $cursor;
+  private function markPositionNew(
+    PhabricatorRepositoryRefPosition $position) {
+    $this->newPositions[] = $position;
     return $this;
   }
 
-  private function markRefDead(PhabricatorRepositoryRefCursor $cursor) {
-    $this->deadRefs[] = $cursor;
+  private function markPositionDead(
+    PhabricatorRepositoryRefPosition $position) {
+    $this->deadPositions[] = $position;
     return $this;
   }
 
@@ -203,10 +223,7 @@ private function updateCursors(
     // NOTE: Mercurial branches may have multiple branch heads; this logic
     // is complex primarily to account for that.
 
-    // Group all the cursors by their ref name, like "master". Since Mercurial
-    // branches may have multiple heads, there could be several cursors with
-    // the same name.
-    $cursor_groups = mgroup($cursors, 'getRefNameRaw');
+    $cursors = mpull($cursors, null, 'getRefNameRaw');
 
     // Group all the new ref values by their name. As above, these groups may
     // have multiple members in Mercurial.
@@ -215,38 +232,47 @@ private function updateCursors(
     foreach ($ref_groups as $name => $refs) {
       $new_commits = mpull($refs, 'getCommitIdentifier', 'getCommitIdentifier');
 
-      $ref_cursors = idx($cursor_groups, $name, array());
-      $old_commits = mpull($ref_cursors, null, 'getCommitIdentifier');
+      $ref_cursor = idx($cursors, $name);
+      if ($ref_cursor) {
+        $old_positions = $ref_cursor->getPositions();
+      } else {
+        $old_positions = array();
+      }
 
       // We're going to delete all the cursors pointing at commits which are
       // no longer associated with the refs. This primarily makes the Mercurial
       // multiple head case easier, and means that when we update a ref we
       // delete the old one and write a new one.
-      foreach ($ref_cursors as $cursor) {
-        if (isset($new_commits[$cursor->getCommitIdentifier()])) {
+      foreach ($old_positions as $old_position) {
+        $hash = $old_position->getCommitIdentifier();
+        if (isset($new_commits[$hash])) {
           // This ref previously pointed at this commit, and still does.
           $this->log(
             pht(
               'Ref %s "%s" still points at %s.',
               $ref_type,
               $name,
-              $cursor->getCommitIdentifier()));
-        } else {
-          // This ref previously pointed at this commit, but no longer does.
-          $this->log(
-            pht(
-              'Ref %s "%s" no longer points at %s.',
-              $ref_type,
-              $name,
-              $cursor->getCommitIdentifier()));
-
-          // Nuke the obsolete cursor.
-          $this->markRefDead($cursor);
+              $hash));
+          continue;
         }
+
+        // This ref previously pointed at this commit, but no longer does.
+        $this->log(
+          pht(
+            'Ref %s "%s" no longer points at %s.',
+            $ref_type,
+            $name,
+            $hash));
+
+        // Nuke the obsolete cursor.
+        $this->markPositionDead($old_position);
       }
 
       // Now, we're going to insert new cursors for all the commits which are
       // associated with this ref that don't currently have cursors.
+      $old_commits = mpull($old_positions, 'getCommitIdentifier');
+      $old_commits = array_fuse($old_commits);
+
       $added_commits = array_diff_key($new_commits, $old_commits);
       foreach ($added_commits as $identifier) {
         $this->log(
@@ -255,12 +281,24 @@ private function updateCursors(
             $ref_type,
             $name,
             $identifier));
-        $this->markRefNew(
-          id(new PhabricatorRepositoryRefCursor())
-            ->setRepositoryPHID($repository->getPHID())
-            ->setRefType($ref_type)
-            ->setRefName($name)
-            ->setCommitIdentifier($identifier));
+
+        if (!$ref_cursor) {
+          // If this is the first time we've seen a particular ref (for
+          // example, a new branch) we need to insert a RefCursor record
+          // for it before we can insert a RefPosition.
+
+          $ref_cursor = $this->newRefCursor(
+            $repository,
+            $ref_type,
+            $name);
+        }
+
+        $new_position = id(new PhabricatorRepositoryRefPosition())
+          ->setCursorID($ref_cursor->getID())
+          ->setCommitIdentifier($identifier)
+          ->setIsClosed(0);
+
+        $this->markPositionNew($new_position);
       }
 
       if ($this->shouldCloseRef($ref_type, $name)) {
@@ -277,16 +315,21 @@ private function updateCursors(
     // Find any cursors for refs which no longer exist. This happens when a
     // branch, tag or bookmark is deleted.
 
-    foreach ($cursor_groups as $name => $cursor_group) {
-      if (idx($ref_groups, $name) === null) {
-        foreach ($cursor_group as $cursor) {
-          $this->log(
-            pht(
-              'Ref %s "%s" no longer exists.',
-              $cursor->getRefType(),
-              $cursor->getRefName()));
-          $this->markRefDead($cursor);
-        }
+    foreach ($cursors as $name => $cursor) {
+      if (!empty($ref_groups[$name])) {
+        // This ref still has some positions, so we don't need to wipe it
+        // out. Try the next one.
+        continue;
+      }
+
+      foreach ($cursor->getPositions() as $position) {
+        $this->log(
+          pht(
+            'Ref %s "%s" no longer exists.',
+            $cursor->getRefType(),
+            $cursor->getRefName()));
+
+        $this->markPositionDead($position);
       }
     }
   }
@@ -452,6 +495,81 @@ private function setCloseFlagOnCommits(array $identifiers) {
     return $this;
   }
 
+  private function newRefCursor(
+    PhabricatorRepository $repository,
+    $ref_type,
+    $ref_name) {
+
+    $cursor = id(new PhabricatorRepositoryRefCursor())
+      ->setRepositoryPHID($repository->getPHID())
+      ->setRefType($ref_type)
+      ->setRefName($ref_name);
+
+    try {
+      return $cursor->save();
+    } catch (AphrontDuplicateKeyQueryException $ex) {
+      // If we raced another daemon to create this position and lost the race,
+      // load the cursor the other daemon created instead.
+    }
+
+    $viewer = $this->getViewer();
+
+    $cursor = id(new PhabricatorRepositoryRefCursorQuery())
+      ->setViewer($viewer)
+      ->withRepositoryPHIDs(array($repository->getPHID()))
+      ->withRefTypes(array($ref_type))
+      ->withRefNames(array($ref_name))
+      ->needPositions(true)
+      ->executeOne();
+    if (!$cursor) {
+      throw new Exception(
+        pht(
+          'Failed to create a new ref cursor (for "%s", of type "%s", in '.
+          'repository "%s") because it collided with an existing cursor, '.
+          'but then failed to load that cursor.',
+          $ref_name,
+          $ref_type,
+          $repository->getDisplayName()));
+    }
+
+    return $cursor;
+  }
+
+  private function saveNewPositions() {
+    $positions = $this->newPositions;
+
+    foreach ($positions as $position) {
+      try {
+        $position->save();
+      } catch (AphrontDuplicateKeyQueryException $ex) {
+        // We may race another daemon to create this position. If we do, and
+        // we lose the race, that's fine: the other daemon did our work for
+        // us and we can continue.
+      }
+    }
+
+    $this->newPositions = array();
+  }
+
+  private function deleteDeadPositions() {
+    $positions = $this->deadPositions;
+    $repository = $this->getRepository();
+
+    foreach ($positions as $position) {
+      // Shove this ref into the old refs table so the discovery engine
+      // can check if any commits have been rendered unreachable.
+      id(new PhabricatorRepositoryOldRef())
+        ->setRepositoryPHID($repository->getPHID())
+        ->setCommitIdentifier($position->getCommitIdentifier())
+        ->save();
+
+      $position->delete();
+    }
+
+    $this->deadPositions = array();
+  }
+
+
 
 /* -(  Updating Git Refs  )-------------------------------------------------- */
 
diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
index 706fe801b6..b3c960e025 100644
--- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
@@ -9,6 +9,7 @@ final class PhabricatorRepositoryRefCursorQuery
   private $refTypes;
   private $refNames;
   private $datasourceQuery;
+  private $needPositions;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -40,6 +41,11 @@ public function withDatasourceQuery($query) {
     return $this;
   }
 
+  public function needPositions($need) {
+    $this->needPositions = $need;
+    return $this;
+  }
+
   public function newResultObject() {
     return new PhabricatorRepositoryRefCursor();
   }
@@ -68,6 +74,22 @@ protected function willFilterPage(array $refs) {
       $ref->attachRepository($repository);
     }
 
+    if (!$refs) {
+      return $refs;
+    }
+
+    if ($this->needPositions) {
+      $positions = id(new PhabricatorRepositoryRefPosition())->loadAllWhere(
+        'cursorID IN (%Ld)',
+        mpull($refs, 'getID'));
+      $positions = mgroup($positions, 'getCursorID');
+
+      foreach ($refs as $key => $ref) {
+        $ref_positions = idx($positions, $ref->getID(), array());
+        $ref->attachPositions($ref_positions);
+      }
+    }
+
     return $refs;
   }
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php b/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
index ec0c90744c..87f737d86e 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
@@ -21,6 +21,7 @@ final class PhabricatorRepositoryRefCursor
   protected $refNameEncoding;
 
   private $repository = self::ATTACHABLE;
+  private $positions = self::ATTACHABLE;
 
   protected function getConfiguration() {
     return array(
@@ -71,6 +72,20 @@ public function getRepository() {
     return $this->assertAttached($this->repository);
   }
 
+  public function attachPositions(array $positions) {
+    assert_instances_of($positions, 'PhabricatorRepositoryRefPosition');
+    $this->positions = $positions;
+    return $this;
+  }
+
+  public function getPositions() {
+    return $this->assertAttached($this->positions);
+  }
+
+  public function getPositionIdentifiers() {
+    return mpull($this->getPositions(), 'getCommitIdentifier');
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 

From 49b718178066d9f75981039f1a13f4c16f52e116 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 09:22:26 -0700
Subject: [PATCH 171/865] Update utility "bin/repository parents" workflow to
 work with RefPosition

Summary:
Ref T11823. I think this is the last callsite which relies on the old data format: `bin/repository parents` rebuilds a cache which we don't currently use very heavily.

Update it to work with the new data.

Test Plan: Ran `bin/repository parents <repository> --trace`, saw successful script execution and reasonable-looking output.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T11823

Differential Revision: https://secure.phabricator.com/D18615
---
 ...torRepositoryManagementParentsWorkflow.php | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php
index 61c5fedf96..671287c3d6 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php
@@ -54,6 +54,7 @@ private function rebuildRepository(PhabricatorRepository $repo) {
       ->setViewer($this->getViewer())
       ->withRefTypes(array(PhabricatorRepositoryRefCursor::TYPE_BRANCH))
       ->withRepositoryPHIDs(array($repo->getPHID()))
+      ->needPositions(true)
       ->execute();
 
     $graph = array();
@@ -66,23 +67,23 @@ private function rebuildRepository(PhabricatorRepository $repo) {
         "%s\n",
         pht('Rebuilding branch "%s"...', $ref->getRefName()));
 
-      $commit = $ref->getCommitIdentifier();
-
-      if ($repo->isGit()) {
-        $stream = new PhabricatorGitGraphStream($repo, $commit);
-      } else {
-        $stream = new PhabricatorMercurialGraphStream($repo, $commit);
-      }
-
-      $discover = array($commit);
-      while ($discover) {
-        $target = array_pop($discover);
-        if (isset($graph[$target])) {
-          continue;
+      foreach ($ref->getPositionIdentifiers() as $commit) {
+        if ($repo->isGit()) {
+          $stream = new PhabricatorGitGraphStream($repo, $commit);
+        } else {
+          $stream = new PhabricatorMercurialGraphStream($repo, $commit);
         }
-        $graph[$target] = $stream->getParents($target);
-        foreach ($graph[$target] as $parent) {
-          $discover[] = $parent;
+
+        $discover = array($commit);
+        while ($discover) {
+          $target = array_pop($discover);
+          if (isset($graph[$target])) {
+            continue;
+          }
+          $graph[$target] = $stream->getParents($target);
+          foreach ($graph[$target] as $parent) {
+            $discover[] = $parent;
+          }
         }
       }
     }

From b352cacdd9179bede1117fa7b15b4475f8867fc6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 12:16:58 -0700
Subject: [PATCH 172/865] Swap "-R" and "serve" argument order for Mercurial

Summary: See <https://discourse.phabricator-community.org/t/unable-to-use-current-mercurial-on-debian-stretch/391/13>. I missed that `-R` is order-sensitive.

Test Plan: Verified both orders work on 3.5.2.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18616
---
 .../diffusion/controller/DiffusionServeController.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index 98942cf2e7..475f688a4c 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -769,7 +769,7 @@ private function serveMercurialRequest(
     }
 
     $command = csprintf(
-      '%s serve -R %s --stdio',
+      '%s -R %s serve --stdio',
       $bin,
       $repository->getLocalPath());
     $command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);

From 76cdaa4f2d108b3b8104a0d09008a6869f084ece Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 12:16:58 -0700
Subject: [PATCH 173/865] (stable) Swap "-R" and "serve" argument order for
 Mercurial

Summary: See <https://discourse.phabricator-community.org/t/unable-to-use-current-mercurial-on-debian-stretch/391/13>. I missed that `-R` is order-sensitive.

Test Plan: Verified both orders work on 3.5.2.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18616
---
 .../diffusion/controller/DiffusionServeController.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index 98942cf2e7..475f688a4c 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -769,7 +769,7 @@ private function serveMercurialRequest(
     }
 
     $command = csprintf(
-      '%s serve -R %s --stdio',
+      '%s -R %s serve --stdio',
       $bin,
       $repository->getLocalPath());
     $command = PhabricatorDaemon::sudoCommandAsDaemonUser($command);

From 51b810b0eb74797743154a11ced42b2c4637397c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 17:46:15 -0700
Subject: [PATCH 174/865] Fix "Author's projects" Herald rules for revisions
 and diffs

Summary:
See PHI71. These didn't get properly updated when we wrote Subprojects and Milestones, and should use materialized members, not raw members. Swap the query so projects you are an indirect member of (e.g., milestones you are a member of the parent for, and parent projects you are a member of a subproject of) are included in the result list.

Also fix a bad typeahead datasource.

Test Plan:
  - Ran a dry run with the test console, saw project PHIDs for milestones and parent projects in the raw field value.
  - Tried to set "Author's projects" to a user, no longer could.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18619
---
 .../DifferentialDiffAuthorProjectsHeraldField.php   | 13 +++++++++----
 ...ifferentialRevisionAuthorProjectsHeraldField.php | 11 ++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php b/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php
index bec1e2a66c..e484a66ce6 100644
--- a/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php
+++ b/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php
@@ -10,9 +10,14 @@ public function getHeraldFieldName() {
   }
 
   public function getHeraldFieldValue($object) {
-    return PhabricatorEdgeQuery::loadDestinationPHIDs(
-      $object->getAuthorPHID(),
-      PhabricatorProjectMemberOfProjectEdgeType::EDGECONST);
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+    $projects = id(new PhabricatorProjectQuery())
+      ->setViewer($viewer)
+      ->withMemberPHIDs(array($object->getAuthorPHID()))
+      ->execute();
+
+    return mpull($projects, 'getPHID');
   }
 
   protected function getHeraldFieldStandardType() {
@@ -20,7 +25,7 @@ protected function getHeraldFieldStandardType() {
   }
 
   protected function getDatasource() {
-    return new PhabricatorProjectOrUserDatasource();
+    return new PhabricatorProjectDatasource();
   }
 
 }
diff --git a/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php b/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php
index cb916fcf3d..bd91e810b2 100644
--- a/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php
+++ b/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php
@@ -10,9 +10,14 @@ public function getHeraldFieldName() {
   }
 
   public function getHeraldFieldValue($object) {
-    return PhabricatorEdgeQuery::loadDestinationPHIDs(
-      $object->getAuthorPHID(),
-      PhabricatorProjectMemberOfProjectEdgeType::EDGECONST);
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+    $projects = id(new PhabricatorProjectQuery())
+      ->setViewer($viewer)
+      ->withMemberPHIDs(array($object->getAuthorPHID()))
+      ->execute();
+
+    return mpull($projects, 'getPHID');
   }
 
   protected function getHeraldFieldStandardType() {

From 3f3ce88c7b5d52142d0e239f2fa83cf14a47d5cc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Sep 2017 17:46:15 -0700
Subject: [PATCH 175/865] (stable) Fix "Author's projects" Herald rules for
 revisions and diffs

Summary:
See PHI71. These didn't get properly updated when we wrote Subprojects and Milestones, and should use materialized members, not raw members. Swap the query so projects you are an indirect member of (e.g., milestones you are a member of the parent for, and parent projects you are a member of a subproject of) are included in the result list.

Also fix a bad typeahead datasource.

Test Plan:
  - Ran a dry run with the test console, saw project PHIDs for milestones and parent projects in the raw field value.
  - Tried to set "Author's projects" to a user, no longer could.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18619
---
 .../DifferentialDiffAuthorProjectsHeraldField.php   | 13 +++++++++----
 ...ifferentialRevisionAuthorProjectsHeraldField.php | 11 ++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php b/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php
index bec1e2a66c..e484a66ce6 100644
--- a/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php
+++ b/src/applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php
@@ -10,9 +10,14 @@ public function getHeraldFieldName() {
   }
 
   public function getHeraldFieldValue($object) {
-    return PhabricatorEdgeQuery::loadDestinationPHIDs(
-      $object->getAuthorPHID(),
-      PhabricatorProjectMemberOfProjectEdgeType::EDGECONST);
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+    $projects = id(new PhabricatorProjectQuery())
+      ->setViewer($viewer)
+      ->withMemberPHIDs(array($object->getAuthorPHID()))
+      ->execute();
+
+    return mpull($projects, 'getPHID');
   }
 
   protected function getHeraldFieldStandardType() {
@@ -20,7 +25,7 @@ protected function getHeraldFieldStandardType() {
   }
 
   protected function getDatasource() {
-    return new PhabricatorProjectOrUserDatasource();
+    return new PhabricatorProjectDatasource();
   }
 
 }
diff --git a/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php b/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php
index cb916fcf3d..bd91e810b2 100644
--- a/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php
+++ b/src/applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php
@@ -10,9 +10,14 @@ public function getHeraldFieldName() {
   }
 
   public function getHeraldFieldValue($object) {
-    return PhabricatorEdgeQuery::loadDestinationPHIDs(
-      $object->getAuthorPHID(),
-      PhabricatorProjectMemberOfProjectEdgeType::EDGECONST);
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+    $projects = id(new PhabricatorProjectQuery())
+      ->setViewer($viewer)
+      ->withMemberPHIDs(array($object->getAuthorPHID()))
+      ->execute();
+
+    return mpull($projects, 'getPHID');
   }
 
   protected function getHeraldFieldStandardType() {

From 94ab0c9afb916ba3df3d2929167d60880a2764d6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Sep 2017 09:33:35 -0700
Subject: [PATCH 176/865] Spell "Relevance" correctly

Summary: Despite how I (and everyone else?) pronounce it, it is spelled with an "a". See PHI38.

Test Plan: Googled both spellings.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18622
---
 .../query/policy/PhabricatorCursorPagedPolicyAwareQuery.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index cd4ccf30b5..09cb3e499c 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -809,7 +809,7 @@ public function getBuiltinOrders() {
     if ($this->supportsFerretEngine()) {
       $orders['relevance'] = array(
         'vector' => array('rank', 'fulltext-modified', 'id'),
-        'name' => pht('Relevence'),
+        'name' => pht('Relevance'),
       );
     }
 

From 3ad727ba787cb9de70243ecee6285a9f60bc2a84 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Sep 2017 11:47:08 -0700
Subject: [PATCH 177/865] Guarantee the `key_position` key is created properly

Summary:
Ref T12987. I was focused on the RefCursor table and overlooked that we need some care on this key.

It's currently possible to run `bin/storage upgrade --no-adjust`, then start Phabricator, and end up with duplicate records in this table. If you try to run `bin/storage adjust` later, it will try to add the unique key but fail. This is unusual for normal installs (they usually do not use `--no-adjust`) but we do it in the cluster and I did this exact thing on `secure`.

Normally, to avoid this, when a new table with a unique key is introduced, we also add a migration to explicitly add that key.

This is mostly harmless in this case. Fix this mistake (force the table to contain only unique rows; add the key) and try using `LOCK TABLES` to make this atomic. If this doesn't cause problems we can use this in similar situations in the future.

The "alter table may unlock things" warning comes from here:

https://dev.mysql.com/doc/refman/5.7/en/lock-tables.html

It seems like it's fine to issue `UNLOCK TABLES` even if you don't have any locks, so I think this script should always do the right thing now, regardless of ALTER TABLE unlocking or not unlocking tables.

Test Plan: Ran `bin/storage upgrade -f`, saw table end up in the right state. I'll also check this on `secure`, where the starting state is a little messier.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12987

Differential Revision: https://secure.phabricator.com/D18623
---
 .../autopatches/20170918.ref.01.position.php  | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 resources/sql/autopatches/20170918.ref.01.position.php

diff --git a/resources/sql/autopatches/20170918.ref.01.position.php b/resources/sql/autopatches/20170918.ref.01.position.php
new file mode 100644
index 0000000000..f95eb8d406
--- /dev/null
+++ b/resources/sql/autopatches/20170918.ref.01.position.php
@@ -0,0 +1,52 @@
+<?php
+
+$table = new PhabricatorRepositoryRefPosition();
+$conn = $table->establishConnection('w');
+$key_name = 'key_position';
+
+try {
+  queryfx(
+    $conn,
+    'ALTER TABLE %T DROP KEY %T',
+    $table->getTableName(),
+    $key_name);
+} catch (AphrontQueryException $ex) {
+  // This key may or may not exist, depending on exactly when the install
+  // ran previous migrations and adjustments. We're just dropping it if it
+  // does exist.
+
+  // We're doing this first (outside of the lock) because the MySQL
+  // documentation says "if you ALTER TABLE a locked table, it may become
+  // unlocked".
+}
+
+queryfx(
+  $conn,
+  'LOCK TABLES %T WRITE',
+  $table->getTableName());
+
+$seen = array();
+foreach (new LiskMigrationIterator($table) as $position) {
+  $cursor_id = $position->getCursorID();
+  $hash = $position->getCommitIdentifier();
+
+  // If this is the first copy of this row we've seen, mark it as seen and
+  // move on.
+  if (empty($seen[$cursor_id][$hash])) {
+    $seen[$cursor_id][$hash] = true;
+    continue;
+  }
+
+  // Otherwise, get rid of this row as it duplicates a row we saw previously.
+  $position->delete();
+}
+
+queryfx(
+  $conn,
+  'ALTER TABLE %T ADD UNIQUE KEY %T (cursorID, commitIdentifier)',
+  $table->getTableName(),
+  $key_name);
+
+queryfx(
+  $conn,
+  'UNLOCK TABLES');

From 156adccef0ad18104389bd9cdfa71cc0ac7876b2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Sep 2017 12:13:11 -0700
Subject: [PATCH 178/865] Fix an issue where "bin/differential migrate-hunk"
 could decompress data

Summary:
Fixes T12986. I caught this bug in the changes from D18584: when we moved a large hunk to file storage, we would decompress it but keep the "deflated" flag. This could cause confusion when loading it later. I missed this in testing since I wasn't exhaustive enough in checking hunks and didn't run into a compressed one.

Instead of compressing on `save()`, compress during the normal workflow.

We currently never advise users to run this workflow so I didn't bother trying to clean up possible existing migrations.

Test Plan:
  - Ran `bin/differential migrate-hunk` on compressed hunks, moving them to and from file storage. Saw them work correctly and remain compressed.
  - Created new small (uncompressed) and large (compressed) hunks, verified they work properly and get compressed (if applicable).
  - Used `bin/cache purge --caches changeset` to clear changeset caches and make sure the actual table was being hit.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12986

Differential Revision: https://secure.phabricator.com/D18624
---
 .../storage/DifferentialModernHunk.php        | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/applications/differential/storage/DifferentialModernHunk.php b/src/applications/differential/storage/DifferentialModernHunk.php
index 6f63f680a1..cde6f29329 100644
--- a/src/applications/differential/storage/DifferentialModernHunk.php
+++ b/src/applications/differential/storage/DifferentialModernHunk.php
@@ -51,8 +51,11 @@ public function setChanges($text) {
 
     $this->dataEncoding = $this->detectEncodingForStorage($text);
     $this->dataType = self::DATATYPE_TEXT;
-    $this->dataFormat = self::DATAFORMAT_RAW;
-    $this->data = $text;
+
+    list($format, $data) = $this->formatDataForStorage($text);
+
+    $this->dataFormat = $format;
+    $this->data = $data;
 
     return $this;
   }
@@ -68,24 +71,13 @@ public function forceEncoding($encoding) {
     return $this;
   }
 
-  public function save() {
-
-    $type = $this->getDataType();
-    $format = $this->getDataFormat();
-
-    // Before saving the data, attempt to compress it.
-    if ($type == self::DATATYPE_TEXT) {
-      if ($format == self::DATAFORMAT_RAW) {
-        $data = $this->getData();
-        $deflated = PhabricatorCaches::maybeDeflateData($data);
-        if ($deflated !== null) {
-          $this->data = $deflated;
-          $this->dataFormat = self::DATAFORMAT_DEFLATED;
-        }
-      }
+  private function formatDataForStorage($data) {
+    $deflated = PhabricatorCaches::maybeDeflateData($data);
+    if ($deflated !== null) {
+      return array(self::DATAFORMAT_DEFLATED, $deflated);
     }
 
-    return parent::save();
+    return array(self::DATAFORMAT_RAW, $data);
   }
 
   public function saveAsText() {
@@ -99,7 +91,10 @@ public function saveAsText() {
     $raw_data = $this->getRawData();
 
     $this->setDataType(self::DATATYPE_TEXT);
-    $this->setData($raw_data);
+
+    list($format, $data) = $this->formatDataForStorage($raw_data);
+    $this->setDataFormat($format);
+    $this->setData($data);
 
     $result = $this->save();
 
@@ -118,8 +113,11 @@ public function saveAsFile() {
 
     $raw_data = $this->getRawData();
 
+    list($format, $data) = $this->formatDataForStorage($raw_data);
+    $this->setDataFormat($format);
+
     $file = PhabricatorFile::newFromFileData(
-      $raw_data,
+      $data,
       array(
         'name' => 'differential-hunk',
         'mime-type' => 'application/octet-stream',

From 23867c14879805c190f5351ec8053c9472a33edf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Sep 2017 12:54:14 -0700
Subject: [PATCH 179/865] Add a "Draft" state for revisions, and action bucket
 support

Summary:
Ref T2543. There's no way to put revisions into this state yet, but start adding support for when there is.

Adds the status constant, plus support for bucketing them.

Test Plan:
  - Manually put a revision in "Draft" state by updating the database directly.
  - Verified my drafts showed up in a "Drafts" section on the bucket view.
  - Verified others' drafts did not appear on the action bucket view.
  - Viewed revisions, queried for "Draft" revisions, etc (stuff we get for free).

{F5186781}

{F5186782}

{F5186783}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18625
---
 .../constants/DifferentialRevisionStatus.php  | 15 +++++++
 ...tialRevisionRequiredActionResultBucket.php | 40 +++++++++++++++++++
 .../storage/DifferentialRevision.php          |  4 ++
 3 files changed, 59 insertions(+)

diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
index b4b291f9c4..70f0e33b28 100644
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -8,6 +8,7 @@ final class DifferentialRevisionStatus extends Phobject {
   const ACCEPTED = 'accepted';
   const PUBLISHED = 'published';
   const ABANDONED = 'abandoned';
+  const DRAFT = 'draft';
 
   private $key;
   private $spec = array();
@@ -76,6 +77,10 @@ public function isChangePlanned() {
     return ($this->key === self::CHANGES_PLANNED);
   }
 
+  public function isDraft() {
+    return ($this->key === self::DRAFT);
+  }
+
   public static function newForStatus($status) {
     $result = new self();
 
@@ -163,6 +168,16 @@ private static function getMap() {
         'color.tag' => 'indigo',
         'color.ansi' => null,
       ),
+      self::DRAFT => array(
+        'name' => pht('Draft'),
+        // For legacy clients, treat this as though it is "Needs Review".
+        'legacy' => 0,
+        'icon' => 'fa-file-text-o',
+        'closed' => false,
+        'color.icon' => 'grey',
+        'color.tag' => 'grey',
+        'color.ansi' => null,
+      ),
     );
   }
 
diff --git a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
index 195a430b1c..f3971f8571 100644
--- a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
+++ b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
@@ -37,6 +37,9 @@ protected function buildResultGroups(
     // other project or package reviewers which they have authority over.
     $this->filterResigned($phids);
 
+    // We also throw away draft revisions which you aren't the author of.
+    $this->filterOtherDrafts($phids);
+
     $groups = array();
 
     $groups[] = $this->newGroup()
@@ -61,6 +64,11 @@ protected function buildResultGroups(
       ->setNoDataString(pht('No revisions are waiting for updates.'))
       ->setObjects($this->filterShouldUpdate($phids));
 
+    $groups[] = $this->newGroup()
+      ->setName(pht('Drafts'))
+      ->setNoDataString(pht('You have no draft revisions.'))
+      ->setObjects($this->filterDrafts($phids));
+
     $groups[] = $this->newGroup()
       ->setName(pht('Waiting on Review'))
       ->setNoDataString(pht('None of your revisions are waiting on review.'))
@@ -247,4 +255,36 @@ private function filterResigned(array $phids) {
     return $results;
   }
 
+  private function filterOtherDrafts(array $phids) {
+    $objects = $this->getRevisionsNotAuthored($this->objects, $phids);
+
+    $results = array();
+    foreach ($objects as $key => $object) {
+      if (!$object->isDraft()) {
+        continue;
+      }
+
+      $results[$key] = $object;
+      unset($this->objects[$key]);
+    }
+
+    return $results;
+  }
+
+  private function filterDrafts(array $phids) {
+    $objects = $this->getRevisionsAuthored($this->objects, $phids);
+
+    $results = array();
+    foreach ($objects as $key => $object) {
+      if (!$object->isDraft()) {
+        continue;
+      }
+
+      $results[$key] = $object;
+      unset($this->objects[$key]);
+    }
+
+    return $results;
+  }
+
 }
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 3615c6e78b..03602b49d9 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -653,6 +653,10 @@ public function isPublished() {
     return $this->getStatusObject()->isPublished();
   }
 
+  public function isDraft() {
+    return $this->getStatusObject()->isDraft();
+  }
+
   public function getStatusIcon() {
     return $this->getStatusObject()->getIcon();
   }

From 03e5d69817c91afde03615a475086044a7db7a33 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 19 Sep 2017 09:22:10 -0700
Subject: [PATCH 180/865] Fix an error in Diffusion when the Owners application
 is uninstalled

Summary:
See <https://discourse.phabricator-community.org/t/undefined-view-when-owners-is-uninstalled/451>.

When Owners is not installed, Diffusion can fatal with a bad `$view`.

Test Plan:
  - Uninstall Owners.
  - View the content of any file in Diffusion.
  - Before: fatal on `$view` undefined.
  - After: Valid page with no owners information.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18629
---
 .../controller/DiffusionBrowseController.php  | 120 +++++++++---------
 1 file changed, 62 insertions(+), 58 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 076e667dc4..d3223e64fd 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -799,75 +799,79 @@ private function buildButtonBar(
   }
 
   private function buildOwnersList(DiffusionRequest $drequest) {
-
     $viewer = $this->getViewer();
-    $repository = $drequest->getRepository();
 
-    $owners = 'PhabricatorOwnersApplication';
-    if (PhabricatorApplication::isClassInstalled($owners)) {
-      $package_query = id(new PhabricatorOwnersPackageQuery())
-        ->setViewer($viewer)
-        ->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
-        ->withControl(
-          $repository->getPHID(),
-          array(
-            $drequest->getPath(),
-          ));
+    $have_owners = PhabricatorApplication::isClassInstalledForViewer(
+      'PhabricatorOwnersApplication',
+      $viewer);
+    if (!$have_owners) {
+      return null;
+    }
 
-      $package_query->execute();
+    $repository = $drequest->getRepository();
 
-      $packages = $package_query->getControllingPackagesForPath(
+    $package_query = id(new PhabricatorOwnersPackageQuery())
+      ->setViewer($viewer)
+      ->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
+      ->withControl(
         $repository->getPHID(),
-        $drequest->getPath());
-
-      $ownership = id(new PHUIObjectItemListView())
-        ->setUser($viewer)
-        ->setNoDataString(pht('No Owners'));
-
-      if ($packages) {
-        foreach ($packages as $package) {
-          $item = id(new PHUIObjectItemView())
-            ->setObject($package)
-            ->setObjectName($package->getMonogram())
-            ->setHeader($package->getName())
-            ->setHref($package->getURI());
-
-          $owners = $package->getOwners();
-          if ($owners) {
-            $owner_list = $viewer->renderHandleList(
-              mpull($owners, 'getUserPHID'));
-          } else {
-            $owner_list = phutil_tag('em', array(), pht('None'));
-          }
-          $item->addAttribute(pht('Owners: %s', $owner_list));
-
-          $auto = $package->getAutoReview();
-          $autoreview_map = PhabricatorOwnersPackage::getAutoreviewOptionsMap();
-          $spec = idx($autoreview_map, $auto, array());
-          $name = idx($spec, 'name', $auto);
-          $item->addIcon('fa-code', $name);
-
-          if ($package->getAuditingEnabled()) {
-            $item->addIcon('fa-check', pht('Auditing Enabled'));
-          } else {
-            $item->addIcon('fa-ban', pht('No Auditing'));
-          }
+        array(
+          $drequest->getPath(),
+        ));
 
-          if ($package->isArchived()) {
-            $item->setDisabled(true);
-          }
+    $package_query->execute();
+
+    $packages = $package_query->getControllingPackagesForPath(
+      $repository->getPHID(),
+      $drequest->getPath());
 
-          $ownership->addItem($item);
+    $ownership = id(new PHUIObjectItemListView())
+      ->setUser($viewer)
+      ->setNoDataString(pht('No Owners'));
+
+    if ($packages) {
+      foreach ($packages as $package) {
+        $item = id(new PHUIObjectItemView())
+          ->setObject($package)
+          ->setObjectName($package->getMonogram())
+          ->setHeader($package->getName())
+          ->setHref($package->getURI());
+
+        $owners = $package->getOwners();
+        if ($owners) {
+          $owner_list = $viewer->renderHandleList(
+            mpull($owners, 'getUserPHID'));
+        } else {
+          $owner_list = phutil_tag('em', array(), pht('None'));
         }
-      }
+        $item->addAttribute(pht('Owners: %s', $owner_list));
 
-      $view = id(new PHUIObjectBoxView())
-        ->setHeaderText(pht('Owner Packages'))
-        ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-        ->addClass('diffusion-mobile-view')
-        ->setObjectList($ownership);
+        $auto = $package->getAutoReview();
+        $autoreview_map = PhabricatorOwnersPackage::getAutoreviewOptionsMap();
+        $spec = idx($autoreview_map, $auto, array());
+        $name = idx($spec, 'name', $auto);
+        $item->addIcon('fa-code', $name);
+
+        if ($package->getAuditingEnabled()) {
+          $item->addIcon('fa-check', pht('Auditing Enabled'));
+        } else {
+          $item->addIcon('fa-ban', pht('No Auditing'));
+        }
+
+        if ($package->isArchived()) {
+          $item->setDisabled(true);
+        }
+
+        $ownership->addItem($item);
+      }
     }
 
+    $view = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Owner Packages'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->addClass('diffusion-mobile-view')
+      ->setObjectList($ownership);
+
     return $view;
   }
 

From 52fff638ca9bb0f7c48791475930a51ae61a1016 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 19 Sep 2017 09:22:10 -0700
Subject: [PATCH 181/865] (stable) Fix an error in Diffusion when the Owners
 application is uninstalled

Summary:
See <https://discourse.phabricator-community.org/t/undefined-view-when-owners-is-uninstalled/451>.

When Owners is not installed, Diffusion can fatal with a bad `$view`.

Test Plan:
  - Uninstall Owners.
  - View the content of any file in Diffusion.
  - Before: fatal on `$view` undefined.
  - After: Valid page with no owners information.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18629
---
 .../controller/DiffusionBrowseController.php  | 120 +++++++++---------
 1 file changed, 62 insertions(+), 58 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 076e667dc4..d3223e64fd 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -799,75 +799,79 @@ private function buildButtonBar(
   }
 
   private function buildOwnersList(DiffusionRequest $drequest) {
-
     $viewer = $this->getViewer();
-    $repository = $drequest->getRepository();
 
-    $owners = 'PhabricatorOwnersApplication';
-    if (PhabricatorApplication::isClassInstalled($owners)) {
-      $package_query = id(new PhabricatorOwnersPackageQuery())
-        ->setViewer($viewer)
-        ->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
-        ->withControl(
-          $repository->getPHID(),
-          array(
-            $drequest->getPath(),
-          ));
+    $have_owners = PhabricatorApplication::isClassInstalledForViewer(
+      'PhabricatorOwnersApplication',
+      $viewer);
+    if (!$have_owners) {
+      return null;
+    }
 
-      $package_query->execute();
+    $repository = $drequest->getRepository();
 
-      $packages = $package_query->getControllingPackagesForPath(
+    $package_query = id(new PhabricatorOwnersPackageQuery())
+      ->setViewer($viewer)
+      ->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
+      ->withControl(
         $repository->getPHID(),
-        $drequest->getPath());
-
-      $ownership = id(new PHUIObjectItemListView())
-        ->setUser($viewer)
-        ->setNoDataString(pht('No Owners'));
-
-      if ($packages) {
-        foreach ($packages as $package) {
-          $item = id(new PHUIObjectItemView())
-            ->setObject($package)
-            ->setObjectName($package->getMonogram())
-            ->setHeader($package->getName())
-            ->setHref($package->getURI());
-
-          $owners = $package->getOwners();
-          if ($owners) {
-            $owner_list = $viewer->renderHandleList(
-              mpull($owners, 'getUserPHID'));
-          } else {
-            $owner_list = phutil_tag('em', array(), pht('None'));
-          }
-          $item->addAttribute(pht('Owners: %s', $owner_list));
-
-          $auto = $package->getAutoReview();
-          $autoreview_map = PhabricatorOwnersPackage::getAutoreviewOptionsMap();
-          $spec = idx($autoreview_map, $auto, array());
-          $name = idx($spec, 'name', $auto);
-          $item->addIcon('fa-code', $name);
-
-          if ($package->getAuditingEnabled()) {
-            $item->addIcon('fa-check', pht('Auditing Enabled'));
-          } else {
-            $item->addIcon('fa-ban', pht('No Auditing'));
-          }
+        array(
+          $drequest->getPath(),
+        ));
 
-          if ($package->isArchived()) {
-            $item->setDisabled(true);
-          }
+    $package_query->execute();
+
+    $packages = $package_query->getControllingPackagesForPath(
+      $repository->getPHID(),
+      $drequest->getPath());
 
-          $ownership->addItem($item);
+    $ownership = id(new PHUIObjectItemListView())
+      ->setUser($viewer)
+      ->setNoDataString(pht('No Owners'));
+
+    if ($packages) {
+      foreach ($packages as $package) {
+        $item = id(new PHUIObjectItemView())
+          ->setObject($package)
+          ->setObjectName($package->getMonogram())
+          ->setHeader($package->getName())
+          ->setHref($package->getURI());
+
+        $owners = $package->getOwners();
+        if ($owners) {
+          $owner_list = $viewer->renderHandleList(
+            mpull($owners, 'getUserPHID'));
+        } else {
+          $owner_list = phutil_tag('em', array(), pht('None'));
         }
-      }
+        $item->addAttribute(pht('Owners: %s', $owner_list));
 
-      $view = id(new PHUIObjectBoxView())
-        ->setHeaderText(pht('Owner Packages'))
-        ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-        ->addClass('diffusion-mobile-view')
-        ->setObjectList($ownership);
+        $auto = $package->getAutoReview();
+        $autoreview_map = PhabricatorOwnersPackage::getAutoreviewOptionsMap();
+        $spec = idx($autoreview_map, $auto, array());
+        $name = idx($spec, 'name', $auto);
+        $item->addIcon('fa-code', $name);
+
+        if ($package->getAuditingEnabled()) {
+          $item->addIcon('fa-check', pht('Auditing Enabled'));
+        } else {
+          $item->addIcon('fa-ban', pht('No Auditing'));
+        }
+
+        if ($package->isArchived()) {
+          $item->setDisabled(true);
+        }
+
+        $ownership->addItem($item);
+      }
     }
 
+    $view = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Owner Packages'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->addClass('diffusion-mobile-view')
+      ->setObjectList($ownership);
+
     return $view;
   }
 

From 3fbad684c1423c724bc64a6299361f268e26ef2a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 20 Sep 2017 10:31:01 -0700
Subject: [PATCH 182/865] More completely explain why we're refusing to send
 reset mail to an unverified address

Summary:
See PHI78. The user was getting this message and (reasonably) interpreted it to mean "reset mail can never be sent to unverified addresses".

Reword it to be more clear, albeit an entire paragraph long. I don't really have a good solution in these cases where we'd need a whole page to explain what's happening (this, plus "we can't tell you which address you should use because an attacker could get information if we did" and "this rule defuses the risk that an opportunistic attacker may try to compromise your account after you add an email you don't own by mistake"). We could write it up separately and link to it, but I feel like that stuff tends to get out of date.

Just land somewhere in the middle.

Test Plan: {F5189105}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18630
---
 .../auth/controller/PhabricatorEmailLoginController.php    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/applications/auth/controller/PhabricatorEmailLoginController.php b/src/applications/auth/controller/PhabricatorEmailLoginController.php
index 92accc7494..f57a29b11a 100644
--- a/src/applications/auth/controller/PhabricatorEmailLoginController.php
+++ b/src/applications/auth/controller/PhabricatorEmailLoginController.php
@@ -71,8 +71,11 @@ public function handleRequest(AphrontRequest $request) {
             $target_email->getUserPHID());
           if ($verified_addresses) {
             $errors[] = pht(
-              'That email address is not verified. You can only send '.
-              'password reset links to a verified address.');
+              'That email address is not verified, but the account it is '.
+              'connected to has at least one other verified address. When an '.
+              'account has at least one verified address, you can only send '.
+              'password reset links to one of the verified addresses. Try '.
+              'a verified address instead.');
             $e_email = pht('Unverified');
           }
         }

From 5112dac491a870ac4f87fb3869be5bbe40308999 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 20 Sep 2017 14:34:06 -0700
Subject: [PATCH 183/865] Update an old SSH redirect URI when editing a bot's
 SSH keys

Summary: See PHI79. When you edit another user's SSH keys (normally, for a bot account) we currently redirect you to an older URI.

Test Plan:
  - Viewed a bot's profile page.
  - Clicked "Edit Settings" on the Manage page.
  - Went to "SSH Keys".
  - Uploaded an SSH key.
  - Before: redirected to a 404 after finishing the workflow.
  - After: redirected to the same page after the workflow.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18633
---
 src/applications/people/storage/PhabricatorUser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index a3ec42213a..166feaa237 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -1390,7 +1390,7 @@ public function getSSHPublicKeyManagementURI(PhabricatorUser $viewer) {
       return '/settings/panel/ssh/';
     } else {
       // Otherwise, take them to the administrative panel for this user.
-      return '/settings/'.$this->getID().'/panel/ssh/';
+      return '/settings/user/'.$this->getUsername().'/page/ssh/';
     }
   }
 

From f089f41e50c626267a70ad21f001ab5ce03560d3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 20 Sep 2017 14:34:06 -0700
Subject: [PATCH 184/865] (stable) Update an old SSH redirect URI when editing
 a bot's SSH keys

Summary: See PHI79. When you edit another user's SSH keys (normally, for a bot account) we currently redirect you to an older URI.

Test Plan:
  - Viewed a bot's profile page.
  - Clicked "Edit Settings" on the Manage page.
  - Went to "SSH Keys".
  - Uploaded an SSH key.
  - Before: redirected to a 404 after finishing the workflow.
  - After: redirected to the same page after the workflow.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18633
---
 src/applications/people/storage/PhabricatorUser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index a3ec42213a..166feaa237 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -1390,7 +1390,7 @@ public function getSSHPublicKeyManagementURI(PhabricatorUser $viewer) {
       return '/settings/panel/ssh/';
     } else {
       // Otherwise, take them to the administrative panel for this user.
-      return '/settings/'.$this->getID().'/panel/ssh/';
+      return '/settings/user/'.$this->getUsername().'/page/ssh/';
     }
   }
 

From c7af663523e556ca08a6b6df30e6fd0932f8dd46 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Sep 2017 14:14:52 -0700
Subject: [PATCH 185/865] Align most revision actions to the new "Draft" state

Summary:
Ref T2543. Most actions are not available for drafts.

Authors can "Request Review" (move out of draft to become a normal revision) or "Abandon".

Non-authors can't do anything (maybe we'll let them do something later -- like "Commandeer"? -- if there's a good reason).

Test Plan: Viewed a draft revision as an author and non-author, saw fewer actions available.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18626
---
 .../xaction/DifferentialRevisionAbandonTransaction.php   | 3 ++-
 .../xaction/DifferentialRevisionAcceptTransaction.php    | 3 ++-
 .../xaction/DifferentialRevisionActionTransaction.php    | 5 +++--
 .../xaction/DifferentialRevisionCloseTransaction.php     | 3 ++-
 .../DifferentialRevisionCommandeerTransaction.php        | 8 +++++++-
 .../DifferentialRevisionPlanChangesTransaction.php       | 8 +++++++-
 .../xaction/DifferentialRevisionReclaimTransaction.php   | 3 ++-
 .../xaction/DifferentialRevisionRejectTransaction.php    | 8 +++++++-
 .../xaction/DifferentialRevisionReopenTransaction.php    | 3 ++-
 .../DifferentialRevisionRequestReviewTransaction.php     | 9 +++++++--
 .../xaction/DifferentialRevisionResignTransaction.php    | 8 +++++++-
 11 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
index b7b0e7f123..6232594aae 100644
--- a/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht('Abandon Revision');
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht('This revision will be abandoned and closed.');
   }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
index f01ce4b487..d52e2dbeb7 100644
--- a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht("Accept Revision \xE2\x9C\x94");
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht('These changes will be approved.');
   }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
index ba769c2be5..a1e66379f7 100644
--- a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
@@ -52,7 +52,8 @@ protected function getRevisionActionGroupKey() {
     return DifferentialRevisionEditEngine::ACTIONGROUP_REVISION;
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return null;
   }
 
@@ -103,7 +104,7 @@ public function newEditField(
       if ($label !== null) {
         $field->setCommentActionLabel($label);
 
-        $description = $this->getRevisionActionDescription();
+        $description = $this->getRevisionActionDescription($revision);
         $field->setActionDescription($description);
 
         $group_key = $this->getRevisionActionGroupKey();
diff --git a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
index d71b30950a..b1c796dca4 100644
--- a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht('Close Revision');
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht('This revision will be closed.');
   }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
index 34cedcbb73..4169c3e4dc 100644
--- a/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht('Commandeer Revision');
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht('You will take control of this revision and become its author.');
   }
 
@@ -65,6 +66,11 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'been closed. You can only commandeer open revisions.'));
     }
 
+    if ($object->isDraft()) {
+      throw new Exception(
+        pht('You can not commandeer a draft revision.'));
+    }
+
     if ($this->isViewerRevisionAuthor($object, $viewer)) {
       throw new Exception(
         pht(
diff --git a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
index 6e584ceb36..231adc5bf8 100644
--- a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht('Plan Changes');
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht(
       'This revision will be removed from review queues until it is revised.');
   }
@@ -55,6 +56,11 @@ public function applyInternalEffects($object, $value) {
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
+    if ($object->isDraft()) {
+      throw new Exception(
+        pht('You can not plan changes to a draft revision.'));
+    }
+
     if ($object->isChangePlanned()) {
       throw new Exception(
         pht(
diff --git a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
index 4767924445..4a4744e2e0 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht('Reclaim Revision');
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht('This revision will be reclaimed and reopened.');
   }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
index b4c71209aa..a15ca0641b 100644
--- a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht("Request Changes \xE2\x9C\x98");
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht('This revision will be returned to the author for updates.');
   }
 
@@ -72,6 +73,11 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'not own.'));
     }
 
+    if ($object->isDraft()) {
+      throw new Exception(
+        pht('You can not request changes to a draft revision.'));
+    }
+
     if ($this->isViewerFullyRejected($object, $viewer)) {
       throw new Exception(
         pht(
diff --git a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
index 1d28433429..4fc9f3a6f1 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht('Reopen Revision');
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht('This revision will be reopened for review.');
   }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
index d102b0c0c2..465b5234d5 100644
--- a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
@@ -10,8 +10,13 @@ protected function getRevisionActionLabel() {
     return pht('Request Review');
   }
 
-  protected function getRevisionActionDescription() {
-    return pht('This revision will be returned to reviewers for feedback.');
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
+    if ($revision->isDraft()) {
+      return pht('This revision will be submitted to reviewers for feedback.');
+    } else {
+      return pht('This revision will be returned to reviewers for feedback.');
+    }
   }
 
   public function getColor() {
diff --git a/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php b/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
index c7805ad35f..40a512202d 100644
--- a/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
@@ -10,7 +10,8 @@ protected function getRevisionActionLabel() {
     return pht('Resign as Reviewer');
   }
 
-  protected function getRevisionActionDescription() {
+  protected function getRevisionActionDescription(
+    DifferentialRevision $revision) {
     return pht('You will resign as a reviewer for this change.');
   }
 
@@ -63,6 +64,11 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'been closed. You can only resign from open revisions.'));
     }
 
+    if ($object->isDraft()) {
+      throw new Exception(
+        pht('You can not resign from a draft revision.'));
+    }
+
     $resigned = DifferentialReviewerStatus::STATUS_RESIGNED;
     if ($this->getViewerReviewerStatus($object, $viewer) == $resigned) {
       throw new Exception(

From fca553f142a23448343747180fc1b59dba2954fe Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Sep 2017 14:40:36 -0700
Subject: [PATCH 186/865] Prepare revision mail for the "Draft" status

Summary:
Ref T2543. Currently, we always do some special things when a revision is created, mostly adding more stuff to the mail.

With drafts, we want to suppress initial mail and send this big, rich mail only when the revision actually moves out of "draft".

Prepare the code for this, with the actual methods hard-coded to the current behavior. This will probably take some tweaking but I think I got most of it.

Test Plan: Banged around in Differential so it sent some mail, saw normal mail without anything new.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18627
---
 ...ifferentialChangesSinceLastUpdateField.php |  2 +-
 .../customfield/DifferentialSummaryField.php  |  2 +-
 .../customfield/DifferentialTestPlanField.php |  2 +-
 .../editor/DifferentialTransactionEditor.php  | 69 ++++++++++++++-----
 .../storage/DifferentialRevision.php          |  8 +++
 5 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/src/applications/differential/customfield/DifferentialChangesSinceLastUpdateField.php b/src/applications/differential/customfield/DifferentialChangesSinceLastUpdateField.php
index a7e3654d0d..6fd24fc0d7 100644
--- a/src/applications/differential/customfield/DifferentialChangesSinceLastUpdateField.php
+++ b/src/applications/differential/customfield/DifferentialChangesSinceLastUpdateField.php
@@ -24,7 +24,7 @@ public function updateTransactionMailBody(
     PhabricatorApplicationTransactionEditor $editor,
     array $xactions) {
 
-    if ($editor->getIsNewObject()) {
+    if ($editor->isFirstBroadcast()) {
       return;
     }
 
diff --git a/src/applications/differential/customfield/DifferentialSummaryField.php b/src/applications/differential/customfield/DifferentialSummaryField.php
index a11bebca6e..eff2de6f12 100644
--- a/src/applications/differential/customfield/DifferentialSummaryField.php
+++ b/src/applications/differential/customfield/DifferentialSummaryField.php
@@ -67,7 +67,7 @@ public function updateTransactionMailBody(
     PhabricatorApplicationTransactionEditor $editor,
     array $xactions) {
 
-    if (!$editor->getIsNewObject()) {
+    if (!$editor->isFirstBroadcast()) {
       return;
     }
 
diff --git a/src/applications/differential/customfield/DifferentialTestPlanField.php b/src/applications/differential/customfield/DifferentialTestPlanField.php
index c774e81a08..f2fa9cd17f 100644
--- a/src/applications/differential/customfield/DifferentialTestPlanField.php
+++ b/src/applications/differential/customfield/DifferentialTestPlanField.php
@@ -71,7 +71,7 @@ public function updateTransactionMailBody(
     PhabricatorApplicationTransactionEditor $editor,
     array $xactions) {
 
-    if (!$editor->getIsNewObject()) {
+    if (!$editor->isFirstBroadcast()) {
       return;
     }
 
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index c6270013aa..989b9c5547 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -26,6 +26,10 @@ public function getCreateObjectTitleForFeed($author, $object) {
     return pht('%s created %s.', $author, $object);
   }
 
+  public function isFirstBroadcast() {
+    return $this->getIsNewObject();
+  }
+
   public function getDiffUpdateTransaction(array $xactions) {
     $type_update = DifferentialTransaction::TYPE_UPDATE;
 
@@ -600,24 +604,25 @@ protected function sortTransactions(array $xactions) {
     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) {
+
+    if (!$object->shouldBroadcast()) {
+      return false;
+    }
+
     return true;
   }
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
+
+    if (!$object->shouldBroadcast()) {
+      return false;
+    }
+
     return true;
   }
 
@@ -633,14 +638,25 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
   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;
+    $show_lines = false;
+    if ($this->isFirstBroadcast()) {
+      $action = pht('Request');
+
+      $show_lines = true;
+    } else {
+      $action = parent::getMailAction($object, $xactions);
+
+      $strongest = $this->getStrongestAction($object, $xactions);
+      $type_update = DifferentialTransaction::TYPE_UPDATE;
+      if ($strongest->getTransactionType() == $type_update) {
+        $show_lines = true;
+      }
+    }
+
+    if ($show_lines) {
+      $count = new PhutilNumber($object->getLineCount());
+      $action = pht('%s, %s line(s)', $action, $count);
     }
 
     return $action;
@@ -679,6 +695,16 @@ protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
+    $viewer = $this->requireActor();
+
+    // If this is the first time we're sending mail about this revision, we
+    // generate mail for all prior transactions, not just whatever is being
+    // applied now. This gets the "added reviewers" lines and other relevant
+    // information into the mail.
+    if ($this->isFirstBroadcast()) {
+      $xactions = $this->loadUnbroadcastTransactions($object);
+    }
+
     $body = new PhabricatorMetaMTAMailBody();
     $body->setViewer($this->requireActor());
 
@@ -1491,4 +1517,15 @@ private function markReviewerComments($object, array $xactions) {
       $acting_phid);
   }
 
+  private function loadUnbroadcastTransactions($object) {
+    $viewer = $this->requireActor();
+
+    $xactions = id(new DifferentialTransactionQuery())
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object->getPHID()))
+      ->execute();
+
+    return array_reverse($xactions);
+  }
+
 }
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 03602b49d9..7bcd178a41 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -694,6 +694,14 @@ public function attachHasDraft(PhabricatorUser $viewer, $has_draft) {
     return $this;
   }
 
+  public function shouldBroadcast() {
+    if (!$this->isDraft()) {
+      return true;
+    }
+
+    return false;
+  }
+
 
 /* -(  HarbormasterBuildableInterface  )------------------------------------- */
 

From 36df39761ea562c270dab13af50e44428e93bee3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Sep 2017 15:28:18 -0700
Subject: [PATCH 187/865] Create revisions into "Draft", publish them when
 builds finish

Summary:
Ref T2543. This doesn't stand alone since mail still goes out normally, but gets this piece working: new revisions start as "Draft", then after updates if there are no builds they go into "Needs Review".

This should work in general because builds update revisions when they complete, to publish a "Harbormaster finished build yada yada" transaction. So either we'll un-draft immediately, or un-draft after the last build finishes.

I'll hold this until the mail and some other stuff (like UI hints) are in slightly better shape since I think it's probably too rough on its own.

Test Plan: Created revisions locally, saw them un-draft after builds.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18628
---
 .../config/editor/PhabricatorConfigEditor.php |  4 +-
 .../editor/DifferentialTransactionEditor.php  | 98 +++++++++++++++++++
 ...habricatorApplicationTransactionEditor.php |  6 +-
 3 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/src/applications/config/editor/PhabricatorConfigEditor.php b/src/applications/config/editor/PhabricatorConfigEditor.php
index dc1b7b8c56..f776c3ec0c 100644
--- a/src/applications/config/editor/PhabricatorConfigEditor.php
+++ b/src/applications/config/editor/PhabricatorConfigEditor.php
@@ -107,9 +107,11 @@ protected function transactionHasEffect(
     return parent::transactionHasEffect($object, $xaction);
   }
 
-  protected function didApplyTransactions(array $xactions) {
+  protected function didApplyTransactions($object, array $xactions) {
     // Force all the setup checks to run on the next page load.
     PhabricatorSetupCheck::deleteSetupCheckCache();
+
+    return $xactions;
   }
 
   public static function storeNewValue(
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 989b9c5547..253d49c1ec 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1528,4 +1528,102 @@ private function loadUnbroadcastTransactions($object) {
     return array_reverse($xactions);
   }
 
+
+  protected function didApplyTransactions($object, array $xactions) {
+    // If a draft revision has no outstanding builds and we're automatically
+    // making drafts public after builds finish, make the revision public.
+    $auto_undraft = true;
+
+    if ($object->isDraft() && $auto_undraft) {
+      $active_builds = $this->hasActiveBuilds($object);
+      if (!$active_builds) {
+        $xaction = $object->getApplicationTransactionTemplate()
+          ->setTransactionType(
+            DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE)
+          ->setOldValue(false)
+          ->setNewValue(true);
+
+        $xaction = $this->populateTransaction($object, $xaction);
+
+        // If we're creating this revision and immediately moving it out of
+        // the draft state, mark this as a create transaction so it gets
+        // hidden in the timeline and mail, since it isn't interesting: it
+        // is as though the draft phase never happened.
+        if ($this->getIsNewObject()) {
+          $xaction->setIsCreateTransaction(true);
+        }
+
+        $object->openTransaction();
+          $object
+            ->setStatus(DifferentialRevisionStatus::NEEDS_REVIEW)
+            ->save();
+
+          $xaction->save();
+        $object->saveTransaction();
+
+        $xactions[] = $xaction;
+      }
+    }
+
+    return $xactions;
+  }
+
+  private function hasActiveBuilds($object) {
+    $viewer = $this->requireActor();
+    $diff = $object->getActiveDiff();
+
+    $buildables = id(new HarbormasterBuildableQuery())
+      ->setViewer($viewer)
+      ->withContainerPHIDs(array($object->getPHID()))
+      ->withBuildablePHIDs(array($diff->getPHID()))
+      ->withManualBuildables(false)
+      ->execute();
+    if (!$buildables) {
+      return false;
+    }
+
+    $builds = id(new HarbormasterBuildQuery())
+      ->setViewer($viewer)
+      ->withBuildablePHIDs(mpull($buildables, 'getPHID'))
+      ->withBuildStatuses(
+        array(
+          HarbormasterBuildStatus::STATUS_INACTIVE,
+          HarbormasterBuildStatus::STATUS_PENDING,
+          HarbormasterBuildStatus::STATUS_BUILDING,
+          HarbormasterBuildStatus::STATUS_FAILED,
+          HarbormasterBuildStatus::STATUS_ABORTED,
+          HarbormasterBuildStatus::STATUS_ERROR,
+          HarbormasterBuildStatus::STATUS_PAUSED,
+          HarbormasterBuildStatus::STATUS_DEADLOCKED,
+        ))
+      ->needBuildTargets(true)
+      ->execute();
+    if (!$builds) {
+      return false;
+    }
+
+    $active = array();
+    foreach ($builds as $key => $build) {
+      foreach ($build->getBuildTargets() as $target) {
+        if ($target->isAutotarget()) {
+          // Ignore autotargets when looking for active of failed builds. If
+          // local tests fail and you continue anyway, you don't need to
+          // double-confirm them.
+          continue;
+        }
+
+        // This build has at least one real target that's doing something.
+        $active[$key] = $build;
+        break;
+      }
+    }
+
+    if (!$active) {
+      return false;
+    }
+
+    return true;
+  }
+
+
 }
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 21e082b4ed..07edf5b0c8 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -1105,7 +1105,7 @@ final public function applyTransactions(
       $this->heraldForcedEmailPHIDs = $adapter->getForcedEmailPHIDs();
     }
 
-    $this->didApplyTransactions($xactions);
+    $xactions = $this->didApplyTransactions($object, $xactions);
 
     if ($object instanceof PhabricatorCustomFieldInterface) {
       // Maybe this makes more sense to move into the search index itself? For
@@ -1234,9 +1234,9 @@ public function publishTransactions(
     return $xactions;
   }
 
-  protected function didApplyTransactions(array $xactions) {
+  protected function didApplyTransactions($object, array $xactions) {
     // Hook for subclasses.
-    return;
+    return $xactions;
   }
 
 

From 1ac52c09e757e4f6ffc51a3dc24108b32970346e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 22 Sep 2017 08:10:12 -0700
Subject: [PATCH 188/865] Improve search highlighting for CJK and substring
 queries

Summary:
Fixes T12995. Currently, the result highlighter (which shows //where// terms matched) only works in "term" mode, not in "substring" mode.

Provide better feedback and behvaior:

  - When a term is a substring term, color it a little differently and add a tooltip. (This is partly to make it easier to debug/diagnose things, probably not enormously valuable to users.)
  - When a term is a substring term, highlight it anywhere in the results.

Test Plan:
Queried for latin and CJK terms.

Here is CJK being highlighted:

{F5192195}

Here is substring vs non-substring implicit behavior:

{F5192196}

Here's ONLY terms being highlighted:

{F5192198}

Here's terms and substrings, since the query now has a substring:

{F5192201}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12995

Differential Revision: https://secure.phabricator.com/D18635
---
 .../search/query/PhabricatorFulltextToken.php |   4 +
 ...abricatorSearchApplicationSearchEngine.php |   2 +-
 .../view/PhabricatorSearchResultView.php      | 150 +++++++++++-------
 3 files changed, 101 insertions(+), 55 deletions(-)

diff --git a/src/applications/search/query/PhabricatorFulltextToken.php b/src/applications/search/query/PhabricatorFulltextToken.php
index 4edeb098a9..8dc2cee3ca 100644
--- a/src/applications/search/query/PhabricatorFulltextToken.php
+++ b/src/applications/search/query/PhabricatorFulltextToken.php
@@ -56,6 +56,10 @@ public function newTag() {
           $shade = PHUITagView::COLOR_RED;
           $icon = 'fa-minus';
           break;
+        case PhutilSearchQueryCompiler::OPERATOR_SUBSTRING:
+          $tip = pht('Substring Search');
+          $shade = PHUITagView::COLOR_VIOLET;
+          break;
         default:
           $shade = PHUITagView::COLOR_BLUE;
           break;
diff --git a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
index d944d61964..3fcf0a8f7a 100644
--- a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
+++ b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
@@ -261,7 +261,7 @@ protected function renderResultList(
       foreach ($results as $phid => $handle) {
         $view = id(new PhabricatorSearchResultView())
           ->setHandle($handle)
-          ->setQuery($query)
+          ->setTokens($fulltext_tokens)
           ->setObject(idx($objects, $phid))
           ->render();
         $list->addItem($view);
diff --git a/src/applications/search/view/PhabricatorSearchResultView.php b/src/applications/search/view/PhabricatorSearchResultView.php
index 63219b3252..8819f41869 100644
--- a/src/applications/search/view/PhabricatorSearchResultView.php
+++ b/src/applications/search/view/PhabricatorSearchResultView.php
@@ -3,16 +3,17 @@
 final class PhabricatorSearchResultView extends AphrontView {
 
   private $handle;
-  private $query;
   private $object;
+  private $tokens;
 
   public function setHandle(PhabricatorObjectHandle $handle) {
     $this->handle = $handle;
     return $this;
   }
 
-  public function setQuery(PhabricatorSavedQuery $query) {
-    $this->query = $query;
+  public function setTokens(array $tokens) {
+    assert_instances_of($tokens, 'PhabricatorFulltextToken');
+    $this->tokens = $tokens;
     return $this;
   }
 
@@ -56,88 +57,129 @@ public function render() {
    * matched their query.
    */
   private function emboldenQuery($str) {
-    $query = $this->query->getParameter('query');
+    $tokens = $this->tokens;
 
-    if (!strlen($query) || !strlen($str)) {
+    if (!$tokens) {
       return $str;
     }
 
-    // This algorithm is safe but not especially fast, so don't bother if
-    // we're dealing with a lot of data. This mostly prevents silly/malicious
-    // queries from doing anything bad.
-    if (strlen($query) + strlen($str) > 2048) {
+    if (count($tokens) > 16) {
       return $str;
     }
 
-    // Keep track of which characters we're going to make bold. This is
-    // byte oriented, but we'll make sure we don't put a bold in the middle
-    // of a character later.
-    $bold = array_fill(0, strlen($str), false);
+    if (!strlen($str)) {
+      return $str;
+    }
 
-    // Split the query into words.
-    $parts = preg_split('/ +/', $query);
+    if (strlen($str) > 2048) {
+      return $str;
+    }
 
-    // Find all occurrences of each word, and mark them to be emboldened.
-    foreach ($parts as $part) {
-      $part = trim($part);
-      $part = trim($part, '"+');
-      if (!strlen($part)) {
-        continue;
+    $patterns = array();
+    foreach ($tokens as $token) {
+      $raw_token = $token->getToken();
+      $operator = $raw_token->getOperator();
+
+      $value = $raw_token->getValue();
+
+      switch ($operator) {
+        case PhutilSearchQueryCompiler::OPERATOR_SUBSTRING:
+          $patterns[] = '(('.preg_quote($value).'))ui';
+          break;
+        case PhutilSearchQueryCompiler::OPERATOR_AND:
+          $patterns[] = '((?<=\W|^)('.preg_quote($value).')(?=\W|\z))ui';
+          break;
+        default:
+          // Don't highlight anything else, particularly "NOT".
+          break;
       }
+    }
 
+    // Find all matches for all query terms in the document title, then reduce
+    // them to a map from offsets to highlighted sequence lengths. If two terms
+    // match at the same position, we choose the longer one.
+    $all_matches = array();
+    foreach ($patterns as $pattern) {
       $matches = null;
-      $has_matches = preg_match_all(
-        '/(?:^|\b)('.preg_quote($part, '/').')/i',
+      $ok = preg_match_all(
+        $pattern,
         $str,
         $matches,
         PREG_OFFSET_CAPTURE);
-
-      if (!$has_matches) {
+      if (!$ok) {
         continue;
       }
 
-      // Flag the matching part of the range for boldening.
       foreach ($matches[1] as $match) {
-        $offset = $match[1];
-        for ($ii = 0; $ii < strlen($match[0]); $ii++) {
-          $bold[$offset + $ii] = true;
+        $match_text = $match[0];
+        $match_offset = $match[1];
+
+        if (!isset($all_matches[$match_offset])) {
+          $all_matches[$match_offset] = 0;
         }
+
+        $all_matches[$match_offset] = max(
+          $all_matches[$match_offset],
+          strlen($match_text));
       }
     }
 
-    // Split the string into ranges, applying bold styling as required.
-    $out = array();
-    $buf = '';
-    $pos = 0;
-    $is_bold = false;
-
-    // Make sure this is UTF8 because phutil_utf8v() will explode if it isn't.
-    $str = phutil_utf8ize($str);
-    foreach (phutil_utf8v($str) as $chr) {
-      if ($bold[$pos] != $is_bold) {
-        if (strlen($buf)) {
-          if ($is_bold) {
-            $out[] = phutil_tag('strong', array(), $buf);
-          } else {
-            $out[] = $buf;
-          }
-          $buf = '';
+    // Go through the string one display glyph at a time. If a glyph starts
+    // on a highlighted byte position, turn on highlighting for the nubmer
+    // of matching bytes. If a query searches for "e" and the document contains
+    // an "e" followed by a bunch of combining marks, this will correctly
+    // highlight the entire glyph.
+    $parts = array();
+    $highlight = 0;
+    $offset = 0;
+    foreach (phutil_utf8v_combined($str) as $character) {
+      $length = strlen($character);
+
+      if (isset($all_matches[$offset])) {
+        $highlight = $all_matches[$offset];
+      }
+
+      if ($highlight > 0) {
+        $is_highlighted = true;
+        $highlight -= $length;
+      } else {
+        $is_highlighted = false;
+      }
+
+      $parts[] = array(
+        'text' => $character,
+        'highlighted' => $is_highlighted,
+      );
+
+      $offset += $length;
+    }
+
+    // Combine all the sequences together so we aren't emitting a tag around
+    // every individual character.
+    $last = null;
+    foreach ($parts as $key => $part) {
+      if ($last !== null) {
+        if ($part['highlighted'] == $parts[$last]['highlighted']) {
+          $parts[$last]['text'] .= $part['text'];
+          unset($parts[$key]);
+          continue;
         }
-        $is_bold = !$is_bold;
       }
-      $buf .= $chr;
-      $pos += strlen($chr);
+
+      $last = $key;
     }
 
-    if (strlen($buf)) {
-      if ($is_bold) {
-        $out[] = phutil_tag('strong', array(), $buf);
+    // Finally, add tags.
+    $result = array();
+    foreach ($parts as $part) {
+      if ($part['highlighted']) {
+        $result[] = phutil_tag('strong', array(), $part['text']);
       } else {
-        $out[] = $buf;
+        $result[] = $part['text'];
       }
     }
 
-    return $out;
+    return $result;
   }
 
 }

From 9f11f310f87209e50c48a852312cd442d0c373b4 Mon Sep 17 00:00:00 2001
From: Aviv Eyal <aviv@myclaimly.com>
Date: Mon, 25 Sep 2017 19:56:22 +0000
Subject: [PATCH 189/865] Make PHUITwoColumnView a little more printable

Summary: Hide navbar, and make curtain behave like on a phone, when printing.

Test Plan: {F5197340}

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18583
---
 resources/celerity/map.php                    | 18 ++++++------
 webroot/rsrc/css/core/core.css                |  5 ++++
 webroot/rsrc/css/phui/phui-action-list.css    |  5 ++++
 webroot/rsrc/css/phui/phui-curtain-view.css   | 28 +++++++++++++++++++
 .../rsrc/css/phui/phui-two-column-view.css    | 28 +++++++++++++++++++
 5 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 552fe22a68..6c7d2db90c 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => 'e9473020',
+    'core.pkg.css' => '87a9a59b',
     'core.pkg.js' => '28552e58',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -114,7 +114,7 @@
     'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
-    'rsrc/css/core/core.css' => '1760853c',
+    'rsrc/css/core/core.css' => '62fa3ace',
     'rsrc/css/core/remarkup.css' => 'cad18339',
     'rsrc/css/core/syntax.css' => 'cae95e89',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
@@ -137,7 +137,7 @@
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
     'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'bf094950',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
-    'rsrc/css/phui/phui-action-list.css' => 'e7eba156',
+    'rsrc/css/phui/phui-action-list.css' => 'f7f61a34',
     'rsrc/css/phui/phui-action-panel.css' => 'b4798122',
     'rsrc/css/phui/phui-badge.css' => '22c0cf4f',
     'rsrc/css/phui/phui-basic-nav-view.css' => '98c11ab3',
@@ -148,7 +148,7 @@
     'rsrc/css/phui/phui-comment-form.css' => 'ac68149f',
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
     'rsrc/css/phui/phui-crumbs-view.css' => '6ece3bbb',
-    'rsrc/css/phui/phui-curtain-view.css' => 'ca363f15',
+    'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026',
     'rsrc/css/phui/phui-document-pro.css' => '8af7ea27',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
     'rsrc/css/phui/phui-document.css' => 'c32e8dec',
@@ -177,7 +177,7 @@
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
     'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
     'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca',
-    'rsrc/css/phui/phui-two-column-view.css' => '1ade9c5f',
+    'rsrc/css/phui/phui-two-column-view.css' => '44ec4951',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
     'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
@@ -765,11 +765,11 @@
     'path-typeahead' => 'f7fc67ec',
     'people-picture-menu-item-css' => 'a06f7f34',
     'people-profile-css' => '4df76faf',
-    'phabricator-action-list-view-css' => 'e7eba156',
+    'phabricator-action-list-view-css' => 'f7f61a34',
     'phabricator-busy' => '59a7976a',
     'phabricator-chatlog-css' => 'd295b020',
     'phabricator-content-source-view-css' => '4b8b05d4',
-    'phabricator-core-css' => '1760853c',
+    'phabricator-core-css' => '62fa3ace',
     'phabricator-countdown-css' => '16c52f5c',
     'phabricator-darklog' => 'c8e1ffe3',
     'phabricator-darkmessage' => 'c48cccdd',
@@ -833,7 +833,7 @@
     'phui-comment-form-css' => 'ac68149f',
     'phui-comment-panel-css' => 'f50152ad',
     'phui-crumbs-view-css' => '6ece3bbb',
-    'phui-curtain-view-css' => 'ca363f15',
+    'phui-curtain-view-css' => '2bdaf026',
     'phui-document-summary-view-css' => '9ca48bdf',
     'phui-document-view-css' => 'c32e8dec',
     'phui-document-view-pro-css' => '8af7ea27',
@@ -872,7 +872,7 @@
     'phui-tag-view-css' => 'b4719c50',
     'phui-theme-css' => '9f261c6b',
     'phui-timeline-view-css' => 'f21db7ca',
-    'phui-two-column-view-css' => '1ade9c5f',
+    'phui-two-column-view-css' => '44ec4951',
     'phui-workboard-color-css' => '783cdff5',
     'phui-workboard-view-css' => '3bc85455',
     'phui-workcard-view-css' => 'cca5fa92',
diff --git a/webroot/rsrc/css/core/core.css b/webroot/rsrc/css/core/core.css
index 9d471477ed..cc14d7ab5a 100644
--- a/webroot/rsrc/css/core/core.css
+++ b/webroot/rsrc/css/core/core.css
@@ -61,6 +61,11 @@ body {
   overflow-y: scroll;
 }
 
+body.printable,
+!print body {
+  background: none;
+}
+
 textarea {
   font: inherit;
 }
diff --git a/webroot/rsrc/css/phui/phui-action-list.css b/webroot/rsrc/css/phui/phui-action-list.css
index a7ad662d33..5e32a1ea0a 100644
--- a/webroot/rsrc/css/phui/phui-action-list.css
+++ b/webroot/rsrc/css/phui/phui-action-list.css
@@ -7,6 +7,11 @@
   display: none;
 }
 
+!print .phabricator-action-list-view {
+  padding: 4px 0;
+  display: none;
+}
+
 .device .phuix-dropdown-menu .phabricator-action-list-view {
   /* When an action list view appears inside a dropdown menu, don't hide it
      by default. */
diff --git a/webroot/rsrc/css/phui/phui-curtain-view.css b/webroot/rsrc/css/phui/phui-curtain-view.css
index 8bd8a331c4..3facf0fe37 100644
--- a/webroot/rsrc/css/phui/phui-curtain-view.css
+++ b/webroot/rsrc/css/phui/phui-curtain-view.css
@@ -21,6 +21,26 @@
   border-top: 1px solid {$greybackground};
 }
 
+!print .phui-curtain-panel + .phui-curtain-panel {
+  padding: 8px 0;
+  border-top: none;
+}
+
+!print .device-desktop .phabricator-action-list-view + .phui-curtain-panel {
+  padding: 8px 0;
+  border-top: none;
+}
+
+!print .device-desktop .phui-curtain-panel + .phui-curtain-panel {
+  padding: 8px 0;
+  border-top: none;
+}
+
+!print .phabricator-action-list-view + .phui-curtain-panel {
+  padding: 8px 0;
+  border-top: none;
+}
+
 .phui-curtain-panel-header {
   padding: 0 0 4px;
   color: {$bluetext};
@@ -37,6 +57,10 @@
   padding: 0;
 }
 
+!print .phui-curtain-panel-body {
+  padding: 0;
+}
+
 /* Project tags */
 
 .phui-curtain-panel-body .phabricator-handle-tag-list-item {
@@ -50,3 +74,7 @@
 .device .curtain-no-panels {
   display: none;
 }
+
+!print .curtain-no-panels {
+  display: none;
+}
diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css
index 2fb0eccee2..f9f86d950a 100644
--- a/webroot/rsrc/css/phui/phui-two-column-view.css
+++ b/webroot/rsrc/css/phui/phui-two-column-view.css
@@ -79,6 +79,30 @@
   width: 300px;
 }
 
+!print .phui-two-column-view .phui-main-column {
+  float: unset;
+  width: unset;
+  margin-bottom: 20px;
+}
+
+!print .phui-two-column-view .phui-side-column {
+  float: unset;
+  width: unset;
+  margin-bottom: 20px;
+}
+
+!print .device-desktop .phui-two-column-view .phui-main-column {
+  float: unset;
+  width: unset;
+  margin-bottom: 20px;
+}
+
+!print .device-desktop .phui-two-column-view .phui-side-column {
+  float: unset;
+  width: unset;
+  margin-bottom: 20px;
+}
+
 .device-desktop .phui-two-column-view.phui-side-column-left .phui-main-column {
   float: right;
   width: calc(100% - 280px);
@@ -307,3 +331,7 @@
   .phui-mobile-menu {
     display: block;
 }
+
+!print .phabricator-side-menu {
+  display: none !important;
+}

From a1d9a2389db4a8c54d90560695993f4e38398593 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 25 Sep 2017 19:11:35 -0700
Subject: [PATCH 190/865] Improve Ferret engine indexing performance for large
 blocks of text

Summary:
See PHI87. Ref T12974. Currently, we do a lot more work here than we need to: we call `phutil_utf8_strtolower()` on each token, but can do it once at the beginning on the whole block.

Additionally, since ngrams don't care about order, we only need to convert unique tokens into ngrams. This saves us some `phutil_utf8v()`. These calls can be slow for large inputs.

Test Plan:
  - Created a ~4MB task description.
  - Ran `bin/search index Txxx --profile ...` to profile indexing performance before and after the change.
  - Saw total runtime drop form 38s to 9s.
  - Before: <https://secure.phabricator.com/xhprof/profile/PHID-FILE-wiht5d7lkyazaywwxovw/>
  - After: <https://secure.phabricator.com/xhprof/profile/PHID-FILE-efxv56q2hulr6kjrxbx6/>

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12974

Differential Revision: https://secure.phabricator.com/D18647
---
 .../search/ferret/PhabricatorFerretEngine.php       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index 3c8098c54f..7d1d03a8b1 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -88,16 +88,23 @@ public function getSubstringNgramsFromString($string) {
   }
 
   private function getNgramsFromString($value, $as_term) {
+    $value = phutil_utf8_strtolower($value);
     $tokens = $this->tokenizeString($value);
 
-    $ngrams = array();
+    // First, extract unique tokens from the string. This reduces the number
+    // of `phutil_utf8v()` calls we need to make if we are indexing a large
+    // corpus with redundant terms.
+    $unique_tokens = array();
     foreach ($tokens as $token) {
-      $token = phutil_utf8_strtolower($token);
-
       if ($as_term) {
         $token = ' '.$token.' ';
       }
 
+      $unique_tokens[$token] = true;
+    }
+
+    $ngrams = array();
+    foreach ($unique_tokens as $token => $ignored) {
       $token_v = phutil_utf8v($token);
       $len = (count($token_v) - 2);
       for ($ii = 0; $ii < $len; $ii++) {

From 9288cad0edc83bb319a2565a597699a6faa0c714 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 25 Sep 2017 19:11:35 -0700
Subject: [PATCH 191/865] (stable) Improve Ferret engine indexing performance
 for large blocks of text

Summary:
See PHI87. Ref T12974. Currently, we do a lot more work here than we need to: we call `phutil_utf8_strtolower()` on each token, but can do it once at the beginning on the whole block.

Additionally, since ngrams don't care about order, we only need to convert unique tokens into ngrams. This saves us some `phutil_utf8v()`. These calls can be slow for large inputs.

Test Plan:
  - Created a ~4MB task description.
  - Ran `bin/search index Txxx --profile ...` to profile indexing performance before and after the change.
  - Saw total runtime drop form 38s to 9s.
  - Before: <https://secure.phabricator.com/xhprof/profile/PHID-FILE-wiht5d7lkyazaywwxovw/>
  - After: <https://secure.phabricator.com/xhprof/profile/PHID-FILE-efxv56q2hulr6kjrxbx6/>

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12974

Differential Revision: https://secure.phabricator.com/D18647
---
 .../search/ferret/PhabricatorFerretEngine.php       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index 3c8098c54f..7d1d03a8b1 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -88,16 +88,23 @@ public function getSubstringNgramsFromString($string) {
   }
 
   private function getNgramsFromString($value, $as_term) {
+    $value = phutil_utf8_strtolower($value);
     $tokens = $this->tokenizeString($value);
 
-    $ngrams = array();
+    // First, extract unique tokens from the string. This reduces the number
+    // of `phutil_utf8v()` calls we need to make if we are indexing a large
+    // corpus with redundant terms.
+    $unique_tokens = array();
     foreach ($tokens as $token) {
-      $token = phutil_utf8_strtolower($token);
-
       if ($as_term) {
         $token = ' '.$token.' ';
       }
 
+      $unique_tokens[$token] = true;
+    }
+
+    $ngrams = array();
+    foreach ($unique_tokens as $token => $ignored) {
       $token_v = phutil_utf8v($token);
       $len = (count($token_v) - 2);
       for ($ii = 0; $ii < $len; $ii++) {

From 086a125ad5ee5d3de3d5b6bc718975387a2b211b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 26 Sep 2017 09:16:42 -0700
Subject: [PATCH 192/865] Improve performance of Ferret engine ngram
 extraction, particularly for large input strings

Summary:
See PHI87. Ref T12974. The `array_slice()` method of splitting the string apart can perform poorly for large input strings. I think this is mostly just the large number of calls plus building and returning an array being not entirely trivial.

We can just use `substr()` instead, as long as we're a little bit careful about keeping track of where we're slicing the string if it has UTF8 characters.

Test Plan:
  - Created a task with a single, unbroken blob of base64 encoded data as the description, roughly 100KB long.
  - Saw indexing performance improve from ~6s to ~1.5s after patch.
  - Before: https://secure.phabricator.com/xhprof/profile/PHID-FILE-nrxs4lwdvupbve5lhl6u/
  - After: https://secure.phabricator.com/xhprof/profile/PHID-FILE-6vs2akgjj5nbqt7yo7ul/

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12974

Differential Revision: https://secure.phabricator.com/D18649
---
 .../search/ferret/PhabricatorFerretEngine.php | 22 +++++++++++---
 .../PhabricatorFerretEngineTestCase.php       | 30 +++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index 7d1d03a8b1..7cd06ae549 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -106,11 +106,25 @@ private function getNgramsFromString($value, $as_term) {
     $ngrams = array();
     foreach ($unique_tokens as $token => $ignored) {
       $token_v = phutil_utf8v($token);
-      $len = (count($token_v) - 2);
-      for ($ii = 0; $ii < $len; $ii++) {
-        $ngram = array_slice($token_v, $ii, 3);
-        $ngram = implode('', $ngram);
+      $length = count($token_v);
+
+      // NOTE: We're being somewhat clever here to micro-optimize performance,
+      // especially for very long strings. See PHI87.
+
+      $token_l = array();
+      for ($ii = 0; $ii < $length; $ii++) {
+        $token_l[$ii] = strlen($token_v[$ii]);
+      }
+
+      $ngram_count = $length - 2;
+      $cursor = 0;
+      for ($ii = 0; $ii < $ngram_count; $ii++) {
+        $ngram_l = $token_l[$ii] + $token_l[$ii + 1] + $token_l[$ii + 2];
+
+        $ngram = substr($token, $cursor, $ngram_l);
         $ngrams[$ngram] = $ngram;
+
+        $cursor += $token_l[$ii];
       }
     }
 
diff --git a/src/applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php b/src/applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php
index a8690f1d8b..ea65a559ff 100644
--- a/src/applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php
+++ b/src/applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php
@@ -24,4 +24,34 @@ public function testTermsCorpus() {
     }
   }
 
+  public function testTermNgramExtraction() {
+    $snowman = "\xE2\x98\x83";
+
+    $map = array(
+      'a' => array(' a '),
+      'ab' => array(' ab', 'ab '),
+      'abcdef' => array(' ab', 'abc', 'bcd', 'cde', 'def', 'ef '),
+      "{$snowman}" => array(" {$snowman} "),
+      "x{$snowman}y" => array(
+        " x{$snowman}",
+        "x{$snowman}y",
+        "{$snowman}y ",
+      ),
+      "{$snowman}{$snowman}" => array(
+        " {$snowman}{$snowman}",
+        "{$snowman}{$snowman} ",
+      ),
+    );
+
+    $engine = new ManiphestTaskFerretEngine();
+
+    foreach ($map as $input => $expect) {
+      $actual = $engine->getTermNgramsFromString($input);
+      $this->assertEqual(
+        $actual,
+        $expect,
+        pht('Term ngrams for: %s.', $input));
+    }
+  }
+
 }

From c034306320b55eca68dcdd94a1065b7e34db5689 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 26 Sep 2017 09:16:42 -0700
Subject: [PATCH 193/865] (stable) Improve performance of Ferret engine ngram
 extraction, particularly for large input strings

Summary:
See PHI87. Ref T12974. The `array_slice()` method of splitting the string apart can perform poorly for large input strings. I think this is mostly just the large number of calls plus building and returning an array being not entirely trivial.

We can just use `substr()` instead, as long as we're a little bit careful about keeping track of where we're slicing the string if it has UTF8 characters.

Test Plan:
  - Created a task with a single, unbroken blob of base64 encoded data as the description, roughly 100KB long.
  - Saw indexing performance improve from ~6s to ~1.5s after patch.
  - Before: https://secure.phabricator.com/xhprof/profile/PHID-FILE-nrxs4lwdvupbve5lhl6u/
  - After: https://secure.phabricator.com/xhprof/profile/PHID-FILE-6vs2akgjj5nbqt7yo7ul/

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12974

Differential Revision: https://secure.phabricator.com/D18649
---
 .../search/ferret/PhabricatorFerretEngine.php | 22 +++++++++++---
 .../PhabricatorFerretEngineTestCase.php       | 30 +++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index 7d1d03a8b1..7cd06ae549 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -106,11 +106,25 @@ private function getNgramsFromString($value, $as_term) {
     $ngrams = array();
     foreach ($unique_tokens as $token => $ignored) {
       $token_v = phutil_utf8v($token);
-      $len = (count($token_v) - 2);
-      for ($ii = 0; $ii < $len; $ii++) {
-        $ngram = array_slice($token_v, $ii, 3);
-        $ngram = implode('', $ngram);
+      $length = count($token_v);
+
+      // NOTE: We're being somewhat clever here to micro-optimize performance,
+      // especially for very long strings. See PHI87.
+
+      $token_l = array();
+      for ($ii = 0; $ii < $length; $ii++) {
+        $token_l[$ii] = strlen($token_v[$ii]);
+      }
+
+      $ngram_count = $length - 2;
+      $cursor = 0;
+      for ($ii = 0; $ii < $ngram_count; $ii++) {
+        $ngram_l = $token_l[$ii] + $token_l[$ii + 1] + $token_l[$ii + 2];
+
+        $ngram = substr($token, $cursor, $ngram_l);
         $ngrams[$ngram] = $ngram;
+
+        $cursor += $token_l[$ii];
       }
     }
 
diff --git a/src/applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php b/src/applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php
index a8690f1d8b..ea65a559ff 100644
--- a/src/applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php
+++ b/src/applications/search/ferret/__tests__/PhabricatorFerretEngineTestCase.php
@@ -24,4 +24,34 @@ public function testTermsCorpus() {
     }
   }
 
+  public function testTermNgramExtraction() {
+    $snowman = "\xE2\x98\x83";
+
+    $map = array(
+      'a' => array(' a '),
+      'ab' => array(' ab', 'ab '),
+      'abcdef' => array(' ab', 'abc', 'bcd', 'cde', 'def', 'ef '),
+      "{$snowman}" => array(" {$snowman} "),
+      "x{$snowman}y" => array(
+        " x{$snowman}",
+        "x{$snowman}y",
+        "{$snowman}y ",
+      ),
+      "{$snowman}{$snowman}" => array(
+        " {$snowman}{$snowman}",
+        "{$snowman}{$snowman} ",
+      ),
+    );
+
+    $engine = new ManiphestTaskFerretEngine();
+
+    foreach ($map as $input => $expect) {
+      $actual = $engine->getTermNgramsFromString($input);
+      $this->assertEqual(
+        $actual,
+        $expect,
+        pht('Term ngrams for: %s.', $input));
+    }
+  }
+
 }

From 9875af739fb5d522817c849e20a9f13fec3b798e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 28 Sep 2017 11:37:10 -0700
Subject: [PATCH 194/865] When we purge the request cache, also force PHP to
 collect cycles

Summary:
Ref T12997. See that task for more details. Briefly, an unusual dataset (where commits are mentioned hundreds of times by other commits) is causing some weird memory behavior in the daemons.

Forcing PHP to GC cycles explicitly after each task completes seems to help with this, by cleaning up some of the memory between tasks. A more thorough fix might be to untangle the `$xactions` structure, but that's significantly more involved.

Test Plan:
  - Did this locally in a controlled environment, saw an immediate collection of a 500MB `$xactions` cycle.
  - Put a similar change in production, memory usage seemed less to improve. It's hard to tell for sure that this does anything, but it shouldn't hurt.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12997

Differential Revision: https://secure.phabricator.com/D18657
---
 src/applications/cache/PhabricatorCaches.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/cache/PhabricatorCaches.php b/src/applications/cache/PhabricatorCaches.php
index 1314aa4ccc..9c22bde672 100644
--- a/src/applications/cache/PhabricatorCaches.php
+++ b/src/applications/cache/PhabricatorCaches.php
@@ -51,6 +51,12 @@ public static function getRequestCache() {
    */
   public static function destroyRequestCache() {
     self::$requestCache = null;
+
+    // See T12997. Force the GC to run when the request cache is destroyed to
+    // clean up any cycles which may still be hanging around.
+    if (function_exists('gc_collect_cycles')) {
+      gc_collect_cycles();
+    }
   }
 
 

From 0d2065e76c0eefaaaa184e7702d380c35ec0c115 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 28 Sep 2017 11:37:10 -0700
Subject: [PATCH 195/865] (stable) When we purge the request cache, also force
 PHP to collect cycles

Summary:
Ref T12997. See that task for more details. Briefly, an unusual dataset (where commits are mentioned hundreds of times by other commits) is causing some weird memory behavior in the daemons.

Forcing PHP to GC cycles explicitly after each task completes seems to help with this, by cleaning up some of the memory between tasks. A more thorough fix might be to untangle the `$xactions` structure, but that's significantly more involved.

Test Plan:
  - Did this locally in a controlled environment, saw an immediate collection of a 500MB `$xactions` cycle.
  - Put a similar change in production, memory usage seemed less to improve. It's hard to tell for sure that this does anything, but it shouldn't hurt.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12997

Differential Revision: https://secure.phabricator.com/D18657
---
 src/applications/cache/PhabricatorCaches.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/cache/PhabricatorCaches.php b/src/applications/cache/PhabricatorCaches.php
index 1314aa4ccc..9c22bde672 100644
--- a/src/applications/cache/PhabricatorCaches.php
+++ b/src/applications/cache/PhabricatorCaches.php
@@ -51,6 +51,12 @@ public static function getRequestCache() {
    */
   public static function destroyRequestCache() {
     self::$requestCache = null;
+
+    // See T12997. Force the GC to run when the request cache is destroyed to
+    // clean up any cycles which may still be hanging around.
+    if (function_exists('gc_collect_cycles')) {
+      gc_collect_cycles();
+    }
   }
 
 

From b75a4151c8996c5dfb1c8c14378fe3259666eac2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 28 Sep 2017 12:48:19 -0700
Subject: [PATCH 196/865] Allow the fulltext index to select only transactions
 with comments

Summary:
Ref T12997. Although we can't query by transaction type (since we can't easily enumerate all possible types which may have comments -- inline types may also have comments), we //can// just check if there's a comment row or not.

This reduces the amount of garbage we need to load to rebuild indexes for unusual objects with hundreds and hundreds of mentions.

Test Plan:
  - Used batch editor to mention a task 700 times.
  - Indexed it before and after this change, saw index time drop from {nav 1600ms > 160ms}.
  - Made some new comments on it, verified that they still indexed/queried properly.
  - Browsed around, made normal transactions, made inline comments.
  - Added a unique word to an inline comment, indexed revision, searched for word, found revision.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12997

Differential Revision: https://secure.phabricator.com/D18660
---
 ...torTransactionsFulltextEngineExtension.php |  1 +
 ...PhabricatorApplicationTransactionQuery.php | 93 ++++++++++++-------
 2 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
index 701ad34ca7..c9f43f49b2 100644
--- a/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
@@ -25,6 +25,7 @@ public function enrichFulltextObject(
     $xactions = $query
       ->setViewer($this->getViewer())
       ->withObjectPHIDs(array($object->getPHID()))
+      ->withComments(true)
       ->needComments(true)
       ->execute();
 
diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
index da8454c7fc..abe1498fc0 100644
--- a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
+++ b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
@@ -7,6 +7,7 @@ abstract class PhabricatorApplicationTransactionQuery
   private $objectPHIDs;
   private $authorPHIDs;
   private $transactionTypes;
+  private $withComments;
 
   private $needComments = true;
   private $needHandles  = true;
@@ -34,10 +35,6 @@ final public static function newQueryForObject(
 
   abstract public function getTemplateApplicationTransaction();
 
-  protected function buildMoreWhereClauses(AphrontDatabaseConnection $conn_r) {
-    return array();
-  }
-
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
@@ -58,6 +55,11 @@ public function withTransactionTypes(array $transaction_types) {
     return $this;
   }
 
+  public function withComments($with_comments) {
+    $this->withComments = $with_comments;
+    return $this;
+  }
+
   public function needComments($need) {
     $this->needComments = $need;
     return $this;
@@ -70,17 +72,8 @@ public function needHandles($need) {
 
   protected function loadPage() {
     $table = $this->getTemplateApplicationTransaction();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T x %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
 
-    $xactions = $table->loadAllFromArray($data);
+    $xactions = $this->loadStandardPage($table);
 
     foreach ($xactions as $xaction) {
       $xaction->attachViewer($this->getViewer());
@@ -161,50 +154,86 @@ protected function willFilterPage(array $xactions) {
     return $xactions;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
-    if ($this->phids) {
+    if ($this->phids !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'phid IN (%Ls)',
+        $conn,
+        'x.phid IN (%Ls)',
         $this->phids);
     }
 
-    if ($this->objectPHIDs) {
+    if ($this->objectPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'objectPHID IN (%Ls)',
+        $conn,
+        'x.objectPHID IN (%Ls)',
         $this->objectPHIDs);
     }
 
-    if ($this->authorPHIDs) {
+    if ($this->authorPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'authorPHID IN (%Ls)',
+        $conn,
+        'x.authorPHID IN (%Ls)',
         $this->authorPHIDs);
     }
 
-    if ($this->transactionTypes) {
+    if ($this->transactionTypes !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'transactionType IN (%Ls)',
+        $conn,
+        'x.transactionType IN (%Ls)',
         $this->transactionTypes);
     }
 
-    foreach ($this->buildMoreWhereClauses($conn_r) as $clause) {
-      $where[] = $clause;
+    if ($this->withComments !== null) {
+      if (!$this->withComments) {
+        $where[] = qsprintf(
+          $conn,
+          'c.id IS NULL');
+      }
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
+    return $where;
+  }
+
+  protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
+    $joins = parent::buildJoinClauseParts($conn);
+
+    if ($this->withComments !== null) {
+      $xaction = $this->getTemplateApplicationTransaction();
+      $comment = $xaction->getApplicationTransactionCommentObject();
+
+      if ($this->withComments) {
+        $joins[] = qsprintf(
+          $conn,
+          'JOIN %T c ON x.phid = c.transactionPHID',
+          $comment->getTableName());
+      } else {
+        $joins[] = qsprintf(
+          $conn,
+          'LEFT JOIN %T c ON x.phid = c.transactionPHID',
+          $comment->getTableName());
+      }
+    }
 
-    return $this->formatWhereClause($where);
+    return $joins;
   }
 
+  protected function shouldGroupQueryResultRows() {
+    if ($this->withComments !== null) {
+      return true;
+    }
+
+    return parent::shouldGroupQueryResultRows();
+  }
 
   public function getQueryApplicationClass() {
     // TODO: Sort this out?
     return null;
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'x';
+  }
+
 }

From 5e276df9c00e818bc4fe605dadb245e49b03cd1a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 28 Sep 2017 12:48:19 -0700
Subject: [PATCH 197/865] (stable) Allow the fulltext index to select only
 transactions with comments

Summary:
Ref T12997. Although we can't query by transaction type (since we can't easily enumerate all possible types which may have comments -- inline types may also have comments), we //can// just check if there's a comment row or not.

This reduces the amount of garbage we need to load to rebuild indexes for unusual objects with hundreds and hundreds of mentions.

Test Plan:
  - Used batch editor to mention a task 700 times.
  - Indexed it before and after this change, saw index time drop from {nav 1600ms > 160ms}.
  - Made some new comments on it, verified that they still indexed/queried properly.
  - Browsed around, made normal transactions, made inline comments.
  - Added a unique word to an inline comment, indexed revision, searched for word, found revision.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12997

Differential Revision: https://secure.phabricator.com/D18660
---
 ...torTransactionsFulltextEngineExtension.php |  1 +
 ...PhabricatorApplicationTransactionQuery.php | 93 ++++++++++++-------
 2 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
index 701ad34ca7..c9f43f49b2 100644
--- a/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
@@ -25,6 +25,7 @@ public function enrichFulltextObject(
     $xactions = $query
       ->setViewer($this->getViewer())
       ->withObjectPHIDs(array($object->getPHID()))
+      ->withComments(true)
       ->needComments(true)
       ->execute();
 
diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
index da8454c7fc..abe1498fc0 100644
--- a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
+++ b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
@@ -7,6 +7,7 @@ abstract class PhabricatorApplicationTransactionQuery
   private $objectPHIDs;
   private $authorPHIDs;
   private $transactionTypes;
+  private $withComments;
 
   private $needComments = true;
   private $needHandles  = true;
@@ -34,10 +35,6 @@ final public static function newQueryForObject(
 
   abstract public function getTemplateApplicationTransaction();
 
-  protected function buildMoreWhereClauses(AphrontDatabaseConnection $conn_r) {
-    return array();
-  }
-
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
@@ -58,6 +55,11 @@ public function withTransactionTypes(array $transaction_types) {
     return $this;
   }
 
+  public function withComments($with_comments) {
+    $this->withComments = $with_comments;
+    return $this;
+  }
+
   public function needComments($need) {
     $this->needComments = $need;
     return $this;
@@ -70,17 +72,8 @@ public function needHandles($need) {
 
   protected function loadPage() {
     $table = $this->getTemplateApplicationTransaction();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T x %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
 
-    $xactions = $table->loadAllFromArray($data);
+    $xactions = $this->loadStandardPage($table);
 
     foreach ($xactions as $xaction) {
       $xaction->attachViewer($this->getViewer());
@@ -161,50 +154,86 @@ protected function willFilterPage(array $xactions) {
     return $xactions;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
-    if ($this->phids) {
+    if ($this->phids !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'phid IN (%Ls)',
+        $conn,
+        'x.phid IN (%Ls)',
         $this->phids);
     }
 
-    if ($this->objectPHIDs) {
+    if ($this->objectPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'objectPHID IN (%Ls)',
+        $conn,
+        'x.objectPHID IN (%Ls)',
         $this->objectPHIDs);
     }
 
-    if ($this->authorPHIDs) {
+    if ($this->authorPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'authorPHID IN (%Ls)',
+        $conn,
+        'x.authorPHID IN (%Ls)',
         $this->authorPHIDs);
     }
 
-    if ($this->transactionTypes) {
+    if ($this->transactionTypes !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'transactionType IN (%Ls)',
+        $conn,
+        'x.transactionType IN (%Ls)',
         $this->transactionTypes);
     }
 
-    foreach ($this->buildMoreWhereClauses($conn_r) as $clause) {
-      $where[] = $clause;
+    if ($this->withComments !== null) {
+      if (!$this->withComments) {
+        $where[] = qsprintf(
+          $conn,
+          'c.id IS NULL');
+      }
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
+    return $where;
+  }
+
+  protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
+    $joins = parent::buildJoinClauseParts($conn);
+
+    if ($this->withComments !== null) {
+      $xaction = $this->getTemplateApplicationTransaction();
+      $comment = $xaction->getApplicationTransactionCommentObject();
+
+      if ($this->withComments) {
+        $joins[] = qsprintf(
+          $conn,
+          'JOIN %T c ON x.phid = c.transactionPHID',
+          $comment->getTableName());
+      } else {
+        $joins[] = qsprintf(
+          $conn,
+          'LEFT JOIN %T c ON x.phid = c.transactionPHID',
+          $comment->getTableName());
+      }
+    }
 
-    return $this->formatWhereClause($where);
+    return $joins;
   }
 
+  protected function shouldGroupQueryResultRows() {
+    if ($this->withComments !== null) {
+      return true;
+    }
+
+    return parent::shouldGroupQueryResultRows();
+  }
 
   public function getQueryApplicationClass() {
     // TODO: Sort this out?
     return null;
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'x';
+  }
+
 }

From a3a6c4ed2edfa835c1e071f8a433380f2dfe0941 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 29 Sep 2017 09:01:12 -0700
Subject: [PATCH 198/865] Fix fatal when searching for "r matey prepare to be
 boarded"

Summary:
See <https://discourse.phabricator-community.org/t/unrecoverable-fatal-error-on-repository-search-in-top-search-bar/503/2>.

The Ferret engine replaced `withNameContains()`, but I missed this obscure callsite.

Test Plan:
  - Searched for `r matey prepare to be boarded`.
  - Before: fatal.
  - After: no fatal.
  - Also searched for `r <actual repository name>`, got repository.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18661
---
 .../engine/PhabricatorJumpNavHandler.php      | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/applications/search/engine/PhabricatorJumpNavHandler.php b/src/applications/search/engine/PhabricatorJumpNavHandler.php
index 6f6ea3d0a9..ddade36d84 100644
--- a/src/applications/search/engine/PhabricatorJumpNavHandler.php
+++ b/src/applications/search/engine/PhabricatorJumpNavHandler.php
@@ -50,17 +50,35 @@ public static function getJumpResponse(PhabricatorUser $viewer, $jump) {
               return id(new AphrontRedirectResponse())
                 ->setURI("/diffusion/symbol/$symbol/?jump=true$context");
             case 'find-repository':
-              $name = $matches[1];
+              $raw_query = $matches[1];
+
+              $engine = id(new PhabricatorRepository())
+                ->newFerretEngine();
+
+              $compiler = id(new PhutilSearchQueryCompiler())
+                ->setEnableFunctions(true);
+
+              $raw_tokens = $compiler->newTokens($raw_query);
+
+              $fulltext_tokens = array();
+              foreach ($raw_tokens as $raw_token) {
+                $fulltext_token = id(new PhabricatorFulltextToken())
+                  ->setToken($raw_token);
+                $fulltext_tokens[] = $fulltext_token;
+              }
+
               $repositories = id(new PhabricatorRepositoryQuery())
                 ->setViewer($viewer)
-                ->withNameContains($name)
+                ->withFerretConstraint($engine, $fulltext_tokens)
                 ->execute();
               if (count($repositories) == 1) {
                 // Just one match, jump to repository.
                 $uri = head($repositories)->getURI();
               } else {
                 // More than one match, jump to search.
-                $uri = urisprintf('/diffusion/?order=name&name=%s', $name);
+                $uri = urisprintf(
+                  '/diffusion/?order=name&query=%s',
+                  $raw_query);
               }
               return id(new AphrontRedirectResponse())->setURI($uri);
             default:

From a39f5e11139ae5631eb990fd2d5ed528724ae00e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 29 Sep 2017 14:48:38 -0700
Subject: [PATCH 199/865] Correct bad context path when doing pattern search
 inside a repository

Summary:
Ref PHI101. It looks like this was maybe copy/pasted by mistake in recent design refactoring.

We need to pass the full path, not the `basename()` of the path, to the search form.

Test Plan: Searched inside `scripts/test/`, found results inside `scripts/test/`.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18664
---
 .../diffusion/controller/DiffusionBrowseController.php         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index d3223e64fd..b4c0352d53 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1557,7 +1557,8 @@ protected function buildHeaderView(DiffusionRequest $drequest) {
 
     $commit_tag = $this->renderCommitHashTag($drequest);
 
-    $path = nonempty(basename($drequest->getPath()), '/');
+    $path = nonempty($drequest->getPath(), '/');
+
     $search = $this->renderSearchForm($path);
 
     $header = id(new PHUIHeaderView())

From fe646ec328289afd6c52ef38659b92cc8d6bd211 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 29 Sep 2017 13:25:55 -0700
Subject: [PATCH 200/865] Mark Owners package reviewers which own nothing in
 the current diff

Summary:
Ref PHI91. When Owners (or Herald, or manual user action) adds package reviewers to a revision, later updates to the revision make some of them less relevant or irrelevant.

Provide a hint when a package reviewer doesn't own any of the paths that a diff changes. Humans can then decide if the reviewer is obsolete/irrelevant or not.

This is a rough cut to get the feature working, design could probably use some tweaking if it sticks.

Test Plan: {F5204309}

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: jboning

Differential Revision: https://secure.phabricator.com/D18663
---
 .../controller/DifferentialController.php     | 130 ++++++++++++------
 .../DifferentialDiffViewController.php        |   2 +
 .../DifferentialRevisionViewController.php    |  10 ++
 .../storage/DifferentialReviewer.php          |  10 ++
 .../view/DifferentialReviewersView.php        |   6 +
 5 files changed, 118 insertions(+), 40 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialController.php b/src/applications/differential/controller/DifferentialController.php
index 2258c4fdcb..fb8a6249a7 100644
--- a/src/applications/differential/controller/DifferentialController.php
+++ b/src/applications/differential/controller/DifferentialController.php
@@ -2,6 +2,10 @@
 
 abstract class DifferentialController extends PhabricatorController {
 
+  private $packageChangesetMap;
+  private $pathPackageMap;
+  private $authorityPackages;
+
   public function buildSideNavView($for_app = false) {
     $viewer = $this->getRequest()->getUser();
 
@@ -21,48 +25,98 @@ public function buildApplicationMenu() {
     return $this->buildSideNavView(true)->getMenu();
   }
 
-  protected function buildTableOfContents(
-    array $changesets,
-    array $visible_changesets,
-    array $coverage) {
-    $viewer = $this->getViewer();
+  protected function buildPackageMaps(array $changesets) {
+    assert_instances_of($changesets, 'DifferentialChangeset');
 
-    $toc_view = id(new PHUIDiffTableOfContentsListView())
-      ->setViewer($viewer)
-      ->setBare(true);
+    $this->packageChangesetMap = array();
+    $this->pathPackageMap = array();
+    $this->authorityPackages = array();
+
+    if (!$changesets) {
+      return;
+    }
+
+    $viewer = $this->getViewer();
 
     $have_owners = PhabricatorApplication::isClassInstalledForViewer(
       'PhabricatorOwnersApplication',
       $viewer);
-    if ($have_owners) {
-      $repository_phid = null;
-      if ($changesets) {
-        $changeset = head($changesets);
-        $diff = $changeset->getDiff();
-        $repository_phid = $diff->getRepositoryPHID();
-      }
+    if (!$have_owners) {
+      return;
+    }
 
-      if (!$repository_phid) {
-        $have_owners = false;
-      } else {
-        if ($viewer->getPHID()) {
-          $packages = id(new PhabricatorOwnersPackageQuery())
-            ->setViewer($viewer)
-            ->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
-            ->withAuthorityPHIDs(array($viewer->getPHID()))
-            ->execute();
-          $toc_view->setAuthorityPackages($packages);
-        }
-
-        $paths = mpull($changesets, 'getOwnersFilename');
-
-        $control_query = id(new PhabricatorOwnersPackageQuery())
-          ->setViewer($viewer)
-          ->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
-          ->withControl($repository_phid, $paths);
-        $control_query->execute();
+    $changeset = head($changesets);
+    $diff = $changeset->getDiff();
+    $repository_phid = $diff->getRepositoryPHID();
+    if (!$repository_phid) {
+      return;
+    }
+
+    if ($viewer->getPHID()) {
+      $packages = id(new PhabricatorOwnersPackageQuery())
+        ->setViewer($viewer)
+        ->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
+        ->withAuthorityPHIDs(array($viewer->getPHID()))
+        ->execute();
+      $this->authorityPackages = $packages;
+    }
+
+    $paths = mpull($changesets, 'getOwnersFilename');
+
+    $control_query = id(new PhabricatorOwnersPackageQuery())
+      ->setViewer($viewer)
+      ->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
+      ->withControl($repository_phid, $paths);
+    $control_query->execute();
+
+    foreach ($changesets as $changeset) {
+      $changeset_path = $changeset->getOwnersFilename();
+
+      $packages = $control_query->getControllingPackagesForPath(
+        $repository_phid,
+        $changeset_path);
+
+      $this->pathPackageMap[$changeset_path] = $packages;
+      foreach ($packages as $package) {
+        $this->packageChangesetMap[$package->getPHID()][] = $changeset;
       }
     }
+  }
+
+  protected function getAuthorityPackages() {
+    if ($this->authorityPackages === null) {
+      throw new PhutilInvalidStateException('buildPackageMaps');
+    }
+    return $this->authorityPackages;
+  }
+
+  protected function getChangesetPackages(DifferentialChangeset $changeset) {
+    if ($this->pathPackageMap === null) {
+      throw new PhutilInvalidStateException('buildPackageMaps');
+    }
+
+    $path = $changeset->getOwnersFilename();
+    return idx($this->pathPackageMap, $path, array());
+  }
+
+  protected function getPackageChangesets($package_phid) {
+    if ($this->packageChangesetMap === null) {
+      throw new PhutilInvalidStateException('buildPackageMaps');
+    }
+
+    return idx($this->packageChangesetMap, $package_phid, array());
+  }
+
+  protected function buildTableOfContents(
+    array $changesets,
+    array $visible_changesets,
+    array $coverage) {
+    $viewer = $this->getViewer();
+
+    $toc_view = id(new PHUIDiffTableOfContentsListView())
+      ->setViewer($viewer)
+      ->setBare(true)
+      ->setAuthorityPackages($this->getAuthorityPackages());
 
     foreach ($changesets as $changeset_id => $changeset) {
       $is_visible = isset($visible_changesets[$changeset_id]);
@@ -78,12 +132,8 @@ protected function buildTableOfContents(
         ->setCoverage(idx($coverage, $filename))
         ->setCoverageID($coverage_id);
 
-      if ($have_owners) {
-        $packages = $control_query->getControllingPackagesForPath(
-          $repository_phid,
-          $changeset->getOwnersFilename());
-        $item->setPackages($packages);
-      }
+      $packages = $this->getChangesetPackages($changeset);
+      $item->setPackages($packages);
 
       $toc_view->addItem($item);
     }
diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
index 7340687bc4..e56eb27d99 100644
--- a/src/applications/differential/controller/DifferentialDiffViewController.php
+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
@@ -118,6 +118,8 @@ public function handleRequest(AphrontRequest $request) {
     $changesets = $diff->loadChangesets();
     $changesets = msort($changesets, 'getSortKey');
 
+    $this->buildPackageMaps($changesets);
+
     $table_of_contents = $this->buildTableOfContents(
       $changesets,
       $changesets,
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 06d8cf0a3f..e1da5ed32e 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -326,11 +326,21 @@ public function handleRequest(AphrontRequest $request) {
       $other_view = $this->renderOtherRevisions($other_revisions);
     }
 
+    $this->buildPackageMaps($changesets);
+
     $toc_view = $this->buildTableOfContents(
       $changesets,
       $visible_changesets,
       $target->loadCoverageMap($viewer));
 
+    // Attach changesets to each reviewer so we can show which Owners package
+    // reviewers own no files.
+    foreach ($revision->getReviewers() as $reviewer) {
+      $reviewer_phid = $reviewer->getReviewerPHID();
+      $reviewer_changesets = $this->getPackageChangesets($reviewer_phid);
+      $reviewer->attachChangesets($reviewer_changesets);
+    }
+
     $tab_group = id(new PHUITabGroupView())
       ->addTab(
         id(new PHUITabView())
diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewer.php
index 3aa9bf6362..9df149e788 100644
--- a/src/applications/differential/storage/DifferentialReviewer.php
+++ b/src/applications/differential/storage/DifferentialReviewer.php
@@ -12,6 +12,7 @@ final class DifferentialReviewer
   protected $voidedPHID;
 
   private $authority = array();
+  private $changesets = self::ATTACHABLE;
 
   protected function getConfiguration() {
     return array(
@@ -54,6 +55,15 @@ public function hasAuthority(PhabricatorUser $viewer) {
     return $this->assertAttachedKey($this->authority, $cache_fragment);
   }
 
+  public function attachChangesets(array $changesets) {
+    $this->changesets = $changesets;
+    return $this;
+  }
+
+  public function getChangesets() {
+    return $this->assertAttached($this->changesets);
+  }
+
   public function isResigned() {
     $status_resigned = DifferentialReviewerStatus::STATUS_RESIGNED;
     return ($this->getReviewerStatus() == $status_resigned);
diff --git a/src/applications/differential/view/DifferentialReviewersView.php b/src/applications/differential/view/DifferentialReviewersView.php
index 3fcb1c0ccf..33aad25289 100644
--- a/src/applications/differential/view/DifferentialReviewersView.php
+++ b/src/applications/differential/view/DifferentialReviewersView.php
@@ -150,6 +150,12 @@ public function render() {
       $item->setIcon($icon, $color, $label);
       $item->setTarget($handle->renderHovercardLink());
 
+      if ($reviewer->isPackage()) {
+        if (!$reviewer->getChangesets()) {
+          $item->setNote(pht('(Owns No Changed Paths)'));
+        }
+      }
+
       $view->addItem($item);
     }
 

From 5c73c169fd31d029df764086cab24d19a6317d76 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 29 Sep 2017 16:20:42 -0700
Subject: [PATCH 201/865] Rough cut of "Move tasks to column..."

Summary:
Ref T5523. See PHI50. See PHI40. This isn't perfect, but should improve things.

Add a "Move tasks to column..." action to workboards which moves all visible tasks in a column to another column, either on the same board or on a different board.

This is a two-step process so that I don't have to write Javascript, and because I'm not 100% sure this is what users actually want/need. If it sticks, the UI could be refined later.

  - The first dialog asks you to choose a project, defaulting ot the current project.
  - The second dialog asks you to choose a column on that project's board.

Test Plan:
  - Moved tasks on the same board.
  - Moved tasks to a different board.
  - Tried to move tasks to the starting column, got a sensible error.
  - Tried to move tasks to no project, got a sensible error.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T5523

Differential Revision: https://secure.phabricator.com/D18665
---
 .../PhabricatorProjectBoardViewController.php | 205 +++++++++++++++++-
 1 file changed, 204 insertions(+), 1 deletion(-)

diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 8405ec677f..87cb5bc417 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -34,7 +34,9 @@ public function handleRequest(AphrontRequest $request) {
       ->setBaseURI($board_uri)
       ->setIsBoardView(true);
 
-    if ($request->isFormPost() && !$request->getBool('initialize')) {
+    if ($request->isFormPost()
+      && !$request->getBool('initialize')
+      && !$request->getStr('move')) {
       $saved = $search_engine->buildSavedQueryFromRequest($request);
       $search_engine->saveQuery($saved);
       $filter_form = id(new AphrontFormView())
@@ -238,6 +240,199 @@ public function handleRequest(AphrontRequest $request) {
         ->setURI($batch_uri);
     }
 
+    $move_id = $request->getStr('move');
+    if (strlen($move_id)) {
+      $column_id_map = mpull($columns, null, 'getID');
+      $move_column = idx($column_id_map, $move_id);
+      if (!$move_column) {
+        return new Aphront404Response();
+      }
+
+      $move_task_phids = $layout_engine->getColumnObjectPHIDs(
+        $board_phid,
+        $move_column->getPHID());
+
+      foreach ($move_task_phids as $key => $move_task_phid) {
+        if (empty($task_can_edit_map[$move_task_phid])) {
+          unset($move_task_phids[$key]);
+        }
+      }
+
+      $move_tasks = array_select_keys($tasks, $move_task_phids);
+      $cancel_uri = $this->getURIWithState($board_uri);
+
+      if (!$move_tasks) {
+        return $this->newDialog()
+          ->setTitle(pht('No Movable Tasks'))
+          ->appendParagraph(
+            pht(
+              'The selected column contains no visible tasks which you '.
+              'have permission to move.'))
+          ->addCancelButton($cancel_uri);
+      }
+
+      $move_project_phid = $project->getPHID();
+      $move_column_phid = null;
+      $move_project = null;
+      $move_column = null;
+      $columns = null;
+      $errors = array();
+
+      if ($request->isFormPost()) {
+        $move_project_phid = head($request->getArr('moveProjectPHID'));
+        if (!$move_project_phid) {
+          $move_project_phid = $request->getStr('moveProjectPHID');
+        }
+
+        if (!$move_project_phid) {
+          if ($request->getBool('hasProject')) {
+            $errors[] = pht('Choose a project to move tasks to.');
+          }
+        } else {
+          $target_project = id(new PhabricatorProjectQuery())
+            ->setViewer($viewer)
+            ->withPHIDs(array($move_project_phid))
+            ->executeOne();
+          if (!$target_project) {
+            $errors[] = pht('You must choose a valid project.');
+          } else if (!$project->getHasWorkboard()) {
+            $errors[] = pht(
+              'You must choose a project with a workboard.');
+          } else {
+            $move_project = $target_project;
+          }
+        }
+
+        if ($move_project) {
+          $move_engine = id(new PhabricatorBoardLayoutEngine())
+            ->setViewer($viewer)
+            ->setBoardPHIDs(array($move_project->getPHID()))
+            ->setFetchAllBoards(true)
+            ->executeLayout();
+
+          $columns = $move_engine->getColumns($move_project->getPHID());
+          $columns = mpull($columns, null, 'getPHID');
+
+          $move_column_phid = $request->getStr('moveColumnPHID');
+          if (!$move_column_phid) {
+            if ($request->getBool('hasColumn')) {
+              $errors[] = pht('Choose a column to move tasks to.');
+            }
+          } else {
+            if (empty($columns[$move_column_phid])) {
+              $errors[] = pht(
+                'Choose a valid column on the target workboard to move '.
+                'tasks to.');
+            } else if ($columns[$move_column_phid]->getID() == $move_id) {
+              $errors[] = pht(
+                'You can not move tasks from a column to itself.');
+            } else {
+              $move_column = $columns[$move_column_phid];
+            }
+          }
+        }
+      }
+
+      if ($move_column && $move_project) {
+        foreach ($move_tasks as $move_task) {
+          $xactions = array();
+
+          // If we're switching projects, get out of the old project first
+          // and move to the new project.
+          if ($move_project->getID() != $project->getID()) {
+            $xactions[] = id(new ManiphestTransaction())
+              ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
+              ->setMetadataValue(
+                'edge:type',
+                PhabricatorProjectObjectHasProjectEdgeType::EDGECONST)
+              ->setNewValue(
+                array(
+                  '-' => array(
+                    $project->getPHID() => $project->getPHID(),
+                  ),
+                  '+' => array(
+                    $move_project->getPHID() => $move_project->getPHID(),
+                  ),
+                ));
+          }
+
+          $xactions[] = id(new ManiphestTransaction())
+            ->setTransactionType(PhabricatorTransactions::TYPE_COLUMNS)
+            ->setNewValue(
+              array(
+                array(
+                  'columnPHID' => $move_column->getPHID(),
+                ),
+              ));
+
+          $editor = id(new ManiphestTransactionEditor())
+            ->setActor($viewer)
+            ->setContinueOnMissingFields(true)
+            ->setContinueOnNoEffect(true)
+            ->setContentSourceFromRequest($request);
+
+          $editor->applyTransactions($move_task, $xactions);
+        }
+
+        return id(new AphrontRedirectResponse())
+          ->setURI($cancel_uri);
+      }
+
+      if ($move_project) {
+        $column_form = id(new AphrontFormView())
+          ->setViewer($viewer)
+          ->appendControl(
+            id(new AphrontFormSelectControl())
+              ->setName('moveColumnPHID')
+              ->setLabel(pht('Move to Column'))
+              ->setValue($move_column_phid)
+              ->setOptions(mpull($columns, 'getDisplayName', 'getPHID')));
+
+        return $this->newDialog()
+          ->setTitle(pht('Move Tasks'))
+          ->setWidth(AphrontDialogView::WIDTH_FORM)
+          ->setErrors($errors)
+          ->addHiddenInput('move', $move_id)
+          ->addHiddenInput('moveProjectPHID', $move_project->getPHID())
+          ->addHiddenInput('hasColumn', true)
+          ->addHiddenInput('hasProject', true)
+          ->appendParagraph(
+            pht(
+              'Choose a column on the %s workboard to move tasks to:',
+              $viewer->renderHandle($move_project->getPHID())))
+          ->appendForm($column_form)
+          ->addSubmitButton(pht('Move Tasks'))
+          ->addCancelButton($cancel_uri);
+      }
+
+      if ($move_project_phid) {
+        $move_project_phid_value = array($move_project_phid);
+      } else {
+        $move_project_phid_value = array();
+      }
+
+      $project_form = id(new AphrontFormView())
+        ->setViewer($viewer)
+        ->appendControl(
+          id(new AphrontFormTokenizerControl())
+            ->setName('moveProjectPHID')
+            ->setLimit(1)
+            ->setLabel(pht('Move to Project'))
+            ->setValue($move_project_phid_value)
+            ->setDatasource(new PhabricatorProjectDatasource()));
+
+      return $this->newDialog()
+        ->setTitle(pht('Move Tasks'))
+        ->setWidth(AphrontDialogView::WIDTH_FORM)
+        ->setErrors($errors)
+        ->addHiddenInput('move', $move_id)
+        ->addHiddenInput('hasProject', true)
+        ->appendForm($project_form)
+        ->addSubmitButton(pht('Continue'))
+        ->addCancelButton($cancel_uri);
+    }
+
+
     $board_id = celerity_generate_unique_node_id();
 
     $board = id(new PHUIWorkboardView())
@@ -851,6 +1046,14 @@ private function buildColumnMenu(
       ->setHref($batch_edit_uri)
       ->setDisabled(!$can_batch_edit);
 
+    $batch_move_uri = $request->getRequestURI();
+    $batch_move_uri->setQueryParam('move', $column->getID());
+    $column_items[] = id(new PhabricatorActionView())
+      ->setIcon('fa-arrow-right')
+      ->setName(pht('Move Tasks to Column...'))
+      ->setHref($batch_move_uri)
+      ->setWorkflow(true);
+
     // Column Related Actions Below
     //
     $edit_uri = 'board/'.$this->id.'/edit/'.$column->getID().'/';

From cd14194a329788d5fff6365bcade278fd18f3612 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 2 Oct 2017 07:21:38 -0700
Subject: [PATCH 202/865] Fix transaction queries using withComments() for
 transactions with no comments

Summary:
See <https://discourse.phabricator-community.org/t/daemons-tasks-crashing-in-a-loop-during-reindex/506/1>. Some object types (for example, Passphrase Credentials) support indexing but not commenting.

Make `withComments(...)` work properly if the transaction type does not support comments.

Test Plan:
Indexed a credential (no comments) and a revision (comments) with `bin/search index --trace ...`.

Before, credential fataled.

After, credetial succeeds, and skips the transaction query.

Before and after, the revision queries the transaction table.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18667
---
 ...PhabricatorApplicationTransactionQuery.php | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
index abe1498fc0..f15522a087 100644
--- a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
+++ b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
@@ -203,16 +203,29 @@ protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
       $xaction = $this->getTemplateApplicationTransaction();
       $comment = $xaction->getApplicationTransactionCommentObject();
 
-      if ($this->withComments) {
-        $joins[] = qsprintf(
-          $conn,
-          'JOIN %T c ON x.phid = c.transactionPHID',
-          $comment->getTableName());
+      // Not every transaction type has comments, so we may be able to
+      // implement this constraint trivially.
+
+      if (!$comment) {
+        if ($this->withComments) {
+          throw new PhabricatorEmptyQueryException();
+        } else {
+          // If we're querying for transactions with no comments and the
+          // transaction type does not support comments, we don't need to
+          // do anything.
+        }
       } else {
-        $joins[] = qsprintf(
-          $conn,
-          'LEFT JOIN %T c ON x.phid = c.transactionPHID',
-          $comment->getTableName());
+        if ($this->withComments) {
+          $joins[] = qsprintf(
+            $conn,
+            'JOIN %T c ON x.phid = c.transactionPHID',
+            $comment->getTableName());
+        } else {
+          $joins[] = qsprintf(
+            $conn,
+            'LEFT JOIN %T c ON x.phid = c.transactionPHID',
+            $comment->getTableName());
+        }
       }
     }
 

From 8297f7a18288b5858674f65de17570abd2c139e9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 2 Oct 2017 07:21:38 -0700
Subject: [PATCH 203/865] (stable) Fix transaction queries using withComments()
 for transactions with no comments

Summary:
See <https://discourse.phabricator-community.org/t/daemons-tasks-crashing-in-a-loop-during-reindex/506/1>. Some object types (for example, Passphrase Credentials) support indexing but not commenting.

Make `withComments(...)` work properly if the transaction type does not support comments.

Test Plan:
Indexed a credential (no comments) and a revision (comments) with `bin/search index --trace ...`.

Before, credential fataled.

After, credetial succeeds, and skips the transaction query.

Before and after, the revision queries the transaction table.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18667
---
 ...PhabricatorApplicationTransactionQuery.php | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
index abe1498fc0..f15522a087 100644
--- a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
+++ b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
@@ -203,16 +203,29 @@ protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
       $xaction = $this->getTemplateApplicationTransaction();
       $comment = $xaction->getApplicationTransactionCommentObject();
 
-      if ($this->withComments) {
-        $joins[] = qsprintf(
-          $conn,
-          'JOIN %T c ON x.phid = c.transactionPHID',
-          $comment->getTableName());
+      // Not every transaction type has comments, so we may be able to
+      // implement this constraint trivially.
+
+      if (!$comment) {
+        if ($this->withComments) {
+          throw new PhabricatorEmptyQueryException();
+        } else {
+          // If we're querying for transactions with no comments and the
+          // transaction type does not support comments, we don't need to
+          // do anything.
+        }
       } else {
-        $joins[] = qsprintf(
-          $conn,
-          'LEFT JOIN %T c ON x.phid = c.transactionPHID',
-          $comment->getTableName());
+        if ($this->withComments) {
+          $joins[] = qsprintf(
+            $conn,
+            'JOIN %T c ON x.phid = c.transactionPHID',
+            $comment->getTableName());
+        } else {
+          $joins[] = qsprintf(
+            $conn,
+            'LEFT JOIN %T c ON x.phid = c.transactionPHID',
+            $comment->getTableName());
+        }
       }
     }
 

From f9110b87abf337dd1e7714d755775e53cffd4db9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 2 Oct 2017 11:36:50 -0700
Subject: [PATCH 204/865] In "Move Tasks to Column...", show only visible
 columns

Summary:
See PHI94. I considered this initially but wasn't sure about it. However, PHI94 brings up the good point that we already use a similar rule in Maniphest.

For consistency, only show visible columns here too.

Test Plan: Used "Move tasks to column..." on a board with visible and hidden columns, only saw visbile columns offered in the dropdown.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18668
---
 .../controller/PhabricatorProjectBoardViewController.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 87cb5bc417..793fe5603d 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -313,6 +313,12 @@ public function handleRequest(AphrontRequest $request) {
           $columns = $move_engine->getColumns($move_project->getPHID());
           $columns = mpull($columns, null, 'getPHID');
 
+          foreach ($columns as $key => $column) {
+            if ($column->isHidden()) {
+              unset($columns[$key]);
+            }
+          }
+
           $move_column_phid = $request->getStr('moveColumnPHID');
           if (!$move_column_phid) {
             if ($request->getBool('hasColumn')) {

From 4390a274c1d83eb71f3d6d6211fd58644a6059f4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 2 Oct 2017 11:36:50 -0700
Subject: [PATCH 205/865] (stable) In "Move Tasks to Column...", show only
 visible columns

Summary:
See PHI94. I considered this initially but wasn't sure about it. However, PHI94 brings up the good point that we already use a similar rule in Maniphest.

For consistency, only show visible columns here too.

Test Plan: Used "Move tasks to column..." on a board with visible and hidden columns, only saw visbile columns offered in the dropdown.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18668
---
 .../controller/PhabricatorProjectBoardViewController.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 87cb5bc417..793fe5603d 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -313,6 +313,12 @@ public function handleRequest(AphrontRequest $request) {
           $columns = $move_engine->getColumns($move_project->getPHID());
           $columns = mpull($columns, null, 'getPHID');
 
+          foreach ($columns as $key => $column) {
+            if ($column->isHidden()) {
+              unset($columns[$key]);
+            }
+          }
+
           $move_column_phid = $request->getStr('moveColumnPHID');
           if (!$move_column_phid) {
             if ($request->getBool('hasColumn')) {

From 89fe84f9789629bbd7166965811e6d33c635f51b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Oct 2017 12:50:01 -0700
Subject: [PATCH 206/865] Add a "/source/..." URI for Diffusion commits which
 redirects

Summary:
See PHI112. The install presumably wants to generate links to Diffusion commits from an external tool, but only knows the short name of the repository.

Provide a `/source/phabricator/commit/abcdef908273` URI which redirects to the canonical URI for the commit.

Test Plan:
  - Visited `/source/` URI for a commit, got a redirect.
  - Visited normal URI for a commit, got a commit page.
  - Visited `/branches/` and `/tags/` for a `/source/` repository, got proper pages.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18676
---
 .../PhabricatorDiffusionApplication.php          |  9 +++++----
 .../controller/DiffusionCommitController.php     | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index cf9c14aa8b..5a426ec299 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -69,10 +69,11 @@ public function getRoutes() {
         'branches/(?P<dblob>.*)' => 'DiffusionBranchTableController',
         'refs/(?P<dblob>.*)' => 'DiffusionRefTableController',
         'lint/(?P<dblob>.*)' => 'DiffusionLintController',
-        'commit/(?P<commit>[a-z0-9]+)/branches/'
-          => 'DiffusionCommitBranchesController',
-        'commit/(?P<commit>[a-z0-9]+)/tags/'
-          => 'DiffusionCommitTagsController',
+        'commit/(?P<commit>[a-z0-9]+)' => array(
+          '/?' => 'DiffusionCommitController',
+          '/branches/' => 'DiffusionCommitBranchesController',
+          '/tags/' => 'DiffusionCommitTagsController',
+        ),
         'compare/' => 'DiffusionCompareController',
         'manage/(?:(?P<panel>[^/]+)/)?'
           => 'DiffusionRepositoryManagePanelsController',
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 59a132b17d..38c94e8a92 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -22,17 +22,27 @@ public function handleRequest(AphrontRequest $request) {
 
     $drequest = $this->getDiffusionRequest();
     $viewer = $request->getUser();
+    $repository = $drequest->getRepository();
+    $commit_identifier = $drequest->getCommit();
+
+    // If this page is being accessed via "/source/xyz/commit/...", redirect
+    // to the canonical URI.
+    $has_callsign = strlen($request->getURIData('repositoryCallsign'));
+    $has_id = strlen($request->getURIData('repositoryID'));
+    if (!$has_callsign && !$has_id) {
+      $canonical_uri = $repository->getCommitURI($commit_identifier);
+      return id(new AphrontRedirectResponse())
+        ->setURI($canonical_uri);
+    }
 
     if ($request->getStr('diff')) {
       return $this->buildRawDiffResponse($drequest);
     }
 
-    $repository = $drequest->getRepository();
-
     $commit = id(new DiffusionCommitQuery())
       ->setViewer($viewer)
       ->withRepository($repository)
-      ->withIdentifiers(array($drequest->getCommit()))
+      ->withIdentifiers(array($commit_identifier))
       ->needCommitData(true)
       ->needAuditRequests(true)
       ->executeOne();

From 1de130c9f5b241cf1e1353f5d87968e7aa5eec1f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 2 Oct 2017 15:27:02 -0700
Subject: [PATCH 207/865] Allow the Ferret engine to remove "common" ngrams
 from the index

Summary:
Ref T13000. This adds support for tracking "common" ngrams, which occur in too many documents to be useful as part of the ngram index.

If an ngram is listed in the "common" table, it won't be written when indexing documents, or queried for when searching for them.

In this change, nothing actually writes to the "common" table. I'll start writing to the table in a followup change.

Specifically, I plan to do this:

  - A new GC process updates the "common" table periodically, by writing ngrams which appear in more than X% of documents to it, for some value of X, if there are at least a minimum number of documents (maybe like 4,000).
  - A new GC process deletes ngrams that have been added to the common table from the existing indexes.

Hopefully, this will pare down the ngrams index to something reasonable over time without requiring any manual tuning.

Test Plan:
  - Ran some queries and indexes.
  - Manually inserted ngrams `xxx` and `yyy` into the ngrams table, searched and indexed, saw them ignored as viable ngrams for search/index.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18672
---
 .../20171002.cngram.01.maniphest.sql          |  7 +++
 .../autopatches/20171002.cngram.02.event.sql  |  7 +++
 .../20171002.cngram.03.revision.sql           |  7 +++
 .../autopatches/20171002.cngram.04.fund.sql   |  7 +++
 .../autopatches/20171002.cngram.05.owners.sql |  7 +++
 .../20171002.cngram.06.passphrase.sql         |  7 +++
 .../autopatches/20171002.cngram.07.blog.sql   |  7 +++
 .../autopatches/20171002.cngram.08.post.sql   |  7 +++
 .../autopatches/20171002.cngram.09.pholio.sql |  7 +++
 .../20171002.cngram.10.phriction.sql          |  7 +++
 .../20171002.cngram.11.project.sql            |  7 +++
 .../autopatches/20171002.cngram.12.user.sql   |  7 +++
 .../20171002.cngram.13.repository.sql         |  7 +++
 .../autopatches/20171002.cngram.14.commit.sql |  7 +++
 .../schema/PhabricatorConfigSchemaSpec.php    |  6 +++
 ...abricatorFerretFulltextEngineExtension.php | 49 ++++++++++++++-----
 .../search/ferret/PhabricatorFerretEngine.php | 31 ++++++++++++
 ...PhabricatorCursorPagedPolicyAwareQuery.php | 28 +++++++++++
 18 files changed, 200 insertions(+), 12 deletions(-)
 create mode 100644 resources/sql/autopatches/20171002.cngram.01.maniphest.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.02.event.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.03.revision.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.04.fund.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.05.owners.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.06.passphrase.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.07.blog.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.08.post.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.09.pholio.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.10.phriction.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.11.project.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.12.user.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.13.repository.sql
 create mode 100644 resources/sql/autopatches/20171002.cngram.14.commit.sql

diff --git a/resources/sql/autopatches/20171002.cngram.01.maniphest.sql b/resources/sql/autopatches/20171002.cngram.01.maniphest.sql
new file mode 100644
index 0000000000..9b275f5b45
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.01.maniphest.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_maniphest.maniphest_task_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.02.event.sql b/resources/sql/autopatches/20171002.cngram.02.event.sql
new file mode 100644
index 0000000000..a071fdcd19
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.02.event.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_calendar.calendar_event_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.03.revision.sql b/resources/sql/autopatches/20171002.cngram.03.revision.sql
new file mode 100644
index 0000000000..40c2450598
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.03.revision.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_differential.differential_revision_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.04.fund.sql b/resources/sql/autopatches/20171002.cngram.04.fund.sql
new file mode 100644
index 0000000000..34975ce4fb
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.04.fund.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_fund.fund_initiative_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.05.owners.sql b/resources/sql/autopatches/20171002.cngram.05.owners.sql
new file mode 100644
index 0000000000..e98d29f87c
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.05.owners.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_owners.owners_package_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.06.passphrase.sql b/resources/sql/autopatches/20171002.cngram.06.passphrase.sql
new file mode 100644
index 0000000000..f9afa9ad87
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.06.passphrase.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_passphrase.passphrase_credential_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.07.blog.sql b/resources/sql/autopatches/20171002.cngram.07.blog.sql
new file mode 100644
index 0000000000..34001c3608
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.07.blog.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_phame.phame_blog_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.08.post.sql b/resources/sql/autopatches/20171002.cngram.08.post.sql
new file mode 100644
index 0000000000..9a9c70867e
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.08.post.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_phame.phame_post_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.09.pholio.sql b/resources/sql/autopatches/20171002.cngram.09.pholio.sql
new file mode 100644
index 0000000000..6e8b8f8dcc
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.09.pholio.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_pholio.pholio_mock_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.10.phriction.sql b/resources/sql/autopatches/20171002.cngram.10.phriction.sql
new file mode 100644
index 0000000000..ed31dc30ba
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.10.phriction.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_phriction.phriction_document_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.11.project.sql b/resources/sql/autopatches/20171002.cngram.11.project.sql
new file mode 100644
index 0000000000..9c11235ba7
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.11.project.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_project.project_project_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.12.user.sql b/resources/sql/autopatches/20171002.cngram.12.user.sql
new file mode 100644
index 0000000000..3e8499aaa6
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.12.user.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_user.user_user_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.13.repository.sql b/resources/sql/autopatches/20171002.cngram.13.repository.sql
new file mode 100644
index 0000000000..e406c44edf
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.13.repository.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_repository_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171002.cngram.14.commit.sql b/resources/sql/autopatches/20171002.cngram.14.commit.sql
new file mode 100644
index 0000000000..48c1a02594
--- /dev/null
+++ b/resources/sql/autopatches/20171002.cngram.14.commit.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_repository.repository_commit_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
index b24adf27cd..971f5b828f 100644
--- a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
+++ b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
@@ -73,6 +73,12 @@ protected function buildFerretIndexSchema(PhabricatorFerretEngine $engine) {
       $engine->getNgramsTableName(),
       $engine->getNgramsSchemaColumns(),
       $engine->getNgramsSchemaKeys());
+
+    $this->buildRawSchema(
+      $engine->getApplicationName(),
+      $engine->getCommonNgramsTableName(),
+      $engine->getCommonNgramsSchemaColumns(),
+      $engine->getCommonNgramsSchemaKeys());
   }
 
   protected function buildRawSchema(
diff --git a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
index 6903072345..fe50518f3f 100644
--- a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
@@ -165,21 +165,46 @@ public function indexFulltextObject(
             $ferret_field['normalCorpus']);
       }
 
-      $sql = array();
-      foreach ($ngrams as $ngram) {
-        $sql[] = qsprintf(
+      if ($ngrams) {
+        $common = queryfx_all(
           $conn,
-          '(%d, %s)',
-          $document_id,
-          $ngram);
+          'SELECT ngram FROM %T WHERE ngram IN (%Ls)',
+          $engine->getCommonNgramsTableName(),
+          $ngrams);
+        $common = ipull($common, 'ngram', 'ngram');
+
+        foreach ($ngrams as $key => $ngram) {
+          if (isset($common[$ngram])) {
+            unset($ngrams[$key]);
+            continue;
+          }
+
+          // NOTE: MySQL discards trailing whitespace in CHAR(X) columns.
+          $trim_ngram = rtrim($ngram, ' ');
+          if (isset($common[$ngram])) {
+            unset($ngrams[$key]);
+            continue;
+          }
+        }
       }
 
-      foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
-        queryfx(
-          $conn,
-          'INSERT INTO %T (documentID, ngram) VALUES %Q',
-          $engine->getNgramsTableName(),
-          $chunk);
+      if ($ngrams) {
+        $sql = array();
+        foreach ($ngrams as $ngram) {
+          $sql[] = qsprintf(
+            $conn,
+            '(%d, %s)',
+            $document_id,
+            $ngram);
+        }
+
+        foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
+          queryfx(
+            $conn,
+            'INSERT INTO %T (documentID, ngram) VALUES %Q',
+            $engine->getNgramsTableName(),
+            $chunk);
+        }
       }
     } catch (Exception $ex) {
       $object->killTransaction();
diff --git a/src/applications/search/ferret/PhabricatorFerretEngine.php b/src/applications/search/ferret/PhabricatorFerretEngine.php
index 7cd06ae549..ee6ca57ec3 100644
--- a/src/applications/search/ferret/PhabricatorFerretEngine.php
+++ b/src/applications/search/ferret/PhabricatorFerretEngine.php
@@ -295,4 +295,35 @@ public function getNgramsSchemaKeys() {
     );
   }
 
+  public function getCommonNgramsTableName() {
+    $application = $this->getApplicationName();
+    $scope = $this->getScopeName();
+
+    return "{$application}_{$scope}_fngrams_common";
+  }
+
+  public function getCommonNgramsSchemaColumns() {
+    return array(
+      'id' => 'auto',
+      'ngram' => 'char3',
+      'needsCollection' => 'bool',
+    );
+  }
+
+  public function getCommonNgramsSchemaKeys() {
+    return array(
+      'PRIMARY' => array(
+        'columns' => array('id'),
+        'unique' => true,
+      ),
+      'key_ngram' => array(
+        'columns' => array('ngram'),
+        'unique' => true,
+      ),
+      'key_collect' => array(
+        'columns' => array('needsCollection'),
+      ),
+    );
+  }
+
 }
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 09cb3e499c..c2b8ce04e0 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -1700,6 +1700,34 @@ protected function buildFerretJoinClause(AphrontDatabaseConnection $conn) {
       }
     }
 
+    // Remove common ngrams, like "the", which occur too frequently in
+    // documents to be useful in constraining the query. The best ngrams
+    // are obscure sequences which occur in very few documents.
+
+    if ($flat) {
+      $common_ngrams = queryfx_all(
+        $conn,
+        'SELECT ngram FROM %T WHERE ngram IN (%Ls)',
+        $engine->getCommonNgramsTableName(),
+        ipull($flat, 'ngram'));
+      $common_ngrams = ipull($common_ngrams, 'ngram', 'ngram');
+
+      foreach ($flat as $key => $spec) {
+        $ngram = $spec['ngram'];
+        if (isset($common_ngrams[$ngram])) {
+          unset($flat[$key]);
+          continue;
+        }
+
+        // NOTE: MySQL discards trailing whitespace in CHAR(X) columns.
+        $trim_ngram = rtrim($ngram, ' ');
+        if (isset($common_ngrams[$trim_ngram])) {
+          unset($flat[$key]);
+          continue;
+        }
+      }
+    }
+
     // MySQL only allows us to join a maximum of 61 tables per query. Each
     // ngram is going to cost us a join toward that limit, so if the user
     // specified a very long query string, just pick 16 of the ngrams

From 3e589cdd73ba40c3e408dabd482ee7fc6165ace1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 2 Oct 2017 16:14:46 -0700
Subject: [PATCH 208/865] Add a workflow for populating (or depopulating) the
 common ngrams table

Summary:
Depends on D18672. Ref T13000. This does an on-demand build of the common ngrams table.

Plan here is:

  - Push to `secure`.
  - Build the common ngrams table here.
  - See if stuff breaks?

If it looks okay on this dataset, we can build out the GC support and try it in production.

Test Plan:
  - Locally, my dataset has a bunch of `bin/lipsum` tasks with similar, common words.
  - Verified that ipsum terms now skip ngrams. For "lorem ipsum" search performance actually IMPROVED by skipping the ngrams table (12s to 9s).
  - Queried for normal terms, got very fast results using the ngram table, as normal.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18673
---
 src/__phutil_library_map__.php                |   2 +
 ...bricatorSearchManagementNgramsWorkflow.php | 106 ++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c535d46322..dd2bcd8dfe 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3948,6 +3948,7 @@
     'PhabricatorSearchIndexVersionDestructionEngineExtension' => 'applications/search/engineextension/PhabricatorSearchIndexVersionDestructionEngineExtension.php',
     'PhabricatorSearchManagementIndexWorkflow' => 'applications/search/management/PhabricatorSearchManagementIndexWorkflow.php',
     'PhabricatorSearchManagementInitWorkflow' => 'applications/search/management/PhabricatorSearchManagementInitWorkflow.php',
+    'PhabricatorSearchManagementNgramsWorkflow' => 'applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php',
     'PhabricatorSearchManagementWorkflow' => 'applications/search/management/PhabricatorSearchManagementWorkflow.php',
     'PhabricatorSearchNgrams' => 'applications/search/ngrams/PhabricatorSearchNgrams.php',
     'PhabricatorSearchNgramsDestructionEngineExtension' => 'applications/search/engineextension/PhabricatorSearchNgramsDestructionEngineExtension.php',
@@ -9528,6 +9529,7 @@
     'PhabricatorSearchIndexVersionDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
     'PhabricatorSearchManagementIndexWorkflow' => 'PhabricatorSearchManagementWorkflow',
     'PhabricatorSearchManagementInitWorkflow' => 'PhabricatorSearchManagementWorkflow',
+    'PhabricatorSearchManagementNgramsWorkflow' => 'PhabricatorSearchManagementWorkflow',
     'PhabricatorSearchManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorSearchNgrams' => 'PhabricatorSearchDAO',
     'PhabricatorSearchNgramsDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
diff --git a/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
new file mode 100644
index 0000000000..d1a6e0bdff
--- /dev/null
+++ b/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
@@ -0,0 +1,106 @@
+<?php
+
+final class PhabricatorSearchManagementNgramsWorkflow
+  extends PhabricatorSearchManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('ngrams')
+      ->setSynopsis(pht('Recompute common ngrams.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'reset',
+            'help' => pht('Reset all common ngram records.'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $is_reset = $args->getArg('reset');
+
+    $all_objects = id(new PhutilClassMapQuery())
+      ->setAncestorClass('PhabricatorFerretInterface')
+      ->execute();
+
+    $min_documents = 4096;
+    $threshold = 0.15;
+
+    foreach ($all_objects as $object) {
+      $engine = $object->newFerretEngine();
+      $conn = $object->establishConnection('w');
+      $display_name = get_class($object);
+
+      if ($is_reset) {
+        echo tsprintf(
+          "%s\n",
+          pht(
+            'Resetting common ngrams for "%s".',
+            $display_name));
+
+        queryfx(
+          $conn,
+          'DELETE FROM %T',
+          $engine->getCommonNgramsTableName());
+        continue;
+      }
+
+      $document_count = queryfx_one(
+        $conn,
+        'SELECT COUNT(*) N FROM %T',
+        $engine->getDocumentTableName());
+      $document_count = $document_count['N'];
+
+      if ($document_count < $min_documents) {
+        echo tsprintf(
+          "%s\n",
+          pht(
+            'Too few documents of type "%s" for any ngrams to be common.',
+            $display_name));
+        continue;
+      }
+
+      $min_frequency = (int)ceil($document_count * $threshold);
+      $common_ngrams = queryfx_all(
+        $conn,
+        'SELECT ngram, COUNT(*) N FROM %T
+          GROUP BY ngram
+          HAVING N >= %d',
+        $engine->getNgramsTableName(),
+        $min_frequency);
+
+      if (!$common_ngrams) {
+        echo tsprintf(
+          "%s\n",
+          pht(
+            'No new common ngrams exist for "%s".',
+            $display_name));
+        continue;
+      }
+
+      $sql = array();
+      foreach ($common_ngrams as $ngram) {
+        $sql[] = qsprintf(
+          $conn,
+          '(%s, 1)',
+          $ngram['ngram']);
+      }
+
+      foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
+        queryfx(
+          $conn,
+          'INSERT IGNORE INTO %T (ngram, needsCollection)
+            VALUES %Q',
+          $engine->getCommonNgramsTableName(),
+          $chunk);
+      }
+
+      echo tsprintf(
+        "%s\n",
+        pht(
+          'Updated common ngrams for "%s".',
+          $display_name));
+    }
+  }
+
+}

From bc9de7eceef01c972c00cadfdff2e65cb996ab7e Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Tue, 3 Oct 2017 12:19:34 -0700
Subject: [PATCH 209/865] Typo fix

Summary: vive la resistance

Test Plan: doitlive

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18674
---
 src/docs/user/cluster/cluster_notifications.diviner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/user/cluster/cluster_notifications.diviner b/src/docs/user/cluster/cluster_notifications.diviner
index 3cdeec3c39..79c89769fc 100644
--- a/src/docs/user/cluster/cluster_notifications.diviner
+++ b/src/docs/user/cluster/cluster_notifications.diviner
@@ -14,7 +14,7 @@ are:
   - performance and capacity may improve.
 
 This configuration is relatively simple, but has a small impact on availability
-and does nothing to increase resitance to data loss.
+and does nothing to increase resistance to data loss.
 
 
 Clustering Design Goals

From b9fd5262509d1f8ace3f46c9782f8ee0638a3f51 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 4 Oct 2017 07:16:33 -0700
Subject: [PATCH 210/865] Fix a fatal on user email settings when
 `account.editable` is disabled

Summary:
If `account.editable` is set to false, we try to add a `null` button and fatal:

> Argument 1 passed to PHUIHeaderView::addActionLink() must be an instance of PHUIButtonView, null given, called in /srv/phabricator/phabricator/src/applications/settings/panel/PhabricatorSettingsPanel.php on line 290

Instead, don't try to render `null` as a button.

Test Plan:
  - Configured `account.editable` false.
  - Viewed email address settings.
  - Before: fatal.
  - After: page works, no button is provided.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18677
---
 .../panel/PhabricatorEmailAddressesSettingsPanel.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
index 1bdb95f568..cd1bfba540 100644
--- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
@@ -138,9 +138,9 @@ public function processRequest(AphrontRequest $request) {
         $editable,
       ));
 
-    $button = null;
+    $buttons = array();
     if ($editable) {
-      $button = id(new PHUIButtonView())
+      $buttons[] = id(new PHUIButtonView())
         ->setTag('a')
         ->setIcon('fa-plus')
         ->setText(pht('Add New Address'))
@@ -149,7 +149,7 @@ public function processRequest(AphrontRequest $request) {
         ->setColor(PHUIButtonView::GREY);
     }
 
-    return $this->newBox(pht('Email Addresses'), $table, array($button));
+    return $this->newBox(pht('Email Addresses'), $table, $buttons);
   }
 
   private function returnNewAddressResponse(

From 0ea5d668d1d40c5e605fa838545fd88a636d15ba Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 4 Oct 2017 10:54:42 -0700
Subject: [PATCH 211/865] Enable hovercards for the "Task Graph" UI in
 Maniphest

Summary: See PHI118. Enables hovercards to support peeking at tags and other details if you, e.g., create numerous identical subtasks of each task.

Test Plan: {F5210816}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18681
---
 src/infrastructure/graph/ManiphestTaskGraph.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/infrastructure/graph/ManiphestTaskGraph.php b/src/infrastructure/graph/ManiphestTaskGraph.php
index 24e463e273..99191760dd 100644
--- a/src/infrastructure/graph/ManiphestTaskGraph.php
+++ b/src/infrastructure/graph/ManiphestTaskGraph.php
@@ -27,6 +27,8 @@ protected function isClosed($object) {
   protected function newTableRow($phid, $object, $trace) {
     $viewer = $this->getViewer();
 
+    Javelin::initBehavior('phui-hovercards');
+
     if ($object) {
       $status = $object->getStatus();
       $priority = $object->getPriority();
@@ -51,15 +53,16 @@ protected function newTableRow($phid, $object, $trace) {
         $assigned = phutil_tag('em', array(), pht('None'));
       }
 
-      $full_title = $object->getTitle();
-
-      $link = phutil_tag(
+      $link = javelin_tag(
         'a',
         array(
           'href' => $object->getURI(),
-          'title' => $full_title,
+          'sigil' => 'hovercard',
+          'meta' => array(
+            'hoverPHID' => $object->getPHID(),
+          ),
         ),
-        $full_title);
+        $object->getTitle());
 
       $link = array(
         phutil_tag(

From 02e1440ef2605312940620b5e96764b282fb48cd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 4 Oct 2017 09:10:18 -0700
Subject: [PATCH 212/865] Dump tables one at a time, rather than all at once

Summary:
Ref T13000. This allows us to be more selective about which tables we dump data for, to reduce the size of backups and exports. The immediate goal is to make large `ngrams` tables more manageable in the cluster, but this generally makes all backups and exports faster and easier.

Here, tables are dumped one at a time. A followup change will sometimes add the `--no-data` flag, to skip dumping readthrough caches and (optionally) rebuildable indexes.

Test Plan: Compared a dump from `master` and from this branch, found them to be essentially identical. The new dump has a little more header information in each section. Verified each contains the same number of `CREATE TABLE` statements.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18679
---
 ...abricatorStorageManagementDumpWorkflow.php | 120 +++++++++++-------
 1 file changed, 76 insertions(+), 44 deletions(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index 4dc5c64042..f491133c67 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -62,7 +62,24 @@ public function didExecute(PhutilArgumentParser $args) {
       return 1;
     }
 
-    $databases = $api->getDatabaseList($patches, true);
+    $ref = $api->getRef();
+    $ref_key = $ref->getRefKey();
+
+    $schemata_map = id(new PhabricatorConfigSchemaQuery())
+      ->setAPIs(array($api))
+      ->setRefs(array($ref))
+      ->loadActualSchemata();
+    $schemata = $schemata_map[$ref_key];
+
+    $targets = array();
+    foreach ($schemata->getDatabases() as $database_name => $database) {
+      foreach ($database->getTables() as $table_name => $table) {
+        $targets[] = array(
+          'database' => $database_name,
+          'table' => $table_name,
+        );
+      }
+    }
 
     list($host, $port) = $this->getBareHostAndPort($api->getHost());
 
@@ -126,35 +143,42 @@ public function didExecute(PhutilArgumentParser $args) {
       $argv[] = $port;
     }
 
-    $argv[] = '--databases';
-    foreach ($databases as $database) {
-      $argv[] = $database;
-    }
-
+    $commands = array();
+    foreach ($targets as $target) {
+      $target_argv = $argv;
+
+      if ($has_password) {
+        $commands[] = csprintf(
+          'mysqldump -p%P %Ls -- %R %R',
+          $password,
+          $target_argv,
+          $target['database'],
+          $target['table']);
+      } else {
+        $command = csprintf(
+          'mysqldump %Ls -- %R %R',
+          $target_argv,
+          $target['database'],
+          $target['table']);
+      }
 
-    if ($has_password) {
-      $command = csprintf('mysqldump -p%P %Ls', $password, $argv);
-    } else {
-      $command = csprintf('mysqldump %Ls', $argv);
+      $commands[] = $command;
     }
 
+
     // Decrease the CPU priority of this process so it doesn't contend with
     // other more important things.
     if (function_exists('proc_nice')) {
       proc_nice(19);
     }
 
-
-    // If we aren't writing to a file, just passthru the command.
-    if ($output_file === null) {
-      return phutil_passthru('%C', $command);
-    }
-
     // If we are writing to a file, stream the command output to disk. This
     // mode makes sure the whole command fails if there's an error (commonly,
     // a full disk). See T6996 for discussion.
 
-    if ($is_compress) {
+    if ($output_file === null) {
+      $file = null;
+    } else if ($is_compress) {
       $file = gzopen($output_file, 'wb1');
     } else {
       $file = fopen($output_file, 'wb');
@@ -167,41 +191,47 @@ public function didExecute(PhutilArgumentParser $args) {
           $file));
     }
 
-    $future = new ExecFuture('%C', $command);
-
     try {
-      $iterator = id(new FutureIterator(array($future)))
-        ->setUpdateInterval(0.100);
-      foreach ($iterator as $ready) {
-        list($stdout, $stderr) = $future->read();
-        $future->discardBuffers();
-
-        if (strlen($stderr)) {
-          fwrite(STDERR, $stderr);
-        }
+      foreach ($commands as $command) {
+        $future = new ExecFuture('%C', $command);
+
+        $iterator = id(new FutureIterator(array($future)))
+          ->setUpdateInterval(0.100);
+        foreach ($iterator as $ready) {
+          list($stdout, $stderr) = $future->read();
+          $future->discardBuffers();
 
-        if (strlen($stdout)) {
-          if ($is_compress) {
-            $ok = gzwrite($file, $stdout);
-          } else {
-            $ok = fwrite($file, $stdout);
+          if (strlen($stderr)) {
+            fwrite(STDERR, $stderr);
           }
 
-          if ($ok !== strlen($stdout)) {
-            throw new Exception(
-              pht(
-                'Failed to write %d byte(s) to file "%s".',
-                new PhutilNumber(strlen($stdout)),
-                $output_file));
+          if (strlen($stdout)) {
+            if (!$file) {
+              $ok = fwrite(STDOUT, $stdout);
+            } else if ($is_compress) {
+              $ok = gzwrite($file, $stdout);
+            } else {
+              $ok = fwrite($file, $stdout);
+            }
+
+            if ($ok !== strlen($stdout)) {
+              throw new Exception(
+                pht(
+                  'Failed to write %d byte(s) to file "%s".',
+                  new PhutilNumber(strlen($stdout)),
+                  $output_file));
+            }
           }
-        }
 
-        if ($ready !== null) {
-          $ready->resolvex();
+          if ($ready !== null) {
+            $ready->resolvex();
+          }
         }
       }
 
-      if ($is_compress) {
+      if (!$file) {
+        $ok = true;
+      } else if ($is_compress) {
         $ok = gzclose($file);
       } else {
         $ok = fclose($file);
@@ -218,7 +248,9 @@ public function didExecute(PhutilArgumentParser $args) {
       // we don't leave any confusing artifacts laying around.
 
       try {
-        Filesystem::remove($output_file);
+        if ($file !== null) {
+          Filesystem::remove($output_file);
+        }
       } catch (Exception $ex) {
         // Ignore any errors we hit.
       }

From c767c971ca796e22253726fe72135af6ba485e67 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 4 Oct 2017 10:51:29 -0700
Subject: [PATCH 213/865] Add "persistence" types (data, cache, or index) to
 tables, and tweak what "storage dump" dumps

Summary:
Ref T13000. This marks each table as either "data" (normal data), "cache" (automatically rebuilt, no need to ever dump) or "index" (can be manually rebuilt).

By default, `bin/storage dump` dumps data and index tables, but not cache tables.

With `--no-indexes`, it dumps only data tables. Indexes can be rebuilt after a restore with `bin/search index --all ...`.

Test Plan:
  - Ran `--no-indexes` and normal dumps with `--trace`, verified that cache and index (former case) or cache only (latter case) tables were dumped with `--no-data`.
  - Verified dump has the same number of `CREATE TABLE` statements as before the changes.
  - Reviewed persistence tags in the web UI (note Ferret engine tables are "Index"):

{F5210886}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18682
---
 .../storage/PhabricatorCacheSchemaSpec.php    |  3 +
 ...bricatorConfigDatabaseStatusController.php |  3 +
 .../schema/PhabricatorConfigSchemaQuery.php   |  2 +
 .../schema/PhabricatorConfigSchemaSpec.php    | 31 ++++++++--
 .../schema/PhabricatorConfigTableSchema.php   | 26 ++++++++
 .../storage/DifferentialSchemaSpec.php        |  3 +
 .../configuration/configuring_backups.diviner | 18 ++++++
 ...abricatorStorageManagementDumpWorkflow.php | 61 +++++++++++++++++--
 8 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/src/applications/cache/storage/PhabricatorCacheSchemaSpec.php b/src/applications/cache/storage/PhabricatorCacheSchemaSpec.php
index 97d6e1ac81..c9e78af0bc 100644
--- a/src/applications/cache/storage/PhabricatorCacheSchemaSpec.php
+++ b/src/applications/cache/storage/PhabricatorCacheSchemaSpec.php
@@ -30,6 +30,9 @@ public function buildSchemata() {
         'key_ttl' => array(
           'columns' => array('cacheExpires'),
         ),
+      ),
+      array(
+        'persistence' => PhabricatorConfigTableSchema::PERSISTENCE_CACHE,
       ));
 
   }
diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
index a67c57e6f9..760317ae80 100644
--- a/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
+++ b/src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php
@@ -261,6 +261,7 @@ private function renderDatabase(
         $this->renderAttr(
           $table->getCollation(),
           $table->hasIssue($collation_issue)),
+        $table->getPersistenceTypeDisplayName(),
       );
     }
 
@@ -270,12 +271,14 @@ private function renderDatabase(
           null,
           pht('Table'),
           pht('Collation'),
+          pht('Persistence'),
         ))
       ->setColumnClasses(
         array(
           null,
           'wide pri',
           null,
+          null,
         ));
 
     $title = $database_name;
diff --git a/src/applications/config/schema/PhabricatorConfigSchemaQuery.php b/src/applications/config/schema/PhabricatorConfigSchemaQuery.php
index 6feda7363c..2cb7763110 100644
--- a/src/applications/config/schema/PhabricatorConfigSchemaQuery.php
+++ b/src/applications/config/schema/PhabricatorConfigSchemaQuery.php
@@ -338,6 +338,8 @@ private function buildComparisonSchemaForServer(
           $comp_table->addKey($comp_key);
         }
 
+        $comp_table->setPersistenceType($expect_table->getPersistenceType());
+
         $comp_database->addTable($comp_table);
       }
       $comp_server->addDatabase($comp_database);
diff --git a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
index 971f5b828f..c451658682 100644
--- a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
+++ b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
@@ -56,36 +56,52 @@ protected function buildLiskObjectSchema(PhabricatorLiskDAO $object) {
   }
 
   protected function buildFerretIndexSchema(PhabricatorFerretEngine $engine) {
+    $index_options = array(
+      'persistence' => PhabricatorConfigTableSchema::PERSISTENCE_INDEX,
+    );
+
     $this->buildRawSchema(
       $engine->getApplicationName(),
       $engine->getDocumentTableName(),
       $engine->getDocumentSchemaColumns(),
-      $engine->getDocumentSchemaKeys());
+      $engine->getDocumentSchemaKeys(),
+      $index_options);
 
     $this->buildRawSchema(
       $engine->getApplicationName(),
       $engine->getFieldTableName(),
       $engine->getFieldSchemaColumns(),
-      $engine->getFieldSchemaKeys());
+      $engine->getFieldSchemaKeys(),
+      $index_options);
 
     $this->buildRawSchema(
       $engine->getApplicationName(),
       $engine->getNgramsTableName(),
       $engine->getNgramsSchemaColumns(),
-      $engine->getNgramsSchemaKeys());
+      $engine->getNgramsSchemaKeys(),
+      $index_options);
 
     $this->buildRawSchema(
       $engine->getApplicationName(),
       $engine->getCommonNgramsTableName(),
       $engine->getCommonNgramsSchemaColumns(),
-      $engine->getCommonNgramsSchemaKeys());
+      $engine->getCommonNgramsSchemaKeys(),
+      $index_options);
   }
 
   protected function buildRawSchema(
     $database_name,
     $table_name,
     array $columns,
-    array $keys) {
+    array $keys,
+    array $options = array()) {
+
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'persistence' => 'optional string',
+      ));
+
     $database = $this->getDatabase($database_name);
 
     $table = $this->newTable($table_name);
@@ -144,6 +160,11 @@ protected function buildRawSchema(
       $table->addKey($key);
     }
 
+    $persistence_type = idx($options, 'persistence');
+    if ($persistence_type !== null) {
+      $table->setPersistenceType($persistence_type);
+    }
+
     $database->addTable($table);
   }
 
diff --git a/src/applications/config/schema/PhabricatorConfigTableSchema.php b/src/applications/config/schema/PhabricatorConfigTableSchema.php
index 870c8ebddb..d6e5bfd9fa 100644
--- a/src/applications/config/schema/PhabricatorConfigTableSchema.php
+++ b/src/applications/config/schema/PhabricatorConfigTableSchema.php
@@ -7,6 +7,11 @@ final class PhabricatorConfigTableSchema
   private $engine;
   private $columns = array();
   private $keys = array();
+  private $persistenceType = self::PERSISTENCE_DATA;
+
+  const PERSISTENCE_DATA = 'data';
+  const PERSISTENCE_CACHE = 'cache';
+  const PERSISTENCE_INDEX = 'index';
 
   public function addColumn(PhabricatorConfigColumnSchema $column) {
     $key = $column->getName();
@@ -45,6 +50,27 @@ public function getKey($key) {
     return idx($this->getKeys(), $key);
   }
 
+  public function setPersistenceType($persistence_type) {
+    $this->persistenceType = $persistence_type;
+    return $this;
+  }
+
+  public function getPersistenceType() {
+    return $this->persistenceType;
+  }
+
+  public function getPersistenceTypeDisplayName() {
+    $map = array(
+      self::PERSISTENCE_DATA => pht('Data'),
+      self::PERSISTENCE_CACHE => pht('Cache'),
+      self::PERSISTENCE_INDEX => pht('Index'),
+    );
+
+    $type = $this->getPersistenceType();
+
+    return idx($map, $type, $type);
+  }
+
   protected function getSubschemata() {
     // NOTE: Keys and columns may have the same name, so make sure we return
     // everything.
diff --git a/src/applications/differential/storage/DifferentialSchemaSpec.php b/src/applications/differential/storage/DifferentialSchemaSpec.php
index e376c7f4f8..7aa76fa822 100644
--- a/src/applications/differential/storage/DifferentialSchemaSpec.php
+++ b/src/applications/differential/storage/DifferentialSchemaSpec.php
@@ -21,6 +21,9 @@ public function buildSchemata() {
         'dateCreated' => array(
           'columns' => array('dateCreated'),
         ),
+      ),
+      array(
+        'persistence' => PhabricatorConfigTableSchema::PERSISTENCE_CACHE,
       ));
 
     $this->buildRawSchema(
diff --git a/src/docs/user/configuration/configuring_backups.diviner b/src/docs/user/configuration/configuring_backups.diviner
index 9776448216..d32eebb0da 100644
--- a/src/docs/user/configuration/configuring_backups.diviner
+++ b/src/docs/user/configuration/configuring_backups.diviner
@@ -145,6 +145,24 @@ present a risk. If you restrict access to the Phabricator host or database, you
 should also restrict access to the backups.
 
 
+Skipping Indexes
+================
+
+By default, `bin/storage dump` does not dump all of the data in the database:
+it skips some caches which can be rebuilt automatically and do not need to be
+backed up. Some of these caches are very large, so the size of the dump may
+be significantly smaller than the size of the databases.
+
+If you have a large amount of data, you can specify `--no-indexes` when taking
+a database dump to skip additional tables which contain search indexes. This
+will reduce the size (and increase the speed) of the backup. This is an
+advanced option which most installs will not benefit from.
+
+This index data can be rebuilt after a restore, but will not be rebuilt
+automatically. If you choose to use this flag, you must manually rebuild
+indexes after a restore (for details, see ((reindex))).
+
+
 Next Steps
 ==========
 
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index f491133c67..fecc0517e3 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -30,6 +30,13 @@ protected function didConstruct() {
               'With __--output__, write a compressed file to disk instead '.
               'of a plaintext file.'),
           ),
+          array(
+            'name' => 'no-indexes',
+            'help' => pht(
+              'Do not dump data in rebuildable index tables. This means '.
+              'backups are smaller and faster, but you will need to manually '.
+              'rebuild indexes after performing a restore.'),
+          ),
           array(
             'name' => 'overwrite',
             'help' => pht(
@@ -49,6 +56,8 @@ public function didExecute(PhutilArgumentParser $args) {
 
     $console = PhutilConsole::getConsole();
 
+    $with_indexes = !$args->getArg('no-indexes');
+
     $applied = $api->getAppliedPatches();
     if ($applied === null) {
       $namespace = $api->getNamespace();
@@ -65,18 +74,58 @@ public function didExecute(PhutilArgumentParser $args) {
     $ref = $api->getRef();
     $ref_key = $ref->getRefKey();
 
-    $schemata_map = id(new PhabricatorConfigSchemaQuery())
+    $schemata_query = id(new PhabricatorConfigSchemaQuery())
       ->setAPIs(array($api))
-      ->setRefs(array($ref))
-      ->loadActualSchemata();
-    $schemata = $schemata_map[$ref_key];
+      ->setRefs(array($ref));
+
+    $actual_map = $schemata_query->loadActualSchemata();
+    $expect_map = $schemata_query->loadExpectedSchemata();
+
+    $schemata = $actual_map[$ref_key];
+    $expect = $expect_map[$ref_key];
 
     $targets = array();
     foreach ($schemata->getDatabases() as $database_name => $database) {
+      $expect_database = $expect->getDatabase($database_name);
       foreach ($database->getTables() as $table_name => $table) {
+
+        // NOTE: It's possible for us to find tables in these database which
+        // we don't expect to be there. For example, an older version of
+        // Phabricator may have had a table that was later dropped. We assume
+        // these are data tables and always dump them, erring on the side of
+        // caution.
+
+        $persistence = PhabricatorConfigTableSchema::PERSISTENCE_DATA;
+        if ($expect_database) {
+          $expect_table = $expect_database->getTable($table_name);
+          if ($expect_table) {
+            $persistence = $expect_table->getPersistenceType();
+          }
+        }
+
+        switch ($persistence) {
+          case PhabricatorConfigTableSchema::PERSISTENCE_CACHE:
+            // When dumping tables, leave the data in cache tables in the
+            // database. This will be automatically rebuild after the data
+            // is restored and does not need to be persisted in backups.
+            $with_data = false;
+            break;
+          case PhabricatorConfigTableSchema::PERSISTENCE_INDEX:
+            // When dumping tables, leave index data behind of the caller
+            // specified "--no-indexes". These tables can be rebuilt manually
+            // from other tables, but do not rebuild automatically.
+            $with_data = $with_indexes;
+            break;
+          case PhabricatorConfigTableSchema::PERSISTENCE_DATA:
+          default:
+            $with_data = true;
+            break;
+        }
+
         $targets[] = array(
           'database' => $database_name,
           'table' => $table_name,
+          'data' => $with_data,
         );
       }
     }
@@ -147,6 +196,10 @@ public function didExecute(PhutilArgumentParser $args) {
     foreach ($targets as $target) {
       $target_argv = $argv;
 
+      if (!$target['data']) {
+        $target_argv[] = '--no-data';
+      }
+
       if ($has_password) {
         $commands[] = csprintf(
           'mysqldump -p%P %Ls -- %R %R',

From 66df5b149309ae261e335022429c458aac323570 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 4 Oct 2017 17:19:27 -0700
Subject: [PATCH 214/865] Add a garbage collector for common ngrams

Summary:
Ref T13000. After an ngram is marked as "common", we can delete it from the storage table.

Currently, the only way to get ngrams marked as "common" is to manually run `bin/search ngrams`, so this has no impact on normal installs.

Test Plan: Ran `bin/garbage collect`, saw it start chewing through my local Maniphest ngrams table and removing common ngrams.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18687
---
 src/__phutil_library_map__.php                |  2 +
 ...catorSearchFerretNgramGarbageCollector.php | 55 +++++++++++++++++++
 ...bricatorSearchManagementNgramsWorkflow.php |  5 +-
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/search/garbagecollector/PhabricatorSearchFerretNgramGarbageCollector.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index dd2bcd8dfe..aca6e09fdb 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3941,6 +3941,7 @@
     'PhabricatorSearchEngineAttachment' => 'applications/search/engineextension/PhabricatorSearchEngineAttachment.php',
     'PhabricatorSearchEngineExtension' => 'applications/search/engineextension/PhabricatorSearchEngineExtension.php',
     'PhabricatorSearchEngineExtensionModule' => 'applications/search/engineextension/PhabricatorSearchEngineExtensionModule.php',
+    'PhabricatorSearchFerretNgramGarbageCollector' => 'applications/search/garbagecollector/PhabricatorSearchFerretNgramGarbageCollector.php',
     'PhabricatorSearchField' => 'applications/search/field/PhabricatorSearchField.php',
     'PhabricatorSearchHost' => 'infrastructure/cluster/search/PhabricatorSearchHost.php',
     'PhabricatorSearchHovercardController' => 'applications/search/controller/PhabricatorSearchHovercardController.php',
@@ -9522,6 +9523,7 @@
     'PhabricatorSearchEngineAttachment' => 'Phobject',
     'PhabricatorSearchEngineExtension' => 'Phobject',
     'PhabricatorSearchEngineExtensionModule' => 'PhabricatorConfigModule',
+    'PhabricatorSearchFerretNgramGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorSearchField' => 'Phobject',
     'PhabricatorSearchHost' => 'Phobject',
     'PhabricatorSearchHovercardController' => 'PhabricatorSearchBaseController',
diff --git a/src/applications/search/garbagecollector/PhabricatorSearchFerretNgramGarbageCollector.php b/src/applications/search/garbagecollector/PhabricatorSearchFerretNgramGarbageCollector.php
new file mode 100644
index 0000000000..f2c43743f6
--- /dev/null
+++ b/src/applications/search/garbagecollector/PhabricatorSearchFerretNgramGarbageCollector.php
@@ -0,0 +1,55 @@
+<?php
+
+final class PhabricatorSearchFerretNgramGarbageCollector
+  extends PhabricatorGarbageCollector {
+
+  const COLLECTORCONST = 'search.ferret.ngram';
+
+  public function getCollectorName() {
+    return pht('Ferret Engine Ngrams');
+  }
+
+  public function hasAutomaticPolicy() {
+    return true;
+  }
+
+  protected function collectGarbage() {
+    $all_objects = id(new PhutilClassMapQuery())
+      ->setAncestorClass('PhabricatorFerretInterface')
+      ->execute();
+
+    $did_collect = false;
+    foreach ($all_objects as $object) {
+      $engine = $object->newFerretEngine();
+      $conn = $object->establishConnection('w');
+
+      $ngram_row = queryfx_one(
+        $conn,
+        'SELECT ngram FROM %T WHERE needsCollection = 1 LIMIT 1',
+        $engine->getCommonNgramsTableName());
+      if (!$ngram_row) {
+        continue;
+      }
+
+      $ngram = $ngram_row['ngram'];
+
+      queryfx(
+        $conn,
+        'DELETE FROM %T WHERE ngram = %s',
+        $engine->getNgramsTableName(),
+        $ngram);
+
+      queryfx(
+        $conn,
+        'UPDATE %T SET needsCollection = 0 WHERE ngram = %s',
+        $engine->getCommonNgramsTableName(),
+        $ngram);
+
+      $did_collect = true;
+      break;
+    }
+
+    return $did_collect;
+  }
+
+}
diff --git a/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
index d1a6e0bdff..4b983fe0f9 100644
--- a/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
+++ b/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
@@ -6,7 +6,10 @@ final class PhabricatorSearchManagementNgramsWorkflow
   protected function didConstruct() {
     $this
       ->setName('ngrams')
-      ->setSynopsis(pht('Recompute common ngrams.'))
+      ->setSynopsis(
+        pht(
+          'Recompute common ngrams. This is an advanced workflow that '.
+          'can harm search quality if used improperly.'))
       ->setArguments(
         array(
           array(

From 17e83b53d53e2f1b08021993e143db891a51b26f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 6 Oct 2017 07:48:25 -0700
Subject: [PATCH 215/865] Add "bin/search query" for debugging query execution

Summary:
Ref T13000. Currently, queries can only be executed from the web UI, which requires logging in as a user. I really want to avoid doing that wherever we can, but being able to execute queries on an instance (and, particularly, see the ngrams and timings on the underlying lookups) would have been helpful in several cases.

Improve tooling a bit in advance of the "common ngrams" stuff going out since it seems likely that it will be useful if issues arise.

Test Plan: Ran `bin/search query --query ...`, got useful minimal output. Ran with `--trace` to get internals.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18690
---
 src/__phutil_library_map__.php                |  2 +
 ...abricatorSearchManagementQueryWorkflow.php | 55 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 src/applications/search/management/PhabricatorSearchManagementQueryWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index aca6e09fdb..a650e33fcf 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3950,6 +3950,7 @@
     'PhabricatorSearchManagementIndexWorkflow' => 'applications/search/management/PhabricatorSearchManagementIndexWorkflow.php',
     'PhabricatorSearchManagementInitWorkflow' => 'applications/search/management/PhabricatorSearchManagementInitWorkflow.php',
     'PhabricatorSearchManagementNgramsWorkflow' => 'applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php',
+    'PhabricatorSearchManagementQueryWorkflow' => 'applications/search/management/PhabricatorSearchManagementQueryWorkflow.php',
     'PhabricatorSearchManagementWorkflow' => 'applications/search/management/PhabricatorSearchManagementWorkflow.php',
     'PhabricatorSearchNgrams' => 'applications/search/ngrams/PhabricatorSearchNgrams.php',
     'PhabricatorSearchNgramsDestructionEngineExtension' => 'applications/search/engineextension/PhabricatorSearchNgramsDestructionEngineExtension.php',
@@ -9532,6 +9533,7 @@
     'PhabricatorSearchManagementIndexWorkflow' => 'PhabricatorSearchManagementWorkflow',
     'PhabricatorSearchManagementInitWorkflow' => 'PhabricatorSearchManagementWorkflow',
     'PhabricatorSearchManagementNgramsWorkflow' => 'PhabricatorSearchManagementWorkflow',
+    'PhabricatorSearchManagementQueryWorkflow' => 'PhabricatorSearchManagementWorkflow',
     'PhabricatorSearchManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorSearchNgrams' => 'PhabricatorSearchDAO',
     'PhabricatorSearchNgramsDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
diff --git a/src/applications/search/management/PhabricatorSearchManagementQueryWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementQueryWorkflow.php
new file mode 100644
index 0000000000..8e40162a98
--- /dev/null
+++ b/src/applications/search/management/PhabricatorSearchManagementQueryWorkflow.php
@@ -0,0 +1,55 @@
+<?php
+
+final class PhabricatorSearchManagementQueryWorkflow
+  extends PhabricatorSearchManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('query')
+      ->setSynopsis(
+        pht('Run a search query. Intended for debugging and development.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'query',
+            'param' => 'query',
+            'help' => pht('Raw query to execute.'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+    $raw_query = $args->getArg('query');
+    if (!strlen($raw_query)) {
+      throw new PhutilArgumentUsageException(
+        pht('Specify a query with --query.'));
+    }
+
+    $engine = id(new PhabricatorSearchApplicationSearchEngine())
+      ->setViewer($viewer);
+
+    $saved = $engine->newSavedQuery();
+    $saved->setParameter('query', $raw_query);
+
+    $query = $engine->buildQueryFromSavedQuery($saved);
+    $pager = $engine->newPagerForSavedQuery($saved);
+
+    $results = $engine->executeQuery($query, $pager);
+    if ($results) {
+      foreach ($results as $result) {
+        echo tsprintf(
+          "%s\t%s\n",
+          $result->getPHID(),
+          $result->getName());
+      }
+    } else {
+      echo tsprintf(
+        "%s\n",
+        pht('No results.'));
+    }
+
+    return 0;
+  }
+
+}

From 85011a46d0aa1a5da241cb91620d929adc6414a9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 6 Oct 2017 11:47:35 -0700
Subject: [PATCH 216/865] Bail out of PhabricatorRepositoryGraphCache more
 aggressively after cache fills

Summary:
Ref PHI109. Ref T11786. We currently test elapsed time every 64 iterations (since iterations are normally very fast), but at least one install is seeing the page timeout after 30 seconds.

One reason could be that cache fills may occur, and are likely to be much slower than normal iterations. In an extreme case, we could do 64 cache fills before checking the time. Tweak thing so that we always check the time after doing a cache fill, regardless of how many iterations have elapsed since the last attempt.

Additionally, this API method currently accepts an arbitrary number of paths, but implicitly limits each cache query to 500ms. If more than 60 paths are passed, this may exceed 30s. Only let the cache churn for a maximum of 10s across all paths.

If this is more the latter issue than the former, this might replace the GraphCache timeouts with `git` timeouts, but at least our understanding of what's going on here will improve.

Test Plan: This is difficult to test convincingly locally, since I can't reproduce the original issue. It still works after these changes, but it worked fine before these changes too.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T11786

Differential Revision: https://secure.phabricator.com/D18692
---
 ...ffusionLastModifiedQueryConduitAPIMethod.php | 14 +++++++++++++-
 .../PhabricatorRepositoryGraphCache.php         | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
index 30b436cfff..1135420a6e 100644
--- a/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
@@ -115,6 +115,10 @@ private function loadCommitsFromCache(array $map) {
     $graph_cache = new PhabricatorRepositoryGraphCache();
 
     $results = array();
+
+    // Spend no more than this many total seconds trying to satisfy queries
+    // via the graph cache.
+    $remaining_time = 10.0;
     foreach ($map as $path => $commit) {
       $path_id = idx($path_map, $path);
       if (!$path_id) {
@@ -125,13 +129,21 @@ private function loadCommitsFromCache(array $map) {
         continue;
       }
 
+      $t_start = microtime(true);
       $cache_result = $graph_cache->loadLastModifiedCommitID(
         $commit_id,
-        $path_id);
+        $path_id,
+        $remaining_time);
+      $t_end = microtime(true);
 
       if ($cache_result !== false) {
         $results[$path] = $cache_result;
       }
+
+      $remaining_time -= ($t_end - $t_start);
+      if ($remaining_time <= 0) {
+        break;
+      }
     }
 
     if ($results) {
diff --git a/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php b/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php
index d52182fcc9..c4adc61ab0 100644
--- a/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php
+++ b/src/applications/repository/graphcache/PhabricatorRepositoryGraphCache.php
@@ -102,6 +102,10 @@ public function loadLastModifiedCommitID($commit_id, $path_id, $time = 0.5) {
         }
 
         // Otherwise, the rebuild gave us the data, so we can keep going.
+
+        $did_fill = true;
+      } else {
+        $did_fill = false;
       }
 
       // Sanity check so we can survive and recover from bad data.
@@ -147,12 +151,17 @@ public function loadLastModifiedCommitID($commit_id, $path_id, $time = 0.5) {
         $commit_id = $parent_id;
 
         // Periodically check if we've spent too long looking for a result
-        // in the cache, and return so we can fall back to a VCS operation. This
-        // keeps us from having a degenerate worst case if, e.g., the cache
-        // is cold and we need to inspect a very large number of blocks
+        // in the cache, and return so we can fall back to a VCS operation.
+        // This keeps us from having a degenerate worst case if, e.g., the
+        // cache is cold and we need to inspect a very large number of blocks
         // to satisfy the query.
 
-        if (((++$iterations) % 64) === 0) {
+        ++$iterations;
+
+        // If we performed a cache fill in this cycle, always check the time
+        // limit, since cache fills may take a significant amount of time.
+
+        if ($did_fill || ($iterations % 64 === 0)) {
           $t_end = microtime(true);
           if (($t_end - $t_start) > $time) {
             return false;

From 1ee7b3ab8cbb49613339b0f8b02b9f91a069a102 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 7 Oct 2017 04:59:29 -0700
Subject: [PATCH 217/865] Correct "bin/storage dump" command construction with
 passwords

Fixes T13004. This should mirror the other branch.
---
 .../workflow/PhabricatorStorageManagementDumpWorkflow.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index fecc0517e3..dced62eee9 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -201,7 +201,7 @@ public function didExecute(PhutilArgumentParser $args) {
       }
 
       if ($has_password) {
-        $commands[] = csprintf(
+        $command = csprintf(
           'mysqldump -p%P %Ls -- %R %R',
           $password,
           $target_argv,

From 0361591da0d9ad18095660be6309c2c51129570c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 7 Oct 2017 04:59:29 -0700
Subject: [PATCH 218/865] (stable) Correct "bin/storage dump" command
 construction with passwords

Fixes T13004. This should mirror the other branch.
---
 .../workflow/PhabricatorStorageManagementDumpWorkflow.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index fecc0517e3..dced62eee9 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -201,7 +201,7 @@ public function didExecute(PhutilArgumentParser $args) {
       }
 
       if ($has_password) {
-        $commands[] = csprintf(
+        $command = csprintf(
           'mysqldump -p%P %Ls -- %R %R',
           $password,
           $target_argv,

From 4fd9d2d4bbdb8fb7013b5bea5e0a5ec121db526f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 7 Oct 2017 13:23:18 -0700
Subject: [PATCH 219/865] Fix "bin/storage dump" with no "--output"

Ref T13004. (I distinctly remember testing this, but must have tweaked things afterward.)
---
 .../workflow/PhabricatorStorageManagementDumpWorkflow.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index dced62eee9..17491d55e9 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -237,7 +237,7 @@ public function didExecute(PhutilArgumentParser $args) {
       $file = fopen($output_file, 'wb');
     }
 
-    if (!$file) {
+    if (($output_file !== null) && !$file) {
       throw new Exception(
         pht(
           'Failed to open file "%s" for writing.',

From 8edd04aff365927a7b0018e2b20076518e4e6a0e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 7 Oct 2017 13:23:18 -0700
Subject: [PATCH 220/865] (stable) Fix "bin/storage dump" with no "--output"

Ref T13004. (I distinctly remember testing this, but must have tweaked things afterward.)
---
 .../workflow/PhabricatorStorageManagementDumpWorkflow.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index dced62eee9..17491d55e9 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -237,7 +237,7 @@ public function didExecute(PhutilArgumentParser $args) {
       $file = fopen($output_file, 'wb');
     }
 
-    if (!$file) {
+    if (($output_file !== null) && !$file) {
       throw new Exception(
         pht(
           'Failed to open file "%s" for writing.',

From 9bd6a3705559b16c75595a06d9d726274bd5be6d Mon Sep 17 00:00:00 2001
From: Dmitri Iouchtchenko <johnnyspoon@gmail.com>
Date: Mon, 9 Oct 2017 10:48:01 -0700
Subject: [PATCH 221/865] Fix spelling

Summary: Noticed a couple of typos in the docs, and then things got out of hand.

Test Plan:
  - Stared at the words until my eyes watered and the letters began to swim on the screen.
  - Consulted a dictionary.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, yelirekim, PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D18693
---
 scripts/setup/manage_garbage.php                       |  2 +-
 .../httpparametertype/AphrontHTTPParameterType.php     |  2 +-
 .../almanac/editor/AlmanacDeviceEditor.php             |  2 +-
 .../audit/view/PhabricatorAuditListView.php            |  2 +-
 .../auth/controller/PhabricatorAuthController.php      |  2 +-
 .../controller/PhabricatorAuthRegisterController.php   |  2 +-
 .../auth/editor/PhabricatorAuthSSHKeyEditor.php        |  2 +-
 .../factor/__tests__/PhabricatorAuthInviteTestCase.php |  2 +-
 .../PhabricatorAuthManagementRevokeWorkflow.php        |  2 +-
 .../auth/provider/PhabricatorOAuth1AuthProvider.php    |  2 +-
 src/applications/base/PhabricatorApplication.php       |  2 +-
 .../base/controller/PhabricatorController.php          |  2 +-
 .../editor/PhabricatorCalendarImportEditEngine.php     |  2 +-
 .../calendar/icon/PhabricatorCalendarIconSet.php       |  2 +-
 src/applications/calendar/util/CalendarTimeUtil.php    |  2 +-
 .../PhabricatorCalendarEventFrequencyTransaction.php   |  4 ++--
 .../PhabricatorCalendarEventInviteTransaction.php      |  4 ++--
 .../PhabricatorCalendarImportFrequencyTransaction.php  |  2 +-
 .../config/check/PhabricatorStorageSetupCheck.php      |  2 +-
 .../conpherence/query/ConpherenceThreadQuery.php       |  2 +-
 .../PhabricatorDashboardPanelTabsCustomField.php       |  2 +-
 .../differential/controller/DifferentialController.php |  2 +-
 .../customfield/DifferentialHarbormasterField.php      |  2 +-
 .../differential/editor/DifferentialDiffEditor.php     |  2 +-
 .../parser/DifferentialChangesetParser.php             |  6 +++---
 .../differential/storage/DifferentialModernHunk.php    |  2 +-
 .../differential/storage/DifferentialRevision.php      |  4 ++--
 ...DifferentialResponsibleViewerFunctionDatasource.php |  2 +-
 .../diffusion/controller/DiffusionCommitController.php |  2 +-
 .../diffusion/editor/DiffusionRepositoryEditEngine.php |  6 +++---
 .../diffusion/engine/DiffusionCommitHookEngine.php     |  2 +-
 .../gitlfs/DiffusionGitLFSAuthenticateWorkflow.php     |  2 +-
 .../diffusion/herald/HeraldCommitAdapter.php           |  2 +-
 .../diffusion/protocol/DiffusionCommandEngine.php      |  2 +-
 .../protocol/DiffusionMercurialWireProtocol.php        |  2 +-
 .../protocol/DiffusionRepositoryClusterEngine.php      |  4 ++--
 .../query/DiffusionCachedResolveRefsQuery.php          |  2 +-
 .../diffusion/query/DiffusionCommitQuery.php           |  2 +-
 .../xaction/DiffusionCommitConcernTransaction.php      |  2 +-
 .../xaction/DiffusionCommitVerifyTransaction.php       |  2 +-
 .../blueprint/DrydockBlueprintImplementation.php       |  4 ++--
 .../drydock/storage/DrydockAuthorization.php           |  2 +-
 .../drydock/worker/DrydockLeaseUpdateWorker.php        |  6 +++---
 src/applications/drydock/worker/DrydockWorker.php      |  2 +-
 .../files/controller/PhabricatorFileDataController.php |  2 +-
 .../PhabricatorFilesManagementCatWorkflow.php          |  2 +-
 .../fund/editor/FundInitiativeEditEngine.php           |  2 +-
 .../HarbormasterSendMessageConduitAPIMethod.php        |  4 ++--
 .../storage/configuration/HarbormasterBuildStep.php    |  2 +-
 .../controller/LegalpadDocumentSignController.php      |  2 +-
 .../maniphest/controller/ManiphestReportController.php |  4 ++--
 .../maniphest/editor/ManiphestTransactionEditor.php    |  2 +-
 .../PhabricatorMailManagementUnverifyWorkflow.php      |  2 +-
 .../metamta/receiver/PhabricatorMailReceiver.php       |  2 +-
 .../__tests__/PhabricatorOwnersPackageTestCase.php     |  2 +-
 .../credentialtype/PassphraseCredentialType.php        |  2 +-
 .../PassphraseSSHPrivateKeyTextCredentialType.php      |  2 +-
 .../passphrase/view/PassphraseCredentialControl.php    |  2 +-
 .../people/markup/PhabricatorMentionRemarkupRule.php   |  2 +-
 .../people/query/PhabricatorPeopleQuery.php            |  4 ++--
 .../people/query/PhabricatorPeopleSearchEngine.php     |  2 +-
 src/applications/people/storage/PhabricatorUser.php    |  6 +++---
 .../phid/handle/pool/PhabricatorHandleList.php         |  2 +-
 .../phid/resolver/PhabricatorPHIDResolver.php          |  2 +-
 .../provider/PhortuneStripePaymentProvider.php         |  2 +-
 .../phrequent/storage/PhrequentTimeBlock.php           |  2 +-
 .../phriction/editor/PhrictionTransactionEditor.php    |  2 +-
 .../policy/filter/PhabricatorPolicyFilter.php          |  2 +-
 .../project/query/PhabricatorProjectColumnQuery.php    |  2 +-
 .../project/remarkup/ProjectRemarkupRule.php           |  2 +-
 .../DifferentialReleephRequestFieldSpecification.php   |  2 +-
 .../field/selector/ReleephDefaultFieldSelector.php     |  2 +-
 .../daemon/PhabricatorMercurialGraphStream.php         |  2 +-
 .../data/PhabricatorRepositoryURINormalizer.php        |  4 ++--
 .../engine/PhabricatorRepositoryDiscoveryEngine.php    |  2 +-
 .../PhabricatorRepositoryManagementThawWorkflow.php    |  2 +-
 .../repository/storage/PhabricatorRepository.php       |  4 ++--
 .../repository/storage/PhabricatorRepositoryURI.php    |  2 +-
 .../PhabricatorRepositoryWorkingCopyVersion.php        |  2 +-
 ...atorRepositoryMercurialCommitChangeParserWorker.php |  2 +-
 .../engine/PhabricatorApplicationSearchEngine.php      |  2 +-
 .../management/PhabricatorSearchManagementWorkflow.php |  2 +-
 .../menuitem/PhabricatorMotivatorProfileMenuItem.php   |  4 ++--
 .../settings/panel/PhabricatorSettingsPanel.php        |  2 +-
 .../settings/query/PhabricatorUserPreferencesQuery.php |  2 +-
 .../settings/setting/PhabricatorTimezoneSetting.php    |  2 +-
 .../PhabricatorSubscriptionsEditController.php         |  2 +-
 .../transactions/editengine/PhabricatorEditEngine.php  |  4 ++--
 .../editor/PhabricatorApplicationTransactionEditor.php |  2 +-
 .../datasource/PhabricatorTypeaheadDatasource.php      |  2 +-
 .../uiexample/examples/PhabricatorStatusUIExample.php  |  2 +-
 src/docs/contributor/cla.diviner                       |  6 +++---
 src/docs/contributor/describing_problems.diviner       |  2 +-
 src/docs/contributor/internationalization.diviner      |  2 +-
 src/docs/contributor/reproduction_steps.diviner        |  4 ++--
 src/docs/user/cluster/cluster.diviner                  |  2 +-
 src/docs/user/cluster/cluster_databases.diviner        |  2 +-
 src/docs/user/cluster/cluster_devices.diviner          |  2 +-
 src/docs/user/cluster/cluster_partitioning.diviner     |  6 +++---
 src/docs/user/cluster/cluster_repositories.diviner     |  2 +-
 src/docs/user/cluster/cluster_search.diviner           |  4 ++--
 .../user/configuration/configuration_guide.diviner     |  4 ++--
 .../user/configuration/configuring_backups.diviner     |  2 +-
 .../user/configuration/configuring_encryption.diviner  |  4 ++--
 src/docs/user/configuration/managing_garbage.diviner   |  2 +-
 src/docs/user/field/conduit_changes.diviner            |  2 +-
 src/docs/user/field/darkconsole.diviner                |  2 +-
 src/docs/user/field/performance.diviner                |  4 ++--
 src/docs/user/field/repository_imports.diviner         |  8 ++++----
 src/docs/user/field/xhprof.diviner                     |  2 +-
 src/docs/user/userguide/almanac.diviner                |  2 +-
 src/docs/user/userguide/arcanist.diviner               |  2 +-
 src/docs/user/userguide/arcanist_lint.diviner          |  2 +-
 src/docs/user/userguide/calendar_exports.diviner       |  2 +-
 src/docs/user/userguide/calendar_imports.diviner       |  2 +-
 src/docs/user/userguide/conduit_edit.diviner           |  2 +-
 src/docs/user/userguide/diffusion_api.diviner          |  2 +-
 src/docs/user/userguide/diffusion_hosting.diviner      |  2 +-
 src/docs/user/userguide/diffusion_managing.diviner     | 10 +++++-----
 src/docs/user/userguide/diffusion_uris.diviner         |  4 ++--
 src/docs/user/userguide/drydock.diviner                |  2 +-
 src/docs/user/userguide/drydock_blueprints.diviner     |  2 +-
 src/docs/user/userguide/drydock_security.diviner       |  2 +-
 src/docs/user/userguide/forms.diviner                  |  2 +-
 src/docs/user/userguide/herald.diviner                 |  2 +-
 src/docs/user/userguide/jump.diviner                   |  2 +-
 src/docs/user/userguide/owners.diviner                 |  2 +-
 src/docs/user/userguide/projects.diviner               |  2 +-
 src/docs/user/userguide/remarkup.diviner               |  2 +-
 src/docs/user/userguide/search.diviner                 |  2 +-
 src/docs/user/userguide/spaces.diviner                 |  2 +-
 src/docs/user/userguide/users.diviner                  |  2 +-
 .../customfield/field/PhabricatorCustomFieldList.php   |  2 +-
 .../workers/query/PhabricatorWorkerTriggerQuery.php    |  4 ++--
 src/infrastructure/diff/view/PHUIDiffGraphView.php     |  2 +-
 .../diff/view/PHUIDiffInlineCommentTableScaffold.php   |  2 +-
 src/infrastructure/env/PhabricatorEnv.php              |  2 +-
 .../translation/PhabricatorUSEnglishTranslation.php    |  6 +++---
 .../policy/PhabricatorCursorPagedPolicyAwareQuery.php  |  4 ++--
 src/infrastructure/storage/lisk/LiskDAO.php            |  2 +-
 .../storage/lisk/__tests__/LiskFixtureTestCase.php     |  2 +-
 .../workflow/PhabricatorStorageManagementWorkflow.php  |  4 ++--
 src/infrastructure/util/PhabricatorHash.php            |  2 +-
 .../util/password/PhabricatorPasswordHasher.php        |  8 ++++----
 src/view/AphrontView.php                               |  2 +-
 src/view/page/PhabricatorStandardPageView.php          |  2 +-
 src/view/phui/PHUIHeaderView.php                       |  2 +-
 webroot/rsrc/css/phui/phui-document.css                |  4 ++--
 webroot/rsrc/css/phui/phui-header-view.css             |  2 +-
 .../rsrc/js/application/conpherence/behavior-menu.js   |  2 +-
 .../conpherence/behavior-participant-pane.js           |  2 +-
 .../application/diffusion/DiffusionLocateFileSource.js |  2 +-
 .../js/application/pholio/behavior-pholio-mock-view.js |  2 +-
 webroot/rsrc/js/core/Prefab.js                         |  4 ++--
 webroot/rsrc/js/core/behavior-device.js                |  2 +-
 webroot/rsrc/js/phuix/PHUIXAutocomplete.js             |  2 +-
 webroot/rsrc/js/phuix/PHUIXDropdownMenu.js             |  2 +-
 157 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/scripts/setup/manage_garbage.php b/scripts/setup/manage_garbage.php
index ba727eab60..326730375e 100755
--- a/scripts/setup/manage_garbage.php
+++ b/scripts/setup/manage_garbage.php
@@ -5,7 +5,7 @@
 require_once $root.'/scripts/__init_script__.php';
 
 $args = new PhutilArgumentParser($argv);
-$args->setTagline(pht('manage garbage colletors'));
+$args->setTagline(pht('manage garbage collectors'));
 $args->setSynopsis(<<<EOSYNOPSIS
 **garbage** __command__ [__options__]
     Manage garbage collectors.
diff --git a/src/aphront/httpparametertype/AphrontHTTPParameterType.php b/src/aphront/httpparametertype/AphrontHTTPParameterType.php
index 995556a6b9..78a62a663c 100644
--- a/src/aphront/httpparametertype/AphrontHTTPParameterType.php
+++ b/src/aphront/httpparametertype/AphrontHTTPParameterType.php
@@ -160,7 +160,7 @@ final public function getExamples() {
   /**
    * Call another type's existence check.
    *
-   * This method allows a type to reuse the exitence behavior of a different
+   * This method allows a type to reuse the existence behavior of a different
    * type. For example, a "list of users" type may have the same basic
    * existence check that a simpler "list of strings" type has, and can just
    * call the simpler type to reuse its behavior.
diff --git a/src/applications/almanac/editor/AlmanacDeviceEditor.php b/src/applications/almanac/editor/AlmanacDeviceEditor.php
index 64b8de7bad..8e110954a3 100644
--- a/src/applications/almanac/editor/AlmanacDeviceEditor.php
+++ b/src/applications/almanac/editor/AlmanacDeviceEditor.php
@@ -204,7 +204,7 @@ protected function validateTransaction(
                 $xaction);
               $errors[] = $error;
             } else {
-              // TODO: Validate addresses, but IPv6 addresses are not trival
+              // TODO: Validate addresses, but IPv6 addresses are not trivial
               // to validate.
             }
 
diff --git a/src/applications/audit/view/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php
index f9399e66ab..cb9fecac3a 100644
--- a/src/applications/audit/view/PhabricatorAuditListView.php
+++ b/src/applications/audit/view/PhabricatorAuditListView.php
@@ -63,7 +63,7 @@ private function getCommitDescription($phid) {
       return $summary;
     }
 
-    // No summary, so either this is still impoting or just has an empty
+    // No summary, so either this is still importing or just has an empty
     // commit message.
 
     if (!$commit->isImported()) {
diff --git a/src/applications/auth/controller/PhabricatorAuthController.php b/src/applications/auth/controller/PhabricatorAuthController.php
index c5b3c1ce99..0ed86e3056 100644
--- a/src/applications/auth/controller/PhabricatorAuthController.php
+++ b/src/applications/auth/controller/PhabricatorAuthController.php
@@ -134,7 +134,7 @@ protected function loadAccountForRegistrationOrLinking($account_key) {
     // checks later on to make sure this account is valid for the intended
     // operation. This requires edit permission for completeness and consistency
     // but it won't actually be meaningfully checked because we're using the
-    // ominpotent user.
+    // omnipotent user.
 
     $account = id(new PhabricatorExternalAccountQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
index a68e12c801..5a792dc864 100644
--- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php
+++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
@@ -79,7 +79,7 @@ public function handleRequest(AphrontRequest $request) {
     }
 
     if ($default_email !== null) {
-      // We should bypass policy here becase e.g. limiting an application use
+      // We should bypass policy here because e.g. limiting an application use
       // to a subset of users should not allow the others to overwrite
       // configured application emails.
       $application_email = id(new PhabricatorMetaMTAApplicationEmailQuery())
diff --git a/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php b/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
index 0962b7b56a..1c40af5795 100644
--- a/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
+++ b/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
@@ -226,7 +226,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
       ->addHeader('Thread-Topic', $phid);
 
     // The primary value of this mail is alerting users to account compromises,
-    // so force delivery. In particular, this mail should still be delievered
+    // so force delivery. In particular, this mail should still be delivered
     // even if "self mail" is disabled.
     $mail->setForceDelivery(true);
 
diff --git a/src/applications/auth/factor/__tests__/PhabricatorAuthInviteTestCase.php b/src/applications/auth/factor/__tests__/PhabricatorAuthInviteTestCase.php
index 3906c5eabe..ce9151bcef 100644
--- a/src/applications/auth/factor/__tests__/PhabricatorAuthInviteTestCase.php
+++ b/src/applications/auth/factor/__tests__/PhabricatorAuthInviteTestCase.php
@@ -51,7 +51,7 @@ public function testDuplicateInvite() {
       $caught = $ex;
     }
 
-    // This first time should accept the invite and verify the addresss.
+    // This first time should accept the invite and verify the address.
     $this->assertTrue(
       ($caught instanceof PhabricatorAuthInviteRegisteredException));
 
diff --git a/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
index bb94cfca62..758761b2ca 100644
--- a/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
+++ b/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
@@ -74,7 +74,7 @@ public function execute(PhutilArgumentParser $args) {
     if (!strlen($from) && !$is_everywhere) {
       throw new PhutilArgumentUsageException(
         pht(
-          'Specify the target to revoke credentals from with "--from" or '.
+          'Specify the target to revoke credentials from with "--from" or '.
           'specify "--everywhere".'));
     } else if (strlen($from) && $is_everywhere) {
       throw new PhutilArgumentUsageException(
diff --git a/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php b/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
index 530bf30583..c62983de2f 100644
--- a/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
@@ -270,7 +270,7 @@ private function getTemporaryTokenType($core_type) {
   }
 
   private function getHandshakeTokenKeyFromClientCode($client_code) {
-    // NOTE: This is very slightly coersive since the TemporaryToken table
+    // NOTE: This is very slightly coercive since the TemporaryToken table
     // expects an "objectPHID" as an identifier, but nothing about the storage
     // is bound to PHIDs.
 
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index 72b577771f..c25612408c 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -108,7 +108,7 @@ public function isUnlisted() {
    *
    * Launchable applications can be pinned to the home page, and show up in the
    * "Launcher" view of the Applications application. Making an application
-   * unlauncahble prevents pinning and hides it from this view.
+   * unlaunchable prevents pinning and hides it from this view.
    *
    * Usually, an application should be marked unlaunchable if:
    *
diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index 1ecfdaf557..f923eb7b73 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -552,7 +552,7 @@ protected function buildTransactionTimeline(
 
 
   public function buildApplicationCrumbsForEditEngine() {
-    // TODO: This is kind of gross, I'm bascially just making this public so
+    // TODO: This is kind of gross, I'm basically just making this public so
     // I can use it in EditEngine. We could do this without making it public
     // by using controller delegation, or make it properly public.
     return $this->buildApplicationCrumbs();
diff --git a/src/applications/calendar/editor/PhabricatorCalendarImportEditEngine.php b/src/applications/calendar/editor/PhabricatorCalendarImportEditEngine.php
index c3dc29bb51..90b4962ca9 100644
--- a/src/applications/calendar/editor/PhabricatorCalendarImportEditEngine.php
+++ b/src/applications/calendar/editor/PhabricatorCalendarImportEditEngine.php
@@ -134,7 +134,7 @@ protected function buildCustomEditFields($object) {
       $fields[] = id(new PhabricatorSelectEditField())
         ->setKey('frequency')
         ->setLabel(pht('Update Automatically'))
-        ->setDescription(pht('Configure an automatic update frequncy.'))
+        ->setDescription(pht('Configure an automatic update frequency.'))
         ->setTransactionType(
           PhabricatorCalendarImportFrequencyTransaction::TRANSACTIONTYPE)
         ->setConduitDescription(pht('Set the automatic update frequency.'))
diff --git a/src/applications/calendar/icon/PhabricatorCalendarIconSet.php b/src/applications/calendar/icon/PhabricatorCalendarIconSet.php
index 22d5b0e4f5..ab6d2126ed 100644
--- a/src/applications/calendar/icon/PhabricatorCalendarIconSet.php
+++ b/src/applications/calendar/icon/PhabricatorCalendarIconSet.php
@@ -16,7 +16,7 @@ protected function newIcons() {
       'fa-plane' => pht('Travel'),
       'fa-plus-square' => pht('Health / Appointment'),
 
-      'fa-rocket' => pht('Sabatical / Leave'),
+      'fa-rocket' => pht('Sabbatical / Leave'),
       'fa-home' => pht('Working From Home'),
       'fa-tree' => pht('Holiday'),
       'fa-gamepad' => pht('Staycation'),
diff --git a/src/applications/calendar/util/CalendarTimeUtil.php b/src/applications/calendar/util/CalendarTimeUtil.php
index 781f6adf7a..d3276654e4 100644
--- a/src/applications/calendar/util/CalendarTimeUtil.php
+++ b/src/applications/calendar/util/CalendarTimeUtil.php
@@ -8,7 +8,7 @@
  * calendar views - one for the conpherence calendar widget and one for the
  * user profile calendar view. These have slight differences such as
  * conpherence showing both a three day "today 'til 2 days from now" *and*
- * a Sunday -> Saturday list, whilest the profile view shows a more simple
+ * a Sunday -> Saturday list, whilst the profile view shows a more simple
  * seven day rolling list of events.
  */
 final class CalendarTimeUtil extends Phobject {
diff --git a/src/applications/calendar/xaction/PhabricatorCalendarEventFrequencyTransaction.php b/src/applications/calendar/xaction/PhabricatorCalendarEventFrequencyTransaction.php
index 6fb8ae8f31..69f2e9e8a6 100644
--- a/src/applications/calendar/xaction/PhabricatorCalendarEventFrequencyTransaction.php
+++ b/src/applications/calendar/xaction/PhabricatorCalendarEventFrequencyTransaction.php
@@ -23,7 +23,7 @@ public function applyInternalEffects($object, $value) {
     // month, it means "the 30th of every month" as far as the RRULE is
     // concerned. Such an event will not occur on months with fewer days.
 
-    // This is surprising, and proably not what the user wants. Instead,
+    // This is surprising, and probably not what the user wants. Instead,
     // schedule these events relative to the end of the month: on the "-1st",
     // "-2nd" or "-3rd" day of the month. For example, a monthly event on
     // the 31st of a 31-day month translates to "every month, on the last
@@ -66,7 +66,7 @@ public function validateTransactions($object, array $xactions) {
       if (!isset($valid[$value])) {
         $errors[] = $this->newInvalidError(
           pht(
-            'Event frequency "%s" is not valid. Valid frequences are: %s.',
+            'Event frequency "%s" is not valid. Valid frequencies are: %s.',
             $value,
             implode(', ', $valid)),
           $xaction);
diff --git a/src/applications/calendar/xaction/PhabricatorCalendarEventInviteTransaction.php b/src/applications/calendar/xaction/PhabricatorCalendarEventInviteTransaction.php
index f1da2c1d77..841a066320 100644
--- a/src/applications/calendar/xaction/PhabricatorCalendarEventInviteTransaction.php
+++ b/src/applications/calendar/xaction/PhabricatorCalendarEventInviteTransaction.php
@@ -132,7 +132,7 @@ public function getTitle() {
         $this->renderHandleList($rem));
     } else {
       return pht(
-        '%s invited %s attendee(s): %s; uninvinted %s attendee(s): %s.',
+        '%s invited %s attendee(s): %s; uninvited %s attendee(s): %s.',
         $this->renderAuthor(),
         phutil_count($add),
         $this->renderHandleList($add),
@@ -161,7 +161,7 @@ public function getTitleForFeed() {
     } else {
       return pht(
         '%s updated the invite list for %s, invited %s: %s; '.
-        'uninvinted %s: %s.',
+        'uninvited %s: %s.',
         $this->renderAuthor(),
         $this->renderObject(),
         phutil_count($add),
diff --git a/src/applications/calendar/xaction/PhabricatorCalendarImportFrequencyTransaction.php b/src/applications/calendar/xaction/PhabricatorCalendarImportFrequencyTransaction.php
index 177adbbf0b..9fc68a3497 100644
--- a/src/applications/calendar/xaction/PhabricatorCalendarImportFrequencyTransaction.php
+++ b/src/applications/calendar/xaction/PhabricatorCalendarImportFrequencyTransaction.php
@@ -32,7 +32,7 @@ public function validateTransactions($object, array $xactions) {
       if (!isset($valid[$value])) {
         $errors[] = $this->newInvalidError(
           pht(
-            'Import frequency "%s" is not valid. Valid frequences are: %s.',
+            'Import frequency "%s" is not valid. Valid frequencies are: %s.',
             $value,
             implode(', ', $valid)),
           $xaction);
diff --git a/src/applications/config/check/PhabricatorStorageSetupCheck.php b/src/applications/config/check/PhabricatorStorageSetupCheck.php
index 09cecfe6d0..cc74cce2ea 100644
--- a/src/applications/config/check/PhabricatorStorageSetupCheck.php
+++ b/src/applications/config/check/PhabricatorStorageSetupCheck.php
@@ -85,7 +85,7 @@ protected function executeChecks() {
           'be buffered into memory before being written to permanent '.
           'storage. Phabricator needs memory available to store these '.
           'chunks while they are uploaded, but PHP is currently configured '.
-          'to severly limit the available memory.'.
+          'to severely limit the available memory.'.
           "\n\n".
           'PHP processes currently have very little free memory available '.
           '(%s). To work well, processes should have at least %s.'.
diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php
index 1bb96537dc..5cd6489d65 100644
--- a/src/applications/conpherence/query/ConpherenceThreadQuery.php
+++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php
@@ -290,7 +290,7 @@ private function loadTransactionsAndHandles(array $conpherences) {
       ->withObjectPHIDs(array_keys($conpherences))
       ->needHandles(true);
 
-    // We have to flip these for the underyling query class. The semantics of
+    // We have to flip these for the underlying query class. The semantics of
     // paging are tricky business.
     if ($this->afterTransactionID) {
       $query->setBeforeID($this->afterTransactionID);
diff --git a/src/applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php b/src/applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php
index 96566db54a..07bbb67ae2 100644
--- a/src/applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php
+++ b/src/applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php
@@ -78,7 +78,7 @@ public function getApplicationTransactionTitle(
 
   public function renderEditControl(array $handles) {
     // NOTE: This includes archived panels so we don't mutate the tabs
-    // when saving a tab panel that includes archied panels. This whole UI is
+    // when saving a tab panel that includes archived panels. This whole UI is
     // hopefully temporary anyway.
 
     $value = $this->getFieldValue();
diff --git a/src/applications/differential/controller/DifferentialController.php b/src/applications/differential/controller/DifferentialController.php
index fb8a6249a7..1860a07745 100644
--- a/src/applications/differential/controller/DifferentialController.php
+++ b/src/applications/differential/controller/DifferentialController.php
@@ -217,7 +217,7 @@ protected function loadHarbormasterData(array $diffs) {
       // by default and let the user toggle the rest. With modern messages,
       // we can send the user to the Harbormaster detail page. Just show
       // "a lot" of messages in legacy cases to try to strike a balance
-      // between implementation simplicitly and compatibility.
+      // between implementation simplicity and compatibility.
       $legacy_messages = array_slice($legacy_messages, 0, 100);
 
       $messages = array();
diff --git a/src/applications/differential/customfield/DifferentialHarbormasterField.php b/src/applications/differential/customfield/DifferentialHarbormasterField.php
index c9b573bda2..cc13be3aa7 100644
--- a/src/applications/differential/customfield/DifferentialHarbormasterField.php
+++ b/src/applications/differential/customfield/DifferentialHarbormasterField.php
@@ -45,7 +45,7 @@ public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
         // by default and let the user toggle the rest. With modern messages,
         // we can send the user to the Harbormaster detail page. Just show
         // "a lot" of messages in legacy cases to try to strike a balance
-        // between implementation simplicitly and compatibility.
+        // between implementation simplicity and compatibility.
         $legacy_messages = array_slice($legacy_messages, 0, 100);
 
         foreach ($legacy_messages as $message) {
diff --git a/src/applications/differential/editor/DifferentialDiffEditor.php b/src/applications/differential/editor/DifferentialDiffEditor.php
index 0058485e63..261f6f1598 100644
--- a/src/applications/differential/editor/DifferentialDiffEditor.php
+++ b/src/applications/differential/editor/DifferentialDiffEditor.php
@@ -106,7 +106,7 @@ protected function applyFinalEffects(
    * We run Herald as part of transaction validation because Herald can
    * block diff creation for Differential diffs. Its important to do this
    * separately so no Herald logs are saved; these logs could expose
-   * information the Herald rules are inteneded to block.
+   * information the Herald rules are intended to block.
    */
   protected function validateTransaction(
     PhabricatorLiskDAO $object,
diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php
index 88303cf420..1eeb4c8452 100644
--- a/src/applications/differential/parser/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/DifferentialChangesetParser.php
@@ -699,7 +699,7 @@ private function process() {
     $hunk_parser->parseHunksForLineData($changeset->getHunks());
 
     // Depending on the whitespace mode, we may need to compute a different
-    // set of changes than the set of changes in the hunk data (specificaly,
+    // set of changes than the set of changes in the hunk data (specifically,
     // we might want to consider changed lines which have only whitespace
     // changes as unchanged).
     if ($ignore_all) {
@@ -1192,11 +1192,11 @@ public function render(
    * Mask - compute the actual lines that need to be shown (because they
    * are near changes lines, near inline comments, or the request has
    * explicitly asked for them, i.e. resulting from the user clicking
-   * "show more"). The $mask returned is a sparesely populated dictionary
+   * "show more"). The $mask returned is a sparsely populated dictionary
    * of $visible_line_number => true.
    *
    * Depths - compute how indented any given line is. The $depths returned
-   * is a sparesely populated dictionary of $visible_line_number => $depth.
+   * is a sparsely populated dictionary of $visible_line_number => $depth.
    *
    * This function also has the side effect of modifying member variable
    * new such that tabs are normalized to spaces for each line of the diff.
diff --git a/src/applications/differential/storage/DifferentialModernHunk.php b/src/applications/differential/storage/DifferentialModernHunk.php
index cde6f29329..c3675c8adf 100644
--- a/src/applications/differential/storage/DifferentialModernHunk.php
+++ b/src/applications/differential/storage/DifferentialModernHunk.php
@@ -128,7 +128,7 @@ public function saveAsFile() {
     $this->setData($file->getPHID());
 
     // NOTE: Because hunks don't have a PHID and we just load hunk data with
-    // the ominipotent viewer, we do not need to attach the file to anything.
+    // the omnipotent viewer, we do not need to attach the file to anything.
 
     $result = $this->save();
 
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 7bcd178a41..e29db36b14 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -442,7 +442,7 @@ private function newReviewerForceAcceptMap(PhabricatorUser $viewer) {
 
     // For each path which the viewer owns a package for, find other packages
     // which that authority can be used to force-accept. Once we find a way to
-    // force-accept a package, we don't need to keep loooking.
+    // force-accept a package, we don't need to keep looking.
     $has_control = array();
     foreach ($force_map as $path => $spec) {
       $path_fragments = PhabricatorOwnersPackage::splitPath($path);
@@ -891,7 +891,7 @@ public function destroyObjectPermanently(
         self::TABLE_COMMIT,
         $this->getID());
 
-      // we have to do paths a little differentally as they do not have
+      // we have to do paths a little differently as they do not have
       // an id or phid column for delete() to act on
       $dummy_path = new DifferentialAffectedPath();
       queryfx(
diff --git a/src/applications/differential/typeahead/DifferentialResponsibleViewerFunctionDatasource.php b/src/applications/differential/typeahead/DifferentialResponsibleViewerFunctionDatasource.php
index 51eb2beb9a..d23ecff47d 100644
--- a/src/applications/differential/typeahead/DifferentialResponsibleViewerFunctionDatasource.php
+++ b/src/applications/differential/typeahead/DifferentialResponsibleViewerFunctionDatasource.php
@@ -22,7 +22,7 @@ public function getDatasourceFunctions() {
         'summary' => pht('Use the current viewing user.'),
         'description' => pht(
           'Show revisions the current viewer is responsible for. This '.
-          'function inclues revisions the viewer is responsible for through '.
+          'function includes revisions the viewer is responsible for through '.
           'membership in projects and packages.'),
       ),
     );
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 38c94e8a92..d7734856f0 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -479,7 +479,7 @@ private function buildPropertyListView(
     // chains of events). This should be rare, but does not indicate a bug
     // or data issue.
 
-    // NOTE: We never query push logs in SVN because the commiter is always
+    // NOTE: We never query push logs in SVN because the committer is always
     // the pusher and the commit time is always the push time; the push log
     // is redundant and we save a query by skipping it.
 
diff --git a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
index 2459c8c559..b3baafbd06 100644
--- a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
+++ b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
@@ -338,7 +338,7 @@ protected function buildCustomEditFields($object) {
         ->setIsCopyable(true)
         ->setDescription(pht('Track only these branches.'))
         ->setConduitDescription(pht('Set the tracked branches.'))
-        ->setConduitTypeDescription(pht('New tracked branchs.'))
+        ->setConduitTypeDescription(pht('New tracked branches.'))
         ->setValue($track_value),
       id(new PhabricatorTextAreaEditField())
         ->setIsStringList(true)
@@ -349,7 +349,7 @@ protected function buildCustomEditFields($object) {
         ->setIsCopyable(true)
         ->setDescription(pht('Autoclose commits on only these branches.'))
         ->setConduitDescription(pht('Set the autoclose branches.'))
-        ->setConduitTypeDescription(pht('New default tracked branchs.'))
+        ->setConduitTypeDescription(pht('New default tracked branches.'))
         ->setValue($autoclose_value),
       id(new PhabricatorTextEditField())
         ->setKey('importOnly')
@@ -396,7 +396,7 @@ protected function buildCustomEditFields($object) {
         ->setConduitDescription(
           pht('Change symbol languages for this repository.'))
         ->setConduitTypeDescription(
-          pht('New symbol langauges.'))
+          pht('New symbol languages.'))
         ->setValue($object->getSymbolLanguages()),
       id(new PhabricatorDatasourceEditField())
         ->setKey('symbolRepositoryPHIDs')
diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index 21df37d87d..7fe45834b3 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -1230,7 +1230,7 @@ private function isInitialImport(array $all_updates) {
     // also look at author data (do the commits come from multiple different
     // authors?) and commit date data (is the oldest commit more than 48 hours
     // old), but we don't have immediate access to those and this simple
-    // heruistic might be good enough.
+    // heuristic might be good enough.
 
     $commit_count = 0;
     $type_commit = PhabricatorRepositoryPushLog::REFTYPE_COMMIT;
diff --git a/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php b/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
index aca7367f8c..41c009455d 100644
--- a/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
+++ b/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
@@ -80,7 +80,7 @@ protected function executeRepositoryOperations() {
 
     $lfs_uri = $repository->getGitLFSURI('info/lfs');
 
-    // Generate a temporary token to allow the user to acces LFS over HTTP.
+    // Generate a temporary token to allow the user to access LFS over HTTP.
     // This works even if normal HTTP repository operations are not available
     // on this host, and does not require the user to have a VCS password.
 
diff --git a/src/applications/diffusion/herald/HeraldCommitAdapter.php b/src/applications/diffusion/herald/HeraldCommitAdapter.php
index 4687028418..bfcd8e3ccb 100644
--- a/src/applications/diffusion/herald/HeraldCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldCommitAdapter.php
@@ -112,7 +112,7 @@ public function getTriggerObjectPHIDs() {
     $phids[] = $repository_phid;
 
     // NOTE: This is projects for the repository, not for the commit. When
-    // Herald evalutes, commits normally can not have any project tags yet.
+    // Herald evaluates, commits normally can not have any project tags yet.
     $repository_project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $repository_phid,
       $project_type);
diff --git a/src/applications/diffusion/protocol/DiffusionCommandEngine.php b/src/applications/diffusion/protocol/DiffusionCommandEngine.php
index b787745a02..53a086db33 100644
--- a/src/applications/diffusion/protocol/DiffusionCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionCommandEngine.php
@@ -178,7 +178,7 @@ private function newCommonEnvironment() {
       if (!$device) {
         throw new Exception(
           pht(
-            'Attempting to build a reposiory command (for repository "%s") '.
+            'Attempting to build a repository command (for repository "%s") '.
             'as device, but this host ("%s") is not configured as a cluster '.
             'device.',
             $repository->getDisplayName(),
diff --git a/src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php b/src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php
index 32a73867e5..251935a6dc 100644
--- a/src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php
+++ b/src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php
@@ -101,7 +101,7 @@ public static function isReadOnlyBatchCommand($cmds) {
 
   /** If the server version is running 3.4+ it will respond
    * with 'bundle2' capability in the format of "bundle2=(url-encoding)".
-   * Until we maange to properly package up bundles to send back we
+   * Until we manage to properly package up bundles to send back we
    * disallow the client from knowing we speak bundle2 by removing it
    * from the capabilities listing.
    *
diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
index e822bb76b0..35bb4d4acf 100644
--- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
@@ -231,7 +231,7 @@ public function synchronizeWorkingCopyBeforeRead() {
       // no way to tell which one has the "right" data. If we pick wrong, we
       // might erase some or all of the data in the repository.
 
-      // Since this is dangeorus, we refuse to guess unless there is only one
+      // Since this is dangerous, we refuse to guess unless there is only one
       // device. If we're the only device in the group, we obviously must be
       // a leader.
 
@@ -252,7 +252,7 @@ public function synchronizeWorkingCopyBeforeRead() {
             'Repository "%s" exists on more than one device, but no device '.
             'has any repository version information. Phabricator can not '.
             'guess which copy of the existing data is authoritative. Promote '.
-            'a device or see "Ambigous Leaders" in the documentation.',
+            'a device or see "Ambiguous Leaders" in the documentation.',
             $repository->getDisplayName()));
       }
 
diff --git a/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php b/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php
index 22ff1d61f0..0217c97d58 100644
--- a/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php
+++ b/src/applications/diffusion/query/DiffusionCachedResolveRefsQuery.php
@@ -9,7 +9,7 @@
  * low-level query can.
  *
  * This class can resolve the most common refs (commits, branches, tags) and
- * can do so cheapy (by examining the database, without needing to make calls
+ * can do so cheaply (by examining the database, without needing to make calls
  * to the VCS or the service host).
  */
 final class DiffusionCachedResolveRefsQuery
diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
index 1521f5770c..da8937910e 100644
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -69,7 +69,7 @@ public function withRepository(PhabricatorRepository $repository) {
 
   /**
    * Look up commits in a specific repository. Prefer
-   * @{method:withRepositoryIDs}; the underyling table is keyed by ID such
+   * @{method:withRepositoryIDs}; the underlying table is keyed by ID such
    * that this method requires a separate initial query to map PHID to ID.
    */
   public function withRepositoryPHIDs(array $phids) {
diff --git a/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
index ff1cc9f3c5..30ec8d9f6d 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
@@ -53,7 +53,7 @@ protected function validateAction($object, PhabricatorUser $viewer) {
     }
 
     // Even if you've already raised a concern, you can raise again as long
-    // as the author requsted you verify.
+    // as the author requested you verify.
     $state_verify = PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION;
 
     if ($this->isViewerFullyRejected($object, $viewer)) {
diff --git a/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
index f9b3fc5161..a44261f7a4 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
@@ -53,7 +53,7 @@ protected function validateAction($object, PhabricatorUser $viewer) {
       throw new Exception(
         pht(
           'You can not request verification of this commit because no '.
-          'auditors have raised conerns with it.'));
+          'auditors have raised concerns with it.'));
     }
   }
 
diff --git a/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
index 76a81d7ef1..a050a859e3 100644
--- a/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
@@ -64,7 +64,7 @@ public function getViewer() {
    * is a coarse compatibility check between a lease and a resource.
    *
    * @param DrydockBlueprint Concrete blueprint to allocate for.
-   * @param DrydockResource Candidiate resource to allocate the lease on.
+   * @param DrydockResource Candidate resource to allocate the lease on.
    * @param DrydockLease Pending lease that wants to allocate here.
    * @return bool True if the resource and lease are compatible.
    * @task lease
@@ -76,7 +76,7 @@ abstract public function canAcquireLeaseOnResource(
 
 
   /**
-   * Acquire a lease. Allows resources to peform setup as leases are brought
+   * Acquire a lease. Allows resources to perform setup as leases are brought
    * online.
    *
    * If acquisition fails, throw an exception.
diff --git a/src/applications/drydock/storage/DrydockAuthorization.php b/src/applications/drydock/storage/DrydockAuthorization.php
index cfd186c9d3..32e694918c 100644
--- a/src/applications/drydock/storage/DrydockAuthorization.php
+++ b/src/applications/drydock/storage/DrydockAuthorization.php
@@ -100,7 +100,7 @@ public function isAuthorized() {
   }
 
   /**
-   * Apply external authorization effects after a user chagnes the value of a
+   * Apply external authorization effects after a user changes the value of a
    * blueprint selector control an object.
    *
    * @param PhabricatorUser User applying the change.
diff --git a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
index a41e57fbf8..d73506f286 100644
--- a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
@@ -241,7 +241,7 @@ private function executeAllocator(DrydockLease $lease) {
       // NOTE: We have not acquired the lease yet, so it is possible that the
       // resource we just built will be snatched up by some other lease before
       // we can acquire it. This is not problematic: we'll retry a little later
-      // and should suceed eventually.
+      // and should succeed eventually.
     }
 
     $resources = $this->rankResources($resources, $lease);
@@ -261,7 +261,7 @@ private function executeAllocator(DrydockLease $lease) {
     if (!$allocated) {
       throw new PhutilAggregateException(
         pht(
-          'Unable to acquire lease "%s" on any resouce.',
+          'Unable to acquire lease "%s" on any resource.',
           $lease->getPHID()),
         $exceptions);
     }
@@ -725,7 +725,7 @@ private function activateLease(DrydockLease $lease) {
     // performed the read above and now, the resource might have closed, so
     // we may activate leases on dead resources. At least for now, this seems
     // fine: a resource dying right before we activate a lease on it should not
-    // be distinguisahble from a resource dying right after we activate a lease
+    // be distinguishable from a resource dying right after we activate a lease
     // on it. We end up with an active lease on a dead resource either way, and
     // can not prevent resources dying from lightning strikes.
 
diff --git a/src/applications/drydock/worker/DrydockWorker.php b/src/applications/drydock/worker/DrydockWorker.php
index f167fef5d0..443780680d 100644
--- a/src/applications/drydock/worker/DrydockWorker.php
+++ b/src/applications/drydock/worker/DrydockWorker.php
@@ -199,7 +199,7 @@ protected function canReclaimResource(DrydockResource $resource) {
     $viewer = $this->getViewer();
 
     // Don't reclaim a resource if it has been updated recently. If two
-    // leases are fighting, we don't want them to keep reclaming resources
+    // leases are fighting, we don't want them to keep reclaiming resources
     // from one another forever without making progress, so make resources
     // immune to reclamation for a little while after they activate or update.
 
diff --git a/src/applications/files/controller/PhabricatorFileDataController.php b/src/applications/files/controller/PhabricatorFileDataController.php
index c8bfcc488a..da438730cd 100644
--- a/src/applications/files/controller/PhabricatorFileDataController.php
+++ b/src/applications/files/controller/PhabricatorFileDataController.php
@@ -119,7 +119,7 @@ private function loadFile() {
     // make this logic simpler and more consistent.
 
     // Beyond making the policy check itself more consistent, this also makes
-    // sure we're consitent about returning HTTP 404 on bad requests instead
+    // sure we're consistent about returning HTTP 404 on bad requests instead
     // of serving HTTP 200 with a login page, which can mislead some clients.
 
     $viewer = PhabricatorUser::getOmnipotentUser();
diff --git a/src/applications/files/management/PhabricatorFilesManagementCatWorkflow.php b/src/applications/files/management/PhabricatorFilesManagementCatWorkflow.php
index 70d5eca5a2..5bf40a057d 100644
--- a/src/applications/files/management/PhabricatorFilesManagementCatWorkflow.php
+++ b/src/applications/files/management/PhabricatorFilesManagementCatWorkflow.php
@@ -24,7 +24,7 @@ protected function didConstruct() {
             'help' => pht(
               'DANGEROUS. Attempt to salvage file content even if the '.
               'integrity check fails. If an adversary has tampered with '.
-              'the file, the conent may be unsafe.'),
+              'the file, the content may be unsafe.'),
           ),
           array(
             'name'      => 'names',
diff --git a/src/applications/fund/editor/FundInitiativeEditEngine.php b/src/applications/fund/editor/FundInitiativeEditEngine.php
index 201a814a0c..824f4e009f 100644
--- a/src/applications/fund/editor/FundInitiativeEditEngine.php
+++ b/src/applications/fund/editor/FundInitiativeEditEngine.php
@@ -50,7 +50,7 @@ protected function getObjectCreateShortText() {
   }
 
   protected function getObjectName() {
-    return pht('Initivative');
+    return pht('Initiative');
   }
 
   protected function getObjectCreateCancelURI($object) {
diff --git a/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php b/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
index 9c3f88d631..dbf1f18cfa 100644
--- a/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
+++ b/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
@@ -142,7 +142,7 @@ public function getMethodDescription() {
       "=============\n".
       "When you send Harbormaster a message, you must include a `type`, ".
       "which describes the overall state of the build. For example, use ".
-      "`pass` to tell Harbomaster that a build completed successfully.".
+      "`pass` to tell Harbormaster that a build completed successfully.".
       "\n\n".
       "Supported message types are:".
       "\n\n".
@@ -155,7 +155,7 @@ public function getMethodDescription() {
       "message, but you can also send a `work` message to report intermediate ".
       "results.\n\n".
       "To provide unit test results, pass a list of results in the `unit` ".
-      "parameter. Each result shoud be a dictionary with these keys:".
+      "parameter. Each result should be a dictionary with these keys:".
       "\n\n".
       "%s".
       "\n\n".
diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
index cdb2044cc5..b29958882c 100644
--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
@@ -38,7 +38,7 @@ protected function getConfiguration() {
         // T6203/NULLABILITY
         // This should not be nullable. Current `null` values indicate steps
         // which predated editable names. These should be backfilled with
-        // default names, then the code for handling `null` shoudl be removed.
+        // default names, then the code for handling `null` should be removed.
         'name' => 'text255?',
         'stepAutoKey' => 'text32?',
       ),
diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
index 05a691e34a..f19cf43d0e 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
@@ -236,7 +236,7 @@ public function handleRequest(AphrontRequest $request) {
 
     // Use the last content update as the modified date. We don't want to
     // show that a document like a TOS was "updated" by an incidental change
-    // to a field like the preamble or privacy settings which does not acutally
+    // to a field like the preamble or privacy settings which does not actually
     // affect the content of the agreement.
     $content_updated = $document_body->getDateCreated();
 
diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
index 6a5b3ad50c..66aa154e8f 100644
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -116,7 +116,7 @@ public function renderBurn() {
         case ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE:
           // NOTE: Merging a task does not generate a "status" transaction.
           // We pretend it did. Note that this is not always accurate: it is
-          // possble to merge a task which was previously closed, but this
+          // possible to merge a task which was previously closed, but this
           // fake transaction always counts a merge as a closure.
           $oldv = $default_status;
           $newv = $duplicate_status;
@@ -762,7 +762,7 @@ private function getWindow() {
     // and equal distance in the past. This is so users can type "6 days" (which
     // means "6 days from now") and get the behavior of "6 days ago", rather
     // than no results (because the window epoch is in the future). This might
-    // be a little confusing because it casues "tomorrow" to mean "yesterday"
+    // be a little confusing because it causes "tomorrow" to mean "yesterday"
     // and "2022" (or whatever) to mean "ten years ago", but these inputs are
     // nonsense anyway.
 
diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
index 1b780549dc..caf70b8f3c 100644
--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
@@ -972,7 +972,7 @@ private function applyBoardMove($object, array $move) {
 
     $object_phid = $object->getPHID();
 
-    // We're doing layout with the ominpotent viewer to make sure we don't
+    // We're doing layout with the omnipotent viewer to make sure we don't
     // remove positions in columns that exist, but which the actual actor
     // can't see.
     $omnipotent_viewer = PhabricatorUser::getOmnipotentUser();
diff --git a/src/applications/metamta/management/PhabricatorMailManagementUnverifyWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementUnverifyWorkflow.php
index 61861d1db0..64f4976ebe 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementUnverifyWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementUnverifyWorkflow.php
@@ -63,7 +63,7 @@ public function execute(PhutilArgumentParser $args) {
         echo tsprintf(
           "%s\n",
           pht(
-            'Address "%s" (owned by "%s") is already unveriifed.',
+            'Address "%s" (owned by "%s") is already unverified.',
             $address,
             $user->getUsername()));
         continue;
diff --git a/src/applications/metamta/receiver/PhabricatorMailReceiver.php b/src/applications/metamta/receiver/PhabricatorMailReceiver.php
index 05b44f364a..12483bf5b6 100644
--- a/src/applications/metamta/receiver/PhabricatorMailReceiver.php
+++ b/src/applications/metamta/receiver/PhabricatorMailReceiver.php
@@ -255,7 +255,7 @@ public static function stripMailboxPrefix($address) {
 
 
   /**
-   * Reduce an email address to its canonical form. For example, an adddress
+   * Reduce an email address to its canonical form. For example, an address
    * like:
    *
    *  "Abraham Lincoln" < ALincoln@example.com >
diff --git a/src/applications/owners/storage/__tests__/PhabricatorOwnersPackageTestCase.php b/src/applications/owners/storage/__tests__/PhabricatorOwnersPackageTestCase.php
index f21f09b44e..d219abfc1e 100644
--- a/src/applications/owners/storage/__tests__/PhabricatorOwnersPackageTestCase.php
+++ b/src/applications/owners/storage/__tests__/PhabricatorOwnersPackageTestCase.php
@@ -82,7 +82,7 @@ public function testFindLongestPathsPerPackage() {
 
     // Now, add a more specific path to Package #1. This tests nested ownership
     // in packages with weak dominion rules. This time, Package #1 should end
-    // up back on top, with Package #2 cedeing control to its more specific
+    // up back on top, with Package #2 ceding control to its more specific
     // path.
     $rows[] = array(
       'id' => 1,
diff --git a/src/applications/passphrase/credentialtype/PassphraseCredentialType.php b/src/applications/passphrase/credentialtype/PassphraseCredentialType.php
index 1da93bcd38..60cb9bb5ae 100644
--- a/src/applications/passphrase/credentialtype/PassphraseCredentialType.php
+++ b/src/applications/passphrase/credentialtype/PassphraseCredentialType.php
@@ -104,7 +104,7 @@ public function getPasswordLabel() {
 
 
   /**
-   * Return true if the provided credental requires a password to decrypt.
+   * Return true if the provided credential requires a password to decrypt.
    *
    * @param PhutilOpaqueEnvelope  Credential secret value.
    * @return bool                 True if the credential needs a password.
diff --git a/src/applications/passphrase/credentialtype/PassphraseSSHPrivateKeyTextCredentialType.php b/src/applications/passphrase/credentialtype/PassphraseSSHPrivateKeyTextCredentialType.php
index d573f19f58..fa686aac4c 100644
--- a/src/applications/passphrase/credentialtype/PassphraseSSHPrivateKeyTextCredentialType.php
+++ b/src/applications/passphrase/credentialtype/PassphraseSSHPrivateKeyTextCredentialType.php
@@ -47,7 +47,7 @@ public function decryptSecret(
         pht(
           'Decrypting SSH keys requires the `%s` binary, but it '.
           'is not available in %s. Either make it available or strip the '.
-          'password fromt his SSH key manually before uploading it.',
+          'password from this SSH key manually before uploading it.',
           'ssh-keygen',
           '$PATH'));
     }
diff --git a/src/applications/passphrase/view/PassphraseCredentialControl.php b/src/applications/passphrase/view/PassphraseCredentialControl.php
index 9c9706fe3f..8ba1ef9bc8 100644
--- a/src/applications/passphrase/view/PassphraseCredentialControl.php
+++ b/src/applications/passphrase/view/PassphraseCredentialControl.php
@@ -67,7 +67,7 @@ protected function renderInput() {
             $user_credential->getName());
         }
       } catch (PhabricatorPolicyException $policy_exception) {
-        // Pull the credential with the ominipotent viewer so we can look up
+        // Pull the credential with the omnipotent viewer so we can look up
         // the ID and provide the monogram.
         $omnipotent_credential = id(new PassphraseCredentialQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
diff --git a/src/applications/people/markup/PhabricatorMentionRemarkupRule.php b/src/applications/people/markup/PhabricatorMentionRemarkupRule.php
index aa5b7f908e..60d4a8168f 100644
--- a/src/applications/people/markup/PhabricatorMentionRemarkupRule.php
+++ b/src/applications/people/markup/PhabricatorMentionRemarkupRule.php
@@ -10,7 +10,7 @@ final class PhabricatorMentionRemarkupRule extends PhutilRemarkupRule {
 
   // NOTE: The negative lookbehind prevents matches like "mail@lists", while
   // allowing constructs like "@tomo/@mroch". Since we now allow periods in
-  // usernames, we can't resonably distinguish that "@company.com" isn't a
+  // usernames, we can't reasonably distinguish that "@company.com" isn't a
   // username, so we'll incorrectly pick it up, but there's little to be done
   // about that. We forbid terminal periods so that we can correctly capture
   // "@joe" instead of "@joe." in "Hey, @joe.".
diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php
index e756a9a4fd..35ff480833 100644
--- a/src/applications/people/query/PhabricatorPeopleQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleQuery.php
@@ -425,7 +425,7 @@ private function rebuildAvailabilityCache(array $rebuild) {
         }
 
         // If the user is set to "Available" for this event, don't consider it
-        // when computin their away status.
+        // when computing their away status.
         if (!$invitee->getDisplayAvailability($event)) {
           continue;
         }
@@ -492,7 +492,7 @@ private function rebuildAvailabilityCache(array $rebuild) {
         // valid for that long.
 
         // NOTE: This doesn't handle overlapping events with the greatest
-        // possible care. In theory, if you're attenting multiple events
+        // possible care. In theory, if you're attending multiple events
         // simultaneously we should accommodate that. However, it's complex
         // to compute, rare, and probably not confusing most of the time.
 
diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
index fa363c4428..0a4367d367 100644
--- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
@@ -79,7 +79,7 @@ protected function buildCustomSearchFields() {
         ->setOptions(
           pht('(Show All)'),
           pht('Show Only Unapproved Users'),
-          pht('Hide Unappproved Users'))
+          pht('Hide Unapproved Users'))
         ->setDescription(
           pht(
             'Pass true to find only users awaiting administrative approval, '.
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 166feaa237..1745154826 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -407,7 +407,7 @@ public function validateCSRFToken($token) {
     $token = substr($token, $breach_prelen + self::CSRF_SALT_LENGTH);
 
     // When the user posts a form, we check that it contains a valid CSRF token.
-    // Tokens cycle each hour (every CSRF_CYLCE_FREQUENCY seconds) and we accept
+    // Tokens cycle each hour (every CSRF_CYCLE_FREQUENCY seconds) and we accept
     // either the current token, the next token (users can submit a "future"
     // token if you have two web frontends that have some clock skew) or any of
     // the last 6 tokens. This means that pages are valid for up to 7 hours.
@@ -1180,7 +1180,7 @@ public static function getOmnipotentUser() {
   /**
    * Get a scalar string identifying this user.
    *
-   * This is similar to using the PHID, but distinguishes between ominpotent
+   * This is similar to using the PHID, but distinguishes between omnipotent
    * and public users explicitly. This allows safe construction of cache keys
    * or cache buckets which do not conflate public and omnipotent users.
    *
@@ -1459,7 +1459,7 @@ public function getFieldSpecificationsForConduit() {
       id(new PhabricatorConduitSearchFieldSpecification())
         ->setKey('roles')
         ->setType('list<string>')
-        ->setDescription(pht('List of acccount roles.')),
+        ->setDescription(pht('List of account roles.')),
     );
   }
 
diff --git a/src/applications/phid/handle/pool/PhabricatorHandleList.php b/src/applications/phid/handle/pool/PhabricatorHandleList.php
index d9a279f8ba..a7b404c5a7 100644
--- a/src/applications/phid/handle/pool/PhabricatorHandleList.php
+++ b/src/applications/phid/handle/pool/PhabricatorHandleList.php
@@ -82,7 +82,7 @@ public function newSublist(array $phids) {
       if (!isset($this[$phid])) {
         throw new Exception(
           pht(
-            'Trying to create a new sublist of an existsing handle list, '.
+            'Trying to create a new sublist of an existing handle list, '.
             'but PHID "%s" does not appear in the parent list.',
             $phid));
       }
diff --git a/src/applications/phid/resolver/PhabricatorPHIDResolver.php b/src/applications/phid/resolver/PhabricatorPHIDResolver.php
index 9070139a0b..940221f551 100644
--- a/src/applications/phid/resolver/PhabricatorPHIDResolver.php
+++ b/src/applications/phid/resolver/PhabricatorPHIDResolver.php
@@ -3,7 +3,7 @@
 /**
  * Resolve a list of identifiers into PHIDs.
  *
- * This class simplifies the process of convering a list of mixed token types
+ * This class simplifies the process of converting a list of mixed token types
  * (like some PHIDs and some usernames) into a list of just PHIDs.
  */
 abstract class PhabricatorPHIDResolver extends Phobject {
diff --git a/src/applications/phortune/provider/PhortuneStripePaymentProvider.php b/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
index 1e7c348297..5adfc62e19 100644
--- a/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
+++ b/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
@@ -361,7 +361,7 @@ public function getCreatePaymentMethodErrorMessage($error_code) {
       case 'error:duplicate_transaction':
       case 'error:processing_error':
       default:
-        // NOTE: These errors currently don't recevive a detailed message.
+        // NOTE: These errors currently don't receive a detailed message.
         // NOTE: We can also end up here with "http:nnn" messages.
 
         // TODO: At least some of these should have a better message, or be
diff --git a/src/applications/phrequent/storage/PhrequentTimeBlock.php b/src/applications/phrequent/storage/PhrequentTimeBlock.php
index ee5fd00a44..3800651476 100644
--- a/src/applications/phrequent/storage/PhrequentTimeBlock.php
+++ b/src/applications/phrequent/storage/PhrequentTimeBlock.php
@@ -124,7 +124,7 @@ public function getObjectTimeRanges() {
               }
             } else {
               // Here, we've prematurely ended a deeper stratum. Merge higher
-              // stata. This looks like this:
+              // strata. This looks like this:
               //
               //                V
               //                V
diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index 1920b4c718..fcc9fe0474 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -452,7 +452,7 @@ public function validateAncestry(
     $verb) {
 
     $errors = array();
-    // NOTE: We use the ominpotent user for these checks because policy
+    // NOTE: We use the omnipotent user for these checks because policy
     // doesn't matter; existence does.
     $other_doc_viewer = PhabricatorUser::getOmnipotentUser();
     $ancestral_slugs = PhabricatorSlug::getAncestry($object->getSlug());
diff --git a/src/applications/policy/filter/PhabricatorPolicyFilter.php b/src/applications/policy/filter/PhabricatorPolicyFilter.php
index f3e1bd2083..fb03936ec2 100644
--- a/src/applications/policy/filter/PhabricatorPolicyFilter.php
+++ b/src/applications/policy/filter/PhabricatorPolicyFilter.php
@@ -257,7 +257,7 @@ public function apply(array $objects) {
       $filtered[$key] = $object;
     }
 
-    // If we survied the primary checks, apply extended checks to objects
+    // If we survived the primary checks, apply extended checks to objects
     // with extended policies.
     $results = array();
     $extended = array();
diff --git a/src/applications/project/query/PhabricatorProjectColumnQuery.php b/src/applications/project/query/PhabricatorProjectColumnQuery.php
index 41ea770137..13f2f52a43 100644
--- a/src/applications/project/query/PhabricatorProjectColumnQuery.php
+++ b/src/applications/project/query/PhabricatorProjectColumnQuery.php
@@ -97,7 +97,7 @@ protected function didFilterPage(array $page) {
       if ($proxy_phid !== null) {
         $proxy = idx($proxies, $proxy_phid);
 
-        // Only attach valid proxies, so we don't end up getting surprsied if
+        // Only attach valid proxies, so we don't end up getting surprised if
         // an install somehow gets junk into their database.
         if (!($proxy instanceof PhabricatorColumnProxyInterface)) {
           $proxy = null;
diff --git a/src/applications/project/remarkup/ProjectRemarkupRule.php b/src/applications/project/remarkup/ProjectRemarkupRule.php
index 70d6b8eda3..96092bab86 100644
--- a/src/applications/project/remarkup/ProjectRemarkupRule.php
+++ b/src/applications/project/remarkup/ProjectRemarkupRule.php
@@ -24,7 +24,7 @@ protected function renderObjectRef(
   protected function getObjectIDPattern() {
     // NOTE: The latter half of this rule matches monograms with internal
     // periods, like `#domain.com`, but does not match monograms with terminal
-    // periods, because they're probably just puncutation.
+    // periods, because they're probably just punctuation.
 
     // Broadly, this will not match every possible project monogram, and we
     // accept some false negatives -- like `#dot.` -- in order to avoid a bunch
diff --git a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
index dd67f5bc59..56d371f1d6 100644
--- a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
+++ b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php
@@ -5,7 +5,7 @@
  *
  * 1: To parse "Releeph: picks RQ<nn>" headers in commits created by
  * arc-releeph so that RQs committed by arc-releeph have real
- * PhabricatorRepositoryCommits associated with them (instaed of just the SHA
+ * PhabricatorRepositoryCommits associated with them (instead of just the SHA
  * of the commit, as seen by the pusher).
  *
  * 2: If requestors want to commit directly to their release branch, they can
diff --git a/src/applications/releeph/field/selector/ReleephDefaultFieldSelector.php b/src/applications/releeph/field/selector/ReleephDefaultFieldSelector.php
index df5e075ebc..af18bfd3d6 100644
--- a/src/applications/releeph/field/selector/ReleephDefaultFieldSelector.php
+++ b/src/applications/releeph/field/selector/ReleephDefaultFieldSelector.php
@@ -7,7 +7,7 @@ final class ReleephDefaultFieldSelector extends ReleephFieldSelector {
    *
    * TODO: This is a giant hacky mess because I am dumb and moved forward on
    * Releeph changes with partial information. Recover from this as gracefully
-   * as possible. This obivously is an abomination. -epriestley
+   * as possible. This obviously is an abomination. -epriestley
    */
   public static function isFacebook() {
     return class_exists('ReleephFacebookKarmaFieldSpecification');
diff --git a/src/applications/repository/daemon/PhabricatorMercurialGraphStream.php b/src/applications/repository/daemon/PhabricatorMercurialGraphStream.php
index 33f947e2f8..205b267ed5 100644
--- a/src/applications/repository/daemon/PhabricatorMercurialGraphStream.php
+++ b/src/applications/repository/daemon/PhabricatorMercurialGraphStream.php
@@ -113,7 +113,7 @@ private function parseUntil($until_type, $until_name) {
   private function parseParents($parents, $target_rev) {
 
     // The hg '{parents}' token is empty if there is one "natural" parent
-    // (predecessor local commit ID). Othwerwise, it may have one or two
+    // (predecessor local commit ID). Otherwise, it may have one or two
     // parents. The string looks like this:
     //
     //  151:1f6c61a60586 154:1d5f799ebe1e
diff --git a/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php b/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php
index 27e93535ab..a29d110a67 100644
--- a/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php
+++ b/src/applications/repository/data/PhabricatorRepositoryURINormalizer.php
@@ -27,10 +27,10 @@
  *     // URIs are very unlikely to be the same repository.
  *   }
  *
- * Because a repository can be hosted at arbitrarly many arbitrary URIs, there
+ * Because a repository can be hosted at arbitrarily many arbitrary URIs, there
  * is no way to completely prevent false negatives by only examining URIs
  * (that is, repositories with totally different URIs could really be the same).
- * However, normalization is relatively agressive and false negatives should
+ * However, normalization is relatively aggressive and false negatives should
  * be rare: if normalization says two URIs are different repositories, they
  * probably are.
  *
diff --git a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
index d0b84a6b31..8e99aabafa 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php
@@ -703,7 +703,7 @@ private function insertTask(
     // new repository for the first time is less important than any other
     // daemon task.
 
-    // If the repostitory has finished importing and we're just catching up
+    // If the repository has finished importing and we're just catching up
     // on recent commits, we schedule discovery at COMMIT priority, which is
     // slightly below the default priority.
 
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementThawWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementThawWorkflow.php
index 2f09ffd9be..71076314da 100644
--- a/src/applications/repository/management/PhabricatorRepositoryManagementThawWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementThawWorkflow.php
@@ -90,7 +90,7 @@ public function execute(PhutilArgumentParser $args) {
       $risk_message);
 
     $is_force = $args->getArg('force');
-    $prompt = pht('Accept the possibilty of permanent data loss?');
+    $prompt = pht('Accept the possibility of permanent data loss?');
     if (!$is_force && !phutil_console_confirm($prompt)) {
       throw new PhutilArgumentUsageException(
         pht('User aborted the workflow.'));
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 09fb239bf0..713ed92270 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1875,7 +1875,7 @@ public function loadUpdateInterval($minimum = 15) {
 
 
   /**
-   * Retrieve the sevice URI for the device hosting this repository.
+   * Retrieve the service URI for the device hosting this repository.
    *
    * See @{method:newConduitClient} for a general discussion of interacting
    * with repository services. This method provides lower-level resolution of
@@ -2129,7 +2129,7 @@ public function getPassthroughEnvironmentalVariables() {
     if ($this->isGit()) {
       // $_ENV does not populate in CLI contexts if "E" is missing from
       // "variables_order" in PHP config. Currently, we do not require this
-      // to be configured. Since it may not be, explictitly bring expected Git
+      // to be configured. Since it may not be, explicitly bring expected Git
       // environmental variables into scope. This list is not exhaustive, but
       // only lists variables with a known impact on commit hook behavior.
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryURI.php b/src/applications/repository/storage/PhabricatorRepositoryURI.php
index cbd25b74eb..c8d560705a 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryURI.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryURI.php
@@ -362,7 +362,7 @@ private function getForcedPort() {
       return PhabricatorEnv::getEnvConfig('diffusion.ssh-port');
     }
 
-    // If Phabricator is running on a nonstandard port, use that as the defualt
+    // If Phabricator is running on a nonstandard port, use that as the default
     // port for URIs with the same protocol.
 
     $is_http = ($protocol == self::BUILTIN_PROTOCOL_HTTP);
diff --git a/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php b/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
index 51abc70d35..750cc91c47 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
@@ -66,7 +66,7 @@ public static function getWriteLock($repository_phid) {
    * may have committed and acknowledged a write on a node that lost the lock
    * partway through the write and is no longer reachable.
    *
-   * In particular, if a node loses its connection to the datbase the global
+   * In particular, if a node loses its connection to the database the global
    * lock is released by default. This is a durable lock which stays locked
    * by default.
    */
diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php
index 0fdd18b20f..60e6c5a5e6 100644
--- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php
+++ b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php
@@ -216,7 +216,7 @@ protected function parseCommitChanges(
           $changes[$path]['changeType']
             = DifferentialChangeType::TYPE_COPY_AWAY;
         } else if ($existing_type == DifferentialChangeType::TYPE_ADD) {
-          // This change removes a diretory and replaces it with a file. Mark
+          // This change removes a directory and replaces it with a file. Mark
           // it as "change" instead of "add".
           $changes[$path]['changeType'] = DifferentialChangeType::TYPE_CHANGE;
         }
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index f4c460ce34..c0497a0c03 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -359,7 +359,7 @@ protected function buildCustomSearchFields() {
    *   );
    *
    * Any unspecified fields (including custom fields and fields added
-   * automatically by infrastruture) will be put in the middle.
+   * automatically by infrastructure) will be put in the middle.
    *
    * @return list<string> Default ordering for field keys.
    */
diff --git a/src/applications/search/management/PhabricatorSearchManagementWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementWorkflow.php
index 43dad986ea..b09f4b2105 100644
--- a/src/applications/search/management/PhabricatorSearchManagementWorkflow.php
+++ b/src/applications/search/management/PhabricatorSearchManagementWorkflow.php
@@ -5,7 +5,7 @@ abstract class PhabricatorSearchManagementWorkflow
 
   protected function validateClusterSearchConfig() {
     // Configuration is normally validated by setup self-checks on the web
-    // workflow, but users may reasonsably run `bin/search` commands after
+    // workflow, but users may reasonably run `bin/search` commands after
     // making manual edits to "local.json". Re-verify configuration here before
     // continuing.
 
diff --git a/src/applications/search/menuitem/PhabricatorMotivatorProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorMotivatorProfileMenuItem.php
index e67d22b555..071979d391 100644
--- a/src/applications/search/menuitem/PhabricatorMotivatorProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorMotivatorProfileMenuItem.php
@@ -80,7 +80,7 @@ protected function newNavigationMenuItems(
   private function getCatFacts() {
     return array(
       pht('Cats purr when they are happy, upset, or asleep.'),
-      pht('The first cats evolved on the savanah about 8,000 years ago.'),
+      pht('The first cats evolved on the savannah about 8,000 years ago.'),
       pht(
         'Cats have a tail, two feet, between one and three ears, and two '.
         'other feet.'),
@@ -111,7 +111,7 @@ private function getCatFacts() {
       pht(
         'Not all cats can retract their claws, but most of them can.'),
       pht(
-        'In the wild, cats and racoons sometimes hunt together in packs.'),
+        'In the wild, cats and raccoons sometimes hunt together in packs.'),
       pht(
         'The Spanish word for cat is "cato". The biggest cat is called '.
         '"el cato".'),
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanel.php b/src/applications/settings/panel/PhabricatorSettingsPanel.php
index d2008f8857..19ac6fec62 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanel.php
@@ -143,7 +143,7 @@ abstract public function getPanelGroupKey();
   /**
    * Return false to prevent this panel from being displayed or used. You can
    * do, e.g., configuration checks here, to determine if the feature your
-   * panel controls is unavailble in this install. By default, all panels are
+   * panel controls is unavailable in this install. By default, all panels are
    * enabled.
    *
    * @return bool True if the panel should be shown.
diff --git a/src/applications/settings/query/PhabricatorUserPreferencesQuery.php b/src/applications/settings/query/PhabricatorUserPreferencesQuery.php
index de4887cbb8..1a6133724d 100644
--- a/src/applications/settings/query/PhabricatorUserPreferencesQuery.php
+++ b/src/applications/settings/query/PhabricatorUserPreferencesQuery.php
@@ -49,7 +49,7 @@ public function withBuiltinKeys(array $keys) {
    * If no settings exist for a user, a new empty settings object with
    * appropriate defaults is returned.
    *
-   * @param bool True to generat synthetic preferences for missing users.
+   * @param bool True to generate synthetic preferences for missing users.
    */
   public function needSyntheticPreferences($synthetic) {
     $this->synthetic = $synthetic;
diff --git a/src/applications/settings/setting/PhabricatorTimezoneSetting.php b/src/applications/settings/setting/PhabricatorTimezoneSetting.php
index b7a6b94e30..887e08129b 100644
--- a/src/applications/settings/setting/PhabricatorTimezoneSetting.php
+++ b/src/applications/settings/setting/PhabricatorTimezoneSetting.php
@@ -46,7 +46,7 @@ public function assertValidValue($value) {
 
     throw new Exception(
       pht(
-        'Timezone "%s" is not a valid timezone identiifer.',
+        'Timezone "%s" is not a valid timezone identifier.',
         $value));
   }
 
diff --git a/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php b/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
index e005c120f0..817e92ce39 100644
--- a/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
+++ b/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
@@ -83,7 +83,7 @@ public function handleRequest(AphrontRequest $request) {
     } else {
 
       // TODO: Eventually, get rid of this once everything implements
-      // PhabriatorApplicationTransactionInterface.
+      // PhabricatorApplicationTransactionInterface.
 
       $editor = id(new PhabricatorSubscriptionsEditor())
         ->setActor($viewer)
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index e1d6812778..6c9cb5e201 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -763,7 +763,7 @@ private function newObjectFromPHID($phid, array $capabilities = array()) {
    * Load an object given a configured query.
    *
    * @param PhabricatorPolicyAwareQuery Configured query.
-   * @param list<const> List of required capabilitiy constants, or omit for
+   * @param list<const> List of required capability constants, or omit for
    *  defaults.
    * @return object|null Object, or null if no such object exists.
    * @task load
@@ -1382,7 +1382,7 @@ private function buildEditFormActions($object) {
    * and that field is visible and editable for the user.
    *
    * For example, you can use it to test if a user is able to reassign tasks
-   * or not, prior to rendering dedicated UI for task reassingment.
+   * or not, prior to rendering dedicated UI for task reassignment.
    *
    * Note that this method does NOT test if the user can actually edit the
    * current object, just if they have access to the related field.
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 07edf5b0c8..175a5775ee 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -3701,7 +3701,7 @@ private function applyProjectConflictRules(array $phids) {
 
       // If a later project in the list is an ancestor of this one, it will
       // have added itself to the map. If any ancestor of this project points
-      // at itself in the map, this project should be dicarded in favor of
+      // at itself in the map, this project should be discarded in favor of
       // that later ancestor.
       foreach ($project->getAncestorProjects() as $ancestor) {
         $ancestor_phid = $ancestor->getPHID();
diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
index 6956561490..8b747281b3 100644
--- a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
@@ -451,7 +451,7 @@ protected function didEvaluateTokens(array $results) {
   public static function isFunctionToken($token) {
     // We're looking for a "(" so that a string like "members(q" is identified
     // and parsed as a function call. This allows us to start generating
-    // results immeidately, before the user fully types out "members(quack)".
+    // results immediately, before the user fully types out "members(quack)".
     return (strpos($token, '(') !== false);
   }
 
diff --git a/src/applications/uiexample/examples/PhabricatorStatusUIExample.php b/src/applications/uiexample/examples/PhabricatorStatusUIExample.php
index 6583bc5848..76a345b8e3 100644
--- a/src/applications/uiexample/examples/PhabricatorStatusUIExample.php
+++ b/src/applications/uiexample/examples/PhabricatorStatusUIExample.php
@@ -33,7 +33,7 @@ public function renderExample() {
     $view->addItem(
       id(new PHUIStatusItemView())
         ->setIcon(PHUIStatusItemView::ICON_WARNING, 'dark', pht('Caution'))
-        ->setTarget(pht('Pomegranite'))
+        ->setTarget(pht('Pomegranate'))
         ->setNote(pht('Lots of seeds. Watch out.')));
 
     $view->addItem(
diff --git a/src/docs/contributor/cla.diviner b/src/docs/contributor/cla.diviner
index f08711483a..54e0142beb 100644
--- a/src/docs/contributor/cla.diviner
+++ b/src/docs/contributor/cla.diviner
@@ -87,7 +87,7 @@ you to consent. If you are not comfortable with this, do not sign the CLA and
 do not contribute to Phabricator.
 
 **Limitation of Liability**: The second benefit the CLA provides is that it
-makes the terms of your contribition explicitly clear upfront, and it puts us
+makes the terms of your contribution explicitly clear upfront, and it puts us
 in a much stronger legal position if a contributor later claims there is
 ambiguity about ownership of their work. We can point at the document they
 signed as proof that they consented to our use and understood the terms of
@@ -100,7 +100,7 @@ anything we are likely to face, but SCO claimed billions of dollars in damages
 and the litigation has now been ongoing for more than a decade.
 
 We want to avoid situations like this in the future by making the terms of
-contibution explicit upfront.
+contribution explicit upfront.
 
 Generally, we believe the terms of the CLA are fair and reasonable for
 contributors, and that the primary way contributors benefit from contributing
@@ -158,7 +158,7 @@ local law.
 
 If you are unsure, you should speak with your employer or a lawyer. If you
 contribute code you do not own under the individual CLA, you are exposing
-yourself to liability. You may also be exposing us to liablity, but we'll have
+yourself to liability. You may also be exposing us to liability, but we'll have
 the CLA on our side to show that we were unwilling pawns in your malicious
 scheme to defraud your employer.
 
diff --git a/src/docs/contributor/describing_problems.diviner b/src/docs/contributor/describing_problems.diviner
index 57bb849b02..d06d7b7d64 100644
--- a/src/docs/contributor/describing_problems.diviner
+++ b/src/docs/contributor/describing_problems.diviner
@@ -140,7 +140,7 @@ Additional Resources
 
 Poor problem descriptions are a common issue in software development and
 extensively documented elsewhere. Here are some additional resources describing
-how to describe problems and ask questions effectivey:
+how to describe problems and ask questions effectively:
 
   - [[ http://www.catb.org/esr/faqs/smart-questions.html | How To Ask
     Questions The Smart Way ]], by Eric S. Raymond
diff --git a/src/docs/contributor/internationalization.diviner b/src/docs/contributor/internationalization.diviner
index e9cdb9dfcd..9c78eb60fb 100644
--- a/src/docs/contributor/internationalization.diviner
+++ b/src/docs/contributor/internationalization.diviner
@@ -198,7 +198,7 @@ would technically be English and most English readers would understand the
 meaning, but no native English speaker would speak or write like this.
 
 However, some languages have different subject-verb order rules or
-colloquisalisms, and a word order which transliterates like this may sound more
+colloquialisms, and a word order which transliterates like this may sound more
 natural to a native speaker. By translating fragments instead of complete
 sentences, you lock translators into English word order.
 
diff --git a/src/docs/contributor/reproduction_steps.diviner b/src/docs/contributor/reproduction_steps.diviner
index d5d58913b7..1050e43c48 100644
--- a/src/docs/contributor/reproduction_steps.diviner
+++ b/src/docs/contributor/reproduction_steps.diviner
@@ -112,7 +112,7 @@ we'll probably be able to follow them and reproduce the issue ourselves.
 
 If you can't follow your steps because they depend on information which is not
 available on a clean instance (for example, a certain config setting), rewrite
-them to include instrutions to create that information (for example, adjusting
+them to include instructions to create that information (for example, adjusting
 the config to the problematic value).
 
 If you follow your instructions but the issue does not reproduce, the issue
@@ -191,7 +191,7 @@ smaller case which reproduces the problem, which might be something like this:
   - Files like `A`, which have uppercase letters, do not work.
 
 With a simpler reproduction scenario, you can simplify your steps to be more
-tailored and mimimal. This will help us pointpoint the issue more quickly and
+tailored and minimal. This will help us pinpoint the issue more quickly and
 be more certain that we've understood and resolved it.
 
 It is more important that steps be complete than that they be simple, and it's
diff --git a/src/docs/user/cluster/cluster.diviner b/src/docs/user/cluster/cluster.diviner
index 30ad53efb8..2362b80485 100644
--- a/src/docs/user/cluster/cluster.diviner
+++ b/src/docs/user/cluster/cluster.diviner
@@ -225,7 +225,7 @@ Cluster: Notifications
 Configuring multiple notification hosts is simple and has no pre-requisites.
 
 With multiple notification hosts, you can survive the loss of any subset of
-hosts as long as at least one host remains alive. Service may be breifly
+hosts as long as at least one host remains alive. Service may be briefly
 disrupted directly after the incident which destroys the other hosts.
 
 Notifications are noncritical, so this normally has little practical impact
diff --git a/src/docs/user/cluster/cluster_databases.diviner b/src/docs/user/cluster/cluster_databases.diviner
index 7255662958..51bf14d925 100644
--- a/src/docs/user/cluster/cluster_databases.diviner
+++ b/src/docs/user/cluster/cluster_databases.diviner
@@ -31,7 +31,7 @@ although this may change in the future.
 
 Phabricator applications //can// be partitioned across multiple database
 masters. This does not provide redundancy and generally does not increase
-resiliance or resistance to data loss, but can help you scale and operate
+resilience or resistance to data loss, but can help you scale and operate
 Phabricator. For details, see
 @{article:Cluster: Partitioning and Advanced Configuration}.
 
diff --git a/src/docs/user/cluster/cluster_devices.diviner b/src/docs/user/cluster/cluster_devices.diviner
index 57729fdb86..c90aa220c4 100644
--- a/src/docs/user/cluster/cluster_devices.diviner
+++ b/src/docs/user/cluster/cluster_devices.diviner
@@ -212,7 +212,7 @@ $ ./bin/almanac register \
 For example, you might run this command on `repo001` when using a shared key:
 
 ```
-$ ./bin/almanac register
+$ ./bin/almanac register \
   --device keywarden.mycompany.net \
   --private-key /path/to/private-key \
   --identify-as repo001.mycompany.net
diff --git a/src/docs/user/cluster/cluster_partitioning.diviner b/src/docs/user/cluster/cluster_partitioning.diviner
index 4dbb47f9d4..20ae11d6a6 100644
--- a/src/docs/user/cluster/cluster_partitioning.diviner
+++ b/src/docs/user/cluster/cluster_partitioning.diviner
@@ -21,7 +21,7 @@ This configuration is complex, and very few installs will benefit from pursuing
 it. Phabricator will normally run comfortably with a single database master
 even for large organizations.
 
-Partitioning generally does not do much to increase resiliance or make it
+Partitioning generally does not do much to increase resilience or make it
 easier to recover from disasters, and is primarily a mechanism for scaling and
 operational convenience.
 
@@ -212,14 +212,14 @@ only one master.
 
 `persistent` //(bool)// Enables persistent connections. Defaults to off.
 
-With persitent connections enabled, Phabricator will keep a pool of database
+With persistent connections enabled, Phabricator will keep a pool of database
 connections open between web requests and reuse them when serving subsequent
 requests.
 
 The primary benefit of using persistent connections is that it will greatly
 reduce pressure on how quickly outbound TCP ports are opened and closed. After
 a TCP port closes, it normally can't be used again for about 60 seconds, so
-rapidly cycling ports can cause resource exuastion. If you're seeing failures
+rapidly cycling ports can cause resource exhaustion. If you're seeing failures
 because requests are unable to bind to an outbound port, enabling this option
 is likely to fix the issue. This option may also slightly increase performance.
 
diff --git a/src/docs/user/cluster/cluster_repositories.diviner b/src/docs/user/cluster/cluster_repositories.diviner
index 21aba731cc..44003679af 100644
--- a/src/docs/user/cluster/cluster_repositories.diviner
+++ b/src/docs/user/cluster/cluster_repositories.diviner
@@ -440,7 +440,7 @@ device or devices have up-to-date information.
 
 When Phabricator can not tell which device in a cluster is a leader, it freezes
 the cluster because it is possible that some devices have less data and others
-have more, and if it choses a leader arbitrarily it may destroy some data
+have more, and if it chooses a leader arbitrarily it may destroy some data
 which you would prefer to retain.
 
 To resolve this, you need to tell Phabricator which device has the most
diff --git a/src/docs/user/cluster/cluster_search.diviner b/src/docs/user/cluster/cluster_search.diviner
index c658f50db4..25c35aa34a 100644
--- a/src/docs/user/cluster/cluster_search.diviner
+++ b/src/docs/user/cluster/cluster_search.diviner
@@ -100,14 +100,14 @@ A typical `mysql` service configuration looks like this:
 Service Type: Elasticsearch
 ======================
 
-The `elasticsearch` sevice type supports these options:
+The `elasticsearch` service type supports these options:
 
 | Key | Description |
 |---|---|
 | `protocol` | Either `"http"` (default) or `"https"`.
 | `port` | Elasticsearch TCP port.
 | `version` | Elasticsearch version, either `2` or `5` (default).
-| `path` | Path for the index. Defaults to `/phabriator`. Advanced.
+| `path` | Path for the index. Defaults to `/phabricator`. Advanced.
 
 A typical `elasticsearch` service configuration looks like this:
 
diff --git a/src/docs/user/configuration/configuration_guide.diviner b/src/docs/user/configuration/configuration_guide.diviner
index 98c27b9736..8b221bda41 100644
--- a/src/docs/user/configuration/configuration_guide.diviner
+++ b/src/docs/user/configuration/configuration_guide.diviner
@@ -116,7 +116,7 @@ Restart nginx after making your edits, then continue to "Setup" below.
 
 = Webserver: Configuring lighttpd =
 
-NOTE: Follow these instructions to use lighttpd. To use Apache or niginx, scroll
+NOTE: Follow these instructions to use lighttpd. To use Apache or nginx, scroll
 up to their sections.
 
 For lighttpd, add a section like this to your lighttpd.conf:
@@ -138,7 +138,7 @@ server.modules list:
 
 Finally, you should run the following commands to enable php support:
 
-  $ sudo apt-get install php5-cgi  # for ubuntu; other distros should be similar
+  $ sudo apt-get install php5-cgi  # for Ubuntu; other distros should be similar
   $ sudo lighty-enable-mod fastcgi-php
 
 Restart lighttpd after making your edits, then continue below.
diff --git a/src/docs/user/configuration/configuring_backups.diviner b/src/docs/user/configuration/configuring_backups.diviner
index d32eebb0da..9c283c5722 100644
--- a/src/docs/user/configuration/configuring_backups.diviner
+++ b/src/docs/user/configuration/configuring_backups.diviner
@@ -64,7 +64,7 @@ If you host repositories in Phabricator, you should back them up. You can use
 repository. To back them up, copy them elsewhere.
 
 You can also just clone them and keep the clones up to date, or use
-{nav Add Mirror} to have the mirror somewhere automatically.
+{nav Add Mirror} to have them mirror somewhere automatically.
 
 
 Restore: Hosted Repositories
diff --git a/src/docs/user/configuration/configuring_encryption.diviner b/src/docs/user/configuration/configuring_encryption.diviner
index dbd0e76314..36315506e6 100644
--- a/src/docs/user/configuration/configuring_encryption.diviner
+++ b/src/docs/user/configuration/configuring_encryption.diviner
@@ -80,7 +80,7 @@ Format: Raw Data
 ================
 
 The `raw` storage format is automatically selected for all newly uploaded
-file data if no key is makred as the `default` key in the keyring. This is
+file data if no key is marked as the `default` key in the keyring. This is
 the behavior of Phabricator if you haven't configured anything.
 
 This format stores raw data without modification.
@@ -137,7 +137,7 @@ To change the format of an individual file, run this command:
 phabricator/ $ ./bin/files encode --as <format> F123 [--key <key>]
 ```
 
-This will change the storage format of the sepcified file.
+This will change the storage format of the specified file.
 
 
 Verifying Storage Formats
diff --git a/src/docs/user/configuration/managing_garbage.diviner b/src/docs/user/configuration/managing_garbage.diviner
index 1896a73904..0b18bd2a0a 100644
--- a/src/docs/user/configuration/managing_garbage.diviner
+++ b/src/docs/user/configuration/managing_garbage.diviner
@@ -21,7 +21,7 @@ Configuring Retention Policies
 
 You can reconfigure the data retention policies for most collectors.
 
-The default retention polcies should be suitable for most installs. However,
+The default retention policies should be suitable for most installs. However,
 you might want to **decrease** retention to reduce the amount of disk space
 used by some high-volume log that you don't find particularly interesting, or
 to adhere to an organizational data retention policy.
diff --git a/src/docs/user/field/conduit_changes.diviner b/src/docs/user/field/conduit_changes.diviner
index a5aa8fef6e..96a890600a 100644
--- a/src/docs/user/field/conduit_changes.diviner
+++ b/src/docs/user/field/conduit_changes.diviner
@@ -11,7 +11,7 @@ For example, when we write a new application, it usually adds several new API
 methods and may update older methods.
 
 This document discusses API stability and how to minimize disruption when
-transitionig between API versions.
+transitioning between API versions.
 
 
 Method Statuses
diff --git a/src/docs/user/field/darkconsole.diviner b/src/docs/user/field/darkconsole.diviner
index a31f0492ae..cbdfb9bda5 100644
--- a/src/docs/user/field/darkconsole.diviner
+++ b/src/docs/user/field/darkconsole.diviner
@@ -131,7 +131,7 @@ Generally, this column can help pinpoint these kinds of problems:
   - Unbatched queries which should be batched (see
     @{article:Performance: N+1 Query Problem}).
   - Opportunities to improve performance with caching.
-  - General goofiness in how service calls are woking.
+  - General goofiness in how service calls are working.
 
 If the services tab looks fine, and particularly if a page is slow but the
 "All Services" cost is small, that may indicate a problem in PHP. The best
diff --git a/src/docs/user/field/performance.diviner b/src/docs/user/field/performance.diviner
index 09413e47df..c5980acd0e 100644
--- a/src/docs/user/field/performance.diviner
+++ b/src/docs/user/field/performance.diviner
@@ -34,7 +34,7 @@ Phabricator will need substantial time to process it, it will take a long time
 to download over the network, and your browser will probably not be able to
 render it especially quickly.
 
-We may be able to improve perfomance in some cases, but Phabricator is not
+We may be able to improve performance in some cases, but Phabricator is not
 magic and can not wish away real complexity. The best solution to these problems
 is usually to find another way to solve your problem: for example, maybe the
 100MB document can be split into several smaller documents.
@@ -51,7 +51,7 @@ The upstream will be less able to help resolve unusual workloads with high
 inherent complexity, like these:
 
   - {icon times, color=red} A 100MB wiki page takes a long time to render.
-  - {icon times, color=red} A turing-complete simulation of Conway's Game of
+  - {icon times, color=red} A Turing-complete simulation of Conway's Game of
     Life implemented in 958,000 Herald rules executes slowly.
   - {icon times, color=red} Uploading an 8GB file takes several minutes.
 
diff --git a/src/docs/user/field/repository_imports.diviner b/src/docs/user/field/repository_imports.diviner
index 495758ea4a..1b1c92bbc0 100644
--- a/src/docs/user/field/repository_imports.diviner
+++ b/src/docs/user/field/repository_imports.diviner
@@ -127,7 +127,7 @@ may have briefly been down, or some configuration wasn't quite right, or the
 daemons were killed halfway through the work.
 
 These commits will retry eventually and usually succeed, but some of the retry
-time limits are very conserative (up to 24 hours) and you might not want to
+time limits are very conservative (up to 24 hours) and you might not want to
 wait that long.
 
 In the Daemon console, temporarily failures usually look like tasks in the
@@ -137,7 +137,7 @@ waiting to retry these tasks.
 
 In the daemon log, these temporary failures might have created log entries, but
 might also not have. For example, if the failure was rooted in a network issue
-that probably will create a log entry, but if the faiulre was rooted in the
+that probably will create a log entry, but if the failure was rooted in the
 daemons being abruptly killed that may not create a log entry.
 
 You can follow the instructions from "Handling Permanent Failures" above to
@@ -167,7 +167,7 @@ Forced Parsing
 ==============
 
 In rare cases, the actual tasks may be lost from the task queue. Usually, they
-have been stolen by gremlins or spritied away by ghosts, or someone may have
+have been stolen by gremlins or spirited away by ghosts, or someone may have
 been too ambitious with running manual SQL commands and deleted a bunch of
 extra things they shouldn't have.
 
@@ -226,7 +226,7 @@ General Tips
 ============
 
 Broadly, `bin/repository` contains several useful debugging commands which
-let you figure out where failures are occuring. You can add the `--trace` flag
+let you figure out where failures are occurring. You can add the `--trace` flag
 to any command to get more details about what it is doing. For any command,
 you can use `help` to learn more about what it does and which flag it takes:
 
diff --git a/src/docs/user/field/xhprof.diviner b/src/docs/user/field/xhprof.diviner
index 7d032e6865..ad6fe82cb8 100644
--- a/src/docs/user/field/xhprof.diviner
+++ b/src/docs/user/field/xhprof.diviner
@@ -88,7 +88,7 @@ that you're looking at a problem which is deeper in the stack, and you need
 to go down further to identify and understand it.
 
 Conversely, if the "Wall Time (Exclusive)" column is large, or the children
-of a call are all cheap, there's probably something expesive happening in the
+of a call are all cheap, there's probably something expensive happening in the
 call itself.
 
 The "Count" column can also sometimes tip you off that something is amiss, if
diff --git a/src/docs/user/userguide/almanac.diviner b/src/docs/user/userguide/almanac.diviner
index d6f0853430..9250724c03 100644
--- a/src/docs/user/userguide/almanac.diviner
+++ b/src/docs/user/userguide/almanac.diviner
@@ -122,7 +122,7 @@ Each service has a name, and may have properties and bindings.
 **Bindings**: Bindings are connections between services and interfaces. They
 tell callers which devices host a named service.
 
-**Networks**: Networks allow Almanac to distingiush between addresses on
+**Networks**: Networks allow Almanac to distinguish between addresses on
 different networks, like VPNs vs the public internet.
 
 If you have hosts in different VPNs or on private networks, you might have
diff --git a/src/docs/user/userguide/arcanist.diviner b/src/docs/user/userguide/arcanist.diviner
index 324ff10490..f6ccc3550f 100644
--- a/src/docs/user/userguide/arcanist.diviner
+++ b/src/docs/user/userguide/arcanist.diviner
@@ -3,7 +3,7 @@
 
 Guide to Arcanist, a command-line interface to Phabricator.
 
-Arcanists provides command-line access to many Phabricator tools (like
+Arcanist provides command-line access to many Phabricator tools (like
 Differential, Files, and Paste), integrates with static analysis ("lint") and
 unit tests, and manages common workflows like getting changes into Differential
 for review.
diff --git a/src/docs/user/userguide/arcanist_lint.diviner b/src/docs/user/userguide/arcanist_lint.diviner
index d7fcce14e8..460b8f85b6 100644
--- a/src/docs/user/userguide/arcanist_lint.diviner
+++ b/src/docs/user/userguide/arcanist_lint.diviner
@@ -169,7 +169,7 @@ Normally, you will be presented with lint messages as you are sending code for
 review. In that context, the severities behave like this:
 
   - `error` When a file contains lint errors, they are always reported. These
-    are intended to be severe problems, like a syntax error. Unresoved lint
+    are intended to be severe problems, like a syntax error. Unresolved lint
     errors require you to confirm that you want to continue.
   - `warning` When a file contains warnings, they are reported by default only
     if they appear on lines that you have changed. They are intended to be
diff --git a/src/docs/user/userguide/calendar_exports.diviner b/src/docs/user/userguide/calendar_exports.diviner
index 340cff863d..487de559a4 100644
--- a/src/docs/user/userguide/calendar_exports.diviner
+++ b/src/docs/user/userguide/calendar_exports.diviner
@@ -61,7 +61,7 @@ To export a group of events:
     - Example: All events tagged `#meetup`.
   - Select the {nav Use Results... > Export Query as .ics} action to turn
     the query into an export.
-  - Name the export with a descritive name.
+  - Name the export with a descriptive name.
   - Select a policy mode for the export (see below for discussion).
   - Click {nav Create New Export} to finish the process.
 
diff --git a/src/docs/user/userguide/calendar_imports.diviner b/src/docs/user/userguide/calendar_imports.diviner
index a4163e9bcd..a8fbc6ff09 100644
--- a/src/docs/user/userguide/calendar_imports.diviner
+++ b/src/docs/user/userguide/calendar_imports.diviner
@@ -10,7 +10,7 @@ IMPORTANT: Calendar is a prototype application. See
 @{article:User Guide: Prototype Applications}.
 
 You can import events into Phabricator to other calendar applications or from
-`.ics` files. This document will guide you through how to importe event data
+`.ics` files. This document will guide you through how to import event data
 into Phabricator.
 
 When you import events from another application, they can not be edited in
diff --git a/src/docs/user/userguide/conduit_edit.diviner b/src/docs/user/userguide/conduit_edit.diviner
index 01d15873a8..5188300e6d 100644
--- a/src/docs/user/userguide/conduit_edit.diviner
+++ b/src/docs/user/userguide/conduit_edit.diviner
@@ -37,7 +37,7 @@ Editing Objects
 
 To edit objects, pass a list of transactions and use `objectIdentifier` to
 specify which object to apply them to. You can normally pass an ID or PHID,
-and many applicaitons also allow you to pass a monogram (for example, you can
+and many applications also allow you to pass a monogram (for example, you can
 edit a task by passing `T123`).
 
 
diff --git a/src/docs/user/userguide/diffusion_api.diviner b/src/docs/user/userguide/diffusion_api.diviner
index f57d5007aa..c2508dda72 100644
--- a/src/docs/user/userguide/diffusion_api.diviner
+++ b/src/docs/user/userguide/diffusion_api.diviner
@@ -147,7 +147,7 @@ Activate the Repository
 =======================
 
 Now that any URIs have been configured, activate the repository with another
-call to `diffusion.repository.edit`. This time, modify the existing repostitory
+call to `diffusion.repository.edit`. This time, modify the existing repository
 instead of creating a new one:
 
 ```
diff --git a/src/docs/user/userguide/diffusion_hosting.diviner b/src/docs/user/userguide/diffusion_hosting.diviner
index 2443b475e8..47197f52fd 100644
--- a/src/docs/user/userguide/diffusion_hosting.diviner
+++ b/src/docs/user/userguide/diffusion_hosting.diviner
@@ -151,7 +151,7 @@ vcs-user ALL=(daemon-user) SETENV: NOPASSWD: /path/to/x, /path/to/y, ...
 
 This is just a template. In the real configuration file, you need to:
 
-  - Replace `www-user`, `dameon-user` and `vcs-user` with the correct
+  - Replace `www-user`, `daemon-user` and `vcs-user` with the correct
     usernames for your system.
   - List every binary that these users need access to, as described above.
   - Make sure each binary path is the full path to the correct binary location
diff --git a/src/docs/user/userguide/diffusion_managing.diviner b/src/docs/user/userguide/diffusion_managing.diviner
index f6ab0997c4..cc03433532 100644
--- a/src/docs/user/userguide/diffusion_managing.diviner
+++ b/src/docs/user/userguide/diffusion_managing.diviner
@@ -121,7 +121,7 @@ It is normally a good idea to leave this protection enabled because most
 scalable workflows rarely rewrite repository history and it's easy to make
 mistakes which are expensive to correct if this protection is disabled.
 
-If you do occasionally need to rewite published history, you can treat this
+If you do occasionally need to rewrite published history, you can treat this
 option like a safety: disable it, perform required rewrites, then enable it
 again.
 
@@ -148,7 +148,7 @@ Repositories can be deactivated. Deactivating a repository has these effects:
   - the repository will be hidden from view in default queries.
 
 When repositories are created for the first time, they are deactivated. This
-gives you an opportuinty to customize settings, like adjusting policies or
+gives you an opportunity to customize settings, like adjusting policies or
 configuring a URI to observe. You must activate a repository before it will
 start working normally.
 
@@ -177,7 +177,7 @@ The **Policies** section of the management interface allows you to review and
 manage repository access policies.
 
 You can configure granular access policies for each repository to control who
-can view, clone, administate, and push to the repository.
+can view, clone, administrate, and push to the repository.
 
 
 Policies: View
@@ -302,7 +302,7 @@ Actions
 The **Actions** panel can configure notifications and publishing behavior.
 
 Normally, Phabricator publishes notifications when it discovers new commits.
-You can disable publishing for a repository by turning off **Publish/Noitfy**.
+You can disable publishing for a repository by turning off **Publish/Notify**.
 This will disable notifications, feed, and Herald (including audits and build
 plans) for this repository.
 
@@ -347,7 +347,7 @@ Commit Identifiers
 ==================
 
 Diffusion uses repository identifiers and information about the commit itself
-to generate globally unique identifers for each commit, like `rE12345`.
+to generate globally unique identifiers for each commit, like `rE12345`.
 
 Each commit may have several identifiers:
 
diff --git a/src/docs/user/userguide/diffusion_uris.diviner b/src/docs/user/userguide/diffusion_uris.diviner
index d1f4b541bc..140948f55e 100644
--- a/src/docs/user/userguide/diffusion_uris.diviner
+++ b/src/docs/user/userguide/diffusion_uris.diviner
@@ -20,7 +20,7 @@ is hosted elsewhere (like GitHub or Bitbucket) and track updates to the remote
 repository. This will create a read-only copy of the repository in Phabricator.
 
 **Mirror Repositories**: Phabricator can publish any repository to mirrors,
-overwiting them with an exact copy of the repository that stays up to date as
+overwriting them with an exact copy of the repository that stays up to date as
 the source changes. This works with both local repositories that Phabricator is
 hosting and remote repositories that Phabricator is observing.
 
@@ -293,7 +293,7 @@ For builtin URIs in //Read Only// or //Read/Write// mode, the most
 human-readable URI defaults to //Always// and the others default to //Never//.
 
 **Always**: This URI will be shown to users as a clone/checkout URI. You can
-add URIs in this mode to cutomize exactly what users are shown.
+add URIs in this mode to customize exactly what users are shown.
 
 **Never**: This URI will not be shown to users. You can hide less-preferred
 URIs to guide users to the URIs they should be using to interact with the
diff --git a/src/docs/user/userguide/drydock.diviner b/src/docs/user/userguide/drydock.diviner
index 44a645bf8a..0d43f7f3f0 100644
--- a/src/docs/user/userguide/drydock.diviner
+++ b/src/docs/user/userguide/drydock.diviner
@@ -151,7 +151,7 @@ thousands of hosts in hundreds of pools, and far beyond that with a little
 work.
 
 Drydock is intended to solve resource management problems at very large scales
-and minimzes blocking operations, locks, and artificial sequencing. Drydock is
+and minimizes blocking operations, locks, and artificial sequencing. Drydock is
 designed to fully utilize an almost arbitrarily large pool of resources and
 improve performance roughly linearly with available hardware.
 
diff --git a/src/docs/user/userguide/drydock_blueprints.diviner b/src/docs/user/userguide/drydock_blueprints.diviner
index 21c4342fa6..c150c503d9 100644
--- a/src/docs/user/userguide/drydock_blueprints.diviner
+++ b/src/docs/user/userguide/drydock_blueprints.diviner
@@ -47,7 +47,7 @@ operations on trusted hosts. For additional discussion, see
 
 This also broadly prevents Drydock from surprising you by coming up with a
 valid but unintended solution to an allocation problem which runs some
-operation on resources that are techincally suitable but not desirable. For
+operation on resources that are technically suitable but not desirable. For
 example, you may not want your Android builds running on your iPhone build
 tier, even if there's no technical reason they can't.
 
diff --git a/src/docs/user/userguide/drydock_security.diviner b/src/docs/user/userguide/drydock_security.diviner
index f12586ab35..9a212437c7 100644
--- a/src/docs/user/userguide/drydock_security.diviner
+++ b/src/docs/user/userguide/drydock_security.diviner
@@ -141,7 +141,7 @@ host which is not on a privileged subnet. For example, use a
 Even if the host is not privileged, many Drydock processes have some level of
 privilege (enabling them to clone repositories, or report test results back to
 Phabricator). Be aware that tests can hijack credentials they are run with,
-and potentialy hijack credentials given to other processes on the same hosts.
+and potentially hijack credentials given to other processes on the same hosts.
 You should use credentials with a minimum set of privileges and assume all
 processes on a host have the highest level of access that any process on the
 host has.
diff --git a/src/docs/user/userguide/forms.diviner b/src/docs/user/userguide/forms.diviner
index 98233e4931..034293ff29 100644
--- a/src/docs/user/userguide/forms.diviner
+++ b/src/docs/user/userguide/forms.diviner
@@ -34,7 +34,7 @@ objects, which will also affect their ability to take inline actions in the
 comment form if you're working in an application which supports comments. This
 can streamline the edit workflow for less experienced users.
 
-Anyone can use prefiling, but you must have permission to configure an
+Anyone can use prefilling, but you must have permission to configure an
 application in order to modify the application's forms. By default, only
 administrators can configure applications.
 
diff --git a/src/docs/user/userguide/herald.diviner b/src/docs/user/userguide/herald.diviner
index 6c5c6239cb..c5a008474d 100644
--- a/src/docs/user/userguide/herald.diviner
+++ b/src/docs/user/userguide/herald.diviner
@@ -126,7 +126,7 @@ match the content. You can use these together to express conditions like
 For example, if you want to match revisions which add or remove calls to a
 "muffinize" function, //but only in JS files//, you can set the value to
 `["/\\.js$/", "/muffinize/"]` or similar. This condition is satisfied only
-when the filename matches the first expression and the conent matches the
+when the filename matches the first expression and the content matches the
 second expression.
 
 **Another Herald rule**: you can create Herald rules which depend on other
diff --git a/src/docs/user/userguide/jump.diviner b/src/docs/user/userguide/jump.diviner
index 413c4fa47b..0421f194a8 100644
--- a/src/docs/user/userguide/jump.diviner
+++ b/src/docs/user/userguide/jump.diviner
@@ -1,7 +1,7 @@
 @title Search User Guide: Shortcuts
 @group userguide
 
-Command reference for global search shorcuts.
+Command reference for global search shortcuts.
 
 Overview
 ========
diff --git a/src/docs/user/userguide/owners.diviner b/src/docs/user/userguide/owners.diviner
index a9a52bfab8..f30fe5023c 100644
--- a/src/docs/user/userguide/owners.diviner
+++ b/src/docs/user/userguide/owners.diviner
@@ -24,7 +24,7 @@ including these paths:
 
 Any files in those directories are considered to be part of the package, and
 you can now conveniently refer to them (for example, in a Herald rule) by
-refering to the package instead of copy/pasting a huge regular expression
+referring to the package instead of copy/pasting a huge regular expression
 into a bunch of places.
 
 If new source files are later added, or the scope of the package otherwise
diff --git a/src/docs/user/userguide/projects.diviner b/src/docs/user/userguide/projects.diviner
index 573c8c4c69..4e3ab3616f 100644
--- a/src/docs/user/userguide/projects.diviner
+++ b/src/docs/user/userguide/projects.diviner
@@ -14,7 +14,7 @@ a name and an icon, and may optionally have members.
 
 For example, you can create projects to provide:
 
-  - **Organization**: Create a project to represent a product or initative,
+  - **Organization**: Create a project to represent a product or initiative,
     then use it to organize related work.
   - **Groups**: Create a project to represent a group of people (like a team),
     then add members of the group as project members.
diff --git a/src/docs/user/userguide/remarkup.diviner b/src/docs/user/userguide/remarkup.diviner
index 6002867b78..28a1a31fc4 100644
--- a/src/docs/user/userguide/remarkup.diviner
+++ b/src/docs/user/userguide/remarkup.diviner
@@ -366,7 +366,7 @@ can be found on the date stamp of any transaction/comment):
 
   T123#412       # Link to comment id #412 of task T123
 
-See the Phabricator configuraton setting `remarkup.ignored-object-names` to
+See the Phabricator configuration setting `remarkup.ignored-object-names` to
 modify this behavior.
 
 = Embedding Objects
diff --git a/src/docs/user/userguide/search.diviner b/src/docs/user/userguide/search.diviner
index 875edc6d0f..d1c6182128 100644
--- a/src/docs/user/userguide/search.diviner
+++ b/src/docs/user/userguide/search.diviner
@@ -87,7 +87,7 @@ view show the results you most often want.
 
 You can share queries with other users by sending them the URL. This will run
 the same query for them with all the parameters you've set (they may see
-different results than you do, because they may not have the same permisions).
+different results than you do, because they may not have the same permissions).
 
 
 Typeaheads
diff --git a/src/docs/user/userguide/spaces.diviner b/src/docs/user/userguide/spaces.diviner
index 212def61f3..4a748fb25b 100644
--- a/src/docs/user/userguide/spaces.diviner
+++ b/src/docs/user/userguide/spaces.diviner
@@ -70,7 +70,7 @@ spaces exist. This simplifies the UI for users with limited access.
 Space Policies
 ==============
 
-Briefly, spacess affect policies like this:
+Briefly, spaces affect policies like this:
 
   - Spaces apply their view policy to all objects inside the space.
   - Space policies are absolute, and stronger than all other policies. A
diff --git a/src/docs/user/userguide/users.diviner b/src/docs/user/userguide/users.diviner
index e96bf8f354..d66f8080d3 100644
--- a/src/docs/user/userguide/users.diviner
+++ b/src/docs/user/userguide/users.diviner
@@ -73,7 +73,7 @@ The **Mailing List** role for an account can not be changed after the account
 is created.
 
 Some options can be configured for mailing lists by browsing to the list user's
-profile and clicking {nav Edit Settings}. You can change the addresss for a
+profile and clicking {nav Edit Settings}. You can change the address for a
 list by editing "Email Addresses" here, choose the language and format for
 email the list receives, and customize which actions the list is notified about.
 
diff --git a/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php b/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
index cb1e56711d..efe12e68b8 100644
--- a/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
+++ b/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
@@ -160,7 +160,7 @@ public function appendFieldsToPropertyList(
       if ($value !== null) {
         switch ($field->getStyleForPropertyView()) {
           case 'header':
-            // We want to hide headers if the fields the're assciated with
+            // We want to hide headers if the fields they're associated with
             // don't actually produce any visible properties. For example, in a
             // list like this:
             //
diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php
index c569f0c695..a8dc5061e7 100644
--- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php
+++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php
@@ -5,7 +5,7 @@ final class PhabricatorWorkerTriggerQuery
 
   // NOTE: This is a PolicyAware query so it can work with other infrastructure
   // like handles; triggers themselves are low-level and do not have
-  // meaninguful policies.
+  // meaningful policies.
 
   const ORDER_ID = 'id';
   const ORDER_EXECUTION = 'execution';
@@ -69,7 +69,7 @@ public function setOrder($order) {
 
   protected function nextPage(array $page) {
     // NOTE: We don't implement paging because we don't currently ever need
-    // it and paging ORDER_EXCUTION is a hassle.
+    // it and paging ORDER_EXECUTION is a hassle.
     throw new PhutilMethodNotImplementedException();
   }
 
diff --git a/src/infrastructure/diff/view/PHUIDiffGraphView.php b/src/infrastructure/diff/view/PHUIDiffGraphView.php
index 76ae0b2045..85741faab7 100644
--- a/src/infrastructure/diff/view/PHUIDiffGraphView.php
+++ b/src/infrastructure/diff/view/PHUIDiffGraphView.php
@@ -160,7 +160,7 @@ public function renderRawGraph(array $parents) {
 
             $terminated[$ii] = true;
 
-            // If this thread is joinining some other node here, we don't want
+            // If this thread is joining some other node here, we don't want
             // to terminate it.
             if (isset($graph[$key + 1])) {
               $joins = $graph[$key + 1]['join'];
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentTableScaffold.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentTableScaffold.php
index 5da25389a5..94eb91ec58 100644
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentTableScaffold.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentTableScaffold.php
@@ -4,7 +4,7 @@
  * Wraps an inline comment row scaffold in a table.
  *
  * This scaffold is used to ship inlines over the wire to the client, so they
- * arrive in a form that's easy to mainipulate (a valid table node).
+ * arrive in a form that's easy to manipulate (a valid table node).
  */
 final class PHUIDiffInlineCommentTableScaffold extends AphrontView {
 
diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php
index 70ddb80630..ba05d0409d 100644
--- a/src/infrastructure/env/PhabricatorEnv.php
+++ b/src/infrastructure/env/PhabricatorEnv.php
@@ -670,7 +670,7 @@ public static function isValidLocalURIForLink($uri) {
    * Detect if a URI identifies some valid linkable remote resource.
    *
    * @param string URI to test.
-   * @return bool True if a URI idenfies a remote resource with an allowed
+   * @return bool True if a URI identifies a remote resource with an allowed
    *              protocol.
    * @task uri
    */
diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
index 95ba57f0c0..184c2d5151 100644
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -730,7 +730,7 @@ protected function getTranslations() {
       '%s added %s reverting commit(s) for %s: %s.' => array(
         array(
           '%s added a reverting commit for %3$s: %4$s.',
-          '%s added reverting commitsi for %3$s: %4$s.',
+          '%s added reverting commits for %3$s: %4$s.',
         ),
       ),
 
@@ -1564,7 +1564,7 @@ protected function getTranslations() {
       '%s uninvited %s attendee(s): %s.' =>
         '%s uninvited: %3$s.',
 
-      '%s invited %s attendee(s): %s; uninvinted %s attendee(s): %s.' =>
+      '%s invited %s attendee(s): %s; uninvited %s attendee(s): %s.' =>
         '%s invited: %3$s; uninvited: %5$s.',
 
       '%s invited %s attendee(s) to %s: %s.' =>
@@ -1573,7 +1573,7 @@ protected function getTranslations() {
       '%s uninvited %s attendee(s) to %s: %s.' =>
         '%s removed invites for %3$s: %4$s.',
 
-      '%s updated the invite list for %s, invited %s: %s; uninvinted %s: %s.' =>
+      '%s updated the invite list for %s, invited %s: %s; uninvited %s: %s.' =>
         '%s updated the invite list for %s, invited: %4$s; uninvited: %6$s.',
 
       'Restart %s build(s)?' => array(
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index c2b8ce04e0..9bebfe6957 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -175,7 +175,7 @@ protected function didLoadRawRows(array $rows) {
    * So, generally, internal paging must bypass policy controls.
    *
    * This method returns the appropriate viewer, based on the context in which
-   * the paging is occuring.
+   * the paging is occurring.
    *
    * @return PhabricatorUser Viewer for executing paging queries.
    */
@@ -536,7 +536,7 @@ protected function willExecuteCursorQuery(
    *
    * @param AphrontDatabaseConnection Connection query will execute on.
    * @param list<map> Column description dictionaries.
-   * @param map Additional constuction options.
+   * @param map Additional construction options.
    * @return string Query clause.
    * @task paging
    */
diff --git a/src/infrastructure/storage/lisk/LiskDAO.php b/src/infrastructure/storage/lisk/LiskDAO.php
index 94eef7d163..0c940ef5f0 100644
--- a/src/infrastructure/storage/lisk/LiskDAO.php
+++ b/src/infrastructure/storage/lisk/LiskDAO.php
@@ -1121,7 +1121,7 @@ public function update() {
     $this->willSaveObject();
     $data = $this->getAllLiskPropertyValues();
 
-    // Remove colums flagged as nonmutable from the update statement.
+    // Remove columns flagged as nonmutable from the update statement.
     $no_mutate = $this->getConfigOption(self::CONFIG_NO_MUTATE);
     if ($no_mutate) {
       foreach ($no_mutate as $column) {
diff --git a/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php b/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
index 065c23e2ff..92c43fcd4b 100644
--- a/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
+++ b/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php
@@ -98,7 +98,7 @@ public function testCounters() {
     $obj = new HarbormasterObject();
     $conn_w = $obj->establishConnection('w');
 
-    // Test that the counter bascially behaves as expected.
+    // Test that the counter basically behaves as expected.
     $this->assertEqual(1, LiskDAO::loadNextCounterValue($conn_w, 'a'));
     $this->assertEqual(2, LiskDAO::loadNextCounterValue($conn_w, 'a'));
     $this->assertEqual(3, LiskDAO::loadNextCounterValue($conn_w, 'a'));
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
index a03ef41c4d..f6b120ba83 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
@@ -181,8 +181,8 @@ final private function doAdjustSchemata(
     if (!$this->force && !$api->isCharacterSetAvailable('utf8mb4')) {
       $message = pht(
         "You have an old version of MySQL (older than 5.5) which does not ".
-        "support the utf8mb4 character set. We strongly recomend upgrading to ".
-        "5.5 or newer.\n\n".
+        "support the utf8mb4 character set. We strongly recommend upgrading ".
+        "to 5.5 or newer.\n\n".
         "If you apply adjustments now and later update MySQL to 5.5 or newer, ".
         "you'll need to apply adjustments again (and they will take a long ".
         "time).\n\n".
diff --git a/src/infrastructure/util/PhabricatorHash.php b/src/infrastructure/util/PhabricatorHash.php
index 19c8414539..5ca4e9b53c 100644
--- a/src/infrastructure/util/PhabricatorHash.php
+++ b/src/infrastructure/util/PhabricatorHash.php
@@ -11,7 +11,7 @@ final class PhabricatorHash extends Phobject {
    * weak. Callers should prefer @{method:digestWithNamedKey}.
    *
    * @param   string  Input string.
-   * @return  string  32-byte hexidecimal SHA1+HMAC hash.
+   * @return  string  32-byte hexadecimal SHA1+HMAC hash.
    */
   public static function weakDigest($string, $key = null) {
     if ($key === null) {
diff --git a/src/infrastructure/util/password/PhabricatorPasswordHasher.php b/src/infrastructure/util/password/PhabricatorPasswordHasher.php
index 7972acc0a8..f0f30045c0 100644
--- a/src/infrastructure/util/password/PhabricatorPasswordHasher.php
+++ b/src/infrastructure/util/password/PhabricatorPasswordHasher.php
@@ -70,7 +70,7 @@ abstract public function getInstallInstructions();
 
   /**
    * Return an indicator of this hasher's strength. When choosing to hash
-   * new passwords, the strongest available hasher which is usuable for new
+   * new passwords, the strongest available hasher which is usable for new
    * passwords will be used, and the presence of a stronger hasher will
    * prompt users to update their hashes.
    *
@@ -208,7 +208,7 @@ private static function parseHashFromStorage(PhutilOpaqueEnvelope $hash) {
    * Get all available password hashers. This may include hashers which can not
    * actually be used (for example, a required extension is missing).
    *
-   * @return list<PhabicatorPasswordHasher> Hasher objects.
+   * @return list<PhabricatorPasswordHasher> Hasher objects.
    * @task hashing
    */
   public static function getAllHashers() {
@@ -243,7 +243,7 @@ public static function getAllHashers() {
    * Get all usable password hashers. This may include hashers which are
    * not desirable or advisable.
    *
-   * @return list<PhabicatorPasswordHasher> Hasher objects.
+   * @return list<PhabricatorPasswordHasher> Hasher objects.
    * @task hashing
    */
   public static function getAllUsableHashers() {
@@ -280,7 +280,7 @@ public static function getBestHasher() {
 
 
   /**
-   * Get the hashser for a given stored hash.
+   * Get the hasher for a given stored hash.
    *
    * @return PhabricatorPasswordHasher Corresponding hasher.
    * @task hashing
diff --git a/src/view/AphrontView.php b/src/view/AphrontView.php
index c014d7d50c..669742f29b 100644
--- a/src/view/AphrontView.php
+++ b/src/view/AphrontView.php
@@ -42,7 +42,7 @@ public function getViewer() {
 
 
   /**
-   * Test if a viewer has been set on this elmeent.
+   * Test if a viewer has been set on this element.
    *
    * @return bool True if a viewer is available.
    */
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index d26cca945f..78ff716a44 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -272,7 +272,7 @@ protected function willRenderPage() {
               'doc_href' => $doc_href,
               'message' => pht(
                 'Phabricator thinks you are using %s, but your '.
-                'client is conviced that it is using %s. This is a serious '.
+                'client is convinced that it is using %s. This is a serious '.
                 'misconfiguration with subtle, but significant, consequences.',
                 $server_protocol, $client_protocol),
             ));
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
index dc836f3d3a..53ec096265 100644
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -166,7 +166,7 @@ protected function getTagAttributes() {
     $classes[] = 'phui-header-shell';
 
     if ($this->noBackground) {
-      $classes[] = 'phui-header-no-backgound';
+      $classes[] = 'phui-header-no-background';
     }
 
     if ($this->bleedHeader) {
diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css
index e5985f8889..954a220229 100644
--- a/webroot/rsrc/css/phui/phui-document.css
+++ b/webroot/rsrc/css/phui/phui-document.css
@@ -35,13 +35,13 @@
 }
 
 .phui-document-content
-  .phui-header-shell.phui-header-no-backgound {
+  .phui-header-shell.phui-header-no-background {
   border-bottom: 1px solid {$thinblueborder};
   margin: 0 0 16px 0;
 }
 
 .phui-document-content
-  .phui-header-shell.phui-header-no-backgound
+  .phui-header-shell.phui-header-no-background
   .phui-header-view {
   padding: 8px 0 4px;
 }
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
index 18b1464e53..478dde2153 100644
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -34,7 +34,7 @@
   vertical-align: middle;
 }
 
-body .phui-header-shell.phui-header-no-backgound {
+body .phui-header-shell.phui-header-no-background {
   background-color: transparent;
   border: none;
 }
diff --git a/webroot/rsrc/js/application/conpherence/behavior-menu.js b/webroot/rsrc/js/application/conpherence/behavior-menu.js
index a5566dc5a4..43488ce4ff 100644
--- a/webroot/rsrc/js/application/conpherence/behavior-menu.js
+++ b/webroot/rsrc/js/application/conpherence/behavior-menu.js
@@ -94,7 +94,7 @@ JX.behavior('conpherence-menu', function(config) {
   var _oldDevice = null;
 
   /**
-   * Initializes this behavior based on all the configuraton jonx and the
+   * Initializes this behavior based on all the configuration jonx and the
    * result of JX.Device.getDevice();
    */
   function init() {
diff --git a/webroot/rsrc/js/application/conpherence/behavior-participant-pane.js b/webroot/rsrc/js/application/conpherence/behavior-participant-pane.js
index 8c9fc056f4..e428cbdbce 100644
--- a/webroot/rsrc/js/application/conpherence/behavior-participant-pane.js
+++ b/webroot/rsrc/js/application/conpherence/behavior-participant-pane.js
@@ -69,7 +69,7 @@ JX.behavior('conpherence-participant-pane', function() {
       // While the user is removing themselves, disable the notification
       // update behavior. If we don't do this, the user can get an error
       // when they remove themselves about permissions as the notification
-      // code tries to load what jist happened.
+      // code tries to load what just happened.
       var loadedPhid = threadManager.getLoadedThreadPHID();
       threadManager.setLoadedThreadPHID(null);
 
diff --git a/webroot/rsrc/js/application/diffusion/DiffusionLocateFileSource.js b/webroot/rsrc/js/application/diffusion/DiffusionLocateFileSource.js
index 14894f6cc0..1f94f349d3 100644
--- a/webroot/rsrc/js/application/diffusion/DiffusionLocateFileSource.js
+++ b/webroot/rsrc/js/application/diffusion/DiffusionLocateFileSource.js
@@ -260,7 +260,7 @@ JX.install('DiffusionLocateFileSource', {
 
     /**
      * Score a matching string by finding the longest prefix of the search
-     * query it contains continguously.
+     * query it contains contiguously.
      */
     scoreMatch: function(haystack, haypos, search) {
       var pos = 0;
diff --git a/webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js b/webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js
index 3991f4cc4e..0a02aebce7 100644
--- a/webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js
+++ b/webroot/rsrc/js/application/pholio/behavior-pholio-mock-view.js
@@ -201,7 +201,7 @@ JX.behavior('pholio-mock-view', function(config, statics) {
   }
 
   function render_image_header(image) {
-    // Render image dimensions and visible size. If we have this infomation
+    // Render image dimensions and visible size. If we have this information
     // from the server we can display some of it immediately; otherwise, we need
     // to wait for the image to load so we can read dimension information from
     // it.
diff --git a/webroot/rsrc/js/core/Prefab.js b/webroot/rsrc/js/core/Prefab.js
index c5a8ef5e9d..979ad3473b 100644
--- a/webroot/rsrc/js/core/Prefab.js
+++ b/webroot/rsrc/js/core/Prefab.js
@@ -184,7 +184,7 @@ JX.install('Prefab', {
       var self_hits = {};
 
       // We'll put matches where the user's input is a prefix of the name
-      // above mathches where that isn't true.
+      // above matches where that isn't true.
       var prefix_hits = {};
 
       var tokens = this.tokenize(value);
@@ -212,7 +212,7 @@ JX.install('Prefab', {
         }
 
         // If one result is open and one is closed, show the open result
-        // first. The "!" tricks here are becaused closed values are display
+        // first. The "!" tricks here are because closed values are display
         // strings, so the value is either `null` or some truthy string. If
         // we compare the values directly, we'll apply this rule to two
         // objects which are both closed but for different reasons, like
diff --git a/webroot/rsrc/js/core/behavior-device.js b/webroot/rsrc/js/core/behavior-device.js
index d74939a7e0..d68a46ff4e 100644
--- a/webroot/rsrc/js/core/behavior-device.js
+++ b/webroot/rsrc/js/core/behavior-device.js
@@ -27,7 +27,7 @@ JX.install('Device', {
       var self = JX.Device;
 
       // Even when we emit a '<meta name="viewport" ... />' tag which tells
-      // devices to fit the conent to the screen width, we'll sometimes measure
+      // devices to fit the content to the screen width, we'll sometimes measure
       // a viewport dimension which is larger than the available screen width,
       // particularly if we check too early.
 
diff --git a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
index df4a031377..a7f719dab4 100644
--- a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
+++ b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
@@ -543,7 +543,7 @@ JX.install('PHUIXAutocomplete', {
 
       // If the input is terminated by a space or another word-terminating
       // punctuation mark, we're going to deactivate if the results can not
-      // be refined by addding more words.
+      // be refined by adding more words.
 
       // The idea is that if you type "@alan ab", you're allowed to keep
       // editing "ab" until you type a space, period, or other terminator,
diff --git a/webroot/rsrc/js/phuix/PHUIXDropdownMenu.js b/webroot/rsrc/js/phuix/PHUIXDropdownMenu.js
index 3f93c1ee41..d9d86bf595 100644
--- a/webroot/rsrc/js/phuix/PHUIXDropdownMenu.js
+++ b/webroot/rsrc/js/phuix/PHUIXDropdownMenu.js
@@ -124,7 +124,7 @@ JX.install('PHUIXDropdownMenu', {
       }
 
       // If this action was built dynamically with PHUIXActionView, don't
-      // do anything by default. The caller is repsonsible for installing a
+      // do anything by default. The caller is responsible for installing a
       // handler if they want to react to clicks.
       if (e.getNode('phuix-action-view')) {
         return;

From b583093186974272188c9403cfd57a7179a3ecab Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Oct 2017 10:52:27 -0700
Subject: [PATCH 222/865] Fix Celerity map definition after spelling
 corrections

See D18693.
---
 resources/celerity/map.php | 196 ++++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 6c7d2db90c..ce069dbd11 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -8,9 +8,9 @@
 return array(
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
-    'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => '87a9a59b',
-    'core.pkg.js' => '28552e58',
+    'conpherence.pkg.js' => '15191c65',
+    'core.pkg.css' => '1a4e0c25',
+    'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
     'differential.pkg.js' => 'b71b8c5d',
@@ -151,13 +151,13 @@
     'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026',
     'rsrc/css/phui/phui-document-pro.css' => '8af7ea27',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
-    'rsrc/css/phui/phui-document.css' => 'c32e8dec',
+    'rsrc/css/phui/phui-document.css' => '878c2f52',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
     'rsrc/css/phui/phui-fontkit.css' => '1320ed01',
     'rsrc/css/phui/phui-form-view.css' => 'ae9f8d16',
     'rsrc/css/phui/phui-form.css' => '7aaa04e3',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
-    'rsrc/css/phui/phui-header-view.css' => '67fab16d',
+    'rsrc/css/phui/phui-header-view.css' => '31dc6c72',
     'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf',
     'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
     'rsrc/css/phui/phui-icon.css' => '5c4a5de6',
@@ -384,8 +384,8 @@
     'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '4d863052',
     'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '9bbf3762',
     'rsrc/js/application/conpherence/behavior-durable-column.js' => '2ae077e1',
-    'rsrc/js/application/conpherence/behavior-menu.js' => 'c9b99b77',
-    'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8',
+    'rsrc/js/application/conpherence/behavior-menu.js' => '4047cd35',
+    'rsrc/js/application/conpherence/behavior-participant-pane.js' => 'd057e45a',
     'rsrc/js/application/conpherence/behavior-pontificate.js' => '55616e04',
     'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
     'rsrc/js/application/conpherence/behavior-toggle-widget.js' => '3dbf94d5',
@@ -403,7 +403,7 @@
     'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
     'rsrc/js/application/differential/behavior-populate.js' => '419998ab',
     'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
-    'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'c93358e3',
+    'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => '00676f00',
     'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
     'rsrc/js/application/diffusion/behavior-commit-branches.js' => 'bdaf4d04',
     'rsrc/js/application/diffusion/behavior-commit-graph.js' => '75b83cbb',
@@ -428,7 +428,7 @@
     'rsrc/js/application/owners/owners-path-editor.js' => '7a68dda3',
     'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc',
     'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => 'bee502c8',
-    'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => 'fbe497e7',
+    'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => 'ec1f3669',
     'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => 'a6b98425',
     'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'fc91ab6c',
     'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef',
@@ -468,7 +468,7 @@
     'rsrc/js/core/KeyboardShortcutManager.js' => 'c19dd9b9',
     'rsrc/js/core/MultirowRowManager.js' => 'b5d57730',
     'rsrc/js/core/Notification.js' => '008faf9c',
-    'rsrc/js/core/Prefab.js' => 'c5af80a2',
+    'rsrc/js/core/Prefab.js' => '77b0ae28',
     'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
     'rsrc/js/core/TextAreaUtils.js' => '320810c8',
     'rsrc/js/core/Title.js' => '485aaa6c',
@@ -480,7 +480,7 @@
     'rsrc/js/core/behavior-choose-control.js' => '327a00d1',
     'rsrc/js/core/behavior-copy.js' => 'b0b8f86d',
     'rsrc/js/core/behavior-detect-timezone.js' => '4c193c96',
-    'rsrc/js/core/behavior-device.js' => 'bb1dd507',
+    'rsrc/js/core/behavior-device.js' => 'a3714c76',
     'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '484a6e22',
     'rsrc/js/core/behavior-error-log.js' => '6882e80a',
     'rsrc/js/core/behavior-fancy-datepicker.js' => 'ecf4e799',
@@ -527,9 +527,9 @@
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => '442efd08',
-    'rsrc/js/phuix/PHUIXAutocomplete.js' => '4b7430ab',
+    'rsrc/js/phuix/PHUIXAutocomplete.js' => 'e0731603',
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
-    'rsrc/js/phuix/PHUIXDropdownMenu.js' => '8018ee50',
+    'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
     'rsrc/js/phuix/PHUIXFormControl.js' => '83e03671',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
@@ -599,8 +599,8 @@
     'javelin-behavior-choose-control' => '327a00d1',
     'javelin-behavior-comment-actions' => '9a6dd75c',
     'javelin-behavior-config-reorder-fields' => 'b6993408',
-    'javelin-behavior-conpherence-menu' => 'c9b99b77',
-    'javelin-behavior-conpherence-participant-pane' => '8604caa8',
+    'javelin-behavior-conpherence-menu' => '4047cd35',
+    'javelin-behavior-conpherence-participant-pane' => 'd057e45a',
     'javelin-behavior-conpherence-pontificate' => '55616e04',
     'javelin-behavior-conpherence-search' => '9bbf3762',
     'javelin-behavior-countdown-timer' => 'e4cc26b3',
@@ -612,7 +612,7 @@
     'javelin-behavior-day-view' => '4b3c4443',
     'javelin-behavior-desktop-notifications-control' => '27ca6289',
     'javelin-behavior-detect-timezone' => '4c193c96',
-    'javelin-behavior-device' => 'bb1dd507',
+    'javelin-behavior-device' => 'a3714c76',
     'javelin-behavior-diff-preview-link' => '051c7832',
     'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
     'javelin-behavior-differential-feedback-preview' => '51c5ad07',
@@ -669,7 +669,7 @@
     'javelin-behavior-phabricator-transaction-list' => '1f6794f6',
     'javelin-behavior-phabricator-watch-anchor' => '9f36c42d',
     'javelin-behavior-pholio-mock-edit' => 'bee502c8',
-    'javelin-behavior-pholio-mock-view' => 'fbe497e7',
+    'javelin-behavior-pholio-mock-view' => 'ec1f3669',
     'javelin-behavior-phui-dropdown-menu' => 'b95d6f7d',
     'javelin-behavior-phui-file-upload' => 'b003d4fb',
     'javelin-behavior-phui-hovercards' => 'bcaccd64',
@@ -709,7 +709,7 @@
     'javelin-behavior-workflow' => '0a3f3021',
     'javelin-color' => '7e41274a',
     'javelin-cookie' => '62dfea03',
-    'javelin-diffusion-locate-file-source' => 'c93358e3',
+    'javelin-diffusion-locate-file-source' => '00676f00',
     'javelin-dom' => '4976858c',
     'javelin-dynval' => 'f6555212',
     'javelin-event' => '2ee659ce',
@@ -794,7 +794,7 @@
     'phabricator-notification-menu-css' => '10685bd4',
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
-    'phabricator-prefab' => 'c5af80a2',
+    'phabricator-prefab' => '77b0ae28',
     'phabricator-remarkup-css' => 'cad18339',
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
@@ -835,7 +835,7 @@
     'phui-crumbs-view-css' => '6ece3bbb',
     'phui-curtain-view-css' => '2bdaf026',
     'phui-document-summary-view-css' => '9ca48bdf',
-    'phui-document-view-css' => 'c32e8dec',
+    'phui-document-view-css' => '878c2f52',
     'phui-document-view-pro-css' => '8af7ea27',
     'phui-feed-story-css' => '44a9c8e9',
     'phui-font-icon-base-css' => '870a7360',
@@ -843,7 +843,7 @@
     'phui-form-css' => '7aaa04e3',
     'phui-form-view-css' => 'ae9f8d16',
     'phui-head-thing-view-css' => 'fd311e5f',
-    'phui-header-view-css' => '67fab16d',
+    'phui-header-view-css' => '31dc6c72',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'f0592bcf',
     'phui-icon-set-selector-css' => '87db8fee',
@@ -879,9 +879,9 @@
     'phui-workpanel-view-css' => 'a3a63478',
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '442efd08',
-    'phuix-autocomplete' => '4b7430ab',
+    'phuix-autocomplete' => 'e0731603',
     'phuix-button-view' => '8a91e1ac',
-    'phuix-dropdown-menu' => '8018ee50',
+    'phuix-dropdown-menu' => '04b2ae03',
     'phuix-form-control-view' => '83e03671',
     'phuix-icon-view' => 'bff6884b',
     'policy-css' => '957ea14c',
@@ -904,6 +904,12 @@
     'unhandled-exception-css' => '4c96257a',
   ),
   'requires' => array(
+    '00676f00' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-typeahead-preloaded-source',
+      'javelin-util',
+    ),
     '008faf9c' => array(
       'javelin-install',
       'javelin-dom',
@@ -924,6 +930,13 @@
       'javelin-dom',
       'phabricator-keyboard-shortcut',
     ),
+    '04b2ae03' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-stratcom',
+    ),
     '051c7832' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1142,6 +1155,20 @@
     '3ffe32d6' => array(
       'javelin-install',
     ),
+    '4047cd35' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-behavior-device',
+      'javelin-history',
+      'javelin-vector',
+      'javelin-scrollbar',
+      'phabricator-title',
+      'phabricator-shaped-request',
+      'conpherence-thread-manager',
+    ),
     '408bf173' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1232,12 +1259,6 @@
       'javelin-util',
       'phabricator-shaped-request',
     ),
-    '4b7430ab' => array(
-      'javelin-install',
-      'javelin-dom',
-      'phuix-icon-view',
-      'phabricator-prefab',
-    ),
     '4c193c96' => array(
       'javelin-behavior',
       'javelin-uri',
@@ -1471,6 +1492,18 @@
       'javelin-reactor',
       'javelin-util',
     ),
+    '77b0ae28' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-typeahead',
+      'javelin-tokenizer',
+      'javelin-typeahead-preloaded-source',
+      'javelin-typeahead-ondemand-source',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-util',
+    ),
     '77c1f0b0' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1513,13 +1546,6 @@
     '7f243deb' => array(
       'javelin-install',
     ),
-    '8018ee50' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-stratcom',
-    ),
     '834a1173' => array(
       'javelin-behavior',
       'javelin-scrollbar',
@@ -1536,15 +1562,6 @@
     '85ee8ce6' => array(
       'aphront-dialog-view-css',
     ),
-    '8604caa8' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-util',
-      'phabricator-notification',
-      'conpherence-thread-manager',
-    ),
     '88236f00' => array(
       'javelin-behavior',
       'phabricator-keyboard-shortcut',
@@ -1698,6 +1715,13 @@
       'javelin-util',
       'phabricator-keyboard-shortcut',
     ),
+    'a3714c76' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-install',
+    ),
     'a3a63478' => array(
       'phui-workcard-view-css',
     ),
@@ -1835,13 +1859,6 @@
       'javelin-uri',
       'phabricator-notification',
     ),
-    'bb1dd507' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-install',
-    ),
     'bcaccd64' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1901,18 +1918,6 @@
     'c587b80f' => array(
       'javelin-install',
     ),
-    'c5af80a2' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-typeahead',
-      'javelin-tokenizer',
-      'javelin-typeahead-preloaded-source',
-      'javelin-typeahead-ondemand-source',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-util',
-    ),
     'c7ccd872' => array(
       'phui-fontkit-css',
     ),
@@ -1924,31 +1929,11 @@
       'javelin-install',
       'javelin-util',
     ),
-    'c93358e3' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-typeahead-preloaded-source',
-      'javelin-util',
-    ),
     'c989ade3' => array(
       'javelin-install',
       'javelin-util',
       'javelin-stratcom',
     ),
-    'c9b99b77' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-behavior-device',
-      'javelin-history',
-      'javelin-vector',
-      'javelin-scrollbar',
-      'phabricator-title',
-      'phabricator-shaped-request',
-      'conpherence-thread-manager',
-    ),
     'caade6f2' => array(
       'javelin-behavior',
       'javelin-request',
@@ -1966,6 +1951,15 @@
     'cd2b9b77' => array(
       'phui-oi-list-view-css',
     ),
+    'd057e45a' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-util',
+      'phabricator-notification',
+      'conpherence-thread-manager',
+    ),
     'd0a99ab4' => array(
       'javelin-behavior',
       'javelin-typeahead-ondemand-source',
@@ -2030,6 +2024,12 @@
       'javelin-typeahead-ondemand-source',
       'javelin-dom',
     ),
+    'e0731603' => array(
+      'javelin-install',
+      'javelin-dom',
+      'phuix-icon-view',
+      'phabricator-prefab',
+    ),
     'e1d25dfb' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2096,6 +2096,20 @@
       'javelin-dom',
       'phabricator-draggable-list',
     ),
+    'ec1f3669' => array(
+      'javelin-behavior',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-magical-init',
+      'javelin-request',
+      'javelin-history',
+      'javelin-workflow',
+      'javelin-mask',
+      'javelin-behavior-device',
+      'phabricator-keyboard-shortcut',
+    ),
     'ecf4e799' => array(
       'javelin-behavior',
       'javelin-util',
@@ -2144,20 +2158,6 @@
       'javelin-install',
       'javelin-dom',
     ),
-    'fbe497e7' => array(
-      'javelin-behavior',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-magical-init',
-      'javelin-request',
-      'javelin-history',
-      'javelin-workflow',
-      'javelin-mask',
-      'javelin-behavior-device',
-      'phabricator-keyboard-shortcut',
-    ),
     'fc91ab6c' => array(
       'javelin-behavior',
       'javelin-dom',

From cf3e198b9f69c10714d1fd58a4b591ac1723b72d Mon Sep 17 00:00:00 2001
From: Dmitri Iouchtchenko <johnnyspoon@gmail.com>
Date: Mon, 9 Oct 2017 11:56:05 -0700
Subject: [PATCH 223/865] Change 'tempate' to 'template'

Summary: Fixed typo. See D18693.

Test Plan: None.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D18694
---
 .../fund/application/PhabricatorFundApplication.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/fund/application/PhabricatorFundApplication.php b/src/applications/fund/application/PhabricatorFundApplication.php
index 9f29f30986..58ce4f8922 100644
--- a/src/applications/fund/application/PhabricatorFundApplication.php
+++ b/src/applications/fund/application/PhabricatorFundApplication.php
@@ -56,7 +56,7 @@ protected function getCustomCapabilities() {
     return array(
       FundDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created initiatives.'),
-        'tempate' => FundInitiativePHIDType::TYPECONST,
+        'template' => FundInitiativePHIDType::TYPECONST,
       ),
       FundCreateInitiativesCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,

From 5897294fa97e17002fd8d847abd97a81cc420971 Mon Sep 17 00:00:00 2001
From: Dmitri Iouchtchenko <johnnyspoon@gmail.com>
Date: Mon, 9 Oct 2017 11:56:52 -0700
Subject: [PATCH 224/865] Add spelling TODOs

Summary: Ref T13005. Added reminders not to copy/paste.

Test Plan: None.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13005

Differential Revision: https://secure.phabricator.com/D18695
---
 src/applications/auth/provider/PhabricatorLDAPAuthProvider.php   | 1 +
 .../capability/HarbormasterBuildPlanDefaultViewCapability.php    | 1 +
 .../legalpad/xaction/LegalpadDocumentPreambleTransaction.php     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
index 7c2bf38618..44b58b85ff 100644
--- a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php
@@ -192,6 +192,7 @@ public function processLoginRequest(
   const KEY_VERSION                 = 'ldap:version';
   const KEY_REFERRALS               = 'ldap:referrals';
   const KEY_START_TLS               = 'ldap:start-tls';
+  // TODO: This is misspelled! See T13005.
   const KEY_ANONYMOUS_USERNAME      = 'ldap:anoynmous-username';
   const KEY_ANONYMOUS_PASSWORD      = 'ldap:anonymous-password';
   const KEY_ALWAYS_SEARCH           = 'ldap:always-search';
diff --git a/src/applications/harbormaster/capability/HarbormasterBuildPlanDefaultViewCapability.php b/src/applications/harbormaster/capability/HarbormasterBuildPlanDefaultViewCapability.php
index 5d3d46caa0..d9ebbb2f0d 100644
--- a/src/applications/harbormaster/capability/HarbormasterBuildPlanDefaultViewCapability.php
+++ b/src/applications/harbormaster/capability/HarbormasterBuildPlanDefaultViewCapability.php
@@ -3,6 +3,7 @@
 final class HarbormasterBuildPlanDefaultViewCapability
   extends PhabricatorPolicyCapability {
 
+  // TODO: This is misspelled! See T13005.
   const CAPABILITY = 'harbomaster.plan.default.view';
 
   public function getCapabilityName() {
diff --git a/src/applications/legalpad/xaction/LegalpadDocumentPreambleTransaction.php b/src/applications/legalpad/xaction/LegalpadDocumentPreambleTransaction.php
index a2b5e1f5cd..7ccb03c95b 100644
--- a/src/applications/legalpad/xaction/LegalpadDocumentPreambleTransaction.php
+++ b/src/applications/legalpad/xaction/LegalpadDocumentPreambleTransaction.php
@@ -3,6 +3,7 @@
 final class LegalpadDocumentPreambleTransaction
   extends LegalpadDocumentTransactionType {
 
+  // TODO: This is misspelled! See T13005.
   const TRANSACTIONTYPE = 'legalpad:premable';
 
   public function generateOldValue($object) {

From 821c7ac8334f54bcb3f290ae91f44421ce232716 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Oct 2017 17:01:56 -0700
Subject: [PATCH 225/865] For backup persitsence, mark the "common ngrams"
 table as a data table, not an index table

Summary:
Ref T13000. Garbage collecting common ngrams is slow because MySQL isn't all that great at deleting rows quickly. See PHI96, where it looks like it's going to take a week to GC ngrams for a ~million objects at a relatively conservative 0.15 threshold.

In the event of a restore, we can reduce the impact by persisting this table so the ngrams just don't get built when the reindex happens.

Test Plan: Viewed schema in Config, saw common ngrams tables marked as "Data" instead of "Index".

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18696
---
 .../config/schema/PhabricatorConfigSchemaSpec.php          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
index c451658682..8e67391b59 100644
--- a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
+++ b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
@@ -81,12 +81,15 @@ protected function buildFerretIndexSchema(PhabricatorFerretEngine $engine) {
       $engine->getNgramsSchemaKeys(),
       $index_options);
 
+    // NOTE: The common ngrams table is not marked as an index table. It is
+    // tiny and persisting it across a restore saves us a lot of work garbage
+    // collecting common ngrams from the index after it gets built.
+
     $this->buildRawSchema(
       $engine->getApplicationName(),
       $engine->getCommonNgramsTableName(),
       $engine->getCommonNgramsSchemaColumns(),
-      $engine->getCommonNgramsSchemaKeys(),
-      $index_options);
+      $engine->getCommonNgramsSchemaKeys());
   }
 
   protected function buildRawSchema(

From 9777c66576ffef33030663c4badc29af74e152d7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Oct 2017 15:13:56 -0700
Subject: [PATCH 226/865] Allow Phabricator to run with
 "enable_post_data_reading" disabled

Summary:
Ref T13008. Depends on D18701. The overall goal here is to make turning `enable_post_data_reading` off not break things, so we can run rate limiting checks before we read file uploads.

The biggest blocker for this is that turning it off stops `$_FILES` from coming into existence.

This //appears// to mostly work. Specifically:

  - Skip the `max_post_size` check when POST is off, since it's meaningless.
  - Don't read or scrub $_POST at startup when POST is off.
  - When we rebuild REQUEST and POST before processing requests, do multipart parsing if we need to and rebuild FILES.
  - Skip the `is_uploaded_file()` check if we built FILES ourselves.

This probably breaks a couple of small things, like maybe `__profile__` and other DarkConsole triggers over POST, and probably some other weird stuff. The parsers may also need more work than they've received so far.

I also need to verify that this actually works (i.e., lets us run code without reading the request body) but I'll include that in the change where I update the actual rate limiting.

Test Plan:
  - Disabled `enable_post_data_reading`.
  - Uploaded a file with a vanilla upload form (project profile image).
  - Uploaded a file with drag and drop.
  - Used DarkConsole.
  - Submitted comments.
  - Created a task.
  - Browsed around.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13008

Differential Revision: https://secure.phabricator.com/D18702
---
 ...AphrontDefaultApplicationConfiguration.php | 77 ++++++++++++++++---
 .../files/storage/PhabricatorFile.php         | 14 +++-
 support/PhabricatorStartup.php                | 34 +++++---
 3 files changed, 101 insertions(+), 24 deletions(-)

diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
index be23895bec..fb67919576 100644
--- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
@@ -15,26 +15,79 @@ public function buildRequest() {
     $parser = new PhutilQueryStringParser();
     $data   = array();
 
-    // If the request has "multipart/form-data" content, we can't use
-    // PhutilQueryStringParser to parse it, and the raw data supposedly is not
-    // available anyway (according to the PHP documentation, "php://input" is
-    // not available for "multipart/form-data" requests). However, it is
-    // available at least some of the time (see T3673), so double check that
-    // we aren't trying to parse data we won't be able to parse correctly by
-    // examining the Content-Type header.
-    $content_type = idx($_SERVER, 'CONTENT_TYPE');
-    $is_form_data = preg_match('@^multipart/form-data@i', $content_type);
-
     $request_method = idx($_SERVER, 'REQUEST_METHOD');
     if ($request_method === 'PUT') {
       // For PUT requests, do nothing: in particular, do NOT read input. This
       // allows us to stream input later and process very large PUT requests,
       // like those coming from Git LFS.
     } else {
+      // For POST requests, we're going to read the raw input ourselves here
+      // if we can. Among other things, this corrects variable names with
+      // the "." character in them, which PHP normally converts into "_".
+
+      // There are two major considerations here: whether the
+      // `enable_post_data_reading` option is set, and whether the content
+      // type is "multipart/form-data" or not.
+
+      // If `enable_post_data_reading` is off, we're free to read the entire
+      // raw request body and parse it -- and we must, because $_POST and
+      // $_FILES are not built for us. If `enable_post_data_reading` is on,
+      // which is the default, we may not be able to read the body (the
+      // documentation says we can't, but empirically we can at least some
+      // of the time).
+
+      // If the content type is "multipart/form-data", we need to build both
+      // $_POST and $_FILES, which is involved. The body itself is also more
+      // difficult to parse than other requests.
       $raw_input = PhabricatorStartup::getRawInput();
-      if (strlen($raw_input) && !$is_form_data) {
-        $data += $parser->parseQueryString($raw_input);
+      if (strlen($raw_input)) {
+        $content_type = idx($_SERVER, 'CONTENT_TYPE');
+        $is_multipart = preg_match('@^multipart/form-data@i', $content_type);
+        if ($is_multipart && !ini_get('enable_post_data_reading')) {
+          $multipart_parser = id(new AphrontMultipartParser())
+            ->setContentType($content_type);
+
+          $multipart_parser->beginParse();
+          $multipart_parser->continueParse($raw_input);
+          $parts = $multipart_parser->endParse();
+
+          $query_string = array();
+          foreach ($parts as $part) {
+            if (!$part->isVariable()) {
+              continue;
+            }
+
+            $name = $part->getName();
+            $value = $part->getVariableValue();
+
+            $query_string[] = urlencode($name).'='.urlencode($value);
+          }
+          $query_string = implode('&', $query_string);
+          $post = $parser->parseQueryString($query_string);
+
+          $files = array();
+          foreach ($parts as $part) {
+            if ($part->isVariable()) {
+              continue;
+            }
+
+            $files[$part->getName()] = $part->getPHPFileDictionary();
+          }
+          $_FILES = $files;
+        } else {
+          $post = $parser->parseQueryString($raw_input);
+        }
+
+        $_POST = $post;
+        PhabricatorStartup::rebuildRequest();
+
+        $data += $post;
       } else if ($_POST) {
+        $post = filter_input_array(INPUT_POST, FILTER_UNSAFE_RAW);
+        if (is_array($post)) {
+          $_POST = $post;
+          PhabricatorStartup::rebuildRequest();
+        }
         $data += $_POST;
       }
     }
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index 19f0bed90a..9636b5b017 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -178,9 +178,17 @@ public static function readUploadedFileData($spec) {
     }
 
     $tmp_name = idx($spec, 'tmp_name');
-    $is_valid = @is_uploaded_file($tmp_name);
-    if (!$is_valid) {
-      throw new Exception(pht('File is not an uploaded file.'));
+
+    // NOTE: If we parsed the request body ourselves, the files we wrote will
+    // not be registered in the `is_uploaded_file()` list. It's fine to skip
+    // this check: it just protects against sloppy code from the long ago era
+    // of "register_globals".
+
+    if (ini_get('enable_post_data_reading')) {
+      $is_valid = @is_uploaded_file($tmp_name);
+      if (!$is_valid) {
+        throw new Exception(pht('File is not an uploaded file.'));
+      }
     }
 
     $file_data = Filesystem::readFile($tmp_name);
diff --git a/support/PhabricatorStartup.php b/support/PhabricatorStartup.php
index fd286b2aa0..3d771a24f7 100644
--- a/support/PhabricatorStartup.php
+++ b/support/PhabricatorStartup.php
@@ -416,9 +416,12 @@ private static function normalizeInput() {
 
     // NOTE: We don't filter INPUT_SERVER because we don't want to overwrite
     // changes made in "preamble.php".
+
+    // NOTE: WE don't filter INPUT_POST because we may be constructing it
+    // lazily if "enable_post_data_reading" is disabled.
+
     $filter = array(
       INPUT_GET,
-      INPUT_POST,
       INPUT_ENV,
       INPUT_COOKIE,
     );
@@ -434,9 +437,6 @@ private static function normalizeInput() {
         case INPUT_COOKIE:
           $_COOKIE = array_merge($_COOKIE, $filtered);
           break;
-        case INPUT_POST:
-          $_POST = array_merge($_POST, $filtered);
-          break;
         case INPUT_ENV;
           $env = array_merge($_ENV, $filtered);
           $_ENV = self::filterEnvSuperglobal($env);
@@ -444,18 +444,28 @@ private static function normalizeInput() {
       }
     }
 
-    // rebuild $_REQUEST, respecting order declared in ini files
+    self::rebuildRequest();
+  }
+
+  /**
+   * @task validation
+   */
+  public static function rebuildRequest() {
+    // Rebuild $_REQUEST, respecting order declared in ".ini" files.
     $order = ini_get('request_order');
+
     if (!$order) {
       $order = ini_get('variables_order');
     }
+
     if (!$order) {
-      // $_REQUEST will be empty, leave it alone
+      // $_REQUEST will be empty, so leave it alone.
       return;
     }
+
     $_REQUEST = array();
-    for ($i = 0; $i < strlen($order); $i++) {
-      switch ($order[$i]) {
+    for ($ii = 0; $ii < strlen($order); $ii++) {
+      switch ($order[$ii]) {
         case 'G':
           $_REQUEST = array_merge($_REQUEST, $_GET);
           break;
@@ -466,7 +476,7 @@ private static function normalizeInput() {
           $_REQUEST = array_merge($_REQUEST, $_COOKIE);
           break;
         default:
-          // $_ENV and $_SERVER never go into $_REQUEST
+          // $_ENV and $_SERVER never go into $_REQUEST.
           break;
       }
     }
@@ -593,6 +603,12 @@ private static function detectPostMaxSizeTriggered() {
       return;
     }
 
+    // If "enable_post_data_reading" is off, we won't have $_POST and this
+    // condition is effectively impossible.
+    if (!ini_get('enable_post_data_reading')) {
+      return;
+    }
+
     // If there's POST data, clearly we're in good shape.
     if ($_POST) {
       return;

From 3f53718d107f0fc96ca9a189e669c5a7f3d64cc4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Oct 2017 14:23:09 -0700
Subject: [PATCH 227/865] Modularize rate/connection limits in Phabricator

Summary:
Depends on D18702. Ref T13008. This replaces the old hard-coded single rate limit with multiple flexible limits, and defines two types of limits:

  - Rate: reject requests if a client has completed too many requests recently.
  - Connection: reject requests if a client has too many more connections than disconnections recently.

The connection limit adds +1 to the score for each connection, then adds -1 for each disconnection. So the overall number is how many open connections they have, at least approximately.

Supporting multiple limits will let us do limiting by Hostname and by remote address (e.g., a specific IP can't exceed a low limit, and all requests to a hostname can't exceed a higher limit).

Configuring the new limits looks something like this:

```
PhabricatorStartup::addRateLimit(new PhabricatorClientRateLimit())
  ->setLimitKey('rate')
  ->setClientKey($_SERVER['REMOTE_ADDR'])
  ->setLimit(5);

PhabricatorStartup::addRateLimit(new PhabricatorClientConnectionLimit())
  ->setLimitKey('conn')
  ->setClientKey($_SERVER['REMOTE_ADDR'])
  ->setLimit(2);
```

Test Plan:
  - Configured limits as above.
  - Made a lot of requests, got cut off by the rate limit.
  - Used `curl --limit-rate -F 'data=@the_letter_m.txt' ...` to upload files really slowly. Got cut off by the connection limit. With `enable_post_data_reading` off, this correctly killed the connections //before// the uploads finished.
  - I'll send this stuff to `secure` before production to give it more of a chance.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13008

Differential Revision: https://secure.phabricator.com/D18703
---
 .../AphrontApplicationConfiguration.php       |  18 +-
 .../PhabricatorAccessControlTestCase.php      |   2 +-
 .../PhabricatorClientConnectionLimit.php      |  44 +++
 support/startup/PhabricatorClientLimit.php    | 291 ++++++++++++++++++
 .../startup/PhabricatorClientRateLimit.php    |  58 ++++
 support/{ => startup}/PhabricatorStartup.php  | 289 +++--------------
 webroot/index.php                             |   7 +-
 7 files changed, 441 insertions(+), 268 deletions(-)
 create mode 100644 support/startup/PhabricatorClientConnectionLimit.php
 create mode 100644 support/startup/PhabricatorClientLimit.php
 create mode 100644 support/startup/PhabricatorClientRateLimit.php
 rename support/{ => startup}/PhabricatorStartup.php (73%)

diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
index c0cd259992..60b12557c9 100644
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -204,20 +204,10 @@ public static function runHTTPRequest(AphrontHTTPSink $sink) {
 
     DarkConsoleXHProfPluginAPI::saveProfilerSample($access_log);
 
-    // Add points to the rate limits for this request.
-    $rate_token = PhabricatorStartup::getRateLimitToken();
-    if ($rate_token !== null) {
-      // The base score for a request allows users to make 30 requests per
-      // minute.
-      $score = (1000 / 30);
-
-      // If the user was logged in, let them make more requests.
-      if ($request->getUser() && $request->getUser()->getPHID()) {
-        $score = $score / 5;
-      }
-
-      PhabricatorStartup::addRateLimitScore($rate_token, $score);
-    }
+    PhabricatorStartup::disconnectRateLimits(
+      array(
+        'viewer' => $request->getUser(),
+      ));
 
     if ($processing_exception) {
       throw $processing_exception;
diff --git a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
index 27e716556e..b6c268d88c 100644
--- a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
+++ b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
@@ -10,7 +10,7 @@ protected function getPhabricatorTestCaseConfiguration() {
 
   public function testControllerAccessControls() {
     $root = dirname(phutil_get_library_root('phabricator'));
-    require_once $root.'/support/PhabricatorStartup.php';
+    require_once $root.'/support/startup/PhabricatorStartup.php';
 
     $application_configuration = new AphrontDefaultApplicationConfiguration();
 
diff --git a/support/startup/PhabricatorClientConnectionLimit.php b/support/startup/PhabricatorClientConnectionLimit.php
new file mode 100644
index 0000000000..4a66d05739
--- /dev/null
+++ b/support/startup/PhabricatorClientConnectionLimit.php
@@ -0,0 +1,44 @@
+<?php
+
+final class PhabricatorClientConnectionLimit
+  extends PhabricatorClientLimit {
+
+  protected function getBucketDuration() {
+    return 60;
+  }
+
+  protected function getBucketCount() {
+    return 15;
+  }
+
+  protected function shouldRejectConnection($score) {
+    // Reject connections if the cumulative score across all buckets exceeds
+    // the limit.
+    return ($score > $this->getLimit());
+  }
+
+  protected function getConnectScore() {
+    return 1;
+  }
+
+  protected function getPenaltyScore() {
+    return 0;
+  }
+
+  protected function getDisconnectScore(array $request_state) {
+    return -1;
+  }
+
+  protected function getRateLimitReason($score) {
+    $client_key = $this->getClientKey();
+
+    // NOTE: This happens before we load libraries, so we can not use pht()
+    // here.
+
+    return
+      "TOO MANY CONCURRENT CONNECTIONS\n".
+      "You (\"{$client_key}\") have too many concurrent ".
+      "connections.\n";
+  }
+
+}
diff --git a/support/startup/PhabricatorClientLimit.php b/support/startup/PhabricatorClientLimit.php
new file mode 100644
index 0000000000..bab90c6f15
--- /dev/null
+++ b/support/startup/PhabricatorClientLimit.php
@@ -0,0 +1,291 @@
+<?php
+
+abstract class PhabricatorClientLimit {
+
+  private $limitKey;
+  private $clientKey;
+  private $limit;
+
+  final public function setLimitKey($limit_key) {
+    $this->limitKey = $limit_key;
+    return $this;
+  }
+
+  final public function getLimitKey() {
+    return $this->limitKey;
+  }
+
+  final public function setClientKey($client_key) {
+    $this->clientKey = $client_key;
+    return $this;
+  }
+
+  final public function getClientKey() {
+    return $this->clientKey;
+  }
+
+  final public function setLimit($limit) {
+    $this->limit = $limit;
+    return $this;
+  }
+
+  final public function getLimit() {
+    return $this->limit;
+  }
+
+  final public function didConnect() {
+    // NOTE: We can not use pht() here because this runs before libraries
+    // load.
+
+    if (!function_exists('apc_fetch') && !function_exists('apcu_fetch')) {
+      throw new Exception(
+        'You can not configure connection rate limits unless APC/APCu are '.
+        'available. Rate limits rely on APC/APCu to track clients and '.
+        'connections.');
+    }
+
+    if ($this->getClientKey() === null) {
+      throw new Exception(
+        'You must configure a client key when defining a rate limit.');
+    }
+
+    if ($this->getLimitKey() === null) {
+      throw new Exception(
+        'You must configure a limit key when defining a rate limit.');
+    }
+
+    if ($this->getLimit() === null) {
+      throw new Exception(
+        'You must configure a limit when defining a rate limit.');
+    }
+
+    $points = $this->getConnectScore();
+    if ($points) {
+      $this->addScore($points);
+    }
+
+    $score = $this->getScore();
+    if (!$this->shouldRejectConnection($score)) {
+      // Client has not hit the limit, so continue processing the request.
+      return null;
+    }
+
+    $penalty = $this->getPenaltyScore();
+    if ($penalty) {
+      $this->addScore($penalty);
+      $score += $penalty;
+    }
+
+    return $this->getRateLimitReason($score);
+  }
+
+  final public function didDisconnect(array $request_state) {
+    $score = $this->getDisconnectScore($request_state);
+    if ($score) {
+      $this->addScore($score);
+    }
+  }
+
+
+  /**
+   * Get the number of seconds for each rate bucket.
+   *
+   * For example, a value of 60 will create one-minute buckets.
+   *
+   * @return int Number of seconds per bucket.
+   */
+  abstract protected function getBucketDuration();
+
+
+  /**
+   * Get the total number of rate limit buckets to retain.
+   *
+   * @return int Total number of rate limit buckets to retain.
+   */
+  abstract protected function getBucketCount();
+
+
+  /**
+   * Get the score to add when a client connects.
+   *
+   * @return double Connection score.
+   */
+  abstract protected function getConnectScore();
+
+
+  /**
+   * Get the number of penalty points to add when a client hits a rate limit.
+   *
+   * @return double Penalty score.
+   */
+  abstract protected function getPenaltyScore();
+
+
+  /**
+   * Get the score to add when a client disconnects.
+   *
+   * @return double Connection score.
+   */
+  abstract protected function getDisconnectScore(array $request_state);
+
+
+  /**
+   * Get a human-readable explanation of why the client is being rejected.
+   *
+   * @return string Brief rejection message.
+   */
+  abstract protected function getRateLimitReason($score);
+
+
+  /**
+   * Determine whether to reject a connection.
+   *
+   * @return bool True to reject the connection.
+   */
+  abstract protected function shouldRejectConnection($score);
+
+
+  /**
+   * Get the APC key for the smallest stored bucket.
+   *
+   * @return string APC key for the smallest stored bucket.
+   * @task ratelimit
+   */
+  private function getMinimumBucketCacheKey() {
+    $limit_key = $this->getLimitKey();
+    return "limit:min:{$limit_key}";
+  }
+
+
+  /**
+   * Get the current bucket ID for storing rate limit scores.
+   *
+   * @return int The current bucket ID.
+   */
+  private function getCurrentBucketID() {
+    return (int)(time() / $this->getBucketDuration());
+  }
+
+
+  /**
+   * Get the APC key for a given bucket.
+   *
+   * @param int Bucket to get the key for.
+   * @return string APC key for the bucket.
+   */
+  private function getBucketCacheKey($bucket_id) {
+    $limit_key = $this->getLimitKey();
+    return "limit:bucket:{$limit_key}:{$bucket_id}";
+  }
+
+
+  /**
+   * Add points to the rate limit score for some client.
+   *
+   * @param string  Some key which identifies the client making the request.
+   * @param float   The cost for this request; more points pushes them toward
+   *                the limit faster.
+   * @return this
+   */
+  private function addScore($score) {
+    $is_apcu = (bool)function_exists('apcu_fetch');
+
+    $current = $this->getCurrentBucketID();
+    $bucket_key = $this->getBucketCacheKey($current);
+
+    // There's a bit of a race here, if a second process reads the bucket
+    // before this one writes it, but it's fine if we occasionally fail to
+    // record a client's score. If they're making requests fast enough to hit
+    // rate limiting, we'll get them soon enough.
+
+    if ($is_apcu) {
+      $bucket = apcu_fetch($bucket_key);
+    } else {
+      $bucket = apc_fetch($bucket_key);
+    }
+
+    if (!is_array($bucket)) {
+      $bucket = array();
+    }
+
+    $client_key = $this->getClientKey();
+    if (empty($bucket[$client_key])) {
+      $bucket[$client_key] = 0;
+    }
+
+    $bucket[$client_key] += $score;
+
+    if ($is_apcu) {
+      apcu_store($bucket_key, $bucket);
+    } else {
+      apc_store($bucket_key, $bucket);
+    }
+
+    return $this;
+  }
+
+
+  /**
+   * Get the current rate limit score for a given client.
+   *
+   * @return float The client's current score.
+   * @task ratelimit
+   */
+  private function getScore() {
+    $is_apcu = (bool)function_exists('apcu_fetch');
+
+    // Identify the oldest bucket stored in APC.
+    $min_key = $this->getMinimumBucketCacheKey();
+    if ($is_apcu) {
+      $min = apcu_fetch($min_key);
+    } else {
+      $min = apc_fetch($min_key);
+    }
+
+    // If we don't have any buckets stored yet, store the current bucket as
+    // the oldest bucket.
+    $cur = $this->getCurrentBucketID();
+    if (!$min) {
+      if ($is_apcu) {
+        apcu_store($min_key, $cur);
+      } else {
+        apc_store($min_key, $cur);
+      }
+      $min = $cur;
+    }
+
+    // Destroy any buckets that are older than the minimum bucket we're keeping
+    // track of. Under load this normally shouldn't do anything, but will clean
+    // up an old bucket once per minute.
+    $count = $this->getBucketCount();
+    for ($cursor = $min; $cursor < ($cur - $count); $cursor++) {
+      $bucket_key = $this->getBucketCacheKey($cursor);
+      if ($is_apcu) {
+        apcu_delete($bucket_key);
+        apcu_store($min_key, $cursor + 1);
+      } else {
+        apc_delete($bucket_key);
+        apc_store($min_key, $cursor + 1);
+      }
+    }
+
+    $client_key = $this->getClientKey();
+
+    // Now, sum up the client's scores in all of the active buckets.
+    $score = 0;
+    for (; $cursor <= $cur; $cursor++) {
+      $bucket_key = $this->getBucketCacheKey($cursor);
+      if ($is_apcu) {
+        $bucket = apcu_fetch($bucket_key);
+      } else {
+        $bucket = apc_fetch($bucket_key);
+      }
+      if (isset($bucket[$client_key])) {
+        $score += $bucket[$client_key];
+      }
+    }
+
+    return $score;
+  }
+
+}
diff --git a/support/startup/PhabricatorClientRateLimit.php b/support/startup/PhabricatorClientRateLimit.php
new file mode 100644
index 0000000000..85a6def878
--- /dev/null
+++ b/support/startup/PhabricatorClientRateLimit.php
@@ -0,0 +1,58 @@
+<?php
+
+final class PhabricatorClientRateLimit
+  extends PhabricatorClientLimit {
+
+  protected function getBucketDuration() {
+    return 60;
+  }
+
+  protected function getBucketCount() {
+    return 5;
+  }
+
+  protected function shouldRejectConnection($score) {
+    $limit = $this->getLimit();
+
+    // Reject connections if the average score across all buckets exceeds the
+    // limit.
+    $average_score = $score / $this->getBucketCount();
+
+    return ($average_score > $limit);
+  }
+
+  protected function getConnectScore() {
+    return 0;
+  }
+
+  protected function getPenaltyScore() {
+    return 1;
+  }
+
+  protected function getDisconnectScore(array $request_state) {
+    $score = 1;
+
+    // If the user was logged in, let them make more requests.
+    if (isset($request_state['viewer'])) {
+      $viewer = $request_state['viewer'];
+      if ($viewer->isLoggedIn()) {
+        $score = 0.25;
+      }
+    }
+
+    return $score;
+  }
+
+  protected function getRateLimitReason($score) {
+    $client_key = $this->getClientKey();
+
+    // NOTE: This happens before we load libraries, so we can not use pht()
+    // here.
+
+    return
+      "TOO MANY REQUESTS\n".
+      "You (\"{$client_key}\") are issuing too many requests ".
+      "too quickly.\n";
+  }
+
+}
diff --git a/support/PhabricatorStartup.php b/support/startup/PhabricatorStartup.php
similarity index 73%
rename from support/PhabricatorStartup.php
rename to support/startup/PhabricatorStartup.php
index 3d771a24f7..41164fbd84 100644
--- a/support/PhabricatorStartup.php
+++ b/support/startup/PhabricatorStartup.php
@@ -46,11 +46,7 @@ final class PhabricatorStartup {
   private static $oldMemoryLimit;
   private static $phases;
 
-  // TODO: For now, disable rate limiting entirely by default. We need to
-  // iterate on it a bit for Conduit, some of the specific score levels, and
-  // to deal with NAT'd offices.
-  private static $maximumRate = 0;
-  private static $rateLimitToken;
+  private static $limits = array();
 
 
 /* -(  Accessing Request Information  )-------------------------------------- */
@@ -138,10 +134,7 @@ public static function didStartup($start_time) {
     // we can switch over to relying on our own exception recovery mechanisms.
     ini_set('display_errors', 0);
 
-    $rate_token = self::getRateLimitToken();
-    if ($rate_token !== null) {
-      self::rateLimitRequest($rate_token);
-    }
+    self::connectRateLimits();
 
     self::normalizeInput();
 
@@ -193,7 +186,7 @@ public static function didShutdown() {
   }
 
   public static function loadCoreLibraries() {
-    $phabricator_root = dirname(dirname(__FILE__));
+    $phabricator_root = dirname(dirname(dirname(__FILE__)));
     $libraries_root = dirname($phabricator_root);
 
     $root = null;
@@ -683,269 +676,66 @@ private static function detectPostMaxSizeTriggered() {
 
 
   /**
-   * Adjust the permissible rate limit score.
-   *
-   * By default, the limit is `1000`. You can use this method to set it to
-   * a larger or smaller value. If you set it to `2000`, users may make twice
-   * as many requests before rate limiting.
-   *
-   * @param int Maximum score before rate limiting.
-   * @return void
-   * @task ratelimit
-   */
-  public static function setMaximumRate($rate) {
-    self::$maximumRate = $rate;
-  }
-
-
-  /**
-   * Set a token to identify the client for purposes of rate limiting.
-   *
-   * By default, the `REMOTE_ADDR` is used. If your install is behind a load
-   * balancer, you may want to parse `X-Forwarded-For` and use that address
-   * instead.
-   *
-   * @param string Client identity for rate limiting.
-   */
-  public static function setRateLimitToken($token) {
-    self::$rateLimitToken = $token;
-  }
-
-
-  /**
-   * Get the current client identity for rate limiting.
-   */
-  public static function getRateLimitToken() {
-    if (self::$rateLimitToken !== null) {
-      return self::$rateLimitToken;
-    }
-
-    if (isset($_SERVER['REMOTE_ADDR'])) {
-      return $_SERVER['REMOTE_ADDR'];
-    }
-
-    return null;
-  }
-
-
-  /**
-   * Check if the user (identified by `$user_identity`) has issued too many
-   * requests recently. If they have, end the request with a 429 error code.
-   *
-   * The key just needs to identify the user. Phabricator uses both user PHIDs
-   * and user IPs as keys, tracking logged-in and logged-out users separately
-   * and enforcing different limits.
+   * Add a new client limits.
    *
-   * @param   string  Some key which identifies the user making the request.
-   * @return  void    If the user has exceeded the rate limit, this method
-   *                  does not return.
-   * @task ratelimit
+   * @param PhabricatorClientLimit New limit.
+   * @return PhabricatorClientLimit The limit.
    */
-  public static function rateLimitRequest($user_identity) {
-    if (!self::canRateLimit()) {
-      return;
-    }
-
-    $score = self::getRateLimitScore($user_identity);
-    $limit = self::$maximumRate * self::getRateLimitBucketCount();
-    if ($score > $limit) {
-      // Give the user some bonus points for getting rate limited. This keeps
-      // bad actors who keep slamming the 429 page locked out completely,
-      // instead of letting them get a burst of requests through every minute
-      // after a bucket expires.
-      $penalty = 50;
-
-      self::addRateLimitScore($user_identity, $penalty);
-      $score += $penalty;
-
-      self::didRateLimit($user_identity, $score, $limit);
-    }
+  public static function addRateLimit(PhabricatorClientLimit $limit) {
+    self::$limits[] = $limit;
+    return $limit;
   }
 
 
   /**
-   * Add points to the rate limit score for some user.
+   * Apply configured rate limits.
    *
-   * If users have earned more than 1000 points per minute across all the
-   * buckets they'll be locked out of the application, so awarding 1 point per
-   * request roughly corresponds to allowing 1000 requests per second, while
-   * awarding 50 points roughly corresponds to allowing 20 requests per second.
+   * If any limit is exceeded, this method terminates the request.
    *
-   * @param string  Some key which identifies the user making the request.
-   * @param float   The cost for this request; more points pushes them toward
-   *                the limit faster.
    * @return void
    * @task ratelimit
    */
-  public static function addRateLimitScore($user_identity, $score) {
-    if (!self::canRateLimit()) {
-      return;
-    }
-
-    $is_apcu = (bool)function_exists('apcu_fetch');
-    $current = self::getRateLimitBucket();
-
-    // There's a bit of a race here, if a second process reads the bucket
-    // before this one writes it, but it's fine if we occasionally fail to
-    // record a user's score. If they're making requests fast enough to hit
-    // rate limiting, we'll get them soon enough.
+  private static function connectRateLimits() {
+    $limits = self::$limits;
 
-    $bucket_key = self::getRateLimitBucketKey($current);
-    if ($is_apcu) {
-      $bucket = apcu_fetch($bucket_key);
-    } else {
-      $bucket = apc_fetch($bucket_key);
-    }
-
-    if (!is_array($bucket)) {
-      $bucket = array();
-    }
-
-    if (empty($bucket[$user_identity])) {
-      $bucket[$user_identity] = 0;
+    $reason = null;
+    $connected = array();
+    foreach ($limits as $limit) {
+      $reason = $limit->didConnect();
+      $connected[] = $limit;
+      if ($reason !== null) {
+        break;
+      }
     }
 
-    $bucket[$user_identity] += $score;
+    // If we're killing the request here, disconnect any limits that we
+    // connected to try to keep the accounting straight.
+    if ($reason !== null) {
+      foreach ($connected as $limit) {
+        $limit->didDisconnect(array());
+      }
 
-    if ($is_apcu) {
-      apcu_store($bucket_key, $bucket);
-    } else {
-      apc_store($bucket_key, $bucket);
+      self::didRateLimit($reason);
     }
   }
 
 
   /**
-   * Determine if rate limiting is available.
-   *
-   * Rate limiting depends on APC, and isn't available unless the APC user
-   * cache is available.
+   * Tear down rate limiting and allow limits to score the request.
    *
-   * @return bool True if rate limiting is available.
+   * @param map<string, wild> Additional, freeform request state.
+   * @return void
    * @task ratelimit
    */
-  private static function canRateLimit() {
+  public static function disconnectRateLimits(array $request_state) {
+    $limits = self::$limits;
 
-    if (!self::$maximumRate) {
-      return false;
+    foreach ($limits as $limit) {
+      $limit->didDisconnect($request_state);
     }
-
-    if (!function_exists('apc_fetch') && !function_exists('apcu_fetch')) {
-      return false;
-    }
-
-    return true;
   }
 
 
-  /**
-   * Get the current bucket for storing rate limit scores.
-   *
-   * @return int The current bucket.
-   * @task ratelimit
-   */
-  private static function getRateLimitBucket() {
-    return (int)(time() / 60);
-  }
-
-
-  /**
-   * Get the total number of rate limit buckets to retain.
-   *
-   * @return int Total number of rate limit buckets to retain.
-   * @task ratelimit
-   */
-  private static function getRateLimitBucketCount() {
-    return 5;
-  }
-
-
-  /**
-   * Get the APC key for a given bucket.
-   *
-   * @param int Bucket to get the key for.
-   * @return string APC key for the bucket.
-   * @task ratelimit
-   */
-  private static function getRateLimitBucketKey($bucket) {
-    return 'rate:bucket:'.$bucket;
-  }
-
-
-  /**
-   * Get the APC key for the smallest stored bucket.
-   *
-   * @return string APC key for the smallest stored bucket.
-   * @task ratelimit
-   */
-  private static function getRateLimitMinKey() {
-    return 'rate:min';
-  }
-
-
-  /**
-   * Get the current rate limit score for a given user.
-   *
-   * @param string Unique key identifying the user.
-   * @return float The user's current score.
-   * @task ratelimit
-   */
-  private static function getRateLimitScore($user_identity) {
-    $is_apcu = (bool)function_exists('apcu_fetch');
-
-    $min_key = self::getRateLimitMinKey();
-
-    // Identify the oldest bucket stored in APC.
-    $cur = self::getRateLimitBucket();
-    if ($is_apcu) {
-      $min = apcu_fetch($min_key);
-    } else {
-      $min = apc_fetch($min_key);
-    }
-
-    // If we don't have any buckets stored yet, store the current bucket as
-    // the oldest bucket.
-    if (!$min) {
-      if ($is_apcu) {
-        apcu_store($min_key, $cur);
-      } else {
-        apc_store($min_key, $cur);
-      }
-      $min = $cur;
-    }
-
-    // Destroy any buckets that are older than the minimum bucket we're keeping
-    // track of. Under load this normally shouldn't do anything, but will clean
-    // up an old bucket once per minute.
-    $count = self::getRateLimitBucketCount();
-    for ($cursor = $min; $cursor < ($cur - $count); $cursor++) {
-      $bucket_key = self::getRateLimitBucketKey($cursor);
-      if ($is_apcu) {
-        apcu_delete($bucket_key);
-        apcu_store($min_key, $cursor + 1);
-      } else {
-        apc_delete($bucket_key);
-        apc_store($min_key, $cursor + 1);
-      }
-    }
-
-    // Now, sum up the user's scores in all of the active buckets.
-    $score = 0;
-    for (; $cursor <= $cur; $cursor++) {
-      $bucket_key = self::getRateLimitBucketKey($cursor);
-      if ($is_apcu) {
-        $bucket = apcu_fetch($bucket_key);
-      } else {
-        $bucket = apc_fetch($bucket_key);
-      }
-      if (isset($bucket[$user_identity])) {
-        $score += $bucket[$user_identity];
-      }
-    }
-
-    return $score;
-  }
-
 
   /**
    * Emit an HTTP 429 "Too Many Requests" response (indicating that the user
@@ -954,18 +744,13 @@ private static function getRateLimitScore($user_identity) {
    * @return exit This method **does not return**.
    * @task ratelimit
    */
-  private static function didRateLimit($user_identity, $score, $limit) {
-    $message =
-      "TOO MANY REQUESTS\n".
-      "You (\"{$user_identity}\") are issuing too many requests ".
-      "too quickly.\n";
-
+  private static function didRateLimit($reason) {
     header(
       'Content-Type: text/plain; charset=utf-8',
       $replace = true,
       $http_error = 429);
 
-    echo $message;
+    echo $reason;
 
     exit(1);
   }
diff --git a/webroot/index.php b/webroot/index.php
index 59e5b71075..5c7d79bfa1 100644
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -37,7 +37,12 @@ function phabricator_startup() {
   // Load the PhabricatorStartup class itself.
   $t_startup = microtime(true);
   $root = dirname(dirname(__FILE__));
-  require_once $root.'/support/PhabricatorStartup.php';
+  require_once $root.'/support/startup/PhabricatorStartup.php';
+
+  // Load client limit classes so the preamble can configure limits.
+  require_once $root.'/support/startup/PhabricatorClientLimit.php';
+  require_once $root.'/support/startup/PhabricatorClientRateLimit.php';
+  require_once $root.'/support/startup/PhabricatorClientConnectionLimit.php';
 
   // If the preamble script exists, load it.
   $t_preamble = microtime(true);

From acb145b3d7adb3d4ce986ccfa9ead4fe90a64641 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 12 Oct 2017 16:26:53 -0700
Subject: [PATCH 228/865] Allow duplicates and merged-in tasks to be queried
 with `edge.search`

Summary: See PHI147.

Test Plan: Called the method from the web UI, got sensible results.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18706
---
 .../ManiphestTaskHasDuplicateTaskEdgeType.php     | 14 ++++++++++++++
 .../ManiphestTaskIsDuplicateOfTaskEdgeType.php    | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/applications/maniphest/edge/ManiphestTaskHasDuplicateTaskEdgeType.php b/src/applications/maniphest/edge/ManiphestTaskHasDuplicateTaskEdgeType.php
index b5f5b44ae3..6d41689ba4 100644
--- a/src/applications/maniphest/edge/ManiphestTaskHasDuplicateTaskEdgeType.php
+++ b/src/applications/maniphest/edge/ManiphestTaskHasDuplicateTaskEdgeType.php
@@ -13,4 +13,18 @@ public function shouldWriteInverseTransactions() {
     return true;
   }
 
+  public function getConduitKey() {
+    return 'task.merged-in';
+  }
+
+  public function getConduitName() {
+    return pht('Merged In');
+  }
+
+  public function getConduitDescription() {
+    return pht(
+      'The source task has had the destination task closed as a '.
+      'duplicate and merged into it.');
+  }
+
 }
diff --git a/src/applications/maniphest/edge/ManiphestTaskIsDuplicateOfTaskEdgeType.php b/src/applications/maniphest/edge/ManiphestTaskIsDuplicateOfTaskEdgeType.php
index 8c0e2a752d..3fafadc0f4 100644
--- a/src/applications/maniphest/edge/ManiphestTaskIsDuplicateOfTaskEdgeType.php
+++ b/src/applications/maniphest/edge/ManiphestTaskIsDuplicateOfTaskEdgeType.php
@@ -13,4 +13,19 @@ public function shouldWriteInverseTransactions() {
     return true;
   }
 
+  public function getConduitKey() {
+    return 'task.duplicate';
+  }
+
+  public function getConduitName() {
+    return pht('Closed as Duplicate');
+  }
+
+  public function getConduitDescription() {
+    return pht(
+      'The source task has been closed as a duplicate of the '.
+      'destination task.');
+  }
+
+
 }

From c5e8de945020ea0fe08f6c8f00784b1fc91a3d58 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 13 Oct 2017 13:38:47 -0700
Subject: [PATCH 229/865] Make `bin/storage dump` insert CREATE DATABASE and
 USE statements

Summary:
Ref T13000. The new approach for dumping database-by-database means that we don't get CREATE DATABASE or USE statements, which makes importing the dump again inconvenient.

Manually stitch these into the dump.

Test Plan:
  - Used `bin/storage dump --namespace ...` to dump a smaller local instance.
  - Used `bin/storage destroy --namespace ...`, to destroy the namespace, then inported the dump cleanly.
  - Verified that each CREATE DATABASE statement appears only once.
  - Verified that `bin/storage renamespace --live` can correctly process this file.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18707
---
 ...abricatorStorageManagementDumpWorkflow.php | 67 +++++++++++++------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index 17491d55e9..88bd80a9a8 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -215,7 +215,10 @@ public function didExecute(PhutilArgumentParser $args) {
           $target['table']);
       }
 
-      $commands[] = $command;
+      $commands[] = array(
+        'command' => $command,
+        'database' => $target['database'],
+      );
     }
 
 
@@ -244,9 +247,26 @@ public function didExecute(PhutilArgumentParser $args) {
           $file));
     }
 
+    $created = array();
+
     try {
-      foreach ($commands as $command) {
-        $future = new ExecFuture('%C', $command);
+      foreach ($commands as $spec) {
+        // Because we're dumping database-by-database, we need to generate our
+        // own CREATE DATABASE and USE statements.
+
+        $database = $spec['database'];
+        $preamble = array();
+        if (!isset($created[$database])) {
+          $preamble[] =
+            "CREATE DATABASE /*!32312 IF NOT EXISTS*/ `{$database}` ".
+            "/*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin */;\n";
+          $created[$database] = true;
+        }
+        $preamble[] = "USE `{$database}`;\n";
+        $preamble = implode('', $preamble);
+        $this->writeData($preamble, $file, $is_compress, $output_file);
+
+        $future = new ExecFuture('%C', $spec['command']);
 
         $iterator = id(new FutureIterator(array($future)))
           ->setUpdateInterval(0.100);
@@ -258,23 +278,7 @@ public function didExecute(PhutilArgumentParser $args) {
             fwrite(STDERR, $stderr);
           }
 
-          if (strlen($stdout)) {
-            if (!$file) {
-              $ok = fwrite(STDOUT, $stdout);
-            } else if ($is_compress) {
-              $ok = gzwrite($file, $stdout);
-            } else {
-              $ok = fwrite($file, $stdout);
-            }
-
-            if ($ok !== strlen($stdout)) {
-              throw new Exception(
-                pht(
-                  'Failed to write %d byte(s) to file "%s".',
-                  new PhutilNumber(strlen($stdout)),
-                  $output_file));
-            }
-          }
+          $this->writeData($stdout, $file, $is_compress, $output_file);
 
           if ($ready !== null) {
             $ready->resolvex();
@@ -314,4 +318,27 @@ public function didExecute(PhutilArgumentParser $args) {
     return 0;
   }
 
+
+  private function writeData($data, $file, $is_compress, $output_file) {
+    if (!strlen($data)) {
+      return;
+    }
+
+    if (!$file) {
+      $ok = fwrite(STDOUT, $data);
+    } else if ($is_compress) {
+      $ok = gzwrite($file, $data);
+    } else {
+      $ok = fwrite($file, $data);
+    }
+
+    if ($ok !== strlen($data)) {
+      throw new Exception(
+        pht(
+          'Failed to write %d byte(s) to file "%s".',
+          new PhutilNumber(strlen($data)),
+          $output_file));
+    }
+  }
+
 }

From 0e645b8f11d2ff3430c3f04cf01be4c30e803f01 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 14 Oct 2017 07:14:31 -0700
Subject: [PATCH 230/865] Disconnect rate limits in the PhabricatorStartup
 shutdown handler

This makes counts more accurate, particularly for connection limits.
---
 support/startup/PhabricatorStartup.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/support/startup/PhabricatorStartup.php b/support/startup/PhabricatorStartup.php
index 41164fbd84..1911a46b8a 100644
--- a/support/startup/PhabricatorStartup.php
+++ b/support/startup/PhabricatorStartup.php
@@ -150,6 +150,11 @@ public static function didStartup($start_time) {
    * @task hook
    */
   public static function didShutdown() {
+    // Disconnect any active rate limits before we shut down. If we don't do
+    // this, requests which exit early will lock a slot in any active
+    // connection limits, and won't count for rate limits.
+    self::disconnectRateLimits(array());
+
     $event = error_get_last();
 
     if (!$event) {
@@ -730,6 +735,10 @@ private static function connectRateLimits() {
   public static function disconnectRateLimits(array $request_state) {
     $limits = self::$limits;
 
+    // Remove all limits before disconnecting them so this works properly if
+    // it runs twice. (We run this automatically as a shutdown handler.)
+    self::$limits = array();
+
     foreach ($limits as $limit) {
       $limit->didDisconnect($request_state);
     }

From e21d603356fc4242143a045e436d42689343e7fa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 14 Oct 2017 07:14:31 -0700
Subject: [PATCH 231/865] (stable) Disconnect rate limits in the
 PhabricatorStartup shutdown handler

This makes counts more accurate, particularly for connection limits.
---
 support/startup/PhabricatorStartup.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/support/startup/PhabricatorStartup.php b/support/startup/PhabricatorStartup.php
index 41164fbd84..1911a46b8a 100644
--- a/support/startup/PhabricatorStartup.php
+++ b/support/startup/PhabricatorStartup.php
@@ -150,6 +150,11 @@ public static function didStartup($start_time) {
    * @task hook
    */
   public static function didShutdown() {
+    // Disconnect any active rate limits before we shut down. If we don't do
+    // this, requests which exit early will lock a slot in any active
+    // connection limits, and won't count for rate limits.
+    self::disconnectRateLimits(array());
+
     $event = error_get_last();
 
     if (!$event) {
@@ -730,6 +735,10 @@ private static function connectRateLimits() {
   public static function disconnectRateLimits(array $request_state) {
     $limits = self::$limits;
 
+    // Remove all limits before disconnecting them so this works properly if
+    // it runs twice. (We run this automatically as a shutdown handler.)
+    self::$limits = array();
+
     foreach ($limits as $limit) {
       $limit->didDisconnect($request_state);
     }

From 819b833607a6f9f05c60390a99cc1c206fde93e2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 14 Oct 2017 07:58:23 -0700
Subject: [PATCH 232/865] Tweak rate limiting point counts for omnipotent users

Summary:
Ref T13008. We haven't hit any issues with this, but I can imagine we might in the future.

When one host makes an intracluster request to another host, the `$viewer` ends up as the omnipotent viewer. This viewer isn't logged in, so they'll currently accumulate rate limit points at a high rate.

Instead, don't give them any points. These requests are always legitimate, and if they originated from a user request, that request should be the one getting rate limited.

Test Plan: Browsed around.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13008

Differential Revision: https://secure.phabricator.com/D18708
---
 support/startup/PhabricatorClientRateLimit.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/support/startup/PhabricatorClientRateLimit.php b/support/startup/PhabricatorClientRateLimit.php
index 85a6def878..89a273e3bf 100644
--- a/support/startup/PhabricatorClientRateLimit.php
+++ b/support/startup/PhabricatorClientRateLimit.php
@@ -35,7 +35,15 @@ protected function getDisconnectScore(array $request_state) {
     // If the user was logged in, let them make more requests.
     if (isset($request_state['viewer'])) {
       $viewer = $request_state['viewer'];
-      if ($viewer->isLoggedIn()) {
+      if ($viewer->isOmnipotent()) {
+        // If the viewer was omnipotent, this was an intracluster request or
+        // some other kind of special request, so don't give it any points
+        // toward rate limiting.
+        $score = 0;
+      } else if ($viewer->isLoggedIn()) {
+        // If the viewer was logged in, give them fewer points than if they
+        // were logged out, since this traffic is much more likely to be
+        // legitimate.
         $score = 0.25;
       }
     }

From 63d1230ade0f610729edc1eee99bd515213c1f31 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 17 Oct 2017 13:58:27 -0700
Subject: [PATCH 233/865] Parameterize the common ngrams threshold

Summary:
Ref T13000. Since other changes have generally made the ngrams table manageable, I'm not planning to enable common ngrams by default at this time.

Instead, make the threshold configurable with "--threshold" so we can guide installs through tuning this if they want (e.g. PHI110), and tune hosted instances.

(This might eventually become automatic, but just smoothing this bit off for now feels reasonable to me.)

Test Plan: Ran with `--reset`, and with various invalid and valid `--threshold` arguments.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13000

Differential Revision: https://secure.phabricator.com/D18710
---
 ...bricatorSearchManagementNgramsWorkflow.php | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
index 4b983fe0f9..ef0d73fa3d 100644
--- a/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
+++ b/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
@@ -16,19 +16,49 @@ protected function didConstruct() {
             'name' => 'reset',
             'help' => pht('Reset all common ngram records.'),
           ),
+          array(
+            'name' => 'threshold',
+            'param' => 'threshold',
+            'help' => pht(
+              'Prune ngrams present in more than this fraction of '.
+              'documents.'),
+          ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
+    $min_documents = 4096;
+
     $is_reset = $args->getArg('reset');
+    $threshold = $args->getArg('threshold');
+
+    if ($is_reset && $threshold !== null) {
+      throw new PhutilArgumentUsageException(
+        pht('Specify either --reset or --threshold, not both.'));
+    }
+
+    if (!$is_reset && $threshold === null) {
+      throw new PhutilArgumentUsageException(
+        pht('Specify either --reset or --threshold.'));
+    }
+
+    if (!$is_reset) {
+      if (!is_numeric($threshold)) {
+        throw new PhutilArgumentUsageException(
+          pht('Specify a numeric threshold between 0 and 1.'));
+      }
+
+      $threshold = (double)$threshold;
+      if ($threshold <= 0 || $threshold >= 1) {
+        throw new PhutilArgumentUsageException(
+          pht('Threshold must be greater than 0.0 and less than 1.0.'));
+      }
+    }
 
     $all_objects = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhabricatorFerretInterface')
       ->execute();
 
-    $min_documents = 4096;
-    $threshold = 0.15;
-
     foreach ($all_objects as $object) {
       $engine = $object->newFerretEngine();
       $conn = $object->establishConnection('w');

From d36f98a15a6aab7cc403db0311f020174f9aa307 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 17 Oct 2017 14:29:05 -0700
Subject: [PATCH 234/865] Clarify acceptable values for `--threshold` in
 `search ngrams`

Summary: See D18710.

Test Plan: o_O

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18712
---
 .../management/PhabricatorSearchManagementNgramsWorkflow.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
index ef0d73fa3d..1a1124b4d8 100644
--- a/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
+++ b/src/applications/search/management/PhabricatorSearchManagementNgramsWorkflow.php
@@ -21,7 +21,7 @@ protected function didConstruct() {
             'param' => 'threshold',
             'help' => pht(
               'Prune ngrams present in more than this fraction of '.
-              'documents.'),
+              'documents. Provide a value between 0.0 and 1.0.'),
           ),
         ));
   }

From bfabe49c5ae88b62556238443e536c986a78d1f6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 19 Oct 2017 13:35:02 -0700
Subject: [PATCH 235/865] Start revisions in "Draft" if prototypes are enabled

Summary: Ref T2543. This is a less ambitious version of the rule in D18628, which I backed off from, since I think this probably still has a fair number of loose ends to tie up.

Test Plan: Created a revision locally.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18713
---
 .../differential/storage/DifferentialRevision.php         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index e29db36b14..d14f69f563 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -67,13 +67,19 @@ public static function initializeNewRevision(PhabricatorUser $actor) {
     $view_policy = $app->getPolicy(
       DifferentialDefaultViewCapability::CAPABILITY);
 
+    if (PhabricatorEnv::getEnvConfig('phabricator.show-prototypes')) {
+      $initial_state = DifferentialRevisionStatus::DRAFT;
+    } else {
+      $initial_state = DifferentialRevisionStatus::NEEDS_REVIEW;
+    }
+
     return id(new DifferentialRevision())
       ->setViewPolicy($view_policy)
       ->setAuthorPHID($actor->getPHID())
       ->attachRepository(null)
       ->attachActiveDiff(null)
       ->attachReviewers(array())
-      ->setModernRevisionStatus(DifferentialRevisionStatus::NEEDS_REVIEW);
+      ->setModernRevisionStatus($initial_state);
   }
 
   protected function getConfiguration() {

From 1755ec242989fabf1c27ab71f5364ce9be68a74a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 19 Oct 2017 14:09:25 -0700
Subject: [PATCH 236/865] Show more detailed hints about draft revisions in the
 UI

Summary: Ref T2543. When revisions are in the draft state, tell the user what we're waiting for or why they aren't moving forward.

Test Plan: {F5228840}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18714
---
 src/__phutil_library_map__.php                |  2 +
 .../customfield/DifferentialDraftField.php    | 90 +++++++++++++++++++
 .../editor/DifferentialTransactionEditor.php  | 48 +---------
 .../storage/DifferentialRevision.php          | 52 +++++++++++
 4 files changed, 145 insertions(+), 47 deletions(-)
 create mode 100644 src/applications/differential/customfield/DifferentialDraftField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index a650e33fcf..93efcc65e1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -444,6 +444,7 @@
     'DifferentialDiffTransactionQuery' => 'applications/differential/query/DifferentialDiffTransactionQuery.php',
     'DifferentialDiffViewController' => 'applications/differential/controller/DifferentialDiffViewController.php',
     'DifferentialDoorkeeperRevisionFeedStoryPublisher' => 'applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php',
+    'DifferentialDraftField' => 'applications/differential/customfield/DifferentialDraftField.php',
     'DifferentialExactUserFunctionDatasource' => 'applications/differential/typeahead/DifferentialExactUserFunctionDatasource.php',
     'DifferentialFieldParseException' => 'applications/differential/exception/DifferentialFieldParseException.php',
     'DifferentialFieldValidationException' => 'applications/differential/exception/DifferentialFieldValidationException.php',
@@ -5451,6 +5452,7 @@
     'DifferentialDiffTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'DifferentialDiffViewController' => 'DifferentialController',
     'DifferentialDoorkeeperRevisionFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
+    'DifferentialDraftField' => 'DifferentialCoreCustomField',
     'DifferentialExactUserFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'DifferentialFieldParseException' => 'Exception',
     'DifferentialFieldValidationException' => 'Exception',
diff --git a/src/applications/differential/customfield/DifferentialDraftField.php b/src/applications/differential/customfield/DifferentialDraftField.php
new file mode 100644
index 0000000000..e37d622a33
--- /dev/null
+++ b/src/applications/differential/customfield/DifferentialDraftField.php
@@ -0,0 +1,90 @@
+<?php
+
+final class DifferentialDraftField
+  extends DifferentialCoreCustomField {
+
+  public function getFieldKey() {
+    return 'differential:draft';
+  }
+
+  public function getFieldName() {
+    return pht('Draft');
+  }
+
+  public function getFieldDescription() {
+    return pht('Show a warning about draft revisions.');
+  }
+
+  protected function readValueFromRevision(
+    DifferentialRevision $revision) {
+    return null;
+  }
+
+  public function shouldAppearInPropertyView() {
+    return true;
+  }
+
+  public function renderPropertyViewValue() {
+    return null;
+  }
+
+  public function getWarningsForRevisionHeader(array $handles) {
+    $viewer = $this->getViewer();
+    $revision = $this->getObject();
+
+    if (!$revision->isDraft()) {
+      return array();
+    }
+
+    $warnings = array();
+
+    $blocking_map = array(
+      HarbormasterBuildStatus::STATUS_FAILED,
+      HarbormasterBuildStatus::STATUS_ABORTED,
+      HarbormasterBuildStatus::STATUS_ERROR,
+      HarbormasterBuildStatus::STATUS_PAUSED,
+      HarbormasterBuildStatus::STATUS_DEADLOCKED,
+    );
+    $blocking_map = array_fuse($blocking_map);
+
+    $builds = $revision->loadActiveBuilds($viewer);
+
+    $waiting = array();
+    $blocking = array();
+    foreach ($builds as $build) {
+      if (isset($blocking_map[$build->getBuildStatus()])) {
+        $blocking[] = $build;
+      } else {
+        $waiting[] = $build;
+      }
+    }
+
+    $blocking_list = $viewer->renderHandleList(mpull($blocking, 'getPHID'))
+      ->setAsInline(true);
+    $waiting_list = $viewer->renderHandleList(mpull($waiting, 'getPHID'))
+      ->setAsInline(true);
+
+    if ($blocking) {
+      $warnings[] = pht(
+        'This draft revision will not be submitted for review because %s '.
+        'build(s) failed: %s.',
+        phutil_count($blocking),
+        $blocking_list);
+      $warnings[] = pht(
+        'Fix build failures and update the revision.');
+    } else if ($waiting) {
+      $warnings[] = pht(
+        'This draft revision will be sent for review once %s '.
+        'build(s) pass: %s.',
+        phutil_count($waiting),
+        $waiting_list);
+    } else {
+      $warnings[] = pht(
+        'This is a draft revision that has not yet been submitted for '.
+        'review.');
+    }
+
+    return $warnings;
+  }
+
+}
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 253d49c1ec..7c9bb01b07 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1570,58 +1570,12 @@ protected function didApplyTransactions($object, array $xactions) {
 
   private function hasActiveBuilds($object) {
     $viewer = $this->requireActor();
-    $diff = $object->getActiveDiff();
 
-    $buildables = id(new HarbormasterBuildableQuery())
-      ->setViewer($viewer)
-      ->withContainerPHIDs(array($object->getPHID()))
-      ->withBuildablePHIDs(array($diff->getPHID()))
-      ->withManualBuildables(false)
-      ->execute();
-    if (!$buildables) {
-      return false;
-    }
-
-    $builds = id(new HarbormasterBuildQuery())
-      ->setViewer($viewer)
-      ->withBuildablePHIDs(mpull($buildables, 'getPHID'))
-      ->withBuildStatuses(
-        array(
-          HarbormasterBuildStatus::STATUS_INACTIVE,
-          HarbormasterBuildStatus::STATUS_PENDING,
-          HarbormasterBuildStatus::STATUS_BUILDING,
-          HarbormasterBuildStatus::STATUS_FAILED,
-          HarbormasterBuildStatus::STATUS_ABORTED,
-          HarbormasterBuildStatus::STATUS_ERROR,
-          HarbormasterBuildStatus::STATUS_PAUSED,
-          HarbormasterBuildStatus::STATUS_DEADLOCKED,
-        ))
-      ->needBuildTargets(true)
-      ->execute();
+    $builds = $object->loadActiveBuilds($viewer);
     if (!$builds) {
       return false;
     }
 
-    $active = array();
-    foreach ($builds as $key => $build) {
-      foreach ($build->getBuildTargets() as $target) {
-        if ($target->isAutotarget()) {
-          // Ignore autotargets when looking for active of failed builds. If
-          // local tests fail and you continue anyway, you don't need to
-          // double-confirm them.
-          continue;
-        }
-
-        // This build has at least one real target that's doing something.
-        $active[$key] = $build;
-        break;
-      }
-    }
-
-    if (!$active) {
-      return false;
-    }
-
     return true;
   }
 
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index d14f69f563..76c7c4da95 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -708,6 +708,58 @@ public function shouldBroadcast() {
     return false;
   }
 
+  public function loadActiveBuilds(PhabricatorUser $viewer) {
+    $diff = $this->getActiveDiff();
+
+    $buildables = id(new HarbormasterBuildableQuery())
+      ->setViewer($viewer)
+      ->withContainerPHIDs(array($this->getPHID()))
+      ->withBuildablePHIDs(array($diff->getPHID()))
+      ->withManualBuildables(false)
+      ->execute();
+    if (!$buildables) {
+      return array();
+    }
+
+    $builds = id(new HarbormasterBuildQuery())
+      ->setViewer($viewer)
+      ->withBuildablePHIDs(mpull($buildables, 'getPHID'))
+      ->withBuildStatuses(
+        array(
+          HarbormasterBuildStatus::STATUS_INACTIVE,
+          HarbormasterBuildStatus::STATUS_PENDING,
+          HarbormasterBuildStatus::STATUS_BUILDING,
+          HarbormasterBuildStatus::STATUS_FAILED,
+          HarbormasterBuildStatus::STATUS_ABORTED,
+          HarbormasterBuildStatus::STATUS_ERROR,
+          HarbormasterBuildStatus::STATUS_PAUSED,
+          HarbormasterBuildStatus::STATUS_DEADLOCKED,
+        ))
+      ->needBuildTargets(true)
+      ->execute();
+    if (!$builds) {
+      return array();
+    }
+
+    $active = array();
+    foreach ($builds as $key => $build) {
+      foreach ($build->getBuildTargets() as $target) {
+        if ($target->isAutotarget()) {
+          // Ignore autotargets when looking for active of failed builds. If
+          // local tests fail and you continue anyway, you don't need to
+          // double-confirm them.
+          continue;
+        }
+
+        // This build has at least one real target that's doing something.
+        $active[$key] = $build;
+        break;
+      }
+    }
+
+    return $active;
+  }
+
 
 /* -(  HarbormasterBuildableInterface  )------------------------------------- */
 

From 01b1854fb45c3fda896362bc565ba09300e59ccd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Oct 2017 07:40:11 -0700
Subject: [PATCH 237/865] Fix an issue with attempting to index comments on
 packages

Summary: See rPcd14194a329788d5fff6365bcade278fd18f3612 for a similar change. Implement `getApplicationTransactionCommentObject()` to return `null` explicitly.

Test Plan: Ran `bin/search index --type ownerspackage`, got indexing after change.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18715
---
 .../owners/storage/PhabricatorOwnersPackageTransaction.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php b/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php
index 66e15b634a..1dfc944f63 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php
@@ -15,4 +15,8 @@ public function getBaseTransactionClass() {
     return 'PhabricatorOwnersPackageTransactionType';
   }
 
+  public function getApplicationTransactionCommentObject() {
+    return null;
+  }
+
 }

From cbcab60fbb95e8ba6e00860e71b7e703e71f3d71 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Oct 2017 10:47:24 -0700
Subject: [PATCH 238/865] Remove obsolete instructions from information on
 prototype applications

Summary: Most of this document is no longer relevant, since we're happy to work on prototypes if you're paying us and no longer have any meaningful free support.

Test Plan: Read document.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18719
---
 src/docs/user/userguide/prototypes.diviner | 33 ----------------------
 1 file changed, 33 deletions(-)

diff --git a/src/docs/user/userguide/prototypes.diviner b/src/docs/user/userguide/prototypes.diviner
index 7352502f99..c84bad1178 100644
--- a/src/docs/user/userguide/prototypes.diviner
+++ b/src/docs/user/userguide/prototypes.diviner
@@ -9,8 +9,6 @@ Overview
 Phabricator includes //prototype applications//, which are applications in an
 early stage of development.
 
-IMPORTANT: The upstream does not offer support for these applications.
-
 When we begin working on a new application, we usually implement it as a
 prototype first. This allows us to get a better sense of how the application
 might work and integrate with other applications, and what technical and product
@@ -32,34 +30,3 @@ on hold indefinitely if we're less excited about it after we begin building it.
 
 If you're interested in previewing upcoming applications, you can use the
 `phabricator.show-prototypes` configuration setting to enable prototypes.
-
-Feedback on Prototypes
-======================
-
-We're usually interested in this sort of feedback on prototypes:
-
-  - {icon check, color=green} **Use Cases**: If we're building something that
-    you think you'd use, we'd love to hear about your use cases for it. This can
-    help us figure out what features to add and how users may think about, use,
-    and integrate the application.
-  - {icon check, color=green} **General Interest**: Is an application something
-    you're looking forward to? Knowing which applications users are interested
-    in can help us set priorities.
-
-We're usually **not** interested in this sort of feedback on prototypes:
-
-  - {icon times, color=red} **Support Requests**: We do not support these
-    applications. Use them at your own risk, or wait for them to leave the
-    prototype phase.
-  - {icon times, color=red} **Bug Reports**: We know these applications don't
-    work well yet, and usually know about most of the open bugs. Even if we
-    don't, whatever isn't working yet may change completely before the
-    application leaves the prototype phase.
-  - {icon times, color=red} **Contributions / Pull Requests**: These
-    applications are usually in too early a state to accept contributions. Let
-    us know about your use case, but wait for release to send code.
-
-Overall, using prototypes makes it easier for us to explore and develop
-application ideas, and to share a preview of what's coming in the future with
-users, but prototypes are not yet full applications and we do not provide
-support until applications leave the prototype phase.

From 65f13b156f5ecdbf689cce16f2bc7b9680818789 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Oct 2017 10:15:07 -0700
Subject: [PATCH 239/865] Improve "refengine" performance for testing large
 numbers of Mercurial branches

Summary:
See PHI158. In the RefEngine, we test if any old branch positions have been removed from the repository. This is uncommon (but not impossible) in Mercurial, and corresponds to users deleting branches in Git.

Currently, we end up running `hg log` for each position, in parallel. Because of Python's large startup overhead, this can be resource intensive for repositories with a large number of branches.

We have to do this in the general case because the caller may be asking us to resolve `tip`, `newfeature`, `tip~3`, `9`, etc. However, in the specific case where the refs are 40-digit hashes, we can bulk resolve them if they exist, like this:

```
hg log ... --rev (abcd or def0 or ab12 or ...)
```

In the general case, we could probably do less of this than we currently do (instead of testing all old heads, we could prune the list by removing commits which we know are still pointed to by current heads) but that's a slightly more involved change and the effect here is already dramatic.

Test Plan:
Verified that CPU usage drops from ~110s -> ~0.9s:

Before:

```
epriestley@orbital ~/dev/phabricator $ time ./bin/repository refs nss
Updating refs in "nss"...
Done.

real	0m14.676s
user	1m24.714s
sys	0m21.645s
```

After:

```
epriestley@orbital ~/dev/phabricator $ time ./bin/repository refs nss
Updating refs in "nss"...
Done.

real	0m0.861s
user	0m0.882s
sys	0m0.213s
```

  - Manually resolved `blue`, `tip`, `9`, etc., got expected results.
  - Tried to resolve invalid hashes, got expected result (no resolution).

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18717
---
 .../DiffusionLowLevelResolveRefsQuery.php     | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
index b649ca65a8..f9e9f74774 100644
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
@@ -256,6 +256,66 @@ private function resolveMercurialRefs() {
       return $results;
     }
 
+    // If some of the refs look like hashes, try to bulk resolve them. This
+    // workflow happens via RefEngine and bulk resolution is dramatically
+    // faster than individual resolution. See PHI158.
+
+    $hashlike = array();
+    foreach ($unresolved as $key => $ref) {
+      if (preg_match('/^[a-f0-9]{40}\z/', $ref)) {
+        $hashlike[$key] = $ref;
+      }
+    }
+
+    if (count($hashlike) > 1) {
+      $hashlike_map = array();
+
+      $hashlike_groups = array_chunk($hashlike, 64, true);
+      foreach ($hashlike_groups as $hashlike_group) {
+        $hashlike_arg = array();
+        foreach ($hashlike_group as $hashlike_ref) {
+          $hashlike_arg[] = hgsprintf('%s', $hashlike_ref);
+        }
+        $hashlike_arg = '('.implode(' or ', $hashlike_arg).')';
+
+        list($err, $refs) = $repository->execLocalCommand(
+          'log --template=%s --rev %s',
+          '{node}\n',
+          $hashlike_arg);
+        if ($err) {
+          // NOTE: If any ref fails to resolve, Mercurial will exit with an
+          // error. We just give up on the whole group and resolve it
+          // individually below. In theory, we could split it into subgroups
+          // but the pathway where this bulk resolution matters rarely tries
+          // to resolve missing refs (see PHI158).
+          continue;
+        }
+
+        $refs = phutil_split_lines($refs, false);
+
+        foreach ($refs as $ref) {
+          $hashlike_map[$ref] = true;
+        }
+      }
+
+      foreach ($unresolved as $key => $ref) {
+        if (!isset($hashlike_map[$ref])) {
+          continue;
+        }
+
+        $results[$ref][] = array(
+          'type' => 'commit',
+          'identifier' => $ref,
+        );
+
+        unset($unresolved[$key]);
+      }
+    }
+
+    if (!$unresolved) {
+      return $results;
+    }
+
     // If we still have unresolved refs (which might be things like "tip"),
     // try to resolve them individually.
 

From 672247eff30b65210e2f0f00b009f8c6c3f4b64f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Oct 2017 10:43:33 -0700
Subject: [PATCH 240/865] Add aural "+" and "-" hints to unified diffs for
 users who use screenreaders

Summary: See PHI160 for discussion.

Test Plan:
With `?__aural__=1`, saw aural hints:

{F5229986}

Without, saw normal visual diff.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18718
---
 .../DifferentialChangesetOneUpRenderer.php    | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
index 7a694cfd98..586680d1b8 100644
--- a/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
@@ -41,6 +41,20 @@ protected function renderPrimitives(array $primitives, $rows) {
 
     $column_width = 4;
 
+    $aural_minus = javelin_tag(
+      'span',
+      array(
+        'aural' => true,
+      ),
+      '- ');
+
+    $aural_plus = javelin_tag(
+      'span',
+      array(
+        'aural' => true,
+      ),
+      '+ ');
+
     $out = array();
     foreach ($primitives as $k => $p) {
       $type = $p['type'];
@@ -55,8 +69,10 @@ protected function renderPrimitives(array $primitives, $rows) {
           if ($is_old) {
             if ($p['htype']) {
               $class = 'left old';
+              $aural = $aural_minus;
             } else {
               $class = 'left';
+              $aural = null;
             }
 
             if ($type == 'old-file') {
@@ -79,14 +95,20 @@ protected function renderPrimitives(array $primitives, $rows) {
               ),
               $line);
 
+            $render = $p['render'];
+            if ($aural !== null) {
+              $render = array($aural, $render);
+            }
+
             $cells[] = phutil_tag('th', array('class' => $class));
             $cells[] = $no_copy;
-            $cells[] = phutil_tag('td', array('class' => $class), $p['render']);
+            $cells[] = phutil_tag('td', array('class' => $class), $render);
             $cells[] = $no_coverage;
           } else {
             if ($p['htype']) {
               $class = 'right new';
               $cells[] = phutil_tag('th', array('class' => $class));
+              $aural = $aural_plus;
             } else {
               $class = 'right';
               if ($left_prefix) {
@@ -98,6 +120,7 @@ protected function renderPrimitives(array $primitives, $rows) {
               $oline = $p['oline'];
 
               $cells[] = phutil_tag('th', array('id' => $left_id), $oline);
+              $aural = null;
             }
 
             if ($type == 'new-file') {
@@ -120,8 +143,13 @@ protected function renderPrimitives(array $primitives, $rows) {
               ),
               $line);
 
+            $render = $p['render'];
+            if ($aural !== null) {
+              $render = array($aural, $render);
+            }
+
             $cells[] = $no_copy;
-            $cells[] = phutil_tag('td', array('class' => $class), $p['render']);
+            $cells[] = phutil_tag('td', array('class' => $class), $render);
             $cells[] = $no_coverage;
           }
 

From 63e6b2553e0ecdb0d10cde7c1845529a6d53e836 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Oct 2017 11:20:02 -0700
Subject: [PATCH 241/865] Simply how Differential drafts ignore Harbormaster
 autobuilds

Summary:
Ref T2543. When a revision is created, we check if any builds are waiting/failed, and submit it for review immediately if we aren't waiting for anything.

In doing this, we ignore builds with only autotargets, since these are client-side and failures from local `arc lint` / `arc unit` should not count (the user has already chosen to ignore/skip them).

The way we do this has some issues:

  - Herald may have started builds, but they may still be PENDING and not have any targets yet. In this case, we'll see "no non-autotargets" and ignore the build, which is wrong.
  - We have to load targets but don't really care about them, which is more work than we really need to do.
  - And it's kind of complex, too.

Instead, just let `BuildQuery` filter out "autobuilds" (builds generated from autoplans) with a JOIN.

Test Plan: Ran `arc diff` with builds configured, got a clean "Draft" state instead of an incorrect promotion directly to "Needs Review".

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18721
---
 .../storage/DifferentialRevision.php          | 25 +--------
 .../query/HarbormasterBuildQuery.php          | 55 +++++++++++++++++--
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 76c7c4da95..da7e18ce05 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -721,9 +721,10 @@ public function loadActiveBuilds(PhabricatorUser $viewer) {
       return array();
     }
 
-    $builds = id(new HarbormasterBuildQuery())
+    return id(new HarbormasterBuildQuery())
       ->setViewer($viewer)
       ->withBuildablePHIDs(mpull($buildables, 'getPHID'))
+      ->withAutobuilds(false)
       ->withBuildStatuses(
         array(
           HarbormasterBuildStatus::STATUS_INACTIVE,
@@ -735,29 +736,7 @@ public function loadActiveBuilds(PhabricatorUser $viewer) {
           HarbormasterBuildStatus::STATUS_PAUSED,
           HarbormasterBuildStatus::STATUS_DEADLOCKED,
         ))
-      ->needBuildTargets(true)
       ->execute();
-    if (!$builds) {
-      return array();
-    }
-
-    $active = array();
-    foreach ($builds as $key => $build) {
-      foreach ($build->getBuildTargets() as $target) {
-        if ($target->isAutotarget()) {
-          // Ignore autotargets when looking for active of failed builds. If
-          // local tests fail and you continue anyway, you don't need to
-          // double-confirm them.
-          continue;
-        }
-
-        // This build has at least one real target that's doing something.
-        $active[$key] = $build;
-        break;
-      }
-    }
-
-    return $active;
   }
 
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildQuery.php b/src/applications/harbormaster/query/HarbormasterBuildQuery.php
index cf6db6115b..770ca4413b 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildQuery.php
@@ -10,6 +10,7 @@ final class HarbormasterBuildQuery
   private $buildPlanPHIDs;
   private $initiatorPHIDs;
   private $needBuildTargets;
+  private $autobuilds;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -41,6 +42,11 @@ public function withInitiatorPHIDs(array $initiator_phids) {
     return $this;
   }
 
+  public function withAutobuilds($with_autobuilds) {
+    $this->autobuilds = $with_autobuilds;
+    return $this;
+  }
+
   public function needBuildTargets($need_targets) {
     $this->needBuildTargets = $need_targets;
     return $this;
@@ -141,50 +147,87 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->ids !== null) {
       $where[] = qsprintf(
         $conn,
-        'id IN (%Ld)',
+        'b.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
         $conn,
-        'phid in (%Ls)',
+        'b.phid in (%Ls)',
         $this->phids);
     }
 
     if ($this->buildStatuses !== null) {
       $where[] = qsprintf(
         $conn,
-        'buildStatus in (%Ls)',
+        'b.buildStatus in (%Ls)',
         $this->buildStatuses);
     }
 
     if ($this->buildablePHIDs !== null) {
       $where[] = qsprintf(
         $conn,
-        'buildablePHID IN (%Ls)',
+        'b.buildablePHID IN (%Ls)',
         $this->buildablePHIDs);
     }
 
     if ($this->buildPlanPHIDs !== null) {
       $where[] = qsprintf(
         $conn,
-        'buildPlanPHID IN (%Ls)',
+        'b.buildPlanPHID IN (%Ls)',
         $this->buildPlanPHIDs);
     }
 
     if ($this->initiatorPHIDs !== null) {
       $where[] = qsprintf(
         $conn,
-        'initiatorPHID IN (%Ls)',
+        'b.initiatorPHID IN (%Ls)',
         $this->initiatorPHIDs);
     }
 
+    if ($this->autobuilds !== null) {
+      if ($this->autobuilds) {
+        $where[] = qsprintf(
+          $conn,
+          'p.planAutoKey IS NOT NULL');
+      } else {
+        $where[] = qsprintf(
+          $conn,
+          'p.planAutoKey IS NULL');
+      }
+    }
+
     return $where;
   }
 
+  protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
+    $joins = parent::buildJoinClauseParts($conn);
+
+    if ($this->shouldJoinPlanTable()) {
+      $joins[] = qsprintf(
+        $conn,
+        'JOIN %T p ON b.buildPlanPHID = p.phid',
+        id(new HarbormasterBuildPlan())->getTableName());
+    }
+
+    return $joins;
+  }
+
+  private function shouldJoinPlanTable() {
+    if ($this->autobuilds !== null) {
+      return true;
+    }
+
+    return false;
+  }
+
   public function getQueryApplicationClass() {
     return 'PhabricatorHarbormasterApplication';
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'b';
+  }
+
 }

From 157f47cd149c1a811c12850bbf76cc05dd805ad9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Oct 2017 15:37:19 -0700
Subject: [PATCH 242/865] Rewrite CommitQuery to use UNION for performance

Summary:
Ref T12680. See PHI167. See that task for discussion.

Rewrite `DiffusionCommitQuery` to work more like `DifferentialRevisionQuery`, and use a UNION to find "all revisions you need to audit OR respond to".

I tried to get this working a little more cleanly than RevisionQuery does, and can probably simplify that now.

Test Plan: Poked at the UI locally without hitting any apparent issues, but my local data is pretty garbage at this point. I'll take a look at how the query plans work on `secure`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12680

Differential Revision: https://secure.phabricator.com/D18722
---
 .../diffusion/query/DiffusionCommitQuery.php  | 83 +++++++++++++------
 ...PhabricatorCursorPagedPolicyAwareQuery.php | 35 ++++++--
 2 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
index da8937910e..8996bab628 100644
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -177,7 +177,63 @@ public function newResultObject() {
   }
 
   protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
+    $table = $this->newResultObject();
+    $conn = $table->establishConnection('r');
+
+    $subqueries = array();
+    if ($this->responsiblePHIDs) {
+      $base_authors = $this->authorPHIDs;
+      $base_auditors = $this->auditorPHIDs;
+
+      $responsible_phids = $this->responsiblePHIDs;
+      if ($base_authors) {
+        $all_authors = array_merge($base_authors, $responsible_phids);
+      } else {
+        $all_authors = $responsible_phids;
+      }
+
+      if ($base_auditors) {
+        $all_auditors = array_merge($base_auditors, $responsible_phids);
+      } else {
+        $all_auditors = $responsible_phids;
+      }
+
+      $this->authorPHIDs = $all_authors;
+      $this->auditorPHIDs = $base_auditors;
+      $subqueries[] = $this->buildStandardPageQuery(
+        $conn,
+        $table->getTableName());
+
+      $this->authorPHIDs = $base_authors;
+      $this->auditorPHIDs = $all_auditors;
+      $subqueries[] = $this->buildStandardPageQuery(
+        $conn,
+        $table->getTableName());
+    } else {
+      $subqueries[] = $this->buildStandardPageQuery(
+        $conn,
+        $table->getTableName());
+    }
+
+    if (count($subqueries) > 1) {
+      foreach ($subqueries as $key => $subquery) {
+        $subqueries[$key] = '('.$subquery.')';
+      }
+
+      $query = qsprintf(
+        $conn,
+        '%Q %Q %Q',
+        implode(' UNION DISTINCT ', $subqueries),
+        $this->buildOrderClause($conn, true),
+        $this->buildLimitClause($conn));
+    } else {
+      $query = head($subqueries);
+    }
+
+    $rows = queryfx_all($conn, '%Q', $query);
+    $rows = $this->didLoadRawRows($rows);
+
+    return $table->loadAllFromArray($rows);
   }
 
   protected function willFilterPage(array $commits) {
@@ -487,18 +543,10 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->auditorPHIDs);
     }
 
-    if ($this->responsiblePHIDs !== null) {
-      $where[] = qsprintf(
-        $conn,
-        '(audit.auditorPHID IN (%Ls) OR commit.authorPHID IN (%Ls))',
-        $this->responsiblePHIDs,
-        $this->responsiblePHIDs);
-    }
-
     if ($this->statuses !== null) {
       $where[] = qsprintf(
         $conn,
-        'commit.auditStatus IN (%Ls)',
+        'commit.auditStatus IN (%Ld)',
         $this->statuses);
     }
 
@@ -541,10 +589,6 @@ private function shouldJoinAuditor() {
     return ($this->auditIDs || $this->auditorPHIDs);
   }
 
-  private function shouldJoinAudit() {
-    return (bool)$this->responsiblePHIDs;
-  }
-
   private function shouldJoinOwners() {
     return (bool)$this->packagePHIDs;
   }
@@ -560,13 +604,6 @@ protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
         $audit_request->getTableName());
     }
 
-    if ($this->shouldJoinAudit()) {
-      $join[] = qsprintf(
-        $conn,
-        'LEFT JOIN %T audit ON commit.phid = audit.commitPHID',
-        $audit_request->getTableName());
-    }
-
     if ($this->shouldJoinOwners()) {
       $join[] = qsprintf(
         $conn,
@@ -584,10 +621,6 @@ protected function shouldGroupQueryResultRows() {
       return true;
     }
 
-    if ($this->shouldJoinAudit()) {
-      return true;
-    }
-
     if ($this->shouldJoinOwners()) {
       return true;
     }
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 9bebfe6957..19d6ba07f4 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -111,7 +111,19 @@ protected function loadStandardPageRowsWithConnection(
     AphrontDatabaseConnection $conn,
     $table_name) {
 
-    $rows = queryfx_all(
+    $query = $this->buildStandardPageQuery($conn, $table_name);
+
+    $rows = queryfx_all($conn, '%Q', $query);
+    $rows = $this->didLoadRawRows($rows);
+
+    return $rows;
+  }
+
+  protected function buildStandardPageQuery(
+    AphrontDatabaseConnection $conn,
+    $table_name) {
+
+    return qsprintf(
       $conn,
       '%Q FROM %T %Q %Q %Q %Q %Q %Q %Q',
       $this->buildSelectClause($conn),
@@ -123,10 +135,6 @@ protected function loadStandardPageRowsWithConnection(
       $this->buildHavingClause($conn),
       $this->buildOrderClause($conn),
       $this->buildLimitClause($conn));
-
-    $rows = $this->didLoadRawRows($rows);
-
-    return $rows;
   }
 
   protected function didLoadRawRows(array $rows) {
@@ -1032,7 +1040,10 @@ public function getOrderableColumns() {
   /**
    * @task order
    */
-  final protected function buildOrderClause(AphrontDatabaseConnection $conn) {
+  final protected function buildOrderClause(
+    AphrontDatabaseConnection $conn,
+    $for_union = false) {
+
     $orderable = $this->getOrderableColumns();
     $vector = $this->getOrderVector();
 
@@ -1045,7 +1056,7 @@ final protected function buildOrderClause(AphrontDatabaseConnection $conn) {
       $parts[] = $part;
     }
 
-    return $this->formatOrderClause($conn, $parts);
+    return $this->formatOrderClause($conn, $parts, $for_union);
   }
 
 
@@ -1054,7 +1065,8 @@ final protected function buildOrderClause(AphrontDatabaseConnection $conn) {
    */
   protected function formatOrderClause(
     AphrontDatabaseConnection $conn,
-    array $parts) {
+    array $parts,
+    $for_union = false) {
 
     $is_query_reversed = false;
     if ($this->getBeforeID()) {
@@ -1075,6 +1087,13 @@ protected function formatOrderClause(
       }
 
       $table = idx($part, 'table');
+
+      // When we're building an ORDER BY clause for a sequence of UNION
+      // statements, we can't refer to tables from the subqueries.
+      if ($for_union) {
+        $table = null;
+      }
+
       $column = $part['column'];
 
       if ($table !== null) {

From e3a48dde1d5b95df4eb0ea1763a6baa7576e418f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 Oct 2017 10:03:56 -0700
Subject: [PATCH 243/865] Correct a method signature in DifferentialDraftField

Summary:
Ref T12190. See <https://discourse.phabricator-community.org/t/exception-preventing-access-to-differential-application/606>.

(I have a followup to fix the root issue.)

Test Plan: Loaded Differential with an eye on the error log in PHP7, no longer saw warnings.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12190

Differential Revision: https://secure.phabricator.com/D18723
---
 .../differential/customfield/DifferentialDraftField.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/differential/customfield/DifferentialDraftField.php b/src/applications/differential/customfield/DifferentialDraftField.php
index e37d622a33..e7ed2bedb2 100644
--- a/src/applications/differential/customfield/DifferentialDraftField.php
+++ b/src/applications/differential/customfield/DifferentialDraftField.php
@@ -24,7 +24,7 @@ public function shouldAppearInPropertyView() {
     return true;
   }
 
-  public function renderPropertyViewValue() {
+  public function renderPropertyViewValue(array $handles) {
     return null;
   }
 

From 5975b9d28e41546a741293ed2ae1377f973bf612 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 Oct 2017 10:03:56 -0700
Subject: [PATCH 244/865] (stable) Correct a method signature in
 DifferentialDraftField

Summary:
Ref T12190. See <https://discourse.phabricator-community.org/t/exception-preventing-access-to-differential-application/606>.

(I have a followup to fix the root issue.)

Test Plan: Loaded Differential with an eye on the error log in PHP7, no longer saw warnings.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12190

Differential Revision: https://secure.phabricator.com/D18723
---
 .../differential/customfield/DifferentialDraftField.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/differential/customfield/DifferentialDraftField.php b/src/applications/differential/customfield/DifferentialDraftField.php
index e37d622a33..e7ed2bedb2 100644
--- a/src/applications/differential/customfield/DifferentialDraftField.php
+++ b/src/applications/differential/customfield/DifferentialDraftField.php
@@ -24,7 +24,7 @@ public function shouldAppearInPropertyView() {
     return true;
   }
 
-  public function renderPropertyViewValue() {
+  public function renderPropertyViewValue(array $handles) {
     return null;
   }
 

From 683df399e7f4753dcea7ce03961e36956d6e790d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 Oct 2017 14:59:32 -0700
Subject: [PATCH 245/865] Simplify UNION/ORDER query construction in
 DifferentialRevisionQuery

Summary: Ref T12680. Use the slightly sleeker construction from D18722 in Differential.

Test Plan: Viewed revision list, reordered by date modified.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12680

Differential Revision: https://secure.phabricator.com/D18727
---
 .../query/DifferentialRevisionQuery.php          | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index 8fd91cbd7e..727a4ca184 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -38,8 +38,6 @@ final class DifferentialRevisionQuery
   private $needDrafts;
   private $needFlags;
 
-  private $buildingGlobalOrder;
-
 
 /* -(  Query Configuration  )------------------------------------------------ */
 
@@ -484,12 +482,11 @@ private function loadData() {
     }
 
     if (count($selects) > 1) {
-      $this->buildingGlobalOrder = true;
       $query = qsprintf(
         $conn_r,
         '%Q %Q %Q',
         implode(' UNION DISTINCT ', $selects),
-        $this->buildOrderClause($conn_r),
+        $this->buildOrderClause($conn_r, true),
         $this->buildLimitClause($conn_r));
     } else {
       $query = head($selects);
@@ -513,7 +510,6 @@ private function buildSelectStatement(AphrontDatabaseConnection $conn_r) {
     $group_by = $this->buildGroupClause($conn_r);
     $having = $this->buildHavingClause($conn_r);
 
-    $this->buildingGlobalOrder = false;
     $order_by = $this->buildOrderClause($conn_r);
 
     $limit = $this->buildLimitClause($conn_r);
@@ -758,17 +754,9 @@ protected function getDefaultOrderVector() {
   }
 
   public function getOrderableColumns() {
-    $primary = ($this->buildingGlobalOrder ? null : 'r');
-
     return array(
-      'id' => array(
-        'table' => $primary,
-        'column' => 'id',
-        'type' => 'int',
-        'unique' => true,
-      ),
       'updated' => array(
-        'table' => $primary,
+        'table' => $this->getPrimaryTableAlias(),
         'column' => 'dateModified',
         'type' => 'int',
       ),

From 1d213dc1fa4b45280196457c61a1c36c396a602c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 Oct 2017 15:04:06 -0700
Subject: [PATCH 246/865] Clean up virtual "_ft_rank" column for query
 construction of Ferret objects

Summary:
Ref T12974. Ferret object queries SELECT a virtual "_ft_rank" column for relevance ordering.

Currently, they always SELECT this column. That's fine and doesn't hurt anything, but makes developing and debugging things kind of a pain since every query has this `, blah blah _ft_rank` junk.

Instead, construct this column only if we're actually going to use it.

Mostly, this cleans up DarkConsole / query logs a bit.

Test Plan:
Viewed normal query results on various pages, viewed global search results, ordered Maniphest tasks by normal stuff and by "Relevance".

Viewed DarkConsole, saw no more "_ft_rank" junk on normal pages.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12974

Differential Revision: https://secure.phabricator.com/D18728
---
 .../policy/PhabricatorCursorPagedPolicyAwareQuery.php      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 19d6ba07f4..63daa6df79 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -1565,6 +1565,13 @@ protected function buildFerretSelectClause(AphrontDatabaseConnection $conn) {
       return $select;
     }
 
+    $vector = $this->getOrderVector();
+    if (!$vector->containsKey('rank')) {
+      // We only need to SELECT the virtual "_ft_rank" column if we're
+      // actually sorting the results by rank.
+      return $select;
+    }
+
     if (!$this->ferretEngine) {
       $select[] = '0 _ft_rank';
       return $select;

From 28a24c333fdd4a8def13e624552eeaa3e37f7e08 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 24 Oct 2017 05:57:15 -0700
Subject: [PATCH 247/865] Fix a couple of other missing
 getApplicationTransactionCommentObject() implementations

Summary:
See PHI165. See D18715. These objects (projects, blogs) also need implementations now.

(I thought about making this method `abstract` or doing try/catch to maybe make this more robust, but I think this should be the end of it, and those changes have mild complexity/compatibility/risk issues.)

Test Plan: Changed `bin/search index` to index only one document of each type, ran `bin/search index --all --force`, saw no more comment-related errors.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18729
---
 src/applications/phame/storage/PhameBlogTransaction.php       | 4 ++++
 .../project/storage/PhabricatorProjectTransaction.php         | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/applications/phame/storage/PhameBlogTransaction.php b/src/applications/phame/storage/PhameBlogTransaction.php
index c605510d7d..d3d6a79d0a 100644
--- a/src/applications/phame/storage/PhameBlogTransaction.php
+++ b/src/applications/phame/storage/PhameBlogTransaction.php
@@ -15,6 +15,10 @@ public function getApplicationTransactionType() {
     return PhabricatorPhameBlogPHIDType::TYPECONST;
   }
 
+  public function getApplicationTransactionCommentObject() {
+    return null;
+  }
+
   public function getBaseTransactionClass() {
     return 'PhameBlogTransactionType';
   }
diff --git a/src/applications/project/storage/PhabricatorProjectTransaction.php b/src/applications/project/storage/PhabricatorProjectTransaction.php
index 158c2480c0..a8b2bb0d4a 100644
--- a/src/applications/project/storage/PhabricatorProjectTransaction.php
+++ b/src/applications/project/storage/PhabricatorProjectTransaction.php
@@ -19,6 +19,10 @@ public function getApplicationTransactionType() {
     return PhabricatorProjectProjectPHIDType::TYPECONST;
   }
 
+  public function getApplicationTransactionCommentObject() {
+    return null;
+  }
+
   public function getBaseTransactionClass() {
     return 'PhabricatorProjectTransactionType';
   }

From beaf0ad9a6360154d5c3f79e2e7eb62b553dcf5b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 24 Oct 2017 09:10:48 -0700
Subject: [PATCH 248/865] Attribute revision promotion from "Draft" to "Needs
 Review" to the author

Summary:
Ref T2543. When Harbormaster finishes builds and promotes a draft revision to review, we currently publish "Harbormaster requested review of...".

Instead, attribute this action to the author, since that's more natural and more useful.

Test Plan: Promoted a diff locally, saw it attributed to me rather than Harbormaster.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18730
---
 .../differential/editor/DifferentialTransactionEditor.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 7c9bb01b07..5e013eff43 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1537,7 +1537,13 @@ protected function didApplyTransactions($object, array $xactions) {
     if ($object->isDraft() && $auto_undraft) {
       $active_builds = $this->hasActiveBuilds($object);
       if (!$active_builds) {
+        // When Harbormaster moves a revision out of the draft state, we
+        // attribute the action to the revision author since this is more
+        // natural and more useful.
+        $author_phid = $object->getAuthorPHID();
+
         $xaction = $object->getApplicationTransactionTemplate()
+          ->setAuthorPHID($author_phid)
           ->setTransactionType(
             DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE)
           ->setOldValue(false)

From f1204c8c45683d86afa5624a6ef7f88f88f8a6c7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 26 Oct 2017 13:38:12 -0700
Subject: [PATCH 249/865] Convert Ponder Questions to Ferret engine

Summary: See PHI177. Ref T12974. PonderQuestion was overlooked during the Ferret engine conversions.

Test Plan:
Ran migrations, searched for questions, got results:

{F5241185}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12974

Differential Revision: https://secure.phabricator.com/D18736
---
 .../20171026.ferret.01.ponder.doc.sql          |  9 +++++++++
 .../20171026.ferret.02.ponder.field.sql        |  8 ++++++++
 .../20171026.ferret.03.ponder.ngrams.sql       |  5 +++++
 .../20171026.ferret.04.ponder.cngrams.sql      |  7 +++++++
 .../20171026.ferret.05.ponder.index.php        | 11 +++++++++++
 src/__phutil_library_map__.php                 |  3 +++
 .../search/PonderQuestionFerretEngine.php      | 18 ++++++++++++++++++
 .../ponder/storage/PonderQuestion.php          | 12 +++++++++++-
 8 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20171026.ferret.01.ponder.doc.sql
 create mode 100644 resources/sql/autopatches/20171026.ferret.02.ponder.field.sql
 create mode 100644 resources/sql/autopatches/20171026.ferret.03.ponder.ngrams.sql
 create mode 100644 resources/sql/autopatches/20171026.ferret.04.ponder.cngrams.sql
 create mode 100644 resources/sql/autopatches/20171026.ferret.05.ponder.index.php
 create mode 100644 src/applications/ponder/search/PonderQuestionFerretEngine.php

diff --git a/resources/sql/autopatches/20171026.ferret.01.ponder.doc.sql b/resources/sql/autopatches/20171026.ferret.01.ponder.doc.sql
new file mode 100644
index 0000000000..38c86a4134
--- /dev/null
+++ b/resources/sql/autopatches/20171026.ferret.01.ponder.doc.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_ponder.ponder_question_fdocument (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  isClosed BOOL NOT NULL,
+  authorPHID VARBINARY(64),
+  ownerPHID VARBINARY(64),
+  epochCreated INT UNSIGNED NOT NULL,
+  epochModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171026.ferret.02.ponder.field.sql b/resources/sql/autopatches/20171026.ferret.02.ponder.field.sql
new file mode 100644
index 0000000000..871f0d8f5b
--- /dev/null
+++ b/resources/sql/autopatches/20171026.ferret.02.ponder.field.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_ponder.ponder_question_ffield (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
+  rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
+  normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171026.ferret.03.ponder.ngrams.sql b/resources/sql/autopatches/20171026.ferret.03.ponder.ngrams.sql
new file mode 100644
index 0000000000..3d2a3024b8
--- /dev/null
+++ b/resources/sql/autopatches/20171026.ferret.03.ponder.ngrams.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_ponder.ponder_question_fngrams (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  documentID INT UNSIGNED NOT NULL,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171026.ferret.04.ponder.cngrams.sql b/resources/sql/autopatches/20171026.ferret.04.ponder.cngrams.sql
new file mode 100644
index 0000000000..49b66e0d39
--- /dev/null
+++ b/resources/sql/autopatches/20171026.ferret.04.ponder.cngrams.sql
@@ -0,0 +1,7 @@
+CREATE TABLE {$NAMESPACE}_ponder.ponder_question_fngrams_common (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
+  needsCollection BOOL NOT NULL,
+  UNIQUE KEY `key_ngram` (ngram),
+  KEY `key_collect` (needsCollection)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20171026.ferret.05.ponder.index.php b/resources/sql/autopatches/20171026.ferret.05.ponder.index.php
new file mode 100644
index 0000000000..20489846d2
--- /dev/null
+++ b/resources/sql/autopatches/20171026.ferret.05.ponder.index.php
@@ -0,0 +1,11 @@
+<?php
+
+$table = new PonderQuestion();
+
+foreach (new LiskMigrationIterator($table) as $question) {
+  PhabricatorSearchWorker::queueDocumentForIndexing(
+    $question->getPHID(),
+    array(
+      'force' => true,
+    ));
+}
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 93efcc65e1..91d5a3cc7b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4774,6 +4774,7 @@
     'PonderQuestionEditController' => 'applications/ponder/controller/PonderQuestionEditController.php',
     'PonderQuestionEditEngine' => 'applications/ponder/editor/PonderQuestionEditEngine.php',
     'PonderQuestionEditor' => 'applications/ponder/editor/PonderQuestionEditor.php',
+    'PonderQuestionFerretEngine' => 'applications/ponder/search/PonderQuestionFerretEngine.php',
     'PonderQuestionFulltextEngine' => 'applications/ponder/search/PonderQuestionFulltextEngine.php',
     'PonderQuestionHistoryController' => 'applications/ponder/controller/PonderQuestionHistoryController.php',
     'PonderQuestionListController' => 'applications/ponder/controller/PonderQuestionListController.php',
@@ -10539,6 +10540,7 @@
       'PhabricatorDestructibleInterface',
       'PhabricatorSpacesInterface',
       'PhabricatorFulltextInterface',
+      'PhabricatorFerretInterface',
     ),
     'PonderQuestionAnswerTransaction' => 'PonderQuestionTransactionType',
     'PonderQuestionAnswerWikiTransaction' => 'PonderQuestionTransactionType',
@@ -10548,6 +10550,7 @@
     'PonderQuestionEditController' => 'PonderController',
     'PonderQuestionEditEngine' => 'PhabricatorEditEngine',
     'PonderQuestionEditor' => 'PonderEditor',
+    'PonderQuestionFerretEngine' => 'PhabricatorFerretEngine',
     'PonderQuestionFulltextEngine' => 'PhabricatorFulltextEngine',
     'PonderQuestionHistoryController' => 'PonderController',
     'PonderQuestionListController' => 'PonderController',
diff --git a/src/applications/ponder/search/PonderQuestionFerretEngine.php b/src/applications/ponder/search/PonderQuestionFerretEngine.php
new file mode 100644
index 0000000000..72345f60c0
--- /dev/null
+++ b/src/applications/ponder/search/PonderQuestionFerretEngine.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PonderQuestionFerretEngine
+  extends PhabricatorFerretEngine {
+
+  public function getApplicationName() {
+    return 'ponder';
+  }
+
+  public function getScopeName() {
+    return 'question';
+  }
+
+  public function newSearchEngine() {
+    return new PonderQuestionSearchEngine();
+  }
+
+}
diff --git a/src/applications/ponder/storage/PonderQuestion.php b/src/applications/ponder/storage/PonderQuestion.php
index c505deeed9..eefcdba9be 100644
--- a/src/applications/ponder/storage/PonderQuestion.php
+++ b/src/applications/ponder/storage/PonderQuestion.php
@@ -11,7 +11,8 @@ final class PonderQuestion extends PonderDAO
     PhabricatorProjectInterface,
     PhabricatorDestructibleInterface,
     PhabricatorSpacesInterface,
-    PhabricatorFulltextInterface {
+    PhabricatorFulltextInterface,
+    PhabricatorFerretInterface {
 
   const MARKUP_FIELD_CONTENT = 'markup:content';
 
@@ -300,4 +301,13 @@ public function newFulltextEngine() {
     return new PonderQuestionFulltextEngine();
   }
 
+
+/* -(  PhabricatorFerretInterface  )----------------------------------------- */
+
+
+  public function newFerretEngine() {
+    return new PonderQuestionFerretEngine();
+  }
+
+
 }

From a03da0c2afe49efa767cef04e4736c1b0eb289b8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 26 Oct 2017 13:00:09 -0700
Subject: [PATCH 250/865] Add a missing `artifactIndex` key to
 HarbormasterBuildArtifact

Summary: See PHI176. We issue a query with only `artifactIndex` from `BuildTarget`, but don't have an applicable key.

Test Plan: This isn't on the normal Harbormaster execution path so I'm not 100% sure I have a local repro, but will confirm with customer.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D18732
---
 .../harbormaster/storage/build/HarbormasterBuildArtifact.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php b/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
index 6825bf6646..461ef4b06f 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
@@ -43,6 +43,9 @@ protected function getConfiguration() {
         'key_target' => array(
           'columns' => array('buildTargetPHID', 'artifactType'),
         ),
+        'key_index' => array(
+          'columns' => array('artifactIndex'),
+        ),
       ),
     ) + parent::getConfiguration();
   }

From fbfed82efddee9732909036f358bc48c272136e4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 26 Oct 2017 13:05:31 -0700
Subject: [PATCH 251/865] Add a missing DaemonLogEvent key for garbage
 collection

Summary: See PHI176. This is issued periodically by the garbage collector. Normally this table is relatively small-ish so this missing key isn't hugely noticeable.

Test Plan:
Ran `./bin/garbage collect --collector daemon.processes --trace` to get the query the GC runs.

Ran ##DELETE FROM `daemon_logevent` WHERE epoch < 1508443504 LIMIT 100## before and after the key, saw a much better query plan afterward:

Before:

```
mysql> explain DELETE FROM `daemon_logevent` WHERE epoch < 1508443504 LIMIT 100;
+----+-------------+-----------------+------+---------------+------+---------+------+-------+-------------+
| id | select_type | table           | type | possible_keys | key  | key_len | ref  | rows  | Extra       |
+----+-------------+-----------------+------+---------------+------+---------+------+-------+-------------+
|  1 | SIMPLE      | daemon_logevent | ALL  | NULL          | NULL | NULL    | NULL | 19325 | Using where |
+----+-------------+-----------------+------+---------------+------+---------+------+-------+-------------+
1 row in set (0.00 sec)
```

After:

```
mysql> explain DELETE FROM `daemon_logevent` WHERE epoch < 1508443504 LIMIT 100;
+----+-------------+-----------------+-------+---------------+-----------+---------+-------+------+-------------+
| id | select_type | table           | type  | possible_keys | key       | key_len | ref   | rows | Extra       |
+----+-------------+-----------------+-------+---------------+-----------+---------+-------+------+-------------+
|  1 | SIMPLE      | daemon_logevent | range | key_epoch     | key_epoch | 4       | const |    1 | Using where |
+----+-------------+-----------------+-------+---------------+-----------+---------+-------+------+-------------+
1 row in set (0.00 sec)
```

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18733
---
 src/applications/daemon/storage/PhabricatorDaemonLogEvent.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/daemon/storage/PhabricatorDaemonLogEvent.php b/src/applications/daemon/storage/PhabricatorDaemonLogEvent.php
index afdbd1f621..c5d2cbd1d4 100644
--- a/src/applications/daemon/storage/PhabricatorDaemonLogEvent.php
+++ b/src/applications/daemon/storage/PhabricatorDaemonLogEvent.php
@@ -18,6 +18,9 @@ protected function getConfiguration() {
         'logID' => array(
           'columns' => array('logID', 'epoch'),
         ),
+        'key_epoch' => array(
+          'columns' => array('epoch'),
+        ),
       ),
     ) + parent::getConfiguration();
   }

From b04d9fdc0ba875d1fd0ff61152a712e163135e18 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 26 Oct 2017 13:11:51 -0700
Subject: [PATCH 252/865] Add a missing key to PhabricatorFile for destroying
 Files

Summary: See PHI176. Depends on D18733. We issue a query when deleting files that currently doesn't hit any keys.

Test Plan:
Ran `./bin/remove destroy --force --trace F56376` to get the query.

Ran ##SELECT * FROM `file` WHERE storageEngine = 'blob' AND storageHandle = '23366' LIMIT 1## before and after the change.

Before:

```
mysql> explain SELECT * FROM `file` WHERE storageEngine = 'blob' AND storageHandle = '23366' LIMIT 1;
+----+-------------+-------+------+---------------+------+---------+------+-------+-------------+
| id | select_type | table | type | possible_keys | key  | key_len | ref  | rows  | Extra       |
+----+-------------+-------+------+---------------+------+---------+------+-------+-------------+
|  1 | SIMPLE      | file  | ALL  | NULL          | NULL | NULL    | NULL | 33866 | Using where |
+----+-------------+-------+------+---------------+------+---------+------+-------+-------------+
1 row in set (0.01 sec)
```

After:

```
mysql> explain SELECT * FROM `file` WHERE storageEngine = 'blob' AND storageHandle = '23366' LIMIT 1;
+----+-------------+-------+------+---------------+------------+---------+-------------+------+------------------------------------+
| id | select_type | table | type | possible_keys | key        | key_len | ref         | rows | Extra                              |
+----+-------------+-------+------+---------------+------------+---------+-------------+------+------------------------------------+
|  1 | SIMPLE      | file  | ref  | key_engine    | key_engine | 388     | const,const |  190 | Using index condition; Using where |
+----+-------------+-------+------+---------------+------------+---------+-------------+------+------------------------------------+
1 row in set (0.00 sec)
```

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18734
---
 src/applications/files/storage/PhabricatorFile.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index 9636b5b017..c87623c68c 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -134,6 +134,9 @@ protected function getConfiguration() {
           'columns' => array('builtinKey'),
           'unique' => true,
         ),
+        'key_engine' => array(
+          'columns' => array('storageEngine', 'storageHandle(64)'),
+        ),
       ),
     ) + parent::getConfiguration();
   }

From d1b4c9f50b99b08fd77fbf6554834b61839813eb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 26 Oct 2017 13:17:33 -0700
Subject: [PATCH 253/865] Add a missing key on DrydockLease

Summary: Depends on D18734. See PHI176. We run this query on the main Drydock lease web UI, among other places. There is currently no `status` key which can satisfy it.

Test Plan:
Viewed Drydock lease page to get the query.

Ran ##explain SELECT * FROM `drydock_lease` WHERE (status IN ('pending', 'acquired', 'active')) ORDER BY `id` DESC LIMIT 101;## before and after the change.

I don't have a ton of leases locally so the un-key'd EXPLAIN isn't //that// bad, but still shows that we're getting a better key. Before:

```
mysql> explain SELECT * FROM `drydock_lease` WHERE (status IN ('pending', 'acquired', 'active')) ORDER BY `id` DESC LIMIT 101;
+----+-------------+---------------+-------+---------------+---------+---------+------+------+-------------+
| id | select_type | table         | type  | possible_keys | key     | key_len | ref  | rows | Extra       |
+----+-------------+---------------+-------+---------------+---------+---------+------+------+-------------+
|  1 | SIMPLE      | drydock_lease | index | NULL          | PRIMARY | 4       | NULL |  101 | Using where |
+----+-------------+---------------+-------+---------------+---------+---------+------+------+-------------+
1 row in set (0.00 sec)
```

After:

```
mysql> explain SELECT * FROM `drydock_lease` WHERE (status IN ('pending', 'acquired', 'active')) ORDER BY `id` DESC LIMIT 101;
+----+-------------+---------------+-------+---------------+------------+---------+------+------+---------------------------------------+
| id | select_type | table         | type  | possible_keys | key        | key_len | ref  | rows | Extra                                 |
+----+-------------+---------------+-------+---------------+------------+---------+------+------+---------------------------------------+
|  1 | SIMPLE      | drydock_lease | range | key_status    | key_status | 130     | NULL |    5 | Using index condition; Using filesort |
+----+-------------+---------------+-------+---------------+------------+---------+------+------+---------------------------------------+
1 row in set (0.00 sec)
```

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D18735
---
 src/applications/drydock/storage/DrydockLease.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
index 0dd4e36b48..e60529afe4 100644
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -83,6 +83,9 @@ protected function getConfiguration() {
         'key_resource' => array(
           'columns' => array('resourcePHID', 'status'),
         ),
+        'key_status' => array(
+          'columns' => array('status'),
+        ),
       ),
     ) + parent::getConfiguration();
   }

From f7f3dd5b20848c221e16bc34b3ce61ddbdbdde94 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 24 Oct 2017 14:04:06 -0700
Subject: [PATCH 254/865] Don't run Herald build and mail rules when they don't
 make sense

Summary:
Ref T2543. Fixes T10109.

Currently, Herald only runs in Differential when a change updates the diff. This is partly for historical reasons, and partly because we don't want to restart builds every time someone makes a comment. However, this behavior is inconsistent with other applications (which always trigger on any change), and occasionally confusing to users (in T10109, for example) or otherwise undesirable.

A similar issue is that T2543 has introduced a "Draft" state, where revisions don't send normal mail until builds finish. This interacts poorly with "Send me an email" rules (which shouldn't do anything here) and particularly with "Send me an email + only run these actions the first time the rule matches", since that might have an effect like "do nothing when the revision is created, then never anything again since you already did nothing once".

To navigate both of these issues, let objects tell Herald that certain actions (like mail or builds) are currently forbidden. If a rule uses a field or action which is currently forbidden, the whole rule automatically fails before it executes, but doesn't count toward "only the first time" as far as Herald's tracking of rule execution is concerned.

Then, forbid mail for draft revisions, and forbid builds for revisions which didn't just get updated. Forbidding mail fixes the issues with "Send me an email" that were created by the introduction of the draft state.

Finally, make Herald run on every revision update, not just substantive updates to the diff. This resolves T10109.

Test Plan:
Created revisions via the draft -> submit workflow, saw different transcripts. Here's a mail action being forbidden for a draft:

{F5237324}

Here's a build action being forbidden for a "mundane" update:

{F5237326}

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T10109, T2543

Differential Revision: https://secure.phabricator.com/D18731
---
 src/__phutil_library_map__.php                |  10 +
 .../editor/DifferentialTransactionEditor.php  |  48 +++--
 .../herald/DifferentialHeraldStateReasons.php |  22 ++
 .../HarbormasterRunBuildPlansHeraldAction.php |   6 +
 .../herald/action/HeraldAction.php            |  12 ++
 .../herald/adapter/HeraldAdapter.php          |  35 +++
 .../controller/HeraldTranscriptController.php |  20 +-
 .../herald/engine/HeraldEngine.php            | 204 ++++++++++++++----
 src/applications/herald/field/HeraldField.php |   4 +
 .../herald/state/HeraldBuildableState.php     |   7 +
 .../herald/state/HeraldMailableState.php      |   7 +
 src/applications/herald/state/HeraldState.php |   3 +
 .../herald/state/HeraldStateReasons.php       |  26 +++
 .../transcript/HeraldConditionTranscript.php  |   7 +
 .../transcript/HeraldRuleTranscript.php       |   6 +
 .../PhabricatorMetaMTAEmailHeraldAction.php   |   6 +
 16 files changed, 359 insertions(+), 64 deletions(-)
 create mode 100644 src/applications/differential/herald/DifferentialHeraldStateReasons.php
 create mode 100644 src/applications/herald/state/HeraldBuildableState.php
 create mode 100644 src/applications/herald/state/HeraldMailableState.php
 create mode 100644 src/applications/herald/state/HeraldState.php
 create mode 100644 src/applications/herald/state/HeraldStateReasons.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 91d5a3cc7b..2040568496 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -458,6 +458,7 @@
     'DifferentialGetWorkingCopy' => 'applications/differential/DifferentialGetWorkingCopy.php',
     'DifferentialGitSVNIDCommitMessageField' => 'applications/differential/field/DifferentialGitSVNIDCommitMessageField.php',
     'DifferentialHarbormasterField' => 'applications/differential/customfield/DifferentialHarbormasterField.php',
+    'DifferentialHeraldStateReasons' => 'applications/differential/herald/DifferentialHeraldStateReasons.php',
     'DifferentialHiddenComment' => 'applications/differential/storage/DifferentialHiddenComment.php',
     'DifferentialHostField' => 'applications/differential/customfield/DifferentialHostField.php',
     'DifferentialHovercardEngineExtension' => 'applications/differential/engineextension/DifferentialHovercardEngineExtension.php',
@@ -1328,6 +1329,7 @@
     'HeraldApplicationActionGroup' => 'applications/herald/action/HeraldApplicationActionGroup.php',
     'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
     'HeraldBasicFieldGroup' => 'applications/herald/field/HeraldBasicFieldGroup.php',
+    'HeraldBuildableState' => 'applications/herald/state/HeraldBuildableState.php',
     'HeraldCommitAdapter' => 'applications/diffusion/herald/HeraldCommitAdapter.php',
     'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
     'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
@@ -1351,6 +1353,7 @@
     'HeraldGroup' => 'applications/herald/group/HeraldGroup.php',
     'HeraldInvalidActionException' => 'applications/herald/engine/exception/HeraldInvalidActionException.php',
     'HeraldInvalidConditionException' => 'applications/herald/engine/exception/HeraldInvalidConditionException.php',
+    'HeraldMailableState' => 'applications/herald/state/HeraldMailableState.php',
     'HeraldManageGlobalRulesCapability' => 'applications/herald/capability/HeraldManageGlobalRulesCapability.php',
     'HeraldManiphestTaskAdapter' => 'applications/maniphest/herald/HeraldManiphestTaskAdapter.php',
     'HeraldNewController' => 'applications/herald/controller/HeraldNewController.php',
@@ -1388,6 +1391,8 @@
     'HeraldSchemaSpec' => 'applications/herald/storage/HeraldSchemaSpec.php',
     'HeraldSelectFieldValue' => 'applications/herald/value/HeraldSelectFieldValue.php',
     'HeraldSpaceField' => 'applications/spaces/herald/HeraldSpaceField.php',
+    'HeraldState' => 'applications/herald/state/HeraldState.php',
+    'HeraldStateReasons' => 'applications/herald/state/HeraldStateReasons.php',
     'HeraldSubscribersField' => 'applications/subscriptions/herald/HeraldSubscribersField.php',
     'HeraldSupportActionGroup' => 'applications/herald/action/HeraldSupportActionGroup.php',
     'HeraldSupportFieldGroup' => 'applications/herald/field/HeraldSupportFieldGroup.php',
@@ -5467,6 +5472,7 @@
     'DifferentialGetWorkingCopy' => 'Phobject',
     'DifferentialGitSVNIDCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialHarbormasterField' => 'DifferentialCustomField',
+    'DifferentialHeraldStateReasons' => 'HeraldStateReasons',
     'DifferentialHiddenComment' => 'DifferentialDAO',
     'DifferentialHostField' => 'DifferentialCustomField',
     'DifferentialHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
@@ -6458,6 +6464,7 @@
     'HeraldApplicationActionGroup' => 'HeraldActionGroup',
     'HeraldApplyTranscript' => 'Phobject',
     'HeraldBasicFieldGroup' => 'HeraldFieldGroup',
+    'HeraldBuildableState' => 'HeraldState',
     'HeraldCommitAdapter' => array(
       'HeraldAdapter',
       'HarbormasterBuildableAdapterInterface',
@@ -6487,6 +6494,7 @@
     'HeraldGroup' => 'Phobject',
     'HeraldInvalidActionException' => 'Exception',
     'HeraldInvalidConditionException' => 'Exception',
+    'HeraldMailableState' => 'HeraldState',
     'HeraldManageGlobalRulesCapability' => 'PhabricatorPolicyCapability',
     'HeraldManiphestTaskAdapter' => 'HeraldAdapter',
     'HeraldNewController' => 'HeraldController',
@@ -6531,6 +6539,8 @@
     'HeraldSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'HeraldSelectFieldValue' => 'HeraldFieldValue',
     'HeraldSpaceField' => 'HeraldField',
+    'HeraldState' => 'Phobject',
+    'HeraldStateReasons' => 'Phobject',
     'HeraldSubscribersField' => 'HeraldField',
     'HeraldSupportActionGroup' => 'HeraldActionGroup',
     'HeraldSupportFieldGroup' => 'HeraldFieldGroup',
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 5e013eff43..9ab30c3f06 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1003,26 +1003,7 @@ private function requireDiff($phid, $need_changesets = false) {
   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;
-          }
-          break;
-        case DifferentialRevisionCommandeerTransaction::TRANSACTIONTYPE:
-          // When users commandeer revisions, we may need to trigger
-          // signatures or author-based rules.
-          return true;
-      }
-    }
-
-    return parent::shouldApplyHeraldRules($object, $xactions);
+    return true;
   }
 
   protected function didApplyHeraldRules(
@@ -1211,6 +1192,33 @@ protected function buildHeraldAdapter(
       $revision,
       $revision->getActiveDiff());
 
+    // If the object is still a draft, prevent "Send me an email" and other
+    // similar rules from acting yet.
+    if (!$object->shouldBroadcast()) {
+      $adapter->setForbiddenAction(
+        HeraldMailableState::STATECONST,
+        DifferentialHeraldStateReasons::REASON_DRAFT);
+    }
+
+    // If this edit didn't actually change the diff (for example, a user
+    // edited the title or changed subscribers), prevent "Run build plan"
+    // and other similar rules from acting yet, since the build results will
+    // not (or, at least, should not) change unless the actual source changes.
+    $has_update = false;
+    $type_update = DifferentialTransaction::TYPE_UPDATE;
+    foreach ($xactions as $xaction) {
+      if ($xaction->getTransactionType() == $type_update) {
+        $has_update = true;
+        break;
+      }
+    }
+
+    if (!$has_update) {
+      $adapter->setForbiddenAction(
+        HeraldBuildableState::STATECONST,
+        DifferentialHeraldStateReasons::REASON_UNCHANGED);
+    }
+
     return $adapter;
   }
 
diff --git a/src/applications/differential/herald/DifferentialHeraldStateReasons.php b/src/applications/differential/herald/DifferentialHeraldStateReasons.php
new file mode 100644
index 0000000000..d3259560d5
--- /dev/null
+++ b/src/applications/differential/herald/DifferentialHeraldStateReasons.php
@@ -0,0 +1,22 @@
+<?php
+
+final class DifferentialHeraldStateReasons
+  extends HeraldStateReasons {
+
+  const REASON_DRAFT = 'differential.draft';
+  const REASON_UNCHANGED = 'differential.unchanged';
+
+  public function explainReason($reason) {
+    $reasons = array(
+      self::REASON_DRAFT => pht(
+        'This revision is still an unsubmitted draft, so mail will not '.
+        'be sent yet.'),
+      self::REASON_UNCHANGED => pht(
+        'The update which triggered Herald did not update the diff for '.
+        'this revision, so builds will not run.'),
+    );
+
+    return idx($reasons, $reason);
+  }
+
+}
diff --git a/src/applications/harbormaster/herald/HarbormasterRunBuildPlansHeraldAction.php b/src/applications/harbormaster/herald/HarbormasterRunBuildPlansHeraldAction.php
index 76bdf9ccc3..8c718e5f5d 100644
--- a/src/applications/harbormaster/herald/HarbormasterRunBuildPlansHeraldAction.php
+++ b/src/applications/harbormaster/herald/HarbormasterRunBuildPlansHeraldAction.php
@@ -7,6 +7,12 @@ final class HarbormasterRunBuildPlansHeraldAction
 
   const ACTIONCONST = 'harbormaster.build';
 
+  public function getRequiredAdapterStates() {
+    return array(
+      HeraldBuildableState::STATECONST,
+    );
+  }
+
   public function getActionGroupKey() {
     return HeraldSupportActionGroup::ACTIONGROUPKEY;
   }
diff --git a/src/applications/herald/action/HeraldAction.php b/src/applications/herald/action/HeraldAction.php
index 091f3e9bc2..a2d589f9f2 100644
--- a/src/applications/herald/action/HeraldAction.php
+++ b/src/applications/herald/action/HeraldAction.php
@@ -17,6 +17,7 @@ abstract class HeraldAction extends Phobject {
   const DO_STANDARD_PERMISSION = 'do.standard.permission';
   const DO_STANDARD_INVALID_ACTION = 'do.standard.invalid-action';
   const DO_STANDARD_WRONG_RULE_TYPE = 'do.standard.wrong-rule-type';
+  const DO_STANDARD_FORBIDDEN = 'do.standard.forbidden';
 
   abstract public function getHeraldActionName();
   abstract public function supportsObject($object);
@@ -25,6 +26,10 @@ abstract public function applyEffect($object, HeraldEffect $effect);
 
   abstract public function renderActionDescription($value);
 
+  public function getRequiredAdapterStates() {
+    return array();
+  }
+
   protected function renderActionEffectDescription($type, $data) {
     return null;
   }
@@ -336,6 +341,11 @@ protected function getStandardEffectMap() {
         'color' => 'red',
         'name' => pht('Wrong Rule Type'),
       ),
+      self::DO_STANDARD_FORBIDDEN => array(
+        'icon' => 'fa-ban',
+        'color' => 'violet',
+        'name' => pht('Forbidden'),
+      ),
     );
   }
 
@@ -381,6 +391,8 @@ final public function renderEffectDescription($type, $data) {
         return pht(
           'This action does not support rules of type "%s".',
           $data);
+      case self::DO_STANDARD_FORBIDDEN:
+        return HeraldStateReasons::getExplanation($data);
     }
 
     return null;
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index 78ce862945..1c50c0b5ee 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -37,6 +37,7 @@ abstract class HeraldAdapter extends Phobject {
   private $fieldMap;
   private $actionMap;
   private $edgeCache = array();
+  private $forbiddenActions = array();
 
   public function getEmailPHIDs() {
     return array_values($this->emailPHIDs);
@@ -1116,4 +1117,38 @@ public function loadEdgePHIDs($type) {
     return $this->edgeCache[$type];
   }
 
+
+/* -(  Forbidden Actions  )-------------------------------------------------- */
+
+
+  final public function getForbiddenActions() {
+    return array_keys($this->forbiddenActions);
+  }
+
+  final public function setForbiddenAction($action, $reason) {
+    $this->forbiddenActions[$action] = $reason;
+    return $this;
+  }
+
+  final public function getRequiredFieldStates($field_key) {
+    return $this->requireFieldImplementation($field_key)
+      ->getRequiredAdapterStates();
+  }
+
+  final public function getRequiredActionStates($action_key) {
+    return $this->requireActionImplementation($action_key)
+      ->getRequiredAdapterStates();
+  }
+
+  final public function getForbiddenReason($action) {
+    if (!isset($this->forbiddenActions[$action])) {
+      throw new Exception(
+        pht(
+          'Action "%s" is not forbidden!',
+          $action));
+    }
+
+    return $this->forbiddenActions[$action];
+  }
+
 }
diff --git a/src/applications/herald/controller/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php
index a9509beb33..dc7ca676e3 100644
--- a/src/applications/herald/controller/HeraldTranscriptController.php
+++ b/src/applications/herald/controller/HeraldTranscriptController.php
@@ -273,7 +273,11 @@ private function buildActionTranscriptPanel(HeraldTranscript $xscript) {
           ->setTarget(phutil_tag('strong', array(), pht('Conditions'))));
 
       foreach ($cond_xscripts as $cond_xscript) {
-        if ($cond_xscript->getResult()) {
+        if ($cond_xscript->isForbidden()) {
+          $icon = 'fa-ban';
+          $color = 'indigo';
+          $result = pht('Forbidden');
+        } else if ($cond_xscript->getResult()) {
           $icon = 'fa-check';
           $color = 'green';
           $result = pht('Passed');
@@ -284,12 +288,17 @@ private function buildActionTranscriptPanel(HeraldTranscript $xscript) {
         }
 
         if ($cond_xscript->getNote()) {
+          $note_text = $cond_xscript->getNote();
+          if ($cond_xscript->isForbidden()) {
+            $note_text = HeraldStateReasons::getExplanation($note_text);
+          }
+
           $note = phutil_tag(
             'div',
             array(
               'class' => 'herald-condition-note',
             ),
-            $cond_xscript->getNote());
+            $note_text);
         } else {
           $note = null;
         }
@@ -310,7 +319,12 @@ private function buildActionTranscriptPanel(HeraldTranscript $xscript) {
         $cond_list->addItem($cond_item);
       }
 
-      if ($rule_xscript->getResult()) {
+      if ($rule_xscript->isForbidden()) {
+        $last_icon = 'fa-ban';
+        $last_color = 'indigo';
+        $last_result = pht('Forbidden');
+        $last_note = pht('Object state prevented rule evaluation.');
+      } else if ($rule_xscript->getResult()) {
         $last_icon = 'fa-check-circle';
         $last_color = 'green';
         $last_result = pht('Passed');
diff --git a/src/applications/herald/engine/HeraldEngine.php b/src/applications/herald/engine/HeraldEngine.php
index df81117b80..b8e1db5626 100644
--- a/src/applications/herald/engine/HeraldEngine.php
+++ b/src/applications/herald/engine/HeraldEngine.php
@@ -12,6 +12,9 @@ final class HeraldEngine extends Phobject {
   protected $object;
   private $dryRun;
 
+  private $forbiddenFields = array();
+  private $forbiddenActions = array();
+
   public function setDryRun($dry_run) {
     $this->dryRun = $dry_run;
     return $this;
@@ -76,39 +79,42 @@ public function applyRules(array $rules, HeraldAdapter $object) {
           // This is not a dry run, and this rule is only supposed to be
           // applied a single time, and it's already been applied...
           // That means automatic failure.
-          $xscript = id(new HeraldRuleTranscript())
-            ->setRuleID($rule->getID())
+          $this->newRuleTranscript($rule)
             ->setResult(false)
-            ->setRuleName($rule->getName())
-            ->setRuleOwner($rule->getAuthorPHID())
             ->setReason(
               pht(
                 'This rule is only supposed to be repeated a single time, '.
                 'and it has already been applied.'));
-          $this->transcript->addRuleTranscript($xscript);
+
           $rule_matches = false;
         } else {
-          $rule_matches = $this->doesRuleMatch($rule, $object);
+          if ($this->isForbidden($rule, $object)) {
+            $this->newRuleTranscript($rule)
+              ->setResult(HeraldRuleTranscript::RESULT_FORBIDDEN)
+              ->setReason(
+                pht(
+                  'Object state is not compatible with rule.'));
+
+            $rule_matches = false;
+          } else {
+            $rule_matches = $this->doesRuleMatch($rule, $object);
+          }
         }
       } catch (HeraldRecursiveConditionsException $ex) {
         $names = array();
-        foreach ($this->stack as $rule_id => $ignored) {
-          $names[] = '"'.$rules[$rule_id]->getName().'"';
+        foreach ($this->stack as $rule_phid => $ignored) {
+          $names[] = '"'.$rules[$rule_phid]->getName().'"';
         }
         $names = implode(', ', $names);
-        foreach ($this->stack as $rule_id => $ignored) {
-          $xscript = new HeraldRuleTranscript();
-          $xscript->setRuleID($rule_id);
-          $xscript->setResult(false);
-          $xscript->setReason(
-            pht(
-              "Rules %s are recursively dependent upon one another! ".
-              "Don't do this! You have formed an unresolvable cycle in the ".
-              "dependency graph!",
-              $names));
-          $xscript->setRuleName($rules[$rule_id]->getName());
-          $xscript->setRuleOwner($rules[$rule_id]->getAuthorPHID());
-          $this->transcript->addRuleTranscript($xscript);
+        foreach ($this->stack as $rule_phid => $ignored) {
+          $this->newRuleTranscript($rules[$rule_phid])
+            ->setResult(false)
+            ->setReason(
+              pht(
+                "Rules %s are recursively dependent upon one another! ".
+                "Don't do this! You have formed an unresolvable cycle in the ".
+                "dependency graph!",
+                $names));
         }
         $rule_matches = false;
       }
@@ -309,14 +315,9 @@ public function doesRuleMatch(
       }
     }
 
-    $rule_transcript = new HeraldRuleTranscript();
-    $rule_transcript->setRuleID($rule->getID());
-    $rule_transcript->setResult($result);
-    $rule_transcript->setReason($reason);
-    $rule_transcript->setRuleName($rule->getName());
-    $rule_transcript->setRuleOwner($rule->getAuthorPHID());
-
-    $this->transcript->addRuleTranscript($rule_transcript);
+    $this->newRuleTranscript($rule)
+      ->setResult($result)
+      ->setReason($reason);
 
     return $result;
   }
@@ -327,16 +328,7 @@ protected function doesConditionMatch(
     HeraldAdapter $object) {
 
     $object_value = $this->getConditionObjectValue($condition, $object);
-    $test_value   = $condition->getValue();
-
-    $cond = $condition->getFieldCondition();
-
-    $transcript = new HeraldConditionTranscript();
-    $transcript->setRuleID($rule->getID());
-    $transcript->setConditionID($condition->getID());
-    $transcript->setFieldName($condition->getFieldName());
-    $transcript->setCondition($cond);
-    $transcript->setTestValue($test_value);
+    $transcript = $this->newConditionTranscript($rule, $condition);
 
     try {
       $result = $object->doesConditionMatch(
@@ -351,8 +343,6 @@ protected function doesConditionMatch(
 
     $transcript->setResult($result);
 
-    $this->transcript->addConditionTranscript($transcript);
-
     return $result;
   }
 
@@ -446,4 +436,136 @@ private function canRuleApplyToObject(
     return false;
   }
 
+  private function newRuleTranscript(HeraldRule $rule) {
+    $xscript = id(new HeraldRuleTranscript())
+      ->setRuleID($rule->getID())
+      ->setRuleName($rule->getName())
+      ->setRuleOwner($rule->getAuthorPHID());
+
+    $this->transcript->addRuleTranscript($xscript);
+
+    return $xscript;
+  }
+
+  private function newConditionTranscript(
+    HeraldRule $rule,
+    HeraldCondition $condition) {
+
+    $xscript = id(new HeraldConditionTranscript())
+      ->setRuleID($rule->getID())
+      ->setConditionID($condition->getID())
+      ->setFieldName($condition->getFieldName())
+      ->setCondition($condition->getFieldCondition())
+      ->setTestValue($condition->getValue());
+
+    $this->transcript->addConditionTranscript($xscript);
+
+    return $xscript;
+  }
+
+  private function newApplyTranscript(
+    HeraldAdapter $adapter,
+    HeraldRule $rule,
+    HeraldActionRecord $action) {
+
+    $effect = id(new HeraldEffect())
+      ->setObjectPHID($adapter->getPHID())
+      ->setAction($action->getAction())
+      ->setTarget($action->getTarget())
+      ->setRule($rule);
+
+    $xscript = new HeraldApplyTranscript($effect, false);
+
+    $this->transcript->addApplyTranscript($xscript);
+
+    return $xscript;
+  }
+
+  private function isForbidden(
+    HeraldRule $rule,
+    HeraldAdapter $adapter) {
+
+    $forbidden = $adapter->getForbiddenActions();
+    if (!$forbidden) {
+      return false;
+    }
+
+    $forbidden = array_fuse($forbidden);
+
+    $is_forbidden = false;
+
+    foreach ($rule->getConditions() as $condition) {
+      $field_key = $condition->getFieldName();
+
+      if (!isset($this->forbiddenFields[$field_key])) {
+        $reason = null;
+
+        try {
+          $states = $adapter->getRequiredFieldStates($field_key);
+        } catch (Exception $ex) {
+          $states = array();
+        }
+
+        foreach ($states as $state) {
+          if (!isset($forbidden[$state])) {
+            continue;
+          }
+          $reason = $adapter->getForbiddenReason($state);
+          break;
+        }
+
+        $this->forbiddenFields[$field_key] = $reason;
+      }
+
+      $forbidden_reason = $this->forbiddenFields[$field_key];
+      if ($forbidden_reason !== null) {
+        $this->newConditionTranscript($rule, $condition)
+          ->setResult(HeraldConditionTranscript::RESULT_FORBIDDEN)
+          ->setNote($forbidden_reason);
+
+        $is_forbidden = true;
+      }
+    }
+
+    foreach ($rule->getActions() as $action_record) {
+      $action_key = $action_record->getAction();
+
+      if (!isset($this->forbiddenActions[$action_key])) {
+        $reason = null;
+
+        try {
+          $states = $adapter->getRequiredActionStates($action_key);
+        } catch (Exception $ex) {
+          $states = array();
+        }
+
+        foreach ($states as $state) {
+          if (!isset($forbidden[$state])) {
+            continue;
+          }
+          $reason = $adapter->getForbiddenReason($state);
+          break;
+        }
+
+        $this->forbiddenActions[$action_key] = $reason;
+      }
+
+      $forbidden_reason = $this->forbiddenActions[$action_key];
+      if ($forbidden_reason !== null) {
+        $this->newApplyTranscript($adapter, $rule, $action_record)
+          ->setAppliedReason(
+            array(
+              array(
+                'type' => HeraldAction::DO_STANDARD_FORBIDDEN,
+                'data' => $forbidden_reason,
+              ),
+            ));
+
+        $is_forbidden = true;
+      }
+    }
+
+    return $is_forbidden;
+  }
+
 }
diff --git a/src/applications/herald/field/HeraldField.php b/src/applications/herald/field/HeraldField.php
index 2abed0ff1d..408a76f7fb 100644
--- a/src/applications/herald/field/HeraldField.php
+++ b/src/applications/herald/field/HeraldField.php
@@ -20,6 +20,10 @@ public function getFieldGroupKey() {
     return null;
   }
 
+  public function getRequiredAdapterStates() {
+    return array();
+  }
+
   protected function getHeraldFieldStandardType() {
     throw new PhutilMethodNotImplementedException();
   }
diff --git a/src/applications/herald/state/HeraldBuildableState.php b/src/applications/herald/state/HeraldBuildableState.php
new file mode 100644
index 0000000000..d19ae87c36
--- /dev/null
+++ b/src/applications/herald/state/HeraldBuildableState.php
@@ -0,0 +1,7 @@
+<?php
+
+final class HeraldBuildableState extends HeraldState {
+
+  const STATECONST = 'buildable';
+
+}
diff --git a/src/applications/herald/state/HeraldMailableState.php b/src/applications/herald/state/HeraldMailableState.php
new file mode 100644
index 0000000000..78f0600f00
--- /dev/null
+++ b/src/applications/herald/state/HeraldMailableState.php
@@ -0,0 +1,7 @@
+<?php
+
+final class HeraldMailableState extends HeraldState {
+
+  const STATECONST = 'mailable';
+
+}
diff --git a/src/applications/herald/state/HeraldState.php b/src/applications/herald/state/HeraldState.php
new file mode 100644
index 0000000000..9d11f8bcb6
--- /dev/null
+++ b/src/applications/herald/state/HeraldState.php
@@ -0,0 +1,3 @@
+<?php
+
+abstract class HeraldState extends Phobject {}
diff --git a/src/applications/herald/state/HeraldStateReasons.php b/src/applications/herald/state/HeraldStateReasons.php
new file mode 100644
index 0000000000..d85e8b713f
--- /dev/null
+++ b/src/applications/herald/state/HeraldStateReasons.php
@@ -0,0 +1,26 @@
+<?php
+
+abstract class HeraldStateReasons extends Phobject {
+
+  abstract public function explainReason($reason);
+
+  final public static function getAllReasons() {
+    return id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->execute();
+  }
+
+  final public static function getExplanation($reason) {
+    $reasons = self::getAllReasons();
+
+    foreach ($reasons as $reason_implementation) {
+      $explanation = $reason_implementation->explainReason($reason);
+      if ($explanation !== null) {
+        return $explanation;
+      }
+    }
+
+    return pht('Unknown reason ("%s").', $reason);
+  }
+
+}
diff --git a/src/applications/herald/storage/transcript/HeraldConditionTranscript.php b/src/applications/herald/storage/transcript/HeraldConditionTranscript.php
index 36a534e6b0..a7096b6880 100644
--- a/src/applications/herald/storage/transcript/HeraldConditionTranscript.php
+++ b/src/applications/herald/storage/transcript/HeraldConditionTranscript.php
@@ -10,6 +10,8 @@ final class HeraldConditionTranscript extends Phobject {
   protected $note;
   protected $result;
 
+  const RESULT_FORBIDDEN = 'forbidden';
+
   public function setRuleID($rule_id) {
     $this->ruleID = $rule_id;
     return $this;
@@ -72,4 +74,9 @@ public function setResult($result) {
   public function getResult() {
     return $this->result;
   }
+
+  public function isForbidden() {
+    return ($this->getResult() === self::RESULT_FORBIDDEN);
+  }
+
 }
diff --git a/src/applications/herald/storage/transcript/HeraldRuleTranscript.php b/src/applications/herald/storage/transcript/HeraldRuleTranscript.php
index d12f1f9dd9..8928a74cf6 100644
--- a/src/applications/herald/storage/transcript/HeraldRuleTranscript.php
+++ b/src/applications/herald/storage/transcript/HeraldRuleTranscript.php
@@ -9,6 +9,12 @@ final class HeraldRuleTranscript extends Phobject {
   protected $ruleName;
   protected $ruleOwner;
 
+  const RESULT_FORBIDDEN = 'forbidden';
+
+  public function isForbidden() {
+    return ($this->getResult() === self::RESULT_FORBIDDEN);
+  }
+
   public function setResult($result) {
     $this->result = $result;
     return $this;
diff --git a/src/applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php b/src/applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php
index 2b29fe2443..74fb879fe7 100644
--- a/src/applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php
+++ b/src/applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php
@@ -6,6 +6,12 @@ abstract class PhabricatorMetaMTAEmailHeraldAction
   const DO_SEND = 'do.send';
   const DO_FORCE = 'do.force';
 
+  public function getRequiredAdapterStates() {
+    return array(
+      HeraldMailableState::STATECONST,
+    );
+  }
+
   public function supportsObject($object) {
     // NOTE: This implementation lacks generality, but there's no great way to
     // figure out if something generates email right now.

From 0da3f34728e313b0a2074984911cf320ef82c106 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 27 Oct 2017 11:27:53 -0700
Subject: [PATCH 255/865] Provide "differential.diff.search"

Summary: See PHI90. For now, this only provides a limited amount of information, but should satisfy the use case in PHI90 and build toward a more complete version in the future.

Test Plan: Used new Conduit method to retrieve information about diffs.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18744
---
 src/__phutil_library_map__.php                |  5 ++
 ...DifferentialDiffSearchConduitAPIMethod.php | 18 +++++
 ...DifferentialQueryDiffsConduitAPIMethod.php | 10 +++
 .../query/DifferentialDiffQuery.php           | 25 ++++++
 .../query/DifferentialDiffSearchEngine.php    | 79 ++++++++++++++++++
 .../differential/storage/DifferentialDiff.php | 81 ++++++++++++++++++-
 6 files changed, 217 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/differential/conduit/DifferentialDiffSearchConduitAPIMethod.php
 create mode 100644 src/applications/differential/query/DifferentialDiffSearchEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2040568496..ff1f00c821 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -439,6 +439,8 @@
     'DifferentialDiffQuery' => 'applications/differential/query/DifferentialDiffQuery.php',
     'DifferentialDiffRepositoryHeraldField' => 'applications/differential/herald/DifferentialDiffRepositoryHeraldField.php',
     'DifferentialDiffRepositoryProjectsHeraldField' => 'applications/differential/herald/DifferentialDiffRepositoryProjectsHeraldField.php',
+    'DifferentialDiffSearchConduitAPIMethod' => 'applications/differential/conduit/DifferentialDiffSearchConduitAPIMethod.php',
+    'DifferentialDiffSearchEngine' => 'applications/differential/query/DifferentialDiffSearchEngine.php',
     'DifferentialDiffTestCase' => 'applications/differential/storage/__tests__/DifferentialDiffTestCase.php',
     'DifferentialDiffTransaction' => 'applications/differential/storage/DifferentialDiffTransaction.php',
     'DifferentialDiffTransactionQuery' => 'applications/differential/query/DifferentialDiffTransactionQuery.php',
@@ -5435,6 +5437,7 @@
       'HarbormasterBuildkiteBuildableInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorDestructibleInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'DifferentialDiffAffectedFilesHeraldField' => 'DifferentialDiffHeraldField',
     'DifferentialDiffAuthorHeraldField' => 'DifferentialDiffHeraldField',
@@ -5453,6 +5456,8 @@
     'DifferentialDiffQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'DifferentialDiffRepositoryHeraldField' => 'DifferentialDiffHeraldField',
     'DifferentialDiffRepositoryProjectsHeraldField' => 'DifferentialDiffHeraldField',
+    'DifferentialDiffSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
+    'DifferentialDiffSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'DifferentialDiffTestCase' => 'PhutilTestCase',
     'DifferentialDiffTransaction' => 'PhabricatorApplicationTransaction',
     'DifferentialDiffTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
diff --git a/src/applications/differential/conduit/DifferentialDiffSearchConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialDiffSearchConduitAPIMethod.php
new file mode 100644
index 0000000000..d4222510d7
--- /dev/null
+++ b/src/applications/differential/conduit/DifferentialDiffSearchConduitAPIMethod.php
@@ -0,0 +1,18 @@
+<?php
+
+final class DifferentialDiffSearchConduitAPIMethod
+  extends PhabricatorSearchEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'differential.diff.search';
+  }
+
+  public function newSearchEngine() {
+    return new DifferentialDiffSearchEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht('Read information about diffs.');
+  }
+
+}
diff --git a/src/applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php
index 7ff8600f81..ade7a3fd28 100644
--- a/src/applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php
@@ -11,6 +11,16 @@ public function getMethodDescription() {
     return pht('Query differential diffs which match certain criteria.');
   }
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_FROZEN;
+  }
+
+  public function getMethodStatusDescription() {
+    return pht(
+      'This method is frozen and will eventually be deprecated. New code '.
+      'should use "differential.diff.search" instead.');
+  }
+
   protected function defineParamTypes() {
     return array(
       'ids' => 'optional list<uint>',
diff --git a/src/applications/differential/query/DifferentialDiffQuery.php b/src/applications/differential/query/DifferentialDiffQuery.php
index f779e40c26..3b1dd3ae62 100644
--- a/src/applications/differential/query/DifferentialDiffQuery.php
+++ b/src/applications/differential/query/DifferentialDiffQuery.php
@@ -6,6 +6,7 @@ final class DifferentialDiffQuery
   private $ids;
   private $phids;
   private $revisionIDs;
+  private $revisionPHIDs;
   private $commitPHIDs;
   private $hasRevision;
 
@@ -27,6 +28,11 @@ public function withRevisionIDs(array $revision_ids) {
     return $this;
   }
 
+  public function withRevisionPHIDs(array $revision_phids) {
+    $this->revisionPHIDs = $revision_phids;
+    return $this;
+  }
+
   public function withCommitPHIDs(array $phids) {
     $this->commitPHIDs = $phids;
     return $this;
@@ -160,6 +166,25 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
       }
     }
 
+    if ($this->revisionPHIDs !== null) {
+      $viewer = $this->getViewer();
+
+      $revisions = id(new DifferentialRevisionQuery())
+        ->setViewer($viewer)
+        ->setParentQuery($this)
+        ->withPHIDs($this->revisionPHIDs)
+        ->execute();
+      $revision_ids = mpull($revisions, 'getID');
+      if (!$revision_ids) {
+        throw new PhabricatorEmptyQueryException();
+      }
+
+      $where[] = qsprintf(
+        $conn,
+        'revisionID IN (%Ls)',
+        $revision_ids);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/differential/query/DifferentialDiffSearchEngine.php b/src/applications/differential/query/DifferentialDiffSearchEngine.php
new file mode 100644
index 0000000000..89feeb5c3e
--- /dev/null
+++ b/src/applications/differential/query/DifferentialDiffSearchEngine.php
@@ -0,0 +1,79 @@
+<?php
+
+final class DifferentialDiffSearchEngine
+  extends PhabricatorApplicationSearchEngine {
+
+  public function getResultTypeDescription() {
+    return pht('Differential Diffs');
+  }
+
+  public function getApplicationClassName() {
+    return 'PhabricatorDifferentialApplication';
+  }
+
+  public function newQuery() {
+    return new DifferentialDiffQuery();
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+
+    if ($map['revisionPHIDs']) {
+      $query->withRevisionPHIDs($map['revisionPHIDs']);
+    }
+
+    return $query;
+  }
+
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorPHIDsSearchField())
+        ->setLabel(pht('Revisions'))
+        ->setKey('revisionPHIDs')
+        ->setAliases(array('revision', 'revisions', 'revisionPHID'))
+        ->setDescription(
+          pht('Find diffs attached to a particular revision.')),
+    );
+  }
+
+  protected function getURI($path) {
+    return '/differential/diff/'.$path;
+  }
+
+  protected function getBuiltinQueryNames() {
+    $names = array();
+
+    $names['all'] = pht('All Diffs');
+
+    return $names;
+  }
+
+  public function buildSavedQueryFromBuiltin($query_key) {
+    $query = $this->newSavedQuery();
+    $query->setQueryKey($query_key);
+
+    $viewer = $this->requireViewer();
+
+    switch ($query_key) {
+      case 'all':
+        return $query;
+    }
+
+    return parent::buildSavedQueryFromBuiltin($query_key);
+  }
+
+  protected function renderResultList(
+    array $revisions,
+    PhabricatorSavedQuery $query,
+    array $handles) {
+    assert_instances_of($revisions, 'DifferentialDiff');
+
+    $viewer = $this->requireViewer();
+
+    // NOTE: This is only exposed to Conduit, so we don't currently render
+    // results.
+
+    return id(new PhabricatorApplicationSearchResultView());
+  }
+
+}
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
index f7e85cd835..d70cdbbdf5 100644
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -9,7 +9,8 @@ final class DifferentialDiff
     HarbormasterCircleCIBuildableInterface,
     HarbormasterBuildkiteBuildableInterface,
     PhabricatorApplicationTransactionInterface,
-    PhabricatorDestructibleInterface {
+    PhabricatorDestructibleInterface,
+    PhabricatorConduitResultInterface {
 
   protected $revisionID;
   protected $authorPHID;
@@ -740,4 +741,82 @@ public function destroyObjectPermanently(
     $this->saveTransaction();
   }
 
+
+/* -(  PhabricatorConduitResultInterface  )---------------------------------- */
+
+
+  public function getFieldSpecificationsForConduit() {
+    return array(
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('revisionPHID')
+        ->setType('phid')
+        ->setDescription(pht('Associated revision PHID.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('authorPHID')
+        ->setType('phid')
+        ->setDescription(pht('Revision author PHID.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('repositoryPHID')
+        ->setType('phid')
+        ->setDescription(pht('Associated repository PHID.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('refs')
+        ->setType('map<string, wild>')
+        ->setDescription(pht('List of related VCS references.')),
+    );
+  }
+
+  public function getFieldValuesForConduit() {
+    $refs = array();
+
+    $branch = $this->getBranch();
+    if (strlen($branch)) {
+      $refs[] = array(
+        'type' => 'branch',
+        'name' => $branch,
+      );
+    }
+
+    $onto = $this->loadTargetBranch();
+    if (strlen($onto)) {
+      $refs[] = array(
+        'type' => 'onto',
+        'name' => $onto,
+      );
+    }
+
+    $base = $this->getSourceControlBaseRevision();
+    if (strlen($base)) {
+      $refs[] = array(
+        'type' => 'base',
+        'identifier' => $base,
+      );
+    }
+
+    $bookmark = $this->getBookmark();
+    if (strlen($bookmark)) {
+      $refs[] = array(
+        'type' => 'bookmark',
+        'name' => $bookmark,
+      );
+    }
+
+    $revision_phid = null;
+    if ($this->getRevisionID()) {
+      $revision_phid = $this->getRevision()->getPHID();
+    }
+
+    return array(
+      'revisionPHID' => $revision_phid,
+      'authorPHID' => $this->getAuthorPHID(),
+      'repositoryPHID' => $this->getRepositoryPHID(),
+      'refs' => $refs,
+    );
+  }
+
+  public function getConduitSearchAttachments() {
+    return array();
+  }
+
+
 }

From f5336cd6e760e6089f009130bb25f2a457c50c4e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 27 Oct 2017 10:00:34 -0700
Subject: [PATCH 256/865] Return transactions from
 "differential.parsecommitmessage"

Summary:
Depends on D18740. Prepares `arc` to receive a `--draft` flag by letting us switch to "differential.revision.edit" instead of "differential.createrevision".

To "differential.revision.edit", we need a transaction list, but we can't automatically construct this list from a field map. Return the transaction list alongside the field map.

The next change uses this list (if available) to switch us to the modern API method.

Test Plan: Ran `arc diff` on the experiemntal branch with followup changes, got a new revision.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18741
---
 ...tialParseCommitMessageConduitAPIMethod.php |  2 ++
 .../DifferentialCommitMessageParser.php       | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php
index 59401862f0..d1ad6b67e7 100644
--- a/src/applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php
@@ -36,6 +36,7 @@ protected function execute(ConduitAPIRequest $request) {
     $field_map = $parser->parseFields($corpus);
 
     $errors = $parser->getErrors();
+    $xactions = $parser->getTransactions();
 
     $revision_id_value = idx(
       $field_map,
@@ -49,6 +50,7 @@ protected function execute(ConduitAPIRequest $request) {
         'value' => $revision_id_value,
         'validDomain' => $revision_id_valid_domain,
       ),
+      'transactions' => $xactions,
     );
   }
 
diff --git a/src/applications/differential/parser/DifferentialCommitMessageParser.php b/src/applications/differential/parser/DifferentialCommitMessageParser.php
index 7e5a50e61f..3a73428e4b 100644
--- a/src/applications/differential/parser/DifferentialCommitMessageParser.php
+++ b/src/applications/differential/parser/DifferentialCommitMessageParser.php
@@ -28,6 +28,7 @@ final class DifferentialCommitMessageParser extends Phobject {
   private $errors;
   private $commitMessageFields;
   private $raiseMissingFieldErrors = true;
+  private $xactions;
 
   public static function newStandardParser(PhabricatorUser $viewer) {
     $key_title = DifferentialTitleCommitMessageField::FIELDKEY;
@@ -134,6 +135,7 @@ public function setSummaryKey($summary_key) {
    */
   public function parseCorpus($corpus) {
     $this->errors = array();
+    $this->xactions = array();
 
     $label_map = $this->getLabelMap();
     $key_title = $this->titleKey;
@@ -284,12 +286,25 @@ public function parseFields($corpus) {
       try {
         $result = $field->parseFieldValue($text_value);
         $result_map[$field_key] = $result;
+
+        try {
+          $xactions = $field->getFieldTransactions($result);
+          foreach ($xactions as $xaction) {
+            $this->xactions[] = $xaction;
+          }
+        } catch (Exception $ex) {
+          $this->errors[] = pht(
+            'Error extracting field transactions from "%s": %s',
+            $field->getFieldName(),
+            $ex->getMessage());
+        }
       } catch (DifferentialFieldParseException $ex) {
         $this->errors[] = pht(
           'Error parsing field "%s": %s',
           $field->getFieldName(),
           $ex->getMessage());
       }
+
     }
 
     if ($this->getRaiseMissingFieldErrors()) {
@@ -317,6 +332,14 @@ public function getErrors() {
   }
 
 
+  /**
+   * @task parse
+   */
+  public function getTransactions() {
+    return $this->xactions;
+  }
+
+
 /* -(  Support Methods  )---------------------------------------------------- */
 
 

From 28cec2f8a2bf96df572c04360c412c8436356421 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 27 Oct 2017 08:55:56 -0700
Subject: [PATCH 257/865] Allow revisions to be held as drafts, even after
 builds finish

Summary:
Ref T2543. Instead of autosubmitting revisions to "Needs Review" when builds finish, allow them to be held in "Draft" indefinitely.

There's currently no UI for this. I plan to just expose it as `arc diff --draft` for now, in a followup change.

Test Plan:
  - Created a revision (via Conduit) with "hold as draft", saw it hold as draft after builds finished.
  - Created a revision (normally), saw it autosubmit after builds finished.
  - Requested review of a "hold as draft" revision to kick it out of draft state.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18737
---
 src/__phutil_library_map__.php                |  2 +
 .../customfield/DifferentialDraftField.php    |  6 +++
 .../editor/DifferentialRevisionEditEngine.php | 16 +++++++
 .../editor/DifferentialTransactionEditor.php  |  2 +-
 .../storage/DifferentialRevision.php          |  9 ++++
 ...fferentialRevisionHoldDraftTransaction.php | 47 +++++++++++++++++++
 6 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index ff1f00c821..7180a7ae04 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -550,6 +550,7 @@
     'DifferentialRevisionHasTaskRelationship' => 'applications/differential/relationships/DifferentialRevisionHasTaskRelationship.php',
     'DifferentialRevisionHeraldField' => 'applications/differential/herald/DifferentialRevisionHeraldField.php',
     'DifferentialRevisionHeraldFieldGroup' => 'applications/differential/herald/DifferentialRevisionHeraldFieldGroup.php',
+    'DifferentialRevisionHoldDraftTransaction' => 'applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php',
     'DifferentialRevisionIDCommitMessageField' => 'applications/differential/field/DifferentialRevisionIDCommitMessageField.php',
     'DifferentialRevisionInlineTransaction' => 'applications/differential/xaction/DifferentialRevisionInlineTransaction.php',
     'DifferentialRevisionInlinesController' => 'applications/differential/controller/DifferentialRevisionInlinesController.php',
@@ -5592,6 +5593,7 @@
     'DifferentialRevisionHasTaskRelationship' => 'DifferentialRevisionRelationship',
     'DifferentialRevisionHeraldField' => 'HeraldField',
     'DifferentialRevisionHeraldFieldGroup' => 'HeraldFieldGroup',
+    'DifferentialRevisionHoldDraftTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionIDCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialRevisionInlineTransaction' => 'PhabricatorModularTransactionType',
     'DifferentialRevisionInlinesController' => 'DifferentialController',
diff --git a/src/applications/differential/customfield/DifferentialDraftField.php b/src/applications/differential/customfield/DifferentialDraftField.php
index e7ed2bedb2..5d625e3ce9 100644
--- a/src/applications/differential/customfield/DifferentialDraftField.php
+++ b/src/applications/differential/customfield/DifferentialDraftField.php
@@ -36,6 +36,12 @@ public function getWarningsForRevisionHeader(array $handles) {
       return array();
     }
 
+    // If the author has held this revision as a draft explicitly, don't
+    // show any misleading messages about it autosubmitting later.
+    if ($revision->getHoldAsDraft()) {
+      return array();
+    }
+
     $warnings = array();
 
     $blocking_map = array(
diff --git a/src/applications/differential/editor/DifferentialRevisionEditEngine.php b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
index 9aad031a7c..2bd3a5cdc3 100644
--- a/src/applications/differential/editor/DifferentialRevisionEditEngine.php
+++ b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
@@ -235,6 +235,22 @@ protected function buildCustomEditFields($object) {
       $fields[] = $action->newEditField($object, $viewer);
     }
 
+    $fields[] = id(new PhabricatorBoolEditField())
+      ->setKey('draft')
+      ->setLabel(pht('Hold as Draft'))
+      ->setIsConduitOnly(true)
+      ->setOptions(
+        pht('Autosubmit Once Builds Finish'),
+        pht('Hold as Draft'))
+      ->setTransactionType(
+        DifferentialRevisionHoldDraftTransaction::TRANSACTIONTYPE)
+      ->setDescription(pht('Hold revision as as draft.'))
+      ->setConduitDescription(
+        pht(
+          'Change autosubmission from draft state after builds finish.'))
+      ->setConduitTypeDescription(pht('New "Hold as Draft" setting.'))
+      ->setValue($object->getHoldAsDraft());
+
     return $fields;
   }
 
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 9ab30c3f06..edc8fd0ad3 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1540,7 +1540,7 @@ private function loadUnbroadcastTransactions($object) {
   protected function didApplyTransactions($object, array $xactions) {
     // If a draft revision has no outstanding builds and we're automatically
     // making drafts public after builds finish, make the revision public.
-    $auto_undraft = true;
+    $auto_undraft = !$object->getHoldAsDraft();
 
     if ($object->isDraft() && $auto_undraft) {
       $active_builds = $this->hasActiveBuilds($object);
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index da7e18ce05..467e503f6f 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -57,6 +57,7 @@ final class DifferentialRevision extends DifferentialDAO
   const RELATION_SUBSCRIBED   = 'subd';
 
   const PROPERTY_CLOSED_FROM_ACCEPTED = 'wasAcceptedBeforeClose';
+  const PROPERTY_DRAFT_HOLD = 'draft.hold';
 
   public static function initializeNewRevision(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
@@ -708,6 +709,14 @@ public function shouldBroadcast() {
     return false;
   }
 
+  public function getHoldAsDraft() {
+    return $this->getProperty(self::PROPERTY_DRAFT_HOLD, false);
+  }
+
+  public function setHoldAsDraft($hold) {
+    return $this->setProperty(self::PROPERTY_DRAFT_HOLD, $hold);
+  }
+
   public function loadActiveBuilds(PhabricatorUser $viewer) {
     $diff = $this->getActiveDiff();
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php b/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
new file mode 100644
index 0000000000..5bc257ab62
--- /dev/null
+++ b/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
@@ -0,0 +1,47 @@
+<?php
+
+final class DifferentialRevisionHoldDraftTransaction
+  extends DifferentialRevisionTransactionType {
+
+  const TRANSACTIONTYPE = 'draft';
+  const EDITKEY = 'draft';
+
+  public function generateOldValue($object) {
+    return (bool)$object->getHoldAsDraft();
+  }
+
+  public function generateNewValue($object, $value) {
+    return (bool)$value;
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setHoldAsDraft($value);
+  }
+
+  public function getTitle() {
+    if ($this->getNewValue()) {
+      return pht(
+        '%s held this revision as a draft.',
+        $this->renderAuthor());
+    } else {
+      return pht(
+        '%s set this revision to automatically submit once builds complete.',
+        $this->renderAuthor());
+    }
+  }
+
+  public function getTitleForFeed() {
+    if ($this->getNewValue()) {
+      return pht(
+        '%s held %s as a draft.',
+        $this->renderAuthor(),
+        $this->renderObject());
+    } else {
+      return pht(
+        '%s set %s to automatically submit once builds complete.',
+        $this->renderAuthor(),
+        $this->renderObject());
+    }
+  }
+
+}

From 7fa0d066bc459e47e7381476c6fd708355cb9104 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 31 Oct 2017 10:29:33 -0700
Subject: [PATCH 258/865] Don't run Herald build rules when Differential
 revisions are updated automatically

Summary: Ref T2543. After D18731, Herald build rules run more often, but now incorrectly try to run builds when Diffusion closes a revision because a commit landed.

Test Plan: Made some mundane updates locally; this is tricky to test comprehensively locally so I'm mostly planning to just push it to `secure`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18745
---
 .../editor/DifferentialTransactionEditor.php  | 22 ++++++++++++++++---
 .../herald/DifferentialHeraldStateReasons.php |  4 ++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index edc8fd0ad3..70c3272a83 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1204,16 +1204,32 @@ protected function buildHeraldAdapter(
     // edited the title or changed subscribers), prevent "Run build plan"
     // and other similar rules from acting yet, since the build results will
     // not (or, at least, should not) change unless the actual source changes.
+    // We also don't run Differential builds if the update was caused by
+    // discovering a commit, as the expectation is that Diffusion builds take
+    // over once things land.
     $has_update = false;
+    $has_commit = false;
+
     $type_update = DifferentialTransaction::TYPE_UPDATE;
     foreach ($xactions as $xaction) {
-      if ($xaction->getTransactionType() == $type_update) {
+      if ($xaction->getTransactionType() != $type_update) {
+        continue;
+      }
+
+      if ($xaction->getMetadataValue('isCommitUpdate')) {
+        $has_commit = true;
+      } else {
         $has_update = true;
-        break;
       }
+
+      break;
     }
 
-    if (!$has_update) {
+    if ($has_commit) {
+      $adapter->setForbiddenAction(
+        HeraldBuildableState::STATECONST,
+        DifferentialHeraldStateReasons::REASON_LANDED);
+    } else if (!$has_update) {
       $adapter->setForbiddenAction(
         HeraldBuildableState::STATECONST,
         DifferentialHeraldStateReasons::REASON_UNCHANGED);
diff --git a/src/applications/differential/herald/DifferentialHeraldStateReasons.php b/src/applications/differential/herald/DifferentialHeraldStateReasons.php
index d3259560d5..92d2ca3067 100644
--- a/src/applications/differential/herald/DifferentialHeraldStateReasons.php
+++ b/src/applications/differential/herald/DifferentialHeraldStateReasons.php
@@ -5,6 +5,7 @@ final class DifferentialHeraldStateReasons
 
   const REASON_DRAFT = 'differential.draft';
   const REASON_UNCHANGED = 'differential.unchanged';
+  const REASON_LANDED = 'differential.landed';
 
   public function explainReason($reason) {
     $reasons = array(
@@ -14,6 +15,9 @@ public function explainReason($reason) {
       self::REASON_UNCHANGED => pht(
         'The update which triggered Herald did not update the diff for '.
         'this revision, so builds will not run.'),
+      self::REASON_LANDED => pht(
+        'The update which triggered Herald was an automatic update in '.
+        'response to discovering a commit, so builds will not run.'),
     );
 
     return idx($reasons, $reason);

From 90d0f8ac6cf5eb12406f330a624bbf87c156f517 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 31 Oct 2017 10:49:19 -0700
Subject: [PATCH 259/865] Revert changes to Diffusion blame view

Summary:
Ref PHI174. This reverts most of these changes:

- 37843127e94a878a7f5bf2c65c8e7004bc65c68a / D18481
- 94cad30ac3f052a711ececf7e370bf5c0071827f / D18474
- 12ae08b6b1a1b7c330593e76c32817f7cdbc87dd / D18473
- 0a013341721f8b1fc249047fe6db26062138b562 / D18462
- ac91ab1ef9196eee0deabfd70157ccc0d53d666e / D18452

These changes made the Diffusion blame view very similar to GitHub's blame view. See D18452 for a before/after of the bulk of these changes; the other revisions are bugfixes.

I think this was generally a step backward, and not motivated by solving a specific problem. I've found the new UI less usable than the old one, and at least one install (see PHI174) also has.

In particular, the revision/commit titles are very bulky and not terribly useful; the date column also isn't terribly useful; the "age" color actually IS pretty useful and was heavily de-emphasized.

I've kept one bugfix here (missing `'a'` tag type) and kept the upgraded icon for "Skip Past This Commit".

I'm going to follow this up with some additional changes:

  - Show a small author profile icon, similar to GitHub, to address PHI174 more directly.
  - Try a zebra-stripe on blocks of rows to make it more clear where changes affected by a particular commit begin and end.
  - Try a hue shift, not just a brightness/saturation shift, to make the "age" color more distinct.
  - Try computing colors as even steps, not based purely on age. Currently, if a file has one long-distant commit and several recent commits, all the recent ones show up as very bright green. I think this would probably be more useful if they were distributed more evenly across the available color bands.

Test Plan:
Viewed blame views in Diffusion, saw a more compact UI similar to the old UI.

{F5251019}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18746
---
 resources/celerity/map.php                    |   4 +-
 .../controller/DiffusionBrowseController.php  | 109 +++++++++++-------
 .../diffusion/diffusion-source.css            |  59 +++-------
 3 files changed, 88 insertions(+), 84 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index ce069dbd11..517827a900 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -73,7 +73,7 @@
     'rsrc/css/application/diffusion/diffusion-icons.css' => '0c15255e',
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
-    'rsrc/css/application/diffusion/diffusion-source.css' => '69ac9399',
+    'rsrc/css/application/diffusion/diffusion-source.css' => '3a1056d8',
     'rsrc/css/application/diffusion/diffusion.css' => '45727264',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
@@ -572,7 +572,7 @@
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
-    'diffusion-source-css' => '69ac9399',
+    'diffusion-source-css' => '3a1056d8',
     'diviner-shared-css' => '896f1d43',
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index b4c0352d53..be9d4fbb9b 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1127,6 +1127,10 @@ private function buildDisplayRows(
         ));
     }
 
+    $skip_text = pht('Skip Past This Commit');
+    $skip_icon = id(new PHUIIconView())
+      ->setIcon('fa-caret-square-o-left');
+
     foreach ($display as $line_index => $line) {
       $row = array();
 
@@ -1142,14 +1146,12 @@ private function buildDisplayRows(
       $revision_link = null;
       $commit_link = null;
       $before_link = null;
-      $commit_date = null;
 
-      $style = 'border-right: 3px solid '.$line['color'].';';
+      $style = 'background: '.$line['color'].';';
 
       if ($identifier && !$line['duplicate']) {
         if (isset($commit_links[$identifier])) {
-          $commit_link = $commit_links[$identifier]['link'];
-          $commit_date = $commit_links[$identifier]['date'];
+          $commit_link = $commit_links[$identifier];
         }
 
         if (isset($revision_map[$identifier])) {
@@ -1160,10 +1162,6 @@ private function buildDisplayRows(
         }
 
         $skip_href = $line_href.'?before='.$identifier.'&view=blame';
-        $skip_text = pht('Skip Past This Commit');
-        $icon = id(new PHUIIconView())
-          ->setIcon('fa-caret-square-o-left');
-
         $before_link = javelin_tag(
           'a',
           array(
@@ -1175,7 +1173,7 @@ private function buildDisplayRows(
               'size'    => 300,
             ),
           ),
-          $icon);
+          $skip_icon);
       }
 
       if ($show_blame) {
@@ -1186,41 +1184,33 @@ private function buildDisplayRows(
           ),
           $before_link);
 
-        $row[] = phutil_tag(
-          'th',
-          array(
-            'class' => 'diffusion-rev-link',
-          ),
-          $commit_link);
-
-        if ($revision_map) {
-          $row[] = phutil_tag(
-            'th',
-            array(
-              'class' => 'diffusion-blame-revision',
-            ),
-            $revision_link);
+        $object_links = array();
+        $object_links[] = $commit_link;
+        if ($revision_link) {
+          $object_links[] = phutil_tag('span', array(), '/');
+          $object_links[] = $revision_link;
         }
 
         $row[] = phutil_tag(
           'th',
           array(
-            'class' => 'diffusion-blame-date',
+            'class' => 'diffusion-rev-link',
           ),
-          $commit_date);
+          $object_links);
       }
 
       $line_link = phutil_tag(
         'a',
         array(
           'href' => $line_href,
+          'style' => $style,
         ),
         $line_number);
 
       $row[] = javelin_tag(
         'th',
         array(
-          'class' => 'diffusion-line-link ',
+          'class' => 'diffusion-line-link',
           'sigil' => 'phabricator-source-line',
           'style' => $style,
         ),
@@ -1536,6 +1526,33 @@ private function loadParentCommitOf($commit) {
     return head($parents);
   }
 
+  private function renderRevisionTooltip(
+    DifferentialRevision $revision,
+    $handles) {
+    $viewer = $this->getRequest()->getUser();
+
+    $date = phabricator_date($revision->getDateModified(), $viewer);
+    $id = $revision->getID();
+    $title = $revision->getTitle();
+    $header = "D{$id} {$title}";
+
+    $author = $handles[$revision->getAuthorPHID()]->getName();
+
+    return "{$header}\n{$date} \xC2\xB7 {$author}";
+  }
+
+  private function renderCommitTooltip(
+    PhabricatorRepositoryCommit $commit,
+    $author) {
+
+    $viewer = $this->getRequest()->getUser();
+
+    $date = phabricator_date($commit->getEpoch(), $viewer);
+    $summary = trim($commit->getSummary());
+
+    return "{$summary}\n{$date} \xC2\xB7 {$author}";
+  }
+
   protected function markupText($text) {
     $engine = PhabricatorMarkupEngine::newDiffusionMarkupEngine();
     $engine->setConfig('viewer', $this->getRequest()->getUser());
@@ -1743,6 +1760,9 @@ private function loadBlame($path, $commit, $timeout) {
         ->setViewer($viewer)
         ->withRepository($repository)
         ->withIdentifiers($identifiers)
+        // TODO: We only fetch this to improve author display behavior, but
+        // shouldn't really need to?
+        ->needCommitData(true)
         ->execute();
       $commits = mpull($commits, null, 'getCommitIdentifier');
     } else {
@@ -1754,27 +1774,25 @@ private function loadBlame($path, $commit, $timeout) {
 
   private function renderCommitLinks(array $commits, $handles) {
     $links = array();
-    $viewer = $this->getViewer();
     foreach ($commits as $identifier => $commit) {
-      $date = phabricator_date($commit->getEpoch(), $viewer);
-      $summary = trim($commit->getSummary());
-
-      $commit_link = phutil_tag(
-        'a',
-        array(
-          'href' => $commit->getURI(),
-        ),
-        $summary);
+      $tooltip = $this->renderCommitTooltip(
+        $commit,
+        $commit->renderAuthorShortName($handles));
 
-      $commit_date = phutil_tag(
+      $commit_link = javelin_tag(
         'a',
         array(
           'href' => $commit->getURI(),
+          'sigil' => 'has-tooltip',
+          'meta'  => array(
+            'tip'   => $tooltip,
+            'align' => 'E',
+            'size'  => 600,
+          ),
         ),
-        $date);
+        $commit->getLocalName());
 
-      $links[$identifier]['link'] = $commit_link;
-      $links[$identifier]['date'] = $commit_date;
+      $links[$identifier] = $commit_link;
     }
 
     return $links;
@@ -1785,10 +1803,19 @@ private function renderRevisionLinks(array $revisions, $handles) {
 
     foreach ($revisions as $revision) {
       $revision_id = $revision->getID();
-      $revision_link = phutil_tag(
+
+      $tooltip = $this->renderRevisionTooltip($revision, $handles);
+
+      $revision_link = javelin_tag(
         'a',
         array(
           'href' => '/'.$revision->getMonogram(),
+          'sigil' => 'has-tooltip',
+          'meta'  => array(
+            'tip'   => $tooltip,
+            'align' => 'E',
+            'size'  => 600,
+          ),
         ),
         $revision->getMonogram());
 
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-source.css b/webroot/rsrc/css/application/diffusion/diffusion-source.css
index 3b8b9a8a16..9ade2d3022 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion-source.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion-source.css
@@ -13,22 +13,24 @@
   -webkit-overflow-scrolling: touch;
 }
 
-.diffusion-source tr.phabricator-source-highlight th,
-.diffusion-source tr.phabricator-source-highlight td {
-  background: {$gentle.highlight};
+.diffusion-source tr.phabricator-source-highlight {
+  background: {$sh-yellowbackground};
 }
 
 .diffusion-source th {
   text-align: right;
   vertical-align: top;
-  color: {$darkbluetext};
+  background: {$lightgreybackground};
+  color: {$bluetext};
   border-right: 1px solid {$thinblueborder};
 }
 
 .diffusion-source td {
   vertical-align: top;
   white-space: pre-wrap;
-  padding: 3px 12px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-left: 8px;
   width: 100%;
   word-break: break-all;
 }
@@ -43,18 +45,12 @@
 }
 
 .diffusion-blame-link,
-.diffusion-rev-link,
-.diffusion-blame-date {
+.diffusion-rev-link {
   white-space: nowrap;
 }
 
-.diffusion-blame-date,
-.diffusion-blame-link,
-.diffusion-blame-revision,
-.diffusion-rev-link {
-  background: {$lightgreybackground};
-  font: {$basefont};
-  font-size: {$smallerfontsize};
+.diffusion-blame-link {
+  min-width: 28px;
 }
 
 .diffusion-source th.diffusion-rev-link {
@@ -62,23 +58,16 @@
   min-width: 130px;
 }
 
-.diffusion-source a {
+.diffusion-blame-link a,
+.diffusion-rev-link a,
+.diffusion-line-link a {
   color: {$darkbluetext};
 }
 
-.diffusion-rev-link a {
-  max-width: 300px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  margin: 3px 8px;
-  display: block;
-}
-
-.diffusion-blame-date a,
-.diffusion-blame-revision a {
-  float: right;
-  margin: 3px 8px;
+.diffusion-rev-link a,
+.diffusion-rev-link span {
+  margin: 2px 8px 0;
+  display: inline-block;
 }
 
 .diffusion-rev-link span {
@@ -91,19 +80,7 @@
 .diffusion-line-link a {
   /* Give the user a larger click target. */
   display: block;
-  padding: 4px 8px 3px;
-}
-
-.diffusion-line-link a {
-  color: {$lightgreytext};
-}
-
-.diffusion-blame-link a .phui-icon-view {
-  color: {$bluetext};
-}
-
-.diffusion-blame-link a:hover .phui-icon-view {
-  color: {$sky};
+  padding: 2px 8px;
 }
 
 .diffusion-line-link {

From bde71324f82ba0eaeabeeff8eb6db84505b1614f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 31 Oct 2017 11:28:31 -0700
Subject: [PATCH 260/865] Show small author portraits in Diffusion blame view

Summary: Depends on D18746. See PHI174. Adds small author portraits next to each blame line (this is similar to GitHub).

Test Plan:
My local test data isn't that great since I don't have commits from a lot of accounts, but looks functional:

{F5251056}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18747
---
 resources/celerity/map.php                    |  4 +-
 .../controller/DiffusionBrowseController.php  | 49 +++++++++++++++++++
 .../diffusion/diffusion-source.css            | 12 ++++-
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 517827a900..b7cb976a16 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -73,7 +73,7 @@
     'rsrc/css/application/diffusion/diffusion-icons.css' => '0c15255e',
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
-    'rsrc/css/application/diffusion/diffusion-source.css' => '3a1056d8',
+    'rsrc/css/application/diffusion/diffusion-source.css' => 'd96b3f9f',
     'rsrc/css/application/diffusion/diffusion.css' => '45727264',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
@@ -572,7 +572,7 @@
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
-    'diffusion-source-css' => '3a1056d8',
+    'diffusion-source-css' => 'd96b3f9f',
     'diviner-shared-css' => '896f1d43',
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index be9d4fbb9b..f4bd2bdebf 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -969,6 +969,24 @@ private function buildDisplayRows(
 
     $handles = $viewer->loadHandles($phids);
 
+    $author_phids = array();
+    $author_map = array();
+    foreach ($blame_commits as $commit) {
+      $commit_identifier = $commit->getCommitIdentifier();
+
+      $author_phid = '';
+      if (isset($revision_map[$commit_identifier])) {
+        $revision_id = $revision_map[$commit_identifier];
+        $revision = $revisions[$revision_id];
+        $author_phid = $revision->getAuthorPHID();
+      } else {
+        $author_phid = $commit->getAuthorPHID();
+      }
+
+      $author_map[$commit_identifier] = $author_phid;
+      $author_phids[$author_phid] = $author_phid;
+    }
+
     $colors = array();
     if ($blame_commits) {
       $epochs = array();
@@ -1113,6 +1131,7 @@ private function buildDisplayRows(
     // blame outputs.
     $commit_links = $this->renderCommitLinks($blame_commits, $handles);
     $revision_links = $this->renderRevisionLinks($revisions, $handles);
+    $author_links = $this->renderAuthorLinks($author_map, $handles);
 
     if ($this->coverage) {
       require_celerity_resource('differential-changeset-view-css');
@@ -1145,6 +1164,7 @@ private function buildDisplayRows(
 
       $revision_link = null;
       $commit_link = null;
+      $author_link = null;
       $before_link = null;
 
       $style = 'background: '.$line['color'].';';
@@ -1152,6 +1172,7 @@ private function buildDisplayRows(
       if ($identifier && !$line['duplicate']) {
         if (isset($commit_links[$identifier])) {
           $commit_link = $commit_links[$identifier];
+          $author_link = $author_links[$author_map[$identifier]];
         }
 
         if (isset($revision_map[$identifier])) {
@@ -1185,6 +1206,7 @@ private function buildDisplayRows(
           $before_link);
 
         $object_links = array();
+        $object_links[] = $author_link;
         $object_links[] = $commit_link;
         if ($revision_link) {
           $object_links[] = phutil_tag('span', array(), '/');
@@ -1772,6 +1794,33 @@ private function loadBlame($path, $commit, $timeout) {
     return array($identifiers, $commits);
   }
 
+  private function renderAuthorLinks(array $authors, $handles) {
+    $links = array();
+
+    foreach ($authors as $phid) {
+      if (!strlen($phid)) {
+        // This means we couldn't identify an author for the commit or the
+        // revision. We just render a blank for alignment.
+        $style = null;
+        $href = null;
+      } else {
+        $src = $handles[$phid]->getImageURI();
+        $style = 'background-image: url('http://github.com/.$src.');';
+        $href = $handles[$phid]->getURI();
+      }
+
+      $links[$phid] = javelin_tag(
+        $href ? 'a' : 'span',
+        array(
+          'class' => 'diffusion-author-link',
+          'style' => $style,
+          'href' => $href,
+        ));
+    }
+
+    return $links;
+  }
+
   private function renderCommitLinks(array $commits, $handles) {
     $links = array();
     foreach ($commits as $identifier => $commit) {
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-source.css b/webroot/rsrc/css/application/diffusion/diffusion-source.css
index 9ade2d3022..06e7d74477 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion-source.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion-source.css
@@ -66,7 +66,7 @@
 
 .diffusion-rev-link a,
 .diffusion-rev-link span {
-  margin: 2px 8px 0;
+  margin: 0 8px 0 0;
   display: inline-block;
 }
 
@@ -90,3 +90,13 @@
   -ms-user-select: none;
   user-select: none;
 }
+
+.diffusion-rev-link .diffusion-author-link {
+  display: inline-block;
+  padding: 0;
+  margin: 2px 4px -4px 4px;
+  width: 16px;
+  height: 16px;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}

From a4b934cad2b520fb2de57a5f08eeffa6aff28ffe Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 31 Oct 2017 11:45:38 -0700
Subject: [PATCH 261/865] Clean up Differential draft mail behaviors

Summary:
Ref T2543. Fixes two relatively minor things:

  - When builds finish in Harbormaster, send mail "From" the author.
  - Set the `firstBroadcast` flag so that initial mail picks up earlier history (notably, the "reviewers" line).

For now, I'm not setting `firstBroadcast` on explicit "Request Review" (but maybe we should), and not trying to deal with weird cases where you leave a bunch of comments on a draft. Those might be fine as-is or may get tweaked later.

Test Plan: Created a revision with Harbormaster builds, ran builds, saw initial email come "From" the right user with more metadata.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18748
---
 .../editor/DifferentialTransactionEditor.php   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 70c3272a83..79a582a43f 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -9,6 +9,7 @@ final class DifferentialTransactionEditor
   private $didExpandInlineState = false;
   private $hasReviewTransaction = false;
   private $affectedPaths;
+  private $firstBroadcast = false;
 
   public function getEditorApplicationClass() {
     return 'PhabricatorDifferentialApplication';
@@ -27,7 +28,7 @@ public function getCreateObjectTitleForFeed($author, $object) {
   }
 
   public function isFirstBroadcast() {
-    return $this->getIsNewObject();
+    return $this->firstBroadcast;
   }
 
   public function getDiffUpdateTransaction(array $xactions) {
@@ -1449,11 +1450,13 @@ protected function willPublish(PhabricatorLiskDAO $object, array $xactions) {
   protected function getCustomWorkerState() {
     return array(
       'changedPriorToCommitURI' => $this->changedPriorToCommitURI,
+      'firstBroadcast' => $this->firstBroadcast,
     );
   }
 
   protected function loadCustomWorkerState(array $state) {
     $this->changedPriorToCommitURI = idx($state, 'changedPriorToCommitURI');
+    $this->firstBroadcast = idx($state, 'firstBroadcast');
     return $this;
   }
 
@@ -1566,6 +1569,19 @@ protected function didApplyTransactions($object, array $xactions) {
         // natural and more useful.
         $author_phid = $object->getAuthorPHID();
 
+        // Additionally, we change the acting PHID for the transaction set
+        // to the author if it isn't already a user so that mail comes from
+        // the natural author.
+        $acting_phid = $this->getActingAsPHID();
+        $user_type = PhabricatorPeopleUserPHIDType::TYPECONST;
+        if (phid_get_type($acting_phid) != $user_type) {
+          $this->setActingAsPHID($author_phid);
+        }
+
+        // Mark this as the first broadcast we're sending about the revision
+        // so mail can generate specially.
+        $this->firstBroadcast = true;
+
         $xaction = $object->getApplicationTransactionTemplate()
           ->setAuthorPHID($author_phid)
           ->setTransactionType(

From 80ebe401e5849799cbc5568f25cca927b7b1b621 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 31 Oct 2017 12:23:16 -0700
Subject: [PATCH 262/865] Tweak padding/spacing on Diffusion blame view for
 profile pictures

Summary: Give profile images a little more space, fix "/" spacing, add a tooltip.

Test Plan: {F5251205}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18749
---
 resources/celerity/map.php                                | 4 ++--
 .../diffusion/controller/DiffusionBrowseController.php    | 5 +++++
 .../rsrc/css/application/diffusion/diffusion-source.css   | 8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index b7cb976a16..c9e1a5b351 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -73,7 +73,7 @@
     'rsrc/css/application/diffusion/diffusion-icons.css' => '0c15255e',
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
-    'rsrc/css/application/diffusion/diffusion-source.css' => 'd96b3f9f',
+    'rsrc/css/application/diffusion/diffusion-source.css' => '5f35a3bd',
     'rsrc/css/application/diffusion/diffusion.css' => '45727264',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
@@ -572,7 +572,7 @@
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
-    'diffusion-source-css' => 'd96b3f9f',
+    'diffusion-source-css' => '5f35a3bd',
     'diviner-shared-css' => '896f1d43',
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index f4bd2bdebf..4985ac2bb7 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1815,6 +1815,11 @@ private function renderAuthorLinks(array $authors, $handles) {
           'class' => 'diffusion-author-link',
           'style' => $style,
           'href' => $href,
+          'sigil' => 'has-tooltip',
+          'meta' => array(
+            'tip' => $handles[$phid]->getName(),
+            'align' => 'E',
+          ),
         ));
     }
 
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-source.css b/webroot/rsrc/css/application/diffusion/diffusion-source.css
index 06e7d74477..a2c67cf16d 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion-source.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion-source.css
@@ -64,14 +64,14 @@
   color: {$darkbluetext};
 }
 
-.diffusion-rev-link a,
-.diffusion-rev-link span {
+.diffusion-rev-link a {
   margin: 0 8px 0 0;
   display: inline-block;
 }
 
 .diffusion-rev-link span {
-  margin-right: -4px;
+  display: inline-block;
+  margin-right: 4px;
   margin-left: -4px;
   color: {$lightgreytext};
 }
@@ -94,7 +94,7 @@
 .diffusion-rev-link .diffusion-author-link {
   display: inline-block;
   padding: 0;
-  margin: 2px 4px -4px 4px;
+  margin: 2px 6px -4px 8px;
   width: 16px;
   height: 16px;
   background-size: 100% 100%;

From 2a7cdcf740ac4948b25a88fda3db9fb9d3f7337e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 31 Oct 2017 13:52:23 -0700
Subject: [PATCH 263/865] Fix an issue where the repository symbol index would
 incorrectly activate inside inline comments

Summary:
See PHI185. When looking at a revision, you can Command-Click (Mac) symbols to jump to their definitions (provided the symbol index has been built).

Currently, the code works on any node inside the changeset list, so it activates when clicking links inside inline comments and opening them in a new window.

To avoid this, don't activate if we're inside an inline comment. This technically prevents you from doing a symbol lookup on a symbol inside a codeblock inside an inline, but that seems fine/reasonable.

Test Plan: Wrote `Dxxx` in an inline, command-clicked it. Before: got a symbol lookup. After: just a new tab with the revision.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18753
---
 resources/celerity/map.php                     | 18 +++++++++---------
 .../repository/repository-crossreference.js    | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index c9e1a5b351..30c04ffc92 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
-    'differential.pkg.js' => 'b71b8c5d',
+    'differential.pkg.js' => 'ae6460e0',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -444,7 +444,7 @@
     'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf',
     'rsrc/js/application/releeph/releeph-request-state-change.js' => 'a0b57eb8',
     'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'de2e896f',
-    'rsrc/js/application/repository/repository-crossreference.js' => 'e5339c43',
+    'rsrc/js/application/repository/repository-crossreference.js' => '7fe9bc12',
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
     'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
@@ -690,7 +690,7 @@
     'javelin-behavior-reorder-applications' => '76b9fc3e',
     'javelin-behavior-reorder-columns' => 'e1d25dfb',
     'javelin-behavior-reorder-profile-menu-items' => 'e2e0a072',
-    'javelin-behavior-repository-crossreference' => 'e5339c43',
+    'javelin-behavior-repository-crossreference' => '7fe9bc12',
     'javelin-behavior-scrollbar' => '834a1173',
     'javelin-behavior-search-reorder-queries' => 'e9581f08',
     'javelin-behavior-select-content' => 'bf5374ef',
@@ -1546,6 +1546,12 @@
     '7f243deb' => array(
       'javelin-install',
     ),
+    '7fe9bc12' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-uri',
+    ),
     '834a1173' => array(
       'javelin-behavior',
       'javelin-scrollbar',
@@ -2073,12 +2079,6 @@
       'javelin-behavior',
       'javelin-dom',
     ),
-    'e5339c43' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-uri',
-    ),
     'e5822781' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/webroot/rsrc/js/application/repository/repository-crossreference.js b/webroot/rsrc/js/application/repository/repository-crossreference.js
index bfb849c759..138ce4bf3e 100644
--- a/webroot/rsrc/js/application/repository/repository-crossreference.js
+++ b/webroot/rsrc/js/application/repository/repository-crossreference.js
@@ -46,8 +46,19 @@ JX.behavior('repository-crossreference', function(config, statics) {
         if (!isSignalkey(e)) {
           return;
         }
+
+        var target = e.getTarget();
+
+        try {
+          // If we're in an inline comment, don't link symbols.
+          if (JX.DOM.findAbove(target, 'div', 'differential-inline-comment')) {
+            return;
+          }
+        } catch (ex) {
+          // Continue if we're not inside an inline comment.
+        }
+
         if (e.getType() === 'mouseover') {
-          var target = e.getTarget();
           while (target !== document.body) {
             if (JX.DOM.isNode(target, 'span') &&
                (target.className in class_map)) {
@@ -58,7 +69,7 @@ JX.behavior('repository-crossreference', function(config, statics) {
             target = target.parentNode;
           }
         } else if (e.getType() === 'click') {
-          openSearch(e.getTarget(), lang);
+          openSearch(target, lang);
         }
       });
   }

From 6d36eb911309d4741ab26c7f7212b642826752b1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 1 Nov 2017 10:42:27 -0700
Subject: [PATCH 264/865] Denormalize Diff PHIDs onto Revisions

Summary:
Ref T12539. See PHI190. Currently, each Diff has a `revisionID`, but Revisions do not point at the current active diff. To find the active diff for a given revision, we need to issue a separate query.

Furthermore, this query is inefficient for bulk loads: if we have a lot of revisions, we end up querying for all diff IDs for all those revisions first, then selecting the largest ones and querying again to get the actual diff objects. This strategy could likely be optimized but the query is a mess in any case.

In several cases, it's useful to have the active diff PHID without needing to do a second query -- sometimes for convenience, and sometimes for performance.

T12539 is an example of such a case: it would be nice to refine the bucketing logic (which only depends on active diff PHIDs), but it feels bad to make the page heavier to do it.

For now, this is unused. I'll start using it to fix the bucketing issue, and then we can expand it gradually to address other performance/convenience issues.

Test Plan:
  - Ran migrations, inspected database, saw sensible values.
  - Created a new revision, saw a sensible database value.
  - Updated an existing revision, saw database update properly.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12539

Differential Revision: https://secure.phabricator.com/D18756
---
 .../autopatches/20171101.diff.01.active.sql   |  2 ++
 .../autopatches/20171101.diff.02.populate.php | 24 +++++++++++++++++++
 .../editor/DifferentialTransactionEditor.php  |  3 +--
 .../storage/DifferentialRevision.php          |  2 ++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 resources/sql/autopatches/20171101.diff.01.active.sql
 create mode 100644 resources/sql/autopatches/20171101.diff.02.populate.php

diff --git a/resources/sql/autopatches/20171101.diff.01.active.sql b/resources/sql/autopatches/20171101.diff.01.active.sql
new file mode 100644
index 0000000000..aee8c5aa13
--- /dev/null
+++ b/resources/sql/autopatches/20171101.diff.01.active.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_differential.differential_revision
+  ADD activeDiffPHID VARBINARY(64) NOT NULL;
diff --git a/resources/sql/autopatches/20171101.diff.02.populate.php b/resources/sql/autopatches/20171101.diff.02.populate.php
new file mode 100644
index 0000000000..b41b0aa51d
--- /dev/null
+++ b/resources/sql/autopatches/20171101.diff.02.populate.php
@@ -0,0 +1,24 @@
+<?php
+
+$table = new DifferentialRevision();
+$conn = $table->establishConnection('w');
+$diff_table = new DifferentialDiff();
+
+foreach (new LiskMigrationIterator($table) as $revision) {
+  $revision_id = $revision->getID();
+
+  $diff_row = queryfx_one(
+    $conn,
+    'SELECT phid FROM %T WHERE revisionID = %d ORDER BY id DESC LIMIT 1',
+    $diff_table->getTableName(),
+    $revision_id);
+
+  if ($diff_row) {
+    queryfx(
+      $conn,
+      'UPDATE %T SET activeDiffPHID = %s WHERE id = %d',
+      $table->getTableName(),
+      $diff_row['phid'],
+      $revision_id);
+  }
+}
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 79a582a43f..3e6cca1edb 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -138,8 +138,7 @@ protected function applyCustomInternalTransaction(
           $object->setRepositoryPHID($diff->getRepositoryPHID());
         }
         $object->attachActiveDiff($diff);
-
-        // TODO: Update the `diffPHID` once we add that.
+        $object->setActiveDiffPHID($diff->getPHID());
         return;
     }
 
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 467e503f6f..61f934f13b 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -35,6 +35,8 @@ final class DifferentialRevision extends DifferentialDAO
   protected $mailKey;
   protected $branchName;
   protected $repositoryPHID;
+  protected $activeDiffPHID;
+
   protected $viewPolicy = PhabricatorPolicies::POLICY_USER;
   protected $editPolicy = PhabricatorPolicies::POLICY_USER;
   protected $properties = array();

From 6ecdadb76a955854875fa25515fba266bb34cfa9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 1 Nov 2017 10:54:23 -0700
Subject: [PATCH 265/865] After "Request Review", move revisions with voided
 "Accepts" into "Ready to Review", not "Waiting on Other Reviewers"

Summary:
Depends on D18756. Fixes T12539. See PHI190. Currently, when this occurs:

  - Alice accepts.
  - Bailey requests review.
  - Alice views her dashboard.

...the revision appears in "Waiting on Other Reviewers" (regardless of whether other reviewers actually exist or not).

Instead, ignore these voided/non-current accepts and let the revisions appear in "Ready to Review", which is more natural.

Test Plan: Went through the steps above. On `master`, saw revision in "Waiting on Other Reviewers". After patch, saw it in "Ready to Review".

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12539

Differential Revision: https://secure.phabricator.com/D18757
---
 ...fferentialRevisionRequiredActionResultBucket.php | 10 +++++++++-
 .../query/DifferentialRevisionResultBucket.php      | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
index f3971f8571..5f5f4008db 100644
--- a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
+++ b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
@@ -123,6 +123,14 @@ private function filterShouldReview(array $phids) {
     $reviewing = array(
       DifferentialReviewerStatus::STATUS_ADDED,
       DifferentialReviewerStatus::STATUS_COMMENTED,
+
+      // If an author has used "Request Review" to put an accepted revision
+      // back into the "Needs Review" state, include "Accepted" reviewers
+      // whose reviews have been voided in the "Should Review" bucket.
+
+      // If we don't do this, they end up in "Waiting on Other Reviewers",
+      // even if there are no other reviewers.
+      DifferentialReviewerStatus::STATUS_ACCEPTED,
     );
     $reviewing = array_fuse($reviewing);
 
@@ -130,7 +138,7 @@ private function filterShouldReview(array $phids) {
 
     $results = array();
     foreach ($objects as $key => $object) {
-      if (!$this->hasReviewersWithStatus($object, $phids, $reviewing)) {
+      if (!$this->hasReviewersWithStatus($object, $phids, $reviewing, false)) {
         continue;
       }
 
diff --git a/src/applications/differential/query/DifferentialRevisionResultBucket.php b/src/applications/differential/query/DifferentialRevisionResultBucket.php
index 54705649eb..a0769ac349 100644
--- a/src/applications/differential/query/DifferentialRevisionResultBucket.php
+++ b/src/applications/differential/query/DifferentialRevisionResultBucket.php
@@ -53,7 +53,8 @@ protected function getRevisionsNotAuthored(array $objects, array $phids) {
   protected function hasReviewersWithStatus(
     DifferentialRevision $revision,
     array $phids,
-    array $statuses) {
+    array $statuses,
+    $current = null) {
 
     foreach ($revision->getReviewers() as $reviewer) {
       $reviewer_phid = $reviewer->getReviewerPHID();
@@ -66,6 +67,16 @@ protected function hasReviewersWithStatus(
         continue;
       }
 
+      if ($current !== null) {
+        if ($status == DifferentialReviewerStatus::STATUS_ACCEPTED) {
+          $diff_phid = $revision->getActiveDiffPHID();
+          $is_current = $reviewer->isAccepted($diff_phid);
+          if ($is_current !== $current) {
+            continue;
+          }
+        }
+      }
+
       return true;
     }
 

From 03d059dd26e27077de6c58847926cfe9d2e6590b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 1 Nov 2017 11:08:19 -0700
Subject: [PATCH 266/865] Don't include resigned reviewers in the Differential
 "To" list

Summary: Ref T12689. See PHI178. This isn't a complete solution (you may still get mailed via packages/projects) but should fix the obvious issue, where "Resigned" reviewers are incorrectly always sent mail directly.

Test Plan: Had Alice resign, interacted as Bailey, no mail to Alice.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12689

Differential Revision: https://secure.phabricator.com/D18758
---
 .../differential/editor/DifferentialTransactionEditor.php     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 3e6cca1edb..26c440e866 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -630,6 +630,10 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
     $phids = array();
     $phids[] = $object->getAuthorPHID();
     foreach ($object->getReviewers() as $reviewer) {
+      if ($reviewer->isResigned()) {
+        continue;
+      }
+
       $phids[] = $reviewer->getReviewerPHID();
     }
     return $phids;

From cb98b60033260998a51821f71add07285fa0d3ef Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 6 Nov 2017 10:25:37 -0800
Subject: [PATCH 267/865] Fill in some straightforward Maniphest transactions
 for `transaction.search`

Summary:
See PHI197. Populates "status" transactions and a few other obvious types where there's no security/performance/payload/formatting issue I can come up with.

The names here are the same as the names for editing with `maniphest.edit`.

Test Plan: Used `transaction.search` to retrieve transactions of all new types.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18761
---
 .../DifferentialRevisionStatusTransaction.php        |  6 +++---
 .../xaction/ManiphestTaskDescriptionTransaction.php  | 10 ++++++++++
 .../xaction/ManiphestTaskOwnerTransaction.php        | 10 ++++++++++
 .../xaction/ManiphestTaskPointsTransaction.php       | 12 ++++++++++++
 .../xaction/ManiphestTaskStatusTransaction.php       | 11 +++++++++++
 .../xaction/ManiphestTaskTitleTransaction.php        | 11 +++++++++++
 6 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
index 615ce38bcf..9c8b3767df 100644
--- a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
@@ -74,10 +74,10 @@ public function getTransactionTypeForConduit($xaction) {
     return 'status';
   }
 
-  public function getFieldValuesForConduit($object, $data) {
+  public function getFieldValuesForConduit($xaction, $data) {
     return array(
-      'old' => $object->getOldValue(),
-      'new' => $object->getNewValue(),
+      'old' => $xaction->getOldValue(),
+      'new' => $xaction->getNewValue(),
     );
   }
 
diff --git a/src/applications/maniphest/xaction/ManiphestTaskDescriptionTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskDescriptionTransaction.php
index 009327ed9b..fec1a87604 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskDescriptionTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskDescriptionTransaction.php
@@ -57,5 +57,15 @@ public function newRemarkupChanges() {
     return $changes;
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'description';
+  }
+
+  public function getFieldValuesForConduit($xaction, $data) {
+    return array(
+      'old' => $xaction->getOldValue(),
+      'new' => $xaction->getNewValue(),
+    );
+  }
 
 }
diff --git a/src/applications/maniphest/xaction/ManiphestTaskOwnerTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskOwnerTransaction.php
index d510fe8fbc..caaf84f542 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskOwnerTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskOwnerTransaction.php
@@ -154,5 +154,15 @@ public function getColor() {
 
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'owner';
+  }
+
+  public function getFieldValuesForConduit($xaction, $data) {
+    return array(
+      'old' => $xaction->getOldValue(),
+      'new' => $xaction->getNewValue(),
+    );
+  }
 
 }
diff --git a/src/applications/maniphest/xaction/ManiphestTaskPointsTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskPointsTransaction.php
index 8953664f27..5a69199874 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskPointsTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskPointsTransaction.php
@@ -107,4 +107,16 @@ private function getValueForPoints($value) {
     return $value;
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'points';
+  }
+
+  public function getFieldValuesForConduit($xaction, $data) {
+    return array(
+      'old' => $xaction->getOldValue(),
+      'new' => $xaction->getNewValue(),
+    );
+  }
+
+
 }
diff --git a/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
index 5e1cd44611..a3780e81b9 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
@@ -229,4 +229,15 @@ public function getColor() {
 
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'status';
+  }
+
+  public function getFieldValuesForConduit($xaction, $data) {
+    return array(
+      'old' => $xaction->getOldValue(),
+      'new' => $xaction->getNewValue(),
+    );
+  }
+
 }
diff --git a/src/applications/maniphest/xaction/ManiphestTaskTitleTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskTitleTransaction.php
index 506817b0fc..e4ec2a132f 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskTitleTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskTitleTransaction.php
@@ -72,4 +72,15 @@ public function validateTransactions($object, array $xactions) {
     return $errors;
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'title';
+  }
+
+  public function getFieldValuesForConduit($xaction, $data) {
+    return array(
+      'old' => $xaction->getOldValue(),
+      'new' => $xaction->getNewValue(),
+    );
+  }
+
 }

From cc865e549bcddb68544c6ae7415c4e19a7db095d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 6 Nov 2017 10:38:43 -0800
Subject: [PATCH 268/865] Provide revision parent/child edges in `edge.search`,
 and more information in `differential.revision.search`

Summary: See PHI195. This bulks out these API methods since all the requests are pretty straightforward.

Test Plan: Ran `edge.search` and `differential.revision.search`.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18762
---
 ...entialRevisionDependedOnByRevisionEdgeType.php | 14 ++++++++++++++
 ...ferentialRevisionDependsOnRevisionEdgeType.php | 13 +++++++++++++
 .../differential/storage/DifferentialRevision.php | 15 +++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php b/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php
index 02a24effcf..a6940b536e 100644
--- a/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php
+++ b/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php
@@ -13,6 +13,20 @@ public function shouldWriteInverseTransactions() {
     return true;
   }
 
+  public function getConduitKey() {
+    return 'revision.child';
+  }
+
+  public function getConduitName() {
+    return pht('Revision Has Child');
+  }
+
+  public function getConduitDescription() {
+    return pht(
+      'The source revision makes changes required by the destination '.
+      'revision.');
+  }
+
   public function getTransactionAddString(
     $actor,
     $add_count,
diff --git a/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php b/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php
index 4613ad8a34..e826f554c6 100644
--- a/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php
+++ b/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php
@@ -17,6 +17,19 @@ public function shouldPreventCycles() {
     return true;
   }
 
+  public function getConduitKey() {
+    return 'revision.parent';
+  }
+
+  public function getConduitName() {
+    return pht('Revision Has Parent');
+  }
+
+  public function getConduitDescription() {
+    return pht(
+      'The source revision depends on changes in the destination revision.');
+  }
+
   public function getTransactionAddString(
     $actor,
     $add_count,
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 61f934f13b..bf4bec0abc 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -986,6 +986,18 @@ public function getFieldSpecificationsForConduit() {
         ->setKey('status')
         ->setType('map<string, wild>')
         ->setDescription(pht('Information about revision status.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('repositoryPHID')
+        ->setType('phid?')
+        ->setDescription(pht('Revision repository PHID.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('diffPHID')
+        ->setType('phid')
+        ->setDescription(pht('Active diff PHID.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('summary')
+        ->setType('string')
+        ->setDescription(pht('Revision summary.')),
     );
   }
 
@@ -1002,6 +1014,9 @@ public function getFieldValuesForConduit() {
       'title' => $this->getTitle(),
       'authorPHID' => $this->getAuthorPHID(),
       'status' => $status_info,
+      'repositoryPHID' => $this->getRepositoryPHID(),
+      'diffPHID' => $this->getActiveDiffPHID(),
+      'summary' => $this->getSummary(),
     );
   }
 

From 587faa6f677c8d7e914051e5307ade00e2bf43b0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 6 Nov 2017 10:53:14 -0800
Subject: [PATCH 269/865] Remove some defunct old-style transaction policy
 checks

Summary:
Ref PHI193. This method of enforcing policy checks is now (mostly) obsolete, and they're generally checked at the Controller/API level instead.

Notably, this method does not call `adjustObjectForPolicyChecks(...)` properly, so it can not handle special cases like "creating a project and taking its newly created members into account" for object policies like "Project Members".

Just remove these checks, which are redundant with checks elsewhere.

Test Plan:
  - Set Project application default edit policy to "Administrators and Project Members".
  - Tried to create a project as a non-administrator, adding myself.
  - Before patch: policy fatal on a VOID object (the project with no PHID generated yet).
  - After patch: object created properly. Got a sensible policy error if I didn't include myself as a member.
  - Also verified that other edit rules are still enforced/respected (I can't edit stuff I shouldn't be able to edit).
  - There's at least a bit of unit test coverage of this, too, which I updated to work via API (which hits the new broad capability checks) instead of via low-level transactions (which enforce only a subset of policy operations now).

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18763
---
 .../PhabricatorProjectCoreTestCase.php        | 20 ++++++++++++-------
 .../PhabricatorProjectTransactionEditor.php   | 10 ----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php b/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php
index d9356357b3..f34f224521 100644
--- a/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php
+++ b/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php
@@ -146,8 +146,7 @@ public function testEditProject() {
     $user = $this->createUser();
     $user->save();
 
-    $user2 = $this->createUser();
-    $user2->save();
+    $user->setAllowInlineCacheGeneration(true);
 
     $proj = $this->createProject($user);
 
@@ -1289,12 +1288,19 @@ private function attemptProjectEdit(
 
     $new_name = $proj->getName().' '.mt_rand();
 
-    $xaction = new PhabricatorProjectTransaction();
-    $xaction->setTransactionType(
-      PhabricatorProjectNameTransaction::TRANSACTIONTYPE);
-    $xaction->setNewValue($new_name);
+    $params = array(
+      'objectIdentifier' => $proj->getID(),
+      'transactions' => array(
+        array(
+          'type' => 'name',
+          'value' => $new_name,
+        ),
+      ),
+    );
 
-    $this->applyTransactions($proj, $user, array($xaction));
+    id(new ConduitCall('project.edit', $params))
+      ->setUser($user)
+      ->execute();
 
     return true;
   }
diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
index adf4a3138b..2764ce6322 100644
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -120,16 +120,6 @@ protected function requireCapabilities(
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
-      case PhabricatorProjectNameTransaction::TRANSACTIONTYPE:
-      case PhabricatorProjectStatusTransaction::TRANSACTIONTYPE:
-      case PhabricatorProjectImageTransaction::TRANSACTIONTYPE:
-      case PhabricatorProjectIconTransaction::TRANSACTIONTYPE:
-      case PhabricatorProjectColorTransaction::TRANSACTIONTYPE:
-        PhabricatorPolicyFilter::requireCapability(
-          $this->requireActor(),
-          $object,
-          PhabricatorPolicyCapability::CAN_EDIT);
-        return;
       case PhabricatorProjectLockTransaction::TRANSACTIONTYPE:
         PhabricatorPolicyFilter::requireCapability(
           $this->requireActor(),

From 12e6106a5907c5160dfca8b997e7b6796d707260 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 6 Nov 2017 11:51:59 -0800
Subject: [PATCH 270/865] Refine bucketing and display rules for voided
 "Accepts" in Differential

Summary:
See PHI190. This clarifies the ruleset a bit:

  - If you accepted, then the author used "Request Review" explicitly, we now show "Accepted Earlier" instead of "Accepted" in the "Reviewers" list on the main revision page. This makes it sligthly more clear why the revision is back in your review queue without picking through the transaction log.
  - Instead of moving all non-current accepts into "Ready to Review", move only voided accepts into "Ready to Review". This stops us from pulling older accepts which haven't been voided (which could have been incorrectly pulled) and correctly pulls older, voided accepts from before an update (for example: accept, then request review, then update) and generally aligns better with intent/expectation.

Test Plan:
  - Accepted, requested review.
  - Saw reviewer as "Accepted Earlier".
  - Saw review in "Ready to Review" bucket.
  - Accepted, updated (with sticky accept).
  - Saw reviewer as "Accepted Prior Diff".
  - Saw review as "Waiting on Authors".

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18764
---
 .../DifferentialRevisionRequiredActionResultBucket.php |  2 +-
 .../query/DifferentialRevisionResultBucket.php         |  9 ++++-----
 .../differential/view/DifferentialReviewersView.php    | 10 ++++++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
index 5f5f4008db..711f70afb3 100644
--- a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
+++ b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
@@ -138,7 +138,7 @@ private function filterShouldReview(array $phids) {
 
     $results = array();
     foreach ($objects as $key => $object) {
-      if (!$this->hasReviewersWithStatus($object, $phids, $reviewing, false)) {
+      if (!$this->hasReviewersWithStatus($object, $phids, $reviewing, true)) {
         continue;
       }
 
diff --git a/src/applications/differential/query/DifferentialRevisionResultBucket.php b/src/applications/differential/query/DifferentialRevisionResultBucket.php
index a0769ac349..c5cc5c0e6c 100644
--- a/src/applications/differential/query/DifferentialRevisionResultBucket.php
+++ b/src/applications/differential/query/DifferentialRevisionResultBucket.php
@@ -54,7 +54,7 @@ protected function hasReviewersWithStatus(
     DifferentialRevision $revision,
     array $phids,
     array $statuses,
-    $current = null) {
+    $include_voided = null) {
 
     foreach ($revision->getReviewers() as $reviewer) {
       $reviewer_phid = $reviewer->getReviewerPHID();
@@ -67,11 +67,10 @@ protected function hasReviewersWithStatus(
         continue;
       }
 
-      if ($current !== null) {
+      if ($include_voided !== null) {
         if ($status == DifferentialReviewerStatus::STATUS_ACCEPTED) {
-          $diff_phid = $revision->getActiveDiffPHID();
-          $is_current = $reviewer->isAccepted($diff_phid);
-          if ($is_current !== $current) {
+          $is_voided = (bool)$reviewer->getVoidedPHID();
+          if ($is_voided !== $include_voided) {
             continue;
           }
         }
diff --git a/src/applications/differential/view/DifferentialReviewersView.php b/src/applications/differential/view/DifferentialReviewersView.php
index 33aad25289..f88669e539 100644
--- a/src/applications/differential/view/DifferentialReviewersView.php
+++ b/src/applications/differential/view/DifferentialReviewersView.php
@@ -47,6 +47,7 @@ public function render() {
 
       $action_phid = $reviewer->getLastActionDiffPHID();
       $is_current_action = $this->isCurrent($action_phid);
+      $is_voided = (bool)$reviewer->getVoidedPHID();
 
       $comment_phid = $reviewer->getLastCommentDiffPHID();
       $is_current_comment = $this->isCurrent($comment_phid);
@@ -86,7 +87,7 @@ public function render() {
           break;
 
         case DifferentialReviewerStatus::STATUS_ACCEPTED:
-          if ($is_current_action) {
+          if ($is_current_action && !$is_voided) {
             $icon = PHUIStatusItemView::ICON_ACCEPT;
             $color = 'green';
             if ($authority_name !== null) {
@@ -97,7 +98,12 @@ public function render() {
           } else {
             $icon = 'fa-check-circle-o';
             $color = 'bluegrey';
-            if ($authority_name !== null) {
+
+            if (!$is_current_action && $is_voided) {
+              // The reviewer accepted the revision, but later the author
+              // used "Request Review" to request an updated review.
+              $label = pht('Accepted Earlier');
+            } else if ($authority_name !== null) {
               $label = pht('Accepted Prior Diff (by %s)', $authority_name);
             } else {
               $label = pht('Accepted Prior Diff');

From 759c757264c84b35abe603026a29191a2ddf3def Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 7 Nov 2017 05:12:11 -0800
Subject: [PATCH 271/865] Include "Draft" revisions in Differential legacy
 status queries

Summary:
See PHI199. Ref T2543. When you run a RevisionQuery with a legacy status constraint (via `differential.query`), we currently don't match "Draft" revisions.

Use the actual complete map from `DifferentialRevisionStatus` instead of hard coding the status list so "Draft" is included.

Test Plan:
  - Ran `differential.query` with `ids` and `status` for a draft revision.
  - Before patch: revision not returned in results.
  - After patch: revision returned in results.

(Note that it returns as "Needs Review", for compatibility.)

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18765
---
 .../constants/DifferentialLegacyQuery.php            | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/applications/differential/constants/DifferentialLegacyQuery.php b/src/applications/differential/constants/DifferentialLegacyQuery.php
index 26d2c4aee2..ff7944afe9 100644
--- a/src/applications/differential/constants/DifferentialLegacyQuery.php
+++ b/src/applications/differential/constants/DifferentialLegacyQuery.php
@@ -32,14 +32,7 @@ public static function getModernValues($status) {
   }
 
   private static function getMap() {
-    $all = array(
-      DifferentialRevisionStatus::NEEDS_REVIEW,
-      DifferentialRevisionStatus::NEEDS_REVISION,
-      DifferentialRevisionStatus::CHANGES_PLANNED,
-      DifferentialRevisionStatus::ACCEPTED,
-      DifferentialRevisionStatus::PUBLISHED,
-      DifferentialRevisionStatus::ABANDONED,
-    );
+    $all = array_keys(DifferentialRevisionStatus::getAll());
 
     $open = array();
     $closed = array();
@@ -61,6 +54,9 @@ private static function getMap() {
       ),
       self::STATUS_NEEDS_REVIEW => array(
         DifferentialRevisionStatus::NEEDS_REVIEW,
+
+        // For legacy callers, "Draft" is treated as "Needs Review".
+        DifferentialRevisionStatus::DRAFT,
       ),
       self::STATUS_NEEDS_REVISION => array(
         DifferentialRevisionStatus::NEEDS_REVISION,

From a7921a4448093d00defa8bd18f35b8c8f8bf3314 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 9 Nov 2017 07:23:40 -0800
Subject: [PATCH 272/865] Filter and reject "--config" and "--debugger" flags
 to Mercurial in any position

Summary:
Ref T13012. These flags can be exploited by attackers to execute code remotely. See T13012 for discussion and context.

Additionally, harden some Mercurial commands where possible (by using additional quoting or embedding arguments in other constructs) so they resist these flags and behave properly when passed arguments with these values.

Test Plan:
  - Added unit tests.
  - Verified "--config" and "--debugger" commands are rejected.
  - Verified more commands now work properly even with branches and files named `--debugger`, although not all of them do.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13012

Differential Revision: https://secure.phabricator.com/D18769
---
 src/__phutil_library_map__.php                |  2 +
 .../DiffusionExistsQueryConduitAPIMethod.php  |  2 +-
 .../DiffusionHistoryQueryConduitAPIMethod.php | 18 +++---
 ...sionMergedCommitsQueryConduitAPIMethod.php |  2 +-
 .../DiffusionSearchQueryConduitAPIMethod.php  |  2 +-
 ...ffusionMercurialFlagInjectionException.php |  3 +
 .../DiffusionMercurialCommandEngine.php       | 21 +++++++
 .../DiffusionCommandEngineTestCase.php        | 56 +++++++++++++++++++
 .../DiffusionMercurialRawDiffQuery.php        |  4 +-
 9 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 src/applications/diffusion/exception/DiffusionMercurialFlagInjectionException.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7180a7ae04..424d72dc72 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -768,6 +768,7 @@
     'DiffusionMercurialBlameQuery' => 'applications/diffusion/query/blame/DiffusionMercurialBlameQuery.php',
     'DiffusionMercurialCommandEngine' => 'applications/diffusion/protocol/DiffusionMercurialCommandEngine.php',
     'DiffusionMercurialFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php',
+    'DiffusionMercurialFlagInjectionException' => 'applications/diffusion/exception/DiffusionMercurialFlagInjectionException.php',
     'DiffusionMercurialRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php',
     'DiffusionMercurialRequest' => 'applications/diffusion/request/DiffusionMercurialRequest.php',
     'DiffusionMercurialResponse' => 'applications/diffusion/response/DiffusionMercurialResponse.php',
@@ -5814,6 +5815,7 @@
     'DiffusionMercurialBlameQuery' => 'DiffusionBlameQuery',
     'DiffusionMercurialCommandEngine' => 'DiffusionCommandEngine',
     'DiffusionMercurialFileContentQuery' => 'DiffusionFileContentQuery',
+    'DiffusionMercurialFlagInjectionException' => 'Exception',
     'DiffusionMercurialRawDiffQuery' => 'DiffusionRawDiffQuery',
     'DiffusionMercurialRequest' => 'DiffusionRequest',
     'DiffusionMercurialResponse' => 'AphrontResponse',
diff --git a/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
index 4280230002..2d4a221171 100644
--- a/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
@@ -47,7 +47,7 @@ protected function getMercurialResult(ConduitAPIRequest $request) {
     $commit = $request->getValue('commit');
     list($err, $stdout) = $repository->execLocalCommand(
       'id --rev %s',
-      $commit);
+      hgsprintf('%s', $commit));
     return !$err;
   }
 
diff --git a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
index 200be8567b..e36c0a124e 100644
--- a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
@@ -123,21 +123,23 @@ protected function getMercurialResult(ConduitAPIRequest $request) {
     // branches).
 
     if (strlen($path)) {
-      $path_arg = csprintf('-- %s', $path);
-      $branch_arg = '';
+      $path_arg = csprintf('%s', $path);
+      $revset_arg = hgsprintf(
+        'reverse(ancestors(%s))',
+        $commit_hash);
     } else {
       $path_arg = '';
-      // NOTE: --branch used to be called --only-branch; use -b for
-      // compatibility.
-      $branch_arg = csprintf('-b %s', $drequest->getBranch());
+      $revset_arg = hgsprintf(
+        'branch(%s) and reverse(ancestors(%s))',
+        $drequest->getBranch(),
+        $commit_hash);
     }
 
     list($stdout) = $repository->execxLocalCommand(
-      'log --debug --template %s --limit %d %C --rev %s %C',
+      'log --debug --template %s --limit %d --rev %s -- %C',
       '{node};{parents}\\n',
       ($offset + $limit), // No '--skip' in Mercurial.
-      $branch_arg,
-      hgsprintf('reverse(ancestors(%s))', $commit_hash),
+      $revset_arg,
       $path_arg);
 
     $stdout = DiffusionMercurialCommandEngine::filterMercurialDebugOutput(
diff --git a/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
index 9d2d6caadc..79587a2e5e 100644
--- a/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
@@ -77,7 +77,7 @@ protected function getMercurialResult(ConduitAPIRequest $request) {
     list($parents) = $repository->execxLocalCommand(
       'parents --template=%s --rev %s',
       '{node}\\n',
-      $commit);
+      hgsprintf('%s', $commit));
     $parents = explode("\n", trim($parents));
 
     if (count($parents) < 2) {
diff --git a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
index 389f931c0f..af973f102d 100644
--- a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
@@ -97,7 +97,7 @@ protected function getMercurialResult(ConduitAPIRequest $request) {
 
     $results = array();
     $future = $repository->getLocalCommandFuture(
-      'grep --rev %s --print0 --line-number %s %s',
+      'grep --rev %s --print0 --line-number -- %s %s',
       hgsprintf('ancestors(%s)', $drequest->getStableCommit()),
       $grep,
       $path);
diff --git a/src/applications/diffusion/exception/DiffusionMercurialFlagInjectionException.php b/src/applications/diffusion/exception/DiffusionMercurialFlagInjectionException.php
new file mode 100644
index 0000000000..e60e735816
--- /dev/null
+++ b/src/applications/diffusion/exception/DiffusionMercurialFlagInjectionException.php
@@ -0,0 +1,3 @@
+<?php
+
+final class DiffusionMercurialFlagInjectionException extends Exception {}
diff --git a/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php b/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php
index 9499b8f5f1..39d89e3e4c 100644
--- a/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionMercurialCommandEngine.php
@@ -11,6 +11,27 @@ protected function canBuildForRepository(
   protected function newFormattedCommand($pattern, array $argv) {
     $args = array();
 
+    // Crudely blacklist commands which look like they may contain command
+    // injection via "--config" or "--debugger". See T13012. To do this, we
+    // print the whole command, parse it using shell rules, then examine each
+    // argument to see if it looks like "--config" or "--debugger".
+
+    $test_command = call_user_func_array(
+      'csprintf',
+      array_merge(array($pattern), $argv));
+    $test_args = id(new PhutilShellLexer())
+      ->splitArguments($test_command);
+
+    foreach ($test_args as $test_arg) {
+      if (preg_match('/^--(config|debugger)/i', $test_arg)) {
+        throw new DiffusionMercurialFlagInjectionException(
+          pht(
+            'Mercurial command appears to contain unsafe injected "--config" '.
+            'or "--debugger": %s',
+            $test_command));
+      }
+    }
+
     // NOTE: Here, and in Git and Subversion, we override the SSH command even
     // if the repository does not use an SSH remote, since our SSH wrapper
     // defuses an attack against older versions of Mercurial, Git and
diff --git a/src/applications/diffusion/protocol/__tests__/DiffusionCommandEngineTestCase.php b/src/applications/diffusion/protocol/__tests__/DiffusionCommandEngineTestCase.php
index 1df3ea3522..50b7d4a5e2 100644
--- a/src/applications/diffusion/protocol/__tests__/DiffusionCommandEngineTestCase.php
+++ b/src/applications/diffusion/protocol/__tests__/DiffusionCommandEngineTestCase.php
@@ -123,6 +123,62 @@ public function testCommandEngine() {
         'argv' => 'xyz',
         'protocol' => 'https',
       ));
+
+    // Test that filtering defenses for "--config" and "--debugger" flag
+    // injections in Mercurial are functional. See T13012.
+
+    $caught = null;
+    try {
+      $this->assertCommandEngineFormat(
+        '',
+        array(),
+        array(
+          'vcs' => $type_hg,
+          'argv' => '--debugger',
+        ));
+    } catch (DiffusionMercurialFlagInjectionException $ex) {
+      $caught = $ex;
+    }
+
+    $this->assertTrue(
+      ($caught instanceof DiffusionMercurialFlagInjectionException),
+      pht('Expected "--debugger" injection in Mercurial to throw.'));
+
+
+    $caught = null;
+    try {
+      $this->assertCommandEngineFormat(
+        '',
+        array(),
+        array(
+          'vcs' => $type_hg,
+          'argv' => '--config=x',
+        ));
+    } catch (DiffusionMercurialFlagInjectionException $ex) {
+      $caught = $ex;
+    }
+
+    $this->assertTrue(
+      ($caught instanceof DiffusionMercurialFlagInjectionException),
+      pht('Expected "--config" injection in Mercurial to throw.'));
+
+    $caught = null;
+    try {
+      $this->assertCommandEngineFormat(
+        '',
+        array(),
+        array(
+          'vcs' => $type_hg,
+          'argv' => (string)csprintf('%s', '--config=x'),
+        ));
+    } catch (DiffusionMercurialFlagInjectionException $ex) {
+      $caught = $ex;
+    }
+
+    $this->assertTrue(
+      ($caught instanceof DiffusionMercurialFlagInjectionException),
+      pht('Expected quoted "--config" injection in Mercurial to throw.'));
+
   }
 
   private function assertCommandEngineFormat(
diff --git a/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
index 39eed01226..9edcbb6380 100644
--- a/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
+++ b/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
@@ -16,14 +16,14 @@ protected function newQueryFuture() {
       // If `$commit` has no parents (usually because it's the first commit
       // in the repository), we want to diff against `null`. This revset will
       // do that for us automatically.
-      $against = '('.$commit.'^ or null)';
+      $against = hgsprintf('(%s^ or null)', $commit);
     }
 
     $future = $repository->getLocalCommandFuture(
       'diff -U %d --git --rev %s --rev %s -- %s',
       $this->getLinesOfContext(),
       $against,
-      $commit,
+      hgsprintf('%s', $commit),
       $path);
 
     return $future;

From 314e7266c3e5b071cb6e916d28c21cb143d6e013 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Nov 2017 12:06:24 -0800
Subject: [PATCH 273/865] Restore "Summary" and "Test Plan" to initial mail for
 non-draft configurations

Summary: See PHI210. Ref T2543. Currently, we don't set this flag if you have prototypes off and don't get any of the new draft stuff, so the mail drops some of the details it is supposed to have.

Test Plan: Disabled prototypes, created a revision, saw summary / test plan in the initial mail.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18771
---
 .../differential/editor/DifferentialTransactionEditor.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 26c440e866..7cea29359f 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1612,6 +1612,13 @@ protected function didApplyTransactions($object, array $xactions) {
 
         $xactions[] = $xaction;
       }
+    } else {
+      // If this revision is being created into some state other than "Draft",
+      // this is the first broadcast and should include sections like "SUMMARY"
+      // and "TEST PLAN".
+      if ($this->getIsNewObject()) {
+        $this->firstBroadcast = true;
+      }
     }
 
     return $xactions;

From c098aec66931720b7de19b8ef628bb6d735c3fab Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Nov 2017 12:06:24 -0800
Subject: [PATCH 274/865] (stable) Restore "Summary" and "Test Plan" to initial
 mail for non-draft configurations

Summary: See PHI210. Ref T2543. Currently, we don't set this flag if you have prototypes off and don't get any of the new draft stuff, so the mail drops some of the details it is supposed to have.

Test Plan: Disabled prototypes, created a revision, saw summary / test plan in the initial mail.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18771
---
 .../differential/editor/DifferentialTransactionEditor.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 26c440e866..7cea29359f 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1612,6 +1612,13 @@ protected function didApplyTransactions($object, array $xactions) {
 
         $xactions[] = $xaction;
       }
+    } else {
+      // If this revision is being created into some state other than "Draft",
+      // this is the first broadcast and should include sections like "SUMMARY"
+      // and "TEST PLAN".
+      if ($this->getIsNewObject()) {
+        $this->firstBroadcast = true;
+      }
     }
 
     return $xactions;

From 95a5b41b0ba2751bccdec0725b84561ba7000d09 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Nov 2017 12:17:31 -0800
Subject: [PATCH 275/865] Allow "arc diff --draft" to create revisions as
 drafts more forcefully

Summary:
Depends on D18771. See PHI206. Currently, `arc diff --draft` only holds revisions in draft mode: it doesn't put them into draft mode if the install isn't configured to use draft mode.

Instead, make it a bit more forceful so that `arc diff --draft` can create into draft mode explicitly even if protoypes are off. This aligns with expection a little more clearly.

Test Plan: Ran `arc diff --draft` with prototypes off, got a revision held in draft mode.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18772
---
 .../xaction/DifferentialRevisionHoldDraftTransaction.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php b/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
index 5bc257ab62..2562f18209 100644
--- a/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
@@ -16,6 +16,15 @@ public function generateNewValue($object, $value) {
 
   public function applyInternalEffects($object, $value) {
     $object->setHoldAsDraft($value);
+
+    // If draft isn't the default state but we're creating a new revision
+    // and holding it as a draft, put it in draft mode. See PHI206.
+    // TODO: This can probably be removed once Draft is the universal default.
+    if ($this->isNewObject()) {
+      if ($object->isNeedsReview()) {
+        $object->setModernRevisionStatus(DifferentialRevisionStatus::DRAFT);
+      }
+    }
   }
 
   public function getTitle() {

From a1f12b4ac7af59216b4a0feb1321542486b8be64 Mon Sep 17 00:00:00 2001
From: Mukunda Modell <mmodell@wikimedia.org>
Date: Tue, 14 Nov 2017 17:03:16 -0600
Subject: [PATCH 276/865] Specify a null behavior for the callsign sort column.

Summary:
Fixes paging on the Diffusion Repository List.

PhabricatorRepositoryQuery needs to specify a behavior for `null` on the OderableColumns definition for the `callsign` column.

See https://phabricator.wikimedia.org/T180457

Test Plan:
1. On an instance with more than 100 repositories
 * some of which are missing a callsign
2. Attempt to sort by callsign.
3. See the sorted results

Previously:

3. Exception: "Column "0" has null value, but does not specify a null behavior."

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18773
---
 src/applications/repository/query/PhabricatorRepositoryQuery.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php
index ffa9fa1b59..035693ff75 100644
--- a/src/applications/repository/query/PhabricatorRepositoryQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php
@@ -425,6 +425,7 @@ public function getOrderableColumns() {
         'type' => 'string',
         'unique' => true,
         'reverse' => true,
+        'null' => 'tail',
       ),
       'name' => array(
         'table' => 'r',

From 3700bcb638def188008839683feecd7b68729173 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 15 Nov 2017 09:21:52 -0800
Subject: [PATCH 277/865] Warn and prevent 1-up/2-up switch in Differential if
 the user is editing an inline

Summary:
See PHI180. Currently, if you begin creating or editing an inline and then swap display modes (for example, with "View Unified"), your edit is lost.

Persisting the editor state is complicated and this is very rare, so just prevent the action and warn the user instead.

Also make the warning persist for a little longer since a few of the messages, including this one, take a couple seconds to read now.

Test Plan:
  - Edited a comment, tried to swap display modes, got a warning.
  - Swapped display modes normally with no comment being edited.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18774
---
 resources/celerity/map.php                    | 14 +++++++-------
 .../view/DifferentialChangesetListView.php    |  3 +++
 .../js/application/diff/DiffChangesetList.js  | 19 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 30c04ffc92..78ae8bd461 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
-    'differential.pkg.js' => 'ae6460e0',
+    'differential.pkg.js' => '500a75c5',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -396,7 +396,7 @@
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => '99abf4cd',
-    'rsrc/js/application/diff/DiffChangesetList.js' => '8f1cd52c',
+    'rsrc/js/application/diff/DiffChangesetList.js' => '3b77efdd',
     'rsrc/js/application/diff/DiffInline.js' => 'e83d28f3',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
@@ -775,7 +775,7 @@
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => '99abf4cd',
-    'phabricator-diff-changeset-list' => '8f1cd52c',
+    'phabricator-diff-changeset-list' => '3b77efdd',
     'phabricator-diff-inline' => 'e83d28f3',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
@@ -1137,6 +1137,10 @@
       'javelin-dom',
       'javelin-magical-init',
     ),
+    '3b77efdd' => array(
+      'javelin-install',
+      'phuix-button-view',
+    ),
     '3cb0b2fc' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1610,10 +1614,6 @@
     '8e1baf68' => array(
       'phui-button-css',
     ),
-    '8f1cd52c' => array(
-      'javelin-install',
-      'phuix-button-view',
-    ),
     '8f29b364' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
index 307d424b0e..59f73b5465 100644
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -301,6 +301,9 @@ public function render() {
 
         'Hide or show all inline comments.' =>
           pht('Hide or show all inline comments.'),
+
+        'Finish editing inline comments before changing display modes.' =>
+          pht('Finish editing inline comments before changing display modes.'),
       ),
     ));
 
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index 3f47f1ed35..ec0270ac12 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -465,7 +465,7 @@ JX.install('DiffChangesetList', {
       new JX.Notification()
         .setContent(message)
         .alterClassName('jx-notification-alert', true)
-        .setDuration(1000)
+        .setDuration(3000)
         .show();
     },
 
@@ -691,6 +691,7 @@ JX.install('DiffChangesetList', {
         'div',
         'differential-changeset');
 
+      var changeset_list = this;
       var changeset = this.getChangesetForNode(node);
 
       var menu = new JX.PHUIXDropdownMenu(button);
@@ -738,6 +739,22 @@ JX.install('DiffChangesetList', {
       var up_item = new JX.PHUIXActionView()
         .setHandler(function(e) {
           if (changeset.isLoaded()) {
+
+            // Don't let the user swap display modes if a comment is being
+            // edited, since they might lose their work. See PHI180.
+            var inlines = changeset.getInlines();
+            for (var ii = 0; ii < inlines.length; ii++) {
+              if (inlines[ii].isEditing()) {
+                changeset_list._warnUser(
+                  pht(
+                    'Finish editing inline comments before changing display ' +
+                    'modes.'));
+                e.prevent();
+                menu.close();
+                return;
+              }
+            }
+
             var renderer = changeset.getRenderer();
             if (renderer == '1up') {
               renderer = '2up';

From bea45e90d3240ac575f70d2ab46aef3d9c9b8634 Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Wed, 15 Nov 2017 11:28:47 -0800
Subject: [PATCH 278/865] Add yaml files to differential.whitespace-matters

Summary: Whitespace has semantic meaning for yaml files, so we shouldn't suppress whitespace-only lines of diff by default.

Test Plan: Edited local config to include yaml files, saw expected whitespace changes.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18775
---
 .../differential/config/PhabricatorDifferentialConfigOptions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
index 7ff886664f..0d00207b43 100644
--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
@@ -86,6 +86,7 @@ public function getOptions() {
         array(
           '/\.py$/',
           '/\.l?hs$/',
+          '/\.ya?ml$/',
         ))
         ->setDescription(
           pht(

From d2cff6a2cf01396f6337edfadd1f7df7cce1277d Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@dropbox.com>
Date: Thu, 16 Nov 2017 00:43:35 -0800
Subject: [PATCH 279/865] Transcode the HTML part of incoming email into UTF-8
 as well

Summary:
D1093 did this for just the text/plain part of incoming
email.  Most text/html parts choose to either use entity encoding
//or// are already UTF-8, thus obviating the need to transcode the
HTML part.  However, this is not always the case, and leads to dropped
messages, by way of:

```
EXCEPTION: (Exception) Failed to JSON encode value (#5: Malformed UTF-8 characters, possibly incorrectly encoded): Dictionary value at key "html" is not valid UTF8, and cannot be JSON encoded: [snip HTML part of message content]```

Generalize the charset transcoding to not apply to just the text/plain part, but
both text/plain and text/html parts.

Test Plan:
Fed in a Windows-1252-encoded text/html part with 0x92
bytes in it; verified that $content only contained valid UTF-8 after
this change.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D18776
---
 scripts/mail/mail_handler.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/mail/mail_handler.php b/scripts/mail/mail_handler.php
index 2ff23adb0f..b76b3910df 100755
--- a/scripts/mail/mail_handler.php
+++ b/scripts/mail/mail_handler.php
@@ -35,16 +35,19 @@
 $parser = new MimeMailParser();
 $parser->setText(file_get_contents('php://stdin'));
 
-$text_body = $parser->getMessageBody('text');
-
-$text_body_headers = $parser->getMessageBodyHeaders('text');
-$content_type = idx($text_body_headers, 'content-type');
-if (
-  !phutil_is_utf8($text_body) &&
-  (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
-   preg_match('/charset=(\S+)/', $content_type, $matches))
-) {
-  $text_body = phutil_utf8_convert($text_body, 'UTF-8', $matches[1]);
+$content = array();
+foreach (array('text', 'html') as $part) {
+  $part_body = $parser->getMessageBody($part);
+  $part_headers = $parser->getMessageBodyHeaders($part);
+  $content_type = idx($part_headers, 'content-type');
+  if (
+    !phutil_is_utf8($part_body) &&
+    (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
+     preg_match('/charset=(\S+)/', $content_type, $matches))
+  ) {
+    $part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
+  }
+  $content[$part] = $part_body;
 }
 
 $headers = $parser->getHeaders();
@@ -57,10 +60,7 @@
 
 $received = new PhabricatorMetaMTAReceivedMail();
 $received->setHeaders($headers);
-$received->setBodies(array(
-  'text' => $text_body,
-  'html' => $parser->getMessageBody('html'),
-));
+$received->setBodies($content);
 
 $attachments = array();
 foreach ($parser->getAttachments() as $attachment) {

From d321cc810aab52be00d75c9dcfa8b9cabd34828e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 22 Nov 2017 06:09:41 -0800
Subject: [PATCH 280/865] Freeze "maniphest.gettasktransactions" and make
 status/priority transactions more consistent

Summary:
Ref T13020. See PHI221.

Freeze legacy method `maniphest.gettasktransactions` in favor of modern method `transaction.search`.

Remove legacy "null on create" behavior from Maniphest status and priority transactions. This behavior is obsolete with EditEngine, and leads to inconsistent transaction sets in the transaction record.

The desired behavior is that transactions which don't do anything (e.g., default value was not changed) don't appear in the transaction log.

Test Plan:
  - Viewed API UI and saw `maniphest.gettasktransactions` marked as "Frozen".
  - Created a new task via web UI (without changing status/priority), queried transactions with `maniphest.gettasktransacitons`/`transaction.search`, no longer saw "null on create" no-op transactions in record.
    - Web UI is unchanged, since these transactions were hidden before and now do not exist.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13020

Differential Revision: https://secure.phabricator.com/D18777
---
 .../ManiphestGetTaskTransactionsConduitAPIMethod.php   | 10 ++++++++++
 .../xaction/ManiphestTaskPriorityTransaction.php       |  9 +++------
 .../xaction/ManiphestTaskStatusTransaction.php         |  3 ---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php b/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
index 8b0d0496cf..357d118bc4 100644
--- a/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
+++ b/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
@@ -21,6 +21,16 @@ protected function defineReturnType() {
     return 'nonempty list<dict<string, wild>>';
   }
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_FROZEN;
+  }
+
+  public function getMethodStatusDescription() {
+    return pht(
+      'This method is frozen and will eventually be deprecated. New code '.
+      'should use "transaction.search" instead.');
+  }
+
   protected function execute(ConduitAPIRequest $request) {
     $results = array();
     $task_ids = $request->getValue('ids');
diff --git a/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
index 2ed7c4e15b..83f38fc659 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
@@ -6,20 +6,17 @@ final class ManiphestTaskPriorityTransaction
   const TRANSACTIONTYPE = 'priority';
 
   public function generateOldValue($object) {
-    if ($this->isNewObject()) {
-      return null;
-    }
-    return $object->getPriority();
+    return (string)$object->getPriority();
   }
 
   public function generateNewValue($object, $value) {
     // `$value` is supposed to be a keyword, but if the priority
     // assigned to a task has been removed from the config,
     // no such keyword will be available. Other edits to the task
-    // should still be allowed, even if the priority is  no longer
+    // should still be allowed, even if the priority is no longer
     // valid, so treat this as a no-op.
     if ($value === ManiphestTaskPriority::UNKNOWN_PRIORITY_KEYWORD) {
-      return $object->getPriority();
+      return (string)$object->getPriority();
     }
 
     return (string)ManiphestTaskPriority::getTaskPriorityFromKeyword($value);
diff --git a/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
index a3780e81b9..dd51a63799 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
@@ -6,9 +6,6 @@ final class ManiphestTaskStatusTransaction
   const TRANSACTIONTYPE = 'status';
 
   public function generateOldValue($object) {
-    if ($this->isNewObject()) {
-      return null;
-    }
     return $object->getStatus();
   }
 

From 1cb0d41367b7a79f0fdaa1be20e348ce5bd8b628 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 22 Nov 2017 07:35:22 -0800
Subject: [PATCH 281/865] Fix inbound mail handling for messages with no HTML
 body part

Summary:
See D18776. See <https://discourse.phabricator-community.org/t/cant-create-maniphest-tasks-by-email/754/2>.

The change in D18776 to improve handling of non-utf8 HTML parts broke handling of mail with //no// HTML parts. Partly, this is because MimeMailParser has a "traditional" PHP-style API where the return type is an exciting surprise.

Test Plan:
  - Sent a text-only message in `Mail.app`.
  - Used "Show Raw" to copy it to `mail.txt`, verifying that the raw message contains ONLY a text body.
  - Ran `cat mail.txt | ./scripts/mail/mail_handler.php --trace --process-duplicates`.
    - Before patch: error about bad `idx()` on a non-array.
    - After patch: clean mail processing.
  - Did the same with a message with both HTML and text bodies to make sure I didn't break anything.

Ideally we'd probably get test coverage on this, but it's been touched roughly once a year since 2013 so it'll probably hold.

Reviewers: amckinley, alexmv

Reviewed By: amckinley, alexmv

Differential Revision: https://secure.phabricator.com/D18778
---
 scripts/mail/mail_handler.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/mail/mail_handler.php b/scripts/mail/mail_handler.php
index b76b3910df..1c3c71f305 100755
--- a/scripts/mail/mail_handler.php
+++ b/scripts/mail/mail_handler.php
@@ -38,15 +38,19 @@
 $content = array();
 foreach (array('text', 'html') as $part) {
   $part_body = $parser->getMessageBody($part);
-  $part_headers = $parser->getMessageBodyHeaders($part);
-  $content_type = idx($part_headers, 'content-type');
-  if (
-    !phutil_is_utf8($part_body) &&
-    (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
-     preg_match('/charset=(\S+)/', $content_type, $matches))
-  ) {
-    $part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
+
+  if (strlen($part_body) && !phutil_is_utf8($part_body)) {
+    $part_headers = $parser->getMessageBodyHeaders($part);
+    if (!is_array($part_headers)) {
+      $part_headers = array();
+    }
+    $content_type = idx($part_headers, 'content-type');
+    if (preg_match('/charset="(.*?)"/', $content_type, $matches) ||
+        preg_match('/charset=(\S+)/', $content_type, $matches)) {
+      $part_body = phutil_utf8_convert($part_body, 'UTF-8', $matches[1]);
+    }
   }
+
   $content[$part] = $part_body;
 }
 

From 2d4a158356ef7fd7931495defe3ef3675f59f333 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 22 Nov 2017 07:52:20 -0800
Subject: [PATCH 282/865] Fix a bad link target in Diffusion content search
 results

Summary: See <https://discourse.phabricator-community.org/t/broken-links-in-diffusion-pattern-search-results-page/757>. This links to the display path, which is incorrect.

Test Plan:
  - In any repository, browsed into a directory.
  - Used pattern search to search for something that hits results.
  - Clicked the title (filename/path) of a result table.
    - Before patch: URL omits path context, 404 or wrong result.
    - After patch: taken to proper page.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18779
---
 .../diffusion/view/DiffusionPatternSearchView.php        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/applications/diffusion/view/DiffusionPatternSearchView.php b/src/applications/diffusion/view/DiffusionPatternSearchView.php
index a679b51400..93ef42d46d 100644
--- a/src/applications/diffusion/view/DiffusionPatternSearchView.php
+++ b/src/applications/diffusion/view/DiffusionPatternSearchView.php
@@ -96,10 +96,11 @@ public function render() {
 
     $path_title = Filesystem::readablePath($this->path, $drequest->getPath());
 
-    $href = $drequest->generateURI(array(
-      'action' => 'browse',
-      'path' => $path_title,
-    ));
+    $href = $drequest->generateURI(
+      array(
+        'action' => 'browse',
+        'path' => $this->path,
+      ));
 
     $title = phutil_tag('a', array('href' => $href), $path_title);
 

From 2c72c2b924ffa3f8a49dbec636a2cdca3bae004f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 22 Nov 2017 09:21:37 -0800
Subject: [PATCH 283/865] Add basic support for OpenGraph header tags for
 public installs

Summary: Ref T13018. This is easy to get working roughly, at least, and seems reasonable.

Test Plan: Viewed page source, saw tags. Custom header logo still worked. Pretty hard to debug against a local install since Disqus / debugger tools can't hit it, but I'll see what it looks like in production and tweak it if I got anything horribly wrong.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13018

Differential Revision: https://secure.phabricator.com/D18780
---
 .../PhabricatorCustomLogoConfigType.php       | 33 +++++++++++++
 src/view/page/PhabricatorStandardPageView.php | 46 ++++++++++++++++++-
 .../page/menu/PhabricatorMainMenuView.php     | 34 +++-----------
 3 files changed, 84 insertions(+), 29 deletions(-)

diff --git a/src/applications/config/custom/PhabricatorCustomLogoConfigType.php b/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
index ff29050602..cf4dfda2b5 100644
--- a/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
+++ b/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
@@ -13,6 +13,39 @@ public static function getLogoWordmark() {
     return idx($logo, 'wordmarkText');
   }
 
+  public static function getLogoURI(PhabricatorUser $viewer) {
+    $logo_uri = null;
+
+    $custom_header = self::getLogoImagePHID();
+    if ($custom_header) {
+      $cache = PhabricatorCaches::getImmutableCache();
+      $cache_key_logo = 'ui.custom-header.logo-phid.v3.'.$custom_header;
+      $logo_uri = $cache->getKey($cache_key_logo);
+
+      if (!$logo_uri) {
+        // NOTE: If the file policy has been changed to be restrictive, we'll
+        // miss here and just show the default logo. The cache will fill later
+        // when someone who can see the file loads the page. This might be a
+        // little spooky, see T11982.
+        $files = id(new PhabricatorFileQuery())
+          ->setViewer($viewer)
+          ->withPHIDs(array($custom_header))
+          ->execute();
+        $file = head($files);
+        if ($file) {
+          $logo_uri = $file->getViewURI();
+          $cache->setKey($cache_key_logo, $logo_uri);
+        }
+      }
+    }
+
+    if (!$logo_uri) {
+      $logo_uri = celerity_get_resource_uri('/rsrc/image/logo/light-eye.png');
+    }
+
+    return $logo_uri;
+  }
+
   public function validateOption(PhabricatorConfigOption $option, $value) {
     if (!is_array($value)) {
       throw new Exception(
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 78ff716a44..d2b4d0d2c2 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -426,10 +426,11 @@ protected function getHead() {
     }
 
     return hsprintf(
-      '%s%s%s',
+      '%s%s%s%s',
       parent::getHead(),
       $font_css,
-      $response->renderSingleResource('javelin-magical-init', 'phabricator'));
+      $response->renderSingleResource('javelin-magical-init', 'phabricator'),
+      $this->newOpenGraphTags());
   }
 
   public function setGlyph($glyph) {
@@ -911,4 +912,45 @@ public function produceAphrontResponse() {
     return $response;
   }
 
+  private function newOpenGraphTags() {
+    // If we don't allow public access, there's no point in emitting OpenGraph
+    // tags because external systems can't fetch pages.
+    if (!PhabricatorEnv::getEnvConfig('policy.allow-public')) {
+      return array();
+    }
+
+    $viewer = $this->getViewer();
+
+    $properties = array(
+      array(
+        'og:title',
+        $this->getTitle(),
+      ),
+      array(
+        'og:type',
+        'website',
+      ),
+      array(
+        'og:url',
+        PhabricatorEnv::getProductionURI($this->getRequest()->getRequestURI()),
+      ),
+      array(
+        'og:image',
+        PhabricatorCustomLogoConfigType::getLogoURI($viewer),
+      ),
+    );
+
+    $tags = array();
+    foreach ($properties as $property) {
+      $tags[] = phutil_tag(
+        'meta',
+        array(
+          'property' => $property[0],
+          'content' => $property[1],
+        ));
+    }
+
+    return $tags;
+  }
+
 }
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index f9e4032d87..2e5b5614ec 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -262,35 +262,16 @@ private function renderPhabricatorSearchMenu() {
   }
 
   private function renderPhabricatorLogo() {
-    $custom_header = PhabricatorCustomLogoConfigType::getLogoImagePHID();
-
     $logo_style = array();
+
+    $custom_header = PhabricatorCustomLogoConfigType::getLogoImagePHID();
     if ($custom_header) {
-      $cache = PhabricatorCaches::getImmutableCache();
-      $cache_key_logo = 'ui.custom-header.logo-phid.v3.'.$custom_header;
-
-      $logo_uri = $cache->getKey($cache_key_logo);
-      if (!$logo_uri) {
-        // NOTE: If the file policy has been changed to be restrictive, we'll
-        // miss here and just show the default logo. The cache will fill later
-        // when someone who can see the file loads the page. This might be a
-        // little spooky, see T11982.
-        $files = id(new PhabricatorFileQuery())
-          ->setViewer($this->getViewer())
-          ->withPHIDs(array($custom_header))
-          ->execute();
-        $file = head($files);
-        if ($file) {
-          $logo_uri = $file->getViewURI();
-          $cache->setKey($cache_key_logo, $logo_uri);
-        }
-      }
+      $viewer = $this->getViewer();
+      $logo_uri = PhabricatorCustomLogoConfigType::getLogoURI($viewer);
 
-      if ($logo_uri) {
-        $logo_style[] = 'background-size: 40px 40px;';
-        $logo_style[] = 'background-position: 0 0;';
-        $logo_style[] = 'background-image: url('http://github.com/.$logo_uri.')';
-      }
+      $logo_style[] = 'background-size: 40px 40px;';
+      $logo_style[] = 'background-position: 0 0;';
+      $logo_style[] = 'background-image: url('http://github.com/.$logo_uri.')';
     }
 
     $logo_node = phutil_tag(
@@ -300,7 +281,6 @@ private function renderPhabricatorLogo() {
         'style' => implode(' ', $logo_style),
       ));
 
-
     $wordmark_text = PhabricatorCustomLogoConfigType::getLogoWordmark();
     if (!strlen($wordmark_text)) {
       $wordmark_text = pht('Phabricator');

From c3d6c4b0ee8efed2ea20d4ece90b012ea19b7f00 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 22 Nov 2017 11:25:51 -0800
Subject: [PATCH 284/865] Include OpenGraph prefix material in <html> tag if
 OpenGraph is enabled

Summary: Ref T13018. Discourse doesn't seem to be picking this up yet (see <https://discourse.phabricator-community.org/t/opengraph-test-topic/762>) so maybe it really needs this meta-meta-XML stuff?

Test Plan: Will push.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13018

Differential Revision: https://secure.phabricator.com/D18781
---
 resources/celerity/map.php                    |   1 +
 src/view/page/AphrontPageView.php             |   9 ++++++++-
 src/view/page/PhabricatorStandardPageView.php |   2 +-
 webroot/rsrc/favicons/opengraph-144x144.png   | Bin 0 -> 13270 bytes
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 webroot/rsrc/favicons/opengraph-144x144.png

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 78ae8bd461..45da85c7f1 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -292,6 +292,7 @@
     'rsrc/favicons/mstile-310x150.png' => '4a49d3ee',
     'rsrc/favicons/mstile-310x310.png' => 'a52ab264',
     'rsrc/favicons/mstile-70x70.png' => '5edce7b8',
+    'rsrc/favicons/opengraph-144x144.png' => '648fb0fc',
     'rsrc/image/BFCFDA.png' => 'd5ec91f4',
     'rsrc/image/actions/edit.png' => '2fc41442',
     'rsrc/image/avatar.png' => '17d346a4',
diff --git a/src/view/page/AphrontPageView.php b/src/view/page/AphrontPageView.php
index 8f3704dca2..bea516a8cf 100644
--- a/src/view/page/AphrontPageView.php
+++ b/src/view/page/AphrontPageView.php
@@ -59,9 +59,15 @@ public function render() {
       ),
       array($body, $tail));
 
+    if (PhabricatorEnv::getEnvConfig('policy.allow-public')) {
+      $html_open_tag = hsprintf('<html prefix="og: http://ogp.me/ns#">');
+    } else {
+      $html_open_tag = hsprintf('<html>');
+    }
+
     $response = hsprintf(
       '<!DOCTYPE html>'.
-      '<html>'.
+      '%s'.
         '<head>'.
           '<meta charset="UTF-8" />'.
           '<title>%s</title>'.
@@ -69,6 +75,7 @@ public function render() {
         '</head>'.
         '%s'.
       '</html>',
+      $html_open_tag,
       $title,
       $head,
       $body);
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index d2b4d0d2c2..b4e706ab0b 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -936,7 +936,7 @@ private function newOpenGraphTags() {
       ),
       array(
         'og:image',
-        PhabricatorCustomLogoConfigType::getLogoURI($viewer),
+        celerity_get_resource_uri('rsrc/favicons/opengraph-144x144.png'),
       ),
     );
 
diff --git a/webroot/rsrc/favicons/opengraph-144x144.png b/webroot/rsrc/favicons/opengraph-144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..92f2114b205565d9029e10ede56cdf23827ee1e4
GIT binary patch
literal 13270
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
bFYpXZa^goDzqnxc>i`sG)nqEAOuzjf>K7hx

literal 0
HcmV?d00001


From 49b57eae7df52c189aef1d973823c697fc97fd4b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 22 Nov 2017 14:27:28 -0800
Subject: [PATCH 285/865] Revert partial/nonfunctional OpenGraph support

Summary:
Ref T13018. See that task and the Discourse thread for discussion.

This doesn't work as-is and we need to `og:description` everything to make it work. I don't want to sink any more time into this so just back all the changes out for now.

(The `<html>` change is unnecessary anyway.)

Test Plan: Strict revert.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13018

Differential Revision: https://secure.phabricator.com/D18782
---
 resources/celerity/map.php                    |   1 -
 .../PhabricatorCustomLogoConfigType.php       |  33 -------------
 src/view/page/AphrontPageView.php             |   9 +---
 src/view/page/PhabricatorStandardPageView.php |  46 +-----------------
 .../page/menu/PhabricatorMainMenuView.php     |  34 ++++++++++---
 webroot/rsrc/favicons/opengraph-144x144.png   | Bin 13270 -> 0 bytes
 6 files changed, 30 insertions(+), 93 deletions(-)
 delete mode 100644 webroot/rsrc/favicons/opengraph-144x144.png

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 45da85c7f1..78ae8bd461 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -292,7 +292,6 @@
     'rsrc/favicons/mstile-310x150.png' => '4a49d3ee',
     'rsrc/favicons/mstile-310x310.png' => 'a52ab264',
     'rsrc/favicons/mstile-70x70.png' => '5edce7b8',
-    'rsrc/favicons/opengraph-144x144.png' => '648fb0fc',
     'rsrc/image/BFCFDA.png' => 'd5ec91f4',
     'rsrc/image/actions/edit.png' => '2fc41442',
     'rsrc/image/avatar.png' => '17d346a4',
diff --git a/src/applications/config/custom/PhabricatorCustomLogoConfigType.php b/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
index cf4dfda2b5..ff29050602 100644
--- a/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
+++ b/src/applications/config/custom/PhabricatorCustomLogoConfigType.php
@@ -13,39 +13,6 @@ public static function getLogoWordmark() {
     return idx($logo, 'wordmarkText');
   }
 
-  public static function getLogoURI(PhabricatorUser $viewer) {
-    $logo_uri = null;
-
-    $custom_header = self::getLogoImagePHID();
-    if ($custom_header) {
-      $cache = PhabricatorCaches::getImmutableCache();
-      $cache_key_logo = 'ui.custom-header.logo-phid.v3.'.$custom_header;
-      $logo_uri = $cache->getKey($cache_key_logo);
-
-      if (!$logo_uri) {
-        // NOTE: If the file policy has been changed to be restrictive, we'll
-        // miss here and just show the default logo. The cache will fill later
-        // when someone who can see the file loads the page. This might be a
-        // little spooky, see T11982.
-        $files = id(new PhabricatorFileQuery())
-          ->setViewer($viewer)
-          ->withPHIDs(array($custom_header))
-          ->execute();
-        $file = head($files);
-        if ($file) {
-          $logo_uri = $file->getViewURI();
-          $cache->setKey($cache_key_logo, $logo_uri);
-        }
-      }
-    }
-
-    if (!$logo_uri) {
-      $logo_uri = celerity_get_resource_uri('/rsrc/image/logo/light-eye.png');
-    }
-
-    return $logo_uri;
-  }
-
   public function validateOption(PhabricatorConfigOption $option, $value) {
     if (!is_array($value)) {
       throw new Exception(
diff --git a/src/view/page/AphrontPageView.php b/src/view/page/AphrontPageView.php
index bea516a8cf..8f3704dca2 100644
--- a/src/view/page/AphrontPageView.php
+++ b/src/view/page/AphrontPageView.php
@@ -59,15 +59,9 @@ public function render() {
       ),
       array($body, $tail));
 
-    if (PhabricatorEnv::getEnvConfig('policy.allow-public')) {
-      $html_open_tag = hsprintf('<html prefix="og: http://ogp.me/ns#">');
-    } else {
-      $html_open_tag = hsprintf('<html>');
-    }
-
     $response = hsprintf(
       '<!DOCTYPE html>'.
-      '%s'.
+      '<html>'.
         '<head>'.
           '<meta charset="UTF-8" />'.
           '<title>%s</title>'.
@@ -75,7 +69,6 @@ public function render() {
         '</head>'.
         '%s'.
       '</html>',
-      $html_open_tag,
       $title,
       $head,
       $body);
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index b4e706ab0b..78ff716a44 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -426,11 +426,10 @@ protected function getHead() {
     }
 
     return hsprintf(
-      '%s%s%s%s',
+      '%s%s%s',
       parent::getHead(),
       $font_css,
-      $response->renderSingleResource('javelin-magical-init', 'phabricator'),
-      $this->newOpenGraphTags());
+      $response->renderSingleResource('javelin-magical-init', 'phabricator'));
   }
 
   public function setGlyph($glyph) {
@@ -912,45 +911,4 @@ public function produceAphrontResponse() {
     return $response;
   }
 
-  private function newOpenGraphTags() {
-    // If we don't allow public access, there's no point in emitting OpenGraph
-    // tags because external systems can't fetch pages.
-    if (!PhabricatorEnv::getEnvConfig('policy.allow-public')) {
-      return array();
-    }
-
-    $viewer = $this->getViewer();
-
-    $properties = array(
-      array(
-        'og:title',
-        $this->getTitle(),
-      ),
-      array(
-        'og:type',
-        'website',
-      ),
-      array(
-        'og:url',
-        PhabricatorEnv::getProductionURI($this->getRequest()->getRequestURI()),
-      ),
-      array(
-        'og:image',
-        celerity_get_resource_uri('rsrc/favicons/opengraph-144x144.png'),
-      ),
-    );
-
-    $tags = array();
-    foreach ($properties as $property) {
-      $tags[] = phutil_tag(
-        'meta',
-        array(
-          'property' => $property[0],
-          'content' => $property[1],
-        ));
-    }
-
-    return $tags;
-  }
-
 }
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index 2e5b5614ec..f9e4032d87 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -262,16 +262,35 @@ private function renderPhabricatorSearchMenu() {
   }
 
   private function renderPhabricatorLogo() {
-    $logo_style = array();
-
     $custom_header = PhabricatorCustomLogoConfigType::getLogoImagePHID();
+
+    $logo_style = array();
     if ($custom_header) {
-      $viewer = $this->getViewer();
-      $logo_uri = PhabricatorCustomLogoConfigType::getLogoURI($viewer);
+      $cache = PhabricatorCaches::getImmutableCache();
+      $cache_key_logo = 'ui.custom-header.logo-phid.v3.'.$custom_header;
+
+      $logo_uri = $cache->getKey($cache_key_logo);
+      if (!$logo_uri) {
+        // NOTE: If the file policy has been changed to be restrictive, we'll
+        // miss here and just show the default logo. The cache will fill later
+        // when someone who can see the file loads the page. This might be a
+        // little spooky, see T11982.
+        $files = id(new PhabricatorFileQuery())
+          ->setViewer($this->getViewer())
+          ->withPHIDs(array($custom_header))
+          ->execute();
+        $file = head($files);
+        if ($file) {
+          $logo_uri = $file->getViewURI();
+          $cache->setKey($cache_key_logo, $logo_uri);
+        }
+      }
 
-      $logo_style[] = 'background-size: 40px 40px;';
-      $logo_style[] = 'background-position: 0 0;';
-      $logo_style[] = 'background-image: url('http://github.com/.$logo_uri.')';
+      if ($logo_uri) {
+        $logo_style[] = 'background-size: 40px 40px;';
+        $logo_style[] = 'background-position: 0 0;';
+        $logo_style[] = 'background-image: url('http://github.com/.$logo_uri.')';
+      }
     }
 
     $logo_node = phutil_tag(
@@ -281,6 +300,7 @@ private function renderPhabricatorLogo() {
         'style' => implode(' ', $logo_style),
       ));
 
+
     $wordmark_text = PhabricatorCustomLogoConfigType::getLogoWordmark();
     if (!strlen($wordmark_text)) {
       $wordmark_text = pht('Phabricator');
diff --git a/webroot/rsrc/favicons/opengraph-144x144.png b/webroot/rsrc/favicons/opengraph-144x144.png
deleted file mode 100644
index 92f2114b205565d9029e10ede56cdf23827ee1e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13270
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
bFYpXZa^goDzqnxc>i`sG)nqEAOuzjf>K7hx


From 00baa3c1dd9ba8b38a588c7dd1ca53fe5d666550 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 14:08:40 -0800
Subject: [PATCH 286/865] Hide archived projects only on workboards, not
 hovercards

Summary:
See PHI225. Previously, see D15335 / T10413. On workboards, we hide archived project tags since they aren't terribly useful in that context, at least most of the time. Originally, see T10349#159916 and D15297.

However, hovercards reuse this display logic, and it's inconsistent/confusing to hide them there, since the actual "Tags" elements on task pages show them. Narrow the scope of this rule.

Test Plan:
  - Viewed a hovercard for a task with an archived project tagged, saw archived project.
  - Viewed a workboard for the same task, saw only unarchived projects other than the current board tagged (this behavior is unchanged).

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18783
---
 .../PhabricatorBoardRenderingEngine.php       |  4 +++-
 .../project/view/ProjectBoardTaskCard.php     | 20 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/applications/project/engine/PhabricatorBoardRenderingEngine.php b/src/applications/project/engine/PhabricatorBoardRenderingEngine.php
index ca8b0633da..d76497bc21 100644
--- a/src/applications/project/engine/PhabricatorBoardRenderingEngine.php
+++ b/src/applications/project/engine/PhabricatorBoardRenderingEngine.php
@@ -67,7 +67,9 @@ public function renderCard($phid) {
     $project_phids = $object->getProjectPHIDs();
     $project_handles = array_select_keys($this->handles, $project_phids);
     if ($project_handles) {
-      $card->setProjectHandles($project_handles);
+      $card
+        ->setHideArchivedProjects(true)
+        ->setProjectHandles($project_handles);
     }
 
     $cover_phid = $object->getCoverImageThumbnailPHID();
diff --git a/src/applications/project/view/ProjectBoardTaskCard.php b/src/applications/project/view/ProjectBoardTaskCard.php
index 1a6807ec45..3a7016ca74 100644
--- a/src/applications/project/view/ProjectBoardTaskCard.php
+++ b/src/applications/project/view/ProjectBoardTaskCard.php
@@ -8,6 +8,7 @@ final class ProjectBoardTaskCard extends Phobject {
   private $owner;
   private $canEdit;
   private $coverImageFile;
+  private $hideArchivedProjects;
 
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
@@ -35,6 +36,15 @@ public function getCoverImageFile() {
     return $this->coverImageFile;
   }
 
+  public function setHideArchivedProjects($hide_archived_projects) {
+    $this->hideArchivedProjects = $hide_archived_projects;
+    return $this;
+  }
+
+  public function getHideArchivedProjects() {
+    return $this->hideArchivedProjects;
+  }
+
   public function setTask(ManiphestTask $task) {
     $this->task = $task;
     return $this;
@@ -126,10 +136,12 @@ public function getItem() {
     $project_handles = $this->getProjectHandles();
 
     // Remove any archived projects from the list.
-    if ($project_handles) {
-      foreach ($project_handles as $key => $handle) {
-        if ($handle->getStatus() == PhabricatorObjectHandle::STATUS_CLOSED) {
-          unset($project_handles[$key]);
+    if ($this->hideArchivedProjects) {
+      if ($project_handles) {
+        foreach ($project_handles as $key => $handle) {
+          if ($handle->getStatus() == PhabricatorObjectHandle::STATUS_CLOSED) {
+            unset($project_handles[$key]);
+          }
         }
       }
     }

From 3d742eb50baf54433e41090d1ba9d06277fedebc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 16:10:33 -0800
Subject: [PATCH 287/865] Lightly modernize LegalpadDocumentQuery

Summary: Ref T13024. Updates LegalpadDocumentQuery to use slightly more modern constructions.

Test Plan: Queried for Legalpad documents, got the same results.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024

Differential Revision: https://secure.phabricator.com/D18785
---
 .../legalpad/query/LegalpadDocumentQuery.php  | 71 +++++++++----------
 1 file changed, 33 insertions(+), 38 deletions(-)

diff --git a/src/applications/legalpad/query/LegalpadDocumentQuery.php b/src/applications/legalpad/query/LegalpadDocumentQuery.php
index 655da955e4..3d79e9f3a1 100644
--- a/src/applications/legalpad/query/LegalpadDocumentQuery.php
+++ b/src/applications/legalpad/query/LegalpadDocumentQuery.php
@@ -77,23 +77,12 @@ public function needViewerSignatures($need) {
     return $this;
   }
 
-  protected function loadPage() {
-    $table = new LegalpadDocument();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT d.* FROM %T d %Q %Q %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildJoinClause($conn_r),
-      $this->buildWhereClause($conn_r),
-      $this->buildGroupClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    $documents = $table->loadAllFromArray($data);
+  public function newResultObject() {
+    return new LegalpadDocument();
+  }
 
-    return $documents;
+  protected function loadPage() {
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $documents) {
@@ -134,12 +123,12 @@ protected function willFilterPage(array $documents) {
     return $documents;
   }
 
-  protected function buildJoinClause(AphrontDatabaseConnection $conn_r) {
-    $joins = array();
+  protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
+    $joins = parent::buildJoinClauseParts($conn);
 
     if ($this->contributorPHIDs !== null) {
       $joins[] = qsprintf(
-        $conn_r,
+        $conn,
         'JOIN edge contributor ON contributor.src = d.phid
           AND contributor.type = %d',
         PhabricatorObjectHasContributorEdgeType::EDGECONST);
@@ -147,79 +136,81 @@ protected function buildJoinClause(AphrontDatabaseConnection $conn_r) {
 
     if ($this->signerPHIDs !== null) {
       $joins[] = qsprintf(
-        $conn_r,
+        $conn,
         'JOIN %T signer ON signer.documentPHID = d.phid
           AND signer.signerPHID IN (%Ls)',
         id(new LegalpadDocumentSignature())->getTableName(),
         $this->signerPHIDs);
     }
 
-    return implode(' ', $joins);
+    return $joins;
   }
 
-  protected function buildGroupClause(AphrontDatabaseConnection $conn_r) {
-    if ($this->contributorPHIDs || $this->signerPHIDs) {
-      return 'GROUP BY d.id';
-    } else {
-      return '';
+  protected function shouldGroupQueryResultRows() {
+    if ($this->contributorPHIDs) {
+      return true;
     }
+
+    if ($this->signerPHIDs) {
+      return true;
+    }
+
+    return parent::shouldGroupQueryResultRows();
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'd.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'd.phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->creatorPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'd.creatorPHID IN (%Ls)',
         $this->creatorPHIDs);
     }
 
     if ($this->dateCreatedAfter !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'd.dateCreated >= %d',
         $this->dateCreatedAfter);
     }
 
     if ($this->dateCreatedBefore !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'd.dateCreated <= %d',
         $this->dateCreatedBefore);
     }
 
     if ($this->contributorPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'contributor.dst IN (%Ls)',
         $this->contributorPHIDs);
     }
 
     if ($this->signatureRequired !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'd.requireSignature = %d',
         $this->signatureRequired);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   private function loadDocumentBodies(array $documents) {
@@ -275,4 +266,8 @@ public function getQueryApplicationClass() {
     return 'PhabricatorLegalpadApplication';
   }
 
+  protected function getPrimaryTableAlias() {
+    return 'd';
+  }
+
 }

From 71406ca93bf4dbda8a3e0afd0115ed5e28a6c120 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 16:42:40 -0800
Subject: [PATCH 288/865] Lightly modernize LegalpadDocumentSearchEngine

Summary: Depends on D18785. Ref T13024. While I'm in here, update this a bit to use the newer stuff.

Test Plan: Searched for Legalpad documents, saw more modern support (subscribers, order by, viewer()).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024

Differential Revision: https://secure.phabricator.com/D18786
---
 .../query/LegalpadDocumentSearchEngine.php    | 136 ++++++------------
 1 file changed, 46 insertions(+), 90 deletions(-)

diff --git a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
index 8b218cf821..1b608b02e3 100644
--- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
+++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
@@ -11,105 +11,66 @@ public function getApplicationClassName() {
     return 'PhabricatorLegalpadApplication';
   }
 
-  public function buildSavedQueryFromRequest(AphrontRequest $request) {
-    $saved = new PhabricatorSavedQuery();
-    $saved->setParameter(
-      'creatorPHIDs',
-      $this->readUsersFromRequest($request, 'creators'));
-
-    $saved->setParameter(
-      'contributorPHIDs',
-      $this->readUsersFromRequest($request, 'contributors'));
-
-    $saved->setParameter(
-      'withViewerSignature',
-      $request->getBool('withViewerSignature'));
-
-    $saved->setParameter('createdStart', $request->getStr('createdStart'));
-    $saved->setParameter('createdEnd', $request->getStr('createdEnd'));
+  public function newQuery() {
+    return id(new LegalpadDocumentQuery())
+      ->needViewerSignatures(true);
+  }
 
-    return $saved;
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorUsersSearchField())
+        ->setLabel(pht('Signed By'))
+        ->setKey('signerPHIDs')
+        ->setAliases(array('signer', 'signers', 'signerPHID'))
+        ->setDescription(
+          pht('Search for documents signed by given users.')),
+      id(new PhabricatorUsersSearchField())
+        ->setLabel(pht('Creators'))
+        ->setKey('creatorPHIDs')
+        ->setAliases(array('creator', 'creators', 'creatorPHID'))
+        ->setDescription(
+          pht('Search for documents with given creators.')),
+      id(new PhabricatorUsersSearchField())
+        ->setLabel(pht('Contributors'))
+        ->setKey('contributorPHIDs')
+        ->setAliases(array('contributor', 'contributors', 'contributorPHID'))
+        ->setDescription(
+          pht('Search for documents with given contributors.')),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created After'))
+        ->setKey('createdStart'),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created Before'))
+        ->setKey('createdEnd'),
+    );
   }
 
-  public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
-    $query = id(new LegalpadDocumentQuery())
-      ->needViewerSignatures(true);
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
 
-    $creator_phids = $saved->getParameter('creatorPHIDs', array());
-    if ($creator_phids) {
-      $query->withCreatorPHIDs($creator_phids);
+    if ($map['signerPHIDs']) {
+      $query->withSignerPHIDs($map['signerPHIDs']);
     }
 
-    $contributor_phids = $saved->getParameter('contributorPHIDs', array());
-    if ($contributor_phids) {
-      $query->withContributorPHIDs($contributor_phids);
+    if ($map['contributorPHIDs']) {
+      $query->withContributorPHIDs($map['creatorPHIDs']);
     }
 
-    if ($saved->getParameter('withViewerSignature')) {
-      $viewer_phid = $this->requireViewer()->getPHID();
-      if ($viewer_phid) {
-        $query->withSignerPHIDs(array($viewer_phid));
-      }
+    if ($map['creatorPHIDs']) {
+      $query->withCreatorPHIDs($map['creatorPHIDs']);
     }
 
-    $start = $this->parseDateTime($saved->getParameter('createdStart'));
-    $end = $this->parseDateTime($saved->getParameter('createdEnd'));
-
-    if ($start) {
-      $query->withDateCreatedAfter($start);
+    if ($map['createdStart']) {
+      $query->withDateCreatedAfter($map['createdStart']);
     }
 
-    if ($end) {
-      $query->withDateCreatedBefore($end);
+    if ($map['createdEnd']) {
+      $query->withDateCreatedAfter($map['createdStart']);
     }
 
     return $query;
   }
 
-  public function buildSearchForm(
-    AphrontFormView $form,
-    PhabricatorSavedQuery $saved_query) {
-
-    $creator_phids = $saved_query->getParameter('creatorPHIDs', array());
-    $contributor_phids = $saved_query->getParameter(
-      'contributorPHIDs', array());
-
-    $viewer_signature = $saved_query->getParameter('withViewerSignature');
-    if (!$this->requireViewer()->getPHID()) {
-      $viewer_signature = false;
-    }
-
-    $form
-      ->appendChild(
-        id(new AphrontFormCheckboxControl())
-          ->addCheckbox(
-            'withViewerSignature',
-            1,
-            pht('Show only documents I have signed.'),
-            $viewer_signature)
-          ->setDisabled(!$this->requireViewer()->getPHID()))
-      ->appendControl(
-        id(new AphrontFormTokenizerControl())
-          ->setDatasource(new PhabricatorPeopleDatasource())
-          ->setName('creators')
-          ->setLabel(pht('Creators'))
-          ->setValue($creator_phids))
-      ->appendControl(
-        id(new AphrontFormTokenizerControl())
-          ->setDatasource(new PhabricatorPeopleDatasource())
-          ->setName('contributors')
-          ->setLabel(pht('Contributors'))
-          ->setValue($contributor_phids));
-
-    $this->buildDateRange(
-      $form,
-      $saved_query,
-      'createdStart',
-      pht('Created After'),
-      'createdEnd',
-      pht('Created Before'));
-  }
-
   protected function getURI($path) {
     return '/legalpad/'.$path;
   }
@@ -130,10 +91,11 @@ public function buildSavedQueryFromBuiltin($query_key) {
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
+    $viewer = $this->requireViewer();
+
     switch ($query_key) {
       case 'signed':
-        return $query
-          ->setParameter('withViewerSignature', true);
+        return $query->setParameter('signerPHIDs', array($viewer->getPHID()));
       case 'all':
         return $query;
     }
@@ -141,12 +103,6 @@ public function buildSavedQueryFromBuiltin($query_key) {
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
-  protected function getRequiredHandlePHIDsForResultList(
-    array $documents,
-    PhabricatorSavedQuery $query) {
-    return array();
-  }
-
   protected function renderResultList(
     array $documents,
     PhabricatorSavedQuery $query,

From ba4b9f71849f501fc95a204f16de7db871a3ce5a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 16:10:38 -0800
Subject: [PATCH 289/865] Refactor on-login Legalpad document signature
 requirement

Summary: Depends on D18786. Ref T13024. I'm going to change the order this occurs in, but move it to a separate method and clean it up a little first.

Test Plan: Added a new document as required, reloaded, signed it, got logged into a session.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024

Differential Revision: https://secure.phabricator.com/D18788
---
 .../base/controller/PhabricatorController.php | 112 ++++++++++++------
 1 file changed, 73 insertions(+), 39 deletions(-)

diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index f923eb7b73..961e85effe 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -227,45 +227,9 @@ public function willBeginExecution() {
     }
 
 
-    if (!$this->shouldAllowLegallyNonCompliantUsers()) {
-      $legalpad_class = 'PhabricatorLegalpadApplication';
-      $legalpad = id(new PhabricatorApplicationQuery())
-        ->setViewer($user)
-        ->withClasses(array($legalpad_class))
-        ->withInstalled(true)
-        ->execute();
-      $legalpad = head($legalpad);
-
-      $doc_query = id(new LegalpadDocumentQuery())
-        ->setViewer($user)
-        ->withSignatureRequired(1)
-        ->needViewerSignatures(true);
-
-      if ($user->hasSession() &&
-          !$user->getSession()->getIsPartial() &&
-          !$user->getSession()->getSignedLegalpadDocuments() &&
-          $user->isLoggedIn() &&
-          $legalpad) {
-
-        $sign_docs = $doc_query->execute();
-        $must_sign_docs = array();
-        foreach ($sign_docs as $sign_doc) {
-          if (!$sign_doc->getUserSignature($user->getPHID())) {
-            $must_sign_docs[] = $sign_doc;
-          }
-        }
-        if ($must_sign_docs) {
-          $controller = new LegalpadDocumentSignController();
-          $this->getRequest()->setURIMap(array(
-            'id' => head($must_sign_docs)->getID(),
-          ));
-          $this->setCurrentApplication($legalpad);
-          return $this->delegateToController($controller);
-        } else {
-          $engine = id(new PhabricatorAuthSessionEngine())
-            ->signLegalpadDocuments($user, $sign_docs);
-        }
-      }
+    $result = $this->requireLegalpadSignatures();
+    if ($result !== null) {
+      return $result;
     }
 
     // NOTE: We do this last so that users get a login page instead of a 403
@@ -558,6 +522,76 @@ public function buildApplicationCrumbsForEditEngine() {
     return $this->buildApplicationCrumbs();
   }
 
+  private function requireLegalpadSignatures() {
+    if ($this->shouldAllowLegallyNonCompliantUsers()) {
+      return null;
+    }
+
+    $viewer = $this->getViewer();
+
+    if (!$viewer->hasSession()) {
+      return null;
+    }
+
+    $session = $viewer->getSession();
+    if ($session->getIsPartial()) {
+      // If the user hasn't made it through MFA yet, require they survive
+      // MFA first.
+      return null;
+    }
+
+    if ($session->getSignedLegalpadDocuments()) {
+      return null;
+    }
+
+    if (!$viewer->isLoggedIn()) {
+      return null;
+    }
+
+    $legalpad_class = 'PhabricatorLegalpadApplication';
+    $legalpad_installed = PhabricatorApplication::isClassInstalledForViewer(
+      $legalpad_class,
+      $viewer);
+    if (!$legalpad_installed) {
+      return null;
+    }
+
+    $sign_docs = id(new LegalpadDocumentQuery())
+      ->setViewer($viewer)
+      ->withSignatureRequired(1)
+      ->needViewerSignatures(true)
+      ->execute();
+
+    $must_sign_docs = array();
+    foreach ($sign_docs as $sign_doc) {
+      if (!$sign_doc->getUserSignature($viewer->getPHID())) {
+        $must_sign_docs[] = $sign_doc;
+      }
+    }
+
+    if (!$must_sign_docs) {
+      // If nothing needs to be signed (either because there are no documents
+      // which require a signature, or because the user has already signed
+      // all of them) mark the session as good and continue.
+      $engine = id(new PhabricatorAuthSessionEngine())
+        ->signLegalpadDocuments($viewer, $sign_docs);
+
+      return null;
+    }
+
+    $request = $this->getRequest();
+    $request->setURIMap(
+      array(
+        'id' => head($must_sign_docs)->getID(),
+      ));
+
+    $application = PhabricatorApplication::getByClass($legalpad_class);
+    $this->setCurrentApplication($application);
+
+    $controller = new LegalpadDocumentSignController();
+    return $this->delegateToController($controller);
+  }
+
 
 /* -(  Deprecated  )--------------------------------------------------------- */
 

From e850bc6b957a8ac6c6faa02d57716ce5d60d42f6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 16:54:26 -0800
Subject: [PATCH 290/865] When requiring login signatures, order documents from
 oldest to newest

Summary: Depends on D18788. Ref T13024. Currently, we prompt users to sign from newest to oldest. This seems less intuitive than oldest to newest.

Test Plan: Dumped document order, saw it swap to oldest-first.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024

Differential Revision: https://secure.phabricator.com/D18789
---
 src/applications/base/controller/PhabricatorController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index 961e85effe..fb9c402083 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -560,6 +560,7 @@ private function requireLegalpadSignatures() {
       ->setViewer($viewer)
       ->withSignatureRequired(1)
       ->needViewerSignatures(true)
+      ->setOrder('oldest')
       ->execute();
 
     $must_sign_docs = array();

From c7718d3a2126fe77da17467c933aa6bd95f59779 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 17:02:09 -0800
Subject: [PATCH 291/865] Ask users to sign Legalpad documents before requiring
 they enroll in MFA

Summary:
Depends on D18789. Ref T13024. See PHI223. Currently, if `security.require-multi-factor-auth` and Legalpad "Signature Required" documents are //both// set, it's not possible to survive account registration, since MFA is requiried to sign and signatures are required to add MFA.

Instead, check for signatures before requiring MFA enrollment. This makes logical sense, since it's silly to add MFA if you don't agree to a Terms of Service or whatever.

(Note that if you already have MFA, we prompt for that first, before either of these steps, which also makes sense.)

Test Plan: Configured `security.require-multi-factor-auth`. Added a signature-required document. Loaded a page as a new user. Went through signature workflow, then through the MFA enrollment workflow.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024

Differential Revision: https://secure.phabricator.com/D18790
---
 .../base/controller/PhabricatorController.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index fb9c402083..09aa24a42e 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -160,6 +160,15 @@ public function willBeginExecution() {
       }
     }
 
+    // Require users sign Legalpad documents before we check if they have
+    // MFA. If we don't do this, they can get stuck in a state where they
+    // can't add MFA until they sign, and can't sign until they add MFA.
+    // See T13024 and PHI223.
+    $result = $this->requireLegalpadSignatures();
+    if ($result !== null) {
+      return $result;
+    }
+
     // Check if the user needs to configure MFA.
     $need_mfa = $this->shouldRequireMultiFactorEnrollment();
     $have_mfa = $user->getIsEnrolledInMultiFactor();
@@ -226,12 +235,6 @@ public function willBeginExecution() {
       }
     }
 
-
-    $result = $this->requireLegalpadSignatures();
-    if ($result !== null) {
-      return $result;
-    }
-
     // NOTE: We do this last so that users get a login page instead of a 403
     // if they need to login.
     if ($this->shouldRequireAdmin() && !$user->getIsAdmin()) {
@@ -523,6 +526,10 @@ public function buildApplicationCrumbsForEditEngine() {
   }
 
   private function requireLegalpadSignatures() {
+    if (!$this->shouldRequireLogin()) {
+      return null;
+    }
+
     if ($this->shouldAllowLegallyNonCompliantUsers()) {
       return null;
     }

From ab0f61aa323d3557b6eff806f257a53e2ca5e759 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 17:16:09 -0800
Subject: [PATCH 292/865] Tell users to "Wait Patiently" for admin account
 verification later in the registration process

Summary:
Depends on D18790. Ref T13024. Fixes T8335. Currently, "unapproved" and "disabled" users are bundled together. This prevents users from completing some registration steps (verification, legalpad documents, MFA enrollment) before approval.

Separate approval out and move it to the end so users can do all the required enrollment stuff on their end before we roadblock them.

Test Plan: Required approval, email verification, signatures, and MFA. Registered an account. Verified email, signed documents, enrolled in MFA, and then got prompted to wait for approval.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024, T8335

Differential Revision: https://secure.phabricator.com/D18791
---
 .../PhabricatorAuthNeedsMultiFactorController.php | 12 ++++++++++++
 .../base/controller/PhabricatorController.php     | 15 +++++++++++----
 .../PhabricatorAccessControlTestCase.php          |  6 +++---
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
index f3e2562a1c..d295812d3e 100644
--- a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
+++ b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
@@ -9,9 +9,21 @@ public function shouldRequireMultiFactorEnrollment() {
     return false;
   }
 
+  public function shouldRequireEnabledUser() {
+    // Users who haven't been approved yet are allowed to enroll in MFA. We'll
+    // kick disabled users out later.
+    return false;
+  }
+
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
 
+    if ($viewer->getIsDisabled()) {
+      // We allowed unapproved and disabled users to hit this controller, but
+      // want to kick out disabled users now.
+      return new Aphront400Response();
+    }
+
     $panel = id(new PhabricatorMultiFactorSettingsPanel())
       ->setUser($viewer)
       ->setViewer($viewer)
diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index 09aa24a42e..0fee880378 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -137,10 +137,6 @@ public function willBeginExecution() {
     }
 
     if ($this->shouldRequireEnabledUser()) {
-      if ($user->isLoggedIn() && !$user->getIsApproved()) {
-        $controller = new PhabricatorAuthNeedsApprovalController();
-        return $this->delegateToController($controller);
-      }
       if ($user->getIsDisabled()) {
         $controller = new PhabricatorDisabledUserController();
         return $this->delegateToController($controller);
@@ -233,6 +229,17 @@ public function willBeginExecution() {
           ->withPHIDs(array($application->getPHID()))
           ->executeOne();
       }
+
+      // If users need approval, require they wait here. We do this near the
+      // end so they can take other actions (like verifying email, signing
+      // documents, and enrolling in MFA) while waiting for an admin to take a
+      // look at things. See T13024 for more discussion.
+      if ($this->shouldRequireEnabledUser()) {
+        if ($user->isLoggedIn() && !$user->getIsApproved()) {
+          $controller = new PhabricatorAuthNeedsApprovalController();
+          return $this->delegateToController($controller);
+        }
+      }
     }
 
     // NOTE: We do this last so that users get a login page instead of a 403
diff --git a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
index b6c268d88c..98fa948722 100644
--- a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
+++ b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
@@ -159,10 +159,10 @@ public function testControllerAccessControls() {
         $u_unverified,
         $u_admin,
         $u_public,
+        $u_notapproved,
       ),
       array(
         $u_disabled,
-        $u_notapproved,
       ));
 
 
@@ -224,7 +224,7 @@ public function testControllerAccessControls() {
       ));
 
     $this->checkAccess(
-      pht('Application Controller'),
+      pht('Application Controller, No Login Required'),
       id(clone $app_controller)->setConfig('login', false),
       $request,
       array(
@@ -232,10 +232,10 @@ public function testControllerAccessControls() {
         $u_unverified,
         $u_admin,
         $u_public,
+        $u_notapproved,
       ),
       array(
         $u_disabled,
-        $u_notapproved,
       ));
   }
 

From dc62d18b473624a2547efb5751f2713ce0047256 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 17:34:43 -0800
Subject: [PATCH 293/865] Allow MFA enrollment before email verification

Summary: Depends on D18791. Ref T13024. This clears up another initialization order issue, where an unverified address could prevent MFA enrollment.

Test Plan: Configured both verification required and MFA required, clicked "Add Factor", got a dialog for the workflow.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024

Differential Revision: https://secure.phabricator.com/D18792
---
 .../PhabricatorAuthNeedsMultiFactorController.php           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
index d295812d3e..27e03485ca 100644
--- a/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
+++ b/src/applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php
@@ -15,6 +15,12 @@ public function shouldRequireEnabledUser() {
     return false;
   }
 
+  public function shouldRequireEmailVerification() {
+    // Users who haven't verified their email addresses yet can still enroll
+    // in MFA.
+    return false;
+  }
+
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
 

From e919233b3182d55b1d257df3b8ec369d702fff97 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 17:53:58 -0800
Subject: [PATCH 294/865] Don't show personalized menu items until users
 establish a full session

Summary:
Depends on D18792. Fixes T13024. Fixes T89198. Currently, when users are logging in initially (for example, need to enter MFA) we show more menu items than we should.

Notably, we may show some personalized/private account details, like the number of unread notifications (probably not relevant) or a user's saved queries (possibly sensitive). At best these are misleading (they won't work yet) and there's an outside possibility they leak a little bit of private data.

Instead, nuke everything except "Log Out" when users have partial sessions.

Test Plan:
Hit a partial session (MFA required, email verification required) and looked at the menu. Only saw "Log Out".

{F5297713}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024

Differential Revision: https://secure.phabricator.com/D18793
---
 .../PhabricatorFileDataController.php         |  4 ++
 .../PeopleMainMenuBarExtension.php            | 72 ++++++++++---------
 .../menu/PhabricatorMainMenuBarExtension.php  | 14 ++++
 .../page/menu/PhabricatorMainMenuView.php     | 58 +++++++++++++--
 4 files changed, 111 insertions(+), 37 deletions(-)

diff --git a/src/applications/files/controller/PhabricatorFileDataController.php b/src/applications/files/controller/PhabricatorFileDataController.php
index da438730cd..98f2cdbd51 100644
--- a/src/applications/files/controller/PhabricatorFileDataController.php
+++ b/src/applications/files/controller/PhabricatorFileDataController.php
@@ -10,6 +10,10 @@ public function shouldRequireLogin() {
     return false;
   }
 
+  public function shouldAllowPartialSessions() {
+    return true;
+  }
+
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $this->phid = $request->getURIData('phid');
diff --git a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
index cd1cffa7a2..01f1ba7cc1 100644
--- a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
+++ b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
@@ -9,6 +9,10 @@ public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
     return $viewer->isLoggedIn();
   }
 
+  public function shouldAllowPartialSessions() {
+    return true;
+  }
+
   public function getExtensionOrder() {
     return 1200;
   }
@@ -65,42 +69,44 @@ private function newDropdown(
     $view = id(new PhabricatorActionListView())
       ->setViewer($viewer);
 
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->appendChild($user_view));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setType(PhabricatorActionView::TYPE_DIVIDER));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Profile'))
-        ->setHref('/p/'.$viewer->getUsername().'/'));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Settings'))
-        ->setHref('/settings/user/'.$viewer->getUsername().'/'));
-
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Manage'))
-        ->setHref('/people/manage/'.$viewer->getID().'/'));
-
-    if ($application) {
-      $help_links = $application->getHelpMenuItems($viewer);
-      if ($help_links) {
-        foreach ($help_links as $link) {
-          $view->addAction($link);
+    if ($this->getIsFullSession()) {
+      $view->addAction(
+        id(new PhabricatorActionView())
+          ->appendChild($user_view));
+
+      $view->addAction(
+        id(new PhabricatorActionView())
+          ->setType(PhabricatorActionView::TYPE_DIVIDER));
+
+      $view->addAction(
+        id(new PhabricatorActionView())
+          ->setName(pht('Profile'))
+          ->setHref('/p/'.$viewer->getUsername().'/'));
+
+      $view->addAction(
+        id(new PhabricatorActionView())
+          ->setName(pht('Settings'))
+          ->setHref('/settings/user/'.$viewer->getUsername().'/'));
+
+      $view->addAction(
+        id(new PhabricatorActionView())
+          ->setName(pht('Manage'))
+          ->setHref('/people/manage/'.$viewer->getID().'/'));
+
+      if ($application) {
+        $help_links = $application->getHelpMenuItems($viewer);
+        if ($help_links) {
+          foreach ($help_links as $link) {
+            $view->addAction($link);
+          }
         }
       }
-    }
 
-    $view->addAction(
-      id(new PhabricatorActionView())
-        ->addSigil('logout-item')
-        ->setType(PhabricatorActionView::TYPE_DIVIDER));
+      $view->addAction(
+        id(new PhabricatorActionView())
+          ->addSigil('logout-item')
+          ->setType(PhabricatorActionView::TYPE_DIVIDER));
+    }
 
     $view->addAction(
       id(new PhabricatorActionView())
diff --git a/src/view/page/menu/PhabricatorMainMenuBarExtension.php b/src/view/page/menu/PhabricatorMainMenuBarExtension.php
index fede2fdb85..d893cccac9 100644
--- a/src/view/page/menu/PhabricatorMainMenuBarExtension.php
+++ b/src/view/page/menu/PhabricatorMainMenuBarExtension.php
@@ -5,6 +5,7 @@ abstract class PhabricatorMainMenuBarExtension extends Phobject {
   private $viewer;
   private $application;
   private $controller;
+  private $isFullSession;
 
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
@@ -33,6 +34,15 @@ public function getController() {
     return $this->controller;
   }
 
+  public function setIsFullSession($is_full_session) {
+    $this->isFullSession = $is_full_session;
+    return $this;
+  }
+
+  public function getIsFullSession() {
+    return $this->isFullSession;
+  }
+
   final public function getExtensionKey() {
     return $this->getPhobjectClassConstant('MAINMENUBARKEY');
   }
@@ -41,6 +51,10 @@ public function isExtensionEnabled() {
     return true;
   }
 
+  public function shouldAllowPartialSessions() {
+    return false;
+  }
+
   public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
     if (!$viewer->isLoggedIn()) {
       return false;
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index f9e4032d87..ba4bda41ea 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -46,7 +46,9 @@ public function render() {
     $app_button = '';
     $aural = null;
 
-    if ($viewer->isLoggedIn() && $viewer->isUserActivated()) {
+    $is_full = $this->isFullSession($viewer);
+
+    if ($is_full) {
       list($menu, $dropdowns, $aural) = $this->renderNotificationMenu();
       if (array_filter($menu)) {
         $alerts[] = $menu;
@@ -54,14 +56,18 @@ public function render() {
       $menu_bar = array_merge($menu_bar, $dropdowns);
       $app_button = $this->renderApplicationMenuButton();
       $search_button = $this->renderSearchMenuButton($header_id);
-    } else {
+    } else if (!$viewer->isLoggedIn()) {
       $app_button = $this->renderApplicationMenuButton();
       if (PhabricatorEnv::getEnvConfig('policy.allow-public')) {
         $search_button = $this->renderSearchMenuButton($header_id);
       }
     }
 
-    $search_menu = $this->renderPhabricatorSearchMenu();
+    if ($search_button) {
+      $search_menu = $this->renderPhabricatorSearchMenu();
+    } else {
+      $search_menu = null;
+    }
 
     if ($alerts) {
       $alerts = javelin_tag(
@@ -84,7 +90,9 @@ public function render() {
 
     $extensions = PhabricatorMainMenuBarExtension::getAllEnabledExtensions();
     foreach ($extensions as $extension) {
-      $extension->setViewer($viewer);
+      $extension
+        ->setViewer($viewer)
+        ->setIsFullSession($is_full);
 
       $controller = $this->getController();
       if ($controller) {
@@ -96,6 +104,14 @@ public function render() {
       }
     }
 
+    if (!$is_full) {
+      foreach ($extensions as $key => $extension) {
+        if (!$extension->shouldAllowPartialSessions()) {
+          unset($extensions[$key]);
+        }
+      }
+    }
+
     foreach ($extensions as $key => $extension) {
       if (!$extension->isExtensionEnabledForViewer($extension->getViewer())) {
         unset($extensions[$key]);
@@ -677,4 +693,38 @@ private function renderNotificationMenu() {
     );
   }
 
+  private function isFullSession(PhabricatorUser $viewer) {
+    if (!$viewer->isLoggedIn()) {
+      return false;
+    }
+
+    if (!$viewer->isUserActivated()) {
+      return false;
+    }
+
+    if (!$viewer->hasSession()) {
+      return false;
+    }
+
+    $session = $viewer->getSession();
+    if ($session->getIsPartial()) {
+      return false;
+    }
+
+    if (!$session->getSignedLegalpadDocuments()) {
+      return false;
+    }
+
+    $mfa_key = 'security.require-multi-factor-auth';
+    $need_mfa = PhabricatorEnv::getEnvConfig($mfa_key);
+    if ($need_mfa) {
+      $have_mfa = $viewer->getIsEnrolledInMultiFactor();
+      if (!$have_mfa) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
 }

From c7d6fd198cc98cf8b860288031eb4274bdcd94e0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Nov 2017 15:11:06 -0800
Subject: [PATCH 295/865] Support "Set X to" as an action in Herald for
 tokenizer/datasource custom fields

Summary:
See PHI173. Adds custom field support for Herald actions, and implements actions for "Datasource/Tokenizer" fields.

The only action available for now is "set field to...". Other actions ("Add values", "Remove values") might make sense in the future for these fields, but there's currently no use case. For most other field types (text, select, checkbox, etc) only "Set to" makes sense.

Test Plan:
  - Added a "datasource" custom field to the custom field definition in Config.
  - Added a "if field is empty, set field to default value X" rule to Herald.
  - Created a task with a nonempty field: no Herald trigger.
  - Created a task with an empty field: Herald fired.
  - Reviewed rule and transcripts for text strings.

{F5297615}

{F5297616}

{F5297617}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18784
---
 src/__phutil_library_map__.php                |   4 +
 .../field/PhabricatorCustomField.php          |  55 +++++++++
 .../PhabricatorCustomFieldHeraldAction.php    | 105 ++++++++++++++++++
 ...habricatorCustomFieldHeraldActionGroup.php |  16 +++
 ...habricatorStandardCustomFieldTokenizer.php |  36 ++++++
 5 files changed, 216 insertions(+)
 create mode 100644 src/infrastructure/customfield/herald/PhabricatorCustomFieldHeraldAction.php
 create mode 100644 src/infrastructure/customfield/herald/PhabricatorCustomFieldHeraldActionGroup.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 424d72dc72..c4890116cf 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2535,6 +2535,8 @@
     'PhabricatorCustomFieldEditField' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php',
     'PhabricatorCustomFieldEditType' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php',
     'PhabricatorCustomFieldFulltextEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php',
+    'PhabricatorCustomFieldHeraldAction' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldAction.php',
+    'PhabricatorCustomFieldHeraldActionGroup' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldActionGroup.php',
     'PhabricatorCustomFieldHeraldField' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldField.php',
     'PhabricatorCustomFieldHeraldFieldGroup' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldFieldGroup.php',
     'PhabricatorCustomFieldImplementationIncompleteException' => 'infrastructure/customfield/exception/PhabricatorCustomFieldImplementationIncompleteException.php',
@@ -7868,6 +7870,8 @@
     'PhabricatorCustomFieldEditField' => 'PhabricatorEditField',
     'PhabricatorCustomFieldEditType' => 'PhabricatorEditType',
     'PhabricatorCustomFieldFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
+    'PhabricatorCustomFieldHeraldAction' => 'HeraldAction',
+    'PhabricatorCustomFieldHeraldActionGroup' => 'HeraldActionGroup',
     'PhabricatorCustomFieldHeraldField' => 'HeraldField',
     'PhabricatorCustomFieldHeraldFieldGroup' => 'HeraldFieldGroup',
     'PhabricatorCustomFieldImplementationIncompleteException' => 'Exception',
diff --git a/src/infrastructure/customfield/field/PhabricatorCustomField.php b/src/infrastructure/customfield/field/PhabricatorCustomField.php
index fba299fc8b..f7f4403402 100644
--- a/src/infrastructure/customfield/field/PhabricatorCustomField.php
+++ b/src/infrastructure/customfield/field/PhabricatorCustomField.php
@@ -34,6 +34,7 @@ abstract class PhabricatorCustomField extends Phobject {
   const ROLE_CONDUIT                  = 'conduit';
   const ROLE_HERALD                   = 'herald';
   const ROLE_EDITENGINE = 'EditEngine';
+  const ROLE_HERALDACTION = 'herald.action';
 
 
 /* -(  Building Applications with Custom Fields  )--------------------------- */
@@ -293,6 +294,8 @@ public function shouldEnableForRole($role) {
         return $this->shouldAppearInTransactionMail();
       case self::ROLE_HERALD:
         return $this->shouldAppearInHerald();
+      case self::ROLE_HERALDACTION:
+        return $this->shouldAppearInHeraldActions();
       case self::ROLE_EDITENGINE:
         return $this->shouldAppearInEditView() ||
                $this->shouldAppearInEditEngine();
@@ -1476,4 +1479,56 @@ public function getHeraldDatasource() {
   }
 
 
+  public function shouldAppearInHeraldActions() {
+    if ($this->proxy) {
+      return $this->proxy->shouldAppearInHeraldActions();
+    }
+    return false;
+  }
+
+
+  public function getHeraldActionName() {
+    if ($this->proxy) {
+      return $this->proxy->getHeraldActionName();
+    }
+
+    return null;
+  }
+
+
+  public function getHeraldActionStandardType() {
+    if ($this->proxy) {
+      return $this->proxy->getHeraldActionStandardType();
+    }
+
+    return null;
+  }
+
+
+  public function getHeraldActionDescription($value) {
+    if ($this->proxy) {
+      return $this->proxy->getHeraldActionDescription($value);
+    }
+
+    return null;
+  }
+
+
+  public function getHeraldActionEffectDescription($value) {
+    if ($this->proxy) {
+      return $this->proxy->getHeraldActionEffectDescription($value);
+    }
+
+    return null;
+  }
+
+
+  public function getHeraldActionDatasource() {
+    if ($this->proxy) {
+      return $this->proxy->getHeraldActionDatasource();
+    }
+
+    return null;
+  }
+
 }
diff --git a/src/infrastructure/customfield/herald/PhabricatorCustomFieldHeraldAction.php b/src/infrastructure/customfield/herald/PhabricatorCustomFieldHeraldAction.php
new file mode 100644
index 0000000000..1d35ba59a2
--- /dev/null
+++ b/src/infrastructure/customfield/herald/PhabricatorCustomFieldHeraldAction.php
@@ -0,0 +1,105 @@
+<?php
+
+final class PhabricatorCustomFieldHeraldAction extends HeraldAction {
+
+  const ACTIONCONST = 'herald.action.custom';
+
+  const DO_SET_FIELD = 'do.set-custom-field';
+
+  private $customField;
+
+  public function setCustomField(PhabricatorCustomField $custom_field) {
+    $this->customField = $custom_field;
+    return $this;
+  }
+
+  public function getCustomField() {
+    return $this->customField;
+  }
+
+  public function getActionGroupKey() {
+    return PhabricatorCustomFieldHeraldActionGroup::ACTIONGROUPKEY;
+  }
+
+  public function supportsObject($object) {
+    return ($object instanceof PhabricatorCustomFieldInterface);
+  }
+
+  public function supportsRuleType($rule_type) {
+    return true;
+  }
+
+  public function getActionsForObject($object) {
+    $viewer = PhabricatorUser::getOmnipotentUser();
+    $role = PhabricatorCustomField::ROLE_HERALDACTION;
+
+    $field_list = PhabricatorCustomField::getObjectFields($object, $role)
+      ->setViewer($viewer)
+      ->readFieldsFromStorage($object);
+
+    $map = array();
+    foreach ($field_list->getFields() as $field) {
+      $key = $field->getFieldKey();
+      $map[$key] = id(new self())
+        ->setCustomField($field);
+    }
+
+    return $map;
+  }
+
+  public function applyEffect($object, HeraldEffect $effect) {
+    $field = $this->getCustomField();
+    $value = $effect->getTarget();
+    $adapter = $this->getAdapter();
+
+    $old_value = $field->getOldValueForApplicationTransactions();
+    $new_value = id(clone $field)
+      ->setValueFromApplicationTransactions($value)
+      ->getValueForStorage();
+
+    $xaction = $adapter->newTransaction()
+      ->setTransactionType(PhabricatorTransactions::TYPE_CUSTOMFIELD)
+      ->setMetadataValue('customfield:key', $field->getFieldKey())
+      ->setOldValue($old_value)
+      ->setNewValue($new_value);
+
+    $adapter->queueTransaction($xaction);
+
+    $this->logEffect(self::DO_SET_FIELD, $value);
+  }
+
+  public function getHeraldActionName() {
+    return $this->getCustomField()->getHeraldActionName();
+  }
+
+  public function getHeraldActionStandardType() {
+    return $this->getCustomField()->getHeraldActionStandardType();
+  }
+
+  protected function getDatasource() {
+    return $this->getCustomField()->getHeraldActionDatasource();
+  }
+
+  public function renderActionDescription($value) {
+    return $this->getCustomField()->getHeraldActionDescription($value);
+  }
+
+  protected function getActionEffectMap() {
+    return array(
+      self::DO_SET_FIELD => array(
+        'icon' => 'fa-pencil',
+        'color' => 'green',
+        'name' => pht('Set Field Value'),
+      ),
+    );
+  }
+
+  protected function renderActionEffectDescription($type, $data) {
+    switch ($type) {
+      case self::DO_SET_FIELD:
+        return $this->getCustomField()->getHeraldActionEffectDescription($data);
+    }
+  }
+
+
+}
diff --git a/src/infrastructure/customfield/herald/PhabricatorCustomFieldHeraldActionGroup.php b/src/infrastructure/customfield/herald/PhabricatorCustomFieldHeraldActionGroup.php
new file mode 100644
index 0000000000..b8f16ab202
--- /dev/null
+++ b/src/infrastructure/customfield/herald/PhabricatorCustomFieldHeraldActionGroup.php
@@ -0,0 +1,16 @@
+<?php
+
+final class PhabricatorCustomFieldHeraldActionGroup
+  extends HeraldActionGroup {
+
+  const ACTIONGROUPKEY = 'customfield';
+
+  public function getGroupLabel() {
+    return pht('Custom Fields');
+  }
+
+  protected function getGroupOrder() {
+    return 2000;
+  }
+
+}
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
index d2b063ffde..9cb19d029d 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
@@ -65,4 +65,40 @@ protected function newConduitEditParameterType() {
     return new ConduitPHIDListParameterType();
   }
 
+  public function shouldAppearInHeraldActions() {
+    return true;
+  }
+
+  public function getHeraldActionName() {
+    return pht('Set "%s" to', $this->getFieldName());
+  }
+
+  public function getHeraldActionDescription($value) {
+    $list = $this->renderHeraldHandleList($value);
+    return pht('Set "%s" to: %s.', $this->getFieldName(), $list);
+  }
+
+  public function getHeraldActionEffectDescription($value) {
+    return $this->renderHeraldHandleList($value);
+  }
+
+  public function getHeraldActionStandardType() {
+    return HeraldAction::STANDARD_PHID_LIST;
+  }
+
+  public function getHeraldActionDatasource() {
+    return $this->getDatasource();
+  }
+
+  private function renderHeraldHandleList($value) {
+    if (!is_array($value)) {
+      return pht('(Invalid List)');
+    } else {
+      return $this->getViewer()
+        ->renderHandleList($value)
+        ->setAsInline(true)
+        ->render();
+    }
+  }
+
 }

From 54f131dc4baad39f54c164ea57135151c4d38542 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Nov 2017 10:42:16 -0800
Subject: [PATCH 296/865] Make "first broadcast" rules for Differential drafts
 more general

Summary:
See PHI228. Ref T2543. The current logic gets this slightly wrong: prototypes are off, you create a draft with `--draft`, then promote it with "Request Review". This misses both branches.

Instead, test these conditions a little more broadly. We also need to store broadcast state since `getIsNewObject()` isn't good enough with this workflow.

Test Plan:
  - With prototypes on and autopromotion, got a rich email after builds finished.
  - With prototypes off, got a rich email immediately.
  - With prototypes off and `--draft`, got a rich email after "Request Review".

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18801
---
 .../editor/DifferentialTransactionEditor.php  | 36 ++++++++++++++-----
 .../storage/DifferentialRevision.php          | 10 ++++++
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 7cea29359f..ae652ba0ec 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -10,6 +10,7 @@ final class DifferentialTransactionEditor
   private $hasReviewTransaction = false;
   private $affectedPaths;
   private $firstBroadcast = false;
+  private $wasDraft = false;
 
   public function getEditorApplicationClass() {
     return 'PhabricatorDifferentialApplication';
@@ -166,6 +167,8 @@ protected function expandTransactions(
       }
     }
 
+    $this->wasDraft = $object->isDraft();
+
     return parent::expandTransactions($object, $xactions);
   }
 
@@ -1581,10 +1584,6 @@ protected function didApplyTransactions($object, array $xactions) {
           $this->setActingAsPHID($author_phid);
         }
 
-        // Mark this as the first broadcast we're sending about the revision
-        // so mail can generate specially.
-        $this->firstBroadcast = true;
-
         $xaction = $object->getApplicationTransactionTemplate()
           ->setAuthorPHID($author_phid)
           ->setTransactionType(
@@ -1612,12 +1611,31 @@ protected function didApplyTransactions($object, array $xactions) {
 
         $xactions[] = $xaction;
       }
-    } else {
-      // If this revision is being created into some state other than "Draft",
-      // this is the first broadcast and should include sections like "SUMMARY"
-      // and "TEST PLAN".
-      if ($this->getIsNewObject()) {
+    }
+
+    // If the revision is new or was a draft, and is no longer a draft, we
+    // might be sending the first email about it.
+
+    // This might mean it was created directly into a non-draft state, or
+    // it just automatically undrafted after builds finished, or a user
+    // explicitly promoted it out of the draft state with an action like
+    // "Request Review".
+
+    // If we haven't sent any email about it yet, mark this email as the first
+    // email so the mail gets enriched with "SUMMARY" and "TEST PLAN".
+
+    $is_new = $this->getIsNewObject();
+    $was_draft = $this->wasDraft;
+
+    if (!$object->isDraft() && ($was_draft || $is_new)) {
+      if (!$object->getHasBroadcast()) {
+        // Mark this as the first broadcast we're sending about the revision
+        // so mail can generate specially.
         $this->firstBroadcast = true;
+
+        $object
+          ->setHasBroadcast(true)
+          ->save();
       }
     }
 
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index bf4bec0abc..73f22c91e4 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -60,6 +60,7 @@ final class DifferentialRevision extends DifferentialDAO
 
   const PROPERTY_CLOSED_FROM_ACCEPTED = 'wasAcceptedBeforeClose';
   const PROPERTY_DRAFT_HOLD = 'draft.hold';
+  const PROPERTY_HAS_BROADCAST = 'draft.broadcast';
 
   public static function initializeNewRevision(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
@@ -719,6 +720,15 @@ public function setHoldAsDraft($hold) {
     return $this->setProperty(self::PROPERTY_DRAFT_HOLD, $hold);
   }
 
+  public function getHasBroadcast() {
+    return $this->getProperty(self::PROPERTY_HAS_BROADCAST, false);
+  }
+
+  public function setHasBroadcast($has_broadcast) {
+    return $this->setProperty(self::PROPERTY_HAS_BROADCAST, $has_broadcast);
+  }
+
+
   public function loadActiveBuilds(PhabricatorUser $viewer) {
     $diff = $this->getActiveDiff();
 

From 1b76250f8995744c016c4b8149263e0bc4727b73 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Nov 2017 11:05:15 -0800
Subject: [PATCH 297/865] Disallow "Accept" on drafts, allow "Resign"

Summary:
Depends on D18801. Ref T2543. See PHI229. I missed "Accept" before, but intended to disallow it (like "Reject") since I don't want drafts to be reviewable.

However, "Resign" seems fine to allow? So let's allow that for now.

Test Plan: Was no longer offered "Accept" on draft revisions.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18802
---
 .../xaction/DifferentialRevisionAcceptTransaction.php        | 5 +++++
 .../xaction/DifferentialRevisionResignTransaction.php        | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
index d52e2dbeb7..190a6a4920 100644
--- a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
@@ -162,6 +162,11 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'closed. Only open revisions can be accepted.'));
     }
 
+    if ($object->isDraft()) {
+      throw new Exception(
+        pht('You can not accept a draft revision.'));
+    }
+
     $config_key = 'differential.allow-self-accept';
     if (!PhabricatorEnv::getEnvConfig($config_key)) {
       if ($this->isViewerRevisionAuthor($object, $viewer)) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php b/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
index 40a512202d..53b0b8da01 100644
--- a/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionResignTransaction.php
@@ -64,11 +64,6 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'been closed. You can only resign from open revisions.'));
     }
 
-    if ($object->isDraft()) {
-      throw new Exception(
-        pht('You can not resign from a draft revision.'));
-    }
-
     $resigned = DifferentialReviewerStatus::STATUS_RESIGNED;
     if ($this->getViewerReviewerStatus($object, $viewer) == $resigned) {
       throw new Exception(

From d8f2630d5c0f9eb5221964944e45b9197753a988 Mon Sep 17 00:00:00 2001
From: Aviv Eyal <aviv@myclaimly.com>
Date: Thu, 30 Nov 2017 15:07:49 +0000
Subject: [PATCH 298/865] Modernize QuickSearch typeahead

Summary:
Use ClassQuery to find datasources for the quick-search.

Mostly, this allows extensions to add quicksearches.

Test Plan:
using `/typeahead/class/`, tested several search terms that make sense.
Removed the tag interface from a datasource, which removed it from results.

Reviewers: epriestley, amckinley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18760
---
 src/__phutil_library_map__.php                 | 14 ++++++++++++++
 .../DiffusionQuickSearchEngineExtension.php    | 12 ++++++++++++
 ...orQuickSearchApplicationEngineExtension.php | 11 +++++++++++
 ...ricatorPeopleQuickSearchEngineExtension.php | 11 +++++++++++
 .../ProjectQuickSearchEngineExtension.php      | 11 +++++++++++
 .../engine/PhabricatorQuickSearchEngine.php    |  8 ++++++++
 .../PhabricatorQuickSearchEngineExtension.php  | 18 ++++++++++++++++++
 .../typeahead/PhabricatorSearchDatasource.php  | 10 ++--------
 ...catorMonogramQuickSearchEngineExtension.php | 11 +++++++++++
 9 files changed, 98 insertions(+), 8 deletions(-)
 create mode 100644 src/applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php
 create mode 100644 src/applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php
 create mode 100644 src/applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php
 create mode 100644 src/applications/project/engineextension/ProjectQuickSearchEngineExtension.php
 create mode 100644 src/applications/search/engine/PhabricatorQuickSearchEngine.php
 create mode 100644 src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php
 create mode 100644 src/applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c4890116cf..53bbf9a749 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -831,6 +831,7 @@
     'DiffusionQueryCommitsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php',
     'DiffusionQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php',
     'DiffusionQueryPathsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php',
+    'DiffusionQuickSearchEngineExtension' => 'applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php',
     'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php',
     'DiffusionRawDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRawDiffQueryConduitAPIMethod.php',
     'DiffusionReadmeView' => 'applications/diffusion/view/DiffusionReadmeView.php',
@@ -3202,6 +3203,7 @@
     'PhabricatorMetronomicTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorMetronomicTriggerClock.php',
     'PhabricatorModularTransaction' => 'applications/transactions/storage/PhabricatorModularTransaction.php',
     'PhabricatorModularTransactionType' => 'applications/transactions/storage/PhabricatorModularTransactionType.php',
+    'PhabricatorMonogramQuickSearchEngineExtension' => 'applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php',
     'PhabricatorMonospacedFontSetting' => 'applications/settings/setting/PhabricatorMonospacedFontSetting.php',
     'PhabricatorMonospacedTextareasSetting' => 'applications/settings/setting/PhabricatorMonospacedTextareasSetting.php',
     'PhabricatorMotivatorProfileMenuItem' => 'applications/search/menuitem/PhabricatorMotivatorProfileMenuItem.php',
@@ -3525,6 +3527,7 @@
     'PhabricatorPeopleProfileTasksController' => 'applications/people/controller/PhabricatorPeopleProfileTasksController.php',
     'PhabricatorPeopleProfileViewController' => 'applications/people/controller/PhabricatorPeopleProfileViewController.php',
     'PhabricatorPeopleQuery' => 'applications/people/query/PhabricatorPeopleQuery.php',
+    'PhabricatorPeopleQuickSearchEngineExtension' => 'applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php',
     'PhabricatorPeopleRenameController' => 'applications/people/controller/PhabricatorPeopleRenameController.php',
     'PhabricatorPeopleRevisionsProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php',
     'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php',
@@ -3785,6 +3788,9 @@
     'PhabricatorQueryOrderItem' => 'infrastructure/query/order/PhabricatorQueryOrderItem.php',
     'PhabricatorQueryOrderTestCase' => 'infrastructure/query/order/__tests__/PhabricatorQueryOrderTestCase.php',
     'PhabricatorQueryOrderVector' => 'infrastructure/query/order/PhabricatorQueryOrderVector.php',
+    'PhabricatorQuickSearchApplicationEngineExtension' => 'applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php',
+    'PhabricatorQuickSearchEngine' => 'applications/search/engine/PhabricatorQuickSearchEngine.php',
+    'PhabricatorQuickSearchEngineExtension' => 'applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php',
     'PhabricatorRateLimitRequestExceptionHandler' => 'aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php',
     'PhabricatorRecaptchaConfigOptions' => 'applications/config/option/PhabricatorRecaptchaConfigOptions.php',
     'PhabricatorRedirectController' => 'applications/base/controller/PhabricatorRedirectController.php',
@@ -4817,6 +4823,7 @@
     'ProjectDefaultViewCapability' => 'applications/project/capability/ProjectDefaultViewCapability.php',
     'ProjectEditConduitAPIMethod' => 'applications/project/conduit/ProjectEditConduitAPIMethod.php',
     'ProjectQueryConduitAPIMethod' => 'applications/project/conduit/ProjectQueryConduitAPIMethod.php',
+    'ProjectQuickSearchEngineExtension' => 'applications/project/engineextension/ProjectQuickSearchEngineExtension.php',
     'ProjectRemarkupRule' => 'applications/project/remarkup/ProjectRemarkupRule.php',
     'ProjectRemarkupRuleTestCase' => 'applications/project/remarkup/__tests__/ProjectRemarkupRuleTestCase.php',
     'ProjectReplyHandler' => 'applications/project/mail/ProjectReplyHandler.php',
@@ -5880,6 +5887,7 @@
     'DiffusionQueryCommitsConduitAPIMethod' => 'DiffusionConduitAPIMethod',
     'DiffusionQueryConduitAPIMethod' => 'DiffusionConduitAPIMethod',
     'DiffusionQueryPathsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
+    'DiffusionQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
     'DiffusionRawDiffQuery' => 'DiffusionFileFutureQuery',
     'DiffusionRawDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
     'DiffusionReadmeView' => 'DiffusionView',
@@ -8612,6 +8620,7 @@
     'PhabricatorMetronomicTriggerClock' => 'PhabricatorTriggerClock',
     'PhabricatorModularTransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorModularTransactionType' => 'Phobject',
+    'PhabricatorMonogramQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
     'PhabricatorMonospacedFontSetting' => 'PhabricatorStringSetting',
     'PhabricatorMonospacedTextareasSetting' => 'PhabricatorSelectSetting',
     'PhabricatorMotivatorProfileMenuItem' => 'PhabricatorProfileMenuItem',
@@ -9004,6 +9013,7 @@
     'PhabricatorPeopleProfileTasksController' => 'PhabricatorPeopleProfileController',
     'PhabricatorPeopleProfileViewController' => 'PhabricatorPeopleProfileController',
     'PhabricatorPeopleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorPeopleQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
     'PhabricatorPeopleRenameController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleRevisionsProfileMenuItem' => 'PhabricatorProfileMenuItem',
     'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
@@ -9319,6 +9329,9 @@
       'Phobject',
       'Iterator',
     ),
+    'PhabricatorQuickSearchApplicationEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
+    'PhabricatorQuickSearchEngine' => 'Phobject',
+    'PhabricatorQuickSearchEngineExtension' => 'Phobject',
     'PhabricatorRateLimitRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
     'PhabricatorRecaptchaConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorRedirectController' => 'PhabricatorController',
@@ -10605,6 +10618,7 @@
     'ProjectDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'ProjectEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'ProjectQueryConduitAPIMethod' => 'ProjectConduitAPIMethod',
+    'ProjectQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
     'ProjectRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'ProjectRemarkupRuleTestCase' => 'PhabricatorTestCase',
     'ProjectReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
diff --git a/src/applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php b/src/applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php
new file mode 100644
index 0000000000..80c705b4f8
--- /dev/null
+++ b/src/applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php
@@ -0,0 +1,12 @@
+<?php
+
+final class DiffusionQuickSearchEngineExtension
+  extends PhabricatorQuickSearchEngineExtension {
+
+  public function newQuickSearchDatasources() {
+    return array(
+      new DiffusionRepositoryDatasource(),
+      new DiffusionSymbolDatasource(),
+    );
+  }
+}
diff --git a/src/applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php b/src/applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php
new file mode 100644
index 0000000000..8161c863ba
--- /dev/null
+++ b/src/applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php
@@ -0,0 +1,11 @@
+<?php
+
+final class PhabricatorQuickSearchApplicationEngineExtension
+  extends PhabricatorQuickSearchEngineExtension {
+
+  public function newQuickSearchDatasources() {
+    return array(
+      new PhabricatorApplicationDatasource(),
+    );
+  }
+}
diff --git a/src/applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php b/src/applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php
new file mode 100644
index 0000000000..565838de72
--- /dev/null
+++ b/src/applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php
@@ -0,0 +1,11 @@
+<?php
+
+final class PhabricatorPeopleQuickSearchEngineExtension
+  extends PhabricatorQuickSearchEngineExtension {
+
+  public function newQuickSearchDatasources() {
+    return array(
+      new PhabricatorPeopleDatasource(),
+    );
+  }
+}
diff --git a/src/applications/project/engineextension/ProjectQuickSearchEngineExtension.php b/src/applications/project/engineextension/ProjectQuickSearchEngineExtension.php
new file mode 100644
index 0000000000..6bb50e021e
--- /dev/null
+++ b/src/applications/project/engineextension/ProjectQuickSearchEngineExtension.php
@@ -0,0 +1,11 @@
+<?php
+
+final class ProjectQuickSearchEngineExtension
+  extends PhabricatorQuickSearchEngineExtension {
+
+  public function newQuickSearchDatasources() {
+    return array(
+      new PhabricatorProjectDatasource(),
+    );
+  }
+}
diff --git a/src/applications/search/engine/PhabricatorQuickSearchEngine.php b/src/applications/search/engine/PhabricatorQuickSearchEngine.php
new file mode 100644
index 0000000000..4b67dca659
--- /dev/null
+++ b/src/applications/search/engine/PhabricatorQuickSearchEngine.php
@@ -0,0 +1,8 @@
+<?php
+
+final class PhabricatorQuickSearchEngine extends Phobject {
+
+  public function getAllDatasources() {
+    return PhabricatorQuickSearchEngineExtension::getAllDatasources();
+  }
+}
diff --git a/src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php b/src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php
new file mode 100644
index 0000000000..43f0b4c3ca
--- /dev/null
+++ b/src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php
@@ -0,0 +1,18 @@
+<?php
+
+abstract class PhabricatorQuickSearchEngineExtension extends Phobject {
+
+  abstract public function newQuickSearchDatasources();
+
+  final public static function getAllDatasources() {
+    $extensions = id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->execute();
+
+    $datasources = array();
+    foreach ($extensions as $extension) {
+      $datasources[] = $extension->newQuickSearchDatasources();
+    }
+    return array_mergev($datasources);
+  }
+}
diff --git a/src/applications/search/typeahead/PhabricatorSearchDatasource.php b/src/applications/search/typeahead/PhabricatorSearchDatasource.php
index 2a17ad01eb..ed17a31185 100644
--- a/src/applications/search/typeahead/PhabricatorSearchDatasource.php
+++ b/src/applications/search/typeahead/PhabricatorSearchDatasource.php
@@ -16,14 +16,8 @@ public function getDatasourceApplicationClass() {
   }
 
   public function getComponentDatasources() {
-    $sources = array(
-      new PhabricatorPeopleDatasource(),
-      new PhabricatorProjectDatasource(),
-      new PhabricatorApplicationDatasource(),
-      new PhabricatorTypeaheadMonogramDatasource(),
-      new DiffusionRepositoryDatasource(),
-      new DiffusionSymbolDatasource(),
-    );
+    $sources = id(new PhabricatorQuickSearchEngine())
+      ->getAllDatasources();
 
     // These results are always rendered in the full browse display mode, so
     // set the browse flag on all component sources.
diff --git a/src/applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php b/src/applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php
new file mode 100644
index 0000000000..078cb44685
--- /dev/null
+++ b/src/applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php
@@ -0,0 +1,11 @@
+<?php
+
+final class PhabricatorMonogramQuickSearchEngineExtension
+  extends PhabricatorQuickSearchEngineExtension {
+
+  public function newQuickSearchDatasources() {
+    return array(
+      new PhabricatorTypeaheadMonogramDatasource(),
+    );
+  }
+}

From 0807b70ea16743aaa8b103c127cf12056a27de07 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 30 Nov 2017 08:13:10 -0800
Subject: [PATCH 299/865] Add an explicit warning in the Differential
 transaction log when users skip review

Summary:
Ref T10233. See PHI231. When users ignore the `arc land` prompt about bad revision states, make it explicitly clear in the transaction log that they broke the rules.

You can currently figure this out by noticing that there's no "This revision is accepted and ready to land." message, but it's unrealistic to expect non-expert users to look for the //absence// of a message to indicate something, and this state change is often relevant.

Test Plan: {F5302351}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T10233

Differential Revision: https://secure.phabricator.com/D18808
---
 resources/celerity/map.php                    |  6 +--
 src/__phutil_library_map__.php                |  2 +
 .../DifferentialDiffExtractionEngine.php      | 10 +++++
 ...ferentialRevisionWrongStateTransaction.php | 41 +++++++++++++++++++
 webroot/rsrc/css/phui/phui-timeline-view.css  |  4 ++
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 78ae8bd461..0ea66bec26 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '1a4e0c25',
+    'core.pkg.css' => 'fdb27ef9',
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -176,7 +176,7 @@
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
     'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
-    'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca',
+    'rsrc/css/phui/phui-timeline-view.css' => 'e2ef62b1',
     'rsrc/css/phui/phui-two-column-view.css' => '44ec4951',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
@@ -871,7 +871,7 @@
     'phui-status-list-view-css' => 'd5263e49',
     'phui-tag-view-css' => 'b4719c50',
     'phui-theme-css' => '9f261c6b',
-    'phui-timeline-view-css' => 'f21db7ca',
+    'phui-timeline-view-css' => 'e2ef62b1',
     'phui-two-column-view-css' => '44ec4951',
     'phui-workboard-color-css' => '783cdff5',
     'phui-workboard-view-css' => '3bc85455',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 53bbf9a749..11be8a50f0 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -594,6 +594,7 @@
     'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/DifferentialRevisionUpdateHistoryView.php',
     'DifferentialRevisionViewController' => 'applications/differential/controller/DifferentialRevisionViewController.php',
     'DifferentialRevisionVoidTransaction' => 'applications/differential/xaction/DifferentialRevisionVoidTransaction.php',
+    'DifferentialRevisionWrongStateTransaction' => 'applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php',
     'DifferentialSchemaSpec' => 'applications/differential/storage/DifferentialSchemaSpec.php',
     'DifferentialSetDiffPropertyConduitAPIMethod' => 'applications/differential/conduit/DifferentialSetDiffPropertyConduitAPIMethod.php',
     'DifferentialStoredCustomField' => 'applications/differential/customfield/DifferentialStoredCustomField.php',
@@ -5647,6 +5648,7 @@
     'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
     'DifferentialRevisionViewController' => 'DifferentialController',
     'DifferentialRevisionVoidTransaction' => 'DifferentialRevisionTransactionType',
+    'DifferentialRevisionWrongStateTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'DifferentialSetDiffPropertyConduitAPIMethod' => 'DifferentialConduitAPIMethod',
     'DifferentialStoredCustomField' => 'DifferentialCustomField',
diff --git a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
index 952c76c63f..c426c411e7 100644
--- a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
+++ b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
@@ -268,6 +268,16 @@ public function updateRevisionWithCommit(
 
     $xactions = array();
 
+    // If the revision isn't closed or "Accepted", write a warning into the
+    // transaction log. This makes it more clear when users bend the rules.
+    if (!$revision->isClosed() && !$revision->isAccepted()) {
+      $wrong_type = DifferentialRevisionWrongStateTransaction::TRANSACTIONTYPE;
+
+      $xactions[] = id(new DifferentialTransaction())
+        ->setTransactionType($wrong_type)
+        ->setNewValue($revision->getModernRevisionStatus());
+    }
+
     $xactions[] = id(new DifferentialTransaction())
       ->setTransactionType(DifferentialTransaction::TYPE_UPDATE)
       ->setIgnoreOnNoEffect(true)
diff --git a/src/applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php b/src/applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php
new file mode 100644
index 0000000000..e19e54199c
--- /dev/null
+++ b/src/applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php
@@ -0,0 +1,41 @@
+<?php
+
+final class DifferentialRevisionWrongStateTransaction
+  extends DifferentialRevisionTransactionType {
+
+  const TRANSACTIONTYPE = 'differential.revision.wrong';
+
+  public function generateOldValue($object) {
+    return null;
+  }
+
+  public function generateNewValue($object, $value) {
+    return $value;
+  }
+
+  public function getIcon() {
+    return 'fa-exclamation';
+  }
+
+  public function getColor() {
+    return 'pink';
+  }
+
+  public function getActionStrength() {
+    return 4;
+  }
+
+  public function getTitle() {
+    $new_value = $this->getNewValue();
+
+    $status = DifferentialRevisionStatus::newForStatus($new_value);
+
+    return pht(
+      'This revision was not accepted when it landed; it landed in state %s.',
+      $this->renderValue($status->getDisplayName()));
+  }
+
+  public function getTitleForFeed() {
+    return null;
+  }
+}
diff --git a/webroot/rsrc/css/phui/phui-timeline-view.css b/webroot/rsrc/css/phui/phui-timeline-view.css
index 33e0f8ed0c..b0ae9c0044 100644
--- a/webroot/rsrc/css/phui/phui-timeline-view.css
+++ b/webroot/rsrc/css/phui/phui-timeline-view.css
@@ -315,6 +315,10 @@
   background-color: {$violet};
 }
 
+.phui-timeline-icon-fill-pink {
+  background-color: {$pink};
+}
+
 .phui-timeline-icon-fill-grey {
   background-color: #888;
 }

From f786c86a6a428b580ccd5f2ce8c5df3bf7a19fa8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 30 Nov 2017 13:41:44 -0800
Subject: [PATCH 300/865] Don't require the "gd" extension be installed in
 order to run unit tests

Summary:
Ref T10405. If `gd` is not installed, a number of unit tests currently fail because they generate synthetic users and try to composite profile pictures for them.

Instead, just fall back to a static default if `gd` is not available.

Test Plan: Faked this pathway, created a new user, saw a default profile picture.

Reviewers: amckinley, lpriestley, avivey

Reviewed By: avivey

Maniphest Tasks: T10405

Differential Revision: https://secure.phabricator.com/D18812
---
 .../builtin/PhabricatorFilesComposeAvatarBuiltinFile.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php b/src/applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php
index 4e461ec3f5..fcd6f97601 100644
--- a/src/applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php
+++ b/src/applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php
@@ -58,6 +58,14 @@ public function loadBuiltinFileData() {
   }
 
   private function composeImage($color, $image, $border) {
+    // If we don't have the GD extension installed, just return a static
+    // default profile image rather than trying to compose a dynamic one.
+    if (!function_exists('imagecreatefromstring')) {
+      $root = dirname(phutil_get_library_root('phabricator'));
+      $default_path = $root.'/resources/builtin/profile.png';
+      return Filesystem::readFile($default_path);
+    }
+
     $color_const = hexdec(trim($color, '#'));
     $true_border = self::rgba2gd($border);
     $image_map = self::getImageMap();

From 14cc0abeb37fd411aceed31db22a820537264fe5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 30 Nov 2017 12:13:07 -0800
Subject: [PATCH 301/865] Fix several safety issues with repository URIs

Summary:
See PHI234. Several issues here:

  - The warning about observing a repository in Read/Write mode checks the raw I/O type, not the effective I/O type. That means we can fail to warn if other URIs are set to "Default", and "Default" is "Read/Write" in practice.
  - There's just an actual typo which prevents the "Observe" version of this error from triggering properly.

Additionally, add more forceful warnings that "Observe" and "Mirror" mean that you want to //replace// a repository with another one, not that we somehow merge branches selectively. It isn't necessarily obvious that "Observe" doesn't mean "merge/union", since the reasons it can't in the general case are somewhat subtle (conflicts between refs with the same names, detecting ref deletion).

Test Plan:
Read documentation. Hit the error locally by trying to "Observe" while in Read/Write mode:

{F5302655}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18810
---
 .../diffusion/editor/DiffusionURIEditor.php            |  4 ++--
 src/docs/user/userguide/diffusion_uris.diviner         | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/applications/diffusion/editor/DiffusionURIEditor.php b/src/applications/diffusion/editor/DiffusionURIEditor.php
index 674efbc158..90ced865f0 100644
--- a/src/applications/diffusion/editor/DiffusionURIEditor.php
+++ b/src/applications/diffusion/editor/DiffusionURIEditor.php
@@ -347,11 +347,11 @@ protected function validateTransaction(
                 continue;
               }
 
-              $io_type = $uri->getIoType();
+              $io_type = $uri->getEffectiveIOType();
 
               if ($io_type == PhabricatorRepositoryURI::IO_READWRITE) {
                 if ($no_readwrite) {
-                  $readwite_conflict = $uri;
+                  $readwrite_conflict = $uri;
                   break;
                 }
               }
diff --git a/src/docs/user/userguide/diffusion_uris.diviner b/src/docs/user/userguide/diffusion_uris.diviner
index 140948f55e..a19d38d3a5 100644
--- a/src/docs/user/userguide/diffusion_uris.diviner
+++ b/src/docs/user/userguide/diffusion_uris.diviner
@@ -239,6 +239,11 @@ You can not add a URI in Observe mode if an existing builtin URI is in
 authorities: the observed remote copy and the hosted local copy. Take the
 other URI out of //Read/Write// mode first.
 
+WARNING: If you observe a remote repository, the entire state of the working
+copy that Phabricator maintains will be deleted and replaced with the state of
+the remote. If some changes are present only in Phabricator's working copy,
+they will be unrecoverably destroyed.
+
 **Mirror**: Phabricator will push any changes made to this repository to the
 remote URI, keeping a read-only mirror hosted at that URI up to date.
 
@@ -251,6 +256,11 @@ It is possible to mirror a repository to another repository that is also
 hosted by Phabricator by adding that other repository's URI, although this is
 silly and probably very rarely of any use.
 
+WARNING: If you mirror to a remote repository, the entire state of that remote
+will be replaced with the state of the working copy Phabricator maintains. If
+some changes are present only in the remote, they will be unrecoverably
+destroyed.
+
 **None**: Phabricator will not fetch changes from or push changes to this URI.
 For builtin URIs, it will not let users fetch changes from or push changes to
 this URI.

From 5240cffd9c20c4f759b4ab2327ec4f6fbe2063ab Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 30 Nov 2017 12:33:02 -0800
Subject: [PATCH 302/865] Fix an issue where Diffusion could fatal if the
 default branch was deleted

Summary: See PHI234. In T12931 we improved the behavior of Diffusion when a repository's default branch is set to a branch that does not exist, but in T11823 the way refcursors work changed, and we can now get a cursor (just with no positions) back for a deleted branch. When we did, we didn't handle things gracefully.

Test Plan:
  - Set default branch to a deleted branch, saw nice error instead of fatal.
  - Set default branch to a nonexistent branch which never existed, saw nice error.
  - Set default branch to existing "master", saw repository normally.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18811
---
 .../controller/DiffusionRepositoryController.php   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index f64b72e1f8..35fce7f03d 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -46,8 +46,20 @@ public function handleRequest(AphrontRequest $request) {
         ->withRepositoryPHIDs(array($repository->getPHID()))
         ->withRefTypes(array(PhabricatorRepositoryRefCursor::TYPE_BRANCH))
         ->withRefNames(array($drequest->getBranch()))
+        ->needPositions(true)
         ->execute();
-      if ($ref_cursors) {
+
+      // It's possible that this branch previously existed, but has been
+      // deleted. Make sure we have valid cursor positions, not just cursors.
+      $any_positions = false;
+      foreach ($ref_cursors as $ref_cursor) {
+        if ($ref_cursor->getPositions()) {
+          $any_positions = true;
+          break;
+        }
+      }
+
+      if ($any_positions) {
         // This is a valid branch, so we necessarily have some content.
         $page_has_content = true;
       } else {

From 42034e6739eb2507839dda708963219c430c7e76 Mon Sep 17 00:00:00 2001
From: lkassianik <lyubakassianik@gmail.com>
Date: Fri, 1 Dec 2017 18:16:26 +0000
Subject: [PATCH 303/865] Property list view on Diffusion commits should show
 build status but not Subscriptions, Projects, or Tokens

Summary: Ref T13019, adds build status back to Diffusion commits

Test Plan: Open a Diffusion commit that has a build status, property list view should show the build status, but not Subscriptions, Projects, or Tokens.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Maniphest Tasks: T13019

Differential Revision: https://secure.phabricator.com/D18813
---
 .../diffusion/controller/DiffusionCommitController.php    | 3 ++-
 .../project/events/PhabricatorProjectUIEventListener.php  | 8 ++++++++
 .../events/PhabricatorSubscriptionsUIEventListener.php    | 8 ++++++++
 .../tokens/event/PhabricatorTokenUIEventListener.php      | 8 ++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index d7734856f0..cdce8702ca 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -438,7 +438,8 @@ private function buildPropertyListView(
     $repository = $drequest->getRepository();
 
     $view = id(new PHUIPropertyListView())
-      ->setUser($this->getRequest()->getUser());
+      ->setUser($this->getRequest()->getUser())
+      ->setObject($commit);
 
     $edge_query = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(array($commit_phid))
diff --git a/src/applications/project/events/PhabricatorProjectUIEventListener.php b/src/applications/project/events/PhabricatorProjectUIEventListener.php
index afbc0aab4e..104084bbf7 100644
--- a/src/applications/project/events/PhabricatorProjectUIEventListener.php
+++ b/src/applications/project/events/PhabricatorProjectUIEventListener.php
@@ -8,8 +8,16 @@ public function register() {
   }
 
   public function handleEvent(PhutilEvent $event) {
+    $object = $event->getValue('object');
+
     switch ($event->getType()) {
       case PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES:
+        // Hacky solution so that property list view on Diffusion
+        // commits shows build status, but not Projects, Subscriptions,
+        // or Tokens.
+        if ($object instanceof PhabricatorRepositoryCommit) {
+          return;
+        }
         $this->handlePropertyEvent($event);
         break;
     }
diff --git a/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php b/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
index 09b26819c0..5f371d69f3 100644
--- a/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
+++ b/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
@@ -9,11 +9,19 @@ public function register() {
   }
 
   public function handleEvent(PhutilEvent $event) {
+    $object = $event->getValue('object');
+
     switch ($event->getType()) {
       case PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS:
         $this->handleActionEvent($event);
         break;
       case PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES:
+        // Hacky solution so that property list view on Diffusion
+        // commits shows build status, but not Projects, Subscriptions,
+        // or Tokens.
+        if ($object instanceof PhabricatorRepositoryCommit) {
+          return;
+        }
         $this->handlePropertyEvent($event);
         break;
     }
diff --git a/src/applications/tokens/event/PhabricatorTokenUIEventListener.php b/src/applications/tokens/event/PhabricatorTokenUIEventListener.php
index bbf3438b62..047c5504bf 100644
--- a/src/applications/tokens/event/PhabricatorTokenUIEventListener.php
+++ b/src/applications/tokens/event/PhabricatorTokenUIEventListener.php
@@ -9,11 +9,19 @@ public function register() {
   }
 
   public function handleEvent(PhutilEvent $event) {
+    $object = $event->getValue('object');
+
     switch ($event->getType()) {
       case PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS:
         $this->handleActionEvent($event);
         break;
       case PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES:
+        // Hacky solution so that property list view on Diffusion
+        // commits shows build status, but not Projects, Subscriptions,
+        // or Tokens.
+        if ($object instanceof PhabricatorRepositoryCommit) {
+          return;
+        }
         $this->handlePropertyEvent($event);
         break;
     }

From c924351a58e40fe391c587899e322be006e98c7f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 2 Dec 2017 16:11:58 -0800
Subject: [PATCH 304/865] Mark sessions as "signed all documents" when Legalpad
 has been uninstalled

See PHI238. When an install uninstalls "Legalpad", we were incorrectly failing
to mark sessions as "Signed All Required Documents" by bailing early.

Test Plan: Uninstalled Legalpad, logged in.
---
 .../base/controller/PhabricatorController.php | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index 0fee880378..5952a806ed 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -562,25 +562,25 @@ private function requireLegalpadSignatures() {
       return null;
     }
 
+    $must_sign_docs = array();
+    $sign_docs = array();
+
     $legalpad_class = 'PhabricatorLegalpadApplication';
     $legalpad_installed = PhabricatorApplication::isClassInstalledForViewer(
       $legalpad_class,
       $viewer);
-    if (!$legalpad_installed) {
-      return null;
-    }
-
-    $sign_docs = id(new LegalpadDocumentQuery())
-      ->setViewer($viewer)
-      ->withSignatureRequired(1)
-      ->needViewerSignatures(true)
-      ->setOrder('oldest')
-      ->execute();
-
-    $must_sign_docs = array();
-    foreach ($sign_docs as $sign_doc) {
-      if (!$sign_doc->getUserSignature($viewer->getPHID())) {
-        $must_sign_docs[] = $sign_doc;
+    if ($legalpad_installed) {
+      $sign_docs = id(new LegalpadDocumentQuery())
+        ->setViewer($viewer)
+        ->withSignatureRequired(1)
+        ->needViewerSignatures(true)
+        ->setOrder('oldest')
+        ->execute();
+
+      foreach ($sign_docs as $sign_doc) {
+        if (!$sign_doc->getUserSignature($viewer->getPHID())) {
+          $must_sign_docs[] = $sign_doc;
+        }
       }
     }
 

From 9fdeb2d8ac95bddfb918f6541ba1f0fbcd5b0c24 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 2 Dec 2017 16:11:58 -0800
Subject: [PATCH 305/865] (stable) Mark sessions as "signed all documents" when
 Legalpad has been uninstalled

See PHI238. When an install uninstalls "Legalpad", we were incorrectly failing
to mark sessions as "Signed All Required Documents" by bailing early.

Test Plan: Uninstalled Legalpad, logged in.
---
 .../base/controller/PhabricatorController.php | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index 0fee880378..5952a806ed 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -562,25 +562,25 @@ private function requireLegalpadSignatures() {
       return null;
     }
 
+    $must_sign_docs = array();
+    $sign_docs = array();
+
     $legalpad_class = 'PhabricatorLegalpadApplication';
     $legalpad_installed = PhabricatorApplication::isClassInstalledForViewer(
       $legalpad_class,
       $viewer);
-    if (!$legalpad_installed) {
-      return null;
-    }
-
-    $sign_docs = id(new LegalpadDocumentQuery())
-      ->setViewer($viewer)
-      ->withSignatureRequired(1)
-      ->needViewerSignatures(true)
-      ->setOrder('oldest')
-      ->execute();
-
-    $must_sign_docs = array();
-    foreach ($sign_docs as $sign_doc) {
-      if (!$sign_doc->getUserSignature($viewer->getPHID())) {
-        $must_sign_docs[] = $sign_doc;
+    if ($legalpad_installed) {
+      $sign_docs = id(new LegalpadDocumentQuery())
+        ->setViewer($viewer)
+        ->withSignatureRequired(1)
+        ->needViewerSignatures(true)
+        ->setOrder('oldest')
+        ->execute();
+
+      foreach ($sign_docs as $sign_doc) {
+        if (!$sign_doc->getUserSignature($viewer->getPHID())) {
+          $must_sign_docs[] = $sign_doc;
+        }
       }
     }
 

From 46d496b8cc061db11954bcd2c03b882a5573eaad Mon Sep 17 00:00:00 2001
From: lkassianik <lyubakassianik@gmail.com>
Date: Tue, 5 Dec 2017 19:24:57 +0000
Subject: [PATCH 306/865] Fix error for URL's that could mean several commits

Summary: Ref T13001, URLs that return multiple commits should show a list of those commits. Not sure if the actual list looks very pretty this way, but was wondering if this approach was vaguely correct.

Test Plan:
- Navigate to `install/rPbd3c23`
- User should see a list view providing links to `install/rPbd3c2355e8e2b220ae5e3cbfe4a057c8088c6a38` and `install/rPbd3c239d5aada68a31db5742bbb8ec099074a561`

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Maniphest Tasks: T13001

Differential Revision: https://secure.phabricator.com/D18816
---
 .../controller/DiffusionCommitController.php  | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index cdce8702ca..11463ef97d 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -39,20 +39,23 @@ public function handleRequest(AphrontRequest $request) {
       return $this->buildRawDiffResponse($drequest);
     }
 
-    $commit = id(new DiffusionCommitQuery())
+    $commits = id(new DiffusionCommitQuery())
       ->setViewer($viewer)
       ->withRepository($repository)
       ->withIdentifiers(array($commit_identifier))
       ->needCommitData(true)
       ->needAuditRequests(true)
-      ->executeOne();
+      ->setLimit(100)
+      ->execute();
+
+    $multiple_results = count($commits) > 1;
 
     $crumbs = $this->buildCrumbs(array(
-      'commit' => true,
+      'commit' => !$multiple_results,
     ));
     $crumbs->setBorder(true);
 
-    if (!$commit) {
+    if (!$commits) {
       if (!$this->getCommitExists()) {
         return new Aphront404Response();
       }
@@ -70,7 +73,40 @@ public function handleRequest(AphrontRequest $request) {
         ->setTitle($title)
         ->setCrumbs($crumbs)
         ->appendChild($error);
+    } else if ($multiple_results) {
+
+      $warning_message =
+        pht(
+          'The identifier %s is ambiguous and matches more than one commit.',
+          phutil_tag(
+            'strong',
+            array(),
+            $commit_identifier));
+
+      $error = id(new PHUIInfoView())
+        ->setTitle(pht('Ambiguous Commit'))
+        ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
+        ->appendChild($warning_message);
+
+      $list = id(new DiffusionCommitListView())
+        ->setViewer($viewer)
+        ->setCommits($commits)
+        ->setNoDataString(pht('No recent commits.'));
+
+      $crumbs->addTextCrumb(pht('Ambiguous Commit'));
+
+      $matched_commits = id(new PHUITwoColumnView())
+        ->setFooter(array(
+          $error,
+          $list,
+        ));
 
+      return $this->newPage()
+        ->setTitle(pht('Ambiguous Commit'))
+        ->setCrumbs($crumbs)
+        ->appendChild($matched_commits);
+    } else {
+      $commit = head($commits);
     }
 
     $audit_requests = $commit->getAudits();

From a989dd181dd1f1115d728595c2adb482784c4ce0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 5 Dec 2017 05:35:06 -0800
Subject: [PATCH 307/865] Fix Mercurial commit history ordering

Summary:
See <https://discourse.phabricator-community.org/t/diffusion-observed-mercurial-repository-history-broken/825>.

In D18769, I rewrote this from using the `--branch` flag (which is unsafe and does not function on branches named `--config=x.y` and such).

However, this rewrite accidentally changed the result order, which impacted Mercurial commit hisotry lists and graphs. Swap the order of the constraints so we get newest-to-oldest again, as expected.

Test Plan: Viewed a Mercurial repository's history graph, saw sensible chronology after the patch.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18817
---
 .../diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
index e36c0a124e..4c1d39e8c8 100644
--- a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
@@ -130,7 +130,7 @@ protected function getMercurialResult(ConduitAPIRequest $request) {
     } else {
       $path_arg = '';
       $revset_arg = hgsprintf(
-        'branch(%s) and reverse(ancestors(%s))',
+        'reverse(ancestors(%s)) and branch(%s)',
         $drequest->getBranch(),
         $commit_hash);
     }

From 4f8340c05f2bf51d6b86e1e589153fc82ddbb708 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 5 Dec 2017 05:42:03 -0800
Subject: [PATCH 308/865] Restore the "Log In" menubar action

Summary:
See <https://discourse.phabricator-community.org/t/activation-link-in-welcome-mail-only-works-if-new-user-isnt-semi-logged-in/740/7>.

In T13024, I rewrote the main menu bar to hide potentially sensitive items (like notification and message counts and saved search filters) until users fully log in.

However, the "Log In" item got caught in this too. For clarity, rename `shouldAllowPartialSessions()` to `shouldRequireFullSession()` (since logged-out users don't have any session at all, so it would be a bit misleading to say that "Log In" "allows" a partial session). Then let "Log In" work again for logged-out users.

(In most cases, users are prompted to log in when they take an action which requires them to be logged in -- like creating or editing an object, or adding comments -- so this item doesn't really need to exist. However, it aligns better with user expectations in many cases to have it present, and some reasonable operations like "Check if I have notifications/messages" don't have an obvious thing to click otherwise.)

Test Plan: Viewed site in an incognito window, saw "Log In" button again. Browsed normally, saw normal menu.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18818
---
 .../auth/extension/PhabricatorAuthMainMenuBarExtension.php    | 4 ++++
 .../people/engineextension/PeopleMainMenuBarExtension.php     | 4 ++--
 src/view/page/menu/PhabricatorMainMenuBarExtension.php        | 4 ++--
 src/view/page/menu/PhabricatorMainMenuView.php                | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php b/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
index d9d251ab07..d9fb5d013b 100644
--- a/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
+++ b/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
@@ -9,6 +9,10 @@ public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
     return true;
   }
 
+  public function shouldRequireFullSession() {
+    return false;
+  }
+
   public function getExtensionOrder() {
     return 900;
   }
diff --git a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
index 01f1ba7cc1..bed9dde44e 100644
--- a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
+++ b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
@@ -9,8 +9,8 @@ public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
     return $viewer->isLoggedIn();
   }
 
-  public function shouldAllowPartialSessions() {
-    return true;
+  public function shouldRequireFullSession() {
+    return false;
   }
 
   public function getExtensionOrder() {
diff --git a/src/view/page/menu/PhabricatorMainMenuBarExtension.php b/src/view/page/menu/PhabricatorMainMenuBarExtension.php
index d893cccac9..e66b1f2c7d 100644
--- a/src/view/page/menu/PhabricatorMainMenuBarExtension.php
+++ b/src/view/page/menu/PhabricatorMainMenuBarExtension.php
@@ -51,8 +51,8 @@ public function isExtensionEnabled() {
     return true;
   }
 
-  public function shouldAllowPartialSessions() {
-    return false;
+  public function shouldRequireFullSession() {
+    return true;
   }
 
   public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index ba4bda41ea..ad9510f348 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -106,7 +106,7 @@ public function render() {
 
     if (!$is_full) {
       foreach ($extensions as $key => $extension) {
-        if (!$extension->shouldAllowPartialSessions()) {
+        if ($extension->shouldRequireFullSession()) {
           unset($extensions[$key]);
         }
       }

From 861bb08141a93131a5aeffdb49f509e33d0b875f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 5 Dec 2017 05:35:06 -0800
Subject: [PATCH 309/865] (stable) Fix Mercurial commit history ordering

Summary:
See <https://discourse.phabricator-community.org/t/diffusion-observed-mercurial-repository-history-broken/825>.

In D18769, I rewrote this from using the `--branch` flag (which is unsafe and does not function on branches named `--config=x.y` and such).

However, this rewrite accidentally changed the result order, which impacted Mercurial commit hisotry lists and graphs. Swap the order of the constraints so we get newest-to-oldest again, as expected.

Test Plan: Viewed a Mercurial repository's history graph, saw sensible chronology after the patch.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18817
---
 .../diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
index e36c0a124e..4c1d39e8c8 100644
--- a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
@@ -130,7 +130,7 @@ protected function getMercurialResult(ConduitAPIRequest $request) {
     } else {
       $path_arg = '';
       $revset_arg = hgsprintf(
-        'branch(%s) and reverse(ancestors(%s))',
+        'reverse(ancestors(%s)) and branch(%s)',
         $drequest->getBranch(),
         $commit_hash);
     }

From 50d5fa87a3fc0821cf7475a76d5aa1167cbc0949 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 5 Dec 2017 05:42:03 -0800
Subject: [PATCH 310/865] (stable) Restore the "Log In" menubar action

Summary:
See <https://discourse.phabricator-community.org/t/activation-link-in-welcome-mail-only-works-if-new-user-isnt-semi-logged-in/740/7>.

In T13024, I rewrote the main menu bar to hide potentially sensitive items (like notification and message counts and saved search filters) until users fully log in.

However, the "Log In" item got caught in this too. For clarity, rename `shouldAllowPartialSessions()` to `shouldRequireFullSession()` (since logged-out users don't have any session at all, so it would be a bit misleading to say that "Log In" "allows" a partial session). Then let "Log In" work again for logged-out users.

(In most cases, users are prompted to log in when they take an action which requires them to be logged in -- like creating or editing an object, or adding comments -- so this item doesn't really need to exist. However, it aligns better with user expectations in many cases to have it present, and some reasonable operations like "Check if I have notifications/messages" don't have an obvious thing to click otherwise.)

Test Plan: Viewed site in an incognito window, saw "Log In" button again. Browsed normally, saw normal menu.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18818
---
 .../auth/extension/PhabricatorAuthMainMenuBarExtension.php    | 4 ++++
 .../people/engineextension/PeopleMainMenuBarExtension.php     | 4 ++--
 src/view/page/menu/PhabricatorMainMenuBarExtension.php        | 4 ++--
 src/view/page/menu/PhabricatorMainMenuView.php                | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php b/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
index d9d251ab07..d9fb5d013b 100644
--- a/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
+++ b/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
@@ -9,6 +9,10 @@ public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
     return true;
   }
 
+  public function shouldRequireFullSession() {
+    return false;
+  }
+
   public function getExtensionOrder() {
     return 900;
   }
diff --git a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
index 01f1ba7cc1..bed9dde44e 100644
--- a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
+++ b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
@@ -9,8 +9,8 @@ public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
     return $viewer->isLoggedIn();
   }
 
-  public function shouldAllowPartialSessions() {
-    return true;
+  public function shouldRequireFullSession() {
+    return false;
   }
 
   public function getExtensionOrder() {
diff --git a/src/view/page/menu/PhabricatorMainMenuBarExtension.php b/src/view/page/menu/PhabricatorMainMenuBarExtension.php
index d893cccac9..e66b1f2c7d 100644
--- a/src/view/page/menu/PhabricatorMainMenuBarExtension.php
+++ b/src/view/page/menu/PhabricatorMainMenuBarExtension.php
@@ -51,8 +51,8 @@ public function isExtensionEnabled() {
     return true;
   }
 
-  public function shouldAllowPartialSessions() {
-    return false;
+  public function shouldRequireFullSession() {
+    return true;
   }
 
   public function isExtensionEnabledForViewer(PhabricatorUser $viewer) {
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index ba4bda41ea..ad9510f348 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -106,7 +106,7 @@ public function render() {
 
     if (!$is_full) {
       foreach ($extensions as $key => $extension) {
-        if (!$extension->shouldAllowPartialSessions()) {
+        if ($extension->shouldRequireFullSession()) {
           unset($extensions[$key]);
         }
       }

From 6d3baa92f90813b77b2acbc1e6860ada5f28f60c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 5 Dec 2017 06:47:48 -0800
Subject: [PATCH 311/865] Execute Herald again after promoting revisions out of
 the "Draft" state

Summary:
Fixes T13027. Ref T2543. When revisions promote from "Draft" because builds finish or no builds are configured, the status currently switches from "Draft" to "Needs Review" without re-running Herald.

This means that some rules -- notably, "Send me an email" rules -- don't fire as soon as they should.

Instead of applying this promotion in a hacky way inline, queue it and apply it normally in a second edit, after the current group finishes.

Test Plan:
  - Created a revision, reviewed Herald transcripts.
  - Saw three Herald passes:
    - First pass (revision creation) triggered builds and no email.
    - Second pass (builds finished) did not trigger builds (no update) and did not trigger email (revision still a draft).
    - Third pass (after promotion out of 'draft') did not trigger builds (no update) but did trigger email (revision no longer a draft).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13027, T2543

Differential Revision: https://secure.phabricator.com/D18819
---
 .../editor/DifferentialTransactionEditor.php  | 16 ++------
 ...entialRevisionRequestReviewTransaction.php | 14 ++++---
 ...habricatorApplicationTransactionEditor.php | 39 +++++++++++++++++++
 3 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index ae652ba0ec..b2fc179002 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1588,11 +1588,8 @@ protected function didApplyTransactions($object, array $xactions) {
           ->setAuthorPHID($author_phid)
           ->setTransactionType(
             DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE)
-          ->setOldValue(false)
           ->setNewValue(true);
 
-        $xaction = $this->populateTransaction($object, $xaction);
-
         // If we're creating this revision and immediately moving it out of
         // the draft state, mark this as a create transaction so it gets
         // hidden in the timeline and mail, since it isn't interesting: it
@@ -1601,15 +1598,10 @@ protected function didApplyTransactions($object, array $xactions) {
           $xaction->setIsCreateTransaction(true);
         }
 
-        $object->openTransaction();
-          $object
-            ->setStatus(DifferentialRevisionStatus::NEEDS_REVIEW)
-            ->save();
-
-          $xaction->save();
-        $object->saveTransaction();
-
-        $xactions[] = $xaction;
+        // Queue this transaction and apply it separately after the current
+        // batch of transactions finishes so that Herald can fire on the new
+        // revision state. See T13027 for discussion.
+        $this->queueTransaction($xaction);
       }
     }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
index 465b5234d5..ed0d20a0b6 100644
--- a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
@@ -57,11 +57,15 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'revisions.'));
     }
 
-    if (!$this->isViewerRevisionAuthor($object, $viewer)) {
-      throw new Exception(
-        pht(
-          'You can not request review of this revision because you are not '.
-          'the author of the revision.'));
+    // When revisions automatically promote out of "Draft" after builds finish,
+    // the viewer may be acting as the Harbormaster application.
+    if (!$viewer->isOmnipotent()) {
+      if (!$this->isViewerRevisionAuthor($object, $viewer)) {
+        throw new Exception(
+          pht(
+            'You can not request review of this revision because you are not '.
+            'the author of the revision.'));
+      }
     }
   }
 
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 175a5775ee..8e6d816769 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -70,6 +70,8 @@ abstract class PhabricatorApplicationTransactionEditor
   private $feedRelatedPHIDs = array();
   private $modularTypes;
 
+  private $transactionQueue = array();
+
   const STORAGE_ENCODING_BINARY = 'binary';
 
   /**
@@ -1174,6 +1176,8 @@ final public function applyTransactions(
         'priority' => PhabricatorWorker::PRIORITY_ALERTS,
       ));
 
+    $this->flushTransactionQueue($object);
+
     return $xactions;
   }
 
@@ -3864,4 +3868,39 @@ public function getCreateObjectTitleForFeed($author, $object) {
     return pht('%s created an object: %s.', $author, $object);
   }
 
+/* -(  Queue  )-------------------------------------------------------------- */
+
+  protected function queueTransaction(
+    PhabricatorApplicationTransaction $xaction) {
+    $this->transactionQueue[] = $xaction;
+    return $this;
+  }
+
+  private function flushTransactionQueue($object) {
+    if (!$this->transactionQueue) {
+      return;
+    }
+
+    $xactions = $this->transactionQueue;
+    $this->transactionQueue = array();
+
+    $editor = $this->newQueueEditor();
+
+    return $editor->applyTransactions($object, $xactions);
+  }
+
+  private function newQueueEditor() {
+    $editor = id(newv(get_class($this), array()))
+      ->setActor($this->getActor())
+      ->setContentSource($this->getContentSource())
+      ->setContinueOnNoEffect($this->getContinueOnNoEffect())
+      ->setContinueOnMissingFields($this->getContinueOnMissingFields());
+
+    if ($this->actingAsPHID !== null) {
+      $editor->setActingAsPHID($this->actingAsPHID);
+    }
+
+    return $editor;
+  }
+
 }

From 60e5c0ec1b3e13cb2b2f9b73525f8354c206c23f Mon Sep 17 00:00:00 2001
From: Tim Hirsh <thirsh@uber.com>
Date: Fri, 8 Dec 2017 11:54:42 -0500
Subject: [PATCH 312/865] Add drydock.blueprint.edit Conduit method

Summary:
Ref: https://admin.phacility.com/PHI243

Since our use case primarily focuses on transaction editing, this patch implements the `drydock.blueprint.edit` api method with the understanding that:
a) this is a work in progress
b) object editing is supported, but object creation is not yet implemented

Test Plan:
* updated existing blueprints via Conduit UI
* regression tested `maniphest.edit` by creating new and updating existing tasks

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin, yelirekim, jcox

Differential Revision: https://secure.phabricator.com/D18822
---
 src/__phutil_library_map__.php                |  2 ++
 .../DrydockBlueprintEditConduitAPIMethod.php  | 20 +++++++++++++++++++
 .../editor/DrydockBlueprintEditEngine.php     | 11 ++++++++++
 .../editengine/PhabricatorEditEngine.php      | 11 +++++++++-
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 11be8a50f0..35be621604 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1004,6 +1004,7 @@
     'DrydockBlueprintCustomField' => 'applications/drydock/customfield/DrydockBlueprintCustomField.php',
     'DrydockBlueprintDatasource' => 'applications/drydock/typeahead/DrydockBlueprintDatasource.php',
     'DrydockBlueprintDisableController' => 'applications/drydock/controller/DrydockBlueprintDisableController.php',
+    'DrydockBlueprintEditConduitAPIMethod' => 'applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php',
     'DrydockBlueprintEditController' => 'applications/drydock/controller/DrydockBlueprintEditController.php',
     'DrydockBlueprintEditEngine' => 'applications/drydock/editor/DrydockBlueprintEditEngine.php',
     'DrydockBlueprintEditor' => 'applications/drydock/editor/DrydockBlueprintEditor.php',
@@ -6090,6 +6091,7 @@
     'DrydockBlueprintCustomField' => 'PhabricatorCustomField',
     'DrydockBlueprintDatasource' => 'PhabricatorTypeaheadDatasource',
     'DrydockBlueprintDisableController' => 'DrydockBlueprintController',
+    'DrydockBlueprintEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'DrydockBlueprintEditController' => 'DrydockBlueprintController',
     'DrydockBlueprintEditEngine' => 'PhabricatorEditEngine',
     'DrydockBlueprintEditor' => 'PhabricatorApplicationTransactionEditor',
diff --git a/src/applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php b/src/applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php
new file mode 100644
index 0000000000..764c077d87
--- /dev/null
+++ b/src/applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php
@@ -0,0 +1,20 @@
+<?php
+
+final class DrydockBlueprintEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'drydock.blueprint.edit';
+  }
+
+  public function newEditEngine() {
+    return new DrydockBlueprintEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'WARNING: Apply transactions to edit an existing blueprint. This method '.
+      'can not create new blueprints.');
+  }
+
+}
diff --git a/src/applications/drydock/editor/DrydockBlueprintEditEngine.php b/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
index 06117272a9..020fe7514c 100644
--- a/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
+++ b/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
@@ -51,6 +51,17 @@ protected function newEditableObject() {
     return $blueprint;
   }
 
+  protected function newEditableObjectForDocumentation() {
+    // In order to generate the proper list of fields/transactions for a
+    // blueprint, a blueprint's type needs to be known upfront, and there's
+    // currently no way to pre-specify the type. Hardcoding an implementation
+    // here prevents the fatal on the Conduit API page and allows transactions
+    // to be edited.
+    $impl = new DrydockWorkingCopyBlueprintImplementation();
+    $this->setBlueprintImplementation($impl);
+    return $this->newEditableObject();
+  }
+
   protected function newObjectQuery() {
     return new DrydockBlueprintQuery();
   }
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 6c9cb5e201..8ba49f4d77 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -630,6 +630,15 @@ final public function getIsCreate() {
     return $this->isCreate;
   }
 
+  /**
+   * Initialize a new object for documentation creation.
+   *
+   * @return object Newly initialized object.
+   * @task load
+   */
+  protected function newEditableObjectForDocumentation() {
+    return $this->newEditableObject();
+  }
 
   /**
    * Flag this workflow as a create or edit.
@@ -2198,7 +2207,7 @@ public function getConduitEditTypes() {
       return array();
     }
 
-    $object = $this->newEditableObject();
+    $object = $this->newEditableObjectForDocumentation();
     $fields = $this->buildEditFields($object);
     return $this->getConduitEditTypesFromFields($fields);
   }

From c9a0d68340ba131d8c8c0b7180293607a19da625 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 11 Dec 2017 11:33:15 -0800
Subject: [PATCH 313/865] Allow Herald rules to add comments

Summary:
See PHI242. All use cases for this that I know of are pretty hacky, but they don't seem perilous, and it's easier than webhooks.

See P1895, T10183, and T9853 for me previously refusing to implement this since all those use cases were also pretty bad.

Test Plan:
  - Wrote a rule to add comments, saw it add comments.
  - Reviewed summary, re-edited rule, reviewed transcript to check that all the strings worked OK.
  - Wrote a new rule for a non-commentable object (a blog) to make sure I wasn't offered the "Add a comment" action.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18823
---
 resources/celerity/map.php                    | 26 +++---
 src/__phutil_library_map__.php                |  4 +
 .../herald/action/HeraldAction.php            |  3 +
 .../herald/action/HeraldCommentAction.php     | 79 +++++++++++++++++++
 .../herald/value/HeraldFieldValue.php         |  1 +
 .../herald/value/HeraldRemarkupFieldValue.php | 22 ++++++
 .../rsrc/css/application/herald/herald.css    |  6 ++
 .../js/application/herald/HeraldRuleEditor.js |  5 ++
 8 files changed, 133 insertions(+), 13 deletions(-)
 create mode 100644 src/applications/herald/action/HeraldCommentAction.php
 create mode 100644 src/applications/herald/value/HeraldRemarkupFieldValue.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 0ea66bec26..d937b91e4f 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -80,7 +80,7 @@
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
     'rsrc/css/application/harbormaster/harbormaster.css' => 'f491c9f4',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
-    'rsrc/css/application/herald/herald.css' => 'dc31f6e9',
+    'rsrc/css/application/herald/herald.css' => 'cd8d0134',
     'rsrc/css/application/maniphest/batch-editor.css' => 'b0f0b6d5',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
     'rsrc/css/application/maniphest/task-edit.css' => 'fda62a9b',
@@ -416,7 +416,7 @@
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/herald/HeraldRuleEditor.js' => 'd6a7e717',
+    'rsrc/js/application/herald/HeraldRuleEditor.js' => '2dff5579',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
     'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
@@ -578,8 +578,8 @@
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => 'b556a948',
     'harbormaster-css' => 'f491c9f4',
-    'herald-css' => 'dc31f6e9',
-    'herald-rule-editor' => 'd6a7e717',
+    'herald-css' => 'cd8d0134',
+    'herald-rule-editor' => '2dff5579',
     'herald-test-css' => 'a52e323e',
     'inline-comment-summary-css' => 'f23d4e8f',
     'javelin-aphlict' => 'e1d4b11a',
@@ -1106,6 +1106,15 @@
       'javelin-install',
       'javelin-event',
     ),
+    '2dff5579' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-json',
+      'phabricator-prefab',
+    ),
     '2ee659ce' => array(
       'javelin-install',
     ),
@@ -2001,15 +2010,6 @@
       'javelin-dom',
       'javelin-stratcom',
     ),
-    'd6a7e717' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-json',
-      'phabricator-prefab',
-    ),
     'd7a74243' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 35be621604..924e81a5ff 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1337,6 +1337,7 @@
     'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
     'HeraldBasicFieldGroup' => 'applications/herald/field/HeraldBasicFieldGroup.php',
     'HeraldBuildableState' => 'applications/herald/state/HeraldBuildableState.php',
+    'HeraldCommentAction' => 'applications/herald/action/HeraldCommentAction.php',
     'HeraldCommitAdapter' => 'applications/diffusion/herald/HeraldCommitAdapter.php',
     'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
     'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
@@ -1378,6 +1379,7 @@
     'HeraldProjectsField' => 'applications/project/herald/HeraldProjectsField.php',
     'HeraldRecursiveConditionsException' => 'applications/herald/engine/exception/HeraldRecursiveConditionsException.php',
     'HeraldRelatedFieldGroup' => 'applications/herald/field/HeraldRelatedFieldGroup.php',
+    'HeraldRemarkupFieldValue' => 'applications/herald/value/HeraldRemarkupFieldValue.php',
     'HeraldRemarkupRule' => 'applications/herald/remarkup/HeraldRemarkupRule.php',
     'HeraldRepetitionPolicyConfig' => 'applications/herald/config/HeraldRepetitionPolicyConfig.php',
     'HeraldRule' => 'applications/herald/storage/HeraldRule.php',
@@ -6488,6 +6490,7 @@
     'HeraldApplyTranscript' => 'Phobject',
     'HeraldBasicFieldGroup' => 'HeraldFieldGroup',
     'HeraldBuildableState' => 'HeraldState',
+    'HeraldCommentAction' => 'HeraldAction',
     'HeraldCommitAdapter' => array(
       'HeraldAdapter',
       'HarbormasterBuildableAdapterInterface',
@@ -6535,6 +6538,7 @@
     'HeraldProjectsField' => 'HeraldField',
     'HeraldRecursiveConditionsException' => 'Exception',
     'HeraldRelatedFieldGroup' => 'HeraldFieldGroup',
+    'HeraldRemarkupFieldValue' => 'HeraldFieldValue',
     'HeraldRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'HeraldRepetitionPolicyConfig' => 'Phobject',
     'HeraldRule' => array(
diff --git a/src/applications/herald/action/HeraldAction.php b/src/applications/herald/action/HeraldAction.php
index a2d589f9f2..04884a94d4 100644
--- a/src/applications/herald/action/HeraldAction.php
+++ b/src/applications/herald/action/HeraldAction.php
@@ -9,6 +9,7 @@ abstract class HeraldAction extends Phobject {
   const STANDARD_NONE = 'standard.none';
   const STANDARD_PHID_LIST = 'standard.phid.list';
   const STANDARD_TEXT = 'standard.text';
+  const STANDARD_REMARKUP = 'standard.remarkup';
 
   const DO_STANDARD_EMPTY = 'do.standard.empty';
   const DO_STANDARD_NO_EFFECT = 'do.standard.no-effect';
@@ -60,6 +61,8 @@ public function getHeraldActionValueType() {
         return new HeraldEmptyFieldValue();
       case self::STANDARD_TEXT:
         return new HeraldTextFieldValue();
+      case self::STANDARD_REMARKUP:
+        return new HeraldRemarkupFieldValue();
       case self::STANDARD_PHID_LIST:
         $tokenizer = id(new HeraldTokenizerFieldValue())
           ->setKey($this->getHeraldActionName())
diff --git a/src/applications/herald/action/HeraldCommentAction.php b/src/applications/herald/action/HeraldCommentAction.php
new file mode 100644
index 0000000000..fa52ba1f5f
--- /dev/null
+++ b/src/applications/herald/action/HeraldCommentAction.php
@@ -0,0 +1,79 @@
+<?php
+
+final class HeraldCommentAction extends HeraldAction {
+
+  const ACTIONCONST = 'comment';
+  const DO_COMMENT = 'do.comment';
+
+  public function getHeraldActionName() {
+    return pht('Add comment');
+  }
+
+  public function getActionGroupKey() {
+    return HeraldUtilityActionGroup::ACTIONGROUPKEY;
+  }
+
+  public function supportsObject($object) {
+    if (!($object instanceof PhabricatorApplicationTransactionInterface)) {
+      return false;
+    }
+
+    $xaction = $object->getApplicationTransactionTemplate();
+    try {
+      $comment = $xaction->getApplicationTransactionCommentObject();
+      if (!$comment) {
+        return false;
+      }
+    } catch (PhutilMethodNotImplementedException $ex) {
+      return false;
+    }
+
+    return true;
+  }
+
+  public function supportsRuleType($rule_type) {
+    return ($rule_type != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
+  }
+
+  public function applyEffect($object, HeraldEffect $effect) {
+    $adapter = $this->getAdapter();
+    $comment_text = $effect->getTarget();
+
+    $xaction = $adapter->newTransaction()
+      ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT);
+
+    $comment = $xaction->getApplicationTransactionCommentObject()
+      ->setContent($comment_text);
+
+    $xaction->attachComment($comment);
+
+    $adapter->queueTransaction($xaction);
+
+    $this->logEffect(self::DO_COMMENT, $comment_text);
+  }
+
+  public function getHeraldActionStandardType() {
+    return self::STANDARD_REMARKUP;
+  }
+
+  protected function getActionEffectMap() {
+    return array(
+      self::DO_COMMENT => array(
+        'icon' => 'fa-comment',
+        'color' => 'blue',
+        'name' => pht('Added Comment'),
+      ),
+    );
+  }
+
+  public function renderActionDescription($value) {
+    $summary = PhabricatorMarkupEngine::summarize($value);
+    return pht('Add comment: %s', $summary);
+  }
+
+  protected function renderActionEffectDescription($type, $data) {
+    $summary = PhabricatorMarkupEngine::summarize($data);
+    return pht('Added a comment: %s', $summary);
+  }
+
+}
diff --git a/src/applications/herald/value/HeraldFieldValue.php b/src/applications/herald/value/HeraldFieldValue.php
index b3f35968e2..c88776f53a 100644
--- a/src/applications/herald/value/HeraldFieldValue.php
+++ b/src/applications/herald/value/HeraldFieldValue.php
@@ -8,6 +8,7 @@ abstract class HeraldFieldValue extends Phobject {
   const CONTROL_TEXT = 'herald.control.text';
   const CONTROL_SELECT = 'herald.control.select';
   const CONTROL_TOKENIZER = 'herald.control.tokenizer';
+  const CONTROL_REMARKUP = 'herald.control.remarkup';
 
   abstract public function getFieldValueKey();
   abstract public function getControlType();
diff --git a/src/applications/herald/value/HeraldRemarkupFieldValue.php b/src/applications/herald/value/HeraldRemarkupFieldValue.php
new file mode 100644
index 0000000000..4740ec7342
--- /dev/null
+++ b/src/applications/herald/value/HeraldRemarkupFieldValue.php
@@ -0,0 +1,22 @@
+<?php
+
+final class HeraldRemarkupFieldValue
+  extends HeraldFieldValue {
+
+  public function getFieldValueKey() {
+    return 'remarkup';
+  }
+
+  public function getControlType() {
+    return self::CONTROL_REMARKUP;
+  }
+
+  public function renderFieldValue($value) {
+    return $value;
+  }
+
+  public function renderEditorValue($value) {
+    return $value;
+  }
+
+}
diff --git a/webroot/rsrc/css/application/herald/herald.css b/webroot/rsrc/css/application/herald/herald.css
index 17b09a1a86..806fef2ac1 100644
--- a/webroot/rsrc/css/application/herald/herald.css
+++ b/webroot/rsrc/css/application/herald/herald.css
@@ -37,6 +37,12 @@
   padding: 2px 4px;
 }
 
+.herald-action-table td textarea {
+  width: 95%;
+  height: 8em;
+  padding: 2px 4px;
+}
+
 .herald-action-table td.target {
   width: 100%;
 }
diff --git a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
index 8c6b46ba44..69eeea4a26 100644
--- a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
+++ b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
@@ -217,6 +217,11 @@ JX.install('HeraldRuleEditor', {
           get_fn = function() { return input.value; };
           set_fn = function(v) { input.value = v; };
           break;
+        case 'herald.control.remarkup':
+          input = JX.$N('textarea');
+          get_fn = function() { return input.value; };
+          set_fn = function(v) { input.value = v; };
+          break;
         case 'herald.control.select':
           var options;
 

From e34b4bbd907e96ec3f7578440773223476c7a014 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Dec 2017 05:35:56 -0800
Subject: [PATCH 314/865] Move the Git LFS gate to dedicated (non-prototype)
 config

Summary: See PHI131. Ref T7789. Although this probably isn't 100% complete, there don't seem to be any actual, known, practical blocking issues remaining (everything is either heresay or not reproducible).

Test Plan: Tried to push LFS locally, got blocked with a helpful message. Enabled setting, tried to push LFS locally, got a successful push.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T7789

Differential Revision: https://secure.phabricator.com/D18825
---
 .../config/PhabricatorDiffusionConfigOptions.php  | 15 ++++++++++++++-
 .../repository/storage/PhabricatorRepository.php  |  3 +--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
index 50f761eabc..d15fb678d5 100644
--- a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
+++ b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
@@ -101,7 +101,7 @@ public function getOptions() {
         ->setBoolOptions(
           array(
             pht('Allow HTTP Basic Auth'),
-            pht('Disable HTTP Basic Auth'),
+            pht('Disallow HTTP Basic Auth'),
           ))
         ->setSummary(pht('Enable HTTP Basic Auth for repositories.'))
         ->setDescription(
@@ -115,6 +115,19 @@ public function getOptions() {
             "barrier to attackers than SSH does.\n\n".
             "Consider using SSH for authenticated access to repositories ".
             "instead of HTTP.")),
+      $this->newOption('diffusion.allow-git-lfs', 'bool', false)
+        ->setBoolOptions(
+          array(
+            pht('Allow Git LFS'),
+            pht('Disallow Git LFS'),
+          ))
+        ->setLocked(true)
+        ->setSummary(pht('Allow Git Large File Storage (LFS).'))
+        ->setDescription(
+          pht(
+            'Phabricator supports Git LFS, a Git extension for storing large '.
+            'files alongside a repository. Activate this setting to allow '.
+            'the extension to store file data in Phabricator.')),
       $this->newOption('diffusion.ssh-user', 'string', null)
         ->setLocked(true)
         ->setSummary(pht('Login username for SSH connections to repositories.'))
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 713ed92270..702bb42780 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1627,8 +1627,7 @@ public function canUseGitLFS() {
       return false;
     }
 
-    // TODO: Unprototype this feature.
-    if (!PhabricatorEnv::getEnvConfig('phabricator.show-prototypes')) {
+    if (!PhabricatorEnv::getEnvConfig('diffusion.allow-git-lfs')) {
       return false;
     }
 

From 8e416474c06398857a990bb0bd6d4725ab17f100 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Dec 2017 05:52:39 -0800
Subject: [PATCH 315/865] Add a Herald pre-commit field for detecting LFS usage

Summary: Depends on D18825. Ref T7789. See PHI131. Allows installs to selectively disable LFS by adding Herald rules to block commits that use LFS.

Test Plan:
  - Wrote an LFS rule ("When commit uses git lfs, block commit").
  - Pushed an LFS commit: rejected.
  - Pushed a non-lFS commit: success.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T7789

Differential Revision: https://secure.phabricator.com/D18827
---
 src/__phutil_library_map__.php                |  2 +
 ...iffusionPreCommitUsesGitLFSHeraldField.php | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 src/applications/diffusion/herald/DiffusionPreCommitUsesGitLFSHeraldField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 924e81a5ff..f86b3a1d2d 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -821,6 +821,7 @@
     'DiffusionPreCommitRefRepositoryHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefRepositoryHeraldField.php',
     'DiffusionPreCommitRefRepositoryProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php',
     'DiffusionPreCommitRefTypeHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefTypeHeraldField.php',
+    'DiffusionPreCommitUsesGitLFSHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitUsesGitLFSHeraldField.php',
     'DiffusionPullEventGarbageCollector' => 'applications/diffusion/garbagecollector/DiffusionPullEventGarbageCollector.php',
     'DiffusionPushCapability' => 'applications/diffusion/capability/DiffusionPushCapability.php',
     'DiffusionPushEventViewController' => 'applications/diffusion/controller/DiffusionPushEventViewController.php',
@@ -5881,6 +5882,7 @@
     'DiffusionPreCommitRefRepositoryHeraldField' => 'DiffusionPreCommitRefHeraldField',
     'DiffusionPreCommitRefRepositoryProjectsHeraldField' => 'DiffusionPreCommitRefHeraldField',
     'DiffusionPreCommitRefTypeHeraldField' => 'DiffusionPreCommitRefHeraldField',
+    'DiffusionPreCommitUsesGitLFSHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPullEventGarbageCollector' => 'PhabricatorGarbageCollector',
     'DiffusionPushCapability' => 'PhabricatorPolicyCapability',
     'DiffusionPushEventViewController' => 'DiffusionPushLogController',
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitUsesGitLFSHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitUsesGitLFSHeraldField.php
new file mode 100644
index 0000000000..3a34db777c
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionPreCommitUsesGitLFSHeraldField.php
@@ -0,0 +1,41 @@
+<?php
+
+final class DiffusionPreCommitUsesGitLFSHeraldField
+  extends DiffusionPreCommitContentHeraldField {
+
+  const FIELDCONST = 'diffusion.pre.commit.git-lfs';
+
+  public function getHeraldFieldName() {
+    return pht('Commit uses Git LFS');
+  }
+
+  public function getFieldGroupKey() {
+    return DiffusionChangeHeraldFieldGroup::FIELDGROUPKEY;
+  }
+
+  public function getHeraldFieldValue($object) {
+    $map = $this->getAdapter()->getDiffContent('+');
+
+    // At the time of writing, all current Git LFS files begin with this
+    // line, verbatim:
+    //
+    //   version https://git-lfs.github.com/spec/v1
+    //
+    // ...but we don't try to match the specific version here, in the hopes
+    // that this might also detect future versions.
+    $pattern = '(^version\s*https://git-lfs.github.com/spec/)i';
+
+    foreach ($map as $path => $content) {
+      if (preg_match($pattern, $content)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_BOOL;
+  }
+
+}

From 5295840a4cf9c1c75e317ace5597a254e3e6b27b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Dec 2017 06:02:09 -0800
Subject: [PATCH 316/865] Restore the "Download from Git LFS" UI button to
 Diffusion

Summary: Depends on D18827. Ref T7789. See PHI204. See PHI131. This button got accidentally removed in Diffusion refactoring (`$data` is no longer used).

Test Plan: {F5321459}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T7789

Differential Revision: https://secure.phabricator.com/D18828
---
 .../diffusion/controller/DiffusionBrowseController.php       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 4985ac2bb7..77ec8e46ca 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -916,7 +916,8 @@ private function renderGitLFSButton() {
       ->setTag('a')
       ->setText($text)
       ->setHref($href)
-      ->setIcon($icon);
+      ->setIcon($icon)
+      ->setColor(PHUIButtonView::GREY);
   }
 
   private function buildDisplayRows(
@@ -1924,7 +1925,7 @@ private function buildGitLFSCorpus(PhabricatorRepositoryGitLFSRef $ref) {
 
     try {
       $file = $this->loadGitLFSFile($ref);
-      $data = $this->renderGitLFSButton();
+      $this->corpusButtons[] = $this->renderGitLFSButton();
     } catch (Exception $ex) {
       $severity = PHUIInfoView::SEVERITY_ERROR;
       $messages[] = pht('The data for this file could not be loaded.');

From e1d6bad864d4faccba5a63261d2a2800a39fd377 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Dec 2017 06:28:11 -0800
Subject: [PATCH 317/865] Stop trying to assess the image dimensions of large
 files and file chunks

Summary:
Depends on D18828. Ref T7789. See <https://discourse.phabricator-community.org/t/git-lfs-fails-with-large-images/584>.

Currently, when you upload a large (>4MB) image, we may try to assess the dimensions for the image and for each individual chunk.

At best, this is slow and not useful. At worst, it fatals or consumes a ton of memory and I/O we don't need to be using.

Instead:

  - Don't try to assess dimensions for chunked files.
  - Don't try to assess dimensions for the chunks themselves.
  - Squelch errors for bad data, etc., that `gd` can't actually read, since we recover sensibly.

Test Plan:
  - Created a 2048x2048 PNG in Photoshop using the "Random Noise" filter which weighs 8.5MB.
  - Uploaded it.
  - Before patch: got complaints in log about `imagecreatefromstring()` failing, although the actual upload went OK in my environment.
  - After patch: clean log, no attempt to detect the size of a big image.
  - Also uploaded a small image, got dimensions detected properly still.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T7789

Differential Revision: https://secure.phabricator.com/D18830
---
 .../FileUploadChunkConduitAPIMethod.php       |  1 +
 .../files/storage/PhabricatorFile.php         | 31 +++++++++++++++++--
 .../PhabricatorFileUploadSource.php           |  1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/applications/files/conduit/FileUploadChunkConduitAPIMethod.php b/src/applications/files/conduit/FileUploadChunkConduitAPIMethod.php
index b4d1a23a3f..eab46c4992 100644
--- a/src/applications/files/conduit/FileUploadChunkConduitAPIMethod.php
+++ b/src/applications/files/conduit/FileUploadChunkConduitAPIMethod.php
@@ -64,6 +64,7 @@ protected function execute(ConduitAPIRequest $request) {
     $params = array(
       'name' => $file->getMonogram().'.chunk-'.$chunk->getID(),
       'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+      'chunk' => true,
     );
 
     if ($mime_type !== null) {
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index c87623c68c..d3dc5208d2 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -40,6 +40,7 @@ final class PhabricatorFile extends PhabricatorFileDAO
   const METADATA_PROFILE = 'profile';
   const METADATA_STORAGE = 'storage';
   const METADATA_INTEGRITY = 'integrity';
+  const METADATA_CHUNK = 'chunk';
 
   const STATUS_ACTIVE = 'active';
   const STATUS_DELETED = 'deleted';
@@ -410,7 +411,7 @@ private static function buildFromFileData($data, array $params = array()) {
     try {
       $file->updateDimensions(false);
     } catch (Exception $ex) {
-      // Do nothing
+      // Do nothing.
     }
 
     $file->saveAndIndex();
@@ -1057,9 +1058,20 @@ public function updateDimensions($save = true) {
       throw new Exception(pht('Cannot retrieve image information.'));
     }
 
+    if ($this->getIsChunk()) {
+      throw new Exception(
+        pht('Refusing to assess image dimensions of file chunk.'));
+    }
+
+    $engine = $this->instantiateStorageEngine();
+    if ($engine->isChunkEngine()) {
+      throw new Exception(
+        pht('Refusing to assess image dimensions of chunked file.'));
+    }
+
     $data = $this->loadFileData();
 
-    $img = imagecreatefromstring($data);
+    $img = @imagecreatefromstring($data);
     if ($img === false) {
       throw new Exception(pht('Error when decoding image.'));
     }
@@ -1255,6 +1267,15 @@ public function setIsProfileImage($value) {
     return $this;
   }
 
+  public function getIsChunk() {
+    return idx($this->metadata, self::METADATA_CHUNK);
+  }
+
+  public function setIsChunk($value) {
+    $this->metadata[self::METADATA_CHUNK] = $value;
+    return $this;
+  }
+
   public function setIntegrityHash($integrity_hash) {
     $this->metadata[self::METADATA_INTEGRITY] = $integrity_hash;
     return $this;
@@ -1339,6 +1360,7 @@ private function readPropertiesFromParameters(array $params) {
         'mime-type' => 'optional string',
         'builtin' => 'optional string',
         'storageEngines' => 'optional list<PhabricatorFileStorageEngine>',
+        'chunk' => 'optional bool',
       ));
 
     $file_name = idx($params, 'name');
@@ -1416,6 +1438,11 @@ private function readPropertiesFromParameters(array $params) {
       $this->setMimeType($mime_type);
     }
 
+    $is_chunk = idx($params, 'chunk');
+    if ($is_chunk) {
+      $this->setIsChunk(true);
+    }
+
     return $this;
   }
 
diff --git a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
index e3242af329..bbd93a455a 100644
--- a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
+++ b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
@@ -189,6 +189,7 @@ private function writeChunk(
     $params = array(
       'name' => $file->getMonogram().'.chunk-'.$offset,
       'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+      'chunk' => true,
     );
 
     // If this isn't the initial chunk, provide a dummy MIME type so we do not

From a1ad184ddd8cd7d788320e871c36b4c1a144fc2c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Dec 2017 07:36:06 -0800
Subject: [PATCH 318/865] Denormalize added and removed line counts for the
 current diff onto revisions

Summary:
See PHI230. Currently, we denormalize raw line counts onto diffs and revisions, but not added/removed line counts.

I'd like to try a `[---+  ]` sort of size hint element (see D16322 for more) as a general approach to conveying size information at a glance and see how it feels, since I think the raw size number isn't very scannable/useful and it may be a significant improvement to hint about how much of a change is throwing stuff out vs adding new stuff.

This just makes the data available without any subquerying and doesn't actually change the UI.

Test Plan:
Created a revision, saw detailed change information populate in the database.

```
mysql> select * from differential_revision where id = 292\G
*************************** 1. row ***************************
              id: 292
           title: WIP
   originalTitle: WIP
            phid: PHID-DREV-ux3cxptibn3l5pxsug3z
          status: draft
         summary: asdf
        testPlan: asdf
      authorPHID: PHID-USER-cvfydnwadpdj7vdon36z
lastReviewerPHID: NULL
       lineCount: 41
     dateCreated: 1513179418
    dateModified: 1513179418
        attached: []
         mailKey: h4mn6perdio47o4beomyvu75zezwvredx3mbrlgz
      branchName: NULL
      viewPolicy: users
      editPolicy: users
  repositoryPHID: PHID-REPO-wif5lutk5gn3y6ursk4p
      properties: {"lines.added":40,"lines.removed":1}
  activeDiffPHID: PHID-DIFF-ixjphpunpkenqgukpmce
1 row in set (0.00 sec)
```

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18832
---
 .../editor/DifferentialTransactionEditor.php  | 24 ++++++++++++++++++-
 .../storage/DifferentialRevision.php          | 17 +++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index b2fc179002..e6dfed88a7 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -132,12 +132,14 @@ protected function applyCustomInternalTransaction(
 
         $diff = $this->requireDiff($xaction->getNewValue());
 
-        $object->setLineCount($diff->getLineCount());
+        $this->updateRevisionLineCounts($object, $diff);
+
         if ($this->repositoryPHIDOverride !== false) {
           $object->setRepositoryPHID($this->repositoryPHIDOverride);
         } else {
           $object->setRepositoryPHID($diff->getRepositoryPHID());
         }
+
         $object->attachActiveDiff($diff);
         $object->setActiveDiffPHID($diff->getPHID());
         return;
@@ -1645,5 +1647,25 @@ private function hasActiveBuilds($object) {
     return true;
   }
 
+  private function updateRevisionLineCounts(
+    DifferentialRevision $revision,
+    DifferentialDiff $diff) {
+
+    $revision->setLineCount($diff->getLineCount());
+
+    $conn = $revision->establishConnection('r');
+
+    $row = queryfx_one(
+      $conn,
+      'SELECT SUM(addLines) A, SUM(delLines) D FROM %T
+        WHERE diffID = %d',
+      id(new DifferentialChangeset())->getTableName(),
+      $diff->getID());
+
+    if ($row) {
+      $revision->setAddedLineCount((int)$row['A']);
+      $revision->setRemovedLineCount((int)$row['D']);
+    }
+  }
 
 }
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 73f22c91e4..2c82de164a 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -61,6 +61,8 @@ final class DifferentialRevision extends DifferentialDAO
   const PROPERTY_CLOSED_FROM_ACCEPTED = 'wasAcceptedBeforeClose';
   const PROPERTY_DRAFT_HOLD = 'draft.hold';
   const PROPERTY_HAS_BROADCAST = 'draft.broadcast';
+  const PROPERTY_LINES_ADDED = 'lines.added';
+  const PROPERTY_LINES_REMOVED = 'lines.removed';
 
   public static function initializeNewRevision(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
@@ -728,6 +730,21 @@ public function setHasBroadcast($has_broadcast) {
     return $this->setProperty(self::PROPERTY_HAS_BROADCAST, $has_broadcast);
   }
 
+  public function setAddedLineCount($count) {
+    return $this->setProperty(self::PROPERTY_LINES_ADDED, $count);
+  }
+
+  public function getAddedLineCount() {
+    return $this->getProperty(self::PROPERTY_LINES_ADDED);
+  }
+
+  public function setRemovedLineCount($count) {
+    return $this->setProperty(self::PROPERTY_LINES_REMOVED, $count);
+  }
+
+  public function getRemovedLineCount() {
+    return $this->getProperty(self::PROPERTY_LINES_REMOVED);
+  }
 
   public function loadActiveBuilds(PhabricatorUser $viewer) {
     $diff = $this->getActiveDiff();

From 7cbbe2ccf793fe29d1cb7b6a7081f57da1f24795 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Dec 2017 07:05:07 -0800
Subject: [PATCH 319/865] When users browse to a submodule path in Diffusion
 explicitly, don't fatal

Summary: Ref T13030. See PHI254. This behavior could be cleaner than I've made it, but it fixes the "this is totally broken" issue, replacing a fatal/exception with an informative (just not terribly useful) page.

Test Plan:
  - Added a submodule to a repository.
  - In Diffusion, clicked some other file next to the submodule, then edited the URI to the submodule path instead.
    - Before patch: fatal.
    - After patch: relatively useful message about this being a submodule.

Note that it's normally hard to hit this URI directly. In the browse view, submodules are marked up as directories and linked to a separate submodule resolution flow.

{F5321524}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13030

Differential Revision: https://secure.phabricator.com/D18831
---
 .../DiffusionBrowseQueryConduitAPIMethod.php  | 30 +++++++++++++++++++
 .../data/DiffusionBrowseResultSet.php         |  1 +
 .../view/DiffusionEmptyResultView.php         |  7 +++++
 3 files changed, 38 insertions(+)

diff --git a/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
index 7ff0f6725a..2e272d69a7 100644
--- a/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
@@ -52,6 +52,36 @@ protected function getGitResult(ConduitAPIRequest $request) {
           $commit,
           $path);
       } catch (CommandException $e) {
+        // The "cat-file" command may fail if the path legitimately does not
+        // exist, but it may also fail if the path is a submodule. This can
+        // produce either "Not a valid object name" or "could not get object
+        // info".
+
+        // To detect if we have a submodule, use `git ls-tree`. If the path
+        // is a submodule, we'll get a "160000" mode mask with type "commit".
+
+        list($sub_err, $sub_stdout) = $repository->execLocalCommand(
+          'ls-tree %s -- %s',
+          $commit,
+          $path);
+        if (!$sub_err) {
+          // If the path failed "cat-file" but "ls-tree" worked, we assume it
+          // must be a submodule. If it is, the output will look something
+          // like this:
+          //
+          //   160000 commit <hash> <path>
+          //
+          // We make sure it has the 160000 mode mask to confirm that it's
+          // definitely a submodule.
+          $mode = (int)$sub_stdout;
+          if ($mode & 160000) {
+            $submodule_reason = DiffusionBrowseResultSet::REASON_IS_SUBMODULE;
+            $result
+              ->setReasonForEmptyResultSet($submodule_reason);
+            return $result;
+          }
+        }
+
         $stderr = $e->getStderr();
         if (preg_match('/^fatal: Not a valid object name/', $stderr)) {
           // Grab two logs, since the first one is when the object was deleted.
diff --git a/src/applications/diffusion/data/DiffusionBrowseResultSet.php b/src/applications/diffusion/data/DiffusionBrowseResultSet.php
index 2208aca505..22d9e08251 100644
--- a/src/applications/diffusion/data/DiffusionBrowseResultSet.php
+++ b/src/applications/diffusion/data/DiffusionBrowseResultSet.php
@@ -3,6 +3,7 @@
 final class DiffusionBrowseResultSet extends Phobject {
 
   const REASON_IS_FILE              = 'is-file';
+  const REASON_IS_SUBMODULE         = 'is-submodule';
   const REASON_IS_DELETED           = 'is-deleted';
   const REASON_IS_NONEXISTENT       = 'nonexistent';
   const REASON_BAD_COMMIT           = 'bad-commit';
diff --git a/src/applications/diffusion/view/DiffusionEmptyResultView.php b/src/applications/diffusion/view/DiffusionEmptyResultView.php
index 12def83e76..c818267268 100644
--- a/src/applications/diffusion/view/DiffusionEmptyResultView.php
+++ b/src/applications/diffusion/view/DiffusionEmptyResultView.php
@@ -40,6 +40,13 @@ public function render() {
         $body = pht('This path was an empty directory at %s.', $commit);
         $severity = PHUIInfoView::SEVERITY_NOTICE;
         break;
+      case DiffusionBrowseResultSet::REASON_IS_SUBMODULE:
+        $title = pht('Submodule');
+        // TODO: We could improve this, but it is normally difficult to
+        // reach this page for a submodule.
+        $body = pht('This path was a submodule at %s.', $commit);
+        $severity = PHUIInfoView::SEVERITY_NOTICE;
+        break;
       case DiffusionBrowseResultSet::REASON_IS_DELETED:
         $deleted = $this->browseResultSet->getDeletedAtCommit();
         $existed = $this->browseResultSet->getExistedAtCommit();

From 8dccf05c4c1af535ca1310e9e893bd2e4d316db3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 20 Dec 2017 09:47:40 -0800
Subject: [PATCH 320/865] Manually set "max_allowed_packet" to 1GB for
 "mysqldump"

Summary:
We have one production instance with failing database backups since they recently uploaded a 52MB hunk. The production configuration specifies a 64MB "max_allowed_packet" in `[mysqld]`, but this doesn't apply to `mysqldump` (we'd need to specify it in a separate `[mysqldump]` section) and `mysqldump` runs with an effective limit of the default (16MB).

We could change our production config to specify a value in `[mysqldump]`, but just change it unconditionally at execution time since there's no reason for any user to ever want this command to fail because they have too much data.

Test Plan: Dumped locally, will verify production backup goes through cleanly.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18834
---
 .../PhabricatorStorageManagementDumpWorkflow.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index 88bd80a9a8..d5f1da9ecf 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -187,6 +187,22 @@ public function didExecute(PhutilArgumentParser $args) {
     $argv[] = '-h';
     $argv[] = $host;
 
+    // MySQL's default "max_allowed_packet" setting is fairly conservative
+    // (16MB). If we try to dump a row which is larger than this limit, the
+    // dump will fail.
+
+    // We encourage users to increase this limit during setup, but modifying
+    // the "[mysqld]" section of the configuration file (instead of
+    // "[mysqldump]" section) won't apply to "mysqldump" and we can not easily
+    // detect what the "mysqldump" setting is.
+
+    // Since no user would ever reasonably want a dump to fail because a row
+    // was too large, just manually force this setting to the largest supported
+    // value.
+
+    $argv[] = '--max-allowed-packet';
+    $argv[] = '1G';
+
     if ($port) {
       $argv[] = '--port';
       $argv[] = $port;

From f56124dc93c3ed342dd9a687b8c07fe0d5f10410 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 20 Dec 2017 09:47:40 -0800
Subject: [PATCH 321/865] (stable) Manually set "max_allowed_packet" to 1GB for
 "mysqldump"

Summary:
We have one production instance with failing database backups since they recently uploaded a 52MB hunk. The production configuration specifies a 64MB "max_allowed_packet" in `[mysqld]`, but this doesn't apply to `mysqldump` (we'd need to specify it in a separate `[mysqldump]` section) and `mysqldump` runs with an effective limit of the default (16MB).

We could change our production config to specify a value in `[mysqldump]`, but just change it unconditionally at execution time since there's no reason for any user to ever want this command to fail because they have too much data.

Test Plan: Dumped locally, will verify production backup goes through cleanly.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18834
---
 .../PhabricatorStorageManagementDumpWorkflow.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
index 88bd80a9a8..d5f1da9ecf 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -187,6 +187,22 @@ public function didExecute(PhutilArgumentParser $args) {
     $argv[] = '-h';
     $argv[] = $host;
 
+    // MySQL's default "max_allowed_packet" setting is fairly conservative
+    // (16MB). If we try to dump a row which is larger than this limit, the
+    // dump will fail.
+
+    // We encourage users to increase this limit during setup, but modifying
+    // the "[mysqld]" section of the configuration file (instead of
+    // "[mysqldump]" section) won't apply to "mysqldump" and we can not easily
+    // detect what the "mysqldump" setting is.
+
+    // Since no user would ever reasonably want a dump to fail because a row
+    // was too large, just manually force this setting to the largest supported
+    // value.
+
+    $argv[] = '--max-allowed-packet';
+    $argv[] = '1G';
+
     if ($port) {
       $argv[] = '--port';
       $argv[] = $port;

From e411d75964e51686ce95d9a9cc245193160f9f70 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Dec 2017 06:26:38 -0800
Subject: [PATCH 322/865] Fix an issue where blame could fatal for unrecognized
 authors

Summary: See PHI255. See <https://discourse.phabricator-community.org/t/error-generating-blame-data/766>.

Test Plan:
  - Viewed a file contributed to by users with no Phabricator user accounts, in Diffusion.
  - Enabled blame.
  - Before patch: blame failed, fatal in logs.
  - After patch: blame worked.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18833
---
 .../controller/DiffusionBrowseController.php       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 77ec8e46ca..92181ff551 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1804,10 +1804,17 @@ private function renderAuthorLinks(array $authors, $handles) {
         // revision. We just render a blank for alignment.
         $style = null;
         $href = null;
+        $sigil = null;
+        $meta = null;
       } else {
         $src = $handles[$phid]->getImageURI();
         $style = 'background-image: url('http://github.com/.$src.');';
         $href = $handles[$phid]->getURI();
+        $sigil = 'has-tooltip';
+        $meta = array(
+          'tip' => $handles[$phid]->getName(),
+          'align' => 'E',
+        );
       }
 
       $links[$phid] = javelin_tag(
@@ -1816,11 +1823,8 @@ private function renderAuthorLinks(array $authors, $handles) {
           'class' => 'diffusion-author-link',
           'style' => $style,
           'href' => $href,
-          'sigil' => 'has-tooltip',
-          'meta' => array(
-            'tip' => $handles[$phid]->getName(),
-            'align' => 'E',
-          ),
+          'sigil' => $sigil,
+          'meta' => $meta,
         ));
     }
 

From 563d42d40e15d2adf1ff5ae3958a853846f304a7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 18 Dec 2017 06:26:38 -0800
Subject: [PATCH 323/865] (stable) Fix an issue where blame could fatal for
 unrecognized authors

Summary: See PHI255. See <https://discourse.phabricator-community.org/t/error-generating-blame-data/766>.

Test Plan:
  - Viewed a file contributed to by users with no Phabricator user accounts, in Diffusion.
  - Enabled blame.
  - Before patch: blame failed, fatal in logs.
  - After patch: blame worked.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18833
---
 .../controller/DiffusionBrowseController.php       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 77ec8e46ca..92181ff551 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1804,10 +1804,17 @@ private function renderAuthorLinks(array $authors, $handles) {
         // revision. We just render a blank for alignment.
         $style = null;
         $href = null;
+        $sigil = null;
+        $meta = null;
       } else {
         $src = $handles[$phid]->getImageURI();
         $style = 'background-image: url('http://github.com/.$src.');';
         $href = $handles[$phid]->getURI();
+        $sigil = 'has-tooltip';
+        $meta = array(
+          'tip' => $handles[$phid]->getName(),
+          'align' => 'E',
+        );
       }
 
       $links[$phid] = javelin_tag(
@@ -1816,11 +1823,8 @@ private function renderAuthorLinks(array $authors, $handles) {
           'class' => 'diffusion-author-link',
           'style' => $style,
           'href' => $href,
-          'sigil' => 'has-tooltip',
-          'meta' => array(
-            'tip' => $handles[$phid]->getName(),
-            'align' => 'E',
-          ),
+          'sigil' => $sigil,
+          'meta' => $meta,
         ));
     }
 

From 393824656fcc222b8e0e9a87614ca189794d8208 Mon Sep 17 00:00:00 2001
From: Dmitri Iouchtchenko <johnnyspoon@gmail.com>
Date: Thu, 21 Dec 2017 12:46:45 -0800
Subject: [PATCH 324/865] Don't notify without notifiable attendees

Summary: Events with no attendees (e.g. fresh instances of recurring events) would trigger an exception when sending notifications, because `$attendee_map` would still get populated.

Test Plan: Declined event, restarted daemons. Did not see exception. Accepted event, restarted daemons. Saw "[Calendar] [Reminder]" email.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D18835
---
 .../notifications/PhabricatorCalendarNotificationEngine.php  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/applications/calendar/notifications/PhabricatorCalendarNotificationEngine.php b/src/applications/calendar/notifications/PhabricatorCalendarNotificationEngine.php
index 4ae007fc0c..59d8476c87 100644
--- a/src/applications/calendar/notifications/PhabricatorCalendarNotificationEngine.php
+++ b/src/applications/calendar/notifications/PhabricatorCalendarNotificationEngine.php
@@ -100,10 +100,11 @@ private function sendNotifications() {
         }
         $notifiable_phids[] = $invitee->getInviteePHID();
       }
-      if (!$notifiable_phids) {
+      if ($notifiable_phids) {
+        $attendee_map[$key] = array_fuse($notifiable_phids);
+      } else {
         unset($events[$key]);
       }
-      $attendee_map[$key] = array_fuse($notifiable_phids);
     }
     if (!$attendee_map) {
       // None of the events have any notifiable attendees, so there is no

From 84cf4938798473a4e0c370702fae56d24116052f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 23 Dec 2017 08:36:58 -0800
Subject: [PATCH 325/865] Allow "Manage" to be the default menu item for
 projects

Summary:
Fixes T13033. Currently (prior to D18836) all the default items for projects can be hidden. When this occurs, the main project page fatals.

If we fix the fatal narrowly (don't try to call `null->getBuiltinKey()` when `$default` is `null`), it would 404, which is a little better but not by much.

After D18836 you can't hide "Profile", which is pretty sensible, and effectively fixes this. This change doubles down: let "Manage" be a default, and send the user there if we can't find a different default.

Ideally, the MenuEngine itself will do more rendering eventually (as it does for some of the newer Home stuff) and could handle this defaulting behavior with less special casing, but we'd still end up in a similar situation if a project had only one "Link" item to "coolcats.com" or something: redirecting the user to "coolcats.com" is probably better than fataling, but not by a huge margin, and not likely to be what they expect.

Test Plan:
Before D18836, disabled both "Profile" and "Workboard" items on a project. Visited project page.

Before patch: fatal. After patch: manage page.

After D18836, you can't do this and just get the profile, so this is sort of moot and mostly future-proofing/for-completeness.

Reviewers: 20after4, amckinley

Reviewed By: amckinley

Maniphest Tasks: T13033

Differential Revision: https://secure.phabricator.com/D18843
---
 .../controller/PhabricatorProjectViewController.php   | 11 +++++++++++
 .../PhabricatorProjectManageProfileMenuItem.php       |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/src/applications/project/controller/PhabricatorProjectViewController.php b/src/applications/project/controller/PhabricatorProjectViewController.php
index 7d5dc37e0b..2e53fe7276 100644
--- a/src/applications/project/controller/PhabricatorProjectViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectViewController.php
@@ -20,6 +20,14 @@ public function handleRequest(AphrontRequest $request) {
     $engine = $this->getProfileMenuEngine();
     $default = $engine->getDefaultItem();
 
+    // If defaults are broken somehow, serve the manage page. See T13033 for
+    // discussion.
+    if ($default) {
+      $default_key = $default->getBuiltinKey();
+    } else {
+      $default_key = PhabricatorProject::ITEM_MANAGE;
+    }
+
     switch ($default->getBuiltinKey()) {
       case PhabricatorProject::ITEM_WORKBOARD:
         $controller_object = new PhabricatorProjectBoardViewController();
@@ -27,6 +35,9 @@ public function handleRequest(AphrontRequest $request) {
       case PhabricatorProject::ITEM_PROFILE:
         $controller_object = new PhabricatorProjectProfileController();
         break;
+      case PhabricatorProject::ITEM_MANAGE:
+        $controller_object = new PhabricatorProjectManageController();
+        break;
       default:
         return $engine->buildResponse();
     }
diff --git a/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php b/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
index ddb59ec095..1bd7e796dc 100644
--- a/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
+++ b/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
@@ -18,6 +18,11 @@ public function canHideMenuItem(
     return false;
   }
 
+  public function canMakeDefault(
+    PhabricatorProfileMenuItemConfiguration $config) {
+    return true;
+  }
+
   public function getDisplayName(
     PhabricatorProfileMenuItemConfiguration $config) {
     $name = $config->getMenuItemProperty('name');

From bd5aa0c90fd1816830948a9e118a9e514145f813 Mon Sep 17 00:00:00 2001
From: Mukunda Modell <mmodell@wikimedia.org>
Date: Sat, 23 Dec 2017 11:38:05 -0800
Subject: [PATCH 326/865] Prevent hiding the
 PhabricatorProjectDetailsProfileMenuItem

Summary: This probably isn't the best solution, however, it conveniently avoids the bug from T13033. It would probably be more user-friendly (but more difficult to implement) if we allowed either Project Details //or// Workboard to be hidden but not both.

Test Plan: Tested locally, indeed this prevents hiding the menu item.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18836
---
 .../menuitem/PhabricatorProjectDetailsProfileMenuItem.php    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/applications/project/menuitem/PhabricatorProjectDetailsProfileMenuItem.php b/src/applications/project/menuitem/PhabricatorProjectDetailsProfileMenuItem.php
index 96619b8ec5..b779f4be90 100644
--- a/src/applications/project/menuitem/PhabricatorProjectDetailsProfileMenuItem.php
+++ b/src/applications/project/menuitem/PhabricatorProjectDetailsProfileMenuItem.php
@@ -13,6 +13,11 @@ private function getDefaultName() {
     return pht('Project Details');
   }
 
+  public function canHideMenuItem(
+    PhabricatorProfileMenuItemConfiguration $config) {
+    return false;
+  }
+
   public function canMakeDefault(
     PhabricatorProfileMenuItemConfiguration $config) {
     return true;

From 66b74073be68007ae918e4e4115df8b9b8c68fe8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 22 Dec 2017 09:59:43 -0800
Subject: [PATCH 327/865] Provide ANSI color information for Harbormaster build
 status via API

Summary:
Ref PHI261. This moves Harbormaster build status to work more similarly to other modern status types, like Differential revision status, where we try to specify as much behavior on the server as possible so that the client and server can vary independently.

(I don't have any specific plans to make Harbormaster build status configurable on the server side, but it isn't out of the question.)

Test Plan: Ran `harbormaster.querybuilds` (saw same data as before) and `harbormaster.build.search` (saw same data as before, plus new ANSI color data).

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D18838
---
 ...arbormasterQueryBuildsConduitAPIMethod.php |  10 ++
 .../constants/HarbormasterBuildStatus.php     | 128 +++++++++++-------
 .../storage/build/HarbormasterBuild.php       |   2 +
 3 files changed, 88 insertions(+), 52 deletions(-)

diff --git a/src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php b/src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php
index a76f53a362..c4622a902c 100644
--- a/src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php
+++ b/src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php
@@ -65,6 +65,16 @@ protected function execute(ConduitAPIRequest $request) {
       $fields = idx($build_data, 'fields', array());
       unset($build_data['fields']);
       unset($build_data['attachments']);
+
+      // To retain backward compatibility, remove newer keys from the
+      // result array.
+      $fields['buildStatus'] = array_select_keys(
+        $fields['buildStatus'],
+        array(
+          'value',
+          'name',
+        ));
+
       $data[] = array_mergev(array($build_data, $querybuilds, $fields));
     }
 
diff --git a/src/applications/harbormaster/constants/HarbormasterBuildStatus.php b/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
index a2cdba5b63..b0e3105d78 100644
--- a/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
+++ b/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
@@ -55,67 +55,28 @@ final class HarbormasterBuildStatus extends Phobject {
    * @return string Human-readable name.
    */
   public static function getBuildStatusName($status) {
-    $map = self::getBuildStatusMap();
-    return idx($map, $status, pht('Unknown ("%s")', $status));
+    $spec = self::getBuildStatusSpec($status);
+    return idx($spec, 'name', pht('Unknown ("%s")', $status));
   }
 
   public static function getBuildStatusMap() {
-    return array(
-      self::STATUS_INACTIVE => pht('Inactive'),
-      self::STATUS_PENDING => pht('Pending'),
-      self::STATUS_BUILDING => pht('Building'),
-      self::STATUS_PASSED => pht('Passed'),
-      self::STATUS_FAILED => pht('Failed'),
-      self::STATUS_ABORTED => pht('Aborted'),
-      self::STATUS_ERROR => pht('Unexpected Error'),
-      self::STATUS_PAUSED => pht('Paused'),
-      self::STATUS_DEADLOCKED => pht('Deadlocked'),
-    );
+    $specs = self::getBuildStatusSpecMap();
+    return ipull($specs, 'name');
   }
 
   public static function getBuildStatusIcon($status) {
-    switch ($status) {
-      case self::STATUS_INACTIVE:
-      case self::STATUS_PENDING:
-        return PHUIStatusItemView::ICON_OPEN;
-      case self::STATUS_BUILDING:
-        return PHUIStatusItemView::ICON_RIGHT;
-      case self::STATUS_PASSED:
-        return PHUIStatusItemView::ICON_ACCEPT;
-      case self::STATUS_FAILED:
-        return PHUIStatusItemView::ICON_REJECT;
-      case self::STATUS_ABORTED:
-        return PHUIStatusItemView::ICON_MINUS;
-      case self::STATUS_ERROR:
-        return PHUIStatusItemView::ICON_MINUS;
-      case self::STATUS_PAUSED:
-        return PHUIStatusItemView::ICON_MINUS;
-      case self::STATUS_DEADLOCKED:
-        return PHUIStatusItemView::ICON_WARNING;
-      default:
-        return PHUIStatusItemView::ICON_QUESTION;
-    }
+    $spec = self::getBuildStatusSpec($status);
+    return idx($spec, 'icon', 'fa-question-circle');
   }
 
   public static function getBuildStatusColor($status) {
-    switch ($status) {
-      case self::STATUS_INACTIVE:
-        return 'dark';
-      case self::STATUS_PENDING:
-      case self::STATUS_BUILDING:
-        return 'blue';
-      case self::STATUS_PASSED:
-        return 'green';
-      case self::STATUS_FAILED:
-      case self::STATUS_ABORTED:
-      case self::STATUS_ERROR:
-      case self::STATUS_DEADLOCKED:
-        return 'red';
-      case self::STATUS_PAUSED:
-        return 'dark';
-      default:
-        return 'bluegrey';
-    }
+    $spec = self::getBuildStatusSpec($status);
+    return idx($spec, 'color', 'bluegrey');
+  }
+
+  public static function getBuildStatusANSIColor($status) {
+    $spec = self::getBuildStatusSpec($status);
+    return idx($spec, 'color.ansi', 'magenta');
   }
 
   public static function getWaitingStatusConstants() {
@@ -142,4 +103,67 @@ public static function getCompletedStatusConstants() {
     );
   }
 
+  private static function getBuildStatusSpecMap() {
+    return array(
+      self::STATUS_INACTIVE => array(
+        'name' => pht('Inactive'),
+        'icon' => 'fa-circle-o',
+        'color' => 'dark',
+        'color.ansi' => 'yellow',
+      ),
+      self::STATUS_PENDING => array(
+        'name' => pht('Pending'),
+        'icon' => 'fa-circle-o',
+        'color' => 'blue',
+        'color.ansi' => 'yellow',
+      ),
+      self::STATUS_BUILDING => array(
+        'name' => pht('Building'),
+        'icon' => 'fa-chevron-circle-right',
+        'color' => 'blue',
+        'color.ansi' => 'yellow',
+      ),
+      self::STATUS_PASSED => array(
+        'name' => pht('Passed'),
+        'icon' => 'fa-check-circle',
+        'color' => 'green',
+        'color.ansi' => 'green',
+      ),
+      self::STATUS_FAILED => array(
+        'name' => pht('Failed'),
+        'icon' => 'fa-times-circle',
+        'color' => 'red',
+        'color.ansi' => 'red',
+      ),
+      self::STATUS_ABORTED => array(
+        'name' => pht('Aborted'),
+        'icon' => 'fa-minus-circle',
+        'color' => 'red',
+        'color.ansi' => 'red',
+      ),
+      self::STATUS_ERROR => array(
+        'name' => pht('Unexpected Error'),
+        'icon' => 'fa-minus-circle',
+        'color' => 'red',
+        'color.ansi' => 'red',
+      ),
+      self::STATUS_PAUSED => array(
+        'name' => pht('Paused'),
+        'icon' => 'fa-minus-circle',
+        'color' => 'dark',
+        'color.ansi' => 'yellow',
+      ),
+      self::STATUS_DEADLOCKED => array(
+        'name' => pht('Deadlocked'),
+        'icon' => 'fa-exclamation-circle',
+        'color' => 'red',
+        'color.ansi' => 'red',
+      ),
+    );
+  }
+
+  private static function getBuildStatusSpec($status) {
+    return idx(self::getBuildStatusSpecMap(), $status, array());
+  }
+
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
index 958eaa1f2b..92d4293913 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
@@ -435,6 +435,8 @@ public function getFieldValuesForConduit() {
       'buildStatus' => array(
         'value' => $status,
         'name' => HarbormasterBuildStatus::getBuildStatusName($status),
+        'color.ansi' =>
+          HarbormasterBuildStatus::getBuildStatusANSIColor($status),
       ),
       'initiatorPHID' => nonempty($this->getInitiatorPHID(), null),
       'name' => $this->getName(),

From ad4db9b2f3f83ab2506de9897d159917454cad5b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 22 Dec 2017 11:55:39 -0800
Subject: [PATCH 328/865] Separate "Set/Reset Password" from "Change Password"

Summary:
See PHI223. Ref T13024. There's a remaining registration/login order issue after the other changes in T13024: we lose track of the current URI when we go through the MFA flow, so we can lose "Set Password" at the end of the flow.

Specifically, the flow goes like this today:

  - User clicks the welcome link in email.
  - They get redirected to the "set password" settings panel.
  - This gets pre-empted by Legalpad (although we'll potentially survive this with the URI intact).
  - This also gets pre-empted by the "Set MFA" workflow. If the user completes this flow, they get redirected to a `/auth/multifactor/?id=123` sort of URI to highlight the factor they added. This causes us to lose the `/settings/panel/password/blah/blah?key=xyz` URI.

The ordering on this is also not ideal; it's preferable to start with a password, then do the other steps, so the user can return to the flow more easily if they are interrupted.

Resolve this by separating the "change your password" and "set/reset your password" flows onto two different pages. This copy/pastes a bit of code, but both flows end up simpler so it feels reasonable to me overall.

We don't require a full session for "set/reset password" (so you can do it if you don't have MFA/legalpad yet) and do it first.

This works better and is broadly simpler for users.

Test Plan:
  - Required MFA + legalpad, invited a user via email, registered.
    - Before: password set flow got lost when setting MFA.
    - After: prompted to set password, then sign documents, then set up MFA.
  - Reset password (with MFA confgiured, was required to MFA first).
  - Tried to reset password without a valid reset key, wasn't successful.
  - Changed password using existing flow.
  - Hit various (all?) error cases (short password, common password, mismatch, missing password, etc).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13024

Differential Revision: https://secure.phabricator.com/D18840
---
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorAuthApplication.php            |   1 +
 .../PhabricatorAuthOneTimeLoginController.php |   3 +-
 .../PhabricatorAuthSetPasswordController.php  | 155 ++++++++++++++++++
 .../people/storage/PhabricatorUser.php        |   4 +
 .../PhabricatorPasswordSettingsPanel.php      |  79 +++------
 6 files changed, 185 insertions(+), 59 deletions(-)
 create mode 100644 src/applications/auth/controller/PhabricatorAuthSetPasswordController.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f86b3a1d2d..f031f7deca 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2112,6 +2112,7 @@
     'PhabricatorAuthSessionGarbageCollector' => 'applications/auth/garbagecollector/PhabricatorAuthSessionGarbageCollector.php',
     'PhabricatorAuthSessionInfo' => 'applications/auth/data/PhabricatorAuthSessionInfo.php',
     'PhabricatorAuthSessionQuery' => 'applications/auth/query/PhabricatorAuthSessionQuery.php',
+    'PhabricatorAuthSetPasswordController' => 'applications/auth/controller/PhabricatorAuthSetPasswordController.php',
     'PhabricatorAuthSetupCheck' => 'applications/config/check/PhabricatorAuthSetupCheck.php',
     'PhabricatorAuthStartController' => 'applications/auth/controller/PhabricatorAuthStartController.php',
     'PhabricatorAuthTOTPKeyTemporaryTokenType' => 'applications/auth/factor/PhabricatorAuthTOTPKeyTemporaryTokenType.php',
@@ -7377,6 +7378,7 @@
     'PhabricatorAuthSessionGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorAuthSessionInfo' => 'Phobject',
     'PhabricatorAuthSessionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorAuthSetPasswordController' => 'PhabricatorAuthController',
     'PhabricatorAuthSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorAuthStartController' => 'PhabricatorAuthController',
     'PhabricatorAuthTOTPKeyTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
diff --git a/src/applications/auth/application/PhabricatorAuthApplication.php b/src/applications/auth/application/PhabricatorAuthApplication.php
index dfc855f315..a6127394fd 100644
--- a/src/applications/auth/application/PhabricatorAuthApplication.php
+++ b/src/applications/auth/application/PhabricatorAuthApplication.php
@@ -84,6 +84,7 @@ public function getRoutes() {
             => 'PhabricatorAuthSSHKeyDeactivateController',
           'view/(?P<id>\d+)/' => 'PhabricatorAuthSSHKeyViewController',
         ),
+        'password/' => 'PhabricatorAuthSetPasswordController',
       ),
 
       '/oauth/(?P<provider>\w+)/login/'
diff --git a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
index 534bda3f35..9f74d50765 100644
--- a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
+++ b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
@@ -139,8 +139,7 @@ public function handleRequest(AphrontRequest $request) {
             ->save();
         unset($unguarded);
 
-        $username = $target_user->getUsername();
-        $panel_uri = "/settings/user/{$username}/page/password/";
+        $panel_uri = '/auth/password/';
 
         $next = (string)id(new PhutilURI($panel_uri))
           ->setQueryParams(
diff --git a/src/applications/auth/controller/PhabricatorAuthSetPasswordController.php b/src/applications/auth/controller/PhabricatorAuthSetPasswordController.php
new file mode 100644
index 0000000000..0db23e52a7
--- /dev/null
+++ b/src/applications/auth/controller/PhabricatorAuthSetPasswordController.php
@@ -0,0 +1,155 @@
+<?php
+
+final class PhabricatorAuthSetPasswordController
+  extends PhabricatorAuthController {
+
+  public function shouldAllowPartialSessions() {
+    return true;
+  }
+
+  public function shouldAllowLegallyNonCompliantUsers() {
+    return true;
+  }
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $this->getViewer();
+
+    if (!PhabricatorPasswordAuthProvider::getPasswordProvider()) {
+      return new Aphront404Response();
+    }
+
+    $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
+      $viewer,
+      $request,
+      '/');
+
+    $key = $request->getStr('key');
+    $password_type = PhabricatorAuthPasswordResetTemporaryTokenType::TOKENTYPE;
+    if (!$key) {
+      return new Aphront404Response();
+    }
+
+    $auth_token = id(new PhabricatorAuthTemporaryTokenQuery())
+      ->setViewer($viewer)
+      ->withTokenResources(array($viewer->getPHID()))
+      ->withTokenTypes(array($password_type))
+      ->withTokenCodes(array(PhabricatorHash::weakDigest($key)))
+      ->withExpired(false)
+      ->executeOne();
+    if (!$auth_token) {
+      return new Aphront404Response();
+    }
+
+    $min_len = PhabricatorEnv::getEnvConfig('account.minimum-password-length');
+    $min_len = (int)$min_len;
+
+    $e_password = true;
+    $e_confirm = true;
+    $errors = array();
+    if ($request->isFormPost()) {
+      $password = $request->getStr('password');
+      $confirm = $request->getStr('confirm');
+
+      $e_password = null;
+      $e_confirm = null;
+
+      if (!strlen($password)) {
+        $errors[] = pht('You must choose a password or skip this step.');
+        $e_password = pht('Required');
+      } else if (strlen($password) < $min_len) {
+        $errors[] = pht(
+          'The selected password is too short. Passwords must be a minimum '.
+          'of %s characters.',
+          new PhutilNumber($min_len));
+        $e_password = pht('Too Short');
+      } else if (!strlen($confirm)) {
+        $errors[] = pht('You must confirm the selecetd password.');
+        $e_confirm = pht('Required');
+      } else if ($password !== $confirm) {
+        $errors[] = pht('The password and confirmation do not match.');
+        $e_password = pht('Invalid');
+        $e_confirm = pht('Invalid');
+      } else if (PhabricatorCommonPasswords::isCommonPassword($password)) {
+        $e_password = pht('Very Weak');
+        $errors[] = pht(
+          'The selected password is very weak: it is one of the most common '.
+          'passwords in use. Choose a stronger password.');
+      }
+
+      if (!$errors) {
+        $envelope = new PhutilOpaqueEnvelope($password);
+
+        // This write is unguarded because the CSRF token has already
+        // been checked in the call to $request->isFormPost() and
+        // the CSRF token depends on the password hash, so when it
+        // is changed here the CSRF token check will fail.
+        $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+
+          id(new PhabricatorUserEditor())
+            ->setActor($viewer)
+            ->changePassword($viewer, $envelope);
+
+        unset($unguarded);
+
+        // Destroy the token.
+        $auth_token->delete();
+
+        return id(new AphrontRedirectResponse())->setURI('/');
+      }
+    }
+
+    $len_caption = null;
+    if ($min_len) {
+      $len_caption = pht('Minimum password length: %d characters.', $min_len);
+    }
+
+    if ($viewer->hasPassword()) {
+      $title = pht('Reset Password');
+      $crumb = pht('Reset Password');
+      $submit = pht('Reset Password');
+    } else {
+      $title = pht('Set Password');
+      $crumb = pht('Set Password');
+      $submit = pht('Set Account Password');
+    }
+
+    $form = id(new AphrontFormView())
+      ->setViewer($viewer)
+      ->addHiddenInput('key', $key)
+      ->appendChild(
+        id(new AphrontFormPasswordControl())
+          ->setDisableAutocomplete(true)
+          ->setLabel(pht('New Password'))
+          ->setError($e_password)
+          ->setName('password'))
+      ->appendChild(
+        id(new AphrontFormPasswordControl())
+          ->setDisableAutocomplete(true)
+          ->setLabel(pht('Confirm Password'))
+          ->setCaption($len_caption)
+          ->setError($e_confirm)
+          ->setName('confirm'))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->addCancelButton('/', pht('Skip This Step'))
+          ->setValue($submit));
+
+    $form_box = id(new PHUIObjectBoxView())
+      ->setHeaderText($title)
+      ->setFormErrors($errors)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
+      ->setForm($form);
+
+    $main_view = id(new PHUITwoColumnView())
+      ->setFooter($form_box);
+
+    $crumbs = $this->buildApplicationCrumbs()
+      ->addTextCrumb($crumb)
+      ->setBorder(true);
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($main_view);
+  }
+}
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 1745154826..30aa3d81ef 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -262,6 +262,10 @@ public function generatePHID() {
       PhabricatorPeopleUserPHIDType::TYPECONST);
   }
 
+  public function hasPassword() {
+    return (bool)strlen($this->passwordHash);
+  }
+
   public function setPassword(PhutilOpaqueEnvelope $envelope) {
     if (!$this->getPHID()) {
       throw new Exception(
diff --git a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
index c1250fca23..3807139fe3 100644
--- a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
@@ -35,23 +35,10 @@ public function processRequest(AphrontRequest $request) {
     $min_len = PhabricatorEnv::getEnvConfig('account.minimum-password-length');
     $min_len = (int)$min_len;
 
-    // NOTE: To change your password, you need to prove you own the account,
-    // either by providing the old password or by carrying a token to
-    // the workflow from a password reset email.
-
-    $key = $request->getStr('key');
-    $password_type = PhabricatorAuthPasswordResetTemporaryTokenType::TOKENTYPE;
-
-    $token = null;
-    if ($key) {
-      $token = id(new PhabricatorAuthTemporaryTokenQuery())
-        ->setViewer($user)
-        ->withTokenResources(array($user->getPHID()))
-        ->withTokenTypes(array($password_type))
-        ->withTokenCodes(array(PhabricatorHash::weakDigest($key)))
-        ->withExpired(false)
-        ->executeOne();
-    }
+    // NOTE: Users can also change passwords through the separate "set/reset"
+    // interface which is reached by logging in with a one-time token after
+    // registration or password reset. If this flow changes, that flow may
+    // also need to change.
 
     $e_old = true;
     $e_new = true;
@@ -59,12 +46,10 @@ public function processRequest(AphrontRequest $request) {
 
     $errors = array();
     if ($request->isFormPost()) {
-      if (!$token) {
-        $envelope = new PhutilOpaqueEnvelope($request->getStr('old_pw'));
-        if (!$user->comparePassword($envelope)) {
-          $errors[] = pht('The old password you entered is incorrect.');
-          $e_old = pht('Invalid');
-        }
+      $envelope = new PhutilOpaqueEnvelope($request->getStr('old_pw'));
+      if (!$user->comparePassword($envelope)) {
+        $errors[] = pht('The old password you entered is incorrect.');
+        $e_old = pht('Invalid');
       }
 
       $pass = $request->getStr('new_pw');
@@ -98,16 +83,7 @@ public function processRequest(AphrontRequest $request) {
 
         unset($unguarded);
 
-        if ($token) {
-          // Destroy the token.
-          $token->delete();
-
-          // If this is a password set/reset, kick the user to the home page
-          // after we update their account.
-          $next = '/';
-        } else {
-          $next = $this->getPanelURI('?saved=true');
-        }
+        $next = $this->getPanelURI('?saved=true');
 
         id(new PhabricatorAuthSessionEngine())->terminateLoginSessions(
           $user,
@@ -125,19 +101,15 @@ public function processRequest(AphrontRequest $request) {
       } catch (PhabricatorPasswordHasherUnavailableException $ex) {
         $can_upgrade = false;
 
-        // Only show this stuff if we aren't on the reset workflow. We can
-        // do resets regardless of the old hasher's availability.
-        if (!$token) {
-          $errors[] = pht(
-            'Your password is currently hashed using an algorithm which is '.
-            'no longer available on this install.');
-          $errors[] = pht(
-            'Because the algorithm implementation is missing, your password '.
-            'can not be used or updated.');
-          $errors[] = pht(
-            'To set a new password, request a password reset link from the '.
-            'login screen and then follow the instructions.');
-        }
+        $errors[] = pht(
+          'Your password is currently hashed using an algorithm which is '.
+          'no longer available on this install.');
+        $errors[] = pht(
+          'Because the algorithm implementation is missing, your password '.
+          'can not be used or updated.');
+        $errors[] = pht(
+          'To set a new password, request a password reset link from the '.
+          'login screen and then follow the instructions.');
       }
 
       if ($can_upgrade) {
@@ -153,20 +125,13 @@ public function processRequest(AphrontRequest $request) {
       $len_caption = pht('Minimum password length: %d characters.', $min_len);
     }
 
-    $form = new AphrontFormView();
-    $form
-      ->setUser($user)
-      ->addHiddenInput('key', $key);
-
-    if (!$token) {
-      $form->appendChild(
+    $form = id(new AphrontFormView())
+      ->setViewer($user)
+      ->appendChild(
         id(new AphrontFormPasswordControl())
           ->setLabel(pht('Old Password'))
           ->setError($e_old)
-          ->setName('old_pw'));
-    }
-
-    $form
+          ->setName('old_pw'))
       ->appendChild(
         id(new AphrontFormPasswordControl())
           ->setDisableAutocomplete(true)

From ead5f4fd9c03f3e2a9939a190739d3e2e65f45e2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 22 Dec 2017 10:11:10 -0800
Subject: [PATCH 329/865] Add an "Accepting reviewers" Herald field for commits

Summary:
See PHI262. Fixes T12578. Although this is a bit niche and probably better accomplished through advisory/soft measures ("Add blocking reviewers") in most cases, it isn't difficult to implement and doesn't create any technical or product tension.

If installs write a rule that blocks commits, that will probably also naturally lead them to an "add reviewers" rule anyway.

Also, allow packages to be hit with the typeahead. They're valid reviewers but previously you couldn't write rules against them, for no actual reason.

Test Plan: Used test console to run this against commits, got sensible results for the field value.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12578

Differential Revision: https://secure.phabricator.com/D18839
---
 src/__phutil_library_map__.php                |  4 ++
 ...tRevisionAcceptingReviewersHeraldField.php | 43 +++++++++++++++++++
 ...sionCommitRevisionReviewersHeraldField.php |  2 +-
 ...tRevisionAcceptingReviewersHeraldField.php | 43 +++++++++++++++++++
 ...mitContentRevisionReviewersHeraldField.php |  2 +-
 5 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
 create mode 100644 src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f031f7deca..849d4d4702 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -696,6 +696,7 @@
     'DiffusionCommitRevertsCommitEdgeType' => 'applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php',
     'DiffusionCommitReviewerHeraldField' => 'applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php',
     'DiffusionCommitRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php',
+    'DiffusionCommitRevisionAcceptingReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php',
     'DiffusionCommitRevisionHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php',
     'DiffusionCommitRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php',
     'DiffusionCommitRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php',
@@ -809,6 +810,7 @@
     'DiffusionPreCommitContentRepositoryHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php',
     'DiffusionPreCommitContentRepositoryProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php',
     'DiffusionPreCommitContentRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php',
+    'DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php',
     'DiffusionPreCommitContentRevisionHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php',
     'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php',
     'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php',
@@ -5755,6 +5757,7 @@
     'DiffusionCommitRevertsCommitEdgeType' => 'PhabricatorEdgeType',
     'DiffusionCommitReviewerHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionAcceptedHeraldField' => 'DiffusionCommitHeraldField',
+    'DiffusionCommitRevisionAcceptingReviewersHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionReviewersHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionSubscribersHeraldField' => 'DiffusionCommitHeraldField',
@@ -5871,6 +5874,7 @@
     'DiffusionPreCommitContentRepositoryHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRepositoryProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionAcceptedHeraldField' => 'DiffusionPreCommitContentHeraldField',
+    'DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'DiffusionPreCommitContentHeraldField',
diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
new file mode 100644
index 0000000000..6d266f1357
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
@@ -0,0 +1,43 @@
+<?php
+
+final class DiffusionCommitRevisionAcceptingReviewersHeraldField
+  extends DiffusionCommitHeraldField {
+
+  const FIELDCONST = 'diffusion.commit.revision.accepting';
+
+  public function getHeraldFieldName() {
+    return pht('Accepting reviewers');
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldRelatedFieldGroup::FIELDGROUPKEY;
+  }
+
+  public function getHeraldFieldValue($object) {
+    $revision = $this->getAdapter()->loadDifferentialRevision();
+
+    if (!$revision) {
+      return array();
+    }
+
+    $diff_phid = $revision->getActiveDiffPHID();
+
+    $reviewer_phids = array();
+    foreach ($revision->getReviewers() as $reviewer) {
+      if ($reviewer->isAccepted($diff_phid)) {
+        $reviewer_phids[] = $reviewer->getReviewerPHID();
+      }
+    }
+
+    return $reviewer_phids;
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new DifferentialReviewerDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
index 50900ede78..a9a3f3e8ca 100644
--- a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
@@ -28,7 +28,7 @@ protected function getHeraldFieldStandardType() {
   }
 
   protected function getDatasource() {
-    return new PhabricatorProjectOrUserDatasource();
+    return new DifferentialReviewerDatasource();
   }
 
 }
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php
new file mode 100644
index 0000000000..b6d50d4a2a
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php
@@ -0,0 +1,43 @@
+<?php
+
+final class DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField
+  extends DiffusionPreCommitContentHeraldField {
+
+  const FIELDCONST = 'diffusion.pre.content.revision.accepting';
+
+  public function getHeraldFieldName() {
+    return pht('Accepting reviewers');
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldRelatedFieldGroup::FIELDGROUPKEY;
+  }
+
+  public function getHeraldFieldValue($object) {
+    $revision = $this->getAdapter()->getRevision();
+
+    if (!$revision) {
+      return array();
+    }
+
+    $diff_phid = $revision->getActiveDiffPHID();
+
+    $reviewer_phids = array();
+    foreach ($revision->getReviewers() as $reviewer) {
+      if ($reviewer->isAccepted($diff_phid)) {
+        $reviewer_phids[] = $reviewer->getReviewerPHID();
+      }
+    }
+
+    return $reviewer_phids;
+   }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new DifferentialReviewerDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
index 936126ba89..aa2b2e9e09 100644
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
@@ -28,7 +28,7 @@ protected function getHeraldFieldStandardType() {
   }
 
   protected function getDatasource() {
-    return new PhabricatorProjectOrUserDatasource();
+    return new DifferentialReviewerDatasource();
   }
 
 }

From 153c054658754214f32b1d428f0ab14fbeca1b7c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 22 Dec 2017 10:11:10 -0800
Subject: [PATCH 330/865] (stable) Add an "Accepting reviewers" Herald field
 for commits

Summary:
See PHI262. Fixes T12578. Although this is a bit niche and probably better accomplished through advisory/soft measures ("Add blocking reviewers") in most cases, it isn't difficult to implement and doesn't create any technical or product tension.

If installs write a rule that blocks commits, that will probably also naturally lead them to an "add reviewers" rule anyway.

Also, allow packages to be hit with the typeahead. They're valid reviewers but previously you couldn't write rules against them, for no actual reason.

Test Plan: Used test console to run this against commits, got sensible results for the field value.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12578

Differential Revision: https://secure.phabricator.com/D18839
---
 src/__phutil_library_map__.php                |  4 ++
 ...tRevisionAcceptingReviewersHeraldField.php | 43 +++++++++++++++++++
 ...sionCommitRevisionReviewersHeraldField.php |  2 +-
 ...tRevisionAcceptingReviewersHeraldField.php | 43 +++++++++++++++++++
 ...mitContentRevisionReviewersHeraldField.php |  2 +-
 5 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
 create mode 100644 src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f031f7deca..849d4d4702 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -696,6 +696,7 @@
     'DiffusionCommitRevertsCommitEdgeType' => 'applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php',
     'DiffusionCommitReviewerHeraldField' => 'applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php',
     'DiffusionCommitRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php',
+    'DiffusionCommitRevisionAcceptingReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php',
     'DiffusionCommitRevisionHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php',
     'DiffusionCommitRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php',
     'DiffusionCommitRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php',
@@ -809,6 +810,7 @@
     'DiffusionPreCommitContentRepositoryHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php',
     'DiffusionPreCommitContentRepositoryProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php',
     'DiffusionPreCommitContentRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php',
+    'DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php',
     'DiffusionPreCommitContentRevisionHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php',
     'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php',
     'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php',
@@ -5755,6 +5757,7 @@
     'DiffusionCommitRevertsCommitEdgeType' => 'PhabricatorEdgeType',
     'DiffusionCommitReviewerHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionAcceptedHeraldField' => 'DiffusionCommitHeraldField',
+    'DiffusionCommitRevisionAcceptingReviewersHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionReviewersHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitRevisionSubscribersHeraldField' => 'DiffusionCommitHeraldField',
@@ -5871,6 +5874,7 @@
     'DiffusionPreCommitContentRepositoryHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRepositoryProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionAcceptedHeraldField' => 'DiffusionPreCommitContentHeraldField',
+    'DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'DiffusionPreCommitContentHeraldField',
diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
new file mode 100644
index 0000000000..6d266f1357
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptingReviewersHeraldField.php
@@ -0,0 +1,43 @@
+<?php
+
+final class DiffusionCommitRevisionAcceptingReviewersHeraldField
+  extends DiffusionCommitHeraldField {
+
+  const FIELDCONST = 'diffusion.commit.revision.accepting';
+
+  public function getHeraldFieldName() {
+    return pht('Accepting reviewers');
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldRelatedFieldGroup::FIELDGROUPKEY;
+  }
+
+  public function getHeraldFieldValue($object) {
+    $revision = $this->getAdapter()->loadDifferentialRevision();
+
+    if (!$revision) {
+      return array();
+    }
+
+    $diff_phid = $revision->getActiveDiffPHID();
+
+    $reviewer_phids = array();
+    foreach ($revision->getReviewers() as $reviewer) {
+      if ($reviewer->isAccepted($diff_phid)) {
+        $reviewer_phids[] = $reviewer->getReviewerPHID();
+      }
+    }
+
+    return $reviewer_phids;
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new DifferentialReviewerDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
index 50900ede78..a9a3f3e8ca 100644
--- a/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php
@@ -28,7 +28,7 @@ protected function getHeraldFieldStandardType() {
   }
 
   protected function getDatasource() {
-    return new PhabricatorProjectOrUserDatasource();
+    return new DifferentialReviewerDatasource();
   }
 
 }
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php
new file mode 100644
index 0000000000..b6d50d4a2a
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField.php
@@ -0,0 +1,43 @@
+<?php
+
+final class DiffusionPreCommitContentRevisionAcceptingReviewersHeraldField
+  extends DiffusionPreCommitContentHeraldField {
+
+  const FIELDCONST = 'diffusion.pre.content.revision.accepting';
+
+  public function getHeraldFieldName() {
+    return pht('Accepting reviewers');
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldRelatedFieldGroup::FIELDGROUPKEY;
+  }
+
+  public function getHeraldFieldValue($object) {
+    $revision = $this->getAdapter()->getRevision();
+
+    if (!$revision) {
+      return array();
+    }
+
+    $diff_phid = $revision->getActiveDiffPHID();
+
+    $reviewer_phids = array();
+    foreach ($revision->getReviewers() as $reviewer) {
+      if ($reviewer->isAccepted($diff_phid)) {
+        $reviewer_phids[] = $reviewer->getReviewerPHID();
+      }
+    }
+
+    return $reviewer_phids;
+   }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new DifferentialReviewerDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
index 936126ba89..aa2b2e9e09 100644
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php
@@ -28,7 +28,7 @@ protected function getHeraldFieldStandardType() {
   }
 
   protected function getDatasource() {
-    return new PhabricatorProjectOrUserDatasource();
+    return new DifferentialReviewerDatasource();
   }
 
 }

From de6c68b91e57208b7ccb454d53916553d79c667c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 3 Jan 2018 13:40:44 -0800
Subject: [PATCH 331/865] Always show "X requested review" in mail to stop some
 undraft mail from being dropped

Summary: Ref T13035. See that task for a description of the issue.

Test Plan:
  - Enabled prototypes.
  - Disabled all Herald rules that trigger Harbormaster builds.
  - Created a new revision.
  - Before patch: initial review request email was dropped.
  - After patch: initial review request email is sent.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13035

Differential Revision: https://secure.phabricator.com/D18851
---
 .../differential/storage/DifferentialTransaction.php        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index ea0d7789cb..18edd3c625 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -111,6 +111,12 @@ public function shouldHideForMail(array $xactions) {
         // Don't hide the initial "X added reviewers: ..." transaction during
         // object creation from mail. See T12118 and PHI54.
         return false;
+      case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
+        // Don't hide the initial "X requested review: ..." transaction from
+        // mail even when it occurs during creation. We need this transaction
+        // to survive so we'll generate mail when revisions immediately leave
+        // the draft state. See T13035 for discussion.
+        return false;
     }
 
     return parent::shouldHideForMail($xactions);

From 129e3a120849ada69ecda9f7a475cb9522080eb5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 3 Jan 2018 13:47:56 -0800
Subject: [PATCH 332/865] Fix a minor/harmless race with feed publishers in
 certain draft states

Summary:
Depends on D18851. Ref T13035. After D18819, revision creation transactions may be split into two groups (if prototypes are enabled).

This split means we have two workers. The first worker doesn't publish feed stories or mail; the second one does.

Currently, both workers call `shouldPublishFeedStory()` before they queue, and then again after the daemons pull them out of the queue. However, the answer to this question can change.

Specifically, this happens:

  - `arc` creates a revision.
  - The first transaction group applies, creating the revision as a draft, and returns `false` from `shouldPublishFeedStory()`, and does not generate related PHIDs. It queues a daemon to send mail, expecting it not to publish a feed story.
  - The second transaction group applies, promoting the revision to "needs review". Since the revision has promoted, `shouldPublishFeedStory()` now returns true. This editor generates related PHIDs and queues a daemon task, expecting it to send mail / publish feed.
  - A few milliseconds pass.
  - The first job gets pulled out of the daemon queue and worked on. It does not have any feed metadata because the object wasn't publishable when the job was queued -- but `shouldPublishFeedStory()` now returns true, so it tries to publish a story without any metadata available. Slightly bad stuff happens (see below).
  - The second job gets pulled out of the daemon queue and worked on. This one has metadata and works fine.

The "slightly bad stuff" is that we publish an empty feed story with no references to any objects, then try to push it to hooks and other listeners. Since it doesn't have any references, it fails to load during the "push to external listeners" phase.

This is harmless but clutters the log and doesn't help anything.

Instead, cache the state of "are we publishing a feed story for this object?" when we queue the worker so it can't race.

Test Plan:
  - Enabled prototypes.
  - Disabled all Herald triggers for Harbormaster build plans.
  - Ran `bin/phd debug task` in one window.
  - Created a revision in a separate window.
  - Before patch: saw "unable to load feed story" errors in the daemon log.
  - After patch: no more "unable to load feed story" errors.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13035

Differential Revision: https://secure.phabricator.com/D18852
---
 src/applications/feed/worker/FeedPushWorker.php             | 4 +++-
 .../editor/PhabricatorApplicationTransactionEditor.php      | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/applications/feed/worker/FeedPushWorker.php b/src/applications/feed/worker/FeedPushWorker.php
index 90407f6a75..3eff676e99 100644
--- a/src/applications/feed/worker/FeedPushWorker.php
+++ b/src/applications/feed/worker/FeedPushWorker.php
@@ -13,7 +13,9 @@ protected function loadFeedStory() {
 
     if (!$story) {
       throw new PhabricatorWorkerPermanentFailureException(
-        pht('Feed story does not exist.'));
+        pht(
+          'Feed story (with key "%s") does not exist or could not be loaded.',
+          $key));
     }
 
     return $story;
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 8e6d816769..c08451624d 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -68,6 +68,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $mailCCPHIDs = array();
   private $feedNotifyPHIDs = array();
   private $feedRelatedPHIDs = array();
+  private $feedShouldPublish = false;
   private $modularTypes;
 
   private $transactionQueue = array();
@@ -1159,6 +1160,7 @@ final public function applyTransactions(
     }
 
     if ($this->shouldPublishFeedStory($object, $xactions)) {
+      $this->feedShouldPublish = true;
       $this->feedRelatedPHIDs = $this->getFeedRelatedPHIDs($object, $xactions);
       $this->feedNotifyPHIDs = $this->getFeedNotifyPHIDs($object, $xactions);
     }
@@ -1216,8 +1218,7 @@ public function publishTransactions(
         ));
     }
 
-    if ($this->shouldPublishFeedStory($object, $xactions)) {
-
+    if ($this->feedShouldPublish) {
       $mailed = array();
       foreach ($messages as $mail) {
         foreach ($mail->buildRecipientList() as $phid) {
@@ -3512,6 +3513,7 @@ private function getAutomaticStateProperties() {
       'mailCCPHIDs',
       'feedNotifyPHIDs',
       'feedRelatedPHIDs',
+      'feedShouldPublish',
     );
   }
 

From 33f7f65e81d49c589241a945dda2651bad0ac6e3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 3 Jan 2018 13:40:44 -0800
Subject: [PATCH 333/865] (stable) Always show "X requested review" in mail to
 stop some undraft mail from being dropped

Summary: Ref T13035. See that task for a description of the issue.

Test Plan:
  - Enabled prototypes.
  - Disabled all Herald rules that trigger Harbormaster builds.
  - Created a new revision.
  - Before patch: initial review request email was dropped.
  - After patch: initial review request email is sent.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13035

Differential Revision: https://secure.phabricator.com/D18851
---
 .../differential/storage/DifferentialTransaction.php        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index ea0d7789cb..18edd3c625 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -111,6 +111,12 @@ public function shouldHideForMail(array $xactions) {
         // Don't hide the initial "X added reviewers: ..." transaction during
         // object creation from mail. See T12118 and PHI54.
         return false;
+      case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
+        // Don't hide the initial "X requested review: ..." transaction from
+        // mail even when it occurs during creation. We need this transaction
+        // to survive so we'll generate mail when revisions immediately leave
+        // the draft state. See T13035 for discussion.
+        return false;
     }
 
     return parent::shouldHideForMail($xactions);

From c12a6cac76030803555b37a52985b2335456d147 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 3 Jan 2018 13:47:56 -0800
Subject: [PATCH 334/865] (stable) Fix a minor/harmless race with feed
 publishers in certain draft states

Summary:
Depends on D18851. Ref T13035. After D18819, revision creation transactions may be split into two groups (if prototypes are enabled).

This split means we have two workers. The first worker doesn't publish feed stories or mail; the second one does.

Currently, both workers call `shouldPublishFeedStory()` before they queue, and then again after the daemons pull them out of the queue. However, the answer to this question can change.

Specifically, this happens:

  - `arc` creates a revision.
  - The first transaction group applies, creating the revision as a draft, and returns `false` from `shouldPublishFeedStory()`, and does not generate related PHIDs. It queues a daemon to send mail, expecting it not to publish a feed story.
  - The second transaction group applies, promoting the revision to "needs review". Since the revision has promoted, `shouldPublishFeedStory()` now returns true. This editor generates related PHIDs and queues a daemon task, expecting it to send mail / publish feed.
  - A few milliseconds pass.
  - The first job gets pulled out of the daemon queue and worked on. It does not have any feed metadata because the object wasn't publishable when the job was queued -- but `shouldPublishFeedStory()` now returns true, so it tries to publish a story without any metadata available. Slightly bad stuff happens (see below).
  - The second job gets pulled out of the daemon queue and worked on. This one has metadata and works fine.

The "slightly bad stuff" is that we publish an empty feed story with no references to any objects, then try to push it to hooks and other listeners. Since it doesn't have any references, it fails to load during the "push to external listeners" phase.

This is harmless but clutters the log and doesn't help anything.

Instead, cache the state of "are we publishing a feed story for this object?" when we queue the worker so it can't race.

Test Plan:
  - Enabled prototypes.
  - Disabled all Herald triggers for Harbormaster build plans.
  - Ran `bin/phd debug task` in one window.
  - Created a revision in a separate window.
  - Before patch: saw "unable to load feed story" errors in the daemon log.
  - After patch: no more "unable to load feed story" errors.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13035

Differential Revision: https://secure.phabricator.com/D18852
---
 src/applications/feed/worker/FeedPushWorker.php             | 4 +++-
 .../editor/PhabricatorApplicationTransactionEditor.php      | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/applications/feed/worker/FeedPushWorker.php b/src/applications/feed/worker/FeedPushWorker.php
index 90407f6a75..3eff676e99 100644
--- a/src/applications/feed/worker/FeedPushWorker.php
+++ b/src/applications/feed/worker/FeedPushWorker.php
@@ -13,7 +13,9 @@ protected function loadFeedStory() {
 
     if (!$story) {
       throw new PhabricatorWorkerPermanentFailureException(
-        pht('Feed story does not exist.'));
+        pht(
+          'Feed story (with key "%s") does not exist or could not be loaded.',
+          $key));
     }
 
     return $story;
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 8e6d816769..c08451624d 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -68,6 +68,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $mailCCPHIDs = array();
   private $feedNotifyPHIDs = array();
   private $feedRelatedPHIDs = array();
+  private $feedShouldPublish = false;
   private $modularTypes;
 
   private $transactionQueue = array();
@@ -1159,6 +1160,7 @@ final public function applyTransactions(
     }
 
     if ($this->shouldPublishFeedStory($object, $xactions)) {
+      $this->feedShouldPublish = true;
       $this->feedRelatedPHIDs = $this->getFeedRelatedPHIDs($object, $xactions);
       $this->feedNotifyPHIDs = $this->getFeedNotifyPHIDs($object, $xactions);
     }
@@ -1216,8 +1218,7 @@ public function publishTransactions(
         ));
     }
 
-    if ($this->shouldPublishFeedStory($object, $xactions)) {
-
+    if ($this->feedShouldPublish) {
       $mailed = array();
       foreach ($messages as $mail) {
         foreach ($mail->buildRecipientList() as $phid) {
@@ -3512,6 +3513,7 @@ private function getAutomaticStateProperties() {
       'mailCCPHIDs',
       'feedNotifyPHIDs',
       'feedRelatedPHIDs',
+      'feedShouldPublish',
     );
   }
 

From cb957f8d62424ace76a06331d9859d92dfb9f5db Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 4 Jan 2018 09:34:40 -0800
Subject: [PATCH 335/865] Pile more atrocities onto the Maniphest burnup report

Summary:
See PHI273. Ref T13020. After D18777, tasks created directly into the default status (which is common) via the web UI no longer write a "status" transaction.

This is consistent with other applications, and consistent with the API/email behavior for tasks since early 2016. It also improves the consistency of //reading// tasks via the API.

However, it impacted the "Burnup Report" which relies on directly reading these rows to detect task creation. Until this is fixed properly (T1562), synthetically generate the "missing" transactions which this page expects by looking at task creation dates instead.

Specifically, we:

  - Generate a fake `status: null -> "open"` transaction for every task by looking at the Task table.
  - Go through the transaction list and remove all the legacy `status: null -> "any open status"` transactions. These will only exist for older tasks.
  - Merge all our new fake transactions into the list of transactions.
  - Continue on as though nothing happened, letting the rendering code continue to operate on legacy-looking data.

I think this will slightly miscount tasks which were created directly into a closed status, but this is very rare, and does not significantly impact the accuracy of this report relative to other known issues (notably, merging closed tasks).

This will also get the wrong result if the default status has changed from an "open" status to a "closed" status at any point, but this is exceptionally bizarre/rare.

Ultimately, T1562 will let us delete all this stuff and disavow its existence.

Test Plan:
  - Created some tasks, loaded burnup before/after this patch.
  - My local chart looks more accurate afterwards, but the data is super weird (I used `bin/lipsum` to create a huge number of tasks a couple months ago). I'll vet this on `secure`, which has more reasonable data.

Here's my local chart:

{F5356499}

That's what it //should// look like, it's just hard to be confident that nothing else is hiding there.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13020

Differential Revision: https://secure.phabricator.com/D18853
---
 .../controller/ManiphestReportController.php  | 57 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
index 66aa154e8f..821c96a2aa 100644
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -99,13 +99,66 @@ public function renderBurn() {
         ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE,
       ));
 
+    // See PHI273. After the move to EditEngine, we no longer create a
+    // "status" transaction if a task is created directly into the default
+    // status. This likely impacted API/email tasks after 2016 and all other
+    // tasks after late 2017. Until Facts can fix this properly, use the
+    // task creation dates to generate synthetic transactions which look like
+    // the older transactions that this page expects.
+
+    $default_status = ManiphestTaskStatus::getDefaultStatus();
+    $duplicate_status = ManiphestTaskStatus::getDuplicateStatus();
+
+    // Build synthetic transactions which take status from `null` to the
+    // default value.
+    $create_rows = queryfx_all(
+      $conn,
+      'SELECT dateCreated FROM %T',
+      id(new ManiphestTask())->getTableName());
+    foreach ($create_rows as $key => $create_row) {
+      $create_rows[$key] = array(
+        'transactionType' => 'status',
+        'oldValue' => null,
+        'newValue' => $default_status,
+        'dateCreated' => $create_row['dateCreated'],
+      );
+    }
+
+    // Remove any actual legacy status transactions which take status from
+    // `null` to any open status.
+    foreach ($data as $key => $row) {
+      if ($row['transactionType'] != 'status') {
+        continue;
+      }
+
+      $oldv = trim($row['oldValue'], '"');
+      $newv = trim($row['oldValue'], '"');
+
+      // If this is a status change, preserve it.
+      if ($oldv != 'null') {
+        continue;
+      }
+
+      // If this task was created directly into a closed status, preserve
+      // the transaction.
+      if (!ManiphestTaskStatus::isOpenStatus($newv)) {
+        continue;
+      }
+
+      // If this is a legacy "create" transaction, discard it in favor of the
+      // synthetic one.
+      unset($data[$key]);
+    }
+
+    // Merge the synthetic rows into the real transactions.
+    $data = array_merge($create_rows, $data);
+    $data = array_values($data);
+
     $stats = array();
     $day_buckets = array();
 
     $open_tasks = array();
 
-    $default_status = ManiphestTaskStatus::getDefaultStatus();
-    $duplicate_status = ManiphestTaskStatus::getDuplicateStatus();
     foreach ($data as $key => $row) {
       switch ($row['transactionType']) {
         case ManiphestTaskStatusTransaction::TRANSACTIONTYPE:

From 53b25db9185606a93f46cfd5d8911af644d63c31 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 26 Dec 2017 10:38:45 -0800
Subject: [PATCH 336/865] Prevent enormous changes from being pushed to
 repositoires by default

Summary:
Fixes T13031. "Enormous" changes are basically changes which are too large to hold in memory, although the actual definition we use today is "more than 1GB of change text or `git diff` runs for more than 15 minutes".

If an install configures a Herald content rule like "when content matches /XYZ/, do something" and then a user pushes a 30 GB source file, we can't put it into memory to `preg_match()` it. Currently, the way to handle this case is to write a separate Herald rule that rejects enormous changes. However, this isn't obvious and means the default behavior is unsafe.

Make the default behavior safe by rejecting these changes with a message, similar to how we reject "dangerous" changes (which permanently delete or overwrite history) by default.

Also, change a couple of UI strings from "Enormous" to "Very Large" to reduce ambiguity. See <https://discourse.phabricator-community.org/t/herald-enormous-check/822>.

Test Plan: Changed the definition of "enormous" from 1GB to 1 byte. Pushed a change; got rejected. Allowed enormous changes, pushed, got rejected by a Herald rule. Disabled the Herald rule, pushed, got a clean push. Prevented enormous changes again. Grepped for "enormous" elsewhere in the UI.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: joshuaspence

Maniphest Tasks: T13031

Differential Revision: https://secure.phabricator.com/D18850
---
 src/__phutil_library_map__.php                |  2 +
 .../PhabricatorDiffusionApplication.php       |  1 +
 .../controller/DiffusionCommitController.php  |  4 +-
 ...fusionRepositoryEditEnormousController.php | 90 +++++++++++++++++++
 .../editor/DiffusionRepositoryEditEngine.php  | 13 +++
 .../engine/DiffusionCommitHookEngine.php      | 63 ++++++++++++-
 .../herald/HeraldPreCommitContentAdapter.php  |  2 +-
 ...ffusionRepositoryBasicsManagementPanel.php | 31 +++++++
 .../config/PhabricatorFilesConfigOptions.php  |  2 +-
 .../editor/PhabricatorRepositoryEditor.php    |  8 ++
 .../storage/PhabricatorRepository.php         | 12 +++
 .../storage/PhabricatorRepositoryPushLog.php  |  2 +
 .../PhabricatorRepositoryTransaction.php      | 11 +++
 13 files changed, 233 insertions(+), 8 deletions(-)
 create mode 100644 src/applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 849d4d4702..1a8de4e42b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -860,6 +860,7 @@
     'DiffusionRepositoryEditDangerousController' => 'applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php',
     'DiffusionRepositoryEditDeleteController' => 'applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php',
     'DiffusionRepositoryEditEngine' => 'applications/diffusion/editor/DiffusionRepositoryEditEngine.php',
+    'DiffusionRepositoryEditEnormousController' => 'applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php',
     'DiffusionRepositoryEditUpdateController' => 'applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php',
     'DiffusionRepositoryFunctionDatasource' => 'applications/diffusion/typeahead/DiffusionRepositoryFunctionDatasource.php',
     'DiffusionRepositoryHistoryManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryHistoryManagementPanel.php',
@@ -5923,6 +5924,7 @@
     'DiffusionRepositoryEditDangerousController' => 'DiffusionRepositoryManageController',
     'DiffusionRepositoryEditDeleteController' => 'DiffusionRepositoryManageController',
     'DiffusionRepositoryEditEngine' => 'PhabricatorEditEngine',
+    'DiffusionRepositoryEditEnormousController' => 'DiffusionRepositoryManageController',
     'DiffusionRepositoryEditUpdateController' => 'DiffusionRepositoryManageController',
     'DiffusionRepositoryFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'DiffusionRepositoryHistoryManagementPanel' => 'DiffusionRepositoryManagementPanel',
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index 5a426ec299..5797b8ba7c 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -89,6 +89,7 @@ public function getRoutes() {
         'edit/' => array(
           'activate/' => 'DiffusionRepositoryEditActivateController',
           'dangerous/' => 'DiffusionRepositoryEditDangerousController',
+          'enormous/' => 'DiffusionRepositoryEditEnormousController',
           'delete/' => 'DiffusionRepositoryEditDeleteController',
           'update/' => 'DiffusionRepositoryEditUpdateController',
           'testautomation/' => 'DiffusionRepositoryTestAutomationController',
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 11463ef97d..b4d06989c2 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -277,9 +277,9 @@ public function handleRequest(AphrontRequest $request) {
           'This commit is empty and does not affect any paths.'));
     } else if ($was_limited) {
       $info_panel = $this->renderStatusMessage(
-        pht('Enormous Commit'),
+        pht('Very Large Commit'),
         pht(
-          'This commit is enormous, and affects more than %d files. '.
+          'This commit is very large, and affects more than %d files. '.
           'Changes are not shown.',
           $hard_limit));
     } else if (!$this->getCommitExists()) {
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php
new file mode 100644
index 0000000000..d4eeb118d7
--- /dev/null
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php
@@ -0,0 +1,90 @@
+<?php
+
+final class DiffusionRepositoryEditEnormousController
+  extends DiffusionRepositoryManageController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $response = $this->loadDiffusionContextForEdit();
+    if ($response) {
+      return $response;
+    }
+
+    $viewer = $this->getViewer();
+    $drequest = $this->getDiffusionRequest();
+    $repository = $drequest->getRepository();
+
+    $panel_uri = id(new DiffusionRepositoryBasicsManagementPanel())
+      ->setRepository($repository)
+      ->getPanelURI();
+
+    if (!$repository->canAllowEnormousChanges()) {
+      return $this->newDialog()
+        ->setTitle(pht('Unprotectable Repository'))
+        ->appendParagraph(
+          pht(
+            'This repository can not be protected from enormous changes '.
+            'because Phabricator does not control what users are allowed '.
+            'to push to it.'))
+        ->addCancelButton($panel_uri);
+    }
+
+    if ($request->isFormPost()) {
+      $xaction = id(new PhabricatorRepositoryTransaction())
+        ->setTransactionType(PhabricatorRepositoryTransaction::TYPE_ENORMOUS)
+        ->setNewValue(!$repository->shouldAllowEnormousChanges());
+
+      $editor = id(new PhabricatorRepositoryEditor())
+        ->setContinueOnNoEffect(true)
+        ->setContentSourceFromRequest($request)
+        ->setActor($viewer)
+        ->applyTransactions($repository, array($xaction));
+
+      return id(new AphrontReloadResponse())->setURI($panel_uri);
+    }
+
+    if ($repository->shouldAllowEnormousChanges()) {
+      $title = pht('Prevent Enormous Changes');
+
+      $body = pht(
+        'It will no longer be possible to push enormous changes to this '.
+        'repository.');
+
+      $submit = pht('Prevent Enormous Changes');
+    } else {
+      $title = pht('Allow Enormous Changes');
+
+      $body = array(
+        pht(
+          'If you allow enormous changes, users can push commits which are '.
+          'too large for Herald to process content rules for. This can allow '.
+          'users to evade content rules implemented in Herald.'),
+        pht(
+          'You can selectively configure Herald by adding rules to prevent a '.
+          'subset of enormous changes (for example, based on who is trying '.
+          'to push the change).'),
+      );
+
+      $submit = pht('Allow Enormous Changes');
+    }
+
+    $more_help = pht(
+      'Enormous changes are commits which are too large to process with '.
+      'content rules because: the diff text for the change is larger than '.
+      '%s bytes; or the diff text takes more than %s seconds to extract.',
+      new PhutilNumber(HeraldCommitAdapter::getEnormousByteLimit()),
+      new PhutilNumber(HeraldCommitAdapter::getEnormousTimeLimit()));
+
+    $response = $this->newDialog();
+
+      foreach ((array)$body as $paragraph) {
+        $response->appendParagraph($paragraph);
+      }
+
+    return $response
+      ->setTitle($title)
+      ->appendParagraph($more_help)
+      ->addSubmitButton($submit)
+      ->addCancelButton($panel_uri);
+  }
+
+}
diff --git a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
index b3baafbd06..4eebc09b52 100644
--- a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
+++ b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
@@ -309,6 +309,19 @@ protected function buildCustomEditFields($object) {
         ->setConduitDescription(pht('Allow or prevent dangerous changes.'))
         ->setConduitTypeDescription(pht('New protection setting.'))
         ->setValue($object->shouldAllowDangerousChanges()),
+      id(new PhabricatorBoolEditField())
+        ->setKey('allowEnormousChanges')
+        ->setLabel(pht('Allow Enormous Changes'))
+        ->setIsCopyable(true)
+        ->setIsConduitOnly(true)
+        ->setOptions(
+          pht('Prevent Enormous Changes'),
+          pht('Allow Enormous Changes'))
+        ->setTransactionType(PhabricatorRepositoryTransaction::TYPE_ENORMOUS)
+        ->setDescription(pht('Permit enomrous changes to be made.'))
+        ->setConduitDescription(pht('Allow or prevent enormous changes.'))
+        ->setConduitTypeDescription(pht('New protection setting.'))
+        ->setValue($object->shouldAllowEnormousChanges()),
       id(new PhabricatorSelectEditField())
         ->setKey('status')
         ->setLabel(pht('Status'))
diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index 7fe45834b3..99df0e54af 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -34,6 +34,7 @@ final class DiffusionCommitHookEngine extends Phobject {
   private $rejectCode = PhabricatorRepositoryPushLog::REJECT_BROKEN;
   private $rejectDetails;
   private $emailPHIDs = array();
+  private $changesets = array();
 
 
 /* -(  Config  )------------------------------------------------------------- */
@@ -131,6 +132,15 @@ public function execute() {
       $this->applyHeraldRefRules($ref_updates, $all_updates);
 
       $content_updates = $this->findContentUpdates($ref_updates);
+
+      try {
+        $this->rejectEnormousChanges($content_updates);
+      } catch (DiffusionCommitHookRejectException $ex) {
+        // If we're rejecting enormous changes, flag everything.
+        $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_ENORMOUS;
+        throw $ex;
+      }
+
       $all_updates = array_merge($all_updates, $content_updates);
 
       $this->applyHeraldContentRules($content_updates, $all_updates);
@@ -1079,7 +1089,37 @@ private function newPushEvent() {
       ->setEpoch(time());
   }
 
-  public function loadChangesetsForCommit($identifier) {
+  private function rejectEnormousChanges(array $content_updates) {
+    $repository = $this->getRepository();
+    if ($repository->shouldAllowEnormousChanges()) {
+      return;
+    }
+
+    foreach ($content_updates as $update) {
+      $identifier = $update->getRefNew();
+      try {
+        $changesets = $this->loadChangesetsForCommit($identifier);
+        $this->changesets[$identifier] = $changesets;
+      } catch (Exception $ex) {
+        $this->changesets[$identifier] = $ex;
+
+        $message = pht(
+          'ENORMOUS CHANGE'.
+          "\n".
+          'Enormous change protection is enabled for this repository, but '.
+          'you are pushing an enormous change ("%s"). Edit the repository '.
+          'configuration before making enormous changes.'.
+          "\n\n".
+          "Content Exception: %s",
+          $identifier,
+          $ex->getMessage());
+
+        throw new DiffusionCommitHookRejectException($message);
+      }
+    }
+  }
+
+  private function loadChangesetsForCommit($identifier) {
     $byte_limit = HeraldCommitAdapter::getEnormousByteLimit();
     $time_limit = HeraldCommitAdapter::getEnormousTimeLimit();
 
@@ -1126,9 +1166,10 @@ public function loadChangesetsForCommit($identifier) {
     if (strlen($raw_diff) >= $byte_limit) {
       throw new Exception(
         pht(
-          'The raw text of this change is enormous (larger than %d '.
-          'bytes). Herald can not process it.',
-          $byte_limit));
+          'The raw text of this change ("%s") is enormous (larger than %s '.
+          'bytes).',
+          $identifier,
+          new PhutilNumber($byte_limit)));
     }
 
     if (!strlen($raw_diff)) {
@@ -1143,6 +1184,20 @@ public function loadChangesetsForCommit($identifier) {
     return $diff->getChangesets();
   }
 
+  public function getChangesetsForCommit($identifier) {
+    if (isset($this->changesets[$identifier])) {
+      $cached = $this->changesets[$identifier];
+
+      if ($cached instanceof Exception) {
+        throw $cached;
+      }
+
+      return $cached;
+    }
+
+    return $this->loadChangesetsForCommit($identifier);
+  }
+
   public function loadCommitRefForCommit($identifier) {
     $repository = $this->getRepository();
     $vcs = $repository->getVersionControlSystem();
diff --git a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
index f4d7e794a2..c93ba32345 100644
--- a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
+++ b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
@@ -37,7 +37,7 @@ public function isDiffEnormous() {
   public function getDiffContent($type) {
     if ($this->changesets === null) {
       try {
-        $this->changesets = $this->getHookEngine()->loadChangesetsForCommit(
+        $this->changesets = $this->getHookEngine()->getChangesetsForCommit(
           $this->getObject()->getRefNew());
       } catch (Exception $ex) {
         $this->changesets = $ex;
diff --git a/src/applications/diffusion/management/DiffusionRepositoryBasicsManagementPanel.php b/src/applications/diffusion/management/DiffusionRepositoryBasicsManagementPanel.php
index 6e527e81b5..af5e9b2881 100644
--- a/src/applications/diffusion/management/DiffusionRepositoryBasicsManagementPanel.php
+++ b/src/applications/diffusion/management/DiffusionRepositoryBasicsManagementPanel.php
@@ -43,6 +43,7 @@ private function buildActionMenu() {
     $delete_uri = $repository->getPathURI('edit/delete/');
     $encoding_uri = $this->getEditPageURI('encoding');
     $dangerous_uri = $repository->getPathURI('edit/dangerous/');
+    $enormous_uri = $repository->getPathURI('edit/enormous/');
 
     if ($repository->isTracked()) {
       $activate_label = pht('Deactivate Repository');
@@ -59,6 +60,15 @@ private function buildActionMenu() {
       $can_dangerous = ($can_edit && $repository->canAllowDangerousChanges());
     }
 
+    $should_enormous = $repository->shouldAllowEnormousChanges();
+    if ($should_enormous) {
+      $enormous_name = pht('Prevent Enormous Changes');
+      $can_enormous = $can_edit;
+    } else {
+      $enormous_name = pht('Allow Enormous Changes');
+      $can_enormous = ($can_edit && $repository->canAllowEnormousChanges());
+    }
+
     $action_list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Basic Information'))
@@ -80,6 +90,13 @@ private function buildActionMenu() {
         ->setDisabled(!$can_dangerous)
         ->setWorkflow(true));
 
+    $action_list->addAction(
+      id(new PhabricatorActionView())
+        ->setName($enormous_name)
+        ->setHref($enormous_uri)
+        ->setDisabled(!$can_enormous)
+        ->setWorkflow(true));
+
     $action_list->addAction(
       id(new PhabricatorActionView())
         ->setHref($activate_uri)
@@ -198,6 +215,20 @@ private function buildBasics() {
 
     $view->addProperty(pht('Dangerous Changes'), $dangerous);
 
+    $can_enormous = $repository->canAllowEnormousChanges();
+    if (!$can_enormous) {
+      $enormous = phutil_tag('em', array(), pht('Not Preventable'));
+    } else {
+      $should_enormous = $repository->shouldAllowEnormousChanges();
+      if ($should_enormous) {
+        $enormous = pht('Allowed');
+      } else {
+        $enormous = pht('Not Allowed');
+      }
+    }
+
+    $view->addProperty(pht('Enormous Changes'), $enormous);
+
     return $view;
   }
 
diff --git a/src/applications/files/config/PhabricatorFilesConfigOptions.php b/src/applications/files/config/PhabricatorFilesConfigOptions.php
index 0f13a2fb4f..1493c54f59 100644
--- a/src/applications/files/config/PhabricatorFilesConfigOptions.php
+++ b/src/applications/files/config/PhabricatorFilesConfigOptions.php
@@ -134,7 +134,7 @@ public function getOptions() {
             "Configure which uploaded file types may be viewed directly ".
             "in the browser. Other file types will be downloaded instead ".
             "of displayed. This is mainly a usability consideration, since ".
-            "browsers tend to freak out when viewing enormous binary files.".
+            "browsers tend to freak out when viewing very large binary files.".
             "\n\n".
             "The keys in this map are viewable MIME types; the values are ".
             "the MIME types they are delivered as when they are viewed in ".
diff --git a/src/applications/repository/editor/PhabricatorRepositoryEditor.php b/src/applications/repository/editor/PhabricatorRepositoryEditor.php
index 401fca3668..768121de5a 100644
--- a/src/applications/repository/editor/PhabricatorRepositoryEditor.php
+++ b/src/applications/repository/editor/PhabricatorRepositoryEditor.php
@@ -28,6 +28,7 @@ public function getTransactionTypes() {
     $types[] = PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE;
     $types[] = PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY;
     $types[] = PhabricatorRepositoryTransaction::TYPE_DANGEROUS;
+    $types[] = PhabricatorRepositoryTransaction::TYPE_ENORMOUS;
     $types[] = PhabricatorRepositoryTransaction::TYPE_SLUG;
     $types[] = PhabricatorRepositoryTransaction::TYPE_SERVICE;
     $types[] = PhabricatorRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE;
@@ -76,6 +77,8 @@ protected function getCustomTransactionOldValue(
         return $object->getPushPolicy();
       case PhabricatorRepositoryTransaction::TYPE_DANGEROUS:
         return $object->shouldAllowDangerousChanges();
+      case PhabricatorRepositoryTransaction::TYPE_ENORMOUS:
+        return $object->shouldAllowEnormousChanges();
       case PhabricatorRepositoryTransaction::TYPE_SLUG:
         return $object->getRepositorySlug();
       case PhabricatorRepositoryTransaction::TYPE_SERVICE:
@@ -110,6 +113,7 @@ protected function getCustomTransactionNewValue(
       case PhabricatorRepositoryTransaction::TYPE_VCS:
       case PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY:
       case PhabricatorRepositoryTransaction::TYPE_DANGEROUS:
+      case PhabricatorRepositoryTransaction::TYPE_ENORMOUS:
       case PhabricatorRepositoryTransaction::TYPE_SERVICE:
       case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE:
       case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_SOURCES:
@@ -184,6 +188,9 @@ protected function applyCustomInternalTransaction(
       case PhabricatorRepositoryTransaction::TYPE_DANGEROUS:
         $object->setDetail('allow-dangerous-changes', $xaction->getNewValue());
         return;
+      case PhabricatorRepositoryTransaction::TYPE_ENORMOUS:
+        $object->setDetail('allow-enormous-changes', $xaction->getNewValue());
+        return;
       case PhabricatorRepositoryTransaction::TYPE_SLUG:
         $object->setRepositorySlug($xaction->getNewValue());
         return;
@@ -248,6 +255,7 @@ protected function requireCapabilities(
       case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE:
       case PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY:
       case PhabricatorRepositoryTransaction::TYPE_DANGEROUS:
+      case PhabricatorRepositoryTransaction::TYPE_ENORMOUS:
       case PhabricatorRepositoryTransaction::TYPE_SLUG:
       case PhabricatorRepositoryTransaction::TYPE_SERVICE:
       case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_SOURCES:
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 702bb42780..435e5749e6 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1672,6 +1672,18 @@ public function shouldAllowDangerousChanges() {
     return (bool)$this->getDetail('allow-dangerous-changes');
   }
 
+  public function canAllowEnormousChanges() {
+    if (!$this->isHosted()) {
+      return false;
+    }
+
+    return true;
+  }
+
+  public function shouldAllowEnormousChanges() {
+    return (bool)$this->getDetail('allow-enormous-changes');
+  }
+
   public function writeStatusMessage(
     $status_type,
     $status_code,
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
index 4c449b4a84..4e099209c6 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
@@ -23,12 +23,14 @@ final class PhabricatorRepositoryPushLog
   const CHANGEFLAG_APPEND = 4;
   const CHANGEFLAG_REWRITE = 8;
   const CHANGEFLAG_DANGEROUS = 16;
+  const CHANGEFLAG_ENORMOUS = 32;
 
   const REJECT_ACCEPT = 0;
   const REJECT_DANGEROUS = 1;
   const REJECT_HERALD = 2;
   const REJECT_EXTERNAL = 3;
   const REJECT_BROKEN = 4;
+  const REJECT_ENORMOUS = 5;
 
   protected $repositoryPHID;
   protected $epoch;
diff --git a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
index e02b670f75..866800161e 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
@@ -16,6 +16,7 @@ final class PhabricatorRepositoryTransaction
   const TYPE_AUTOCLOSE = 'repo:autoclose';
   const TYPE_PUSH_POLICY = 'repo:push-policy';
   const TYPE_DANGEROUS = 'repo:dangerous';
+  const TYPE_ENORMOUS = 'repo:enormous';
   const TYPE_SLUG = 'repo:slug';
   const TYPE_SERVICE = 'repo:service';
   const TYPE_SYMBOLS_SOURCES = 'repo:symbol-source';
@@ -376,6 +377,16 @@ public function getTitle() {
             '%s enabled protection against dangerous changes.',
             $this->renderHandleLink($author_phid));
         }
+      case self::TYPE_ENORMOUS:
+        if ($new) {
+          return pht(
+            '%s disabled protection against enormous changes.',
+            $this->renderHandleLink($author_phid));
+        } else {
+          return pht(
+            '%s enabled protection against enormous changes.',
+            $this->renderHandleLink($author_phid));
+        }
       case self::TYPE_SLUG:
         if (strlen($old) && !strlen($new)) {
           return pht(

From 83c528c46435e25f929c1a359bf3b3929783db00 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 15 Dec 2017 08:21:20 -0800
Subject: [PATCH 337/865] Modularize transactions for Drydock Blueprints

Summary: Ref PHI243. This is a followup to D18822, which added an edit-only `drydock.blueprint.edit`. By modularizing transactions (here) and then adding a "type" transaction (next change) I intend to remove the "edit-only" limitation and make this API method fully functional.

Test Plan: Created and edited blueprints via the web UI. Edited blueprints via the API. Disabled/enabled blueprints (currently web UI only).

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D18845
---
 src/__phutil_library_map__.php                |   8 +-
 .../DrydockBlueprintDisableController.php     |   3 +-
 .../editor/DrydockBlueprintEditEngine.php     |   2 +-
 .../drydock/editor/DrydockBlueprintEditor.php | 100 ++----------------
 .../storage/DrydockBlueprintTransaction.php   |  35 +-----
 .../DrydockBlueprintDisableTransaction.php    |  48 +++++++++
 .../DrydockBlueprintNameTransaction.php       |  60 +++++++++++
 .../DrydockBlueprintTransactionType.php       |   4 +
 8 files changed, 133 insertions(+), 127 deletions(-)
 create mode 100644 src/applications/drydock/xaction/DrydockBlueprintDisableTransaction.php
 create mode 100644 src/applications/drydock/xaction/DrydockBlueprintNameTransaction.php
 create mode 100644 src/applications/drydock/xaction/DrydockBlueprintTransactionType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1a8de4e42b..0a005eef4a 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1008,6 +1008,7 @@
     'DrydockBlueprintCustomField' => 'applications/drydock/customfield/DrydockBlueprintCustomField.php',
     'DrydockBlueprintDatasource' => 'applications/drydock/typeahead/DrydockBlueprintDatasource.php',
     'DrydockBlueprintDisableController' => 'applications/drydock/controller/DrydockBlueprintDisableController.php',
+    'DrydockBlueprintDisableTransaction' => 'applications/drydock/xaction/DrydockBlueprintDisableTransaction.php',
     'DrydockBlueprintEditConduitAPIMethod' => 'applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php',
     'DrydockBlueprintEditController' => 'applications/drydock/controller/DrydockBlueprintEditController.php',
     'DrydockBlueprintEditEngine' => 'applications/drydock/editor/DrydockBlueprintEditEngine.php',
@@ -1016,12 +1017,14 @@
     'DrydockBlueprintImplementationTestCase' => 'applications/drydock/blueprint/__tests__/DrydockBlueprintImplementationTestCase.php',
     'DrydockBlueprintListController' => 'applications/drydock/controller/DrydockBlueprintListController.php',
     'DrydockBlueprintNameNgrams' => 'applications/drydock/storage/DrydockBlueprintNameNgrams.php',
+    'DrydockBlueprintNameTransaction' => 'applications/drydock/xaction/DrydockBlueprintNameTransaction.php',
     'DrydockBlueprintPHIDType' => 'applications/drydock/phid/DrydockBlueprintPHIDType.php',
     'DrydockBlueprintQuery' => 'applications/drydock/query/DrydockBlueprintQuery.php',
     'DrydockBlueprintSearchConduitAPIMethod' => 'applications/drydock/conduit/DrydockBlueprintSearchConduitAPIMethod.php',
     'DrydockBlueprintSearchEngine' => 'applications/drydock/query/DrydockBlueprintSearchEngine.php',
     'DrydockBlueprintTransaction' => 'applications/drydock/storage/DrydockBlueprintTransaction.php',
     'DrydockBlueprintTransactionQuery' => 'applications/drydock/query/DrydockBlueprintTransactionQuery.php',
+    'DrydockBlueprintTransactionType' => 'applications/drydock/xaction/DrydockBlueprintTransactionType.php',
     'DrydockBlueprintViewController' => 'applications/drydock/controller/DrydockBlueprintViewController.php',
     'DrydockCommand' => 'applications/drydock/storage/DrydockCommand.php',
     'DrydockCommandError' => 'applications/drydock/exception/DrydockCommandError.php',
@@ -6102,6 +6105,7 @@
     'DrydockBlueprintCustomField' => 'PhabricatorCustomField',
     'DrydockBlueprintDatasource' => 'PhabricatorTypeaheadDatasource',
     'DrydockBlueprintDisableController' => 'DrydockBlueprintController',
+    'DrydockBlueprintDisableTransaction' => 'DrydockBlueprintTransactionType',
     'DrydockBlueprintEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'DrydockBlueprintEditController' => 'DrydockBlueprintController',
     'DrydockBlueprintEditEngine' => 'PhabricatorEditEngine',
@@ -6110,12 +6114,14 @@
     'DrydockBlueprintImplementationTestCase' => 'PhabricatorTestCase',
     'DrydockBlueprintListController' => 'DrydockBlueprintController',
     'DrydockBlueprintNameNgrams' => 'PhabricatorSearchNgrams',
+    'DrydockBlueprintNameTransaction' => 'DrydockBlueprintTransactionType',
     'DrydockBlueprintPHIDType' => 'PhabricatorPHIDType',
     'DrydockBlueprintQuery' => 'DrydockQuery',
     'DrydockBlueprintSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'DrydockBlueprintSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'DrydockBlueprintTransaction' => 'PhabricatorApplicationTransaction',
+    'DrydockBlueprintTransaction' => 'PhabricatorModularTransaction',
     'DrydockBlueprintTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'DrydockBlueprintTransactionType' => 'PhabricatorModularTransactionType',
     'DrydockBlueprintViewController' => 'DrydockBlueprintController',
     'DrydockCommand' => array(
       'DrydockDAO',
diff --git a/src/applications/drydock/controller/DrydockBlueprintDisableController.php b/src/applications/drydock/controller/DrydockBlueprintDisableController.php
index 525e55228b..60fc8b0d74 100644
--- a/src/applications/drydock/controller/DrydockBlueprintDisableController.php
+++ b/src/applications/drydock/controller/DrydockBlueprintDisableController.php
@@ -28,7 +28,8 @@ public function handleRequest(AphrontRequest $request) {
       $xactions = array();
 
       $xactions[] = id(new DrydockBlueprintTransaction())
-        ->setTransactionType(DrydockBlueprintTransaction::TYPE_DISABLED)
+        ->setTransactionType(
+          DrydockBlueprintDisableTransaction::TRANSACTIONTYPE)
         ->setNewValue($is_disable ? 1 : 0);
 
       $editor = id(new DrydockBlueprintEditor())
diff --git a/src/applications/drydock/editor/DrydockBlueprintEditEngine.php b/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
index 020fe7514c..bd91aa3350 100644
--- a/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
+++ b/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
@@ -121,7 +121,7 @@ protected function buildCustomEditFields($object) {
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setDescription(pht('Name of the blueprint.'))
-        ->setTransactionType(DrydockBlueprintTransaction::TYPE_NAME)
+        ->setTransactionType(DrydockBlueprintNameTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getBlueprintName()),
     );
diff --git a/src/applications/drydock/editor/DrydockBlueprintEditor.php b/src/applications/drydock/editor/DrydockBlueprintEditor.php
index 125c36811a..aac3e7a020 100644
--- a/src/applications/drydock/editor/DrydockBlueprintEditor.php
+++ b/src/applications/drydock/editor/DrydockBlueprintEditor.php
@@ -11,6 +11,14 @@ public function getEditorObjectsDescription() {
     return pht('Drydock Blueprints');
   }
 
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this blueprint.', $author);
+  }
+
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
+  }
+
   protected function supportsSearch() {
     return true;
   }
@@ -21,99 +29,7 @@ public function getTransactionTypes() {
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
-    $types[] = DrydockBlueprintTransaction::TYPE_NAME;
-    $types[] = DrydockBlueprintTransaction::TYPE_DISABLED;
-
     return $types;
   }
 
-  protected function getCustomTransactionOldValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case DrydockBlueprintTransaction::TYPE_NAME:
-        return $object->getBlueprintName();
-      case DrydockBlueprintTransaction::TYPE_DISABLED:
-        return (int)$object->getIsDisabled();
-    }
-
-    return parent::getCustomTransactionOldValue($object, $xaction);
-  }
-
-  protected function getCustomTransactionNewValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case DrydockBlueprintTransaction::TYPE_NAME:
-        return $xaction->getNewValue();
-      case DrydockBlueprintTransaction::TYPE_DISABLED:
-        return (int)$xaction->getNewValue();
-    }
-
-    return parent::getCustomTransactionNewValue($object, $xaction);
-  }
-
-  protected function applyCustomInternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case DrydockBlueprintTransaction::TYPE_NAME:
-        $object->setBlueprintName($xaction->getNewValue());
-        return;
-      case DrydockBlueprintTransaction::TYPE_DISABLED:
-        $object->setIsDisabled((int)$xaction->getNewValue());
-        return;
-    }
-
-    return parent::applyCustomInternalTransaction($object, $xaction);
-  }
-
-  protected function applyCustomExternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case DrydockBlueprintTransaction::TYPE_NAME:
-      case DrydockBlueprintTransaction::TYPE_DISABLED:
-        return;
-    }
-
-    return parent::applyCustomExternalTransaction($object, $xaction);
-  }
-
-
-  protected function validateTransaction(
-    PhabricatorLiskDAO $object,
-    $type,
-    array $xactions) {
-
-    $errors = parent::validateTransaction($object, $type, $xactions);
-
-    switch ($type) {
-      case DrydockBlueprintTransaction::TYPE_NAME:
-        $missing = $this->validateIsEmptyTextField(
-          $object->getBlueprintName(),
-          $xactions);
-
-        if ($missing) {
-          $error = new PhabricatorApplicationTransactionValidationError(
-            $type,
-            pht('Required'),
-            pht('You must choose a name for this blueprint.'),
-            nonempty(last($xactions), null));
-
-          $error->setIsMissingFieldError(true);
-          $errors[] = $error;
-          continue;
-        }
-
-        break;
-    }
-
-    return $errors;
-  }
-
 }
diff --git a/src/applications/drydock/storage/DrydockBlueprintTransaction.php b/src/applications/drydock/storage/DrydockBlueprintTransaction.php
index 0856f01fdb..68eebe8c1d 100644
--- a/src/applications/drydock/storage/DrydockBlueprintTransaction.php
+++ b/src/applications/drydock/storage/DrydockBlueprintTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class DrydockBlueprintTransaction
-  extends PhabricatorApplicationTransaction {
+  extends PhabricatorModularTransaction {
 
   const TYPE_NAME = 'drydock:blueprint:name';
   const TYPE_DISABLED = 'drydock:blueprint:disabled';
@@ -14,37 +14,8 @@ public function getApplicationTransactionType() {
     return DrydockBlueprintPHIDType::TYPECONST;
   }
 
-  public function getTitle() {
-    $old = $this->getOldValue();
-    $new = $this->getNewValue();
-    $author_handle = $this->renderHandleLink($this->getAuthorPHID());
-
-    switch ($this->getTransactionType()) {
-      case self::TYPE_NAME:
-        if (!strlen($old)) {
-          return pht(
-            '%s created this blueprint.',
-            $author_handle);
-        } else {
-          return pht(
-            '%s renamed this blueprint from "%s" to "%s".',
-            $author_handle,
-            $old,
-            $new);
-        }
-      case self::TYPE_DISABLED:
-        if ($new) {
-          return pht(
-            '%s disabled this blueprint.',
-            $author_handle);
-        } else {
-          return pht(
-            '%s enabled this blueprint.',
-            $author_handle);
-        }
-    }
-
-    return parent::getTitle();
+  public function getBaseTransactionClass() {
+    return 'DrydockBlueprintTransactionType';
   }
 
 }
diff --git a/src/applications/drydock/xaction/DrydockBlueprintDisableTransaction.php b/src/applications/drydock/xaction/DrydockBlueprintDisableTransaction.php
new file mode 100644
index 0000000000..216cea35f4
--- /dev/null
+++ b/src/applications/drydock/xaction/DrydockBlueprintDisableTransaction.php
@@ -0,0 +1,48 @@
+<?php
+
+final class DrydockBlueprintDisableTransaction
+  extends DrydockBlueprintTransactionType {
+
+  const TRANSACTIONTYPE = 'drydock:blueprint:disabled';
+
+  public function generateOldValue($object) {
+    return (bool)$object->getIsDisabled();
+  }
+
+  public function generateNewValue($object, $value) {
+    return (bool)$value;
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setIsDisabled((int)$value);
+  }
+
+  public function getTitle() {
+    $new = $this->getNewValue();
+    if ($new) {
+      return pht(
+        '%s disabled this blueprint.',
+        $this->renderAuthor());
+    } else {
+      return pht(
+        '%s enabled this blueprint.',
+        $this->renderAuthor());
+    }
+  }
+
+  public function getTitleForFeed() {
+    $new = $this->getNewValue();
+    if ($new) {
+      return pht(
+        '%s disabled %s.',
+        $this->renderAuthor(),
+        $this->renderObject());
+    } else {
+      return pht(
+        '%s enabled %s.',
+        $this->renderAuthor(),
+        $this->renderObject());
+    }
+  }
+
+}
diff --git a/src/applications/drydock/xaction/DrydockBlueprintNameTransaction.php b/src/applications/drydock/xaction/DrydockBlueprintNameTransaction.php
new file mode 100644
index 0000000000..c3c17d0413
--- /dev/null
+++ b/src/applications/drydock/xaction/DrydockBlueprintNameTransaction.php
@@ -0,0 +1,60 @@
+<?php
+
+final class DrydockBlueprintNameTransaction
+  extends DrydockBlueprintTransactionType {
+
+  const TRANSACTIONTYPE = 'drydock:blueprint:name';
+
+  public function generateOldValue($object) {
+    return $object->getBlueprintName();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setBlueprintName($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s renamed this blueprint from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function getTitleForFeed() {
+    $old = $this->getOldValue();
+    $new = $this->getNewValue();
+
+    return pht(
+      '%s renamed %s from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderObject(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    $name = $object->getBlueprintName();
+    if ($this->isEmptyTextTransaction($name, $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Blueprints must have a name.'));
+    }
+
+    $max_length = $object->getColumnMaximumByteLength('blueprintName');
+    foreach ($xactions as $xaction) {
+      $new_value = $xaction->getNewValue();
+
+      $new_length = strlen($new_value);
+      if ($new_length > $max_length) {
+        $errors[] = $this->newInvalidError(
+          pht('Blueprint names can be no longer than %s characters.',
+          new PhutilNumber($max_length)));
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/drydock/xaction/DrydockBlueprintTransactionType.php b/src/applications/drydock/xaction/DrydockBlueprintTransactionType.php
new file mode 100644
index 0000000000..ecf021b3ad
--- /dev/null
+++ b/src/applications/drydock/xaction/DrydockBlueprintTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class DrydockBlueprintTransactionType
+  extends PhabricatorModularTransactionType {}

From 6d9776fa8963dffb5ba3a384dfe6703fb49a0d17 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 13 Dec 2017 07:47:18 -0800
Subject: [PATCH 338/865] Give EditEngine a Conduit-specific initialization
 pathway for objects

Summary:
Depends on D18845. See PHI243 for context and more details.

Briefly, some objects need a "type" transaction (or something similar) very early on, and we can't generate their fields until we know the object type. Drydock blueprints are an example: a blueprint's fields depend on the blueprint's type.

In web interfaces, the workflow just forces the user to select a type first. For Conduit workflows, I think the cleanest approach is to proactively extract and apply type information before processing the request. This will make the implementation a little messier, but the API cleaner.

An alternative is to add more fields to the API, like a "type" field. This makes the implementation cleaner, but the API messier. I think we're better off favoring a cleaner API here.

This change just makes it possible for `DrydockBlueprintEditEngine` to look at the incoming transactions and extract a "type"; it doesn't actually change any behavior.

Test Plan: Performed edits via API, but this change doesn't alter any behavior.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18847
---
 .../editengine/PhabricatorEditEngine.php      | 67 +++++++++++++------
 1 file changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 8ba49f4d77..1e9d936929 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -630,6 +630,17 @@ final public function getIsCreate() {
     return $this->isCreate;
   }
 
+  /**
+   * Initialize a new object for object creation via Conduit.
+   *
+   * @return object Newly initialized object.
+   * @param list<wild> Raw transactions.
+   * @task load
+   */
+  protected function newEditableObjectFromConduit(array $raw_xactions) {
+    return $this->newEditableObject();
+  }
+
   /**
    * Initialize a new object for documentation creation.
    *
@@ -2031,6 +2042,8 @@ final public function buildConduitResponse(ConduitAPIRequest $request) {
           get_class($this)));
     }
 
+    $raw_xactions = $this->getRawConduitTransactions($request);
+
     $identifier = $request->getValue('objectIdentifier');
     if ($identifier) {
       $this->setIsCreate(false);
@@ -2039,7 +2052,7 @@ final public function buildConduitResponse(ConduitAPIRequest $request) {
       $this->requireCreateCapability();
 
       $this->setIsCreate(true);
-      $object = $this->newEditableObject();
+      $object = $this->newEditableObjectFromConduit($raw_xactions);
     }
 
     $this->validateObject($object);
@@ -2049,7 +2062,11 @@ final public function buildConduitResponse(ConduitAPIRequest $request) {
     $types = $this->getConduitEditTypesFromFields($fields);
     $template = $object->getApplicationTransactionTemplate();
 
-    $xactions = $this->getConduitTransactions($request, $types, $template);
+    $xactions = $this->getConduitTransactions(
+      $request,
+      $raw_xactions,
+      $types,
+      $template);
 
     $editor = $object->getApplicationTransactionEditor()
       ->setActor($viewer)
@@ -2078,23 +2095,7 @@ final public function buildConduitResponse(ConduitAPIRequest $request) {
     );
   }
 
-
-  /**
-   * Generate transactions which can be applied from edit actions in a Conduit
-   * request.
-   *
-   * @param ConduitAPIRequest The request.
-   * @param list<PhabricatorEditType> Supported edit types.
-   * @param PhabricatorApplicationTransaction Template transaction.
-   * @return list<PhabricatorApplicationTransaction> Generated transactions.
-   * @task conduit
-   */
-  private function getConduitTransactions(
-    ConduitAPIRequest $request,
-    array $types,
-    PhabricatorApplicationTransaction $template) {
-
-    $viewer = $request->getUser();
+  private function getRawConduitTransactions(ConduitAPIRequest $request) {
     $transactions_key = 'transactions';
 
     $xactions = $request->getValue($transactions_key);
@@ -2124,7 +2125,33 @@ private function getConduitTransactions(
             $transactions_key,
             $key));
       }
+    }
+
+    return $xactions;
+  }
+
+
+  /**
+   * Generate transactions which can be applied from edit actions in a Conduit
+   * request.
+   *
+   * @param ConduitAPIRequest The request.
+   * @param list<wild> Raw conduit transactions.
+   * @param list<PhabricatorEditType> Supported edit types.
+   * @param PhabricatorApplicationTransaction Template transaction.
+   * @return list<PhabricatorApplicationTransaction> Generated transactions.
+   * @task conduit
+   */
+  private function getConduitTransactions(
+    ConduitAPIRequest $request,
+    array $xactions,
+    array $types,
+    PhabricatorApplicationTransaction $template) {
 
+    $viewer = $request->getUser();
+    $results = array();
+
+    foreach ($xactions as $key => $xaction) {
       $type = $xaction['type'];
       if (empty($types[$type])) {
         throw new Exception(
@@ -2137,8 +2164,6 @@ private function getConduitTransactions(
       }
     }
 
-    $results = array();
-
     if ($this->getIsCreate()) {
       $results[] = id(clone $template)
         ->setTransactionType(PhabricatorTransactions::TYPE_CREATE);

From f3f1f9dc577ac9675accae0f5870e55a08a3f258 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 26 Dec 2017 10:17:27 -0800
Subject: [PATCH 339/865] Allow "drydock.blueprint.edit" to create blueprints

Summary:
Depends on D18848. Ref PHI243. This puts a bit of logic up front to figure out the blueprint type before we actually start editing it.

This implementation is a little messy but it keeps the API clean. Eventually, the implementation could probably go in the TransactionTypes so more code is shared, but I'd like to wait for a couple more of these first.

This capability probably isn't too useful, but just pays down a bit of technical debt from the caveat introduced in D18822.

Test Plan:
  - Created a new blueprint with the API.
  - Tried to create a blueprint without a "type" (got a helpful error).
  - Created and edited blueprints via the web UI.
  - Tried to change the "type" of an existing blueprint (got a helpful error).

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D18849
---
 src/__phutil_library_map__.php                |  2 +
 .../DrydockBlueprintEditConduitAPIMethod.php  |  3 +-
 .../editor/DrydockBlueprintEditEngine.php     | 45 ++++++++++++++-
 .../DrydockBlueprintTypeTransaction.php       | 57 +++++++++++++++++++
 4 files changed, 104 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/drydock/xaction/DrydockBlueprintTypeTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 0a005eef4a..f4a410ad2e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1025,6 +1025,7 @@
     'DrydockBlueprintTransaction' => 'applications/drydock/storage/DrydockBlueprintTransaction.php',
     'DrydockBlueprintTransactionQuery' => 'applications/drydock/query/DrydockBlueprintTransactionQuery.php',
     'DrydockBlueprintTransactionType' => 'applications/drydock/xaction/DrydockBlueprintTransactionType.php',
+    'DrydockBlueprintTypeTransaction' => 'applications/drydock/xaction/DrydockBlueprintTypeTransaction.php',
     'DrydockBlueprintViewController' => 'applications/drydock/controller/DrydockBlueprintViewController.php',
     'DrydockCommand' => 'applications/drydock/storage/DrydockCommand.php',
     'DrydockCommandError' => 'applications/drydock/exception/DrydockCommandError.php',
@@ -6122,6 +6123,7 @@
     'DrydockBlueprintTransaction' => 'PhabricatorModularTransaction',
     'DrydockBlueprintTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'DrydockBlueprintTransactionType' => 'PhabricatorModularTransactionType',
+    'DrydockBlueprintTypeTransaction' => 'DrydockBlueprintTransactionType',
     'DrydockBlueprintViewController' => 'DrydockBlueprintController',
     'DrydockCommand' => array(
       'DrydockDAO',
diff --git a/src/applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php b/src/applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php
index 764c077d87..7a120f7c5b 100644
--- a/src/applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php
+++ b/src/applications/drydock/conduit/DrydockBlueprintEditConduitAPIMethod.php
@@ -13,8 +13,7 @@ public function newEditEngine() {
 
   public function getMethodSummary() {
     return pht(
-      'WARNING: Apply transactions to edit an existing blueprint. This method '.
-      'can not create new blueprints.');
+      'Apply transactions to create or edit a blueprint.');
   }
 
 }
diff --git a/src/applications/drydock/editor/DrydockBlueprintEditEngine.php b/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
index bd91aa3350..6bd1366ef0 100644
--- a/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
+++ b/src/applications/drydock/editor/DrydockBlueprintEditEngine.php
@@ -51,6 +51,38 @@ protected function newEditableObject() {
     return $blueprint;
   }
 
+  protected function newEditableObjectFromConduit(array $raw_xactions) {
+    $type = null;
+    foreach ($raw_xactions as $raw_xaction) {
+      if ($raw_xaction['type'] !== 'type') {
+        continue;
+      }
+
+      $type = $raw_xaction['value'];
+    }
+
+    if ($type === null) {
+      throw new Exception(
+        pht(
+          'When creating a new Drydock blueprint via the Conduit API, you '.
+          'must provide a "type" transaction to select a type.'));
+    }
+
+    $map = DrydockBlueprintImplementation::getAllBlueprintImplementations();
+    if (!isset($map[$type])) {
+      throw new Exception(
+        pht(
+          'Blueprint type "%s" is unrecognized. Valid types are: %s.',
+          $type,
+          implode(', ', array_keys($map))));
+    }
+
+    $impl = clone $map[$type];
+    $this->setBlueprintImplementation($impl);
+
+    return $this->newEditableObject();
+  }
+
   protected function newEditableObjectForDocumentation() {
     // In order to generate the proper list of fields/transactions for a
     // blueprint, a blueprint's type needs to be known upfront, and there's
@@ -112,11 +144,22 @@ protected function buildCustomEditFields($object) {
     $impl = $object->getImplementation();
 
     return array(
+      // This field appears in the web UI
       id(new PhabricatorStaticEditField())
-        ->setKey('type')
+        ->setKey('displayType')
         ->setLabel(pht('Blueprint Type'))
         ->setDescription(pht('Type of blueprint.'))
         ->setValue($impl->getBlueprintName()),
+      id(new PhabricatorTextEditField())
+        ->setKey('type')
+        ->setLabel(pht('Type'))
+        ->setIsConduitOnly(true)
+        ->setTransactionType(
+          DrydockBlueprintTypeTransaction::TRANSACTIONTYPE)
+        ->setDescription(pht('When creating a blueprint, set the type.'))
+        ->setConduitDescription(pht('Set the blueprint type.'))
+        ->setConduitTypeDescription(pht('Blueprint type.'))
+        ->setValue($object->getClassName()),
       id(new PhabricatorTextEditField())
         ->setKey('name')
         ->setLabel(pht('Name'))
diff --git a/src/applications/drydock/xaction/DrydockBlueprintTypeTransaction.php b/src/applications/drydock/xaction/DrydockBlueprintTypeTransaction.php
new file mode 100644
index 0000000000..024e6092fa
--- /dev/null
+++ b/src/applications/drydock/xaction/DrydockBlueprintTypeTransaction.php
@@ -0,0 +1,57 @@
+<?php
+
+final class DrydockBlueprintTypeTransaction
+  extends DrydockBlueprintTransactionType {
+
+  const TRANSACTIONTYPE = 'drydock.blueprint.type';
+
+  public function generateOldValue($object) {
+    return $object->getClassName();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setClassName($value);
+  }
+
+  public function getTitle() {
+    // These transactions can only be applied during object creation and never
+    // generate a timeline event.
+    return null;
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    $name = $object->getClassName();
+    if ($this->isEmptyTextTransaction($name, $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('You must select a blueprint type when creating a blueprint.'));
+    }
+
+    $map = DrydockBlueprintImplementation::getAllBlueprintImplementations();
+
+    foreach ($xactions as $xaction) {
+      if (!$this->isNewObject()) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'The type of a blueprint can not be changed once it has '.
+            'been created.'),
+          $xaction);
+        continue;
+      }
+
+      $new = $xaction->getNewValue();
+      if (!isset($map[$new])) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Blueprint type "%s" is not valid. Valid types are: %s.',
+            $new,
+            implode(', ', array_keys($map))));
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}

From 0f02d79ffa9d5f20d3687953f7276076cf0a82cf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 4 Jan 2018 12:22:27 -0800
Subject: [PATCH 340/865] Remove nonfunctional Mercurial "bundle2" capability
 filtering from SSH pathway

Summary:
Ref T13036. This code attempts to filter the "capabilities" message to remove "bundle2", but I think this has never worked.

Specifically, the //write// pathway is hooked, and "write" here means "client is writing a message to the server". However, the "capabilities" frame is part of the response, not part of the request. Thus, this code never fires, at least on recent versions of Mercurial.

Since I plan to support bundle2 and don't want to decode response frames, just get rid of this, assuming we'll achieve those goals.

I think this was just overlooked in D14241, which probably focused on the HTTP version. This code does (at least, potentially) do something for HTTP.

I'm leaving the actual "strip stuff" code in place for now since I think it's still used on the HTTP pathway.

Test Plan:
  - Added debug logging, saw this code never hit even though `hg push --debug` shows the client believing bundle2 is supported.
  - Logged both halves of the wire protocol and saw this come from the server, not the client.
  - Ran the failing `hg push` of a 4MB file under hg 4.4.1, got the same error as before.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: cspeckmim

Maniphest Tasks: T13036

Differential Revision: https://secure.phabricator.com/D18855
---
 .../diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
index 4508ae53da..da877b7314 100644
--- a/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
@@ -109,14 +109,7 @@ public function willWriteMessageCallback(
       $this->didSeeWrite = true;
     }
 
-    $raw_message = $message['raw'];
-    if ($command == 'capabilities') {
-      $raw_message = DiffusionMercurialWireProtocol::filterBundle2Capability(
-        $raw_message);
-    }
-
-    // If we're good, return the raw message data.
-    return $raw_message;
+    return $message['raw'];
   }
 
   protected function raiseWrongVCSException(

From 3a4e14431fce5b80c57c1f62ed6003ee93575ac6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 4 Jan 2018 12:46:38 -0800
Subject: [PATCH 341/865] Remove an obsolete comment about Mercurial SSH error
 behavior

Summary:
Depends on D18855. Ref T13036. This comment no longer seems to be accurate: anything we send over `stderr` is faithfully shown to the user with recent clients.

From [[ https://www.mercurial-scm.org/repo/hg/file/default/mercurial/help/internals/wireprotocol.txt | this document ]], the missing sauce may have been:

```
A generic error response type is also supported. It consists of a an error
message written to ``stderr`` followed by ``\n-\n``. In addition, ``\n`` is
written to ``stdout``.
```

That is, writing "\n" to stdout in addition to writing the error to stderr. However, this no longer appears to be necessary.

I think the modern client behavior is generally sensible (and consistent with the behavior of Git and Subversion) so this //probably// isn't a bug or me making a mistake.

Test Plan: With a modern client, threw some arbitrary exception during execution. Observed a helpful message on the client with no additional steps.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13036

Differential Revision: https://secure.phabricator.com/D18856
---
 .../ssh/DiffusionMercurialServeSSHWorkflow.php        | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
index da877b7314..5701a4bac1 100644
--- a/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
@@ -66,17 +66,6 @@ protected function executeRepositoryOperations() {
       ->setWillWriteCallback(array($this, 'willWriteMessageCallback'))
       ->execute();
 
-    // TODO: It's apparently technically possible to communicate errors to
-    // Mercurial over SSH by writing a special "\n<error>\n-\n" string. However,
-    // my attempt to implement that resulted in Mercurial closing the socket and
-    // then hanging, without showing the error. This might be an issue on our
-    // side (we need to close our half of the socket?), or maybe the code
-    // for this in Mercurial doesn't actually work, or maybe something else
-    // is afoot. At some point, we should look into doing this more cleanly.
-    // For now, when we, e.g., reject writes for policy reasons, the user will
-    // see "abort: unexpected response: empty string" after the diagnostically
-    // useful, e.g., "remote: This repository is read-only over SSH." message.
-
     if (!$err && $this->didSeeWrite) {
       $repository->writeStatusMessage(
         PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE,

From 13c8963dab27b5ee24a87c5f4ebbf18be585dc19 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 4 Jan 2018 13:41:20 -0800
Subject: [PATCH 342/865] Fix a Mercurial wire protocol parser issue when we
 receive a length frame before any data

Summary:
Depends on D18856. Ref T13036. See PHI275. When we receive a length frame but the buffer doesn't have any data yet, we currently emit a pointless 0-length data frame on the channel.

For normal chatter this is harmless/valid, but it causes problems when a channel has transitioned into bundle2 mode (probably it indicates "end of stream")?

In any case, it's never helpful, so if we're about to read a data block and don't have any data, just bail out until we see some more data.

Note that we can't end up here //expecting// a 0-length data block: both the `data-length` and `data-bytes` states already handle that properly.

Test Plan: Pushed 4MB changes to a Mercurial repository with Mercurial 4.1.1, was no longer able to hit channel errors.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13036

Differential Revision: https://secure.phabricator.com/D18857
---
 .../ssh/DiffusionMercurialWireClientSSHProtocolChannel.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php b/src/applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php
index 5150ef9352..4c16fb9f0f 100644
--- a/src/applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php
+++ b/src/applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php
@@ -192,6 +192,13 @@ protected function decodeStream($data) {
           $this->state = 'data-bytes';
         }
       } else if ($this->state == 'data-bytes') {
+        // If we don't have any more bytes on the buffer yet, just bail:
+        // otherwise, we'll emit a pointless and possibly harmful 0-byte data
+        // frame. See T13036 for discussion.
+        if (!strlen($this->buffer)) {
+          break;
+        }
+
         $bytes = substr($this->buffer, 0, $this->expectBytes);
         $this->buffer = substr($this->buffer, strlen($bytes));
         $this->expectBytes -= strlen($bytes);

From 94db95a165e710e30366c52d99ef1f5f289fbac3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 4 Jan 2018 10:18:45 -0800
Subject: [PATCH 343/865] Sort burnup data chronologically after merging
 synthetic and "real" data

Summary:
Ref T13020. See PHI273. See D18853. On `secure`, the chart looks less promising than it did locally, and is full of discontinuities:

{F5356544}

I think this is a sorting issue. But if I can't fake my way through this soon I'll maybe get the Fact engine running and use it to provide the data here, as a sort of half-step toward T1562?

Test Plan: Chart looks the same locally, will push and see if `secure` improves?

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13020

Differential Revision: https://secure.phabricator.com/D18854
---
 .../maniphest/controller/ManiphestReportController.php           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
index 821c96a2aa..5633091450 100644
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -153,6 +153,7 @@ public function renderBurn() {
     // Merge the synthetic rows into the real transactions.
     $data = array_merge($create_rows, $data);
     $data = array_values($data);
+    $data = isort($data, 'dateCreated');
 
     $stats = array();
     $day_buckets = array();

From 554359203467986d2873f274364f80e2bc640239 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 4 Jan 2018 14:11:54 -0800
Subject: [PATCH 344/865] Add a couple of clarifying comments to the Mercurial
 protocol parser

Summary: See D18857. Ref T13036. See PHI275. Explain what's going on here a little better since it isn't entirely obvious and debugging these stream parsers is a gigantic pain.

Test Plan: Read text.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13036

Differential Revision: https://secure.phabricator.com/D18859
---
 ...nMercurialWireClientSSHProtocolChannel.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php b/src/applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php
index 4c16fb9f0f..8eb026d8fe 100644
--- a/src/applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php
+++ b/src/applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php
@@ -180,6 +180,15 @@ protected function decodeStream($data) {
           $this->state = 'arguments';
         }
       } else if ($this->state == 'data-length') {
+
+        // We're reading the length of a chunk of raw data. It looks like
+        // this:
+        //
+        //   <length-in-bytes>\n
+        //
+        // The length is human-readable text (for example, "4096"), and
+        // may be 0.
+
         $line = $this->readProtocolLine();
         if ($line === null) {
           break;
@@ -192,6 +201,9 @@ protected function decodeStream($data) {
           $this->state = 'data-bytes';
         }
       } else if ($this->state == 'data-bytes') {
+
+        // We're reading some known, nonzero number of raw bytes of data.
+
         // If we don't have any more bytes on the buffer yet, just bail:
         // otherwise, we'll emit a pointless and possibly harmful 0-byte data
         // frame. See T13036 for discussion.
@@ -203,6 +215,13 @@ protected function decodeStream($data) {
         $this->buffer = substr($this->buffer, strlen($bytes));
         $this->expectBytes -= strlen($bytes);
 
+        // NOTE: We emit a data frame as soon as we read some data. This can
+        // cause us to repackage frames: for example, if we receive one large
+        // frame slowly, we may emit it as several smaller frames. In theory
+        // this is good; in practice, Mercurial never seems to select a frame
+        // size larger than 4096 bytes naturally and this may be more
+        // complexity and trouble than it is worth. See T13036.
+
         $messages[] = $this->newDataMessage($bytes);
 
         if (!$this->expectBytes) {

From adbd7d4fd8a2c80b7f27c10c1432b6eef0196ae4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 4 Jan 2018 14:44:01 -0800
Subject: [PATCH 345/865] Make the new synthetic burnup chart data respect the
 "Project" filter

Summary: See PHI273. Third time's the charm? This page has a "Project" filter which lets you view data for only one project, but the synthetic data currently ignores it.

Test Plan: Filtered burnup chart by various projects, saw sensible-looking data.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18860
---
 .../controller/ManiphestReportController.php         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
index 5633091450..3ba597fb92 100644
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -75,6 +75,7 @@ public function renderBurn() {
     $conn = $table->establishConnection('r');
 
     $joins = '';
+    $create_joins = '';
     if ($project_phid) {
       $joins = qsprintf(
         $conn,
@@ -84,6 +85,12 @@ public function renderBurn() {
         PhabricatorEdgeConfig::TABLE_NAME_EDGE,
         PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
         $project_phid);
+      $create_joins = qsprintf(
+        $conn,
+        'JOIN %T p ON p.src = t.phid AND p.type = %d AND p.dst = %s',
+        PhabricatorEdgeConfig::TABLE_NAME_EDGE,
+        PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
+        $project_phid);
     }
 
     $data = queryfx_all(
@@ -113,8 +120,9 @@ public function renderBurn() {
     // default value.
     $create_rows = queryfx_all(
       $conn,
-      'SELECT dateCreated FROM %T',
-      id(new ManiphestTask())->getTableName());
+      'SELECT t.dateCreated FROM %T t %Q',
+      id(new ManiphestTask())->getTableName(),
+      $create_joins);
     foreach ($create_rows as $key => $create_row) {
       $create_rows[$key] = array(
         'transactionType' => 'status',

From 2140741e25288b05671e60c8954ffc0c2be7b624 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@dropbox.com>
Date: Sat, 6 Jan 2018 07:25:26 -0800
Subject: [PATCH 346/865] Fix typo in new setting description

Summary:
Noticed by @amckinley in
https://secure.phabricator.com/D18850#inline-57246 but not fixed
before landing.

Test Plan: ispell

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, amckinley, epriestley

Differential Revision: https://secure.phabricator.com/D18861
---
 .../diffusion/editor/DiffusionRepositoryEditEngine.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
index 4eebc09b52..dcb79a6c86 100644
--- a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
+++ b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
@@ -318,7 +318,7 @@ protected function buildCustomEditFields($object) {
           pht('Prevent Enormous Changes'),
           pht('Allow Enormous Changes'))
         ->setTransactionType(PhabricatorRepositoryTransaction::TYPE_ENORMOUS)
-        ->setDescription(pht('Permit enomrous changes to be made.'))
+        ->setDescription(pht('Permit enormous changes to be made.'))
         ->setConduitDescription(pht('Allow or prevent enormous changes.'))
         ->setConduitTypeDescription(pht('New protection setting.'))
         ->setValue($object->shouldAllowEnormousChanges()),

From 82bfb9817920bbd6f75d27cbbf4555e310b826b0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 10 Jan 2018 13:32:44 -0800
Subject: [PATCH 347/865] Fix a copy/paste error on the burnup chart

Summary: See PHI286, maybe. See PHI273. Strongly considering just deleting this.

Test Plan: ~.~

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18865
---
 .../maniphest/controller/ManiphestReportController.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
index 3ba597fb92..4f546d04c5 100644
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -140,7 +140,7 @@ public function renderBurn() {
       }
 
       $oldv = trim($row['oldValue'], '"');
-      $newv = trim($row['oldValue'], '"');
+      $newv = trim($row['newValue'], '"');
 
       // If this is a status change, preserve it.
       if ($oldv != 'null') {

From 53b4882b8073439f00502587e9979f93a56e232d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 10 Jan 2018 13:32:44 -0800
Subject: [PATCH 348/865] (stable) Fix a copy/paste error on the burnup chart

Summary: See PHI286, maybe. See PHI273. Strongly considering just deleting this.

Test Plan: ~.~

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18865
---
 .../maniphest/controller/ManiphestReportController.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
index 3ba597fb92..4f546d04c5 100644
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -140,7 +140,7 @@ public function renderBurn() {
       }
 
       $oldv = trim($row['oldValue'], '"');
-      $newv = trim($row['oldValue'], '"');
+      $newv = trim($row['newValue'], '"');
 
       // If this is a status change, preserve it.
       if ($oldv != 'null') {

From 3e983b583dc0b5c46aa0702b346fbd552766a318 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 16 Jan 2018 11:01:29 -0800
Subject: [PATCH 349/865] Fix a transposed feed story in Badges

Summary: See <https://discourse.phabricator-community.org/t/badge-quality-from-and-to-interchanged-in-activity-log/987>. These are swapped.

Test Plan: Changed a badge quality, viewed feed story, saw it position the strings correctly.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18870
---
 .../xaction/PhabricatorBadgesBadgeQualityTransaction.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/applications/badges/xaction/PhabricatorBadgesBadgeQualityTransaction.php b/src/applications/badges/xaction/PhabricatorBadgesBadgeQualityTransaction.php
index de060c17e7..fc1bf014c0 100644
--- a/src/applications/badges/xaction/PhabricatorBadgesBadgeQualityTransaction.php
+++ b/src/applications/badges/xaction/PhabricatorBadgesBadgeQualityTransaction.php
@@ -37,11 +37,11 @@ public function getTitleForFeed() {
     $new = $this->getQualityLabel($this->getNewValue());
 
     return pht(
-      '%s updated %s quality from %s to %s.',
+      '%s updated the quality of %s from %s to %s.',
       $this->renderAuthor(),
       $this->renderObject(),
-      $new,
-      $old);
+      $old,
+      $new);
   }
 
   public function validateTransactions($object, array $xactions) {

From ad659627b3e931256e295efda941775c4020b713 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 30 Nov 2017 05:14:05 -0800
Subject: [PATCH 350/865] Make bulk editor working set editable and more
 homogenous

Summary:
Ref T13025. See PHI50. Fixes T11286. Ref T10005. Begin modernizing the bulk editor.

For T10005 ("move the bulk editor to modern infrastructure"), rewrite the rendering of the editable set so that it is application-agnostic and can work with any kind of object.

For T11286 ("let users de-select items in the working set"), make the working set editable.

Test Plan:
{F5302158}

  - Deselected some objects, applied an edit, saw the edit apply to only selected objects.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025, T11286, T10005

Differential Revision: https://secure.phabricator.com/D18805
---
 resources/celerity/map.php                    | 17 ++--
 .../ManiphestBatchEditController.php          | 77 +++++++++++++------
 src/view/phui/PHUIObjectItemView.php          | 43 +++++++++++
 .../phui/object-item/phui-oi-list-view.css    | 19 +++++
 webroot/rsrc/css/phui/phui-box.css            |  4 +
 .../js/phui/behavior-phui-selectable-list.js  | 44 +++++++++++
 6 files changed, 175 insertions(+), 29 deletions(-)
 create mode 100644 webroot/rsrc/js/phui/behavior-phui-selectable-list.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d937b91e4f..0fdf44344f 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'fdb27ef9',
+    'core.pkg.css' => '5be8063f',
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -135,14 +135,14 @@
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
     'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
-    'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'bf094950',
+    'rsrc/css/phui/object-item/phui-oi-list-view.css' => '73c5f5c4',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
     'rsrc/css/phui/phui-action-list.css' => 'f7f61a34',
     'rsrc/css/phui/phui-action-panel.css' => 'b4798122',
     'rsrc/css/phui/phui-badge.css' => '22c0cf4f',
     'rsrc/css/phui/phui-basic-nav-view.css' => '98c11ab3',
     'rsrc/css/phui/phui-big-info-view.css' => 'acc3492c',
-    'rsrc/css/phui/phui-box.css' => '9f3745fb',
+    'rsrc/css/phui/phui-box.css' => '4bd6cdb9',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-cms.css' => '504b4b23',
     'rsrc/css/phui/phui-comment-form.css' => 'ac68149f',
@@ -523,6 +523,7 @@
     'rsrc/js/core/phtize.js' => 'd254d646',
     'rsrc/js/phui/behavior-phui-dropdown-menu.js' => 'b95d6f7d',
     'rsrc/js/phui/behavior-phui-file-upload.js' => 'b003d4fb',
+    'rsrc/js/phui/behavior-phui-selectable-list.js' => '464259a2',
     'rsrc/js/phui/behavior-phui-submenu.js' => 'a6f7a73b',
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
@@ -673,6 +674,7 @@
     'javelin-behavior-phui-dropdown-menu' => 'b95d6f7d',
     'javelin-behavior-phui-file-upload' => 'b003d4fb',
     'javelin-behavior-phui-hovercards' => 'bcaccd64',
+    'javelin-behavior-phui-selectable-list' => '464259a2',
     'javelin-behavior-phui-submenu' => 'a6f7a73b',
     'javelin-behavior-phui-tab-group' => '0a0b10e9',
     'javelin-behavior-phuix-example' => '68af71ca',
@@ -820,7 +822,7 @@
     'phui-badge-view-css' => '22c0cf4f',
     'phui-basic-nav-view-css' => '98c11ab3',
     'phui-big-info-view-css' => 'acc3492c',
-    'phui-box-css' => '9f3745fb',
+    'phui-box-css' => '4bd6cdb9',
     'phui-button-bar-css' => 'f1ff5494',
     'phui-button-css' => '1863cc6e',
     'phui-button-simple-css' => '8e1baf68',
@@ -860,7 +862,7 @@
     'phui-oi-color-css' => 'cd2b9b77',
     'phui-oi-drag-ui-css' => '08f4ccc3',
     'phui-oi-flush-ui-css' => '9d9685d6',
-    'phui-oi-list-view-css' => 'bf094950',
+    'phui-oi-list-view-css' => '73c5f5c4',
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
@@ -1226,6 +1228,11 @@
       'javelin-behavior',
       'javelin-dom',
     ),
+    '464259a2' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+    ),
     '469c0d9e' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
index f2ec4b433f..c3438a6cee 100644
--- a/src/applications/maniphest/controller/ManiphestBatchEditController.php
+++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php
@@ -89,12 +89,7 @@ public function handleRequest(AphrontRequest $request) {
         ->setURI($job->getMonitorURI());
     }
 
-    $handles = ManiphestTaskListView::loadTaskHandles($viewer, $tasks);
-
-    $list = new ManiphestTaskListView();
-    $list->setTasks($tasks);
-    $list->setUser($viewer);
-    $list->setHandles($handles);
+    $list = $this->newBulkObjectList($tasks);
 
     $template = new AphrontTokenizerTemplateView();
     $template = $template->render();
@@ -142,21 +137,8 @@ public function handleRequest(AphrontRequest $request) {
         'statusMap'   => ManiphestTaskStatus::getTaskStatusMap(),
       ));
 
-    $form = id(new AphrontFormView())
-      ->setUser($viewer)
-      ->addHiddenInput('board', $board_id)
-      ->setID('maniphest-batch-edit-form');
-
-    foreach ($tasks as $task) {
-      $form->appendChild(
-        phutil_tag(
-          'input',
-          array(
-            'type' => 'hidden',
-            'name' => 'batch[]',
-            'value' => $task->getID(),
-          )));
-    }
+    $form = id(new PHUIFormLayoutView())
+      ->setUser($viewer);
 
     $form->appendChild(
       phutil_tag(
@@ -166,6 +148,7 @@ public function handleRequest(AphrontRequest $request) {
           'name' => 'actions',
           'id'   => 'batch-form-actions',
         )));
+
     $form->appendChild(
       id(new PHUIFormInsetView())
         ->setTitle(pht('Actions'))
@@ -210,17 +193,63 @@ public function handleRequest(AphrontRequest $request) {
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form);
 
-    $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
-      ->setFooter(array(
+
+    $complete_form = phabricator_form(
+      $viewer,
+      array(
+        'action' => $request->getRequestURI(),
+        'method' => 'POST',
+        'id' => 'maniphest-batch-edit-form',
+      ),
+      array(
+        phutil_tag(
+          'input',
+          array(
+            'type' => 'hidden',
+            'name' => 'board',
+            'value' => $board_id,
+          )),
         $task_box,
         $form_box,
       ));
 
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter($complete_form);
+
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
       ->appendChild($view);
   }
 
+  private function newBulkObjectList(array $objects) {
+    $viewer = $this->getViewer();
+    $objects = mpull($objects, null, 'getPHID');
+
+    $handles = $viewer->loadHandles(array_keys($objects));
+
+    $status_closed = PhabricatorObjectHandle::STATUS_CLOSED;
+
+    $list = id(new PHUIObjectItemListView())
+      ->setViewer($viewer)
+      ->setFlush(true);
+
+    foreach ($objects as $phid => $object) {
+      $handle = $handles[$phid];
+
+      $is_closed = ($handle->getStatus() === $status_closed);
+
+      $item = id(new PHUIObjectItemView())
+        ->setHeader($handle->getFullName())
+        ->setHref($handle->getURI())
+        ->setDisabled($is_closed)
+        ->setSelectable('batch[]', $object->getID(), true);
+
+      $list->addItem($item);
+    }
+
+    return $list;
+  }
+
 }
diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php
index 070d436cf6..4753561124 100644
--- a/src/view/phui/PHUIObjectItemView.php
+++ b/src/view/phui/PHUIObjectItemView.php
@@ -29,6 +29,10 @@ final class PHUIObjectItemView extends AphrontTagView {
   private $coverImage;
   private $description;
 
+  private $selectableName;
+  private $selectableValue;
+  private $isSelected;
+
   public function setDisabled($disabled) {
     $this->disabled = $disabled;
     return $this;
@@ -160,6 +164,13 @@ public function setDescription($description) {
     return $this;
   }
 
+  public function setSelectable($name, $value, $is_selected) {
+    $this->selectableName = $name;
+    $this->selectableValue = $value;
+    $this->isSelected = $is_selected;
+    return $this;
+  }
+
   public function setEpoch($epoch) {
     $date = phabricator_datetime($epoch, $this->getUser());
     $this->addIcon('none', $date);
@@ -239,6 +250,8 @@ protected function getTagName() {
   }
 
   protected function getTagAttributes() {
+    $sigils = array();
+
     $item_classes = array();
     $item_classes[] = 'phui-oi';
 
@@ -286,6 +299,17 @@ protected function getTagAttributes() {
         throw new Exception(pht('Invalid effect!'));
     }
 
+    if ($this->isSelected) {
+      $item_classes[] = 'phui-oi-selected';
+    }
+
+    if ($this->selectableName !== null) {
+      $item_classes[] = 'phui-oi-selectable';
+      $sigils[] = 'phui-oi-selectable';
+
+      Javelin::initBehavior('phui-selectable-list');
+    }
+
     if ($this->getGrippable()) {
       $item_classes[] = 'phui-oi-grippable';
     }
@@ -300,6 +324,7 @@ protected function getTagAttributes() {
 
     return array(
       'class' => $item_classes,
+      'sigil' => $sigils,
     );
   }
 
@@ -628,6 +653,24 @@ protected function getTagContent() {
         $countdown);
     }
 
+    if ($this->selectableName !== null) {
+      $checkbox = phutil_tag(
+        'input',
+        array(
+          'type' => 'checkbox',
+          'name' => $this->selectableName,
+          'value' => $this->selectableValue,
+          'checked' => ($this->isSelected ? 'checked' : null),
+        ));
+
+      $column0 = phutil_tag(
+        'div',
+        array(
+          'class' => 'phui-oi-col0 phui-oi-checkbox',
+        ),
+        $checkbox);
+    }
+
     $column1 = phutil_tag(
       'div',
       array(
diff --git a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
index e356396451..4ee5d41b67 100644
--- a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
+++ b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
@@ -664,3 +664,22 @@ ul.phui-oi-list-view .phui-oi-selected
   padding: 0 8px 8px;
   text-align: left;
 }
+
+.phui-oi-col0.phui-oi-checkbox {
+  width: 28px;
+  text-align: center;
+}
+
+.phui-oi-selectable {
+  cursor: pointer;
+  user-select: none;
+  -webkit-user-select: none;
+}
+
+/* When the list selection state can be toggled on the client (as in the bulk
+  editor), keep the border color consistent to make the interaction feel more
+  robust. */
+ul.phui-oi-list-view .phui-oi-selectable
+  .phui-oi-frame {
+  border-color: {$blueborder};
+}
diff --git a/webroot/rsrc/css/phui/phui-box.css b/webroot/rsrc/css/phui/phui-box.css
index 278f1365e8..c5fd1d8d3b 100644
--- a/webroot/rsrc/css/phui/phui-box.css
+++ b/webroot/rsrc/css/phui/phui-box.css
@@ -103,6 +103,10 @@ body.device .phui-box-blue-property.phui-object-box.phui-object-box-collapsed
   padding: 2px 8px;
 }
 
+.phui-box-blue-property .phui-oi-list-view.phui-oi-list-flush {
+  padding: 0;
+}
+
 body .phui-box-blue-property.phui-object-box.phui-object-box-collapsed {
   padding: 0;
 }
diff --git a/webroot/rsrc/js/phui/behavior-phui-selectable-list.js b/webroot/rsrc/js/phui/behavior-phui-selectable-list.js
new file mode 100644
index 0000000000..eaa33565d0
--- /dev/null
+++ b/webroot/rsrc/js/phui/behavior-phui-selectable-list.js
@@ -0,0 +1,44 @@
+/**
+ * @provides javelin-behavior-phui-selectable-list
+ * @requires javelin-behavior
+ *           javelin-stratcom
+ *           javelin-dom
+ */
+
+JX.behavior('phui-selectable-list', function() {
+
+  JX.Stratcom.listen('click', 'phui-oi-selectable', function(e) {
+    if (!e.isNormalClick()) {
+      return;
+    }
+
+    // If the user clicked a link, ignore it.
+    if (e.getNode('tag:a')) {
+      return;
+    }
+
+    var root = e.getNode('phui-oi-selectable');
+
+    // If the user did not click the checkbox, pretend they did. This makes
+    // the entire element a click target to make changing the selection set a
+    // bit easier.
+    if (!e.getNode('tag:input')) {
+      var checkbox = getCheckbox(root);
+      checkbox.checked = !checkbox.checked;
+
+      e.kill();
+    }
+
+    setTimeout(JX.bind(null, redraw, root), 0);
+  });
+
+  function getCheckbox(root) {
+    return JX.DOM.find(root, 'input');
+  }
+
+  function redraw(root) {
+    var checkbox = getCheckbox(root);
+    JX.DOM.alterClass(root, 'phui-oi-selected', !!checkbox.checked);
+  }
+
+});

From 7f91c8c4acbb65ce7bd8a9fad217fd8a9db30112 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 30 Nov 2017 05:57:39 -0800
Subject: [PATCH 351/865] Rebuild the bulk editor on SearchEngine

Summary:
Depends on D18805. Ref T13025. Fixes T10268.

Instead of using a list of IDs for the bulk editor, power it with SearchEngine queries. This gives us the full power of SearchEngine and lets us use a query key instead of a list of 20,000 IDs to avoid issues with URL lengths.

Also, split it into a base `BulkEngine` and per-application subclasses. This moves us toward T10005 and universal support for bulk operations.

Also:

  - Renames most of "batch" to "bulk": we're curently inconsitent about this, I like "bulk" better since I think it's more clear if you don't regularly interact with `.bat` files, and newer stuff mostly uses "bulk".
  - When objects in the result set can't be edited because you don't have permission, show the status more clearly.

This probably breaks some stuff a bit since I refactored so heavily, but it seems mostly OK from poking around. I'll clean up anything I missed in followups to deal with remaining items on T13025.

Test Plan:
{F5302300}

  - Bulk edited from Maniphest.
  - Bulk edited from a workboard (no more giant `?ids=....` in the URL).
  - Hit most of the error conditions, I think?
  - Clicked the "Cancel" button.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025, T10268

Differential Revision: https://secure.phabricator.com/D18806
---
 resources/celerity/map.php                    |  24 +-
 src/__phutil_library_map__.php                |   8 +-
 .../base/PhabricatorApplication.php           |   4 +
 .../PhabricatorManiphestApplication.php       |   2 +-
 .../bulk/ManiphestTaskBulkEngine.php          |  50 ++
 .../ManiphestBatchEditController.php          | 255 ----------
 .../ManiphestBulkEditController.php           |  32 ++
 .../view/ManiphestTaskResultListView.php      |   2 +-
 .../PhabricatorProjectBoardViewController.php |  23 +-
 .../bulk/PhabricatorBulkEngine.php            | 454 ++++++++++++++++++
 src/view/phui/PHUIObjectItemView.php          |  36 +-
 .../phui/object-item/phui-oi-list-view.css    |   4 +
 .../maniphest/behavior-batch-selector.js      |  11 +-
 13 files changed, 612 insertions(+), 293 deletions(-)
 create mode 100644 src/applications/maniphest/bulk/ManiphestTaskBulkEngine.php
 delete mode 100644 src/applications/maniphest/controller/ManiphestBatchEditController.php
 create mode 100644 src/applications/maniphest/controller/ManiphestBulkEditController.php
 create mode 100644 src/applications/transactions/bulk/PhabricatorBulkEngine.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 0fdf44344f..650d3f7efb 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '5be8063f',
+    'core.pkg.css' => '075f9867',
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -18,7 +18,7 @@
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
     'maniphest.pkg.css' => '4845691a',
-    'maniphest.pkg.js' => '5ab2753f',
+    'maniphest.pkg.js' => '4d7e79c8',
     'rsrc/audio/basic/alert.mp3' => '98461568',
     'rsrc/audio/basic/bing.mp3' => 'ab8603a5',
     'rsrc/audio/basic/pock.mp3' => '0cc772f5',
@@ -135,7 +135,7 @@
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
     'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
-    'rsrc/css/phui/object-item/phui-oi-list-view.css' => '73c5f5c4',
+    'rsrc/css/phui/object-item/phui-oi-list-view.css' => '6ae18df0',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
     'rsrc/css/phui/phui-action-list.css' => 'f7f61a34',
     'rsrc/css/phui/phui-action-panel.css' => 'b4798122',
@@ -420,7 +420,7 @@
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
     'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
-    'rsrc/js/application/maniphest/behavior-batch-selector.js' => '0825c27a',
+    'rsrc/js/application/maniphest/behavior-batch-selector.js' => 'ad54037e',
     'rsrc/js/application/maniphest/behavior-line-chart.js' => 'e4232876',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
     'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '71237763',
@@ -643,7 +643,7 @@
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-editor' => '782ab6e7',
-    'javelin-behavior-maniphest-batch-selector' => '0825c27a',
+    'javelin-behavior-maniphest-batch-selector' => 'ad54037e',
     'javelin-behavior-maniphest-list-editor' => 'a9f88de2',
     'javelin-behavior-maniphest-subpriority-editor' => '71237763',
     'javelin-behavior-owners-path-editor' => '7a68dda3',
@@ -862,7 +862,7 @@
     'phui-oi-color-css' => 'cd2b9b77',
     'phui-oi-drag-ui-css' => '08f4ccc3',
     'phui-oi-flush-ui-css' => '9d9685d6',
-    'phui-oi-list-view-css' => '73c5f5c4',
+    'phui-oi-list-view-css' => '6ae18df0',
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
@@ -960,12 +960,6 @@
       'javelin-stratcom',
       'javelin-workflow',
     ),
-    '0825c27a' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-util',
-    ),
     '08f4ccc3' => array(
       'phui-oi-list-view-css',
     ),
@@ -1815,6 +1809,12 @@
       'phuix-autocomplete',
       'javelin-mask',
     ),
+    'ad54037e' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-util',
+    ),
     'b003d4fb' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f4a410ad2e..3ff9ce4fd3 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1487,8 +1487,8 @@
     'MacroQueryConduitAPIMethod' => 'applications/macro/conduit/MacroQueryConduitAPIMethod.php',
     'ManiphestAssignEmailCommand' => 'applications/maniphest/command/ManiphestAssignEmailCommand.php',
     'ManiphestAssigneeDatasource' => 'applications/maniphest/typeahead/ManiphestAssigneeDatasource.php',
-    'ManiphestBatchEditController' => 'applications/maniphest/controller/ManiphestBatchEditController.php',
     'ManiphestBulkEditCapability' => 'applications/maniphest/capability/ManiphestBulkEditCapability.php',
+    'ManiphestBulkEditController' => 'applications/maniphest/controller/ManiphestBulkEditController.php',
     'ManiphestClaimEmailCommand' => 'applications/maniphest/command/ManiphestClaimEmailCommand.php',
     'ManiphestCloseEmailCommand' => 'applications/maniphest/command/ManiphestCloseEmailCommand.php',
     'ManiphestConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestConduitAPIMethod.php',
@@ -1547,6 +1547,7 @@
     'ManiphestTaskAttachTransaction' => 'applications/maniphest/xaction/ManiphestTaskAttachTransaction.php',
     'ManiphestTaskAuthorHeraldField' => 'applications/maniphest/herald/ManiphestTaskAuthorHeraldField.php',
     'ManiphestTaskAuthorPolicyRule' => 'applications/maniphest/policyrule/ManiphestTaskAuthorPolicyRule.php',
+    'ManiphestTaskBulkEngine' => 'applications/maniphest/bulk/ManiphestTaskBulkEngine.php',
     'ManiphestTaskCloseAsDuplicateRelationship' => 'applications/maniphest/relationship/ManiphestTaskCloseAsDuplicateRelationship.php',
     'ManiphestTaskClosedStatusDatasource' => 'applications/maniphest/typeahead/ManiphestTaskClosedStatusDatasource.php',
     'ManiphestTaskCoverImageTransaction' => 'applications/maniphest/xaction/ManiphestTaskCoverImageTransaction.php',
@@ -2198,6 +2199,7 @@
     'PhabricatorBuiltinFileCachePurger' => 'applications/cache/purger/PhabricatorBuiltinFileCachePurger.php',
     'PhabricatorBuiltinPatchList' => 'infrastructure/storage/patch/PhabricatorBuiltinPatchList.php',
     'PhabricatorBulkContentSource' => 'infrastructure/daemon/contentsource/PhabricatorBulkContentSource.php',
+    'PhabricatorBulkEngine' => 'applications/transactions/bulk/PhabricatorBulkEngine.php',
     'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
     'PhabricatorCacheEngine' => 'applications/system/engine/PhabricatorCacheEngine.php',
     'PhabricatorCacheEngineExtension' => 'applications/system/engine/PhabricatorCacheEngineExtension.php',
@@ -6678,8 +6680,8 @@
     'MacroQueryConduitAPIMethod' => 'MacroConduitAPIMethod',
     'ManiphestAssignEmailCommand' => 'ManiphestEmailCommand',
     'ManiphestAssigneeDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
-    'ManiphestBatchEditController' => 'ManiphestController',
     'ManiphestBulkEditCapability' => 'PhabricatorPolicyCapability',
+    'ManiphestBulkEditController' => 'ManiphestController',
     'ManiphestClaimEmailCommand' => 'ManiphestEmailCommand',
     'ManiphestCloseEmailCommand' => 'ManiphestEmailCommand',
     'ManiphestConduitAPIMethod' => 'ConduitAPIMethod',
@@ -6761,6 +6763,7 @@
     'ManiphestTaskAttachTransaction' => 'ManiphestTaskTransactionType',
     'ManiphestTaskAuthorHeraldField' => 'ManiphestTaskHeraldField',
     'ManiphestTaskAuthorPolicyRule' => 'PhabricatorPolicyRule',
+    'ManiphestTaskBulkEngine' => 'PhabricatorBulkEngine',
     'ManiphestTaskCloseAsDuplicateRelationship' => 'ManiphestTaskRelationship',
     'ManiphestTaskClosedStatusDatasource' => 'PhabricatorTypeaheadDatasource',
     'ManiphestTaskCoverImageTransaction' => 'ManiphestTaskTransactionType',
@@ -7487,6 +7490,7 @@
     'PhabricatorBuiltinFileCachePurger' => 'PhabricatorCachePurger',
     'PhabricatorBuiltinPatchList' => 'PhabricatorSQLPatchList',
     'PhabricatorBulkContentSource' => 'PhabricatorContentSource',
+    'PhabricatorBulkEngine' => 'Phobject',
     'PhabricatorCacheDAO' => 'PhabricatorLiskDAO',
     'PhabricatorCacheEngine' => 'Phobject',
     'PhabricatorCacheEngineExtension' => 'Phobject',
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index c25612408c..0ae8e75354 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -618,6 +618,10 @@ protected function getEditRoutePattern($base = null) {
       ')?';
   }
 
+  protected function getBulkRoutePattern($base = null) {
+    return $base.'(?:query/(?P<queryKey>[^/]+)/)?';
+  }
+
   protected function getQueryRoutePattern($base = null) {
     return $base.'(?:query/(?P<queryKey>[^/]+)/)?';
   }
diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
index 3076354599..6e4ac0a8f6 100644
--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
@@ -52,7 +52,7 @@ public function getRoutes() {
       '/maniphest/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'ManiphestTaskListController',
         'report/(?:(?P<view>\w+)/)?' => 'ManiphestReportController',
-        'batch/' => 'ManiphestBatchEditController',
+        $this->getBulkRoutePattern('bulk/') => 'ManiphestBulkEditController',
         'task/' => array(
           $this->getEditRoutePattern('edit/')
             => 'ManiphestTaskEditController',
diff --git a/src/applications/maniphest/bulk/ManiphestTaskBulkEngine.php b/src/applications/maniphest/bulk/ManiphestTaskBulkEngine.php
new file mode 100644
index 0000000000..8b62f627d8
--- /dev/null
+++ b/src/applications/maniphest/bulk/ManiphestTaskBulkEngine.php
@@ -0,0 +1,50 @@
+<?php
+
+final class ManiphestTaskBulkEngine
+  extends PhabricatorBulkEngine {
+
+  private $workboard;
+
+  public function setWorkboard(PhabricatorProject $workboard) {
+    $this->workboard = $workboard;
+    return $this;
+  }
+
+  public function getWorkboard() {
+    return $this->workboard;
+  }
+
+  public function newSearchEngine() {
+    return new ManiphestTaskSearchEngine();
+  }
+
+  public function getDoneURI() {
+    $board_uri = $this->getBoardURI();
+    if ($board_uri) {
+      return $board_uri;
+    }
+
+    return parent::getDoneURI();
+  }
+
+  public function getCancelURI() {
+    $board_uri = $this->getBoardURI();
+    if ($board_uri) {
+      return $board_uri;
+    }
+
+    return parent::getCancelURI();
+  }
+
+  private function getBoardURI() {
+    $workboard = $this->getWorkboard();
+
+    if ($workboard) {
+      $project_id = $workboard->getID();
+      return "/project/board/{$project_id}/";
+    }
+
+    return null;
+  }
+
+}
diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
deleted file mode 100644
index c3438a6cee..0000000000
--- a/src/applications/maniphest/controller/ManiphestBatchEditController.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-
-final class ManiphestBatchEditController extends ManiphestController {
-
-  public function handleRequest(AphrontRequest $request) {
-    $viewer = $this->getViewer();
-
-    $this->requireApplicationCapability(
-      ManiphestBulkEditCapability::CAPABILITY);
-
-    $project = null;
-    $board_id = $request->getInt('board');
-    if ($board_id) {
-      $project = id(new PhabricatorProjectQuery())
-        ->setViewer($viewer)
-        ->withIDs(array($board_id))
-        ->executeOne();
-      if (!$project) {
-        return new Aphront404Response();
-      }
-    }
-
-    $task_ids = $request->getArr('batch');
-    if (!$task_ids) {
-      $task_ids = $request->getStrList('batch');
-    }
-
-    if (!$task_ids) {
-      throw new Exception(
-        pht(
-          'No tasks are selected.'));
-    }
-
-    $tasks = id(new ManiphestTaskQuery())
-      ->setViewer($viewer)
-      ->withIDs($task_ids)
-      ->requireCapabilities(
-        array(
-          PhabricatorPolicyCapability::CAN_VIEW,
-          PhabricatorPolicyCapability::CAN_EDIT,
-        ))
-      ->needSubscriberPHIDs(true)
-      ->needProjectPHIDs(true)
-      ->execute();
-
-    if (!$tasks) {
-      throw new Exception(
-        pht("You don't have permission to edit any of the selected tasks."));
-    }
-
-    if ($project) {
-      $cancel_uri = '/project/board/'.$project->getID().'/';
-      $redirect_uri = $cancel_uri;
-    } else {
-      $cancel_uri = '/maniphest/';
-      $redirect_uri = '/maniphest/?ids='.implode(',', mpull($tasks, 'getID'));
-    }
-
-    $actions = $request->getStr('actions');
-    if ($actions) {
-      $actions = phutil_json_decode($actions);
-    }
-
-    if ($request->isFormPost() && $actions) {
-      $job = PhabricatorWorkerBulkJob::initializeNewJob(
-        $viewer,
-        new ManiphestTaskEditBulkJobType(),
-        array(
-          'taskPHIDs' => mpull($tasks, 'getPHID'),
-          'actions' => $actions,
-          'cancelURI' => $cancel_uri,
-          'doneURI' => $redirect_uri,
-        ));
-
-      $type_status = PhabricatorWorkerBulkJobTransaction::TYPE_STATUS;
-
-      $xactions = array();
-      $xactions[] = id(new PhabricatorWorkerBulkJobTransaction())
-        ->setTransactionType($type_status)
-        ->setNewValue(PhabricatorWorkerBulkJob::STATUS_CONFIRM);
-
-      $editor = id(new PhabricatorWorkerBulkJobEditor())
-        ->setActor($viewer)
-        ->setContentSourceFromRequest($request)
-        ->setContinueOnMissingFields(true)
-        ->applyTransactions($job, $xactions);
-
-      return id(new AphrontRedirectResponse())
-        ->setURI($job->getMonitorURI());
-    }
-
-    $list = $this->newBulkObjectList($tasks);
-
-    $template = new AphrontTokenizerTemplateView();
-    $template = $template->render();
-
-    $projects_source = new PhabricatorProjectDatasource();
-    $mailable_source = new PhabricatorMetaMTAMailableDatasource();
-    $mailable_source->setViewer($viewer);
-    $owner_source = new ManiphestAssigneeDatasource();
-    $owner_source->setViewer($viewer);
-    $spaces_source = id(new PhabricatorSpacesNamespaceDatasource())
-      ->setViewer($viewer);
-
-    require_celerity_resource('maniphest-batch-editor');
-    Javelin::initBehavior(
-      'maniphest-batch-editor',
-      array(
-        'root' => 'maniphest-batch-edit-form',
-        'tokenizerTemplate' => $template,
-        'sources' => array(
-          'project' => array(
-            'src' => $projects_source->getDatasourceURI(),
-            'placeholder' => $projects_source->getPlaceholderText(),
-            'browseURI' => $projects_source->getBrowseURI(),
-          ),
-          'owner' => array(
-            'src' => $owner_source->getDatasourceURI(),
-            'placeholder' => $owner_source->getPlaceholderText(),
-            'browseURI' => $owner_source->getBrowseURI(),
-            'limit' => 1,
-          ),
-          'cc' => array(
-            'src' => $mailable_source->getDatasourceURI(),
-            'placeholder' => $mailable_source->getPlaceholderText(),
-            'browseURI' => $mailable_source->getBrowseURI(),
-          ),
-          'spaces' => array(
-            'src' => $spaces_source->getDatasourceURI(),
-            'placeholder' => $spaces_source->getPlaceholderText(),
-            'browseURI' => $spaces_source->getBrowseURI(),
-            'limit' => 1,
-          ),
-        ),
-        'input' => 'batch-form-actions',
-        'priorityMap' => ManiphestTaskPriority::getTaskPriorityMap(),
-        'statusMap'   => ManiphestTaskStatus::getTaskStatusMap(),
-      ));
-
-    $form = id(new PHUIFormLayoutView())
-      ->setUser($viewer);
-
-    $form->appendChild(
-      phutil_tag(
-        'input',
-        array(
-          'type' => 'hidden',
-          'name' => 'actions',
-          'id'   => 'batch-form-actions',
-        )));
-
-    $form->appendChild(
-      id(new PHUIFormInsetView())
-        ->setTitle(pht('Actions'))
-        ->setRightButton(javelin_tag(
-            'a',
-            array(
-              'href' => '#',
-              'class' => 'button button-green',
-              'sigil' => 'add-action',
-              'mustcapture' => true,
-            ),
-            pht('Add Another Action')))
-        ->setContent(javelin_tag(
-          'table',
-          array(
-            'sigil' => 'maniphest-batch-actions',
-            'class' => 'maniphest-batch-actions-table',
-          ),
-          '')))
-      ->appendChild(
-        id(new AphrontFormSubmitControl())
-          ->setValue(pht('Update Tasks'))
-          ->addCancelButton($cancel_uri));
-
-    $title = pht('Batch Editor');
-
-    $crumbs = $this->buildApplicationCrumbs();
-    $crumbs->addTextCrumb($title);
-    $crumbs->setBorder(true);
-
-    $header = id(new PHUIHeaderView())
-      ->setHeader(pht('Batch Editor'))
-      ->setHeaderIcon('fa-pencil-square-o');
-
-    $task_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Selected Tasks'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setObjectList($list);
-
-    $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Actions'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setForm($form);
-
-
-    $complete_form = phabricator_form(
-      $viewer,
-      array(
-        'action' => $request->getRequestURI(),
-        'method' => 'POST',
-        'id' => 'maniphest-batch-edit-form',
-      ),
-      array(
-        phutil_tag(
-          'input',
-          array(
-            'type' => 'hidden',
-            'name' => 'board',
-            'value' => $board_id,
-          )),
-        $task_box,
-        $form_box,
-      ));
-
-    $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
-      ->setFooter($complete_form);
-
-    return $this->newPage()
-      ->setTitle($title)
-      ->setCrumbs($crumbs)
-      ->appendChild($view);
-  }
-
-  private function newBulkObjectList(array $objects) {
-    $viewer = $this->getViewer();
-    $objects = mpull($objects, null, 'getPHID');
-
-    $handles = $viewer->loadHandles(array_keys($objects));
-
-    $status_closed = PhabricatorObjectHandle::STATUS_CLOSED;
-
-    $list = id(new PHUIObjectItemListView())
-      ->setViewer($viewer)
-      ->setFlush(true);
-
-    foreach ($objects as $phid => $object) {
-      $handle = $handles[$phid];
-
-      $is_closed = ($handle->getStatus() === $status_closed);
-
-      $item = id(new PHUIObjectItemView())
-        ->setHeader($handle->getFullName())
-        ->setHref($handle->getURI())
-        ->setDisabled($is_closed)
-        ->setSelectable('batch[]', $object->getID(), true);
-
-      $list->addItem($item);
-    }
-
-    return $list;
-  }
-
-}
diff --git a/src/applications/maniphest/controller/ManiphestBulkEditController.php b/src/applications/maniphest/controller/ManiphestBulkEditController.php
new file mode 100644
index 0000000000..b698e54848
--- /dev/null
+++ b/src/applications/maniphest/controller/ManiphestBulkEditController.php
@@ -0,0 +1,32 @@
+<?php
+
+final class ManiphestBulkEditController extends ManiphestController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $this->getViewer();
+
+    $this->requireApplicationCapability(
+      ManiphestBulkEditCapability::CAPABILITY);
+
+    $bulk_engine = id(new ManiphestTaskBulkEngine())
+      ->setViewer($viewer)
+      ->setController($this)
+      ->addContextParameter('board');
+
+    $board_id = $request->getInt('board');
+    if ($board_id) {
+      $project = id(new PhabricatorProjectQuery())
+        ->setViewer($viewer)
+        ->withIDs(array($board_id))
+        ->executeOne();
+      if (!$project) {
+        return new Aphront404Response();
+      }
+
+      $bulk_engine->setWorkboard($project);
+    }
+
+    return $bulk_engine->buildResponse();
+  }
+
+}
diff --git a/src/applications/maniphest/view/ManiphestTaskResultListView.php b/src/applications/maniphest/view/ManiphestTaskResultListView.php
index 0144df0e33..2203db8bfc 100644
--- a/src/applications/maniphest/view/ManiphestTaskResultListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskResultListView.php
@@ -255,7 +255,7 @@ private function renderBatchEditor(PhabricatorSavedQuery $saved_query) {
       $user,
       array(
         'method' => 'POST',
-        'action' => '/maniphest/batch/',
+        'action' => '/maniphest/bulk/',
         'id'     => 'batch-select-form',
       ),
       $editor);
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 793fe5603d..9396d1873e 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -230,14 +230,23 @@ public function handleRequest(AphrontRequest $request) {
           ->addCancelButton($board_uri);
       }
 
-      $batch_ids = mpull($batch_tasks, 'getID');
-      $batch_ids = implode(',', $batch_ids);
+      // Create a saved query to hold the working set. This allows us to get
+      // around URI length limitations with a long "?ids=..." query string.
+      // For details, see T10268.
+      $search_engine = id(new ManiphestTaskSearchEngine())
+        ->setViewer($viewer);
+
+      $saved_query = $search_engine->newSavedQuery();
+      $saved_query->setParameter('ids', mpull($batch_tasks, 'getID'));
+      $search_engine->saveQuery($saved_query);
+
+      $query_key = $saved_query->getQueryKey();
+
+      $bulk_uri = new PhutilURI("/maniphest/bulk/query/{$query_key}/");
+      $bulk_uri->setQueryParam('board', $this->id);
 
-      $batch_uri = new PhutilURI('/maniphest/batch/');
-      $batch_uri->setQueryParam('board', $this->id);
-      $batch_uri->setQueryParam('batch', $batch_ids);
       return id(new AphrontRedirectResponse())
-        ->setURI($batch_uri);
+        ->setURI($bulk_uri);
     }
 
     $move_id = $request->getStr('move');
@@ -1048,7 +1057,7 @@ private function buildColumnMenu(
 
     $column_items[] = id(new PhabricatorActionView())
       ->setIcon('fa-list-ul')
-      ->setName(pht('Batch Edit Tasks...'))
+      ->setName(pht('Bulk Edit Tasks...'))
       ->setHref($batch_edit_uri)
       ->setDisabled(!$can_batch_edit);
 
diff --git a/src/applications/transactions/bulk/PhabricatorBulkEngine.php b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
new file mode 100644
index 0000000000..82dc7f2510
--- /dev/null
+++ b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
@@ -0,0 +1,454 @@
+<?php
+
+abstract class PhabricatorBulkEngine extends Phobject {
+
+  private $viewer;
+  private $controller;
+  private $context = array();
+  private $objectList;
+  private $savedQuery;
+  private $editableList;
+  private $targetList;
+
+  abstract public function newSearchEngine();
+
+  public function getCancelURI() {
+    $saved_query = $this->savedQuery;
+    if ($saved_query) {
+      $path = '/query/'.$saved_query->getQueryKey().'/';
+    } else {
+      $path = '/';
+    }
+
+    return $this->getQueryURI($path);
+  }
+
+  public function getDoneURI() {
+    if ($this->objectList !== null) {
+      $ids = mpull($this->objectList, 'getID');
+      $path = '/?ids='.implode(',', $ids);
+    } else {
+      $path = '/';
+    }
+
+    return $this->getQueryURI($path);
+  }
+
+  protected function getQueryURI($path = '/') {
+    $viewer = $this->getViewer();
+
+    $engine = id($this->newSearchEngine())
+      ->setViewer($viewer);
+
+    return $engine->getQueryBaseURI().ltrim($path, '/');
+  }
+
+  protected function getBulkURI() {
+    $saved_query = $this->savedQuery;
+    if ($saved_query) {
+      $path = '/query/'.$saved_query->getQueryKey().'/';
+    } else {
+      $path = '/';
+    }
+
+    return $this->getBulkBaseURI($path);
+  }
+
+  protected function getBulkBaseURI($path) {
+    return $this->getQueryURI('bulk/'.ltrim($path, '/'));
+  }
+
+  final public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  final public function setController(PhabricatorController $controller) {
+    $this->controller = $controller;
+    return $this;
+  }
+
+  final public function getController() {
+    return $this->controller;
+  }
+
+  final public function addContextParameter($key) {
+    $this->context[$key] = true;
+    return $this;
+  }
+
+  final public function buildResponse() {
+    $viewer = $this->getViewer();
+    $controller = $this->getController();
+    $request = $controller->getRequest();
+
+    $response = $this->loadObjectList();
+    if ($response) {
+      return $response;
+    }
+
+    if ($request->isFormPost() && $request->getBool('bulkEngine')) {
+      return $this->buildEditResponse();
+    }
+
+    $list_view = $this->newBulkObjectList();
+
+    $header = id(new PHUIHeaderView())
+      ->setHeader(pht('Bulk Editor'))
+      ->setHeaderIcon('fa-pencil-square-o');
+
+    $list_box = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Working Set'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setObjectList($list_view);
+
+    $form_view = $this->newBulkActionForm();
+
+    $form_box = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Actions'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setForm($form_view);
+
+    $complete_form = phabricator_form(
+      $viewer,
+      array(
+        'action' => $this->getBulkURI(),
+        'method' => 'POST',
+        'id' => 'maniphest-batch-edit-form',
+      ),
+      array(
+        $this->newContextInputs(),
+        $list_box,
+        $form_box,
+      ));
+
+    $column_view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter($complete_form);
+
+    // TODO: This is a bit hacky and inflexible.
+    $crumbs = $controller->buildApplicationCrumbsForEditEngine();
+    $crumbs->addTextCrumb(pht('Query'), $this->getCancelURI());
+    $crumbs->addTextCrumb(pht('Bulk Editor'));
+
+    return $controller->newPage()
+      ->setTitle(pht('Bulk Edit'))
+      ->setCrumbs($crumbs)
+      ->appendChild($column_view);
+  }
+
+  private function loadObjectList() {
+    $viewer = $this->getViewer();
+    $controller = $this->getController();
+    $request = $controller->getRequest();
+
+    $search_engine = id($this->newSearchEngine())
+      ->setViewer($viewer);
+
+    $query_key = $request->getURIData('queryKey');
+    if (strlen($query_key)) {
+      if ($search_engine->isBuiltinQuery($query_key)) {
+        $saved = $search_engine->buildSavedQueryFromBuiltin($query_key);
+      } else {
+        $saved = id(new PhabricatorSavedQueryQuery())
+          ->setViewer($viewer)
+          ->withQueryKeys(array($query_key))
+          ->executeOne();
+        if (!$saved) {
+          return new Aphront404Response();
+        }
+      }
+    } else {
+      // TODO: For now, since we don't deal gracefully with queries which
+      // match a huge result set, just bail if we don't have any query
+      // parameters instead of querying for a trillion tasks and timing out.
+      $request_data = $request->getPassthroughRequestData();
+      if (!$request_data) {
+        throw new Exception(
+          pht(
+            'Expected a query key or a set of query constraints.'));
+      }
+
+      $saved = $search_engine->buildSavedQueryFromRequest($request);
+      $search_engine->saveQuery($saved);
+    }
+
+    $object_query = $search_engine->buildQueryFromSavedQuery($saved)
+      ->setViewer($viewer);
+    $object_list = $object_query->execute();
+    $object_list = mpull($object_list, null, 'getPHID');
+
+    // If the user has submitted the bulk edit form, select only the objects
+    // they checked.
+    if ($request->getBool('bulkEngine')) {
+      $target_phids = $request->getArr('bulkTargetPHIDs');
+
+      // NOTE: It's possible that the underlying query result set has changed
+      // between the time we ran the query initially and now: for example, the
+      // query was for "Open Tasks" and some tasks were closed while the user
+      // was making action selections.
+
+      // This could result in some objects getting dropped from the working set
+      // here: we'll have target PHIDs for them, but they will no longer be
+      // part of the object list. For now, just go with this since it doesn't
+      // seem like a big problem and may even be desirable.
+
+      $this->targetList = array_select_keys($object_list, $target_phids);
+    } else {
+      $this->targetList = $object_list;
+    }
+
+    $this->objectList = $object_list;
+    $this->savedQuery = $saved;
+
+    // Filter just the editable objects. We show all the objects which the
+    // query matches whether they're editable or not, but indicate which ones
+    // can not be edited to the user.
+
+    $editable_list = id(new PhabricatorPolicyFilter())
+      ->setViewer($viewer)
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->apply($object_list);
+    $this->editableList = mpull($editable_list, null, 'getPHID');
+
+    return null;
+  }
+
+  private function newBulkObjectList() {
+    $viewer = $this->getViewer();
+
+    $objects = $this->objectList;
+    $objects = mpull($objects, null, 'getPHID');
+
+    $handles = $viewer->loadHandles(array_keys($objects));
+
+    $status_closed = PhabricatorObjectHandle::STATUS_CLOSED;
+
+    $list = id(new PHUIObjectItemListView())
+      ->setViewer($viewer)
+      ->setFlush(true);
+
+    foreach ($objects as $phid => $object) {
+      $handle = $handles[$phid];
+
+      $is_closed = ($handle->getStatus() === $status_closed);
+      $can_edit = isset($this->editableList[$phid]);
+      $is_disabled = ($is_closed || !$can_edit);
+      $is_selected = isset($this->targetList[$phid]);
+
+      $item = id(new PHUIObjectItemView())
+        ->setHeader($handle->getFullName())
+        ->setHref($handle->getURI())
+        ->setDisabled($is_disabled)
+        ->setSelectable('bulkTargetPHIDs[]', $phid, $is_selected, !$can_edit);
+
+      if (!$can_edit) {
+        $item->addIcon('fa-pencil red', pht('Not Editable'));
+      }
+
+      $list->addItem($item);
+    }
+
+    return $list;
+  }
+
+  private function newContextInputs() {
+    $viewer = $this->getViewer();
+    $controller = $this->getController();
+    $request = $controller->getRequest();
+
+    $parameters = array();
+    foreach ($this->context as $key => $value) {
+      $parameters[$key] = $request->getStr($key);
+    }
+
+    $parameters = array(
+      'bulkEngine' => 1,
+    ) + $parameters;
+
+    $result = array();
+    foreach ($parameters as $key => $value) {
+      $result[] = phutil_tag(
+        'input',
+        array(
+          'type' => 'hidden',
+          'name' => $key,
+          'value' => $value,
+        ));
+    }
+
+    return $result;
+  }
+
+  private function newBulkActionForm() {
+    $viewer = $this->getViewer();
+
+    $cancel_uri = $this->getCancelURI();
+
+    $template = new AphrontTokenizerTemplateView();
+    $template = $template->render();
+
+    $projects_source = new PhabricatorProjectDatasource();
+    $mailable_source = new PhabricatorMetaMTAMailableDatasource();
+    $mailable_source->setViewer($viewer);
+    $owner_source = new ManiphestAssigneeDatasource();
+    $owner_source->setViewer($viewer);
+    $spaces_source = id(new PhabricatorSpacesNamespaceDatasource())
+      ->setViewer($viewer);
+
+    require_celerity_resource('maniphest-batch-editor');
+
+    Javelin::initBehavior(
+      'maniphest-batch-editor',
+      array(
+        'root' => 'maniphest-batch-edit-form',
+        'tokenizerTemplate' => $template,
+        'sources' => array(
+          'project' => array(
+            'src' => $projects_source->getDatasourceURI(),
+            'placeholder' => $projects_source->getPlaceholderText(),
+            'browseURI' => $projects_source->getBrowseURI(),
+          ),
+          'owner' => array(
+            'src' => $owner_source->getDatasourceURI(),
+            'placeholder' => $owner_source->getPlaceholderText(),
+            'browseURI' => $owner_source->getBrowseURI(),
+            'limit' => 1,
+          ),
+          'cc' => array(
+            'src' => $mailable_source->getDatasourceURI(),
+            'placeholder' => $mailable_source->getPlaceholderText(),
+            'browseURI' => $mailable_source->getBrowseURI(),
+          ),
+          'spaces' => array(
+            'src' => $spaces_source->getDatasourceURI(),
+            'placeholder' => $spaces_source->getPlaceholderText(),
+            'browseURI' => $spaces_source->getBrowseURI(),
+            'limit' => 1,
+          ),
+        ),
+        'input' => 'batch-form-actions',
+        'priorityMap' => ManiphestTaskPriority::getTaskPriorityMap(),
+        'statusMap'   => ManiphestTaskStatus::getTaskStatusMap(),
+      ));
+
+    $form = id(new PHUIFormLayoutView())
+      ->setUser($viewer);
+
+    $form->appendChild(
+      phutil_tag(
+        'input',
+        array(
+          'type' => 'hidden',
+          'name' => 'actions',
+          'id'   => 'batch-form-actions',
+        )));
+
+    $form->appendChild(
+      id(new PHUIFormInsetView())
+        ->setTitle(pht('Bulk Edit Actions'))
+        ->setRightButton(
+          javelin_tag(
+            'a',
+            array(
+              'href' => '#',
+              'class' => 'button button-green',
+              'sigil' => 'add-action',
+              'mustcapture' => true,
+            ),
+            pht('Add Another Action')))
+        ->setContent(
+          javelin_tag(
+            'table',
+            array(
+              'sigil' => 'maniphest-batch-actions',
+              'class' => 'maniphest-batch-actions-table',
+            ),
+            '')))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue(pht('Apply Bulk Edit'))
+          ->addCancelButton($cancel_uri));
+
+    return $form;
+  }
+
+  private function buildEditResponse() {
+    $viewer = $this->getViewer();
+    $controller = $this->getController();
+    $request = $controller->getRequest();
+
+    if (!$this->objectList) {
+      throw new Exception(pht('Query does not match any objects.'));
+    }
+
+    if (!$this->editableList) {
+      throw new Exception(
+        pht(
+          'Query does not match any objects you have permission to edit.'));
+    }
+
+    // Restrict the selection set to objects the user can actually edit.
+    $objects = array_intersect_key($this->editableList, $this->targetList);
+
+    if (!$objects) {
+      throw new Exception(
+        pht(
+          'You have not selected any objects to edit.'));
+    }
+
+    $raw_actions = $request->getStr('actions');
+    if ($raw_actions) {
+      $actions = phutil_json_decode($raw_actions);
+    } else {
+      $actions = array();
+    }
+
+    if (!$actions) {
+      throw new Exception(
+        pht(
+          'You have not chosen any edits to apply.'));
+    }
+
+    $cancel_uri = $this->getCancelURI();
+    $done_uri = $this->getDoneURI();
+
+    $job = PhabricatorWorkerBulkJob::initializeNewJob(
+      $viewer,
+      // TODO: This is a Maniphest-specific job type for now, but will become
+      // a generic one so it gets to live here for now instead of in the task
+      // specific BulkEngine subclass.
+      new ManiphestTaskEditBulkJobType(),
+      array(
+        'taskPHIDs' => mpull($objects, 'getPHID'),
+        'actions' => $actions,
+        'cancelURI' => $cancel_uri,
+        'doneURI' => $done_uri,
+      ));
+
+    $type_status = PhabricatorWorkerBulkJobTransaction::TYPE_STATUS;
+
+    $xactions = array();
+    $xactions[] = id(new PhabricatorWorkerBulkJobTransaction())
+      ->setTransactionType($type_status)
+      ->setNewValue(PhabricatorWorkerBulkJob::STATUS_CONFIRM);
+
+    $editor = id(new PhabricatorWorkerBulkJobEditor())
+      ->setActor($viewer)
+      ->setContentSourceFromRequest($request)
+      ->setContinueOnMissingFields(true)
+      ->applyTransactions($job, $xactions);
+
+    return id(new AphrontRedirectResponse())
+      ->setURI($job->getMonitorURI());
+  }
+
+}
diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php
index 4753561124..c1e57632c4 100644
--- a/src/view/phui/PHUIObjectItemView.php
+++ b/src/view/phui/PHUIObjectItemView.php
@@ -32,6 +32,7 @@ final class PHUIObjectItemView extends AphrontTagView {
   private $selectableName;
   private $selectableValue;
   private $isSelected;
+  private $isForbidden;
 
   public function setDisabled($disabled) {
     $this->disabled = $disabled;
@@ -164,10 +165,17 @@ public function setDescription($description) {
     return $this;
   }
 
-  public function setSelectable($name, $value, $is_selected) {
+  public function setSelectable(
+    $name,
+    $value,
+    $is_selected,
+    $is_forbidden = false) {
+
     $this->selectableName = $name;
     $this->selectableValue = $value;
     $this->isSelected = $is_selected;
+    $this->isForbidden = $is_forbidden;
+
     return $this;
   }
 
@@ -299,11 +307,13 @@ protected function getTagAttributes() {
         throw new Exception(pht('Invalid effect!'));
     }
 
-    if ($this->isSelected) {
+    if ($this->isForbidden) {
+      $item_classes[] = 'phui-oi-forbidden';
+    } else if ($this->isSelected) {
       $item_classes[] = 'phui-oi-selected';
     }
 
-    if ($this->selectableName !== null) {
+    if ($this->selectableName !== null && !$this->isForbidden) {
       $item_classes[] = 'phui-oi-selectable';
       $sigils[] = 'phui-oi-selectable';
 
@@ -654,14 +664,18 @@ protected function getTagContent() {
     }
 
     if ($this->selectableName !== null) {
-      $checkbox = phutil_tag(
-        'input',
-        array(
-          'type' => 'checkbox',
-          'name' => $this->selectableName,
-          'value' => $this->selectableValue,
-          'checked' => ($this->isSelected ? 'checked' : null),
-        ));
+      if (!$this->isForbidden) {
+        $checkbox = phutil_tag(
+          'input',
+          array(
+            'type' => 'checkbox',
+            'name' => $this->selectableName,
+            'value' => $this->selectableValue,
+            'checked' => ($this->isSelected ? 'checked' : null),
+          ));
+      } else {
+        $checkbox = null;
+      }
 
       $column0 = phutil_tag(
         'div',
diff --git a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
index 4ee5d41b67..ff79a8d70b 100644
--- a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
+++ b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
@@ -455,6 +455,10 @@ ul.phui-oi-list-view .phui-oi-selected
   border-color: {$sh-blueborder};
 }
 
+.phui-oi-forbidden {
+  background: {$sh-redbackground};
+}
+
 
 /* - Handle Icons --------------------------------------------------------------
 
diff --git a/webroot/rsrc/js/application/maniphest/behavior-batch-selector.js b/webroot/rsrc/js/application/maniphest/behavior-batch-selector.js
index b7728abb57..b62f40a589 100644
--- a/webroot/rsrc/js/application/maniphest/behavior-batch-selector.js
+++ b/webroot/rsrc/js/application/maniphest/behavior-batch-selector.js
@@ -157,12 +157,15 @@ JX.behavior('maniphest-batch-selector', function(config) {
     'submit',
     null,
     function() {
-      var inputs = [];
+      var ids = [];
       for (var k in selected) {
-        inputs.push(
-          JX.$N('input', {type: 'hidden', name: 'batch[]', value: k}));
+        ids.push(k);
       }
-      JX.DOM.setContent(JX.$(config.idContainer), inputs);
+      ids = ids.join(',');
+
+      var input = JX.$N('input', {type: 'hidden', name: 'ids', value: ids});
+
+      JX.DOM.setContent(JX.$(config.idContainer), input);
     });
 
   update();

From 6ef45d82459336daeeaf2e08fd2c6b3c1faade44 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 5 Jan 2018 11:08:16 -0800
Subject: [PATCH 352/865] Provide a generic transaction-oriented bulk job
 worker

Summary:
Depends on D18806. Ref T13025. See PHI173. Currently, Maniphest bulk edits are processed by a Maniphest-specific worker. I want to replace this with a generic worker which can apply transactional edits to any object.

This implements a generic worker, although it has no callers yet. Future changes give it callers, and later remove the Maniphest-specific worker.

Test Plan: See next changes.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18862
---
 src/__phutil_library_map__.php                |  2 +
 .../bulk/PhabricatorEditEngineBulkJobType.php | 82 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3ff9ce4fd3..b39d89a087 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2729,6 +2729,7 @@
     'PhabricatorEdgesDestructionEngineExtension' => 'infrastructure/edges/engineextension/PhabricatorEdgesDestructionEngineExtension.php',
     'PhabricatorEditEngine' => 'applications/transactions/editengine/PhabricatorEditEngine.php',
     'PhabricatorEditEngineAPIMethod' => 'applications/transactions/editengine/PhabricatorEditEngineAPIMethod.php',
+    'PhabricatorEditEngineBulkJobType' => 'applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php',
     'PhabricatorEditEngineCheckboxesCommentAction' => 'applications/transactions/commentaction/PhabricatorEditEngineCheckboxesCommentAction.php',
     'PhabricatorEditEngineColumnsCommentAction' => 'applications/transactions/commentaction/PhabricatorEditEngineColumnsCommentAction.php',
     'PhabricatorEditEngineCommentAction' => 'applications/transactions/commentaction/PhabricatorEditEngineCommentAction.php',
@@ -8110,6 +8111,7 @@
       'PhabricatorPolicyInterface',
     ),
     'PhabricatorEditEngineAPIMethod' => 'ConduitAPIMethod',
+    'PhabricatorEditEngineBulkJobType' => 'PhabricatorWorkerBulkJobType',
     'PhabricatorEditEngineCheckboxesCommentAction' => 'PhabricatorEditEngineCommentAction',
     'PhabricatorEditEngineColumnsCommentAction' => 'PhabricatorEditEngineCommentAction',
     'PhabricatorEditEngineCommentAction' => 'Phobject',
diff --git a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
new file mode 100644
index 0000000000..1a529f753d
--- /dev/null
+++ b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
@@ -0,0 +1,82 @@
+<?php
+
+final class PhabricatorEditEngineBulkJobType
+   extends PhabricatorWorkerBulkJobType {
+
+  public function getBulkJobTypeKey() {
+    return 'transaction.edit';
+  }
+
+  public function getJobName(PhabricatorWorkerBulkJob $job) {
+    return pht('Bulk Edit');
+  }
+
+  public function getDescriptionForConfirm(PhabricatorWorkerBulkJob $job) {
+    return pht(
+      'You are about to apply a bulk edit which will affect '.
+      '%s object(s).',
+      new PhutilNumber($job->getSize()));
+  }
+
+  public function getJobSize(PhabricatorWorkerBulkJob $job) {
+    return count($job->getParameter('objectPHIDs', array()));
+  }
+
+  public function getDoneURI(PhabricatorWorkerBulkJob $job) {
+    return $job->getParameter('doneURI');
+  }
+
+  public function createTasks(PhabricatorWorkerBulkJob $job) {
+    $tasks = array();
+
+    foreach ($job->getParameter('objectPHIDs', array()) as $phid) {
+      $tasks[] = PhabricatorWorkerBulkTask::initializeNewTask($job, $phid);
+    }
+
+    return $tasks;
+  }
+
+  public function runTask(
+    PhabricatorUser $actor,
+    PhabricatorWorkerBulkJob $job,
+    PhabricatorWorkerBulkTask $task) {
+
+    $object = id(new PhabricatorObjectQuery())
+      ->setViewer($actor)
+      ->withPHIDs(array($task->getObjectPHID()))
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->executeOne();
+    if (!$object) {
+      return;
+    }
+
+    $raw_xactions = $job->getParameter('xactions');
+    $xactions = $this->buildTransactions($object, $raw_xactions);
+
+    $editor = $object->getApplicationTransactionEditor()
+      ->setActor($actor)
+      ->setContentSource($job->newContentSource())
+      ->setContinueOnNoEffect(true)
+      ->setContinueOnMissingFields(true)
+      ->applyTransactions($object, $xactions);
+  }
+
+  private function buildTransactions($object, array $raw_xactions) {
+    $xactions = array();
+
+    foreach ($raw_xactions as $raw_xaction) {
+      $xaction = $object->getApplicationTransactionTemplate()
+        ->setTransactionType($raw_xaction['type'])
+        ->setNewValue($raw_xaction['value']);
+
+      $xactions[] = $xaction;
+    }
+
+    return $xactions;
+  }
+
+}

From 09e71a408235008e39cb5e82876511452a5a0d13 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 10 Jan 2018 11:23:55 -0800
Subject: [PATCH 353/865] Define bulk edits in terms of EditEngine, not
 hard-coded ad-hoc definitions

Summary:
Depends on D18862. See PHI173. Ref T13025. Fixes T10005. This redefines bulk edits in terms of EditEngine fields, rather than hard-coding the whole thing.

Only text fields -- and, specifically, only the "Title" field -- are supported after this change. Followup changes will add more bulk edit parameter types and broader field support.

However, the title field now works without any Maniphest-specific code, outside of the small amount of binding code in the `ManiphestBulkEditor` subclass.

Test Plan: Used the bulk edit workflow to change the titles of tasks.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025, T10005

Differential Revision: https://secure.phabricator.com/D18863
---
 resources/celerity/map.php                    |  37 ++--
 src/__phutil_library_map__.php                |   4 +
 .../bulk/ManiphestTaskBulkEngine.php          |   4 +
 .../maniphest/editor/ManiphestEditEngine.php  |   1 +
 .../bulk/PhabricatorBulkEngine.php            | 154 ++++++++---------
 .../bulk/type/BulkParameterType.php           |  24 +++
 .../bulk/type/BulkStringParameterType.php     |  10 ++
 .../editengine/PhabricatorEditEngine.php      |  65 +++++++
 .../editfield/PhabricatorEditField.php        |  61 ++++++-
 .../PhabricatorPHIDListEditField.php          |   4 +
 .../editfield/PhabricatorTextEditField.php    |   4 +
 .../edittype/PhabricatorEditType.php          |  40 +++++
 .../application/maniphest/batch-editor.css    |  17 --
 webroot/rsrc/css/phui/phui-bulk-editor.css    |  22 +++
 .../maniphest/behavior-batch-editor.js        | 158 ------------------
 webroot/rsrc/js/core/behavior-bulk-editor.js  | 113 +++++++++++++
 webroot/rsrc/js/phuix/PHUIXFormControl.js     |  13 ++
 17 files changed, 449 insertions(+), 282 deletions(-)
 create mode 100644 src/applications/transactions/bulk/type/BulkParameterType.php
 create mode 100644 src/applications/transactions/bulk/type/BulkStringParameterType.php
 delete mode 100644 webroot/rsrc/css/application/maniphest/batch-editor.css
 create mode 100644 webroot/rsrc/css/phui/phui-bulk-editor.css
 delete mode 100644 webroot/rsrc/js/application/maniphest/behavior-batch-editor.js
 create mode 100644 webroot/rsrc/js/core/behavior-bulk-editor.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 650d3f7efb..a8eee7a3cb 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -81,7 +81,6 @@
     'rsrc/css/application/harbormaster/harbormaster.css' => 'f491c9f4',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'cd8d0134',
-    'rsrc/css/application/maniphest/batch-editor.css' => 'b0f0b6d5',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
     'rsrc/css/application/maniphest/task-edit.css' => 'fda62a9b',
     'rsrc/css/application/maniphest/task-summary.css' => '11cc5344',
@@ -143,6 +142,7 @@
     'rsrc/css/phui/phui-basic-nav-view.css' => '98c11ab3',
     'rsrc/css/phui/phui-big-info-view.css' => 'acc3492c',
     'rsrc/css/phui/phui-box.css' => '4bd6cdb9',
+    'rsrc/css/phui/phui-bulk-editor.css' => '1fe728a8',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-cms.css' => '504b4b23',
     'rsrc/css/phui/phui-comment-form.css' => 'ac68149f',
@@ -419,7 +419,6 @@
     'rsrc/js/application/herald/HeraldRuleEditor.js' => '2dff5579',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
-    'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
     'rsrc/js/application/maniphest/behavior-batch-selector.js' => 'ad54037e',
     'rsrc/js/application/maniphest/behavior-line-chart.js' => 'e4232876',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
@@ -477,6 +476,7 @@
     'rsrc/js/core/behavior-audio-source.js' => '59b251eb',
     'rsrc/js/core/behavior-autofocus.js' => '7319e029',
     'rsrc/js/core/behavior-badge-view.js' => '8ff5e24c',
+    'rsrc/js/core/behavior-bulk-editor.js' => '5e178556',
     'rsrc/js/core/behavior-choose-control.js' => '327a00d1',
     'rsrc/js/core/behavior-copy.js' => 'b0b8f86d',
     'rsrc/js/core/behavior-detect-timezone.js' => '4c193c96',
@@ -532,7 +532,7 @@
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
-    'rsrc/js/phuix/PHUIXFormControl.js' => '83e03671',
+    'rsrc/js/phuix/PHUIXFormControl.js' => '68bb05aa',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
   ),
   'symbols' => array(
@@ -595,6 +595,7 @@
     'javelin-behavior-audio-source' => '59b251eb',
     'javelin-behavior-audit-preview' => 'd835b03a',
     'javelin-behavior-badge-view' => '8ff5e24c',
+    'javelin-behavior-bulk-editor' => '5e178556',
     'javelin-behavior-bulk-job-reload' => 'edf8a145',
     'javelin-behavior-calendar-month-view' => 'fe33e256',
     'javelin-behavior-choose-control' => '327a00d1',
@@ -642,7 +643,6 @@
     'javelin-behavior-lightbox-attachments' => '560f41da',
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
-    'javelin-behavior-maniphest-batch-editor' => '782ab6e7',
     'javelin-behavior-maniphest-batch-selector' => 'ad54037e',
     'javelin-behavior-maniphest-list-editor' => 'a9f88de2',
     'javelin-behavior-maniphest-subpriority-editor' => '71237763',
@@ -756,7 +756,6 @@
     'javelin-workboard-column' => '758b4758',
     'javelin-workboard-controller' => '26167537',
     'javelin-workflow' => '1e911d0f',
-    'maniphest-batch-editor' => 'b0f0b6d5',
     'maniphest-report-css' => '9b9580b7',
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
@@ -823,6 +822,7 @@
     'phui-basic-nav-view-css' => '98c11ab3',
     'phui-big-info-view-css' => 'acc3492c',
     'phui-box-css' => '4bd6cdb9',
+    'phui-bulk-editor-css' => '1fe728a8',
     'phui-button-bar-css' => 'f1ff5494',
     'phui-button-css' => '1863cc6e',
     'phui-button-simple-css' => '8e1baf68',
@@ -884,7 +884,7 @@
     'phuix-autocomplete' => 'e0731603',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
-    'phuix-form-control-view' => '83e03671',
+    'phuix-form-control-view' => '68bb05aa',
     'phuix-icon-view' => 'bff6884b',
     'policy-css' => '957ea14c',
     'policy-edit-css' => '815c66f7',
@@ -1387,6 +1387,15 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
+    '5e178556' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'phabricator-prefab',
+      'multirow-row-manager',
+      'javelin-json',
+      'phuix-form-control-view',
+    ),
     '5e2634b9' => array(
       'javelin-behavior',
       'javelin-aphlict',
@@ -1436,6 +1445,10 @@
       'javelin-dom',
       'phuix-button-view',
     ),
+    '68bb05aa' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     '69adf288' => array(
       'javelin-install',
     ),
@@ -1524,14 +1537,6 @@
       'javelin-request',
       'javelin-util',
     ),
-    '782ab6e7' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'phabricator-prefab',
-      'multirow-row-manager',
-      'javelin-json',
-    ),
     '7927a7d3' => array(
       'javelin-behavior',
       'javelin-quicksand',
@@ -1570,10 +1575,6 @@
       'javelin-behavior',
       'javelin-scrollbar',
     ),
-    '83e03671' => array(
-      'javelin-install',
-      'javelin-dom',
-    ),
     '8499b6ab' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b39d89a087..e9bb60fe22 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -222,6 +222,8 @@
     'AuditConduitAPIMethod' => 'applications/audit/conduit/AuditConduitAPIMethod.php',
     'AuditQueryConduitAPIMethod' => 'applications/audit/conduit/AuditQueryConduitAPIMethod.php',
     'AuthManageProvidersCapability' => 'applications/auth/capability/AuthManageProvidersCapability.php',
+    'BulkParameterType' => 'applications/transactions/bulk/type/BulkParameterType.php',
+    'BulkStringParameterType' => 'applications/transactions/bulk/type/BulkStringParameterType.php',
     'CalendarTimeUtil' => 'applications/calendar/util/CalendarTimeUtil.php',
     'CalendarTimeUtilTestCase' => 'applications/calendar/__tests__/CalendarTimeUtilTestCase.php',
     'CelerityAPI' => 'applications/celerity/CelerityAPI.php',
@@ -5242,6 +5244,8 @@
     'AuditConduitAPIMethod' => 'ConduitAPIMethod',
     'AuditQueryConduitAPIMethod' => 'AuditConduitAPIMethod',
     'AuthManageProvidersCapability' => 'PhabricatorPolicyCapability',
+    'BulkParameterType' => 'Phobject',
+    'BulkStringParameterType' => 'BulkParameterType',
     'CalendarTimeUtil' => 'Phobject',
     'CalendarTimeUtilTestCase' => 'PhabricatorTestCase',
     'CelerityAPI' => 'Phobject',
diff --git a/src/applications/maniphest/bulk/ManiphestTaskBulkEngine.php b/src/applications/maniphest/bulk/ManiphestTaskBulkEngine.php
index 8b62f627d8..44f575eefe 100644
--- a/src/applications/maniphest/bulk/ManiphestTaskBulkEngine.php
+++ b/src/applications/maniphest/bulk/ManiphestTaskBulkEngine.php
@@ -18,6 +18,10 @@ public function newSearchEngine() {
     return new ManiphestTaskSearchEngine();
   }
 
+  public function newEditEngine() {
+    return new ManiphestEditEngine();
+  }
+
   public function getDoneURI() {
     $board_uri = $this->getBoardURI();
     if ($board_uri) {
diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php
index b4ca86a442..f74fae076f 100644
--- a/src/applications/maniphest/editor/ManiphestEditEngine.php
+++ b/src/applications/maniphest/editor/ManiphestEditEngine.php
@@ -178,6 +178,7 @@ protected function buildCustomEditFields($object) {
       id(new PhabricatorTextEditField())
         ->setKey('title')
         ->setLabel(pht('Title'))
+        ->setBulkEditLabel(pht('Set title to'))
         ->setDescription(pht('Name of the task.'))
         ->setConduitDescription(pht('Rename the task.'))
         ->setConduitTypeDescription(pht('New task name.'))
diff --git a/src/applications/transactions/bulk/PhabricatorBulkEngine.php b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
index 82dc7f2510..f3cbeac9e1 100644
--- a/src/applications/transactions/bulk/PhabricatorBulkEngine.php
+++ b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
@@ -10,7 +10,10 @@ abstract class PhabricatorBulkEngine extends Phobject {
   private $editableList;
   private $targetList;
 
+  private $rootFormID;
+
   abstract public function newSearchEngine();
+  abstract public function newEditEngine();
 
   public function getCancelURI() {
     $saved_query = $this->savedQuery;
@@ -118,7 +121,7 @@ final public function buildResponse() {
       array(
         'action' => $this->getBulkURI(),
         'method' => 'POST',
-        'id' => 'maniphest-batch-edit-form',
+        'id' => $this->getRootFormID(),
       ),
       array(
         $this->newContextInputs(),
@@ -290,95 +293,60 @@ private function newContextInputs() {
 
   private function newBulkActionForm() {
     $viewer = $this->getViewer();
+    $input_id = celerity_generate_unique_node_id();
 
-    $cancel_uri = $this->getCancelURI();
-
-    $template = new AphrontTokenizerTemplateView();
-    $template = $template->render();
-
-    $projects_source = new PhabricatorProjectDatasource();
-    $mailable_source = new PhabricatorMetaMTAMailableDatasource();
-    $mailable_source->setViewer($viewer);
-    $owner_source = new ManiphestAssigneeDatasource();
-    $owner_source->setViewer($viewer);
-    $spaces_source = id(new PhabricatorSpacesNamespaceDatasource())
+    $edit_engine = id($this->newEditEngine())
       ->setViewer($viewer);
 
-    require_celerity_resource('maniphest-batch-editor');
+    $edit_map = $edit_engine->newBulkEditMap();
+
+    require_celerity_resource('phui-bulk-editor-css');
 
     Javelin::initBehavior(
-      'maniphest-batch-editor',
+      'bulk-editor',
       array(
-        'root' => 'maniphest-batch-edit-form',
-        'tokenizerTemplate' => $template,
-        'sources' => array(
-          'project' => array(
-            'src' => $projects_source->getDatasourceURI(),
-            'placeholder' => $projects_source->getPlaceholderText(),
-            'browseURI' => $projects_source->getBrowseURI(),
-          ),
-          'owner' => array(
-            'src' => $owner_source->getDatasourceURI(),
-            'placeholder' => $owner_source->getPlaceholderText(),
-            'browseURI' => $owner_source->getBrowseURI(),
-            'limit' => 1,
-          ),
-          'cc' => array(
-            'src' => $mailable_source->getDatasourceURI(),
-            'placeholder' => $mailable_source->getPlaceholderText(),
-            'browseURI' => $mailable_source->getBrowseURI(),
-          ),
-          'spaces' => array(
-            'src' => $spaces_source->getDatasourceURI(),
-            'placeholder' => $spaces_source->getPlaceholderText(),
-            'browseURI' => $spaces_source->getBrowseURI(),
-            'limit' => 1,
-          ),
-        ),
-        'input' => 'batch-form-actions',
-        'priorityMap' => ManiphestTaskPriority::getTaskPriorityMap(),
-        'statusMap'   => ManiphestTaskStatus::getTaskStatusMap(),
+        'rootNodeID' => $this->getRootFormID(),
+        'inputNodeID' => $input_id,
+        'edits' => $edit_map,
       ));
 
-    $form = id(new PHUIFormLayoutView())
-      ->setUser($viewer);
+    $cancel_uri = $this->getCancelURI();
 
-    $form->appendChild(
-      phutil_tag(
-        'input',
-        array(
-          'type' => 'hidden',
-          'name' => 'actions',
-          'id'   => 'batch-form-actions',
-        )));
-
-    $form->appendChild(
-      id(new PHUIFormInsetView())
-        ->setTitle(pht('Bulk Edit Actions'))
-        ->setRightButton(
-          javelin_tag(
-            'a',
-            array(
-              'href' => '#',
-              'class' => 'button button-green',
-              'sigil' => 'add-action',
-              'mustcapture' => true,
-            ),
-            pht('Add Another Action')))
-        ->setContent(
-          javelin_tag(
-            'table',
-            array(
-              'sigil' => 'maniphest-batch-actions',
-              'class' => 'maniphest-batch-actions-table',
-            ),
-            '')))
+    return id(new PHUIFormLayoutView())
+      ->setViewer($viewer)
+      ->appendChild(
+        phutil_tag(
+          'input',
+          array(
+            'type' => 'hidden',
+            'name' => 'xactions',
+            'id'   => $input_id,
+          )))
+      ->appendChild(
+        id(new PHUIFormInsetView())
+          ->setTitle(pht('Bulk Edit Actions'))
+          ->setRightButton(
+            javelin_tag(
+              'a',
+              array(
+                'href' => '#',
+                'class' => 'button button-green',
+                'sigil' => 'add-action',
+                'mustcapture' => true,
+              ),
+              pht('Add Another Action')))
+          ->setContent(
+            javelin_tag(
+              'table',
+              array(
+                'sigil' => 'bulk-actions',
+                'class' => 'bulk-edit-table',
+              ),
+              '')))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Apply Bulk Edit'))
           ->addCancelButton($cancel_uri));
-
-    return $form;
   }
 
   private function buildEditResponse() {
@@ -405,31 +373,33 @@ private function buildEditResponse() {
           'You have not selected any objects to edit.'));
     }
 
-    $raw_actions = $request->getStr('actions');
-    if ($raw_actions) {
-      $actions = phutil_json_decode($raw_actions);
+    $raw_xactions = $request->getStr('xactions');
+    if ($raw_xactions) {
+      $raw_xactions = phutil_json_decode($raw_xactions);
     } else {
-      $actions = array();
+      $raw_xactions = array();
     }
 
-    if (!$actions) {
+    if (!$raw_xactions) {
       throw new Exception(
         pht(
           'You have not chosen any edits to apply.'));
     }
 
+    $edit_engine = id($this->newEditEngine())
+      ->setViewer($viewer);
+
+    $xactions = $edit_engine->newRawBulkTransactions($raw_xactions);
+
     $cancel_uri = $this->getCancelURI();
     $done_uri = $this->getDoneURI();
 
     $job = PhabricatorWorkerBulkJob::initializeNewJob(
       $viewer,
-      // TODO: This is a Maniphest-specific job type for now, but will become
-      // a generic one so it gets to live here for now instead of in the task
-      // specific BulkEngine subclass.
-      new ManiphestTaskEditBulkJobType(),
+      new PhabricatorEditEngineBulkJobType(),
       array(
-        'taskPHIDs' => mpull($objects, 'getPHID'),
-        'actions' => $actions,
+        'objectPHIDs' => mpull($objects, 'getPHID'),
+        'xactions' => $xactions,
         'cancelURI' => $cancel_uri,
         'doneURI' => $done_uri,
       ));
@@ -451,4 +421,12 @@ private function buildEditResponse() {
       ->setURI($job->getMonitorURI());
   }
 
+  private function getRootFormID() {
+    if (!$this->rootFormID) {
+      $this->rootFormID = celerity_generate_unique_node_id();
+    }
+
+    return $this->rootFormID;
+  }
+
 }
diff --git a/src/applications/transactions/bulk/type/BulkParameterType.php b/src/applications/transactions/bulk/type/BulkParameterType.php
new file mode 100644
index 0000000000..e5d1ad9312
--- /dev/null
+++ b/src/applications/transactions/bulk/type/BulkParameterType.php
@@ -0,0 +1,24 @@
+<?php
+
+abstract class BulkParameterType extends Phobject {
+
+  private $viewer;
+
+  final public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  abstract public function getPHUIXControlType();
+
+  public function getPHUIXControlSpecification() {
+    return array(
+      'value' => null,
+    );
+  }
+
+}
diff --git a/src/applications/transactions/bulk/type/BulkStringParameterType.php b/src/applications/transactions/bulk/type/BulkStringParameterType.php
new file mode 100644
index 0000000000..906ff9e2de
--- /dev/null
+++ b/src/applications/transactions/bulk/type/BulkStringParameterType.php
@@ -0,0 +1,10 @@
+<?php
+
+final class BulkStringParameterType
+  extends BulkParameterType {
+
+  public function getPHUIXControlType() {
+    return 'text';
+  }
+
+}
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 1e9d936929..2df6679827 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -2421,6 +2421,71 @@ protected function didApplyTransactions($object, array $xactions) {
   }
 
 
+/* -(  Bulk Edits  )--------------------------------------------------------- */
+
+
+  final public function newBulkEditMap() {
+    $config = $this->loadDefaultConfiguration();
+    if (!$config) {
+      throw new Exception(
+        pht('No default edit engine configuration for bulk edit.'));
+    }
+
+    $object = $this->newEditableObject();
+    $fields = $this->buildEditFields($object);
+
+    $edit_types = $this->getBulkEditTypesFromFields($fields);
+
+    $map = array();
+    foreach ($edit_types as $key => $type) {
+      $bulk_type = $type->getBulkParameterType();
+      if ($bulk_type === null) {
+        continue;
+      }
+
+      $bulk_label = $type->getBulkEditLabel();
+      if ($bulk_label === null) {
+        continue;
+      }
+
+      $map[] = array(
+        'label' => $bulk_label,
+        'xaction' => $type->getTransactionType(),
+        'control' => array(
+          'type' => $bulk_type->getPHUIXControlType(),
+          'spec' => (object)$bulk_type->getPHUIXControlSpecification(),
+        ),
+      );
+    }
+
+    return $map;
+  }
+
+
+  final public function newRawBulkTransactions(array $xactions) {
+    return $xactions;
+  }
+
+  private function getBulkEditTypesFromFields(array $fields) {
+    $types = array();
+
+    foreach ($fields as $field) {
+      $field_types = $field->getBulkEditTypes();
+
+      if ($field_types === null) {
+        continue;
+      }
+
+      foreach ($field_types as $field_type) {
+        $field_type->setField($field);
+        $types[$field_type->getEditType()] = $field_type;
+      }
+    }
+
+    return $types;
+  }
+
+
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
diff --git a/src/applications/transactions/editfield/PhabricatorEditField.php b/src/applications/transactions/editfield/PhabricatorEditField.php
index 3cc6fe2fff..643bb2fca4 100644
--- a/src/applications/transactions/editfield/PhabricatorEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorEditField.php
@@ -17,6 +17,7 @@ abstract class PhabricatorEditField extends Phobject {
   private $previewPanel;
   private $controlID;
   private $controlInstructions;
+  private $bulkEditLabel;
 
   private $description;
   private $conduitDescription;
@@ -45,6 +46,7 @@ abstract class PhabricatorEditField extends Phobject {
   private $isConduitOnly = false;
 
   private $conduitEditTypes;
+  private $bulkEditTypes;
 
   public function setKey($key) {
     $this->key = $key;
@@ -64,6 +66,15 @@ public function getLabel() {
     return $this->label;
   }
 
+  public function setBulkEditLabel($bulk_edit_label) {
+    $this->bulkEditLabel = $bulk_edit_label;
+    return $this;
+  }
+
+  public function getBulkEditLabel() {
+    return $this->bulkEditLabel;
+  }
+
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
@@ -625,6 +636,22 @@ protected function newHTTPParameterType() {
     return new AphrontStringHTTPParameterType();
   }
 
+  protected function getBulkParameterType() {
+    $type = $this->newBulkParameterType();
+
+    if (!$type) {
+      return null;
+    }
+
+    $type->setViewer($this->getViewer());
+
+    return $type;
+  }
+
+  protected function newBulkParameterType() {
+    return null;
+  }
+
   public function getConduitParameterType() {
     $type = $this->newConduitParameterType();
 
@@ -657,8 +684,15 @@ protected function newEditType() {
       return null;
     }
 
-    return id(new PhabricatorSimpleEditType())
+    $edit_type = id(new PhabricatorSimpleEditType())
       ->setConduitParameterType($parameter_type);
+
+    $bulk_type = $this->getBulkParameterType();
+    if ($bulk_type) {
+      $edit_type->setBulkParameterType($bulk_type);
+    }
+
+    return $edit_type;
   }
 
   protected function getEditType() {
@@ -718,6 +752,31 @@ protected function newConduitEditTypes() {
     return array($edit_type);
   }
 
+  final public function getBulkEditTypes() {
+    if ($this->bulkEditTypes === null) {
+      $edit_types = $this->newBulkEditTypes();
+      $edit_types = mpull($edit_types, null, 'getEditType');
+
+      foreach ($edit_types as $edit_type) {
+        $edit_type->setEditField($this);
+      }
+
+      $this->bulkEditTypes = $edit_types;
+    }
+
+    return $this->bulkEditTypes;
+  }
+
+  protected function newBulkEditTypes() {
+    $edit_type = $this->getEditType();
+
+    if (!$edit_type) {
+      return array();
+    }
+
+    return array($edit_type);
+  }
+
   public function getCommentAction() {
     $label = $this->getCommentActionLabel();
     if ($label === null) {
diff --git a/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php b/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
index 7195741c43..e29206c8ba 100644
--- a/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
@@ -104,6 +104,10 @@ protected function newEditType() {
     return $type;
   }
 
+  protected function newBulkEditTypes() {
+    return $this->newConduitEditTypes();
+  }
+
   protected function newConduitEditTypes() {
     if (!$this->getUseEdgeTransactions()) {
       return parent::newConduitEditTypes();
diff --git a/src/applications/transactions/editfield/PhabricatorTextEditField.php b/src/applications/transactions/editfield/PhabricatorTextEditField.php
index fa51ff6142..68854cf2e2 100644
--- a/src/applications/transactions/editfield/PhabricatorTextEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorTextEditField.php
@@ -29,4 +29,8 @@ protected function newConduitParameterType() {
     return new ConduitStringParameterType();
   }
 
+  protected function newBulkParameterType() {
+    return new BulkStringParameterType();
+  }
+
 }
diff --git a/src/applications/transactions/edittype/PhabricatorEditType.php b/src/applications/transactions/edittype/PhabricatorEditType.php
index 1451ec2c04..0cba9db867 100644
--- a/src/applications/transactions/edittype/PhabricatorEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEditType.php
@@ -14,6 +14,9 @@ abstract class PhabricatorEditType extends Phobject {
   private $conduitTypeDescription;
   private $conduitParameterType;
 
+  private $bulkParameterType;
+  private $bulkEditLabel;
+
   public function setLabel($label) {
     $this->label = $label;
     return $this;
@@ -23,6 +26,19 @@ public function getLabel() {
     return $this->label;
   }
 
+  public function setBulkEditLabel($bulk_edit_label) {
+    $this->bulkEditLabel = $bulk_edit_label;
+    return $this;
+  }
+
+  public function getBulkEditLabel() {
+    if ($this->bulkEditLabel !== null) {
+      return $this->bulkEditLabel;
+    }
+
+    return $this->getField()->getBulkEditLabel();
+  }
+
   public function setField(PhabricatorEditField $field) {
     $this->field = $field;
     return $this;
@@ -85,6 +101,30 @@ public function getEditField() {
     return $this->editField;
   }
 
+
+/* -(  Bulk  )--------------------------------------------------------------- */
+
+
+  protected function newBulkParameterType() {
+    if ($this->bulkParameterType) {
+      return clone $this->bulkParameterType;
+    }
+
+    return null;
+  }
+
+
+  public function setBulkParameterType(BulkParameterType $type) {
+    $this->bulkParameterType = $type;
+    return $this;
+  }
+
+
+  public function getBulkParameterType() {
+    return $this->newBulkParameterType();
+  }
+
+
 /* -(  Conduit  )------------------------------------------------------------ */
 
 
diff --git a/webroot/rsrc/css/application/maniphest/batch-editor.css b/webroot/rsrc/css/application/maniphest/batch-editor.css
deleted file mode 100644
index ea98fd013c..0000000000
--- a/webroot/rsrc/css/application/maniphest/batch-editor.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @provides maniphest-batch-editor
- */
-.maniphest-batch-actions-table {
-  width: 100%;
-  margin: 12px 0;
-}
-
-.maniphest-batch-actions-table td {
-  padding: 4px 8px;
-  vertical-align: middle;
-}
-
-.batch-editor-input {
-  width: 100%;
-  text-align: left;
-}
diff --git a/webroot/rsrc/css/phui/phui-bulk-editor.css b/webroot/rsrc/css/phui/phui-bulk-editor.css
new file mode 100644
index 0000000000..d7364b1d75
--- /dev/null
+++ b/webroot/rsrc/css/phui/phui-bulk-editor.css
@@ -0,0 +1,22 @@
+/**
+ * @provides phui-bulk-editor-css
+ */
+
+.bulk-edit-table {
+  width: 100%;
+  margin: 12px 0;
+}
+
+.bulk-edit-table td {
+  padding: 4px 8px;
+  vertical-align: middle;
+}
+
+.bulk-edit-input {
+  width: 100%;
+  text-align: left;
+}
+
+.bulk-edit-input input {
+  width: 100%;
+}
diff --git a/webroot/rsrc/js/application/maniphest/behavior-batch-editor.js b/webroot/rsrc/js/application/maniphest/behavior-batch-editor.js
deleted file mode 100644
index ad2cf32d9e..0000000000
--- a/webroot/rsrc/js/application/maniphest/behavior-batch-editor.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * @provides javelin-behavior-maniphest-batch-editor
- * @requires javelin-behavior
- *           javelin-dom
- *           javelin-util
- *           phabricator-prefab
- *           multirow-row-manager
- *           javelin-json
- */
-
-JX.behavior('maniphest-batch-editor', function(config) {
-  var root = JX.$(config.root);
-  var editor_table = JX.DOM.find(root, 'table', 'maniphest-batch-actions');
-  var manager = new JX.MultirowRowManager(editor_table);
-  var action_rows = [];
-
-  function renderRow() {
-    var action_select = JX.Prefab.renderSelect(
-      {
-        'add_project': 'Add Projects',
-        'remove_project' : 'Remove Projects',
-        'priority': 'Change Priority',
-        'status': 'Change Status',
-        'add_comment': 'Comment',
-        'assign': 'Assign',
-        'add_ccs' : 'Add CCs',
-        'remove_ccs' : 'Remove CCs',
-        'space': 'Shift to Space'
-      });
-
-    var proj_tokenizer = build_tokenizer(config.sources.project);
-    var owner_tokenizer = build_tokenizer(config.sources.owner);
-    var cc_tokenizer = build_tokenizer(config.sources.cc);
-    var space_tokenizer = build_tokenizer(config.sources.spaces);
-
-    var priority_select = JX.Prefab.renderSelect(config.priorityMap);
-    var status_select = JX.Prefab.renderSelect(config.statusMap);
-    var comment_input = JX.$N('input', {style: {width: '100%'}});
-
-    var cell = JX.$N('td', {className: 'batch-editor-input'});
-    var vfunc = null;
-
-    function update() {
-      switch (action_select.value) {
-        case 'add_project':
-        case 'remove_project':
-          JX.DOM.setContent(cell, proj_tokenizer.template);
-          vfunc = function() {
-            return JX.keys(proj_tokenizer.object.getTokens());
-          };
-          break;
-        case 'add_ccs':
-        case 'remove_ccs':
-          JX.DOM.setContent(cell, cc_tokenizer.template);
-          vfunc = function() {
-            return JX.keys(cc_tokenizer.object.getTokens());
-          };
-          break;
-        case 'assign':
-          JX.DOM.setContent(cell, owner_tokenizer.template);
-          vfunc = function() {
-            return JX.keys(owner_tokenizer.object.getTokens());
-          };
-          break;
-        case 'space':
-          JX.DOM.setContent(cell, space_tokenizer.template);
-          vfunc = function() {
-            return JX.keys(space_tokenizer.object.getTokens());
-          };
-          break;
-        case 'add_comment':
-          JX.DOM.setContent(cell, comment_input);
-          vfunc = function() {
-            return comment_input.value;
-          };
-          break;
-        case 'priority':
-          JX.DOM.setContent(cell, priority_select);
-          vfunc = function() { return priority_select.value; };
-          break;
-        case 'status':
-          JX.DOM.setContent(cell, status_select);
-          vfunc = function() { return status_select.value; };
-          break;
-      }
-    }
-
-    JX.DOM.listen(action_select, 'change', null, update);
-    update();
-
-    return {
-      nodes : [JX.$N('td', {}, action_select), cell],
-      dataCallback : function() {
-        return {
-          action: action_select.value,
-          value: vfunc()
-        };
-      }
-    };
-  }
-
-  function onaddaction(e) {
-    e.kill();
-    addRow({});
-  }
-
-  function addRow(info) {
-    var data = renderRow(info);
-    var row = manager.addRow(data.nodes);
-    var id = manager.getRowID(row);
-
-    action_rows[id] = data.dataCallback;
-  }
-
-  function onsubmit() {
-    var input = JX.$(config.input);
-
-    var actions = [];
-    for (var k in action_rows) {
-      actions.push(action_rows[k]());
-    }
-
-    input.value = JX.JSON.stringify(actions);
-  }
-
-  addRow({});
-
-  JX.DOM.listen(
-    root,
-    'click',
-    'add-action',
-    onaddaction);
-
-  JX.DOM.listen(
-    root,
-    'submit',
-    null,
-    onsubmit);
-
-  manager.listen(
-    'row-removed',
-    function(row_id) {
-      delete action_rows[row_id];
-    });
-
-  function build_tokenizer(tconfig) {
-    var built = JX.Prefab.newTokenizerFromTemplate(
-      config.tokenizerTemplate,
-      JX.copy({}, tconfig));
-    built.tokenizer.start();
-
-    return {
-      object: built.tokenizer,
-      template: built.node
-    };
-  }
-
-});
diff --git a/webroot/rsrc/js/core/behavior-bulk-editor.js b/webroot/rsrc/js/core/behavior-bulk-editor.js
new file mode 100644
index 0000000000..1e6e60e94e
--- /dev/null
+++ b/webroot/rsrc/js/core/behavior-bulk-editor.js
@@ -0,0 +1,113 @@
+/**
+ * @provides javelin-behavior-bulk-editor
+ * @requires javelin-behavior
+ *           javelin-dom
+ *           javelin-util
+ *           phabricator-prefab
+ *           multirow-row-manager
+ *           javelin-json
+ *           phuix-form-control-view
+ */
+
+JX.behavior('bulk-editor', function(config) {
+
+  var root = JX.$(config.rootNodeID);
+  var editor_table = JX.DOM.find(root, 'table', 'bulk-actions');
+
+  var manager = new JX.MultirowRowManager(editor_table);
+  var action_rows = [];
+
+  var option_map = {};
+  var option_order = [];
+  var spec_map = {};
+
+  for (var ii = 0; ii < config.edits.length; ii++) {
+    var edit = config.edits[ii];
+
+    option_map[edit.xaction] = edit.label;
+    option_order.push(edit.xaction);
+
+    spec_map[edit.xaction] = edit;
+  }
+
+  function renderRow() {
+    var action_select = JX.Prefab.renderSelect(
+      option_map,
+      null,
+      null,
+      option_order);
+
+    var cell = JX.$N('td', {className: 'bulk-edit-input'});
+    var vfunc = null;
+
+    function update() {
+      var spec = spec_map[action_select.value];
+      var control = spec.control;
+
+      var phuix = new JX.PHUIXFormControl()
+        .setControl(control.type, control.spec);
+
+      JX.DOM.setContent(cell, phuix.getRawInputNode());
+
+      vfunc = JX.bind(phuix, phuix.getValue);
+    }
+
+    JX.DOM.listen(action_select, 'change', null, update);
+    update();
+
+    return {
+      nodes : [JX.$N('td', {}, action_select), cell],
+      dataCallback : function() {
+        return {
+          type: action_select.value,
+          value: vfunc()
+        };
+      }
+    };
+  }
+
+  function onaddaction(e) {
+    e.kill();
+    addRow({});
+  }
+
+  function addRow(info) {
+    var data = renderRow(info);
+    var row = manager.addRow(data.nodes);
+    var id = manager.getRowID(row);
+
+    action_rows[id] = data.dataCallback;
+  }
+
+  function onsubmit() {
+    var input = JX.$(config.inputNodeID);
+
+    var actions = [];
+    for (var k in action_rows) {
+      actions.push(action_rows[k]());
+    }
+
+    input.value = JX.JSON.stringify(actions);
+  }
+
+  addRow({});
+
+  JX.DOM.listen(
+    root,
+    'click',
+    'add-action',
+    onaddaction);
+
+  JX.DOM.listen(
+    root,
+    'submit',
+    null,
+    onsubmit);
+
+  manager.listen(
+    'row-removed',
+    function(row_id) {
+      delete action_rows[row_id];
+    });
+
+});
diff --git a/webroot/rsrc/js/phuix/PHUIXFormControl.js b/webroot/rsrc/js/phuix/PHUIXFormControl.js
index 5640b95ae8..0a9b8d45d7 100644
--- a/webroot/rsrc/js/phuix/PHUIXFormControl.js
+++ b/webroot/rsrc/js/phuix/PHUIXFormControl.js
@@ -14,6 +14,7 @@ JX.install('PHUIXFormControl', {
     _className: null,
     _valueSetCallback: null,
     _valueGetCallback: null,
+    _rawInputNode: null,
 
     setLabel: function(label) {
       JX.DOM.setContent(this._getLabelNode(), label);
@@ -53,6 +54,9 @@ JX.install('PHUIXFormControl', {
         case 'checkboxes':
           input = this._newCheckboxes(spec);
           break;
+        case 'text':
+          input = this._newText(spec);
+          break;
         default:
           // TODO: Default or better error?
           JX.$E('Bad Input Type');
@@ -62,6 +66,7 @@ JX.install('PHUIXFormControl', {
       JX.DOM.setContent(node, input.node);
       this._valueGetCallback = input.get;
       this._valueSetCallback = input.set;
+      this._rawInputNode = input.node;
 
       return this;
     },
@@ -75,6 +80,10 @@ JX.install('PHUIXFormControl', {
       return this._valueGetCallback();
     },
 
+    getRawInputNode: function() {
+      return this._rawInputNode;
+    },
+
     getNode: function() {
       if (!this._node) {
 
@@ -281,6 +290,10 @@ JX.install('PHUIXFormControl', {
     },
 
     _newPoints: function(spec) {
+      return this._newText();
+    },
+
+    _newText: function(spec) {
       var attrs = {
         type: 'text',
         value: spec.value

From a251db461826470bdb694271db8bd7508fcec5d8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 10 Jan 2018 13:04:25 -0800
Subject: [PATCH 354/865] Remove the Maniphest-specific bulk job type

Summary: Depends on D18863. Ref PHI173. Ref T13025. After D18863, this job type is no longer used: the workflow uses a genric worker instead which can apply transactions to any object.

Test Plan: Grepped for callsites, found none.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18864
---
 src/__phutil_library_map__.php                |   2 -
 .../bulk/ManiphestTaskEditBulkJobType.php     | 303 ------------------
 2 files changed, 305 deletions(-)
 delete mode 100644 src/applications/maniphest/bulk/ManiphestTaskEditBulkJobType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e9bb60fe22..d8cf93c9ab 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1559,7 +1559,6 @@
     'ManiphestTaskDescriptionTransaction' => 'applications/maniphest/xaction/ManiphestTaskDescriptionTransaction.php',
     'ManiphestTaskDetailController' => 'applications/maniphest/controller/ManiphestTaskDetailController.php',
     'ManiphestTaskEdgeTransaction' => 'applications/maniphest/xaction/ManiphestTaskEdgeTransaction.php',
-    'ManiphestTaskEditBulkJobType' => 'applications/maniphest/bulk/ManiphestTaskEditBulkJobType.php',
     'ManiphestTaskEditController' => 'applications/maniphest/controller/ManiphestTaskEditController.php',
     'ManiphestTaskEditEngineLock' => 'applications/maniphest/editor/ManiphestTaskEditEngineLock.php',
     'ManiphestTaskFerretEngine' => 'applications/maniphest/search/ManiphestTaskFerretEngine.php',
@@ -6778,7 +6777,6 @@
     'ManiphestTaskDescriptionTransaction' => 'ManiphestTaskTransactionType',
     'ManiphestTaskDetailController' => 'ManiphestController',
     'ManiphestTaskEdgeTransaction' => 'ManiphestTaskTransactionType',
-    'ManiphestTaskEditBulkJobType' => 'PhabricatorWorkerBulkJobType',
     'ManiphestTaskEditController' => 'ManiphestController',
     'ManiphestTaskEditEngineLock' => 'PhabricatorEditEngineLock',
     'ManiphestTaskFerretEngine' => 'PhabricatorFerretEngine',
diff --git a/src/applications/maniphest/bulk/ManiphestTaskEditBulkJobType.php b/src/applications/maniphest/bulk/ManiphestTaskEditBulkJobType.php
deleted file mode 100644
index 1b083d88f9..0000000000
--- a/src/applications/maniphest/bulk/ManiphestTaskEditBulkJobType.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-
-final class ManiphestTaskEditBulkJobType
-   extends PhabricatorWorkerBulkJobType {
-
-  public function getBulkJobTypeKey() {
-    return 'maniphest.task.edit';
-  }
-
-  public function getJobName(PhabricatorWorkerBulkJob $job) {
-    return pht('Maniphest Bulk Edit');
-  }
-
-  public function getDescriptionForConfirm(PhabricatorWorkerBulkJob $job) {
-    return pht(
-      'You are about to apply a bulk edit to Maniphest which will affect '.
-      '%s task(s).',
-      new PhutilNumber($job->getSize()));
-  }
-
-  public function getJobSize(PhabricatorWorkerBulkJob $job) {
-    return count($job->getParameter('taskPHIDs', array()));
-  }
-
-  public function getDoneURI(PhabricatorWorkerBulkJob $job) {
-    return $job->getParameter('doneURI');
-  }
-
-  public function createTasks(PhabricatorWorkerBulkJob $job) {
-    $tasks = array();
-
-    foreach ($job->getParameter('taskPHIDs', array()) as $phid) {
-      $tasks[] = PhabricatorWorkerBulkTask::initializeNewTask($job, $phid);
-    }
-
-    return $tasks;
-  }
-
-  public function runTask(
-    PhabricatorUser $actor,
-    PhabricatorWorkerBulkJob $job,
-    PhabricatorWorkerBulkTask $task) {
-
-    $object = id(new ManiphestTaskQuery())
-      ->setViewer($actor)
-      ->requireCapabilities(
-        array(
-          PhabricatorPolicyCapability::CAN_VIEW,
-          PhabricatorPolicyCapability::CAN_EDIT,
-        ))
-      ->withPHIDs(array($task->getObjectPHID()))
-      ->needProjectPHIDs(true)
-      ->needSubscriberPHIDs(true)
-      ->executeOne();
-    if (!$object) {
-      return;
-    }
-
-    $field_list = PhabricatorCustomField::getObjectFields(
-      $object,
-      PhabricatorCustomField::ROLE_EDIT);
-    $field_list->readFieldsFromStorage($object);
-
-    $actions = $job->getParameter('actions');
-    $xactions = $this->buildTransactions($actions, $object);
-
-    $editor = id(new ManiphestTransactionEditor())
-      ->setActor($actor)
-      ->setContentSource($job->newContentSource())
-      ->setContinueOnNoEffect(true)
-      ->setContinueOnMissingFields(true)
-      ->applyTransactions($object, $xactions);
-  }
-
-  private function buildTransactions($actions, ManiphestTask $task) {
-    $value_map = array();
-    $type_map = array(
-      'add_comment' => PhabricatorTransactions::TYPE_COMMENT,
-      'assign' => ManiphestTaskOwnerTransaction::TRANSACTIONTYPE,
-      'status' => ManiphestTaskStatusTransaction::TRANSACTIONTYPE,
-      'priority' => ManiphestTaskPriorityTransaction::TRANSACTIONTYPE,
-      'add_project' => PhabricatorTransactions::TYPE_EDGE,
-      'remove_project' => PhabricatorTransactions::TYPE_EDGE,
-      'add_ccs' => PhabricatorTransactions::TYPE_SUBSCRIBERS,
-      'remove_ccs' => PhabricatorTransactions::TYPE_SUBSCRIBERS,
-      'space' => PhabricatorTransactions::TYPE_SPACE,
-    );
-
-    $edge_edit_types = array(
-      'add_project'    => true,
-      'remove_project' => true,
-      'add_ccs'        => true,
-      'remove_ccs'     => true,
-    );
-
-    $xactions = array();
-    foreach ($actions as $action) {
-      if (empty($type_map[$action['action']])) {
-        throw new Exception(pht("Unknown batch edit action '%s'!", $action));
-      }
-
-      $type = $type_map[$action['action']];
-
-      // Figure out the current value, possibly after modifications by other
-      // batch actions of the same type. For example, if the user chooses to
-      // "Add Comment" twice, we should add both comments. More notably, if the
-      // user chooses "Remove Project..." and also "Add Project...", we should
-      // avoid restoring the removed project in the second transaction.
-
-      if (array_key_exists($type, $value_map)) {
-        $current = $value_map[$type];
-      } else {
-        switch ($type) {
-          case PhabricatorTransactions::TYPE_COMMENT:
-            $current = null;
-            break;
-          case ManiphestTaskOwnerTransaction::TRANSACTIONTYPE:
-            $current = $task->getOwnerPHID();
-            break;
-          case ManiphestTaskStatusTransaction::TRANSACTIONTYPE:
-            $current = $task->getStatus();
-            break;
-          case ManiphestTaskPriorityTransaction::TRANSACTIONTYPE:
-            $current = $task->getPriority();
-            break;
-          case PhabricatorTransactions::TYPE_EDGE:
-            $current = $task->getProjectPHIDs();
-            break;
-          case PhabricatorTransactions::TYPE_SUBSCRIBERS:
-            $current = $task->getSubscriberPHIDs();
-            break;
-          case PhabricatorTransactions::TYPE_SPACE:
-            $current = PhabricatorSpacesNamespaceQuery::getObjectSpacePHID(
-              $task);
-            break;
-        }
-      }
-
-      // Check if the value is meaningful / provided, and normalize it if
-      // necessary. This discards, e.g., empty comments and empty owner
-      // changes.
-
-      $value = $action['value'];
-      switch ($type) {
-        case PhabricatorTransactions::TYPE_COMMENT:
-          if (!strlen($value)) {
-            continue 2;
-          }
-          break;
-        case PhabricatorTransactions::TYPE_SPACE:
-          if (empty($value)) {
-            continue 2;
-          }
-          $value = head($value);
-          break;
-        case ManiphestTaskOwnerTransaction::TRANSACTIONTYPE:
-          if (empty($value)) {
-            continue 2;
-          }
-          $value = head($value);
-          $no_owner = PhabricatorPeopleNoOwnerDatasource::FUNCTION_TOKEN;
-          if ($value === $no_owner) {
-            $value = null;
-          }
-          break;
-        case PhabricatorTransactions::TYPE_EDGE:
-          if (empty($value)) {
-            continue 2;
-          }
-          break;
-        case PhabricatorTransactions::TYPE_SUBSCRIBERS:
-          if (empty($value)) {
-            continue 2;
-          }
-          break;
-      }
-
-      // If the edit doesn't change anything, go to the next action. This
-      // check is only valid for changes like "owner", "status", etc, not
-      // for edge edits, because we should still apply an edit like
-      // "Remove Projects: A, B" to a task with projects "A, B".
-
-      if (empty($edge_edit_types[$action['action']])) {
-        if ($value == $current) {
-          continue;
-        }
-      }
-
-      // Apply the value change; for most edits this is just replacement, but
-      // some need to merge the current and edited values (add/remove project).
-
-      switch ($type) {
-        case PhabricatorTransactions::TYPE_COMMENT:
-          if (strlen($current)) {
-            $value = $current."\n\n".$value;
-          }
-          break;
-        case PhabricatorTransactions::TYPE_EDGE:
-          $is_remove = $action['action'] == 'remove_project';
-
-          $current = array_fill_keys($current, true);
-          $value   = array_fill_keys($value, true);
-
-          $new = $current;
-          $did_something = false;
-
-          if ($is_remove) {
-            foreach ($value as $phid => $ignored) {
-              if (isset($new[$phid])) {
-                unset($new[$phid]);
-                $did_something = true;
-              }
-            }
-          } else {
-            foreach ($value as $phid => $ignored) {
-              if (empty($new[$phid])) {
-                $new[$phid] = true;
-                $did_something = true;
-              }
-            }
-          }
-
-          if (!$did_something) {
-            continue 2;
-          }
-
-          $value = array_keys($new);
-          break;
-        case PhabricatorTransactions::TYPE_SUBSCRIBERS:
-          $is_remove = $action['action'] == 'remove_ccs';
-
-          $current = array_fill_keys($current, true);
-
-          $new = array();
-          $did_something = false;
-
-          if ($is_remove) {
-            foreach ($value as $phid) {
-              if (isset($current[$phid])) {
-                $new[$phid] = true;
-                $did_something = true;
-              }
-            }
-            if ($new) {
-              $value = array('-' => array_keys($new));
-            }
-          } else {
-            $new = array();
-            foreach ($value as $phid) {
-              $new[$phid] = true;
-              $did_something = true;
-            }
-            if ($new) {
-              $value = array('+' => array_keys($new));
-            }
-          }
-          if (!$did_something) {
-            continue 2;
-          }
-
-          break;
-      }
-
-      $value_map[$type] = $value;
-    }
-
-    $template = new ManiphestTransaction();
-
-    foreach ($value_map as $type => $value) {
-      $xaction = clone $template;
-      $xaction->setTransactionType($type);
-
-      switch ($type) {
-        case PhabricatorTransactions::TYPE_COMMENT:
-          $xaction->attachComment(
-            id(new ManiphestTransactionComment())
-              ->setContent($value));
-          break;
-        case PhabricatorTransactions::TYPE_EDGE:
-          $project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
-          $xaction
-            ->setMetadataValue('edge:type', $project_type)
-            ->setNewValue(
-              array(
-                '=' => array_fuse($value),
-              ));
-          break;
-        case ManiphestTaskPriorityTransaction::TRANSACTIONTYPE:
-          $keyword_map = ManiphestTaskPriority::getTaskPriorityKeywordsMap();
-          $keyword = head(idx($keyword_map, $value));
-          $xaction->setNewValue($keyword);
-          break;
-        default:
-          $xaction->setNewValue($value);
-          break;
-      }
-
-      $xactions[] = $xaction;
-    }
-
-    return $xactions;
-  }
-}

From bf1ac701c37c93791143ef31bacb1196f05fca44 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 11 Jan 2018 09:27:58 -0800
Subject: [PATCH 355/865] Support "select" types in bulk editor (status,
 priority)

Summary: Depends on D18864. Ref T13025. Adds bulk edit support back for "status" and "priority" using `<select />` controls.

Test Plan:
Used bulk editor to change status and priority for tasks.

{F5374436}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18866
---
 src/__phutil_library_map__.php                |  2 ++
 .../maniphest/editor/ManiphestEditEngine.php  |  2 ++
 .../bulk/type/BulkParameterType.php           | 10 +++++++++
 .../bulk/type/BulkSelectParameterType.php     | 22 +++++++++++++++++++
 .../editfield/PhabricatorEditField.php        |  4 +++-
 .../editfield/PhabricatorSelectEditField.php  |  4 ++++
 6 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/transactions/bulk/type/BulkSelectParameterType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index d8cf93c9ab..c9087c6476 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -223,6 +223,7 @@
     'AuditQueryConduitAPIMethod' => 'applications/audit/conduit/AuditQueryConduitAPIMethod.php',
     'AuthManageProvidersCapability' => 'applications/auth/capability/AuthManageProvidersCapability.php',
     'BulkParameterType' => 'applications/transactions/bulk/type/BulkParameterType.php',
+    'BulkSelectParameterType' => 'applications/transactions/bulk/type/BulkSelectParameterType.php',
     'BulkStringParameterType' => 'applications/transactions/bulk/type/BulkStringParameterType.php',
     'CalendarTimeUtil' => 'applications/calendar/util/CalendarTimeUtil.php',
     'CalendarTimeUtilTestCase' => 'applications/calendar/__tests__/CalendarTimeUtilTestCase.php',
@@ -5244,6 +5245,7 @@
     'AuditQueryConduitAPIMethod' => 'AuditConduitAPIMethod',
     'AuthManageProvidersCapability' => 'PhabricatorPolicyCapability',
     'BulkParameterType' => 'Phobject',
+    'BulkSelectParameterType' => 'BulkParameterType',
     'BulkStringParameterType' => 'BulkParameterType',
     'CalendarTimeUtil' => 'Phobject',
     'CalendarTimeUtilTestCase' => 'PhabricatorTestCase',
diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php
index f74fae076f..607e3c5914 100644
--- a/src/applications/maniphest/editor/ManiphestEditEngine.php
+++ b/src/applications/maniphest/editor/ManiphestEditEngine.php
@@ -201,6 +201,7 @@ protected function buildCustomEditFields($object) {
       id(new PhabricatorSelectEditField())
         ->setKey('status')
         ->setLabel(pht('Status'))
+        ->setBulkEditLabel(pht('Set status to'))
         ->setDescription(pht('Status of the task.'))
         ->setConduitDescription(pht('Change the task status.'))
         ->setConduitTypeDescription(pht('New task status constant.'))
@@ -213,6 +214,7 @@ protected function buildCustomEditFields($object) {
       id(new PhabricatorSelectEditField())
         ->setKey('priority')
         ->setLabel(pht('Priority'))
+        ->setBulkEditLabel(pht('Set priority to'))
         ->setDescription(pht('Priority of the task.'))
         ->setConduitDescription(pht('Change the priority of the task.'))
         ->setConduitTypeDescription(pht('New task priority constant.'))
diff --git a/src/applications/transactions/bulk/type/BulkParameterType.php b/src/applications/transactions/bulk/type/BulkParameterType.php
index e5d1ad9312..5c88dcc85e 100644
--- a/src/applications/transactions/bulk/type/BulkParameterType.php
+++ b/src/applications/transactions/bulk/type/BulkParameterType.php
@@ -3,6 +3,7 @@
 abstract class BulkParameterType extends Phobject {
 
   private $viewer;
+  private $field;
 
   final public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
@@ -13,6 +14,15 @@ final public function getViewer() {
     return $this->viewer;
   }
 
+  final public function setField(PhabricatorEditField $field) {
+    $this->field = $field;
+    return $this;
+  }
+
+  final public function getField() {
+    return $this->field;
+  }
+
   abstract public function getPHUIXControlType();
 
   public function getPHUIXControlSpecification() {
diff --git a/src/applications/transactions/bulk/type/BulkSelectParameterType.php b/src/applications/transactions/bulk/type/BulkSelectParameterType.php
new file mode 100644
index 0000000000..d1cfc5125b
--- /dev/null
+++ b/src/applications/transactions/bulk/type/BulkSelectParameterType.php
@@ -0,0 +1,22 @@
+<?php
+
+final class BulkSelectParameterType
+  extends BulkParameterType {
+
+  public function getOptions() {
+    return $this->getField()->getOptions();
+  }
+
+  public function getPHUIXControlType() {
+    return 'select';
+  }
+
+  public function getPHUIXControlSpecification() {
+    return array(
+      'options' => $this->getOptions(),
+      'order' => array_keys($this->getOptions()),
+      'value' => null,
+    );
+  }
+
+}
diff --git a/src/applications/transactions/editfield/PhabricatorEditField.php b/src/applications/transactions/editfield/PhabricatorEditField.php
index 643bb2fca4..01a70166c7 100644
--- a/src/applications/transactions/editfield/PhabricatorEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorEditField.php
@@ -643,7 +643,9 @@ protected function getBulkParameterType() {
       return null;
     }
 
-    $type->setViewer($this->getViewer());
+    $type
+      ->setField($this)
+      ->setViewer($this->getViewer());
 
     return $type;
   }
diff --git a/src/applications/transactions/editfield/PhabricatorSelectEditField.php b/src/applications/transactions/editfield/PhabricatorSelectEditField.php
index fa565dbe61..aacd67f5a8 100644
--- a/src/applications/transactions/editfield/PhabricatorSelectEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorSelectEditField.php
@@ -54,6 +54,10 @@ protected function newConduitParameterType() {
     return new ConduitStringParameterType();
   }
 
+  protected function newBulkParameterType() {
+    return new BulkSelectParameterType();
+  }
+
   private function getCanonicalValue($value) {
     $options = $this->getOptions();
     if (!isset($options[$value])) {

From 687fada5af4362672d9c62f159983c233774e5c6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 11 Jan 2018 09:48:33 -0800
Subject: [PATCH 356/865] Restore bulk edit support for remarkup fields
 (description, add comment)

Summary:
Depends on D18866. Ref T13025. Fixes T12415. This makes the old "Add Comment" action work, and adds support for a new "Set description to" action (possibly, I could imagine "append description" being useful some day, maybe).

The implementation is just a `<textarea />`, not a whole fancy remarkup box with `[Bold] [Italic] ...` buttons, preview, typeaheads, etc. It would be nice to enrich this eventually but doing the rendering in pure JS is currently very involved.

This requires a little bit of gymnastics to get the transaction populated properly, and adds some extra validation since we need some code there anyway.

Test Plan:
  - Changed the description of a task via bulk editor.
  - Added a comment to a task via bulk editor.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025, T12415

Differential Revision: https://secure.phabricator.com/D18867
---
 resources/celerity/map.php                    | 16 +++----
 src/__phutil_library_map__.php                |  2 +
 .../maniphest/editor/ManiphestEditEngine.php  |  1 +
 .../bulk/PhabricatorEditEngineBulkJobType.php | 13 +++++-
 .../bulk/type/BulkRemarkupParameterType.php   | 10 ++++
 .../editengine/PhabricatorEditEngine.php      | 46 ++++++++++++++++++-
 .../PhabricatorRemarkupEditField.php          |  4 ++
 .../edittype/PhabricatorCommentEditType.php   | 15 ++++++
 .../edittype/PhabricatorEditType.php          |  5 ++
 .../PhabricatorCommentEditEngineExtension.php |  1 +
 webroot/rsrc/css/phui/phui-bulk-editor.css    |  5 ++
 webroot/rsrc/js/phuix/PHUIXFormControl.js     | 25 ++++++++++
 12 files changed, 132 insertions(+), 11 deletions(-)
 create mode 100644 src/applications/transactions/bulk/type/BulkRemarkupParameterType.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index a8eee7a3cb..61516212d3 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -142,7 +142,7 @@
     'rsrc/css/phui/phui-basic-nav-view.css' => '98c11ab3',
     'rsrc/css/phui/phui-big-info-view.css' => 'acc3492c',
     'rsrc/css/phui/phui-box.css' => '4bd6cdb9',
-    'rsrc/css/phui/phui-bulk-editor.css' => '1fe728a8',
+    'rsrc/css/phui/phui-bulk-editor.css' => '9a81e5d5',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-cms.css' => '504b4b23',
     'rsrc/css/phui/phui-comment-form.css' => 'ac68149f',
@@ -532,7 +532,7 @@
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
-    'rsrc/js/phuix/PHUIXFormControl.js' => '68bb05aa',
+    'rsrc/js/phuix/PHUIXFormControl.js' => '1dd0870c',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
   ),
   'symbols' => array(
@@ -822,7 +822,7 @@
     'phui-basic-nav-view-css' => '98c11ab3',
     'phui-big-info-view-css' => 'acc3492c',
     'phui-box-css' => '4bd6cdb9',
-    'phui-bulk-editor-css' => '1fe728a8',
+    'phui-bulk-editor-css' => '9a81e5d5',
     'phui-button-bar-css' => 'f1ff5494',
     'phui-button-css' => '1863cc6e',
     'phui-button-simple-css' => '8e1baf68',
@@ -884,7 +884,7 @@
     'phuix-autocomplete' => 'e0731603',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
-    'phuix-form-control-view' => '68bb05aa',
+    'phuix-form-control-view' => '1dd0870c',
     'phuix-icon-view' => 'bff6884b',
     'policy-css' => '957ea14c',
     'policy-edit-css' => '815c66f7',
@@ -1029,6 +1029,10 @@
       'javelin-request',
       'javelin-uri',
     ),
+    '1dd0870c' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     '1e911d0f' => array(
       'javelin-stratcom',
       'javelin-request',
@@ -1445,10 +1449,6 @@
       'javelin-dom',
       'phuix-button-view',
     ),
-    '68bb05aa' => array(
-      'javelin-install',
-      'javelin-dom',
-    ),
     '69adf288' => array(
       'javelin-install',
     ),
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c9087c6476..8c1c941f34 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -223,6 +223,7 @@
     'AuditQueryConduitAPIMethod' => 'applications/audit/conduit/AuditQueryConduitAPIMethod.php',
     'AuthManageProvidersCapability' => 'applications/auth/capability/AuthManageProvidersCapability.php',
     'BulkParameterType' => 'applications/transactions/bulk/type/BulkParameterType.php',
+    'BulkRemarkupParameterType' => 'applications/transactions/bulk/type/BulkRemarkupParameterType.php',
     'BulkSelectParameterType' => 'applications/transactions/bulk/type/BulkSelectParameterType.php',
     'BulkStringParameterType' => 'applications/transactions/bulk/type/BulkStringParameterType.php',
     'CalendarTimeUtil' => 'applications/calendar/util/CalendarTimeUtil.php',
@@ -5245,6 +5246,7 @@
     'AuditQueryConduitAPIMethod' => 'AuditConduitAPIMethod',
     'AuthManageProvidersCapability' => 'PhabricatorPolicyCapability',
     'BulkParameterType' => 'Phobject',
+    'BulkRemarkupParameterType' => 'BulkParameterType',
     'BulkSelectParameterType' => 'BulkParameterType',
     'BulkStringParameterType' => 'BulkParameterType',
     'CalendarTimeUtil' => 'Phobject',
diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php
index 607e3c5914..71ae414de2 100644
--- a/src/applications/maniphest/editor/ManiphestEditEngine.php
+++ b/src/applications/maniphest/editor/ManiphestEditEngine.php
@@ -245,6 +245,7 @@ protected function buildCustomEditFields($object) {
     $fields[] = id(new PhabricatorRemarkupEditField())
       ->setKey('description')
       ->setLabel(pht('Description'))
+      ->setBulkEditLabel(pht('Set description to'))
       ->setDescription(pht('Task description.'))
       ->setConduitDescription(pht('Update the task description.'))
       ->setConduitTypeDescription(pht('New task description.'))
diff --git a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
index 1a529f753d..fae6765769 100644
--- a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
+++ b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
@@ -70,8 +70,17 @@ private function buildTransactions($object, array $raw_xactions) {
 
     foreach ($raw_xactions as $raw_xaction) {
       $xaction = $object->getApplicationTransactionTemplate()
-        ->setTransactionType($raw_xaction['type'])
-        ->setNewValue($raw_xaction['value']);
+        ->setTransactionType($raw_xaction['type']);
+
+      if (isset($raw_xaction['value'])) {
+        $xaction->setNewValue($raw_xaction['value']);
+      }
+
+      if (isset($raw_xaction['comment'])) {
+        $comment = $xaction->getApplicationTransactionCommentObject()
+          ->setContent($raw_xaction['comment']);
+        $xaction->attachComment($comment);
+      }
 
       $xactions[] = $xaction;
     }
diff --git a/src/applications/transactions/bulk/type/BulkRemarkupParameterType.php b/src/applications/transactions/bulk/type/BulkRemarkupParameterType.php
new file mode 100644
index 0000000000..8c5cc4c40e
--- /dev/null
+++ b/src/applications/transactions/bulk/type/BulkRemarkupParameterType.php
@@ -0,0 +1,10 @@
+<?php
+
+final class BulkRemarkupParameterType
+  extends BulkParameterType {
+
+  public function getPHUIXControlType() {
+    return 'remarkup';
+  }
+
+}
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 2df6679827..7ae2e1ee05 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -2450,7 +2450,7 @@ final public function newBulkEditMap() {
 
       $map[] = array(
         'label' => $bulk_label,
-        'xaction' => $type->getTransactionType(),
+        'xaction' => $key,
         'control' => array(
           'type' => $bulk_type->getPHUIXControlType(),
           'spec' => (object)$bulk_type->getPHUIXControlSpecification(),
@@ -2463,6 +2463,50 @@ final public function newBulkEditMap() {
 
 
   final public function newRawBulkTransactions(array $xactions) {
+    $config = $this->loadDefaultConfiguration();
+    if (!$config) {
+      throw new Exception(
+        pht('No default edit engine configuration for bulk edit.'));
+    }
+
+    $object = $this->newEditableObject();
+    $fields = $this->buildEditFields($object);
+
+    $edit_types = $this->getBulkEditTypesFromFields($fields);
+
+    foreach ($xactions as $key => $xaction) {
+      PhutilTypeSpec::checkMap(
+        $xaction,
+        array(
+          'type' => 'string',
+          'value' => 'optional wild',
+          'comment' => 'optional string',
+        ));
+
+      $type = $xaction['type'];
+      if (!isset($edit_types[$type])) {
+        throw new Exception(
+          pht(
+            'Unsupported bulk edit type "%s".',
+            $type));
+      }
+
+      $edit_type = $edit_types[$type];
+
+      // Replace the edit type with the underlying transaction type. Usually
+      // these are 1:1 and the transaction type just has more internal noise,
+      // but it's possible that this isn't the case.
+      $xaction['type'] = $edit_type->getTransactionType();
+
+      $xaction = $edit_type->newRawBulkTransaction($xaction);
+      if ($xaction === null) {
+        unset($xactions[$key]);
+        continue;
+      }
+
+      $xactions[$key] = $xaction;
+    }
+
     return $xactions;
   }
 
diff --git a/src/applications/transactions/editfield/PhabricatorRemarkupEditField.php b/src/applications/transactions/editfield/PhabricatorRemarkupEditField.php
index bb221a0de1..039f0b368f 100644
--- a/src/applications/transactions/editfield/PhabricatorRemarkupEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorRemarkupEditField.php
@@ -11,4 +11,8 @@ protected function newConduitParameterType() {
     return new ConduitStringParameterType();
   }
 
+  protected function newBulkParameterType() {
+    return new BulkRemarkupParameterType();
+  }
+
 }
diff --git a/src/applications/transactions/edittype/PhabricatorCommentEditType.php b/src/applications/transactions/edittype/PhabricatorCommentEditType.php
index 2ab24677f7..0bc82f7dc7 100644
--- a/src/applications/transactions/edittype/PhabricatorCommentEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorCommentEditType.php
@@ -6,6 +6,21 @@ protected function newConduitParameterType() {
     return new ConduitStringParameterType();
   }
 
+  protected function newBulkParameterType() {
+    return new BulkRemarkupParameterType();
+  }
+
+  public function newRawBulkTransaction(array $xaction) {
+    if (!strlen($xaction['value'])) {
+      return null;
+    }
+
+    $xaction['comment'] = $xaction['value'];
+    unset($xaction['value']);
+
+    return $xaction;
+  }
+
   public function generateTransactions(
     PhabricatorApplicationTransaction $template,
     array $spec) {
diff --git a/src/applications/transactions/edittype/PhabricatorEditType.php b/src/applications/transactions/edittype/PhabricatorEditType.php
index 0cba9db867..5c9a9dac92 100644
--- a/src/applications/transactions/edittype/PhabricatorEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEditType.php
@@ -125,6 +125,11 @@ public function getBulkParameterType() {
   }
 
 
+  public function newRawBulkTransaction(array $xaction) {
+    return $xaction;
+  }
+
+
 /* -(  Conduit  )------------------------------------------------------------ */
 
 
diff --git a/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
index 3a01756ea7..9eb5fbf827 100644
--- a/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
@@ -46,6 +46,7 @@ public function buildCustomEditFields(
     $comment_field = id(new PhabricatorCommentEditField())
       ->setKey(self::EDITKEY)
       ->setLabel(pht('Comments'))
+      ->setBulkEditLabel(pht('Add comment'))
       ->setAliases(array('comments'))
       ->setIsHidden(true)
       ->setIsReorderable(false)
diff --git a/webroot/rsrc/css/phui/phui-bulk-editor.css b/webroot/rsrc/css/phui/phui-bulk-editor.css
index d7364b1d75..41ab2567e6 100644
--- a/webroot/rsrc/css/phui/phui-bulk-editor.css
+++ b/webroot/rsrc/css/phui/phui-bulk-editor.css
@@ -20,3 +20,8 @@
 .bulk-edit-input input {
   width: 100%;
 }
+
+.bulk-edit-input textarea {
+  width: 100%;
+  height: 8em;
+}
diff --git a/webroot/rsrc/js/phuix/PHUIXFormControl.js b/webroot/rsrc/js/phuix/PHUIXFormControl.js
index 0a9b8d45d7..cd67e89691 100644
--- a/webroot/rsrc/js/phuix/PHUIXFormControl.js
+++ b/webroot/rsrc/js/phuix/PHUIXFormControl.js
@@ -57,6 +57,9 @@ JX.install('PHUIXFormControl', {
         case 'text':
           input = this._newText(spec);
           break;
+        case 'remarkup':
+          input = this._newRemarkup(spec);
+          break;
         default:
           // TODO: Default or better error?
           JX.$E('Bad Input Type');
@@ -312,6 +315,28 @@ JX.install('PHUIXFormControl', {
       };
     },
 
+    _newRemarkup: function(spec) {
+      var attrs = {};
+
+      // We could imagine a world where this renders a full remarkup control
+      // with all the hint buttons and client behaviors, but today much of that
+      // behavior is defined server-side and thus this isn't a world we
+      // currently live in.
+
+      var node = JX.$N('textarea', attrs);
+      node.value = spec.value || '';
+
+      return {
+        node: node,
+        get: function() {
+          return node.value;
+        },
+        set: function(value) {
+          node.value = value;
+        }
+      };
+    },
+
     _newOptgroups: function(spec) {
       var value = spec.value || null;
 

From 0cad6021b6f4225487750c8808321f96f41a956e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 11 Jan 2018 10:58:10 -0800
Subject: [PATCH 357/865] Restore "Tags" and "Subscribers" edit capabilities to
 Maniphest bulk editor

Summary: Depends on D18867. Ref T13025. Fixes T8740. Rebuilds the tag/subscriber actions (add, remove, set) into the bulk editor.

Test Plan: Added, removed and set these values via bulk edit.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025, T8740

Differential Revision: https://secure.phabricator.com/D18868
---
 src/__phutil_library_map__.php                |  2 +
 ...PhabricatorProjectsEditEngineExtension.php | 20 +++++++++-
 ...icatorSubscriptionsEditEngineExtension.php | 20 +++++++++-
 .../bulk/PhabricatorEditEngineBulkJobType.php |  6 +++
 .../bulk/type/BulkTokenizerParameterType.php  | 40 +++++++++++++++++++
 .../editengine/PhabricatorEditEngine.php      |  2 +
 .../editfield/PhabricatorEditField.php        | 13 ++++++
 .../edittype/PhabricatorEdgeEditType.php      | 24 +++++++++++
 8 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 src/applications/transactions/bulk/type/BulkTokenizerParameterType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 8c1c941f34..8c24e33602 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -226,6 +226,7 @@
     'BulkRemarkupParameterType' => 'applications/transactions/bulk/type/BulkRemarkupParameterType.php',
     'BulkSelectParameterType' => 'applications/transactions/bulk/type/BulkSelectParameterType.php',
     'BulkStringParameterType' => 'applications/transactions/bulk/type/BulkStringParameterType.php',
+    'BulkTokenizerParameterType' => 'applications/transactions/bulk/type/BulkTokenizerParameterType.php',
     'CalendarTimeUtil' => 'applications/calendar/util/CalendarTimeUtil.php',
     'CalendarTimeUtilTestCase' => 'applications/calendar/__tests__/CalendarTimeUtilTestCase.php',
     'CelerityAPI' => 'applications/celerity/CelerityAPI.php',
@@ -5249,6 +5250,7 @@
     'BulkRemarkupParameterType' => 'BulkParameterType',
     'BulkSelectParameterType' => 'BulkParameterType',
     'BulkStringParameterType' => 'BulkParameterType',
+    'BulkTokenizerParameterType' => 'BulkParameterType',
     'CalendarTimeUtil' => 'Phobject',
     'CalendarTimeUtilTestCase' => 'PhabricatorTestCase',
     'CelerityAPI' => 'Phobject',
diff --git a/src/applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php
index 5daacd315c..a388a39a97 100644
--- a/src/applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php
+++ b/src/applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php
@@ -46,6 +46,8 @@ public function buildCustomEditFields(
       $project_phids = array();
     }
 
+    $viewer = $engine->getViewer();
+
     $projects_field = id(new PhabricatorProjectsEditField())
       ->setKey('projectPHIDs')
       ->setLabel(pht('Tags'))
@@ -58,9 +60,11 @@ public function buildCustomEditFields(
       ->setDescription(pht('Select project tags for the object.'))
       ->setTransactionType($edge_type)
       ->setMetadataValue('edge:type', $project_edge_type)
-      ->setValue($project_phids);
+      ->setValue($project_phids)
+      ->setViewer($viewer);
 
-    $projects_field->setViewer($engine->getViewer());
+    $projects_datasource = id(new PhabricatorProjectDatasource())
+      ->setViewer($viewer);
 
     $edit_add = $projects_field->getConduitEditType(self::EDITKEY_ADD)
       ->setConduitDescription(pht('Add project tags.'));
@@ -72,6 +76,18 @@ public function buildCustomEditFields(
     $edit_rem = $projects_field->getConduitEditType(self::EDITKEY_REMOVE)
       ->setConduitDescription(pht('Remove project tags.'));
 
+    $projects_field->getBulkEditType(self::EDITKEY_ADD)
+      ->setBulkEditLabel(pht('Add project tags'))
+      ->setDatasource($projects_datasource);
+
+    $projects_field->getBulkEditType(self::EDITKEY_SET)
+      ->setBulkEditLabel(pht('Set project tags to'))
+      ->setDatasource($projects_datasource);
+
+    $projects_field->getBulkEditType(self::EDITKEY_REMOVE)
+      ->setBulkEditLabel(pht('Remove project tags'))
+      ->setDatasource($projects_datasource);
+
     return array(
       $projects_field,
     );
diff --git a/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php
index c37933a938..67efd31f63 100644
--- a/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php
+++ b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php
@@ -42,6 +42,8 @@ public function buildCustomEditFields(
       $sub_phids = array();
     }
 
+    $viewer = $engine->getViewer();
+
     $subscribers_field = id(new PhabricatorSubscribersEditField())
       ->setKey(self::FIELDKEY)
       ->setLabel(pht('Subscribers'))
@@ -53,9 +55,11 @@ public function buildCustomEditFields(
       ->setCommentActionOrder(9000)
       ->setDescription(pht('Choose subscribers.'))
       ->setTransactionType($subscribers_type)
-      ->setValue($sub_phids);
+      ->setValue($sub_phids)
+      ->setViewer($viewer);
 
-    $subscribers_field->setViewer($engine->getViewer());
+    $subscriber_datasource = id(new PhabricatorMetaMTAMailableDatasource())
+      ->setViewer($viewer);
 
     $edit_add = $subscribers_field->getConduitEditType(self::EDITKEY_ADD)
       ->setConduitDescription(pht('Add subscribers.'));
@@ -67,6 +71,18 @@ public function buildCustomEditFields(
     $edit_rem = $subscribers_field->getConduitEditType(self::EDITKEY_REMOVE)
       ->setConduitDescription(pht('Remove subscribers.'));
 
+    $subscribers_field->getBulkEditType(self::EDITKEY_ADD)
+      ->setBulkEditLabel(pht('Add subscribers'))
+      ->setDatasource($subscriber_datasource);
+
+    $subscribers_field->getBulkEditType(self::EDITKEY_SET)
+      ->setBulkEditLabel(pht('Set subscribers to'))
+      ->setDatasource($subscriber_datasource);
+
+    $subscribers_field->getBulkEditType(self::EDITKEY_REMOVE)
+      ->setBulkEditLabel(pht('Remove subscribers'))
+      ->setDatasource($subscriber_datasource);
+
     return array(
       $subscribers_field,
     );
diff --git a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
index fae6765769..9728e2c5b5 100644
--- a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
+++ b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
@@ -82,6 +82,12 @@ private function buildTransactions($object, array $raw_xactions) {
         $xaction->attachComment($comment);
       }
 
+      if (isset($raw_xaction['metadata'])) {
+        foreach ($raw_xaction['metadata'] as $meta_key => $meta_value) {
+          $xaction->setMetadataValue($meta_key, $meta_value);
+        }
+      }
+
       $xactions[] = $xaction;
     }
 
diff --git a/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php b/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php
new file mode 100644
index 0000000000..0edc46c664
--- /dev/null
+++ b/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php
@@ -0,0 +1,40 @@
+<?php
+
+final class BulkTokenizerParameterType
+  extends BulkParameterType {
+
+  private $datasource;
+
+  public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
+    $this->datasource = $datasource;
+    return $this;
+  }
+
+  public function getDatasource() {
+    return $this->datasource;
+  }
+
+  public function getPHUIXControlType() {
+    return 'tokenizer';
+  }
+
+  public function getPHUIXControlSpecification() {
+    $template = new AphrontTokenizerTemplateView();
+    $template_markup = $template->render();
+
+    $datasource = $this->getDatasource();
+    $limit = null;
+
+    return array(
+      'markup' => (string)hsprintf('%s', $template_markup),
+      'config' => array(
+        'src' => $datasource->getDatasourceURI(),
+        'browseURI' => $datasource->getBrowseURI(),
+        'placeholder' => $datasource->getPlaceholderText(),
+        'limit' => $limit,
+      ),
+      'value' => null,
+    );
+  }
+
+}
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 7ae2e1ee05..63ccde3afd 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -2498,6 +2498,8 @@ final public function newRawBulkTransactions(array $xactions) {
       // but it's possible that this isn't the case.
       $xaction['type'] = $edit_type->getTransactionType();
 
+      $xaction['metadata'] = $edit_type->getMetadata();
+
       $xaction = $edit_type->newRawBulkTransaction($xaction);
       if ($xaction === null) {
         unset($xactions[$key]);
diff --git a/src/applications/transactions/editfield/PhabricatorEditField.php b/src/applications/transactions/editfield/PhabricatorEditField.php
index 01a70166c7..c0d0cdd8c8 100644
--- a/src/applications/transactions/editfield/PhabricatorEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorEditField.php
@@ -769,6 +769,19 @@ final public function getBulkEditTypes() {
     return $this->bulkEditTypes;
   }
 
+  final public function getBulkEditType($key) {
+    $edit_types = $this->getBulkEditTypes();
+
+    if (empty($edit_types[$key])) {
+      throw new Exception(
+        pht(
+          'This EditField does not provide a Bulk EditType with key "%s".',
+          $key));
+    }
+
+    return $edit_types[$key];
+  }
+
   protected function newBulkEditTypes() {
     $edit_type = $this->getEditType();
 
diff --git a/src/applications/transactions/edittype/PhabricatorEdgeEditType.php b/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
index 0c376423cd..c5a6777d48 100644
--- a/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
@@ -34,4 +34,28 @@ public function generateTransactions(
     return array($xaction);
   }
 
+  protected function newBulkParameterType() {
+    if (!$this->getDatasource()) {
+      return null;
+    }
+
+    return id(new BulkTokenizerParameterType())
+      ->setDatasource($this->getDatasource());
+  }
+
+
+  public function newRawBulkTransaction(array $xaction) {
+    $value = idx($xaction, 'value');
+
+    if ($this->getEdgeOperation() !== null) {
+      $value = array_fuse($value);
+      $value = array(
+        $this->getEdgeOperation() => $value,
+      );
+      $xaction['value'] = $value;
+    }
+
+    return $xaction;
+  }
+
 }

From 91a78db99b33dd01a9377b60ff364c6b11191e5b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 04:45:10 -0800
Subject: [PATCH 358/865] Support "Assign To" in Maniphest bulk editor

Summary:
Ref T13025. See PHI173. This supports the "Assign to" field in the new editor.

This is very slightly funky: to unassign tasks, you need to leave the field blank. I have half a diff to fix this, but the way the `none()` token works in the default datasource is odd so it needs a separate datasource. I'm punting on this for now since it works, at least, and isn't //completely// unreasonable.

This also simplifies some EditEngine stuff a little. Notably:

  - I reorganized EditType construction slightly so subclasses can copy/paste a little bit less.
  - EditType had `field` and `editField` properties which had the same values. I canonicalized on `editField` and made this value set a little more automatically.

Test Plan: Used bulk editor to reassign some tasks. By leaving the field blank, unassigned tasks.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18874
---
 .../maniphest/editor/ManiphestEditEngine.php  |  1 +
 .../editengine/PhabricatorEditEngine.php      |  2 -
 .../editfield/PhabricatorEditField.php        | 50 ++++++++-----------
 .../PhabricatorPHIDListEditField.php          |  6 +--
 .../PhabricatorTokenizerEditField.php         |  8 +++
 .../PhabricatorDatasourceEditType.php         | 16 ++++++
 .../edittype/PhabricatorEdgeEditType.php      |  1 -
 .../edittype/PhabricatorEditType.php          | 12 +----
 8 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php
index 71ae414de2..8df261dc4a 100644
--- a/src/applications/maniphest/editor/ManiphestEditEngine.php
+++ b/src/applications/maniphest/editor/ManiphestEditEngine.php
@@ -189,6 +189,7 @@ protected function buildCustomEditFields($object) {
         ->setKey('owner')
         ->setAliases(array('ownerPHID', 'assign', 'assigned'))
         ->setLabel(pht('Assigned To'))
+        ->setBulkEditLabel(pht('Assign to'))
         ->setDescription(pht('User who is responsible for the task.'))
         ->setConduitDescription(pht('Reassign the task.'))
         ->setConduitTypeDescription(
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 63ccde3afd..4a0d109590 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -2219,7 +2219,6 @@ private function getConduitEditTypesFromFields(array $fields) {
       }
 
       foreach ($field_types as $field_type) {
-        $field_type->setField($field);
         $types[$field_type->getEditType()] = $field_type;
       }
     }
@@ -2523,7 +2522,6 @@ private function getBulkEditTypesFromFields(array $fields) {
       }
 
       foreach ($field_types as $field_type) {
-        $field_type->setField($field);
         $types[$field_type->getEditType()] = $field_type;
       }
     }
diff --git a/src/applications/transactions/editfield/PhabricatorEditField.php b/src/applications/transactions/editfield/PhabricatorEditField.php
index c0d0cdd8c8..ad8b7372a5 100644
--- a/src/applications/transactions/editfield/PhabricatorEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorEditField.php
@@ -681,50 +681,49 @@ public function getEditTypeKey() {
   }
 
   protected function newEditType() {
-    $parameter_type = $this->getConduitParameterType();
-    if (!$parameter_type) {
-      return null;
-    }
-
-    $edit_type = id(new PhabricatorSimpleEditType())
-      ->setConduitParameterType($parameter_type);
-
-    $bulk_type = $this->getBulkParameterType();
-    if ($bulk_type) {
-      $edit_type->setBulkParameterType($bulk_type);
-    }
-
-    return $edit_type;
+    return new PhabricatorSimpleEditType();
   }
 
   protected function getEditType() {
     $transaction_type = $this->getTransactionType();
-
     if ($transaction_type === null) {
       return null;
     }
 
-    $type_key = $this->getEditTypeKey();
     $edit_type = $this->newEditType();
     if (!$edit_type) {
       return null;
     }
 
-    return $edit_type
-      ->setEditType($type_key)
+    $type_key = $this->getEditTypeKey();
+
+    $edit_type
+      ->setEditField($this)
       ->setTransactionType($transaction_type)
+      ->setEditType($type_key)
       ->setMetadata($this->getMetadata());
+
+    if (!$edit_type->getConduitParameterType()) {
+      $conduit_parameter = $this->getConduitParameterType();
+      if ($conduit_parameter) {
+        $edit_type->setConduitParameterType($conduit_parameter);
+      }
+    }
+
+    if (!$edit_type->getBulkParameterType()) {
+      $bulk_parameter = $this->getBulkParameterType();
+      if ($bulk_parameter) {
+        $edit_type->setBulkParameterType($bulk_parameter);
+      }
+    }
+
+    return $edit_type;
   }
 
   final public function getConduitEditTypes() {
     if ($this->conduitEditTypes === null) {
       $edit_types = $this->newConduitEditTypes();
       $edit_types = mpull($edit_types, null, 'getEditType');
-
-      foreach ($edit_types as $edit_type) {
-        $edit_type->setEditField($this);
-      }
-
       $this->conduitEditTypes = $edit_types;
     }
 
@@ -758,11 +757,6 @@ final public function getBulkEditTypes() {
     if ($this->bulkEditTypes === null) {
       $edit_types = $this->newBulkEditTypes();
       $edit_types = mpull($edit_types, null, 'getEditType');
-
-      foreach ($edit_types as $edit_type) {
-        $edit_type->setEditField($this);
-      }
-
       $this->bulkEditTypes = $edit_types;
     }
 
diff --git a/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php b/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
index e29206c8ba..b084c142e5 100644
--- a/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
@@ -98,10 +98,8 @@ protected function newEditType() {
       return new PhabricatorEdgeEditType();
     }
 
-    $type = new PhabricatorDatasourceEditType();
-    $type->setIsSingleValue($this->getIsSingleValue());
-    $type->setConduitParameterType($this->newConduitParameterType());
-    return $type;
+    return id(new PhabricatorDatasourceEditType())
+      ->setIsSingleValue($this->getIsSingleValue());
   }
 
   protected function newBulkEditTypes() {
diff --git a/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php b/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
index 237f315b51..d657213456 100644
--- a/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
@@ -56,4 +56,12 @@ protected function newCommentAction() {
     return $action;
   }
 
+  protected function newBulkParameterType() {
+    $datasource = $this->newDatasource()
+      ->setViewer($this->getViewer());
+
+    return id(new BulkTokenizerParameterType())
+      ->setDatasource($datasource);
+  }
+
 }
diff --git a/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php b/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php
index b6e1a5d7bb..dcb4f6f023 100644
--- a/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php
@@ -19,4 +19,20 @@ public function getValueDescription() {
     return '?';
   }
 
+  public function newRawBulkTransaction(array $xaction) {
+    $value = idx($xaction, 'value');
+
+    if ($this->getIsSingleValue()) {
+      if ($value) {
+        $value = head($value);
+      } else {
+        $value = null;
+      }
+
+      $xaction['value'] = $value;
+    }
+
+    return $xaction;
+  }
+
 }
diff --git a/src/applications/transactions/edittype/PhabricatorEdgeEditType.php b/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
index c5a6777d48..976ab3ec8e 100644
--- a/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
@@ -43,7 +43,6 @@ protected function newBulkParameterType() {
       ->setDatasource($this->getDatasource());
   }
 
-
   public function newRawBulkTransaction(array $xaction) {
     $value = idx($xaction, 'value');
 
diff --git a/src/applications/transactions/edittype/PhabricatorEditType.php b/src/applications/transactions/edittype/PhabricatorEditType.php
index 5c9a9dac92..127fe93e3a 100644
--- a/src/applications/transactions/edittype/PhabricatorEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEditType.php
@@ -6,7 +6,6 @@ abstract class PhabricatorEditType extends Phobject {
   private $editField;
   private $transactionType;
   private $label;
-  private $field;
   private $metadata = array();
 
   private $conduitDescription;
@@ -36,16 +35,7 @@ public function getBulkEditLabel() {
       return $this->bulkEditLabel;
     }
 
-    return $this->getField()->getBulkEditLabel();
-  }
-
-  public function setField(PhabricatorEditField $field) {
-    $this->field = $field;
-    return $this;
-  }
-
-  public function getField() {
-    return $this->field;
+    return $this->getEditField()->getBulkEditLabel();
   }
 
   public function setEditType($edit_type) {

From 1e51f1d0dc25fd7e1f5fd653272e95333f509607 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 05:49:44 -0800
Subject: [PATCH 359/865] Reuse more transaction construction code in bulk
 editor

Summary:
Ref T13025. Currently, the bulk editor takes an HTTP request and emits a list of "raw" transactions (simple dictionaries). This goes into the job queue, and the background job builds a real transaction.

However, the logic to turn an HTTP request into a raw transaction is ending up with some duplication, since we generally already have logic to turn an HTTP request into a full object.

Instead: build real objects first, then serialize them to dictionaries. Send those to the job queue, rebuild them into objects again, and we end up in the same spot with a little less code duplication.

Finally, delete the mostly-copied code.

Test Plan: Used bulk editor to add comments, projects, and rename tasks.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18875
---
 .../bulk/PhabricatorEditEngineBulkJobType.php |  8 +++--
 .../editengine/PhabricatorEditEngine.php      | 32 +++++++++++++------
 .../edittype/PhabricatorCommentEditType.php   | 11 -------
 .../PhabricatorDatasourceEditType.php         | 16 ----------
 .../edittype/PhabricatorEdgeEditType.php      | 14 --------
 .../edittype/PhabricatorEditType.php          |  5 ---
 6 files changed, 29 insertions(+), 57 deletions(-)

diff --git a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
index 9728e2c5b5..e7ff5d3414 100644
--- a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
+++ b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
@@ -72,8 +72,8 @@ private function buildTransactions($object, array $raw_xactions) {
       $xaction = $object->getApplicationTransactionTemplate()
         ->setTransactionType($raw_xaction['type']);
 
-      if (isset($raw_xaction['value'])) {
-        $xaction->setNewValue($raw_xaction['value']);
+      if (isset($raw_xaction['new'])) {
+        $xaction->setNewValue($raw_xaction['new']);
       }
 
       if (isset($raw_xaction['comment'])) {
@@ -88,6 +88,10 @@ private function buildTransactions($object, array $raw_xactions) {
         }
       }
 
+      if (array_key_exists('old', $raw_xaction)) {
+        $xaction->setOldValue($raw_xaction['old']);
+      }
+
       $xactions[] = $xaction;
     }
 
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 4a0d109590..2abc419895 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -2472,14 +2472,15 @@ final public function newRawBulkTransactions(array $xactions) {
     $fields = $this->buildEditFields($object);
 
     $edit_types = $this->getBulkEditTypesFromFields($fields);
+    $template = $object->getApplicationTransactionTemplate();
 
+    $raw_xactions = array();
     foreach ($xactions as $key => $xaction) {
       PhutilTypeSpec::checkMap(
         $xaction,
         array(
           'type' => 'string',
           'value' => 'optional wild',
-          'comment' => 'optional string',
         ));
 
       $type = $xaction['type'];
@@ -2497,18 +2498,31 @@ final public function newRawBulkTransactions(array $xactions) {
       // but it's possible that this isn't the case.
       $xaction['type'] = $edit_type->getTransactionType();
 
-      $xaction['metadata'] = $edit_type->getMetadata();
+      $xaction_objects = $edit_type->generateTransactions(
+        clone $template,
+        $xaction);
 
-      $xaction = $edit_type->newRawBulkTransaction($xaction);
-      if ($xaction === null) {
-        unset($xactions[$key]);
-        continue;
-      }
+      foreach ($xaction_objects as $xaction_object) {
+        $raw_xaction = array(
+          'type' => $xaction_object->getTransactionType(),
+          'metadata' => $xaction_object->getMetadata(),
+          'new' => $xaction_object->getNewValue(),
+        );
 
-      $xactions[$key] = $xaction;
+        if ($xaction_object->hasOldValue()) {
+          $raw_xaction['old'] = $xaction_object->getOldValue();
+        }
+
+        if ($xaction_object->hasComment()) {
+          $comment = $xaction_object->getComment();
+          $raw_xaction['comment'] = $comment->getContent();
+        }
+
+        $raw_xactions[] = $raw_xaction;
+      }
     }
 
-    return $xactions;
+    return $raw_xactions;
   }
 
   private function getBulkEditTypesFromFields(array $fields) {
diff --git a/src/applications/transactions/edittype/PhabricatorCommentEditType.php b/src/applications/transactions/edittype/PhabricatorCommentEditType.php
index 0bc82f7dc7..38194e4498 100644
--- a/src/applications/transactions/edittype/PhabricatorCommentEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorCommentEditType.php
@@ -10,17 +10,6 @@ protected function newBulkParameterType() {
     return new BulkRemarkupParameterType();
   }
 
-  public function newRawBulkTransaction(array $xaction) {
-    if (!strlen($xaction['value'])) {
-      return null;
-    }
-
-    $xaction['comment'] = $xaction['value'];
-    unset($xaction['value']);
-
-    return $xaction;
-  }
-
   public function generateTransactions(
     PhabricatorApplicationTransaction $template,
     array $spec) {
diff --git a/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php b/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php
index dcb4f6f023..b6e1a5d7bb 100644
--- a/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php
@@ -19,20 +19,4 @@ public function getValueDescription() {
     return '?';
   }
 
-  public function newRawBulkTransaction(array $xaction) {
-    $value = idx($xaction, 'value');
-
-    if ($this->getIsSingleValue()) {
-      if ($value) {
-        $value = head($value);
-      } else {
-        $value = null;
-      }
-
-      $xaction['value'] = $value;
-    }
-
-    return $xaction;
-  }
-
 }
diff --git a/src/applications/transactions/edittype/PhabricatorEdgeEditType.php b/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
index 976ab3ec8e..9398cfb9aa 100644
--- a/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
@@ -43,18 +43,4 @@ protected function newBulkParameterType() {
       ->setDatasource($this->getDatasource());
   }
 
-  public function newRawBulkTransaction(array $xaction) {
-    $value = idx($xaction, 'value');
-
-    if ($this->getEdgeOperation() !== null) {
-      $value = array_fuse($value);
-      $value = array(
-        $this->getEdgeOperation() => $value,
-      );
-      $xaction['value'] = $value;
-    }
-
-    return $xaction;
-  }
-
 }
diff --git a/src/applications/transactions/edittype/PhabricatorEditType.php b/src/applications/transactions/edittype/PhabricatorEditType.php
index 127fe93e3a..de9404866d 100644
--- a/src/applications/transactions/edittype/PhabricatorEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEditType.php
@@ -115,11 +115,6 @@ public function getBulkParameterType() {
   }
 
 
-  public function newRawBulkTransaction(array $xaction) {
-    return $xaction;
-  }
-
-
 /* -(  Conduit  )------------------------------------------------------------ */
 
 

From a26cf20dd128723a2d7016c8ccef24d6a00d0b09 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 06:15:52 -0800
Subject: [PATCH 360/865] Fix a bug with setting custom PHID list field values
 via Conduit and prepare for bulk edits

Summary:
Ref T13025. Custom field transactions work somewhat unusually: the values sometimes need to be encoded. We currently do not apply this encoding correctly via Conduit.

For example, setting some custom PHID field to `["PHID-X-Y"]` fails with a bunch of JSON errors.

Add an extra hook callback so that EditTypes can apply processing to transaction values, then apply the correct CustomField processing.

This only affects Conduit. In a future diff, this also allows bulk edit of custom fields to work correctly.

Test Plan: Added a custom field to Maniphest with a list of projects. Used Conduit to bulk edit it (which now works, but did not before). Used the web UI to bulk edit it.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18876
---
 .../editengine/PhabricatorEditEngine.php           | 14 ++++++++++----
 .../transactions/edittype/PhabricatorEditType.php  | 12 ++++++++++++
 .../editor/PhabricatorCustomFieldEditType.php      | 10 ++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 2abc419895..1d03896cb5 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -2169,6 +2169,8 @@ private function getConduitTransactions(
         ->setTransactionType(PhabricatorTransactions::TYPE_CREATE);
     }
 
+    $is_strict = $request->getIsStrictlyTyped();
+
     foreach ($xactions as $xaction) {
       $type = $types[$xaction['type']];
 
@@ -2179,10 +2181,10 @@ private function getConduitTransactions(
       $parameter_type->setViewer($viewer);
 
       try {
-        $xaction['value'] = $parameter_type->getValue(
-          $xaction,
-          'value',
-          $request->getIsStrictlyTyped());
+        $value = $xaction['value'];
+        $value = $parameter_type->getValue($xaction, 'value', $is_strict);
+        $value = $type->getTransactionValueFromConduit($value);
+        $xaction['value'] = $value;
       } catch (Exception $ex) {
         throw new PhutilProxyException(
           pht(
@@ -2498,6 +2500,10 @@ final public function newRawBulkTransactions(array $xactions) {
       // but it's possible that this isn't the case.
       $xaction['type'] = $edit_type->getTransactionType();
 
+      $value = $xaction['value'];
+      $value = $edit_type->getTransactionValueFromBulkEdit($value);
+      $xaction['value'] = $value;
+
       $xaction_objects = $edit_type->generateTransactions(
         clone $template,
         $xaction);
diff --git a/src/applications/transactions/edittype/PhabricatorEditType.php b/src/applications/transactions/edittype/PhabricatorEditType.php
index de9404866d..51eed77f89 100644
--- a/src/applications/transactions/edittype/PhabricatorEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEditType.php
@@ -91,6 +91,10 @@ public function getEditField() {
     return $this->editField;
   }
 
+  protected function getTransactionValueFromValue($value) {
+    return $value;
+  }
+
 
 /* -(  Bulk  )--------------------------------------------------------------- */
 
@@ -114,6 +118,10 @@ public function getBulkParameterType() {
     return $this->newBulkParameterType();
   }
 
+  public function getTransactionValueFromBulkEdit($value) {
+    return $this->getTransactionValueFromValue($value);
+  }
+
 
 /* -(  Conduit  )------------------------------------------------------------ */
 
@@ -192,4 +200,8 @@ public function getConduitDocumentation() {
     return $this->conduitDocumentation;
   }
 
+  public function getTransactionValueFromConduit($value) {
+    return $this->getTransactionValueFromValue($value);
+  }
+
 }
diff --git a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php
index 2f8008c699..88c8fe07a8 100644
--- a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php
+++ b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php
@@ -40,4 +40,14 @@ public function generateTransactions(
     return array($xaction);
   }
 
+  protected function getTransactionValueFromValue($value) {
+    $field = $this->getCustomField();
+
+    // Avoid changing the value of the field itself, since later calls would
+    // incorrectly reflect the new value.
+    $clone = clone $field;
+    $clone->setValueFromApplicationTransactions($value);
+    return $clone->getNewValueForApplicationTransactions();
+  }
+
 }

From b6737554e1ec955512434adcb482a6a2e87c6d1d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 05:42:54 -0800
Subject: [PATCH 361/865] Support tokenizer custom fields in bulk editor

Summary:
Ref T13025. This allows custom tokenizer fields, like a "Owning Group" field, to be edited with the bulk editor.

See PHI173 for some context.

Test Plan: Edited a custom "Owner" field (a project tokenizer) with the bulk editor.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18877
---
 .../PhabricatorCustomFieldEditField.php       | 30 ++++++++++++++-----
 .../field/PhabricatorCustomField.php          | 27 +++++++++++++++++
 ...habricatorStandardCustomFieldTokenizer.php |  7 +++++
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
index ffdb157d8e..1153f82a34 100644
--- a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
+++ b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
@@ -6,6 +6,7 @@ final class PhabricatorCustomFieldEditField
   private $customField;
   private $httpParameterType;
   private $conduitParameterType;
+  private $bulkParameterType;
 
   public function setCustomField(PhabricatorCustomField $custom_field) {
     $this->customField = $custom_field;
@@ -36,6 +37,16 @@ public function getCustomFieldConduitParameterType() {
     return $this->conduitParameterType;
   }
 
+  public function setCustomFieldBulkParameterType(
+    BulkParameterType $type) {
+    $this->bulkParameterType = $type;
+    return $this;
+  }
+
+  public function getCustomFieldBulkParameterType() {
+    return $this->bulkParameterType;
+  }
+
   protected function buildControl() {
     if ($this->getIsConduitOnly()) {
       return null;
@@ -51,15 +62,8 @@ protected function buildControl() {
   }
 
   protected function newEditType() {
-    $type = id(new PhabricatorCustomFieldEditType())
+    return id(new PhabricatorCustomFieldEditType())
       ->setCustomField($this->getCustomField());
-
-    $conduit_type = $this->newConduitParameterType();
-    if ($conduit_type) {
-      $type->setConduitParameterType($conduit_type);
-    }
-
-    return $type;
   }
 
   public function getValueForTransaction() {
@@ -116,6 +120,16 @@ protected function newConduitParameterType() {
     return null;
   }
 
+  protected function newBulkParameterType() {
+    $type = $this->getCustomFieldBulkParameterType();
+
+    if ($type) {
+      return clone $type;
+    }
+
+    return null;
+  }
+
   public function getAllReadValueFromRequestKeys() {
     $keys = array();
 
diff --git a/src/infrastructure/customfield/field/PhabricatorCustomField.php b/src/infrastructure/customfield/field/PhabricatorCustomField.php
index f7f4403402..c96f09f369 100644
--- a/src/infrastructure/customfield/field/PhabricatorCustomField.php
+++ b/src/infrastructure/customfield/field/PhabricatorCustomField.php
@@ -1119,6 +1119,11 @@ protected function newEditField() {
       $field->setCustomFieldConduitParameterType($conduit_type);
     }
 
+    $bulk_type = $this->getBulkParameterType();
+    if ($bulk_type) {
+      $field->setCustomFieldBulkParameterType($bulk_type);
+    }
+
     return $field;
   }
 
@@ -1133,16 +1138,38 @@ protected function newStandardEditField() {
       $conduit_only = false;
     }
 
+    $bulk_label = $this->getBulkEditLabel();
+
     return $this->newEditField()
       ->setKey($this->getFieldKey())
       ->setEditTypeKey($this->getModernFieldKey())
       ->setLabel($this->getFieldName())
+      ->setBulkEditLabel($bulk_label)
       ->setDescription($this->getFieldDescription())
       ->setTransactionType($this->getApplicationTransactionType())
       ->setIsConduitOnly($conduit_only)
       ->setValue($this->getNewValueForApplicationTransactions());
   }
 
+  protected function getBulkEditLabel() {
+    if ($this->proxy) {
+      return $this->proxy->getBulkEditLabel();
+    }
+
+    return pht('Set "%s" to', $this->getFieldName());
+  }
+
+  public function getBulkParameterType() {
+    return $this->newBulkParameterType();
+  }
+
+  protected function newBulkParameterType() {
+    if ($this->proxy) {
+      return $this->proxy->newBulkParameterType();
+    }
+    return null;
+  }
+
   protected function getHTTPParameterType() {
     if ($this->proxy) {
       return $this->proxy->getHTTPParameterType();
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
index 9cb19d029d..5c5f422375 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
@@ -65,6 +65,13 @@ protected function newConduitEditParameterType() {
     return new ConduitPHIDListParameterType();
   }
 
+  protected function newBulkParameterType() {
+    $datasource = $this->getDatasource();
+
+    return id(new BulkTokenizerParameterType())
+      ->setDatasource($datasource);
+  }
+
   public function shouldAppearInHeraldActions() {
     return true;
   }

From f8113aecdcbe76333cd73847fb8c3748556a886e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 06:52:59 -0800
Subject: [PATCH 362/865] Make bulk edit <select /> fields a little more
 natrual and set options for subtype transactions

Summary:
Ref T13025. This is some minor technical stuff: make the "select" bulk edit type a little more consistent with other types by passing data down instead of having it reach up the stack. This simplifies the implementation of a custom field "select" in a future change.

Also, provide an option list to the "select" edit field for object subtypes. This is only accessible via Conduit so it currently never actually renders anything in the UI, but with the bulk edit stuff we get some initialization order issues if we don't set anything. This will also make any future changes which expose subtypes more broadly more straightforward.

Test Plan:
  - Bulk edited "select" fields, like "Status" and "Priority".
  - No more fatal when trying to `getOptions()` internally on the subtype field.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18878
---
 .../transactions/bulk/type/BulkSelectParameterType.php   | 9 ++++++++-
 .../editfield/PhabricatorSelectEditField.php             | 3 ++-
 .../PhabricatorSubtypeEditEngineExtension.php            | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/applications/transactions/bulk/type/BulkSelectParameterType.php b/src/applications/transactions/bulk/type/BulkSelectParameterType.php
index d1cfc5125b..2f0ba863ef 100644
--- a/src/applications/transactions/bulk/type/BulkSelectParameterType.php
+++ b/src/applications/transactions/bulk/type/BulkSelectParameterType.php
@@ -3,8 +3,15 @@
 final class BulkSelectParameterType
   extends BulkParameterType {
 
+  private $options;
+
+  public function setOptions(array $options) {
+    $this->options = $options;
+    return $this;
+  }
+
   public function getOptions() {
-    return $this->getField()->getOptions();
+    return $this->options;
   }
 
   public function getPHUIXControlType() {
diff --git a/src/applications/transactions/editfield/PhabricatorSelectEditField.php b/src/applications/transactions/editfield/PhabricatorSelectEditField.php
index aacd67f5a8..7e98d84b2f 100644
--- a/src/applications/transactions/editfield/PhabricatorSelectEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorSelectEditField.php
@@ -55,7 +55,8 @@ protected function newConduitParameterType() {
   }
 
   protected function newBulkParameterType() {
-    return new BulkSelectParameterType();
+    return id(new BulkSelectParameterType())
+      ->setOptions($this->getOptions());
   }
 
   private function getCanonicalValue($value) {
diff --git a/src/applications/transactions/engineextension/PhabricatorSubtypeEditEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorSubtypeEditEngineExtension.php
index a47a4d1b55..260c0d2acf 100644
--- a/src/applications/transactions/engineextension/PhabricatorSubtypeEditEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorSubtypeEditEngineExtension.php
@@ -30,6 +30,9 @@ public function buildCustomEditFields(
 
     $subtype_type = PhabricatorTransactions::TYPE_SUBTYPE;
 
+    $map = $object->newEditEngineSubtypeMap();
+    $options = mpull($map, 'getName');
+
     $subtype_field = id(new PhabricatorSelectEditField())
       ->setKey(self::EDITKEY)
       ->setLabel(pht('Subtype'))
@@ -41,7 +44,8 @@ public function buildCustomEditFields(
       ->setTransactionType($subtype_type)
       ->setConduitDescription(pht('Change the object subtype.'))
       ->setConduitTypeDescription(pht('New object subtype key.'))
-      ->setValue($object->getEditEngineSubtype());
+      ->setValue($object->getEditEngineSubtype())
+      ->setOptions($options);
 
     return array(
       $subtype_field,

From ae1b07bcfb437a5ee190775371c555758abcb15d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 06:54:08 -0800
Subject: [PATCH 363/865] Support "<select />" custom fields in bulk editor

Summary: Ref T13025. Fixes T5689. A straightforward change!

Test Plan: Used the bulk editor to modify a custom "select" field like the one in T5689.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025, T5689

Differential Revision: https://secure.phabricator.com/D18879
---
 .../standard/PhabricatorStandardCustomFieldSelect.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
index db84fc82e8..036b7301a1 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
@@ -148,4 +148,9 @@ protected function newConduitEditParameterType() {
     return new ConduitStringParameterType();
   }
 
+  protected function newBulkParameterType() {
+    return id(new BulkSelectParameterType())
+      ->setOptions($this->getOptions());
+  }
+
 }

From 7a431813373a4a5f1b1ab15179f800266b78ff05 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 07:32:28 -0800
Subject: [PATCH 364/865] Organize bulk edit actions into nice groups

Summary: Ref T13025. We're getting kind of a lot of actions, so put them in nice groups so they're easier to work with.

Test Plan: {F5386038}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18880
---
 resources/celerity/map.php                    | 21 +++---
 src/__phutil_library_map__.php                |  2 +
 .../view/ManiphestTaskResultListView.php      |  2 +-
 .../bulk/PhabricatorBulkEditGroup.php         | 27 +++++++
 .../bulk/PhabricatorBulkEngine.php            | 26 +++++++
 .../editengine/PhabricatorEditEngine.php      | 75 +++++++++++++++++++
 .../editfield/PhabricatorEditField.php        | 10 +++
 .../edittype/PhabricatorEditType.php          | 14 ++++
 .../PhabricatorCommentEditEngineExtension.php |  9 +++
 .../PhabricatorEditEngineExtension.php        |  4 +
 ...bricatorCustomFieldEditEngineExtension.php | 13 ++++
 webroot/rsrc/js/core/behavior-bulk-editor.js  |  9 +--
 12 files changed, 194 insertions(+), 18 deletions(-)
 create mode 100644 src/applications/transactions/bulk/PhabricatorBulkEditGroup.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 61516212d3..f671233f69 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -476,7 +476,7 @@
     'rsrc/js/core/behavior-audio-source.js' => '59b251eb',
     'rsrc/js/core/behavior-autofocus.js' => '7319e029',
     'rsrc/js/core/behavior-badge-view.js' => '8ff5e24c',
-    'rsrc/js/core/behavior-bulk-editor.js' => '5e178556',
+    'rsrc/js/core/behavior-bulk-editor.js' => '66a6def1',
     'rsrc/js/core/behavior-choose-control.js' => '327a00d1',
     'rsrc/js/core/behavior-copy.js' => 'b0b8f86d',
     'rsrc/js/core/behavior-detect-timezone.js' => '4c193c96',
@@ -595,7 +595,7 @@
     'javelin-behavior-audio-source' => '59b251eb',
     'javelin-behavior-audit-preview' => 'd835b03a',
     'javelin-behavior-badge-view' => '8ff5e24c',
-    'javelin-behavior-bulk-editor' => '5e178556',
+    'javelin-behavior-bulk-editor' => '66a6def1',
     'javelin-behavior-bulk-job-reload' => 'edf8a145',
     'javelin-behavior-calendar-month-view' => 'fe33e256',
     'javelin-behavior-choose-control' => '327a00d1',
@@ -1391,15 +1391,6 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
-    '5e178556' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'phabricator-prefab',
-      'multirow-row-manager',
-      'javelin-json',
-      'phuix-form-control-view',
-    ),
     '5e2634b9' => array(
       'javelin-behavior',
       'javelin-aphlict',
@@ -1436,6 +1427,14 @@
       'javelin-workflow',
       'javelin-dom',
     ),
+    '66a6def1' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'multirow-row-manager',
+      'javelin-json',
+      'phuix-form-control-view',
+    ),
     '680ea2c8' => array(
       'javelin-install',
       'javelin-dom',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 8c24e33602..4d143d0d44 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2203,6 +2203,7 @@
     'PhabricatorBuiltinFileCachePurger' => 'applications/cache/purger/PhabricatorBuiltinFileCachePurger.php',
     'PhabricatorBuiltinPatchList' => 'infrastructure/storage/patch/PhabricatorBuiltinPatchList.php',
     'PhabricatorBulkContentSource' => 'infrastructure/daemon/contentsource/PhabricatorBulkContentSource.php',
+    'PhabricatorBulkEditGroup' => 'applications/transactions/bulk/PhabricatorBulkEditGroup.php',
     'PhabricatorBulkEngine' => 'applications/transactions/bulk/PhabricatorBulkEngine.php',
     'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
     'PhabricatorCacheEngine' => 'applications/system/engine/PhabricatorCacheEngine.php',
@@ -7499,6 +7500,7 @@
     'PhabricatorBuiltinFileCachePurger' => 'PhabricatorCachePurger',
     'PhabricatorBuiltinPatchList' => 'PhabricatorSQLPatchList',
     'PhabricatorBulkContentSource' => 'PhabricatorContentSource',
+    'PhabricatorBulkEditGroup' => 'Phobject',
     'PhabricatorBulkEngine' => 'Phobject',
     'PhabricatorCacheDAO' => 'PhabricatorLiskDAO',
     'PhabricatorCacheEngine' => 'Phobject',
diff --git a/src/applications/maniphest/view/ManiphestTaskResultListView.php b/src/applications/maniphest/view/ManiphestTaskResultListView.php
index 2203db8bfc..b4cf9a544c 100644
--- a/src/applications/maniphest/view/ManiphestTaskResultListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskResultListView.php
@@ -218,7 +218,7 @@ private function renderBatchEditor(PhabricatorSavedQuery $saved_query) {
         'disabled'    => 'disabled',
         'class'       => 'disabled',
       ),
-      pht("Batch Edit Selected \xC2\xBB"));
+      pht("Bulk Edit Selected \xC2\xBB"));
 
     $export = javelin_tag(
       'a',
diff --git a/src/applications/transactions/bulk/PhabricatorBulkEditGroup.php b/src/applications/transactions/bulk/PhabricatorBulkEditGroup.php
new file mode 100644
index 0000000000..c650ec222e
--- /dev/null
+++ b/src/applications/transactions/bulk/PhabricatorBulkEditGroup.php
@@ -0,0 +1,27 @@
+<?php
+
+final class PhabricatorBulkEditGroup
+  extends Phobject {
+
+  private $key;
+  private $label;
+
+  public function setKey($key) {
+    $this->key = $key;
+    return $this;
+  }
+
+  public function getKey() {
+    return $this->key;
+  }
+
+  public function setLabel($label) {
+    $this->label = $label;
+    return $this;
+  }
+
+  public function getLabel() {
+    return $this->label;
+  }
+
+}
diff --git a/src/applications/transactions/bulk/PhabricatorBulkEngine.php b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
index f3cbeac9e1..642cd02a71 100644
--- a/src/applications/transactions/bulk/PhabricatorBulkEngine.php
+++ b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
@@ -299,6 +299,29 @@ private function newBulkActionForm() {
       ->setViewer($viewer);
 
     $edit_map = $edit_engine->newBulkEditMap();
+    $groups = $edit_engine->newBulkEditGroupMap();
+
+    $spec = array();
+    $option_groups = igroup($edit_map, 'group');
+    foreach ($groups as $group_key => $group) {
+      $options = idx($option_groups, $group_key, array());
+      if (!$options) {
+        continue;
+      }
+
+      $option_map = array();
+      foreach ($options as $option) {
+        $option_map[] = array(
+          'key' => $option['xaction'],
+          'label' => $option['label'],
+        );
+      }
+
+      $spec[] = array(
+        'label' => $group->getLabel(),
+        'options' => $option_map,
+      );
+    }
 
     require_celerity_resource('phui-bulk-editor-css');
 
@@ -308,6 +331,9 @@ private function newBulkActionForm() {
         'rootNodeID' => $this->getRootFormID(),
         'inputNodeID' => $input_id,
         'edits' => $edit_map,
+        'optgroups' => array(
+          'groups' => $spec,
+        ),
       ));
 
     $cancel_uri = $this->getCancelURI();
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 1d03896cb5..ea3b987568 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -181,6 +181,11 @@ final protected function buildEditFields($object) {
         $field
           ->setViewer($viewer)
           ->setObject($object);
+
+        $group_key = $field->getBulkEditGroupKey();
+        if ($group_key === null) {
+          $field->setBulkEditGroupKey('extension');
+        }
       }
 
       $extension_fields = mpull($extension_fields, null, 'getKey');
@@ -2424,6 +2429,60 @@ protected function didApplyTransactions($object, array $xactions) {
 
 /* -(  Bulk Edits  )--------------------------------------------------------- */
 
+  final public function newBulkEditGroupMap() {
+    $groups = $this->newBulkEditGroups();
+
+    $map = array();
+    foreach ($groups as $group) {
+      $key = $group->getKey();
+
+      if (isset($map[$key])) {
+        throw new Exception(
+          pht(
+            'Two bulk edit groups have the same key ("%s"). Each bulk edit '.
+            'group must have a unique key.',
+            $key));
+      }
+
+      $map[$key] = $group;
+    }
+
+    if ($this->isEngineExtensible()) {
+      $extensions = PhabricatorEditEngineExtension::getAllEnabledExtensions();
+    } else {
+      $extensions = array();
+    }
+
+    foreach ($extensions as $extension) {
+      $extension_groups = $extension->newBulkEditGroups($this);
+      foreach ($extension_groups as $group) {
+        $key = $group->getKey();
+
+        if (isset($map[$key])) {
+          throw new Exception(
+            pht(
+              'Extension "%s" defines a bulk edit group with the same key '.
+              '("%s") as the main editor or another extension. Each bulk '.
+              'edit group must have a unique key.'));
+        }
+
+        $map[$key] = $group;
+      }
+    }
+
+    return $map;
+  }
+
+  protected function newBulkEditGroups() {
+    return array(
+      id(new PhabricatorBulkEditGroup())
+        ->setKey('default')
+        ->setLabel(pht('Primary Fields')),
+      id(new PhabricatorBulkEditGroup())
+        ->setKey('extension')
+        ->setLabel(pht('Support Applications')),
+    );
+  }
 
   final public function newBulkEditMap() {
     $config = $this->loadDefaultConfiguration();
@@ -2434,6 +2493,7 @@ final public function newBulkEditMap() {
 
     $object = $this->newEditableObject();
     $fields = $this->buildEditFields($object);
+    $groups = $this->newBulkEditGroupMap();
 
     $edit_types = $this->getBulkEditTypesFromFields($fields);
 
@@ -2449,9 +2509,24 @@ final public function newBulkEditMap() {
         continue;
       }
 
+      $group_key = $type->getBulkEditGroupKey();
+      if (!$group_key) {
+        $group_key = 'default';
+      }
+
+      if (!isset($groups[$group_key])) {
+        throw new Exception(
+          pht(
+            'Field "%s" has a bulk edit group key ("%s") with no '.
+            'corresponding bulk edit group.',
+            $key,
+            $group_key));
+      }
+
       $map[] = array(
         'label' => $bulk_label,
         'xaction' => $key,
+        'group' => $group_key,
         'control' => array(
           'type' => $bulk_type->getPHUIXControlType(),
           'spec' => (object)$bulk_type->getPHUIXControlSpecification(),
diff --git a/src/applications/transactions/editfield/PhabricatorEditField.php b/src/applications/transactions/editfield/PhabricatorEditField.php
index ad8b7372a5..94c95a5052 100644
--- a/src/applications/transactions/editfield/PhabricatorEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorEditField.php
@@ -18,6 +18,7 @@ abstract class PhabricatorEditField extends Phobject {
   private $controlID;
   private $controlInstructions;
   private $bulkEditLabel;
+  private $bulkEditGroupKey;
 
   private $description;
   private $conduitDescription;
@@ -75,6 +76,15 @@ public function getBulkEditLabel() {
     return $this->bulkEditLabel;
   }
 
+  public function setBulkEditGroupKey($key) {
+    $this->bulkEditGroupKey = $key;
+    return $this;
+  }
+
+  public function getBulkEditGroupKey() {
+    return $this->bulkEditGroupKey;
+  }
+
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
diff --git a/src/applications/transactions/edittype/PhabricatorEditType.php b/src/applications/transactions/edittype/PhabricatorEditType.php
index 51eed77f89..95fa5bf3c7 100644
--- a/src/applications/transactions/edittype/PhabricatorEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorEditType.php
@@ -15,6 +15,7 @@ abstract class PhabricatorEditType extends Phobject {
 
   private $bulkParameterType;
   private $bulkEditLabel;
+  private $bulkEditGroupKey;
 
   public function setLabel($label) {
     $this->label = $label;
@@ -38,6 +39,19 @@ public function getBulkEditLabel() {
     return $this->getEditField()->getBulkEditLabel();
   }
 
+  public function setBulkEditGroupKey($key) {
+    $this->bulkEditGroupKey = $key;
+    return $this;
+  }
+
+  public function getBulkEditGroupKey() {
+    if ($this->bulkEditGroupKey !== null) {
+      return $this->bulkEditGroupKey;
+    }
+
+    return $this->getEditField()->getBulkEditGroupKey();
+  }
+
   public function setEditType($edit_type) {
     $this->editType = $edit_type;
     return $this;
diff --git a/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
index 9eb5fbf827..c5da130b68 100644
--- a/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
@@ -33,6 +33,14 @@ public function supportsObject(
     return (bool)$comment;
   }
 
+  public function newBulkEditGroups(PhabricatorEditEngine $engine) {
+    return array(
+      id(new PhabricatorBulkEditGroup())
+        ->setKey('comments')
+        ->setLabel(pht('Comments')),
+    );
+  }
+
   public function buildCustomEditFields(
     PhabricatorEditEngine $engine,
     PhabricatorApplicationTransactionInterface $object) {
@@ -47,6 +55,7 @@ public function buildCustomEditFields(
       ->setKey(self::EDITKEY)
       ->setLabel(pht('Comments'))
       ->setBulkEditLabel(pht('Add comment'))
+      ->setBulkEditGroupKey('comments')
       ->setAliases(array('comments'))
       ->setIsHidden(true)
       ->setIsReorderable(false)
diff --git a/src/applications/transactions/engineextension/PhabricatorEditEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorEditEngineExtension.php
index 9a799d4e5b..f2f22b158b 100644
--- a/src/applications/transactions/engineextension/PhabricatorEditEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorEditEngineExtension.php
@@ -32,6 +32,10 @@ abstract public function buildCustomEditFields(
     PhabricatorEditEngine $engine,
     PhabricatorApplicationTransactionInterface $object);
 
+  public function newBulkEditGroups(PhabricatorEditEngine $engine) {
+    return array();
+  }
+
   final public static function getAllExtensions() {
     return id(new PhutilClassMapQuery())
       ->setAncestorClass(__CLASS__)
diff --git a/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php
index 3edc898cb7..cec665a037 100644
--- a/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php
+++ b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php
@@ -23,6 +23,14 @@ public function supportsObject(
     return ($object instanceof PhabricatorCustomFieldInterface);
   }
 
+  public function newBulkEditGroups(PhabricatorEditEngine $engine) {
+    return array(
+      id(new PhabricatorBulkEditGroup())
+        ->setKey('custom')
+        ->setLabel(pht('Custom Fields')),
+    );
+  }
+
   public function buildCustomEditFields(
     PhabricatorEditEngine $engine,
     PhabricatorApplicationTransactionInterface $object) {
@@ -43,6 +51,11 @@ public function buildCustomEditFields(
     foreach ($field_list->getFields() as $field) {
       $edit_fields = $field->getEditEngineFields($engine);
       foreach ($edit_fields as $edit_field) {
+        $group_key = $edit_field->getBulkEditGroupKey();
+        if ($group_key === null) {
+          $edit_field->setBulkEditGroupKey('custom');
+        }
+
         $results[] = $edit_field;
       }
     }
diff --git a/webroot/rsrc/js/core/behavior-bulk-editor.js b/webroot/rsrc/js/core/behavior-bulk-editor.js
index 1e6e60e94e..79e1c2714e 100644
--- a/webroot/rsrc/js/core/behavior-bulk-editor.js
+++ b/webroot/rsrc/js/core/behavior-bulk-editor.js
@@ -3,7 +3,6 @@
  * @requires javelin-behavior
  *           javelin-dom
  *           javelin-util
- *           phabricator-prefab
  *           multirow-row-manager
  *           javelin-json
  *           phuix-form-control-view
@@ -31,11 +30,9 @@ JX.behavior('bulk-editor', function(config) {
   }
 
   function renderRow() {
-    var action_select = JX.Prefab.renderSelect(
-      option_map,
-      null,
-      null,
-      option_order);
+    var action_select = new JX.PHUIXFormControl()
+      .setControl('optgroups', config.optgroups)
+      .getRawInputNode();
 
     var cell = JX.$N('td', {className: 'bulk-edit-input'});
     var vfunc = null;

From 8a5def8e0ae1bb22064a6a457b37f24e4b7c503f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 07:44:44 -0800
Subject: [PATCH 365/865] Remove legacy transaction editor "getDisableEmail()"
 method

Summary:
Ref T13042. This is a very, very old policy-violating option from yesteryear which supported build systems publishing updates by adding comments to revisions, without sending email about it.

Harbormaster has served this role for a long time and this is policy-violating in the general case (it allows attackers to act in secret).

Test Plan: Grepped for affected symbols.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13042

Differential Revision: https://secure.phabricator.com/D18881
---
 ...ferentialCreateCommentConduitAPIMethod.php |  4 ++-
 ...habricatorApplicationTransactionEditor.php | 31 +++----------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
index 21b055a1e4..657237c718 100644
--- a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
@@ -106,9 +106,11 @@ protected function execute(ConduitAPIRequest $request) {
       }
     }
 
+    // NOTE: The legacy "silent" flag is now ignored and has no effect. See
+    // T13042.
+
     $editor = id(new DifferentialTransactionEditor())
       ->setActor($viewer)
-      ->setDisableEmail($request->getValue('silent'))
       ->setContentSource($request->newContentSource())
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true);
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index c08451624d..b4ad4365a7 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -59,7 +59,6 @@ abstract class PhabricatorApplicationTransactionEditor
   private $isHeraldEditor;
   private $isInverseEdgeEditor;
   private $actingAsPHID;
-  private $disableEmail;
 
   private $heraldEmailPHIDs = array();
   private $heraldForcedEmailPHIDs = array();
@@ -206,21 +205,6 @@ public function getIsHeraldEditor() {
     return $this->isHeraldEditor;
   }
 
-  /**
-   * Prevent this editor from generating email when applying transactions.
-   *
-   * @param bool  True to disable email.
-   * @return this
-   */
-  public function setDisableEmail($disable_email) {
-    $this->disableEmail = $disable_email;
-    return $this;
-  }
-
-  public function getDisableEmail() {
-    return $this->disableEmail;
-  }
-
   public function setUnmentionablePHIDMap(array $map) {
     $this->unmentionablePHIDMap = $map;
     return $this;
@@ -1152,11 +1136,9 @@ final public function applyTransactions(
     // Editors need to pass into workers.
     $object = $this->willPublish($object, $xactions);
 
-    if (!$this->getDisableEmail()) {
-      if ($this->shouldSendMail($object, $xactions)) {
-        $this->mailToPHIDs = $this->getMailTo($object);
-        $this->mailCCPHIDs = $this->getMailCC($object);
-      }
+    if ($this->shouldSendMail($object, $xactions)) {
+      $this->mailToPHIDs = $this->getMailTo($object);
+      $this->mailCCPHIDs = $this->getMailCC($object);
     }
 
     if ($this->shouldPublishFeedStory($object, $xactions)) {
@@ -1204,10 +1186,8 @@ public function publishTransactions(
     $this->object = $object;
 
     $messages = array();
-    if (!$this->getDisableEmail()) {
-      if ($this->shouldSendMail($object, $xactions)) {
-        $messages = $this->buildMail($object, $xactions);
-      }
+    if ($this->shouldSendMail($object, $xactions)) {
+      $messages = $this->buildMail($object, $xactions);
     }
 
     if ($this->supportsSearch()) {
@@ -3504,7 +3484,6 @@ protected function loadCustomWorkerState(array $state) {
   private function getAutomaticStateProperties() {
     return array(
       'parentMessageID',
-      'disableEmail',
       'isNewObject',
       'heraldEmailPHIDs',
       'heraldForcedEmailPHIDs',

From 8b12fa6d6ed0abfe5e40a278f832957731e332f3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 07:59:35 -0800
Subject: [PATCH 366/865] Prepare TransactionEditor for silent transactions via
 bulk edit

Summary:
Ref T13042. This adds a "silent" edit mechanism which suppresses feed stories, email, and notifications.

The other behaviors here are:

  - The transactions are marked as "silent" so we can render a hint in the UI in the future to make it clear to users that they aren't missing email.
  - If the editor uses Herald, mail rules are suppressed so they don't fire incorrectly (this mostly affects "the first time this rule matches, send me an email" rules: without this, they'd match "the first time" on the bulk edit, not send email, then never match again since they already matched).
  - If the edit queues additional edits, those are applied silently too.

This doesn't (or, at least, shouldn't) actually change any behavior since you can't apply silent edits yet.

Test Plan:
Somewhat theoretical, since this isn't reachable yet. Should get meaningful testing in an upcoming change.

Did a bit of var_dump() / debug poking to attempt to verify that nothing too crazy is happening.

Viewed and edited objects, no changes in behavior.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13042

Differential Revision: https://secure.phabricator.com/D18882
---
 src/__phutil_library_map__.php                |  2 +
 .../herald/state/HeraldCoreStateReasons.php   | 18 +++++++
 ...habricatorApplicationTransactionEditor.php | 54 +++++++++++++++----
 .../PhabricatorApplicationTransaction.php     | 14 +++++
 .../PhabricatorApplicationTransactionView.php |  3 +-
 src/view/phui/PHUITimelineEventView.php       | 10 ++++
 6 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 src/applications/herald/state/HeraldCoreStateReasons.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4d143d0d44..108c73b044 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1356,6 +1356,7 @@
     'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
     'HeraldContentSourceField' => 'applications/herald/field/HeraldContentSourceField.php',
     'HeraldController' => 'applications/herald/controller/HeraldController.php',
+    'HeraldCoreStateReasons' => 'applications/herald/state/HeraldCoreStateReasons.php',
     'HeraldDAO' => 'applications/herald/storage/HeraldDAO.php',
     'HeraldDifferentialAdapter' => 'applications/differential/herald/HeraldDifferentialAdapter.php',
     'HeraldDifferentialDiffAdapter' => 'applications/differential/herald/HeraldDifferentialDiffAdapter.php',
@@ -6529,6 +6530,7 @@
     'HeraldConditionTranscript' => 'Phobject',
     'HeraldContentSourceField' => 'HeraldField',
     'HeraldController' => 'PhabricatorController',
+    'HeraldCoreStateReasons' => 'HeraldStateReasons',
     'HeraldDAO' => 'PhabricatorLiskDAO',
     'HeraldDifferentialAdapter' => 'HeraldAdapter',
     'HeraldDifferentialDiffAdapter' => 'HeraldDifferentialAdapter',
diff --git a/src/applications/herald/state/HeraldCoreStateReasons.php b/src/applications/herald/state/HeraldCoreStateReasons.php
new file mode 100644
index 0000000000..7a033ff51e
--- /dev/null
+++ b/src/applications/herald/state/HeraldCoreStateReasons.php
@@ -0,0 +1,18 @@
+<?php
+
+final class HeraldCoreStateReasons
+  extends HeraldStateReasons {
+
+  const REASON_SILENT = 'core.silent';
+
+  public function explainReason($reason) {
+    $reasons = array(
+      self::REASON_SILENT => pht(
+        'This change applied silently, so mail and other notifications '.
+        'will not be sent.'),
+    );
+
+    return idx($reasons, $reason);
+  }
+
+}
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index b4ad4365a7..829e3ab43d 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -68,7 +68,9 @@ abstract class PhabricatorApplicationTransactionEditor
   private $feedNotifyPHIDs = array();
   private $feedRelatedPHIDs = array();
   private $feedShouldPublish = false;
+  private $mailShouldSend = false;
   private $modularTypes;
+  private $silent;
 
   private $transactionQueue = array();
 
@@ -187,6 +189,15 @@ public function getIsPreview() {
     return $this->isPreview;
   }
 
+  public function setIsSilent($silent) {
+    $this->silent = $silent;
+    return $this;
+  }
+
+  public function getIsSilent() {
+    return $this->silent;
+  }
+
   public function setIsInverseEdgeEditor($is_inverse_edge_editor) {
     $this->isInverseEdgeEditor = $is_inverse_edge_editor;
     return $this;
@@ -790,6 +801,10 @@ protected function populateTransaction(
       $xaction->setObjectPHID($object->getPHID());
     }
 
+    if ($this->getIsSilent()) {
+      $xaction->setIsSilentTransaction(true);
+    }
+
     return $xaction;
   }
 
@@ -1136,15 +1151,22 @@ final public function applyTransactions(
     // Editors need to pass into workers.
     $object = $this->willPublish($object, $xactions);
 
-    if ($this->shouldSendMail($object, $xactions)) {
-      $this->mailToPHIDs = $this->getMailTo($object);
-      $this->mailCCPHIDs = $this->getMailCC($object);
-    }
+    if (!$this->getIsSilent()) {
+      if ($this->shouldSendMail($object, $xactions)) {
+        $this->mailShouldSend = true;
+        $this->mailToPHIDs = $this->getMailTo($object);
+        $this->mailCCPHIDs = $this->getMailCC($object);
+      }
 
-    if ($this->shouldPublishFeedStory($object, $xactions)) {
-      $this->feedShouldPublish = true;
-      $this->feedRelatedPHIDs = $this->getFeedRelatedPHIDs($object, $xactions);
-      $this->feedNotifyPHIDs = $this->getFeedNotifyPHIDs($object, $xactions);
+      if ($this->shouldPublishFeedStory($object, $xactions)) {
+        $this->feedShouldPublish = true;
+        $this->feedRelatedPHIDs = $this->getFeedRelatedPHIDs(
+          $object,
+          $xactions);
+        $this->feedNotifyPHIDs = $this->getFeedNotifyPHIDs(
+          $object,
+          $xactions);
+      }
     }
 
     PhabricatorWorker::scheduleTask(
@@ -1186,7 +1208,7 @@ public function publishTransactions(
     $this->object = $object;
 
     $messages = array();
-    if ($this->shouldSendMail($object, $xactions)) {
+    if ($this->mailShouldSend) {
       $messages = $this->buildMail($object, $xactions);
     }
 
@@ -3138,6 +3160,16 @@ private function applyHeraldRules(
       $adapter->setApplicationEmail($this->getApplicationEmail());
     }
 
+    // If this editor is operating in silent mode, tell Herald that we aren't
+    // going to send any mail. This allows it to skip "the first time this
+    // rule matches, send me an email" rules which would otherwise match even
+    // though we aren't going to send any mail.
+    if ($this->getIsSilent()) {
+      $adapter->setForbiddenAction(
+        HeraldMailableState::STATECONST,
+        HeraldCoreStateReasons::REASON_SILENT);
+    }
+
     $xscript = HeraldEngine::loadAndApplyRules($adapter);
 
     $this->setHeraldAdapter($adapter);
@@ -3493,6 +3525,7 @@ private function getAutomaticStateProperties() {
       'feedNotifyPHIDs',
       'feedRelatedPHIDs',
       'feedShouldPublish',
+      'mailShouldSend',
     );
   }
 
@@ -3875,7 +3908,8 @@ private function newQueueEditor() {
       ->setActor($this->getActor())
       ->setContentSource($this->getContentSource())
       ->setContinueOnNoEffect($this->getContinueOnNoEffect())
-      ->setContinueOnMissingFields($this->getContinueOnMissingFields());
+      ->setContinueOnMissingFields($this->getContinueOnMissingFields())
+      ->setIsSilent($this->getIsSilent());
 
     if ($this->actingAsPHID !== null) {
       $editor->setActingAsPHID($this->actingAsPHID);
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index bf3c616df9..d49c3bf675 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -158,6 +158,14 @@ public function getIsDefaultTransaction() {
     return (bool)$this->getMetadataValue('core.default', false);
   }
 
+  public function setIsSilentTransaction($silent) {
+    return $this->setMetadataValue('core.silent', $silent);
+  }
+
+  public function getIsSilentTransaction() {
+    return (bool)$this->getMetadataValue('core.silent', false);
+  }
+
   public function attachComment(
     PhabricatorApplicationTransactionComment $comment) {
     $this->comment = $comment;
@@ -1515,6 +1523,12 @@ public function shouldDisplayGroupWith(array $group) {
       if ($apart > (60 * 2)) {
         return false;
       }
+
+      // Don't group silent and nonsilent transactions together.
+      $is_silent = $this->getIsSilentTransaction();
+      if ($is_silent != $xaction->getIsSilentTransaction()) {
+        return false;
+      }
     }
 
     return true;
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
index 0d427419d5..e10f5c008e 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
@@ -423,7 +423,8 @@ private function renderEvent(
       ->setUserHandle($xaction->getHandle($xaction->getAuthorPHID()))
       ->setIcon($xaction->getIcon())
       ->setColor($xaction->getColor())
-      ->setHideCommentOptions($this->getHideCommentOptions());
+      ->setHideCommentOptions($this->getHideCommentOptions())
+      ->setIsSilent($xaction->getIsSilentTransaction());
 
     list($token, $token_removed) = $xaction->getToken();
     if ($token) {
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index 51a0ea5aae..f07b40cb39 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -29,6 +29,7 @@ final class PHUITimelineEventView extends AphrontView {
   private $authorPHID;
   private $badges = array();
   private $pinboardItems = array();
+  private $isSilent;
 
   public function setAuthorPHID($author_phid) {
     $this->authorPHID = $author_phid;
@@ -177,6 +178,15 @@ public function setColor($color) {
     return $this;
   }
 
+  public function setIsSilent($is_silent) {
+    $this->isSilent = $is_silent;
+    return $this;
+  }
+
+  public function getIsSilent() {
+    return $this->isSilent;
+  }
+
   public function setReallyMajorEvent($me) {
     $this->reallyMajorEvent = $me;
     return $this;

From 3038d564a6d8a2194fdf0cd716436e44ee23efd5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 10:08:02 -0800
Subject: [PATCH 367/865] Allow bulk edits to be made silently if you have CLI
 access

Summary:
Fixes T13042. This hooks up the new "silent" mode from D18882 and makes it actually work.

The UI (where we tell you to go run some command and then reload the page) is pretty clumsy, but should solve some problems for now and can be cleaned up eventually. The actual mechanics (timeline aggregation, Herald interaction,  etc.) are on firmer ground.

Test Plan:
  - Made a normal bulk edit, got mail and feed stories.
  - Made a silent bulk edit, no mail and no feed.
  - Saw "Silent Edit" marker in timeline for silent edits:

{F5386245}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13042

Differential Revision: https://secure.phabricator.com/D18883
---
 bin/bulk                                      |  1 +
 .../autopatches/20180119.bulk.01.silent.sql   |  2 +
 scripts/manage_bulk.php                       |  1 +
 scripts/setup/manage_bulk.php                 | 21 ++++++
 src/__phutil_library_map__.php                |  4 ++
 ...bricatorDaemonBulkJobMonitorController.php | 15 +++-
 .../bulk/PhabricatorEditEngineBulkJobType.php | 30 +++++++-
 ...icatorBulkManagementMakeSilentWorkflow.php | 72 +++++++++++++++++++
 .../PhabricatorBulkManagementWorkflow.php     |  4 ++
 .../storage/PhabricatorWorkerBulkJob.php      |  5 +-
 .../PhabricatorUSEnglishTranslation.php       |  7 ++
 src/view/phui/PHUITimelineEventView.php       |  8 +++
 12 files changed, 165 insertions(+), 5 deletions(-)
 create mode 120000 bin/bulk
 create mode 100644 resources/sql/autopatches/20180119.bulk.01.silent.sql
 create mode 120000 scripts/manage_bulk.php
 create mode 100755 scripts/setup/manage_bulk.php
 create mode 100644 src/applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php
 create mode 100644 src/applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php

diff --git a/bin/bulk b/bin/bulk
new file mode 120000
index 0000000000..04d0550497
--- /dev/null
+++ b/bin/bulk
@@ -0,0 +1 @@
+../scripts/setup/manage_bulk.php
\ No newline at end of file
diff --git a/resources/sql/autopatches/20180119.bulk.01.silent.sql b/resources/sql/autopatches/20180119.bulk.01.silent.sql
new file mode 100644
index 0000000000..b426de953d
--- /dev/null
+++ b/resources/sql/autopatches/20180119.bulk.01.silent.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_worker.worker_bulkjob
+  ADD isSilent BOOL NOT NULL;
diff --git a/scripts/manage_bulk.php b/scripts/manage_bulk.php
new file mode 120000
index 0000000000..04d0550497
--- /dev/null
+++ b/scripts/manage_bulk.php
@@ -0,0 +1 @@
+../scripts/setup/manage_bulk.php
\ No newline at end of file
diff --git a/scripts/setup/manage_bulk.php b/scripts/setup/manage_bulk.php
new file mode 100755
index 0000000000..9786f9b078
--- /dev/null
+++ b/scripts/setup/manage_bulk.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+
+$root = dirname(dirname(dirname(__FILE__)));
+require_once $root.'/scripts/__init_script__.php';
+
+$args = new PhutilArgumentParser($argv);
+$args->setTagline(pht('manage bulk jobs'));
+$args->setSynopsis(<<<EOSYNOPSIS
+**bulk** __command__ [__options__]
+  Manage and debug bulk jobs.
+
+EOSYNOPSIS
+  );
+$args->parseStandardArguments();
+
+$workflows = id(new PhutilClassMapQuery())
+  ->setAncestorClass('PhabricatorBulkManagementWorkflow')
+  ->execute();
+$workflows[] = new PhutilHelpArgumentWorkflow();
+$args->parseWorkflows($workflows);
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 108c73b044..55fe8ada3d 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2206,6 +2206,8 @@
     'PhabricatorBulkContentSource' => 'infrastructure/daemon/contentsource/PhabricatorBulkContentSource.php',
     'PhabricatorBulkEditGroup' => 'applications/transactions/bulk/PhabricatorBulkEditGroup.php',
     'PhabricatorBulkEngine' => 'applications/transactions/bulk/PhabricatorBulkEngine.php',
+    'PhabricatorBulkManagementMakeSilentWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php',
+    'PhabricatorBulkManagementWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php',
     'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
     'PhabricatorCacheEngine' => 'applications/system/engine/PhabricatorCacheEngine.php',
     'PhabricatorCacheEngineExtension' => 'applications/system/engine/PhabricatorCacheEngineExtension.php',
@@ -7504,6 +7506,8 @@
     'PhabricatorBulkContentSource' => 'PhabricatorContentSource',
     'PhabricatorBulkEditGroup' => 'Phobject',
     'PhabricatorBulkEngine' => 'Phobject',
+    'PhabricatorBulkManagementMakeSilentWorkflow' => 'PhabricatorBulkManagementWorkflow',
+    'PhabricatorBulkManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorCacheDAO' => 'PhabricatorLiskDAO',
     'PhabricatorCacheEngine' => 'Phobject',
     'PhabricatorCacheEngineExtension' => 'Phobject',
diff --git a/src/applications/daemon/controller/PhabricatorDaemonBulkJobMonitorController.php b/src/applications/daemon/controller/PhabricatorDaemonBulkJobMonitorController.php
index 79d509f1ea..fd3e61d869 100644
--- a/src/applications/daemon/controller/PhabricatorDaemonBulkJobMonitorController.php
+++ b/src/applications/daemon/controller/PhabricatorDaemonBulkJobMonitorController.php
@@ -49,13 +49,22 @@ public function handleRequest(AphrontRequest $request) {
           return id(new AphrontRedirectResponse())
             ->setURI($job->getMonitorURI());
         } else {
-          return $this->newDialog()
-            ->setTitle(pht('Confirm Bulk Job'))
-            ->appendParagraph($job->getDescriptionForConfirm())
+          $dialog = $this->newDialog()
+            ->setTitle(pht('Confirm Bulk Job'));
+
+          $confirm = $job->getDescriptionForConfirm();
+          $confirm = (array)$confirm;
+          foreach ($confirm as $paragraph) {
+            $dialog->appendParagraph($paragraph);
+          }
+
+          $dialog
             ->appendParagraph(
               pht('Start work on this bulk job?'))
             ->addCancelButton($job->getManageURI(), pht('Details'))
             ->addSubmitButton(pht('Start Work'));
+
+          return $dialog;
         }
       } else {
         return $this->newDialog()
diff --git a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
index e7ff5d3414..758e7f3439 100644
--- a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
+++ b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php
@@ -12,10 +12,36 @@ public function getJobName(PhabricatorWorkerBulkJob $job) {
   }
 
   public function getDescriptionForConfirm(PhabricatorWorkerBulkJob $job) {
-    return pht(
+    $parts = array();
+
+    $parts[] = pht(
       'You are about to apply a bulk edit which will affect '.
       '%s object(s).',
       new PhutilNumber($job->getSize()));
+
+    if ($job->getIsSilent()) {
+      $parts[] = pht(
+        'If you start work now, this edit will be applied silently: it will '.
+        'not send mail or publish notifications.');
+    } else {
+      $parts[] = pht(
+        'If you start work now, this edit will send mail and publish '.
+        'notifications normally.');
+
+      $parts[] = pht('To silence this edit, run this command:');
+
+      $command = csprintf(
+        'phabricator/ $ ./bin/bulk make-silent --id %R',
+        $job->getID());
+      $command = (string)$command;
+
+      $parts[] = phutil_tag('tt', array(), $command);
+
+      $parts[] = pht(
+        'After running this command, reload this page to see the new setting.');
+    }
+
+    return $parts;
   }
 
   public function getJobSize(PhabricatorWorkerBulkJob $job) {
@@ -56,12 +82,14 @@ public function runTask(
 
     $raw_xactions = $job->getParameter('xactions');
     $xactions = $this->buildTransactions($object, $raw_xactions);
+    $is_silent = $job->getIsSilent();
 
     $editor = $object->getApplicationTransactionEditor()
       ->setActor($actor)
       ->setContentSource($job->newContentSource())
       ->setContinueOnNoEffect(true)
       ->setContinueOnMissingFields(true)
+      ->setIsSilent($is_silent)
       ->applyTransactions($object, $xactions);
   }
 
diff --git a/src/applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php b/src/applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php
new file mode 100644
index 0000000000..ca13a8f0ea
--- /dev/null
+++ b/src/applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php
@@ -0,0 +1,72 @@
+<?php
+
+final class PhabricatorBulkManagementMakeSilentWorkflow
+  extends PhabricatorBulkManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('make-silent')
+      ->setExamples('**make-silent** [options]')
+      ->setSynopsis(
+        pht('Configure a bulk job to execute silently.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'id',
+            'param' => 'id',
+            'help' => pht(
+              'Configure bulk job __id__ to run silently (without sending '.
+              'mail or publishing notifications).'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+
+    $id = $args->getArg('id');
+    if (!$id) {
+      throw new PhutilArgumentUsageException(
+        pht('Use "--id" to choose a bulk job to make silent.'));
+    }
+
+    $job = id(new PhabricatorWorkerBulkJobQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($id))
+      ->executeOne();
+    if (!$job) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Unable to load bulk job with ID "%s".',
+          $id));
+    }
+
+    if ($job->getIsSilent()) {
+      echo tsprintf(
+        "%s\n",
+        pht('This job is already configured to run silently.'));
+      return 0;
+    }
+
+    if ($job->getStatus() !== PhabricatorWorkerBulkJob::STATUS_CONFIRM) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Work has already started on job "%s". Jobs can not be '.
+          'reconfigured after they have been started.',
+          $id));
+    }
+
+    $job
+      ->setIsSilent(true)
+      ->save();
+
+    echo tsprintf(
+      "%s\n",
+      pht(
+        'Configured job "%s" to run silently.',
+        $id));
+
+    return 0;
+  }
+
+}
diff --git a/src/applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php b/src/applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php
new file mode 100644
index 0000000000..6533fedd80
--- /dev/null
+++ b/src/applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class PhabricatorBulkManagementWorkflow
+  extends PhabricatorManagementWorkflow {}
diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
index feb25a0128..40e43c2ec7 100644
--- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
+++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
@@ -21,6 +21,7 @@ final class PhabricatorWorkerBulkJob
   protected $status;
   protected $parameters = array();
   protected $size;
+  protected $isSilent;
 
   private $jobImplementation = self::ATTACHABLE;
 
@@ -34,6 +35,7 @@ protected function getConfiguration() {
         'jobTypeKey' => 'text32',
         'status' => 'text32',
         'size' => 'uint32',
+        'isSilent' => 'bool',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_type' => array(
@@ -58,7 +60,8 @@ public static function initializeNewJob(
       ->setAuthorPHID($actor->getPHID())
       ->setJobTypeKey($type->getBulkJobTypeKey())
       ->setParameters($parameters)
-      ->attachJobImplementation($type);
+      ->attachJobImplementation($type)
+      ->setIsSilent(0);
 
     $job->setSize($job->computeSize());
 
diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
index 184c2d5151..2cb44fe169 100644
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -1639,6 +1639,13 @@ protected function getTranslations() {
         ),
       ),
 
+      'You are about to apply a bulk edit which will affect '.
+      '%s object(s).' => array(
+        'You are about to apply a bulk edit to a single object.',
+        'You are about to apply a bulk edit which will affect '.
+        '%s objects.',
+      ),
+
     );
   }
 
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index f07b40cb39..161dd0c944 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -584,6 +584,14 @@ private function renderExtra(array $events) {
         }
         $extra[] = $date;
       }
+
+      // If this edit was applied silently, give user a hint that they should
+      // not expect to have received any mail or notifications.
+      if ($this->getIsSilent()) {
+        $extra[] = id(new PHUIIconView())
+          ->setIcon('fa-bell-slash', 'red')
+          ->setTooltip(pht('Silent Edit'));
+      }
     }
 
     $extra = javelin_tag(

From 86a0c7daa25343cd11f3f148a5ec9b8721e3a4a6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 13:38:23 -0800
Subject: [PATCH 368/865] Fix a fatal in blame when the viewer can't see a
 revision because of a permission issue

Summary:
Fixes T13040. To reproduce:

  - View a file with blame enabled, where some line has an associated revision (say, `D123`).
  - Edit `D123` so it exists and is a valid revision, but the viewer can't see it.
  - Reload the page.

Instead, only add revisions to the map if we actually managed to load them.

Test Plan: Page no longer fatals.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13040

Differential Revision: https://secure.phabricator.com/D18884
---
 .../diffusion/controller/DiffusionBrowseController.php        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 92181ff551..fac3e48706 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -947,6 +947,10 @@ private function buildDisplayRows(
       }
 
       foreach ($revision_ids as $commit_phid => $revision_id) {
+        // If the viewer can't actually see this revision, skip it.
+        if (!isset($revisions[$revision_id])) {
+          continue;
+        }
         $revision_map[$commit_map[$commit_phid]] = $revision_id;
       }
     }

From 3b7547e726ed67f5ba74215b276b22965311d5cd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 14:23:53 -0800
Subject: [PATCH 369/865] Fix an issue where certain configurations could fail
 to publish revision feed stories

Summary: See PHI292. This is just a generalization of D18851: feed stories have the same issue as mail. Don't hide "requested a review" in either mail or feed.

Test Plan:
  - Enable prototypes.
  - No harbormaster builds.
  - Create a revision.
    - Pre-patch: no feed story.
    - Post-patch: feed story.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18886
---
 .../storage/DifferentialTransaction.php             | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index 18edd3c625..667341cef4 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -100,6 +100,13 @@ public function shouldHide() {
           return true;
         }
         break;
+      case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
+        // Don't hide the initial "X requested review: ..." transaction from
+        // mail or feed even when it occurs during creation. We need this
+        // transaction to survive so we'll generate mail and feed stories when
+        // revisions immediately leave the draft state. See T13035 for
+        // discussion.
+        return false;
     }
 
     return parent::shouldHide();
@@ -111,12 +118,6 @@ public function shouldHideForMail(array $xactions) {
         // Don't hide the initial "X added reviewers: ..." transaction during
         // object creation from mail. See T12118 and PHI54.
         return false;
-      case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
-        // Don't hide the initial "X requested review: ..." transaction from
-        // mail even when it occurs during creation. We need this transaction
-        // to survive so we'll generate mail when revisions immediately leave
-        // the draft state. See T13035 for discussion.
-        return false;
     }
 
     return parent::shouldHideForMail($xactions);

From c63768044559aee8c236064d8cf4ef1cc3067a9c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 16:02:53 -0800
Subject: [PATCH 370/865] Show related objects on daemon worker task queue
 detail pages

Summary:
See PHI287. Currently, you can't get very much information about a task in the worker queue from the web UI.

This is largely intentional (e.g., it's bad if we let you inspect the content of a "send an administrator's password reset email" task), and a lot of the data is task-class specific so it would be a lot of work to expose it, but we can add one useful piece of information pretty easily: for tasks with an `objectPHID` that points at a valid object that's visible to the user, tell the user which object the task is associated with.

Test Plan: {F5386562}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18890
---
 .../PhabricatorWorkerTaskDetailController.php     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
index 85c2f2f87e..e18c2d725e 100644
--- a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
+++ b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
@@ -79,13 +79,20 @@ public function handleRequest(AphrontRequest $request) {
       ->appendChild($view);
   }
 
-  private function buildPropertyListView(
-    PhabricatorWorkerTask $task) {
-
-    $viewer = $this->getRequest()->getUser();
+  private function buildPropertyListView(PhabricatorWorkerTask $task) {
+    $viewer = $this->getViewer();
 
     $view = new PHUIPropertyListView();
 
+    $object_phid = $task->getObjectPHID();
+    if ($object_phid) {
+      $handles = $viewer->loadHandles(array($object_phid));
+      $handle = $handles[$object_phid];
+      if ($handle->isComplete()) {
+        $view->addProperty(pht('Object'), $handle->renderLink());
+      }
+    }
+
     if ($task->isArchived()) {
       switch ($task->getResult()) {
         case PhabricatorWorkerArchiveTask::RESULT_SUCCESS:

From 6a6279705671a4c760e5913e57c2e073aa1ed381 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 14:11:07 -0800
Subject: [PATCH 371/865] Fix some issues with Diffusion file data limits

Summary:
See <https://discourse.phabricator-community.org/t/files-created-from-repository-contents-slightly-over-one-chunk-in-size-are-truncated-to-exactly-one-chunk-in-size/988/1>. Three issues here:

  - When we finish reading `git cat-file ...` or whatever, we can end up with more than one chunk worth of bytes left in the internal buffer if the read is fast. Use `while` instead of `if` to make sure we write the whole buffer.
  - Limiting output with `setStdoutSizeLimit()` isn't really a reliable way to limit the size if we're also reading from the buffer. It's also pretty indirect and confusing. Instead, just let the `FileUploadSource` explicitly implement a byte limit in a straightforward way.
  - We weren't setting the time limit correctly on the main path.

Overall, this could cause >4MB files to "write" as 4MB files, with the rest of the file left in the UploadSource buffer. Since these files were technically under the limit, they could return as valid. This was intermittent.

Test Plan:
  - Pushed a ~4.2MB file.
  - Reloaded Diffusion a bunch, sometimes saw the `while/if` buffer race and produce a 4MB file with a prompt to download it. (Other times, the buffer worked right and the page just says "this file is too big, sorry").
  - Applied patches.
  - Reloaded Diffusion a bunch, no longer saw bad behavior or truncated files.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18885
---
 src/__phutil_library_map__.php                |  2 ++
 .../query/DiffusionFileFutureQuery.php        | 24 +++++------------
 .../PhabricatorFileUploadSource.php           | 26 ++++++++++++++++---
 ...atorFileUploadSourceByteLimitException.php |  4 +++
 4 files changed, 36 insertions(+), 20 deletions(-)
 create mode 100644 src/applications/files/uploadsource/PhabricatorFileUploadSourceByteLimitException.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 55fe8ada3d..2b46a40970 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2938,6 +2938,7 @@
     'PhabricatorFileUploadDialogController' => 'applications/files/controller/PhabricatorFileUploadDialogController.php',
     'PhabricatorFileUploadException' => 'applications/files/exception/PhabricatorFileUploadException.php',
     'PhabricatorFileUploadSource' => 'applications/files/uploadsource/PhabricatorFileUploadSource.php',
+    'PhabricatorFileUploadSourceByteLimitException' => 'applications/files/uploadsource/PhabricatorFileUploadSourceByteLimitException.php',
     'PhabricatorFileinfoSetupCheck' => 'applications/config/check/PhabricatorFileinfoSetupCheck.php',
     'PhabricatorFilesApplication' => 'applications/files/application/PhabricatorFilesApplication.php',
     'PhabricatorFilesApplicationStorageEnginePanel' => 'applications/files/applicationpanel/PhabricatorFilesApplicationStorageEnginePanel.php',
@@ -8362,6 +8363,7 @@
     'PhabricatorFileUploadDialogController' => 'PhabricatorFileController',
     'PhabricatorFileUploadException' => 'Exception',
     'PhabricatorFileUploadSource' => 'Phobject',
+    'PhabricatorFileUploadSourceByteLimitException' => 'Exception',
     'PhabricatorFileinfoSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorFilesApplication' => 'PhabricatorApplication',
     'PhabricatorFilesApplicationStorageEnginePanel' => 'PhabricatorApplicationConfigurationPanel',
diff --git a/src/applications/diffusion/query/DiffusionFileFutureQuery.php b/src/applications/diffusion/query/DiffusionFileFutureQuery.php
index 250e4962da..18779e5fb8 100644
--- a/src/applications/diffusion/query/DiffusionFileFutureQuery.php
+++ b/src/applications/diffusion/query/DiffusionFileFutureQuery.php
@@ -88,7 +88,7 @@ final public function executeInline() {
   }
 
   final protected function executeQuery() {
-    $future = $this->newQueryFuture();
+    $future = $this->newConfiguredQueryFuture();
 
     $drequest = $this->getRequest();
 
@@ -105,6 +105,11 @@ final protected function executeQuery() {
         ->setViewPolicy(PhabricatorPolicies::POLICY_NOONE)
         ->setExecFuture($future);
 
+      $byte_limit = $this->getByteLimit();
+      if ($byte_limit) {
+        $source->setByteLimit($byte_limit);
+      }
+
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         $file = $source->uploadFile();
       unset($unguarded);
@@ -116,18 +121,8 @@ final protected function executeQuery() {
 
       $this->didHitTimeLimit = true;
       $file = null;
-    }
-
-    $byte_limit = $this->getByteLimit();
-
-    if ($byte_limit && ($file->getByteSize() > $byte_limit)) {
+    } catch (PhabricatorFileUploadSourceByteLimitException $ex) {
       $this->didHitByteLimit = true;
-
-      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-        id(new PhabricatorDestructionEngine())
-          ->destroyObject($file);
-      unset($unguarded);
-
       $file = null;
     }
 
@@ -141,11 +136,6 @@ private function newConfiguredQueryFuture() {
       $future->setTimeout($this->getTimeout());
     }
 
-    $byte_limit = $this->getByteLimit();
-    if ($byte_limit) {
-      $future->setStdoutSizeLimit($byte_limit + 1);
-    }
-
     return $future;
   }
 
diff --git a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
index bbd93a455a..bf213a417e 100644
--- a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
+++ b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
@@ -12,6 +12,8 @@ abstract class PhabricatorFileUploadSource
   private $shouldChunk;
   private $didRewind;
   private $totalBytesWritten = 0;
+  private $totalBytesRead = 0;
+  private $byteLimit = 0;
 
   public function setName($name) {
     $this->name = $name;
@@ -40,6 +42,15 @@ public function getViewPolicy() {
     return $this->viewPolicy;
   }
 
+  public function setByteLimit($byte_limit) {
+    $this->byteLimit = $byte_limit;
+    return $this;
+  }
+
+  public function getByteLimit() {
+    return $this->byteLimit;
+  }
+
   public function uploadFile() {
     if (!$this->shouldChunkFile()) {
       return $this->writeSingleFile();
@@ -81,8 +92,15 @@ private function readFileData() {
       return false;
     }
 
+    $read_bytes = $data->current();
+    $this->totalBytesRead += strlen($read_bytes);
+
+    if ($this->byteLimit && ($this->totalBytesRead > $this->byteLimit)) {
+      throw new PhabricatorFileUploadSourceByteLimitException();
+    }
+
     $rope = $this->getRope();
-    $rope->append($data->current());
+    $rope->append($read_bytes);
 
     return true;
   }
@@ -160,8 +178,10 @@ private function writeChunkedFile() {
       }
     }
 
-    // If we have extra bytes at the end, write them.
-    if ($rope->getByteLength()) {
+    // If we have extra bytes at the end, write them. Note that it's possible
+    // that we have more than one chunk of bytes left if the read was very
+    // fast.
+    while ($rope->getByteLength()) {
       $this->writeChunk($file, $engine);
     }
 
diff --git a/src/applications/files/uploadsource/PhabricatorFileUploadSourceByteLimitException.php b/src/applications/files/uploadsource/PhabricatorFileUploadSourceByteLimitException.php
new file mode 100644
index 0000000000..d78c2189b6
--- /dev/null
+++ b/src/applications/files/uploadsource/PhabricatorFileUploadSourceByteLimitException.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorFileUploadSourceByteLimitException
+  extends Exception {}

From fbfcc375316123815ca8aed12bc8211ebb3861fa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 14:43:20 -0800
Subject: [PATCH 372/865] Respect token limits for "Assign to" and custom
 datasource fields in Herald

Summary:
See PHI173. Currently, Herald has an "Assign to" action for tasks, and you can specify custom fields with datasource values (like users or projects) that have a limit (like 1 "Owner", or 12 "Jury Members").

Herald doesn't support these limits right now, so you can write `[ Assign to ][ X, Y, Z ]`. This just means "Assign to X", but make it more clear by actually enforcing the limit in the UI.

Test Plan:
  - Created a "projects" custom field with limit 1.
  - Tried to create actions that 'assign to' or 'set custom field to' more than one thing, got helpfully rebuffed by the UI.
  - Created an "add subscribers" action with more than one value.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18887
---
 resources/celerity/map.php                    | 22 +++++++++----------
 .../value/HeraldTokenizerFieldValue.php       |  1 +
 .../ManiphestTaskAssignOtherHeraldAction.php  |  5 ++---
 ...habricatorStandardCustomFieldTokenizer.php |  9 +++++++-
 .../js/application/herald/HeraldRuleEditor.js |  3 ++-
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f671233f69..1d8c9f4b64 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -416,7 +416,7 @@
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/herald/HeraldRuleEditor.js' => '2dff5579',
+    'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
     'rsrc/js/application/maniphest/behavior-batch-selector.js' => 'ad54037e',
@@ -580,7 +580,7 @@
     'global-drag-and-drop-css' => 'b556a948',
     'harbormaster-css' => 'f491c9f4',
     'herald-css' => 'cd8d0134',
-    'herald-rule-editor' => '2dff5579',
+    'herald-rule-editor' => 'dca75c0e',
     'herald-test-css' => 'a52e323e',
     'inline-comment-summary-css' => 'f23d4e8f',
     'javelin-aphlict' => 'e1d4b11a',
@@ -1106,15 +1106,6 @@
       'javelin-install',
       'javelin-event',
     ),
-    '2dff5579' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-json',
-      'phabricator-prefab',
-    ),
     '2ee659ce' => array(
       'javelin-install',
     ),
@@ -2030,6 +2021,15 @@
       'javelin-util',
       'phabricator-shaped-request',
     ),
+    'dca75c0e' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-json',
+      'phabricator-prefab',
+    ),
     'de2e896f' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/applications/herald/value/HeraldTokenizerFieldValue.php b/src/applications/herald/value/HeraldTokenizerFieldValue.php
index bb3ceef1e7..215df29693 100644
--- a/src/applications/herald/value/HeraldTokenizerFieldValue.php
+++ b/src/applications/herald/value/HeraldTokenizerFieldValue.php
@@ -58,6 +58,7 @@ protected function getControlTemplate() {
         'datasourceURI' => $datasource->getDatasourceURI(),
         'browseURI' => $datasource->getBrowseURI(),
         'placeholder' => $datasource->getPlaceholderText(),
+        'limit' => $datasource->getLimit(),
       ),
     );
   }
diff --git a/src/applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php b/src/applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php
index 5a2591058e..27a5477623 100644
--- a/src/applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php
+++ b/src/applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php
@@ -22,9 +22,8 @@ public function getHeraldActionStandardType() {
   }
 
   protected function getDatasource() {
-    // TODO: Eventually, it would be nice to get "limit = 1" exported from here
-    // up to the UI.
-    return new ManiphestAssigneeDatasource();
+    return id(new ManiphestAssigneeDatasource())
+      ->setLimit(1);
   }
 
   public function renderActionDescription($value) {
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
index 5c5f422375..65c112c684 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
@@ -94,7 +94,14 @@ public function getHeraldActionStandardType() {
   }
 
   public function getHeraldActionDatasource() {
-    return $this->getDatasource();
+    $datasource = $this->getDatasource();
+
+    $limit = $this->getFieldConfigValue('limit');
+    if ($limit) {
+      $datasource->setLimit($limit);
+    }
+
+    return $datasource;
   }
 
   private function renderHeraldHandleList($value) {
diff --git a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
index 69eeea4a26..443fe9811e 100644
--- a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
+++ b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
@@ -283,7 +283,8 @@ JX.install('HeraldRuleEditor', {
       var tokenizerConfig = {
         src: spec.datasourceURI,
         placeholder: spec.placeholder,
-        browseURI: spec.browseURI
+        browseURI: spec.browseURI,
+        limit: spec.limit
       };
 
       var build = JX.Prefab.newTokenizerFromTemplate(

From d9b6513a2141367bd2449541571bcd9a985771d8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 14:50:42 -0800
Subject: [PATCH 373/865] Respect tokenizer limits in the bulk editor

Summary: Ref T13025. This makes limits (for fields like "Assign To") work in the bulk editor, so you can't type "Assign to: x, y, z" anymore.

Test Plan: Hit limit for "Assign to" and a custom project field. No limit for "Add subscribers".

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18888
---
 .../transactions/bulk/type/BulkTokenizerParameterType.php    | 3 +--
 .../transactions/editfield/PhabricatorTokenizerEditField.php | 4 ++++
 .../standard/PhabricatorStandardCustomFieldTokenizer.php     | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php b/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php
index 0edc46c664..a48f8877d5 100644
--- a/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php
+++ b/src/applications/transactions/bulk/type/BulkTokenizerParameterType.php
@@ -23,7 +23,6 @@ public function getPHUIXControlSpecification() {
     $template_markup = $template->render();
 
     $datasource = $this->getDatasource();
-    $limit = null;
 
     return array(
       'markup' => (string)hsprintf('%s', $template_markup),
@@ -31,7 +30,7 @@ public function getPHUIXControlSpecification() {
         'src' => $datasource->getDatasourceURI(),
         'browseURI' => $datasource->getBrowseURI(),
         'placeholder' => $datasource->getPlaceholderText(),
-        'limit' => $limit,
+        'limit' => $datasource->getLimit(),
       ),
       'value' => null,
     );
diff --git a/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php b/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
index d657213456..ba7514085d 100644
--- a/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
@@ -60,6 +60,10 @@ protected function newBulkParameterType() {
     $datasource = $this->newDatasource()
       ->setViewer($this->getViewer());
 
+    if ($this->getIsSingleValue()) {
+      $datasource->setLimit(1);
+    }
+
     return id(new BulkTokenizerParameterType())
       ->setDatasource($datasource);
   }
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
index 65c112c684..cdb54fb7e9 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
@@ -68,6 +68,11 @@ protected function newConduitEditParameterType() {
   protected function newBulkParameterType() {
     $datasource = $this->getDatasource();
 
+    $limit = $this->getFieldConfigValue('limit');
+    if ($limit) {
+      $datasource->setLimit($limit);
+    }
+
     return id(new BulkTokenizerParameterType())
       ->setDatasource($datasource);
   }

From a9d7b4f0ff75f62df2d8df0f1064570699702778 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Jan 2018 14:57:23 -0800
Subject: [PATCH 374/865] Support bulk edit of "points" for Maniphest tasks

Summary: Ref T13025. Fixes T10973. Fairly straightforward. The "points" type is just an alias for "text" today.

Test Plan: Bulk edited points.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025, T10973

Differential Revision: https://secure.phabricator.com/D18889
---
 src/__phutil_library_map__.php                         |  2 ++
 .../maniphest/editor/ManiphestEditEngine.php           |  1 +
 .../transactions/bulk/type/BulkPointsParameterType.php | 10 ++++++++++
 .../editfield/PhabricatorPointsEditField.php           |  5 +++++
 4 files changed, 18 insertions(+)
 create mode 100644 src/applications/transactions/bulk/type/BulkPointsParameterType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2b46a40970..0cd6ee0333 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -223,6 +223,7 @@
     'AuditQueryConduitAPIMethod' => 'applications/audit/conduit/AuditQueryConduitAPIMethod.php',
     'AuthManageProvidersCapability' => 'applications/auth/capability/AuthManageProvidersCapability.php',
     'BulkParameterType' => 'applications/transactions/bulk/type/BulkParameterType.php',
+    'BulkPointsParameterType' => 'applications/transactions/bulk/type/BulkPointsParameterType.php',
     'BulkRemarkupParameterType' => 'applications/transactions/bulk/type/BulkRemarkupParameterType.php',
     'BulkSelectParameterType' => 'applications/transactions/bulk/type/BulkSelectParameterType.php',
     'BulkStringParameterType' => 'applications/transactions/bulk/type/BulkStringParameterType.php',
@@ -5252,6 +5253,7 @@
     'AuditQueryConduitAPIMethod' => 'AuditConduitAPIMethod',
     'AuthManageProvidersCapability' => 'PhabricatorPolicyCapability',
     'BulkParameterType' => 'Phobject',
+    'BulkPointsParameterType' => 'BulkParameterType',
     'BulkRemarkupParameterType' => 'BulkParameterType',
     'BulkSelectParameterType' => 'BulkParameterType',
     'BulkStringParameterType' => 'BulkParameterType',
diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php
index 8df261dc4a..359ba493d4 100644
--- a/src/applications/maniphest/editor/ManiphestEditEngine.php
+++ b/src/applications/maniphest/editor/ManiphestEditEngine.php
@@ -234,6 +234,7 @@ protected function buildCustomEditFields($object) {
       $fields[] = id(new PhabricatorPointsEditField())
         ->setKey('points')
         ->setLabel($points_label)
+        ->setBulkEditLabel($action_label)
         ->setDescription(pht('Point value of the task.'))
         ->setConduitDescription(pht('Change the task point value.'))
         ->setConduitTypeDescription(pht('New task point value.'))
diff --git a/src/applications/transactions/bulk/type/BulkPointsParameterType.php b/src/applications/transactions/bulk/type/BulkPointsParameterType.php
new file mode 100644
index 0000000000..fe01db976a
--- /dev/null
+++ b/src/applications/transactions/bulk/type/BulkPointsParameterType.php
@@ -0,0 +1,10 @@
+<?php
+
+final class BulkPointsParameterType
+  extends BulkParameterType {
+
+  public function getPHUIXControlType() {
+    return 'points';
+  }
+
+}
diff --git a/src/applications/transactions/editfield/PhabricatorPointsEditField.php b/src/applications/transactions/editfield/PhabricatorPointsEditField.php
index 48c1b3b35b..a8c6d345f3 100644
--- a/src/applications/transactions/editfield/PhabricatorPointsEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorPointsEditField.php
@@ -14,4 +14,9 @@ protected function newConduitParameterType() {
   protected function newCommentAction() {
     return id(new PhabricatorEditEnginePointsCommentAction());
   }
+
+  protected function newBulkParameterType() {
+    return new BulkPointsParameterType();
+  }
+
 }

From 7970cf058517aa7d8f9fa6ecd52838327e14d495 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 Jan 2018 08:52:48 -0800
Subject: [PATCH 375/865] Add a `bin/auth revoke` revoker for temporary tokens

Summary: Ref T13043. Allows CLI revocation of temporary ("forgot password", "one-time login") tokens.

Test Plan: Used "Forgot Password?" to generate tokens, used `bin/auth revoke --type temporary` with `--from` and `--everywhere` to revoke them.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18891
---
 src/__phutil_library_map__.php                |  2 ++
 .../PhabricatorAuthTemporaryTokenRevoker.php  | 33 +++++++++++++++++++
 .../PhabricatorUSEnglishTranslation.php       |  5 +++
 3 files changed, 40 insertions(+)
 create mode 100644 src/applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 0cd6ee0333..e611c2353f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2133,6 +2133,7 @@
     'PhabricatorAuthTemporaryToken' => 'applications/auth/storage/PhabricatorAuthTemporaryToken.php',
     'PhabricatorAuthTemporaryTokenGarbageCollector' => 'applications/auth/garbagecollector/PhabricatorAuthTemporaryTokenGarbageCollector.php',
     'PhabricatorAuthTemporaryTokenQuery' => 'applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php',
+    'PhabricatorAuthTemporaryTokenRevoker' => 'applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php',
     'PhabricatorAuthTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthTemporaryTokenType.php',
     'PhabricatorAuthTemporaryTokenTypeModule' => 'applications/auth/tokentype/PhabricatorAuthTemporaryTokenTypeModule.php',
     'PhabricatorAuthTerminateSessionController' => 'applications/auth/controller/PhabricatorAuthTerminateSessionController.php',
@@ -7422,6 +7423,7 @@
     ),
     'PhabricatorAuthTemporaryTokenGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorAuthTemporaryTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorAuthTemporaryTokenRevoker' => 'PhabricatorAuthRevoker',
     'PhabricatorAuthTemporaryTokenType' => 'Phobject',
     'PhabricatorAuthTemporaryTokenTypeModule' => 'PhabricatorConfigModule',
     'PhabricatorAuthTerminateSessionController' => 'PhabricatorAuthController',
diff --git a/src/applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php b/src/applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php
new file mode 100644
index 0000000000..8f9fdb2b9e
--- /dev/null
+++ b/src/applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php
@@ -0,0 +1,33 @@
+<?php
+
+final class PhabricatorAuthTemporaryTokenRevoker
+  extends PhabricatorAuthRevoker {
+
+  const REVOKERKEY = 'temporary';
+
+  public function revokeAllCredentials() {
+    $table = new PhabricatorAuthTemporaryToken();
+    $conn = $table->establishConnection('w');
+
+    queryfx(
+      $conn,
+      'DELETE FROM %T',
+      $table->getTableName());
+
+    return $conn->getAffectedRows();
+  }
+
+  public function revokeCredentialsFrom($object) {
+    $table = new PhabricatorAuthTemporaryToken();
+    $conn = $table->establishConnection('w');
+
+    queryfx(
+      $conn,
+      'DELETE FROM %T WHERE tokenResource = %s',
+      $table->getTableName(),
+      $object->getPHID());
+
+    return $conn->getAffectedRows();
+  }
+
+}
diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
index 2cb44fe169..40cedacf06 100644
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -1646,6 +1646,11 @@ protected function getTranslations() {
         '%s objects.',
       ),
 
+      'Destroyed %s credential(s) of type "%s".' => array(
+        'Destroyed one credential of type "%2$s".',
+        'Destroyed %s credentials of type "%s".',
+      ),
+
     );
   }
 

From 39c3b10a2f21c601a90545339a6544f2b9dab4eb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 Jan 2018 08:59:52 -0800
Subject: [PATCH 376/865] Add a `bin/auth revoke` revoker for sessions

Summary: Ref T13043. Allows CLI revocation of login sessions.

Test Plan: Used `bin/auth revoke --type session` with `--from` and `--everywhere` to revoke sessions. Saw accounts get logged out in web UI.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18892
---
 src/__phutil_library_map__.php                |  2 ++
 .../revoker/PhabricatorAuthSessionRevoker.php | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 src/applications/auth/revoker/PhabricatorAuthSessionRevoker.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e611c2353f..3a7785d2e1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2126,6 +2126,7 @@
     'PhabricatorAuthSessionGarbageCollector' => 'applications/auth/garbagecollector/PhabricatorAuthSessionGarbageCollector.php',
     'PhabricatorAuthSessionInfo' => 'applications/auth/data/PhabricatorAuthSessionInfo.php',
     'PhabricatorAuthSessionQuery' => 'applications/auth/query/PhabricatorAuthSessionQuery.php',
+    'PhabricatorAuthSessionRevoker' => 'applications/auth/revoker/PhabricatorAuthSessionRevoker.php',
     'PhabricatorAuthSetPasswordController' => 'applications/auth/controller/PhabricatorAuthSetPasswordController.php',
     'PhabricatorAuthSetupCheck' => 'applications/config/check/PhabricatorAuthSetupCheck.php',
     'PhabricatorAuthStartController' => 'applications/auth/controller/PhabricatorAuthStartController.php',
@@ -7413,6 +7414,7 @@
     'PhabricatorAuthSessionGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorAuthSessionInfo' => 'Phobject',
     'PhabricatorAuthSessionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorAuthSessionRevoker' => 'PhabricatorAuthRevoker',
     'PhabricatorAuthSetPasswordController' => 'PhabricatorAuthController',
     'PhabricatorAuthSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorAuthStartController' => 'PhabricatorAuthController',
diff --git a/src/applications/auth/revoker/PhabricatorAuthSessionRevoker.php b/src/applications/auth/revoker/PhabricatorAuthSessionRevoker.php
new file mode 100644
index 0000000000..b5e294e6f1
--- /dev/null
+++ b/src/applications/auth/revoker/PhabricatorAuthSessionRevoker.php
@@ -0,0 +1,33 @@
+<?php
+
+final class PhabricatorAuthSessionRevoker
+  extends PhabricatorAuthRevoker {
+
+  const REVOKERKEY = 'session';
+
+  public function revokeAllCredentials() {
+    $table = new PhabricatorAuthSession();
+    $conn = $table->establishConnection('w');
+
+    queryfx(
+      $conn,
+      'DELETE FROM %T',
+      $table->getTableName());
+
+    return $conn->getAffectedRows();
+  }
+
+  public function revokeCredentialsFrom($object) {
+    $table = new PhabricatorAuthSession();
+    $conn = $table->establishConnection('w');
+
+    queryfx(
+      $conn,
+      'DELETE FROM %T WHERE userPHID = %s',
+      $table->getTableName(),
+      $object->getPHID());
+
+    return $conn->getAffectedRows();
+  }
+
+}

From fa1ecb7f66121d198e33c5d8d17f01ffd36b9389 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 Jan 2018 09:08:30 -0800
Subject: [PATCH 377/865] Add a `bin/auth revoke` revoker for SSH keys

Summary: Ref T13043. Adds CLI support for revoking SSH keys. Also retargets UI language from "Deactivate" to "Revoke" to make it more clear that this is a one-way operation. This operation is already correctly implemented as a "Revoke" operation.

Test Plan: Used `bin/auth revoke --type ssh` to revoke keys, verified they became revoked (with proper transactions) in the UI. Revoked keys from the web UI flow.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18893
---
 src/__phutil_library_map__.php                |  6 ++-
 .../PhabricatorAuthApplication.php            |  4 +-
 ...PhabricatorAuthSSHKeyRevokeController.php} |  8 +--
 .../PhabricatorAuthSSHKeyViewController.php   |  8 +--
 .../auth/revoker/PhabricatorAuthRevoker.php   |  2 +-
 .../revoker/PhabricatorAuthSSHRevoker.php     | 52 +++++++++++++++++++
 .../auth/storage/PhabricatorAuthSSHKey.php    |  2 +-
 .../PhabricatorAuthSSHKeyTransaction.php      |  4 +-
 8 files changed, 70 insertions(+), 16 deletions(-)
 rename src/applications/auth/controller/{PhabricatorAuthSSHKeyDeactivateController.php => PhabricatorAuthSSHKeyRevokeController.php} (86%)
 create mode 100644 src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3a7785d2e1..7ad2f2673c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2105,7 +2105,6 @@
     'PhabricatorAuthRevoker' => 'applications/auth/revoker/PhabricatorAuthRevoker.php',
     'PhabricatorAuthSSHKey' => 'applications/auth/storage/PhabricatorAuthSSHKey.php',
     'PhabricatorAuthSSHKeyController' => 'applications/auth/controller/PhabricatorAuthSSHKeyController.php',
-    'PhabricatorAuthSSHKeyDeactivateController' => 'applications/auth/controller/PhabricatorAuthSSHKeyDeactivateController.php',
     'PhabricatorAuthSSHKeyEditController' => 'applications/auth/controller/PhabricatorAuthSSHKeyEditController.php',
     'PhabricatorAuthSSHKeyEditor' => 'applications/auth/editor/PhabricatorAuthSSHKeyEditor.php',
     'PhabricatorAuthSSHKeyGenerateController' => 'applications/auth/controller/PhabricatorAuthSSHKeyGenerateController.php',
@@ -2113,12 +2112,14 @@
     'PhabricatorAuthSSHKeyPHIDType' => 'applications/auth/phid/PhabricatorAuthSSHKeyPHIDType.php',
     'PhabricatorAuthSSHKeyQuery' => 'applications/auth/query/PhabricatorAuthSSHKeyQuery.php',
     'PhabricatorAuthSSHKeyReplyHandler' => 'applications/auth/mail/PhabricatorAuthSSHKeyReplyHandler.php',
+    'PhabricatorAuthSSHKeyRevokeController' => 'applications/auth/controller/PhabricatorAuthSSHKeyRevokeController.php',
     'PhabricatorAuthSSHKeySearchEngine' => 'applications/auth/query/PhabricatorAuthSSHKeySearchEngine.php',
     'PhabricatorAuthSSHKeyTableView' => 'applications/auth/view/PhabricatorAuthSSHKeyTableView.php',
     'PhabricatorAuthSSHKeyTransaction' => 'applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php',
     'PhabricatorAuthSSHKeyTransactionQuery' => 'applications/auth/query/PhabricatorAuthSSHKeyTransactionQuery.php',
     'PhabricatorAuthSSHKeyViewController' => 'applications/auth/controller/PhabricatorAuthSSHKeyViewController.php',
     'PhabricatorAuthSSHPublicKey' => 'applications/auth/sshkey/PhabricatorAuthSSHPublicKey.php',
+    'PhabricatorAuthSSHRevoker' => 'applications/auth/revoker/PhabricatorAuthSSHRevoker.php',
     'PhabricatorAuthSession' => 'applications/auth/storage/PhabricatorAuthSession.php',
     'PhabricatorAuthSessionEngine' => 'applications/auth/engine/PhabricatorAuthSessionEngine.php',
     'PhabricatorAuthSessionEngineExtension' => 'applications/auth/engine/PhabricatorAuthSessionEngineExtension.php',
@@ -7390,7 +7391,6 @@
       'PhabricatorApplicationTransactionInterface',
     ),
     'PhabricatorAuthSSHKeyController' => 'PhabricatorAuthController',
-    'PhabricatorAuthSSHKeyDeactivateController' => 'PhabricatorAuthSSHKeyController',
     'PhabricatorAuthSSHKeyEditController' => 'PhabricatorAuthSSHKeyController',
     'PhabricatorAuthSSHKeyEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorAuthSSHKeyGenerateController' => 'PhabricatorAuthSSHKeyController',
@@ -7398,12 +7398,14 @@
     'PhabricatorAuthSSHKeyPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorAuthSSHKeyQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorAuthSSHKeyReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
+    'PhabricatorAuthSSHKeyRevokeController' => 'PhabricatorAuthSSHKeyController',
     'PhabricatorAuthSSHKeySearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorAuthSSHKeyTableView' => 'AphrontView',
     'PhabricatorAuthSSHKeyTransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorAuthSSHKeyTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorAuthSSHKeyViewController' => 'PhabricatorAuthSSHKeyController',
     'PhabricatorAuthSSHPublicKey' => 'Phobject',
+    'PhabricatorAuthSSHRevoker' => 'PhabricatorAuthRevoker',
     'PhabricatorAuthSession' => array(
       'PhabricatorAuthDAO',
       'PhabricatorPolicyInterface',
diff --git a/src/applications/auth/application/PhabricatorAuthApplication.php b/src/applications/auth/application/PhabricatorAuthApplication.php
index a6127394fd..ff4ed1f136 100644
--- a/src/applications/auth/application/PhabricatorAuthApplication.php
+++ b/src/applications/auth/application/PhabricatorAuthApplication.php
@@ -80,8 +80,8 @@ public function getRoutes() {
           'generate/' => 'PhabricatorAuthSSHKeyGenerateController',
           'upload/' => 'PhabricatorAuthSSHKeyEditController',
           'edit/(?P<id>\d+)/' => 'PhabricatorAuthSSHKeyEditController',
-          'deactivate/(?P<id>\d+)/'
-            => 'PhabricatorAuthSSHKeyDeactivateController',
+          'revoke/(?P<id>\d+)/'
+            => 'PhabricatorAuthSSHKeyRevokeController',
           'view/(?P<id>\d+)/' => 'PhabricatorAuthSSHKeyViewController',
         ),
         'password/' => 'PhabricatorAuthSetPasswordController',
diff --git a/src/applications/auth/controller/PhabricatorAuthSSHKeyDeactivateController.php b/src/applications/auth/controller/PhabricatorAuthSSHKeyRevokeController.php
similarity index 86%
rename from src/applications/auth/controller/PhabricatorAuthSSHKeyDeactivateController.php
rename to src/applications/auth/controller/PhabricatorAuthSSHKeyRevokeController.php
index 8eca02340d..0547c2175d 100644
--- a/src/applications/auth/controller/PhabricatorAuthSSHKeyDeactivateController.php
+++ b/src/applications/auth/controller/PhabricatorAuthSSHKeyRevokeController.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorAuthSSHKeyDeactivateController
+final class PhabricatorAuthSSHKeyRevokeController
   extends PhabricatorAuthSSHKeyController {
 
   public function handleRequest(AphrontRequest $request) {
@@ -46,14 +46,14 @@ public function handleRequest(AphrontRequest $request) {
     $name = phutil_tag('strong', array(), $key->getName());
 
     return $this->newDialog()
-      ->setTitle(pht('Deactivate SSH Public Key'))
+      ->setTitle(pht('Revoke SSH Public Key'))
       ->appendParagraph(
         pht(
-          'The key "%s" will be permanently deactivated, and you will no '.
+          'The key "%s" will be permanently revoked, and you will no '.
           'longer be able to use the corresponding private key to '.
           'authenticate.',
           $name))
-      ->addSubmitButton(pht('Deactivate Public Key'))
+      ->addSubmitButton(pht('Revoke Public Key'))
       ->addCancelButton($cancel_uri);
   }
 
diff --git a/src/applications/auth/controller/PhabricatorAuthSSHKeyViewController.php b/src/applications/auth/controller/PhabricatorAuthSSHKeyViewController.php
index 66c3a5f09b..54c6e3861b 100644
--- a/src/applications/auth/controller/PhabricatorAuthSSHKeyViewController.php
+++ b/src/applications/auth/controller/PhabricatorAuthSSHKeyViewController.php
@@ -35,7 +35,7 @@ public function handleRequest(AphrontRequest $request) {
     if ($ssh_key->getIsActive()) {
       $header->setStatus('fa-check', 'bluegrey', pht('Active'));
     } else {
-      $header->setStatus('fa-ban', 'dark', pht('Deactivated'));
+      $header->setStatus('fa-ban', 'dark', pht('Revoked'));
     }
 
     $header->addActionLink(
@@ -80,7 +80,7 @@ private function buildCurtain(PhabricatorAuthSSHKey $ssh_key) {
     $id = $ssh_key->getID();
 
     $edit_uri = $this->getApplicationURI("sshkey/edit/{$id}/");
-    $deactivate_uri = $this->getApplicationURI("sshkey/deactivate/{$id}/");
+    $revoke_uri = $this->getApplicationURI("sshkey/revoke/{$id}/");
 
     $curtain = $this->newCurtainView($ssh_key);
 
@@ -95,8 +95,8 @@ private function buildCurtain(PhabricatorAuthSSHKey $ssh_key) {
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-times')
-        ->setName(pht('Deactivate SSH Key'))
-        ->setHref($deactivate_uri)
+        ->setName(pht('Revoke SSH Key'))
+        ->setHref($revoke_uri)
         ->setWorkflow(true)
         ->setDisabled(!$can_edit));
 
diff --git a/src/applications/auth/revoker/PhabricatorAuthRevoker.php b/src/applications/auth/revoker/PhabricatorAuthRevoker.php
index f4467036b9..3a807e3089 100644
--- a/src/applications/auth/revoker/PhabricatorAuthRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthRevoker.php
@@ -5,7 +5,7 @@ abstract class PhabricatorAuthRevoker
 
   private $viewer;
 
-  abstract public function revokeAlLCredentials();
+  abstract public function revokeAllCredentials();
   abstract public function revokeCredentialsFrom($object);
 
   public function setViewer(PhabricatorUser $viewer) {
diff --git a/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php b/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
new file mode 100644
index 0000000000..16cc8eaea4
--- /dev/null
+++ b/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
@@ -0,0 +1,52 @@
+<?php
+
+final class PhabricatorAuthSSHRevoker
+  extends PhabricatorAuthRevoker {
+
+  const REVOKERKEY = 'ssh';
+
+  public function revokeAllCredentials() {
+    $query = new PhabricatorAuthSSHKeyQuery();
+    return $this->revokeWithQuery($query);
+  }
+
+  public function revokeCredentialsFrom($object) {
+    $query = id(new PhabricatorAuthSSHKeyQuery())
+      ->withObjectPHIDs(array($object->getPHID()));
+
+    return $this->revokeWithQuery($query);
+  }
+
+  private function revokeWithQuery(PhabricatorAuthSSHKeyQuery $query) {
+    $viewer = $this->getViewer();
+
+    // We're only going to revoke keys which have not already been revoked.
+
+    $ssh_keys = $query
+      ->setViewer($viewer)
+      ->withIsActive(true)
+      ->execute();
+
+    $content_source = PhabricatorContentSource::newForSource(
+      PhabricatorDaemonContentSource::SOURCECONST);
+
+    $auth_phid = id(new PhabricatorAuthApplication())->getPHID();
+    foreach ($ssh_keys as $ssh_key) {
+      $xactions = array();
+      $xactions[] = $ssh_key->getApplicationTransactionTemplate()
+        ->setTransactionType(PhabricatorAuthSSHKeyTransaction::TYPE_DEACTIVATE)
+        ->setNewValue(1);
+
+      $editor = id(new PhabricatorAuthSSHKeyEditor())
+        ->setActor($viewer)
+        ->setActingAsPHID($auth_phid)
+        ->setContinueOnNoEffect(true)
+        ->setContinueOnMissingFields(true)
+        ->setContentSource($content_source)
+        ->applyTransactions($ssh_key, $xactions);
+    }
+
+    return count($ssh_keys);
+  }
+
+}
diff --git a/src/applications/auth/storage/PhabricatorAuthSSHKey.php b/src/applications/auth/storage/PhabricatorAuthSSHKey.php
index 7cd23d297e..2a9a6273bf 100644
--- a/src/applications/auth/storage/PhabricatorAuthSSHKey.php
+++ b/src/applications/auth/storage/PhabricatorAuthSSHKey.php
@@ -139,7 +139,7 @@ public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
   public function describeAutomaticCapability($capability) {
     if (!$this->getIsACtive()) {
       return pht(
-        'Deactivated SSH keys can not be edited or reactivated.');
+        'Revoked SSH keys can not be edited or reinstated.');
     }
 
     return pht(
diff --git a/src/applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php b/src/applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php
index 37edb7384d..bb08310cf3 100644
--- a/src/applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php
+++ b/src/applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php
@@ -43,11 +43,11 @@ public function getTitle() {
       case self::TYPE_DEACTIVATE:
         if ($new) {
           return pht(
-            '%s deactivated this key.',
+            '%s revoked this key.',
             $this->renderHandleLink($author_phid));
         } else {
           return pht(
-            '%s activated this key.',
+            '%s reinstated this key.',
             $this->renderHandleLink($author_phid));
         }
 

From 9c00a437848cdf9850c46b231f8cb8c086595517 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 Jan 2018 11:42:35 -0800
Subject: [PATCH 378/865] Add a more modern object for storing password hashes

Summary:
Ref T13043. Currently:

  - Passwords are stored separately in the "VCS Passwords" and "User" tables and don't share as much code as they could.
  - Because User objects are all over the place in the code, password hashes are all over the place too (i.e., often somewhere in process memory). This is a very low-severity, theoretical sort of issue, but it could make leaving a stray `var_dump()` in the code somewhere a lot more dangerous than it otherwise is. Even if we never do this, third-party developers might. So it "feels nice" to imagine separating this data into a different table that we rarely load.
  - Passwords can not be //revoked//. They can be //deleted//, but users can set the same password again. If you believe or suspect that a password may have been compromised, you might reasonably prefer to revoke it and force the user to select a //different// password.

This change prepares to remedy these issues by adding a new, more modern dedicated password storage table which supports storing multiple password types (account vs VCS), gives passwords real PHIDs and transactions, supports DestructionEngine, supports revocation, and supports `bin/auth revoke`.

It doesn't actually make anything use this new table yet. Future changes will migrate VCS passwords and account passwords to this table.

(This also gives third party applications a reasonable place to store password hashes in a consistent way if they have some need for it.)

Test Plan: Added some basic unit tests to cover general behavior. This is just skeleton code for now and will get more thorough testing when applications move.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18894
---
 .../autopatches/20180120.auth.01.password.sql |  10 ++
 .../20180120.auth.02.passwordxaction.sql      |  19 ++
 src/__phutil_library_map__.php                |  25 +++
 .../PhabricatorAuthPasswordTestCase.php       |  31 ++++
 .../editor/PhabricatorAuthPasswordEditor.php  |  22 +++
 ...atorPasswordDestructionEngineExtension.php |  29 +++
 .../phid/PhabricatorAuthPasswordPHIDType.php  |  36 ++++
 .../query/PhabricatorAuthPasswordQuery.php    | 114 ++++++++++++
 .../PhabricatorAuthPasswordRevoker.php        |  52 ++++++
 .../revoker/PhabricatorAuthSSHRevoker.php     |   2 +-
 .../auth/storage/PhabricatorAuthPassword.php  | 167 ++++++++++++++++++
 .../PhabricatorAuthPasswordTransaction.php    |  21 +++
 ...abricatorAuthPasswordRevokeTransaction.php |  32 ++++
 ...PhabricatorAuthPasswordTransactionType.php |   4 +
 14 files changed, 563 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20180120.auth.01.password.sql
 create mode 100644 resources/sql/autopatches/20180120.auth.02.passwordxaction.sql
 create mode 100644 src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
 create mode 100644 src/applications/auth/editor/PhabricatorAuthPasswordEditor.php
 create mode 100644 src/applications/auth/extension/PhabricatorPasswordDestructionEngineExtension.php
 create mode 100644 src/applications/auth/phid/PhabricatorAuthPasswordPHIDType.php
 create mode 100644 src/applications/auth/query/PhabricatorAuthPasswordQuery.php
 create mode 100644 src/applications/auth/revoker/PhabricatorAuthPasswordRevoker.php
 create mode 100644 src/applications/auth/storage/PhabricatorAuthPassword.php
 create mode 100644 src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php
 create mode 100644 src/applications/auth/xaction/PhabricatorAuthPasswordRevokeTransaction.php
 create mode 100644 src/applications/auth/xaction/PhabricatorAuthPasswordTransactionType.php

diff --git a/resources/sql/autopatches/20180120.auth.01.password.sql b/resources/sql/autopatches/20180120.auth.01.password.sql
new file mode 100644
index 0000000000..679d50c5b1
--- /dev/null
+++ b/resources/sql/autopatches/20180120.auth.01.password.sql
@@ -0,0 +1,10 @@
+CREATE TABLE {$NAMESPACE}_auth.auth_password (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  objectPHID VARBINARY(64) NOT NULL,
+  passwordType VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT},
+  passwordHash VARCHAR(128) NOT NULL COLLATE {$COLLATE_TEXT},
+  isRevoked BOOL NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180120.auth.02.passwordxaction.sql b/resources/sql/autopatches/20180120.auth.02.passwordxaction.sql
new file mode 100644
index 0000000000..1d4f075b87
--- /dev/null
+++ b/resources/sql/autopatches/20180120.auth.02.passwordxaction.sql
@@ -0,0 +1,19 @@
+CREATE TABLE {$NAMESPACE}_auth.auth_passwordtransaction (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  authorPHID VARBINARY(64) NOT NULL,
+  objectPHID VARBINARY(64) NOT NULL,
+  viewPolicy VARBINARY(64) NOT NULL,
+  editPolicy VARBINARY(64) NOT NULL,
+  commentPHID VARBINARY(64) DEFAULT NULL,
+  commentVersion INT UNSIGNED NOT NULL,
+  transactionType VARCHAR(32) COLLATE {$COLLATE_TEXT} NOT NULL,
+  oldValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  newValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  contentSource LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  metadata LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_phid` (`phid`),
+  KEY `key_object` (`objectPHID`)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7ad2f2673c..a83eb55345 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2089,7 +2089,16 @@
     'PhabricatorAuthOldOAuthRedirectController' => 'applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php',
     'PhabricatorAuthOneTimeLoginController' => 'applications/auth/controller/PhabricatorAuthOneTimeLoginController.php',
     'PhabricatorAuthOneTimeLoginTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthOneTimeLoginTemporaryTokenType.php',
+    'PhabricatorAuthPassword' => 'applications/auth/storage/PhabricatorAuthPassword.php',
+    'PhabricatorAuthPasswordEditor' => 'applications/auth/editor/PhabricatorAuthPasswordEditor.php',
+    'PhabricatorAuthPasswordPHIDType' => 'applications/auth/phid/PhabricatorAuthPasswordPHIDType.php',
+    'PhabricatorAuthPasswordQuery' => 'applications/auth/query/PhabricatorAuthPasswordQuery.php',
     'PhabricatorAuthPasswordResetTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php',
+    'PhabricatorAuthPasswordRevokeTransaction' => 'applications/auth/xaction/PhabricatorAuthPasswordRevokeTransaction.php',
+    'PhabricatorAuthPasswordRevoker' => 'applications/auth/revoker/PhabricatorAuthPasswordRevoker.php',
+    'PhabricatorAuthPasswordTestCase' => 'applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php',
+    'PhabricatorAuthPasswordTransaction' => 'applications/auth/storage/PhabricatorAuthPasswordTransaction.php',
+    'PhabricatorAuthPasswordTransactionType' => 'applications/auth/xaction/PhabricatorAuthPasswordTransactionType.php',
     'PhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorAuthProvider.php',
     'PhabricatorAuthProviderConfig' => 'applications/auth/storage/PhabricatorAuthProviderConfig.php',
     'PhabricatorAuthProviderConfigController' => 'applications/auth/controller/config/PhabricatorAuthProviderConfigController.php',
@@ -3481,6 +3490,7 @@
     'PhabricatorPagerUIExample' => 'applications/uiexample/examples/PhabricatorPagerUIExample.php',
     'PhabricatorPassphraseApplication' => 'applications/passphrase/application/PhabricatorPassphraseApplication.php',
     'PhabricatorPasswordAuthProvider' => 'applications/auth/provider/PhabricatorPasswordAuthProvider.php',
+    'PhabricatorPasswordDestructionEngineExtension' => 'applications/auth/extension/PhabricatorPasswordDestructionEngineExtension.php',
     'PhabricatorPasswordHasher' => 'infrastructure/util/password/PhabricatorPasswordHasher.php',
     'PhabricatorPasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorPasswordHasherTestCase.php',
     'PhabricatorPasswordHasherUnavailableException' => 'infrastructure/util/password/PhabricatorPasswordHasherUnavailableException.php',
@@ -7366,7 +7376,21 @@
     'PhabricatorAuthOldOAuthRedirectController' => 'PhabricatorAuthController',
     'PhabricatorAuthOneTimeLoginController' => 'PhabricatorAuthController',
     'PhabricatorAuthOneTimeLoginTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
+    'PhabricatorAuthPassword' => array(
+      'PhabricatorAuthDAO',
+      'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
+      'PhabricatorApplicationTransactionInterface',
+    ),
+    'PhabricatorAuthPasswordEditor' => 'PhabricatorApplicationTransactionEditor',
+    'PhabricatorAuthPasswordPHIDType' => 'PhabricatorPHIDType',
+    'PhabricatorAuthPasswordQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorAuthPasswordResetTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
+    'PhabricatorAuthPasswordRevokeTransaction' => 'PhabricatorAuthPasswordTransactionType',
+    'PhabricatorAuthPasswordRevoker' => 'PhabricatorAuthRevoker',
+    'PhabricatorAuthPasswordTestCase' => 'PhabricatorTestCase',
+    'PhabricatorAuthPasswordTransaction' => 'PhabricatorApplicationTransaction',
+    'PhabricatorAuthPasswordTransactionType' => 'PhabricatorModularTransactionType',
     'PhabricatorAuthProvider' => 'Phobject',
     'PhabricatorAuthProviderConfig' => array(
       'PhabricatorAuthDAO',
@@ -8984,6 +9008,7 @@
     'PhabricatorPagerUIExample' => 'PhabricatorUIExample',
     'PhabricatorPassphraseApplication' => 'PhabricatorApplication',
     'PhabricatorPasswordAuthProvider' => 'PhabricatorAuthProvider',
+    'PhabricatorPasswordDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
     'PhabricatorPasswordHasher' => 'Phobject',
     'PhabricatorPasswordHasherTestCase' => 'PhabricatorTestCase',
     'PhabricatorPasswordHasherUnavailableException' => 'Exception',
diff --git a/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php b/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
new file mode 100644
index 0000000000..78491845aa
--- /dev/null
+++ b/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
@@ -0,0 +1,31 @@
+<?php
+
+final class PhabricatorAuthPasswordTestCase extends PhabricatorTestCase {
+
+  protected function getPhabricatorTestCaseConfiguration() {
+    return array(
+      self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
+    );
+  }
+
+  public function testCompare() {
+    $password1 = new PhutilOpaqueEnvelope('hunter2');
+    $password2 = new PhutilOpaqueEnvelope('hunter3');
+
+    $user = $this->generateNewTestUser();
+    $type = PhabricatorAuthPassword::PASSWORD_TYPE_TEST;
+
+    $pass = PhabricatorAuthPassword::initializeNewPassword($user, $type)
+      ->setPassword($password1, $user)
+      ->save();
+
+    $this->assertTrue(
+      $pass->comparePassword($password1, $user),
+      pht('Good password should match.'));
+
+    $this->assertFalse(
+      $pass->comparePassword($password2, $user),
+      pht('Bad password should not match.'));
+  }
+
+}
diff --git a/src/applications/auth/editor/PhabricatorAuthPasswordEditor.php b/src/applications/auth/editor/PhabricatorAuthPasswordEditor.php
new file mode 100644
index 0000000000..6812fd8f66
--- /dev/null
+++ b/src/applications/auth/editor/PhabricatorAuthPasswordEditor.php
@@ -0,0 +1,22 @@
+<?php
+
+final class PhabricatorAuthPasswordEditor
+  extends PhabricatorApplicationTransactionEditor {
+
+  public function getEditorApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
+  public function getEditorObjectsDescription() {
+    return pht('Passwords');
+  }
+
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this password.', $author);
+  }
+
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
+  }
+
+}
diff --git a/src/applications/auth/extension/PhabricatorPasswordDestructionEngineExtension.php b/src/applications/auth/extension/PhabricatorPasswordDestructionEngineExtension.php
new file mode 100644
index 0000000000..7b28044b0b
--- /dev/null
+++ b/src/applications/auth/extension/PhabricatorPasswordDestructionEngineExtension.php
@@ -0,0 +1,29 @@
+<?php
+
+final class PhabricatorPasswordDestructionEngineExtension
+  extends PhabricatorDestructionEngineExtension {
+
+  const EXTENSIONKEY = 'passwords';
+
+  public function getExtensionName() {
+    return pht('Passwords');
+  }
+
+  public function destroyObject(
+    PhabricatorDestructionEngine $engine,
+    $object) {
+
+    $viewer = $engine->getViewer();
+    $object_phid = $object->getPHID();
+
+    $passwords = id(new PhabricatorAuthPasswordQuery())
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object_phid))
+      ->execute();
+
+    foreach ($passwords as $password) {
+      $engine->destroyObject($password);
+    }
+  }
+
+}
diff --git a/src/applications/auth/phid/PhabricatorAuthPasswordPHIDType.php b/src/applications/auth/phid/PhabricatorAuthPasswordPHIDType.php
new file mode 100644
index 0000000000..8433df8824
--- /dev/null
+++ b/src/applications/auth/phid/PhabricatorAuthPasswordPHIDType.php
@@ -0,0 +1,36 @@
+<?php
+
+final class PhabricatorAuthPasswordPHIDType extends PhabricatorPHIDType {
+
+  const TYPECONST = 'APAS';
+
+  public function getTypeName() {
+    return pht('Auth Password');
+  }
+
+  public function newObject() {
+    return new PhabricatorAuthPassword();
+  }
+
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
+  protected function buildQueryForObjects(
+    PhabricatorObjectQuery $query,
+    array $phids) {
+    return id(new PhabricatorAuthPasswordQuery())
+      ->withPHIDs($phids);
+  }
+
+  public function loadHandles(
+    PhabricatorHandleQuery $query,
+    array $handles,
+    array $objects) {
+
+    foreach ($handles as $phid => $handle) {
+      $password = $objects[$phid];
+    }
+  }
+
+}
diff --git a/src/applications/auth/query/PhabricatorAuthPasswordQuery.php b/src/applications/auth/query/PhabricatorAuthPasswordQuery.php
new file mode 100644
index 0000000000..483936fb30
--- /dev/null
+++ b/src/applications/auth/query/PhabricatorAuthPasswordQuery.php
@@ -0,0 +1,114 @@
+<?php
+
+final class PhabricatorAuthPasswordQuery
+  extends PhabricatorCursorPagedPolicyAwareQuery {
+
+  private $ids;
+  private $phids;
+  private $objectPHIDs;
+  private $passwordTypes;
+  private $isRevoked;
+
+  public function withIDs(array $ids) {
+    $this->ids = $ids;
+    return $this;
+  }
+
+  public function withPHIDs(array $phids) {
+    $this->phids = $phids;
+    return $this;
+  }
+
+  public function withObjectPHIDs(array $object_phids) {
+    $this->objectPHIDs = $object_phids;
+    return $this;
+  }
+
+  public function withPasswordTypes(array $types) {
+    $this->passwordTypes = $types;
+    return $this;
+  }
+
+  public function withIsRevoked($is_revoked) {
+    $this->isRevoked = $is_revoked;
+    return $this;
+  }
+
+  public function newResultObject() {
+    return new PhabricatorAuthPassword();
+  }
+
+  protected function loadPage() {
+    return $this->loadStandardPage($this->newResultObject());
+  }
+
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
+
+    if ($this->ids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'id IN (%Ld)',
+        $this->ids);
+    }
+
+    if ($this->phids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'phid IN (%Ls)',
+        $this->phids);
+    }
+
+    if ($this->objectPHIDs !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'objectPHID IN (%Ls)',
+        $this->objectPHIDs);
+    }
+
+    if ($this->passwordTypes !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'passwordType IN (%Ls)',
+        $this->passwordTypes);
+    }
+
+    if ($this->isRevoked !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'isRevoked = %d',
+        (int)$this->isRevoked);
+    }
+
+    return $where;
+  }
+
+  protected function willFilterPage(array $passwords) {
+    $object_phids = mpull($passwords, 'getObjectPHID');
+
+    $objects = id(new PhabricatorObjectQuery())
+      ->setViewer($this->getViewer())
+      ->setParentQuery($this)
+      ->withPHIDs($object_phids)
+      ->execute();
+    $objects = mpull($objects, null, 'getPHID');
+
+    foreach ($passwords as $key => $password) {
+      $object = idx($objects, $password->getObjectPHID());
+      if (!$object) {
+        unset($passwords[$key]);
+        $this->didRejectResult($password);
+        continue;
+      }
+
+      $password->attachObject($object);
+    }
+
+    return $passwords;
+  }
+
+  public function getQueryApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
+}
diff --git a/src/applications/auth/revoker/PhabricatorAuthPasswordRevoker.php b/src/applications/auth/revoker/PhabricatorAuthPasswordRevoker.php
new file mode 100644
index 0000000000..e42d0db256
--- /dev/null
+++ b/src/applications/auth/revoker/PhabricatorAuthPasswordRevoker.php
@@ -0,0 +1,52 @@
+<?php
+
+final class PhabricatorAuthPasswordRevoker
+  extends PhabricatorAuthRevoker {
+
+  const REVOKERKEY = 'password';
+
+  public function revokeAllCredentials() {
+    $query = new PhabricatorAuthPasswordQuery();
+    return $this->revokeWithQuery($query);
+  }
+
+  public function revokeCredentialsFrom($object) {
+    $query = id(new PhabricatorAuthPasswordQuery())
+      ->withObjectPHIDs(array($object->getPHID()));
+    return $this->revokeWithQuery($query);
+  }
+
+  private function revokeWithQuery(PhabricatorAuthPasswordQuery $query) {
+    $viewer = $this->getViewer();
+
+    $passwords = $query
+      ->setViewer($viewer)
+      ->withIsRevoked(false)
+      ->execute();
+
+    $content_source = PhabricatorContentSource::newForSource(
+      PhabricatorDaemonContentSource::SOURCECONST);
+
+    $revoke_type = PhabricatorAuthPasswordRevokeTransaction::TRANSACTIONTYPE;
+
+    $auth_phid = id(new PhabricatorAuthApplication())->getPHID();
+    foreach ($passwords as $password) {
+      $xactions = array();
+
+      $xactions[] = $password->getApplicationTransactionTemplate()
+        ->setTransactionType($revoke_type)
+        ->setNewValue(true);
+
+      $editor = $password->getApplicationTransactionEditor()
+        ->setActor($viewer)
+        ->setActingAsPHID($auth_phid)
+        ->setContinueOnNoEffect(true)
+        ->setContinueOnMissingFields(true)
+        ->setContentSource($content_source)
+        ->applyTransactions($password, $xactions);
+    }
+
+    return count($passwords);
+  }
+
+}
diff --git a/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php b/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
index 16cc8eaea4..aafb60cfca 100644
--- a/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
@@ -37,7 +37,7 @@ private function revokeWithQuery(PhabricatorAuthSSHKeyQuery $query) {
         ->setTransactionType(PhabricatorAuthSSHKeyTransaction::TYPE_DEACTIVATE)
         ->setNewValue(1);
 
-      $editor = id(new PhabricatorAuthSSHKeyEditor())
+      $editor = $ssh_key->getApplicationTransactionEditor()
         ->setActor($viewer)
         ->setActingAsPHID($auth_phid)
         ->setContinueOnNoEffect(true)
diff --git a/src/applications/auth/storage/PhabricatorAuthPassword.php b/src/applications/auth/storage/PhabricatorAuthPassword.php
new file mode 100644
index 0000000000..7d9e22c960
--- /dev/null
+++ b/src/applications/auth/storage/PhabricatorAuthPassword.php
@@ -0,0 +1,167 @@
+<?php
+
+final class PhabricatorAuthPassword
+  extends PhabricatorAuthDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface,
+    PhabricatorApplicationTransactionInterface {
+
+  protected $objectPHID;
+  protected $passwordType;
+  protected $passwordHash;
+  protected $isRevoked;
+
+  private $object = self::ATTACHABLE;
+
+  const PASSWORD_TYPE_ACCOUNT = 'account';
+  const PASSWORD_TYPE_VCS = 'vcs';
+  const PASSWORD_TYPE_TEST = 'test';
+
+  public static function initializeNewPassword(
+    PhabricatorUser $object,
+    $type) {
+
+    return id(new self())
+      ->setObjectPHID($object->getPHID())
+      ->attachObject($object)
+      ->setPasswordType($type)
+      ->setIsRevoked(0);
+  }
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_AUX_PHID => true,
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'passwordType' => 'text64',
+        'passwordHash' => 'text128',
+        'isRevoked' => 'bool',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_role' => array(
+          'columns' => array('objectPHID', 'passwordType'),
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  public function getPHIDType() {
+    return PhabricatorAuthPasswordPHIDType::TYPECONST;
+  }
+
+  public function getObject() {
+    return $this->assertAttached($this->object);
+  }
+
+  public function attachObject($object) {
+    $this->object = $object;
+    return $this;
+  }
+
+  public function setPassword(
+    PhutilOpaqueEnvelope $password,
+    PhabricatorUser $object) {
+
+    $hasher = PhabricatorPasswordHasher::getBestHasher();
+
+    $digest = $this->digestPassword($password, $object);
+    $hash = $hasher->getPasswordHashForStorage($digest);
+    $raw_hash = $hash->openEnvelope();
+
+    return $this->setPasswordHash($raw_hash);
+  }
+
+  public function comparePassword(
+    PhutilOpaqueEnvelope $password,
+    PhabricatorUser $object) {
+
+    $digest = $this->digestPassword($password, $object);
+    $raw_hash = $this->getPasswordHash();
+    $hash = new PhutilOpaqueEnvelope($raw_hash);
+
+    return PhabricatorPasswordHasher::comparePassword($digest, $hash);
+  }
+
+  private function digestPassword(
+    PhutilOpaqueEnvelope $password,
+    PhabricatorUser $object) {
+
+    $object_phid = $object->getPHID();
+
+    if ($this->getObjectPHID() !== $object->getPHID()) {
+      throw new Exception(
+        pht(
+          'This password is associated with an object PHID ("%s") for '.
+          'a different object than the provided one ("%s").',
+          $this->getObjectPHID(),
+          $object->getPHID()));
+    }
+
+    $raw_input = PhabricatorHash::digestPassword($password, $object_phid);
+
+    return new PhutilOpaqueEnvelope($raw_input);
+  }
+
+
+
+/* -(  PhabricatorPolicyInterface  )----------------------------------------- */
+
+
+  public function getCapabilities() {
+    return array(
+      PhabricatorPolicyCapability::CAN_VIEW,
+    );
+  }
+
+  public function getPolicy($capability) {
+    return PhabricatorPolicies::getMostOpenPolicy();
+  }
+
+  public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
+    return false;
+  }
+
+
+/* -(  PhabricatorExtendedPolicyInterface  )--------------------------------- */
+
+
+  public function getExtendedPolicy($capability, PhabricatorUser $viewer) {
+    return array(
+      array($this->getObject(), PhabricatorPolicyCapability::CAN_VIEW),
+    );
+  }
+
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $this->delete();
+  }
+
+
+/* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
+
+
+  public function getApplicationTransactionEditor() {
+    return new PhabricatorAuthPasswordEditor();
+  }
+
+  public function getApplicationTransactionObject() {
+    return $this;
+  }
+
+  public function getApplicationTransactionTemplate() {
+    return new PhabricatorAuthPasswordTransaction();
+  }
+
+  public function willRenderTimeline(
+    PhabricatorApplicationTransactionView $timeline,
+    AphrontRequest $request) {
+
+    return $timeline;
+  }
+
+
+}
diff --git a/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php b/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php
new file mode 100644
index 0000000000..f416331fda
--- /dev/null
+++ b/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php
@@ -0,0 +1,21 @@
+<?php
+
+final class PhabricatorAuthPasswordTransaction
+  extends PhabricatorApplicationTransaction {
+
+  public function getApplicationName() {
+    return 'auth';
+  }
+
+  public function getApplicationTransactionType() {
+    return PhabricatorAuthPasswordPHIDType::TYPECONST;
+  }
+
+  public function getApplicationTransactionCommentObject() {
+    return null;
+  }
+
+  public function getBaseTransactionClass() {
+    return 'PhabricatorAuthPasswordTransactionType';
+  }
+}
diff --git a/src/applications/auth/xaction/PhabricatorAuthPasswordRevokeTransaction.php b/src/applications/auth/xaction/PhabricatorAuthPasswordRevokeTransaction.php
new file mode 100644
index 0000000000..e5f9489f6e
--- /dev/null
+++ b/src/applications/auth/xaction/PhabricatorAuthPasswordRevokeTransaction.php
@@ -0,0 +1,32 @@
+<?php
+
+final class PhabricatorAuthPasswordRevokeTransaction
+  extends PhabricatorAuthPasswordTransactionType {
+
+  const TRANSACTIONTYPE = 'password.revoke';
+
+  public function generateOldValue($object) {
+    return (bool)$object->getIsRevoked();
+  }
+
+  public function generateNewValue($object, $value) {
+    return (bool)$value;
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setIsRevoked((int)$value);
+  }
+
+  public function getTitle() {
+    if ($this->getNewValue()) {
+      return pht(
+        '%s revoked this password.',
+        $this->renderAuthor());
+    } else {
+      return pht(
+        '%s removed this password from the revocation list.',
+        $this->renderAuthor());
+    }
+  }
+
+}
diff --git a/src/applications/auth/xaction/PhabricatorAuthPasswordTransactionType.php b/src/applications/auth/xaction/PhabricatorAuthPasswordTransactionType.php
new file mode 100644
index 0000000000..c557ffa10f
--- /dev/null
+++ b/src/applications/auth/xaction/PhabricatorAuthPasswordTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class PhabricatorAuthPasswordTransactionType
+  extends PhabricatorModularTransactionType {}

From 42e2cd9af02e13c4ee5c145f279b887eef8f9c85 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 Jan 2018 17:41:31 -0800
Subject: [PATCH 379/865] Add a "--force" flag to `bin/auth revoke`

Summary: Ref T13043. I'd like to replace the manual credential revocation in the Phacility export workflow with shared code in `bin/auth revoke`, but we need it to run non-interactively. Add a `--force` flag purely to make our lives easier.

Test Plan: Ran `bin/auth revoke --everywhere ...` with and without `--force`. Got prompted without, got total annihilation with.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18895
---
 .../management/PhabricatorAuthManagementRevokeWorkflow.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
index 758761b2ca..ea46fef540 100644
--- a/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
+++ b/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
@@ -34,6 +34,10 @@ protected function didConstruct() {
             'name' => 'everywhere',
             'help' => pht('Revoke from all credential owners.'),
           ),
+          array(
+            'name' => 'force',
+            'help' => pht('Revoke credentials without prompting.'),
+          ),
         ));
   }
 
@@ -41,6 +45,7 @@ public function execute(PhutilArgumentParser $args) {
     $viewer = PhabricatorUser::getOmnipotentUser();
 
     $all_types = PhabricatorAuthRevoker::getAllRevokers();
+    $is_force = $args->getArg('force');
 
     $type = $args->getArg('type');
     $is_everything = $args->getArg('everything');
@@ -97,7 +102,7 @@ public function execute(PhutilArgumentParser $args) {
       }
     }
 
-    if ($is_everywhere) {
+    if ($is_everywhere && !$is_force) {
       echo id(new PhutilConsoleBlock())
         ->addParagraph(
           pht(

From c280c85772a3d8e74dc906fa6babe9a22ec009c3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 Jan 2018 19:22:09 -0800
Subject: [PATCH 380/865] Consolidate password verification/revocation logic in
 a new PhabricatorAuthPasswordEngine

Summary:
Ref T13043. This provides a new piece of shared infrastructure that VCS passwords and account passwords can use to validate passwords that users enter.

This isn't reachable by anything yet.

The test coverage of the "upgrade" flow (where we rehash a password to use a stronger hasher) isn't great in this diff, I'll expand that in the next change and then start migrating things.

Test Plan: Added a bunch of unit tests.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18896
---
 src/__phutil_library_map__.php                |   6 +-
 .../PhabricatorAuthPasswordTestCase.php       |  92 +++++++
 .../engine/PhabricatorAuthPasswordEngine.php  | 240 ++++++++++++++++++
 .../auth/storage/PhabricatorAuthPassword.php  |  42 ++-
 .../PhabricatorAuthPasswordTransaction.php    |   2 +-
 ...bricatorAuthPasswordUpgradeTransaction.php |  24 ++
 6 files changed, 402 insertions(+), 4 deletions(-)
 create mode 100644 src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
 create mode 100644 src/applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index a83eb55345..67be49d017 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2091,6 +2091,7 @@
     'PhabricatorAuthOneTimeLoginTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthOneTimeLoginTemporaryTokenType.php',
     'PhabricatorAuthPassword' => 'applications/auth/storage/PhabricatorAuthPassword.php',
     'PhabricatorAuthPasswordEditor' => 'applications/auth/editor/PhabricatorAuthPasswordEditor.php',
+    'PhabricatorAuthPasswordEngine' => 'applications/auth/engine/PhabricatorAuthPasswordEngine.php',
     'PhabricatorAuthPasswordPHIDType' => 'applications/auth/phid/PhabricatorAuthPasswordPHIDType.php',
     'PhabricatorAuthPasswordQuery' => 'applications/auth/query/PhabricatorAuthPasswordQuery.php',
     'PhabricatorAuthPasswordResetTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php',
@@ -2099,6 +2100,7 @@
     'PhabricatorAuthPasswordTestCase' => 'applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php',
     'PhabricatorAuthPasswordTransaction' => 'applications/auth/storage/PhabricatorAuthPasswordTransaction.php',
     'PhabricatorAuthPasswordTransactionType' => 'applications/auth/xaction/PhabricatorAuthPasswordTransactionType.php',
+    'PhabricatorAuthPasswordUpgradeTransaction' => 'applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php',
     'PhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorAuthProvider.php',
     'PhabricatorAuthProviderConfig' => 'applications/auth/storage/PhabricatorAuthProviderConfig.php',
     'PhabricatorAuthProviderConfigController' => 'applications/auth/controller/config/PhabricatorAuthProviderConfigController.php',
@@ -7383,14 +7385,16 @@
       'PhabricatorApplicationTransactionInterface',
     ),
     'PhabricatorAuthPasswordEditor' => 'PhabricatorApplicationTransactionEditor',
+    'PhabricatorAuthPasswordEngine' => 'Phobject',
     'PhabricatorAuthPasswordPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorAuthPasswordQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorAuthPasswordResetTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
     'PhabricatorAuthPasswordRevokeTransaction' => 'PhabricatorAuthPasswordTransactionType',
     'PhabricatorAuthPasswordRevoker' => 'PhabricatorAuthRevoker',
     'PhabricatorAuthPasswordTestCase' => 'PhabricatorTestCase',
-    'PhabricatorAuthPasswordTransaction' => 'PhabricatorApplicationTransaction',
+    'PhabricatorAuthPasswordTransaction' => 'PhabricatorModularTransaction',
     'PhabricatorAuthPasswordTransactionType' => 'PhabricatorModularTransactionType',
+    'PhabricatorAuthPasswordUpgradeTransaction' => 'PhabricatorAuthPasswordTransactionType',
     'PhabricatorAuthProvider' => 'Phobject',
     'PhabricatorAuthProviderConfig' => array(
       'PhabricatorAuthDAO',
diff --git a/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php b/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
index 78491845aa..a388ab8386 100644
--- a/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
+++ b/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
@@ -28,4 +28,96 @@ public function testCompare() {
       pht('Bad password should not match.'));
   }
 
+  public function testPasswordEngine() {
+    $password1 = new PhutilOpaqueEnvelope('the quick');
+    $password2 = new PhutilOpaqueEnvelope('brown fox');
+
+    $user = $this->generateNewTestUser();
+    $test_type = PhabricatorAuthPassword::PASSWORD_TYPE_TEST;
+    $account_type = PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT;
+    $content_source = $this->newContentSource();
+
+    $engine = id(new PhabricatorAuthPasswordEngine())
+      ->setViewer($user)
+      ->setContentSource($content_source)
+      ->setPasswordType($test_type)
+      ->setObject($user);
+
+    $account_engine = id(new PhabricatorAuthPasswordEngine())
+      ->setViewer($user)
+      ->setContentSource($content_source)
+      ->setPasswordType($account_type)
+      ->setObject($user);
+
+    // We haven't set any passwords yet, so both passwords should be
+    // invalid.
+    $this->assertFalse($engine->isValidPassword($password1));
+    $this->assertFalse($engine->isValidPassword($password2));
+
+    $pass = PhabricatorAuthPassword::initializeNewPassword($user, $test_type)
+      ->setPassword($password1, $user)
+      ->save();
+
+    // The password should now be valid.
+    $this->assertTrue($engine->isValidPassword($password1));
+    $this->assertFalse($engine->isValidPassword($password2));
+
+    // But, since the password is a "test" password, it should not be a valid
+    // "account" password.
+    $this->assertFalse($account_engine->isValidPassword($password1));
+    $this->assertFalse($account_engine->isValidPassword($password2));
+
+    // Both passwords are unique for the "test" engine, since an active
+    // password of a given type doesn't collide with itself.
+    $this->assertTrue($engine->isUniquePassword($password1));
+    $this->assertTrue($engine->isUniquePassword($password2));
+
+    // The "test" password is no longer unique for the "account" engine.
+    $this->assertFalse($account_engine->isUniquePassword($password1));
+    $this->assertTrue($account_engine->isUniquePassword($password2));
+
+    $this->revokePassword($user, $pass);
+
+    // Now that we've revoked the password, it should no longer be valid.
+    $this->assertFalse($engine->isValidPassword($password1));
+    $this->assertFalse($engine->isValidPassword($password2));
+
+    // But it should be a revoked password.
+    $this->assertTrue($engine->isRevokedPassword($password1));
+    $this->assertFalse($engine->isRevokedPassword($password2));
+
+    // It should be revoked for both roles: revoking a "test" password also
+    // prevents you from choosing it as a new "account" password.
+    $this->assertTrue($account_engine->isRevokedPassword($password1));
+    $this->assertFalse($account_engine->isValidPassword($password2));
+
+    // The revoked password makes this password non-unique for all account
+    // types.
+    $this->assertFalse($engine->isUniquePassword($password1));
+    $this->assertTrue($engine->isUniquePassword($password2));
+    $this->assertFalse($account_engine->isUniquePassword($password1));
+    $this->assertTrue($account_engine->isUniquePassword($password2));
+  }
+
+  private function revokePassword(
+    PhabricatorUser $actor,
+    PhabricatorAuthPassword $password) {
+
+    $content_source = $this->newContentSource();
+    $revoke_type = PhabricatorAuthPasswordRevokeTransaction::TRANSACTIONTYPE;
+
+    $xactions = array();
+
+    $xactions[] = $password->getApplicationTransactionTemplate()
+      ->setTransactionType($revoke_type)
+      ->setNewValue(true);
+
+    $editor = $password->getApplicationTransactionEditor()
+      ->setActor($actor)
+      ->setContinueOnNoEffect(true)
+      ->setContinueOnMissingFields(true)
+      ->setContentSource($content_source)
+      ->applyTransactions($password, $xactions);
+  }
+
 }
diff --git a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
new file mode 100644
index 0000000000..7bd0186c72
--- /dev/null
+++ b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
@@ -0,0 +1,240 @@
+<?php
+
+final class PhabricatorAuthPasswordEngine
+  extends Phobject {
+
+  private $viewer;
+  private $contentSource;
+  private $object;
+  private $passwordType;
+  private $upgradeHashers = true;
+
+  public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  public function getViewer() {
+    return $this->viewer;
+  }
+
+  public function setContentSource(PhabricatorContentSource $content_source) {
+    $this->contentSource = $content_source;
+    return $this;
+  }
+
+  public function getContentSource() {
+    return $this->contentSource;
+  }
+
+  public function setObject($object) {
+    $this->object = $object;
+    return $this;
+  }
+
+  public function getObject() {
+    return $this->object;
+  }
+
+  public function setPasswordType($password_type) {
+    $this->passwordType = $password_type;
+    return $this;
+  }
+
+  public function getPasswordType() {
+    return $this->passwordType;
+  }
+
+  public function setUpgradeHashers($upgrade_hashers) {
+    $this->upgradeHashers = $upgrade_hashers;
+    return $this;
+  }
+
+  public function getUpgradeHashers() {
+    return $this->upgradeHashers;
+  }
+
+  public function isValidPassword(PhutilOpaqueEnvelope $envelope) {
+    $this->requireSetup();
+
+    $password_type = $this->getPasswordType();
+
+    $passwords = $this->newQuery()
+      ->withPasswordTypes(array($password_type))
+      ->withIsRevoked(false)
+      ->execute();
+
+    $matches = $this->getMatches($envelope, $passwords);
+    if (!$matches) {
+      return false;
+    }
+
+    if ($this->shouldUpgradeHashers()) {
+      $this->upgradeHashers($envelope, $matches);
+    }
+
+    return true;
+  }
+
+  public function isUniquePassword(PhutilOpaqueEnvelope $envelope) {
+    $this->requireSetup();
+
+    $password_type = $this->getPasswordType();
+
+    // To test that the password is unique, we're loading all active and
+    // revoked passwords for all roles for the given user, then throwing out
+    // the active passwords for the current role (so a password can't
+    // collide with itself).
+
+    // Note that two different objects can have the same password (say,
+    // users @alice and @bailey). We're only preventing @alice from using
+    // the same password for everything.
+
+    $passwords = $this->newQuery()
+      ->execute();
+
+    foreach ($passwords as $key => $password) {
+      $same_type = ($password->getPasswordType() === $password_type);
+      $is_active = !$password->getIsRevoked();
+
+      if ($same_type && $is_active) {
+        unset($passwords[$key]);
+      }
+    }
+
+    $matches = $this->getMatches($envelope, $passwords);
+
+    return !$matches;
+  }
+
+  public function isRevokedPassword(PhutilOpaqueEnvelope $envelope) {
+    $this->requireSetup();
+
+    // To test if a password is revoked, we're loading all revoked passwords
+    // across all roles for the given user. If a password was revoked in one
+    // role, you can't reuse it in a different role.
+
+    $passwords = $this->newQuery()
+      ->withIsRevoked(true)
+      ->execute();
+
+    $matches = $this->getMatches($envelope, $passwords);
+
+    return (bool)$matches;
+  }
+
+  private function requireSetup() {
+    if (!$this->getObject()) {
+      throw new PhutilInvalidStateException('setObject');
+    }
+
+    if (!$this->getPasswordType()) {
+      throw new PhutilInvalidStateException('setPasswordType');
+    }
+
+    if (!$this->getViewer()) {
+      throw new PhutilInvalidStateException('setViewer');
+    }
+
+    if ($this->shouldUpgradeHashers()) {
+      if (!$this->getContentSource()) {
+        throw new PhutilInvalidStateException('setContentSource');
+      }
+    }
+  }
+
+  private function shouldUpgradeHashers() {
+    if (!$this->getUpgradeHashers()) {
+      return false;
+    }
+
+    if (PhabricatorEnv::isReadOnly()) {
+      // Don't try to upgrade hashers if we're in read-only mode, since we
+      // won't be able to write the new hash to the database.
+      return false;
+    }
+
+    return true;
+  }
+
+  private function newQuery() {
+    $viewer = $this->getViewer();
+    $object = $this->getObject();
+    $password_type = $this->getPasswordType();
+
+    return id(new PhabricatorAuthPasswordQuery())
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object->getPHID()));
+  }
+
+  private function getMatches(
+    PhutilOpaqueEnvelope $envelope,
+    array $passwords) {
+
+    $object = $this->getObject();
+
+    $matches = array();
+    foreach ($passwords as $password) {
+      try {
+        $is_match = $password->comparePassword($envelope, $object);
+      } catch (PhabricatorPasswordHasherUnavailableException $ex) {
+        $is_match = false;
+      }
+
+      if ($is_match) {
+        $matches[] = $password;
+      }
+    }
+
+    return $matches;
+  }
+
+  private function upgradeHashers(
+    PhutilOpaqueEnvelope $envelope,
+    array $passwords) {
+
+    assert_instances_of($passwords, 'PhabricatorAuthPassword');
+
+    $need_upgrade = array();
+    foreach ($passwords as $password) {
+      if (!$password->canUpgrade()) {
+        continue;
+      }
+      $need_upgrade[] = $password;
+    }
+
+    if (!$need_upgrade) {
+      return;
+    }
+
+    $upgrade_type = PhabricatorAuthPasswordUpgradeTransaction::TRANSACTIONTYPE;
+    $viewer = $this->getViewer();
+    $content_source = $this->getContentSource();
+
+    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+    foreach ($need_upgrade as $password) {
+
+      // This does the actual upgrade. We then apply a transaction to make
+      // the upgrade more visible and auditable.
+      $old_hasher = $password->getHasher();
+      $password->upgradePasswordHasher($envelope, $this->getObject());
+      $new_hasher = $password->getHasher();
+
+      $xactions = array();
+
+      $xactions[] = $password->getApplicationTransactionTemplate()
+        ->setTransactionType($upgrade_type)
+        ->setOldValue($old_hasher->getHashName())
+        ->setNewValue($new_hasher->getHashName());
+
+      $editor = $password->getApplicationTransactionEditor()
+        ->setActor($viewer)
+        ->setContinueOnNoEffect(true)
+        ->setContinueOnMissingFields(true)
+        ->setContentSource($content_source)
+        ->applyTransactions($password, $xactions);
+    }
+    unset($unguarded);
+  }
+
+}
diff --git a/src/applications/auth/storage/PhabricatorAuthPassword.php b/src/applications/auth/storage/PhabricatorAuthPassword.php
index 7d9e22c960..d578de6691 100644
--- a/src/applications/auth/storage/PhabricatorAuthPassword.php
+++ b/src/applications/auth/storage/PhabricatorAuthPassword.php
@@ -58,11 +58,46 @@ public function attachObject($object) {
     return $this;
   }
 
+  public function getHasher() {
+    $hash = $this->newPasswordEnvelope();
+    return PhabricatorPasswordHasher::getHasherForHash($hash);
+  }
+
+  public function canUpgrade() {
+    $hash = $this->newPasswordEnvelope();
+    return PhabricatorPasswordHasher::canUpgradeHash($hash);
+  }
+
+  public function upgradePasswordHasher(
+    PhutilOpaqueEnvelope $envelope,
+    PhabricatorUser $object) {
+
+    // Before we make changes, double check that this is really the correct
+    // password. It could be really bad if we "upgraded" a password and changed
+    // the secret!
+
+    if (!$this->comparePassword($envelope, $object)) {
+      throw new Exception(
+        pht(
+          'Attempting to upgrade password hasher, but the password for the '.
+          'upgrade is not the stored credential!'));
+    }
+
+    return $this->setPassword($envelope, $object);
+  }
+
   public function setPassword(
     PhutilOpaqueEnvelope $password,
     PhabricatorUser $object) {
 
     $hasher = PhabricatorPasswordHasher::getBestHasher();
+    return $this->setPasswordWithHasher($password, $object, $hasher);
+  }
+
+  public function setPasswordWithHasher(
+    PhutilOpaqueEnvelope $password,
+    PhabricatorUser $object,
+    PhabricatorPasswordHasher $hasher) {
 
     $digest = $this->digestPassword($password, $object);
     $hash = $hasher->getPasswordHashForStorage($digest);
@@ -76,12 +111,15 @@ public function comparePassword(
     PhabricatorUser $object) {
 
     $digest = $this->digestPassword($password, $object);
-    $raw_hash = $this->getPasswordHash();
-    $hash = new PhutilOpaqueEnvelope($raw_hash);
+    $hash = $this->newPasswordEnvelope();
 
     return PhabricatorPasswordHasher::comparePassword($digest, $hash);
   }
 
+  private function newPasswordEnvelope() {
+    return new PhutilOpaqueEnvelope($this->getPasswordHash());
+  }
+
   private function digestPassword(
     PhutilOpaqueEnvelope $password,
     PhabricatorUser $object) {
diff --git a/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php b/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php
index f416331fda..9d02112dff 100644
--- a/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php
+++ b/src/applications/auth/storage/PhabricatorAuthPasswordTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorAuthPasswordTransaction
-  extends PhabricatorApplicationTransaction {
+  extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'auth';
diff --git a/src/applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php b/src/applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php
new file mode 100644
index 0000000000..1f1fdde135
--- /dev/null
+++ b/src/applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php
@@ -0,0 +1,24 @@
+<?php
+
+final class PhabricatorAuthPasswordUpgradeTransaction
+  extends PhabricatorAuthPasswordTransactionType {
+
+  const TRANSACTIONTYPE = 'password.upgrade';
+
+  public function generateOldValue($object) {
+    return $this->getStorage()->getOldValue();
+  }
+
+  public function generateNewValue($object, $value) {
+    return (bool)$value;
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s upgraded the hash algorithm for this password from "%s" to "%s".',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+}

From bb12f4bab718fab0b02e11c4894db2d548472615 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 07:26:10 -0800
Subject: [PATCH 381/865] Add test coverage to the PasswordEngine upgrade
 workflow and fix a few bugs

Summary:
Ref T13043. When we verify a password and a better hasher is available, we automatically upgrade the stored hash to the stronger hasher.

Add test coverage for this workflow and fix a few bugs and issues, mostly related to shuffling the old hasher name into the transaction.

This doesn't touch anything user-visible yet.

Test Plan: Ran unit tests.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18897
---
 src/__phutil_library_map__.php                |  2 +
 .../PhabricatorAuthPasswordTestCase.php       | 85 +++++++++++++++++++
 .../editor/PhabricatorAuthPasswordEditor.php  | 11 +++
 .../engine/PhabricatorAuthPasswordEngine.php  |  2 +-
 ...habricatorAuthPasswordTransactionQuery.php | 10 +++
 ...bricatorAuthPasswordUpgradeTransaction.php | 10 ++-
 6 files changed, 117 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/auth/query/PhabricatorAuthPasswordTransactionQuery.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 67be49d017..38f97b4900 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2099,6 +2099,7 @@
     'PhabricatorAuthPasswordRevoker' => 'applications/auth/revoker/PhabricatorAuthPasswordRevoker.php',
     'PhabricatorAuthPasswordTestCase' => 'applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php',
     'PhabricatorAuthPasswordTransaction' => 'applications/auth/storage/PhabricatorAuthPasswordTransaction.php',
+    'PhabricatorAuthPasswordTransactionQuery' => 'applications/auth/query/PhabricatorAuthPasswordTransactionQuery.php',
     'PhabricatorAuthPasswordTransactionType' => 'applications/auth/xaction/PhabricatorAuthPasswordTransactionType.php',
     'PhabricatorAuthPasswordUpgradeTransaction' => 'applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php',
     'PhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorAuthProvider.php',
@@ -7393,6 +7394,7 @@
     'PhabricatorAuthPasswordRevoker' => 'PhabricatorAuthRevoker',
     'PhabricatorAuthPasswordTestCase' => 'PhabricatorTestCase',
     'PhabricatorAuthPasswordTransaction' => 'PhabricatorModularTransaction',
+    'PhabricatorAuthPasswordTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorAuthPasswordTransactionType' => 'PhabricatorModularTransactionType',
     'PhabricatorAuthPasswordUpgradeTransaction' => 'PhabricatorAuthPasswordTransactionType',
     'PhabricatorAuthProvider' => 'Phobject',
diff --git a/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php b/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
index a388ab8386..6ac616b2a1 100644
--- a/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
+++ b/src/applications/auth/__tests__/PhabricatorAuthPasswordTestCase.php
@@ -99,6 +99,91 @@ public function testPasswordEngine() {
     $this->assertTrue($account_engine->isUniquePassword($password2));
   }
 
+  public function testPasswordUpgrade() {
+    $weak_hasher = new PhabricatorIteratedMD5PasswordHasher();
+
+    // Make sure we have two different hashers, and that the second one is
+    // stronger than iterated MD5. The most common reason this would fail is
+    // if an install does not have bcrypt available.
+    $strong_hasher = PhabricatorPasswordHasher::getBestHasher();
+    if ($strong_hasher->getStrength() <= $weak_hasher->getStrength()) {
+      $this->assertSkipped(
+        pht(
+          'Multiple password hashers of different strengths are not '.
+          'available, so hash upgrading can not be tested.'));
+    }
+
+    $envelope = new PhutilOpaqueEnvelope('lunar1997');
+
+    $user = $this->generateNewTestUser();
+    $type = PhabricatorAuthPassword::PASSWORD_TYPE_TEST;
+    $content_source = $this->newContentSource();
+
+    $engine = id(new PhabricatorAuthPasswordEngine())
+      ->setViewer($user)
+      ->setContentSource($content_source)
+      ->setPasswordType($type)
+      ->setObject($user);
+
+    $password = PhabricatorAuthPassword::initializeNewPassword($user, $type)
+      ->setPasswordWithHasher($envelope, $user, $weak_hasher)
+      ->save();
+
+    $weak_name = $weak_hasher->getHashName();
+    $strong_name = $strong_hasher->getHashName();
+
+    // Since we explicitly used the weak hasher, the password should have
+    // been hashed with it.
+    $actual_hasher = $password->getHasher();
+    $this->assertEqual($weak_name, $actual_hasher->getHashName());
+
+    $is_valid = $engine
+      ->setUpgradeHashers(false)
+      ->isValidPassword($envelope, $user);
+    $password->reload();
+
+    // Since we disabled hasher upgrading, the password should not have been
+    // rehashed.
+    $this->assertTrue($is_valid);
+    $actual_hasher = $password->getHasher();
+    $this->assertEqual($weak_name, $actual_hasher->getHashName());
+
+    $is_valid = $engine
+      ->setUpgradeHashers(true)
+      ->isValidPassword($envelope, $user);
+    $password->reload();
+
+    // Now that we enabled hasher upgrading, the password should have been
+    // automatically rehashed into the stronger format.
+    $this->assertTrue($is_valid);
+    $actual_hasher = $password->getHasher();
+    $this->assertEqual($strong_name, $actual_hasher->getHashName());
+
+    // We should also have an "upgrade" transaction in the transaction record
+    // now which records the two hasher names.
+    $xactions = id(new PhabricatorAuthPasswordTransactionQuery())
+      ->setViewer($user)
+      ->withObjectPHIDs(array($password->getPHID()))
+      ->withTransactionTypes(
+        array(
+          PhabricatorAuthPasswordUpgradeTransaction::TRANSACTIONTYPE,
+        ))
+      ->execute();
+
+    $this->assertEqual(1, count($xactions));
+    $xaction = head($xactions);
+
+    $this->assertEqual($weak_name, $xaction->getOldValue());
+    $this->assertEqual($strong_name, $xaction->getNewValue());
+
+    $is_valid = $engine
+      ->isValidPassword($envelope, $user);
+
+    // Finally, the password should still be valid after all the dust has
+    // settled.
+    $this->assertTrue($is_valid);
+  }
+
   private function revokePassword(
     PhabricatorUser $actor,
     PhabricatorAuthPassword $password) {
diff --git a/src/applications/auth/editor/PhabricatorAuthPasswordEditor.php b/src/applications/auth/editor/PhabricatorAuthPasswordEditor.php
index 6812fd8f66..0867d22b87 100644
--- a/src/applications/auth/editor/PhabricatorAuthPasswordEditor.php
+++ b/src/applications/auth/editor/PhabricatorAuthPasswordEditor.php
@@ -3,6 +3,17 @@
 final class PhabricatorAuthPasswordEditor
   extends PhabricatorApplicationTransactionEditor {
 
+  private $oldHasher;
+
+  public function setOldHasher(PhabricatorPasswordHasher $old_hasher) {
+    $this->oldHasher = $old_hasher;
+    return $this;
+  }
+
+  public function getOldHasher() {
+    return $this->oldHasher;
+  }
+
   public function getEditorApplicationClass() {
     return 'PhabricatorAuthApplication';
   }
diff --git a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
index 7bd0186c72..1cbfa0c80b 100644
--- a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
@@ -224,7 +224,6 @@ private function upgradeHashers(
 
       $xactions[] = $password->getApplicationTransactionTemplate()
         ->setTransactionType($upgrade_type)
-        ->setOldValue($old_hasher->getHashName())
         ->setNewValue($new_hasher->getHashName());
 
       $editor = $password->getApplicationTransactionEditor()
@@ -232,6 +231,7 @@ private function upgradeHashers(
         ->setContinueOnNoEffect(true)
         ->setContinueOnMissingFields(true)
         ->setContentSource($content_source)
+        ->setOldHasher($old_hasher)
         ->applyTransactions($password, $xactions);
     }
     unset($unguarded);
diff --git a/src/applications/auth/query/PhabricatorAuthPasswordTransactionQuery.php b/src/applications/auth/query/PhabricatorAuthPasswordTransactionQuery.php
new file mode 100644
index 0000000000..519b6aa77b
--- /dev/null
+++ b/src/applications/auth/query/PhabricatorAuthPasswordTransactionQuery.php
@@ -0,0 +1,10 @@
+<?php
+
+final class PhabricatorAuthPasswordTransactionQuery
+  extends PhabricatorApplicationTransactionQuery {
+
+  public function getTemplateApplicationTransaction() {
+    return new PhabricatorAuthPasswordTransaction();
+  }
+
+}
diff --git a/src/applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php b/src/applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php
index 1f1fdde135..9804ab5ace 100644
--- a/src/applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php
+++ b/src/applications/auth/xaction/PhabricatorAuthPasswordUpgradeTransaction.php
@@ -6,11 +6,17 @@ final class PhabricatorAuthPasswordUpgradeTransaction
   const TRANSACTIONTYPE = 'password.upgrade';
 
   public function generateOldValue($object) {
-    return $this->getStorage()->getOldValue();
+    $old_hasher = $this->getEditor()->getOldHasher();
+
+    if (!$old_hasher) {
+      throw new PhutilInvalidStateException('setOldHasher');
+    }
+
+    return $old_hasher->getHashName();
   }
 
   public function generateNewValue($object, $value) {
-    return (bool)$value;
+    return $value;
   }
 
   public function getTitle() {

From dd8f588ac51bb178fb24aeb8f09ee1c0cd097d68 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 20 Jan 2018 19:22:17 -0800
Subject: [PATCH 382/865] Migrate VCS passwords to new shared password
 infrastructure

Summary:
Ref T13043. Migrate VCS passwords away from their dedicated table to new the new shared infrastructure.

Future changes will migrate account passwords and remove the old table.

Test Plan:
- Ran migrations.
  - Cloned with the same password that was configured before the migrations (worked).
  - Cloned with a different, invalid password (failed).
- Changed password.
  - Cloned with old password (failed).
  - Cloned with new password (worked).
- Deleted password in web UI.
  - Cloned with old password (failed).
- Set password to the same password as it currently is set to (worked, no "unique" collision).
- Set password to account password. !!This (incorrectly) works for now until account passwords migrate, since the uniqueness check can't see them yet.!!
- Set password to a new unique password.
  - Cloned (worked).
  - Revoked the password with `bin/auth revoke`.
  - Verified web UI shows "no password set".
  - Verified that pull no longer works.
  - Verified that I can no longer select the revoked password.
- Verified that accounts do not interact:
  - Tried to set account B to account A's password (worked).
  - Tried to set account B to a password revoked on account A (worked).
- Spot checked the `password` and `passwordtransaction` tables for saniity.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18898
---
 .../autopatches/20180120.auth.03.vcsdata.sql  |  5 ++
 .../autopatches/20180120.auth.04.vcsphid.php  | 22 ++++++++
 .../controller/DiffusionServeController.php   | 29 ++++-------
 .../DiffusionSetPasswordSettingsPanel.php     | 50 ++++++++++++-------
 4 files changed, 69 insertions(+), 37 deletions(-)
 create mode 100644 resources/sql/autopatches/20180120.auth.03.vcsdata.sql
 create mode 100644 resources/sql/autopatches/20180120.auth.04.vcsphid.php

diff --git a/resources/sql/autopatches/20180120.auth.03.vcsdata.sql b/resources/sql/autopatches/20180120.auth.03.vcsdata.sql
new file mode 100644
index 0000000000..3d1392bd5c
--- /dev/null
+++ b/resources/sql/autopatches/20180120.auth.03.vcsdata.sql
@@ -0,0 +1,5 @@
+INSERT INTO {$NAMESPACE}_auth.auth_password
+  (objectPHID, phid, passwordType, passwordHash, isRevoked,
+    dateCreated, dateModified)
+  SELECT userPHID, '', 'vcs', passwordHash, 0, dateCreated, dateModified
+    FROM {$NAMESPACE}_repository.repository_vcspassword;
diff --git a/resources/sql/autopatches/20180120.auth.04.vcsphid.php b/resources/sql/autopatches/20180120.auth.04.vcsphid.php
new file mode 100644
index 0000000000..40b61a54b9
--- /dev/null
+++ b/resources/sql/autopatches/20180120.auth.04.vcsphid.php
@@ -0,0 +1,22 @@
+<?php
+
+// Populate VCS passwords (which we copied from the old "VCS Password" table
+// in the last migration) with new PHIDs.
+
+$table = new PhabricatorAuthPassword();
+$conn = $table->establishConnection('w');
+
+foreach (new LiskMigrationIterator($table) as $row) {
+  if ($row->getPHID()) {
+    continue;
+  }
+
+  $new_phid = $row->generatePHID();
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET phid = %s WHERE id = %d',
+    $table->getTableName(),
+    $new_phid,
+    $row->getID());
+}
diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index 475f688a4c..0496b93bb6 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -715,28 +715,17 @@ private function authenticateHTTPRepositoryUser(
       return null;
     }
 
-    $password_entry = id(new PhabricatorRepositoryVCSPassword())
-      ->loadOneWhere('userPHID = %s', $user->getPHID());
-    if (!$password_entry) {
-      // User doesn't have a password set.
-      return null;
-    }
-
-    if (!$password_entry->comparePassword($password, $user)) {
-      // Password doesn't match.
-      return null;
-    }
+    $request = $this->getRequest();
+    $content_source = PhabricatorContentSource::newFromRequest($request);
 
-    // If the user's password is stored using a less-than-optimal hash, upgrade
-    // them to the strongest available hash.
+    $engine = id(new PhabricatorAuthPasswordEngine())
+      ->setViewer($user)
+      ->setContentSource($content_source)
+      ->setPasswordType(PhabricatorAuthPassword::PASSWORD_TYPE_VCS)
+      ->setObject($user);
 
-    $hash_envelope = new PhutilOpaqueEnvelope(
-      $password_entry->getPasswordHash());
-    if (PhabricatorPasswordHasher::canUpgradeHash($hash_envelope)) {
-      $password_entry->setPassword($password, $user);
-      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-        $password_entry->save();
-      unset($unguarded);
+    if (!$engine->isValidPassword($password)) {
+      return null;
     }
 
     return $user;
diff --git a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
index ccfa0df4a4..2da51e0624 100644
--- a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
+++ b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
@@ -35,13 +35,20 @@ public function processRequest(AphrontRequest $request) {
       $request,
       '/settings/');
 
-    $vcspassword = id(new PhabricatorRepositoryVCSPassword())
-      ->loadOneWhere(
-        'userPHID = %s',
-        $user->getPHID());
-    if (!$vcspassword) {
-      $vcspassword = id(new PhabricatorRepositoryVCSPassword());
-      $vcspassword->setUserPHID($user->getPHID());
+    $vcs_type = PhabricatorAuthPassword::PASSWORD_TYPE_VCS;
+
+    $vcspasswords = id(new PhabricatorAuthPasswordQuery())
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($user->getPHID()))
+      ->withPasswordTypes(array($vcs_type))
+      ->withIsRevoked(false)
+      ->execute();
+    if ($vcspasswords) {
+      $vcspassword = head($vcspasswords);
+    } else {
+      $vcspassword = PhabricatorAuthPassword::initializeNewPassword(
+        $user,
+        $vcs_type);
     }
 
     $panel_uri = $this->getPanelURI('?saved=true');
@@ -77,23 +84,32 @@ public function processRequest(AphrontRequest $request) {
 
       if (!$errors) {
         $envelope = new PhutilOpaqueEnvelope($new_password);
+        $content_source = PhabricatorContentSource::newFromRequest($request);
 
-        try {
-          // NOTE: This test is against $viewer (not $user), so that the error
-          // message below makes sense in the case that the two are different,
-          // and because an admin reusing their own password is bad, while
-          // system agents generally do not have passwords anyway.
+        // NOTE: This test is against $viewer (not $user), so that the error
+        // message below makes sense in the case that the two are different,
+        // and because an admin reusing their own password is bad, while
+        // system agents generally do not have passwords anyway.
 
-          $same_password = $viewer->comparePassword($envelope);
-        } catch (PhabricatorPasswordHasherUnavailableException $ex) {
-          // If we're missing the hasher, just let the user continue.
-          $same_password = false;
-        }
+        $engine = id(new PhabricatorAuthPasswordEngine())
+          ->setViewer($viewer)
+          ->setContentSource($content_source)
+          ->setObject($viewer)
+          ->setPasswordType($vcs_type);
+
+        $same_password = !$engine->isUniquePassword($envelope);
+        $revoked_password = $engine->isRevokedPassword($envelope);
 
         if ($new_password !== $confirm) {
           $e_password = pht('Does Not Match');
           $e_confirm = pht('Does Not Match');
           $errors[] = pht('Password and confirmation do not match.');
+        } else if ($revoked_password) {
+          $e_password = pht('Revoked');
+          $e_confirm = pht('Revoked');
+          $errors[] = pht(
+            'This password has been revoked. You must choose a new, unique '.
+            'password.');
         } else if ($same_password) {
           $e_password = pht('Not Unique');
           $e_confirm = pht('Not Unique');

From 753c4c5ff1ad53d522cc4310b6b5176581bce2dd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 08:09:53 -0800
Subject: [PATCH 383/865] Remove the "PhabricatorRepositoryVCSPassword" class
 and table

Summary:
Ref T13043. After D18898, this has been migrated to new, more modern storage and no longer has any readers or writers.

One migration from long ago (early 2014) is affected. Since this is ancient and the cost of dropping this is small (see inline), I just dropped it.

I'll note this in the changelog.

Test Plan: Ran migrations, got a clean bill of health from `storage status`. Grepped for removed symbol.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18899
---
 .../autopatches/20140218.passwords.4.vcs.php  | 32 +++-------
 .../autopatches/20180121.auth.01.vcsnuke.sql  |  1 +
 src/__phutil_library_map__.php                |  2 -
 .../PhabricatorRepositoryVCSPassword.php      | 60 -------------------
 4 files changed, 10 insertions(+), 85 deletions(-)
 create mode 100644 resources/sql/autopatches/20180121.auth.01.vcsnuke.sql
 delete mode 100644 src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php

diff --git a/resources/sql/autopatches/20140218.passwords.4.vcs.php b/resources/sql/autopatches/20140218.passwords.4.vcs.php
index 1030775326..c811844c27 100644
--- a/resources/sql/autopatches/20140218.passwords.4.vcs.php
+++ b/resources/sql/autopatches/20140218.passwords.4.vcs.php
@@ -1,27 +1,13 @@
 <?php
 
-$table = new PhabricatorRepositoryVCSPassword();
-$conn_w = $table->establishConnection('w');
+// This migration once upgraded VCS password hashing, but the table was
+// later removed in 2018 (see T13043).
 
-echo pht('Upgrading password hashing for VCS passwords.')."\n";
+// Since almost four years have passed since this migration, the cost of
+// losing this data is very small (users just need to reset their passwords),
+// and a version of this migration against the modern schema isn't easy to
+// implement or test, just skip the migration.
 
-$best_hasher = PhabricatorPasswordHasher::getBestHasher();
-foreach (new LiskMigrationIterator($table) as $password) {
-  $id = $password->getID();
-
-  echo pht('Migrating VCS password %d...', $id)."\n";
-
-  $input_hash = $password->getPasswordHash();
-  $input_envelope = new PhutilOpaqueEnvelope($input_hash);
-
-  $storage_hash = $best_hasher->getPasswordHashForStorage($input_envelope);
-
-  queryfx(
-    $conn_w,
-    'UPDATE %T SET passwordHash = %s WHERE id = %d',
-    $table->getTableName(),
-    $storage_hash->openEnvelope(),
-    $id);
-}
-
-echo pht('Done.')."\n";
+// This means that installs which upgrade from a version of Phabricator
+// released prior to Feb 2014 to a version of Phabricator relased after
+// Jan 2018 will need to have users reset VCS passwords.
diff --git a/resources/sql/autopatches/20180121.auth.01.vcsnuke.sql b/resources/sql/autopatches/20180121.auth.01.vcsnuke.sql
new file mode 100644
index 0000000000..b106a2ddd7
--- /dev/null
+++ b/resources/sql/autopatches/20180121.auth.01.vcsnuke.sql
@@ -0,0 +1 @@
+DROP TABLE {$NAMESPACE}_repository.repository_vcspassword;
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 38f97b4900..50f4abc475 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3944,7 +3944,6 @@
     'PhabricatorRepositoryURITestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php',
     'PhabricatorRepositoryURITransaction' => 'applications/repository/storage/PhabricatorRepositoryURITransaction.php',
     'PhabricatorRepositoryURITransactionQuery' => 'applications/repository/query/PhabricatorRepositoryURITransactionQuery.php',
-    'PhabricatorRepositoryVCSPassword' => 'applications/repository/storage/PhabricatorRepositoryVCSPassword.php',
     'PhabricatorRepositoryWorkingCopyVersion' => 'applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php',
     'PhabricatorRequestExceptionHandler' => 'aphront/handler/PhabricatorRequestExceptionHandler.php',
     'PhabricatorResourceSite' => 'aphront/site/PhabricatorResourceSite.php',
@@ -9593,7 +9592,6 @@
     'PhabricatorRepositoryURITestCase' => 'PhabricatorTestCase',
     'PhabricatorRepositoryURITransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorRepositoryURITransactionQuery' => 'PhabricatorApplicationTransactionQuery',
-    'PhabricatorRepositoryVCSPassword' => 'PhabricatorRepositoryDAO',
     'PhabricatorRepositoryWorkingCopyVersion' => 'PhabricatorRepositoryDAO',
     'PhabricatorRequestExceptionHandler' => 'AphrontRequestExceptionHandler',
     'PhabricatorResourceSite' => 'PhabricatorSite',
diff --git a/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php b/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php
deleted file mode 100644
index 2f5c20cf7e..0000000000
--- a/src/applications/repository/storage/PhabricatorRepositoryVCSPassword.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-final class PhabricatorRepositoryVCSPassword extends PhabricatorRepositoryDAO {
-
-  protected $id;
-  protected $userPHID;
-  protected $passwordHash;
-
-  protected function getConfiguration() {
-    return array(
-      self::CONFIG_COLUMN_SCHEMA => array(
-        'passwordHash' => 'text128',
-      ),
-      self::CONFIG_KEY_SCHEMA => array(
-        'key_phid' => array(
-          'columns' => array('userPHID'),
-          'unique' => true,
-        ),
-      ),
-    ) + parent::getConfiguration();
-  }
-
-  public function setPassword(
-    PhutilOpaqueEnvelope $password,
-    PhabricatorUser $user) {
-    $hash_envelope = $this->hashPassword($password, $user);
-    return $this->setPasswordHash($hash_envelope->openEnvelope());
-  }
-
-  public function comparePassword(
-    PhutilOpaqueEnvelope $password,
-    PhabricatorUser $user) {
-
-    return PhabricatorPasswordHasher::comparePassword(
-      $this->getPasswordHashInput($password, $user),
-      new PhutilOpaqueEnvelope($this->getPasswordHash()));
-  }
-
-  private function getPasswordHashInput(
-    PhutilOpaqueEnvelope $password,
-    PhabricatorUser $user) {
-    if ($user->getPHID() != $this->getUserPHID()) {
-      throw new Exception(pht('User does not match password user PHID!'));
-    }
-
-    $raw_input = PhabricatorHash::digestPassword($password, $user->getPHID());
-    return new PhutilOpaqueEnvelope($raw_input);
-  }
-
-  private function hashPassword(
-    PhutilOpaqueEnvelope $password,
-    PhabricatorUser $user) {
-
-    $input_envelope = $this->getPasswordHashInput($password, $user);
-
-    $best_hasher = PhabricatorPasswordHasher::getBestHasher();
-    return $best_hasher->getPasswordHashForStorage($input_envelope);
-  }
-
-}

From 5a8a56f414fce1385bdc3b1a46334b1a489f0765 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 14:58:46 -0800
Subject: [PATCH 384/865] Prepare the new AuthPassword infrastructure for
 storing account passwords

Summary:
Ref T13043. In D18898 I moved VCS passwords to the new shared infrastructure.

Before account passwords can move, we need to make two changes:

  - For legacy reasons, VCS passwords and Account passwords have different "digest" algorithms. Both are more complicated than they should be, but we can't easily fix it without breaking existing passwords. Add a `PasswordHashInterface` so that objects which can have passwords hashes can implement custom digest logic for each password type.
  - Account passwords have a dedicated external salt (`PhabricatorUser->passwordSalt`). This is a generally reasonable thing to support (since not all hashers are self-salting) and we need to keep it around so existing passwords still work. Add salt support to `AuthPassword` and make it generate/regenerate when passwords are updated.

Then add a nice story about password digestion.

Test Plan: Ran migrations. Used an existing VCS password; changed VCS password. Tried to use a revoked password. Unit tests still pass. Grepped for callers to legacy `PhabricatorHash::digestPassword()`, found none.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18900
---
 .../autopatches/20180121.auth.02.passsalt.sql |  2 +
 src/__phutil_library_map__.php                |  2 +
 .../engine/PhabricatorAuthPasswordEngine.php  |  2 +-
 .../PhabricatorPasswordHashInterface.php      |  9 +++
 .../auth/storage/PhabricatorAuthPassword.php  | 35 +++++++---
 .../people/storage/PhabricatorUser.php        | 65 ++++++++++++++++++-
 src/infrastructure/util/PhabricatorHash.php   | 18 -----
 7 files changed, 105 insertions(+), 28 deletions(-)
 create mode 100644 resources/sql/autopatches/20180121.auth.02.passsalt.sql
 create mode 100644 src/applications/auth/password/PhabricatorPasswordHashInterface.php

diff --git a/resources/sql/autopatches/20180121.auth.02.passsalt.sql b/resources/sql/autopatches/20180121.auth.02.passsalt.sql
new file mode 100644
index 0000000000..78ee953ea4
--- /dev/null
+++ b/resources/sql/autopatches/20180121.auth.02.passsalt.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_auth.auth_password
+  ADD passwordSalt VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 50f4abc475..efd8c0ed26 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3494,6 +3494,7 @@
     'PhabricatorPassphraseApplication' => 'applications/passphrase/application/PhabricatorPassphraseApplication.php',
     'PhabricatorPasswordAuthProvider' => 'applications/auth/provider/PhabricatorPasswordAuthProvider.php',
     'PhabricatorPasswordDestructionEngineExtension' => 'applications/auth/extension/PhabricatorPasswordDestructionEngineExtension.php',
+    'PhabricatorPasswordHashInterface' => 'applications/auth/password/PhabricatorPasswordHashInterface.php',
     'PhabricatorPasswordHasher' => 'infrastructure/util/password/PhabricatorPasswordHasher.php',
     'PhabricatorPasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorPasswordHasherTestCase.php',
     'PhabricatorPasswordHasherUnavailableException' => 'infrastructure/util/password/PhabricatorPasswordHasherUnavailableException.php',
@@ -9992,6 +9993,7 @@
       'PhabricatorFulltextInterface',
       'PhabricatorFerretInterface',
       'PhabricatorConduitResultInterface',
+      'PhabricatorPasswordHashInterface',
     ),
     'PhabricatorUserBadgesCacheType' => 'PhabricatorUserCacheType',
     'PhabricatorUserBlurbField' => 'PhabricatorUserCustomField',
diff --git a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
index 1cbfa0c80b..3ac83c3c59 100644
--- a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
@@ -27,7 +27,7 @@ public function getContentSource() {
     return $this->contentSource;
   }
 
-  public function setObject($object) {
+  public function setObject(PhabricatorPasswordHashInterface $object) {
     $this->object = $object;
     return $this;
   }
diff --git a/src/applications/auth/password/PhabricatorPasswordHashInterface.php b/src/applications/auth/password/PhabricatorPasswordHashInterface.php
new file mode 100644
index 0000000000..10cad716c1
--- /dev/null
+++ b/src/applications/auth/password/PhabricatorPasswordHashInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+interface PhabricatorPasswordHashInterface {
+
+  public function newPasswordDigest(
+    PhutilOpaqueEnvelope $envelope,
+    PhabricatorAuthPassword $password);
+
+}
diff --git a/src/applications/auth/storage/PhabricatorAuthPassword.php b/src/applications/auth/storage/PhabricatorAuthPassword.php
index d578de6691..81e1af7e5c 100644
--- a/src/applications/auth/storage/PhabricatorAuthPassword.php
+++ b/src/applications/auth/storage/PhabricatorAuthPassword.php
@@ -10,6 +10,7 @@ final class PhabricatorAuthPassword
   protected $objectPHID;
   protected $passwordType;
   protected $passwordHash;
+  protected $passwordSalt;
   protected $isRevoked;
 
   private $object = self::ATTACHABLE;
@@ -19,7 +20,7 @@ final class PhabricatorAuthPassword
   const PASSWORD_TYPE_TEST = 'test';
 
   public static function initializeNewPassword(
-    PhabricatorUser $object,
+    PhabricatorPasswordHashInterface $object,
     $type) {
 
     return id(new self())
@@ -35,6 +36,7 @@ protected function getConfiguration() {
       self::CONFIG_COLUMN_SCHEMA => array(
         'passwordType' => 'text64',
         'passwordHash' => 'text128',
+        'passwordSalt' => 'text64',
         'isRevoked' => 'bool',
       ),
       self::CONFIG_KEY_SCHEMA => array(
@@ -70,7 +72,7 @@ public function canUpgrade() {
 
   public function upgradePasswordHasher(
     PhutilOpaqueEnvelope $envelope,
-    PhabricatorUser $object) {
+    PhabricatorPasswordHashInterface $object) {
 
     // Before we make changes, double check that this is really the correct
     // password. It could be really bad if we "upgraded" a password and changed
@@ -88,7 +90,7 @@ public function upgradePasswordHasher(
 
   public function setPassword(
     PhutilOpaqueEnvelope $password,
-    PhabricatorUser $object) {
+    PhabricatorPasswordHashInterface $object) {
 
     $hasher = PhabricatorPasswordHasher::getBestHasher();
     return $this->setPasswordWithHasher($password, $object, $hasher);
@@ -96,9 +98,18 @@ public function setPassword(
 
   public function setPasswordWithHasher(
     PhutilOpaqueEnvelope $password,
-    PhabricatorUser $object,
+    PhabricatorPasswordHashInterface $object,
     PhabricatorPasswordHasher $hasher) {
 
+    if (!strlen($password->openEnvelope())) {
+      throw new Exception(
+        pht('Attempting to set an empty password!'));
+    }
+
+    // Generate (or regenerate) the salt first.
+    $new_salt = Filesystem::readRandomCharacters(64);
+    $this->setPasswordSalt($new_salt);
+
     $digest = $this->digestPassword($password, $object);
     $hash = $hasher->getPasswordHashForStorage($digest);
     $raw_hash = $hash->openEnvelope();
@@ -108,7 +119,7 @@ public function setPasswordWithHasher(
 
   public function comparePassword(
     PhutilOpaqueEnvelope $password,
-    PhabricatorUser $object) {
+    PhabricatorPasswordHashInterface $object) {
 
     $digest = $this->digestPassword($password, $object);
     $hash = $this->newPasswordEnvelope();
@@ -122,7 +133,7 @@ private function newPasswordEnvelope() {
 
   private function digestPassword(
     PhutilOpaqueEnvelope $password,
-    PhabricatorUser $object) {
+    PhabricatorPasswordHashInterface $object) {
 
     $object_phid = $object->getPHID();
 
@@ -135,9 +146,17 @@ private function digestPassword(
           $object->getPHID()));
     }
 
-    $raw_input = PhabricatorHash::digestPassword($password, $object_phid);
+    $digest = $object->newPasswordDigest($password, $this);
+
+    if (!($digest instanceof PhutilOpaqueEnvelope)) {
+      throw new Exception(
+        pht(
+          'Failed to digest password: object ("%s") did not return an '.
+          'opaque envelope with a password digest.',
+          $object->getPHID()));
+    }
 
-    return new PhutilOpaqueEnvelope($raw_input);
+    return $digest;
   }
 
 
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 30aa3d81ef..455991ca53 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -20,7 +20,8 @@ final class PhabricatorUser
     PhabricatorApplicationTransactionInterface,
     PhabricatorFulltextInterface,
     PhabricatorFerretInterface,
-    PhabricatorConduitResultInterface {
+    PhabricatorConduitResultInterface,
+    PhabricatorPasswordHashInterface {
 
   const SESSION_TABLE = 'phabricator_session';
   const NAMETOKEN_TABLE = 'user_nametoken';
@@ -1620,4 +1621,66 @@ public function getCSSValue($variable_key) {
     return $variables[$variable_key];
   }
 
+/* -(  PhabricatorPasswordHashInterface  )----------------------------------- */
+
+
+  public function newPasswordDigest(
+    PhutilOpaqueEnvelope $envelope,
+    PhabricatorAuthPassword $password) {
+
+    // Before passwords are hashed, they are digested. The goal of digestion
+    // is twofold: to reduce the length of very long passwords to something
+    // reasonable; and to salt the password in case the best available hasher
+    // does not include salt automatically.
+
+    // Users may choose arbitrarily long passwords, and attackers may try to
+    // attack the system by probing it with very long passwords. When large
+    // inputs are passed to hashers -- which are intentionally slow -- it
+    // can result in unacceptably long runtimes. The classic attack here is
+    // to try to log in with a 64MB password and see if that locks up the
+    // machine for the next century. By digesting passwords to a standard
+    // length first, the length of the raw input does not impact the runtime
+    // of the hashing algorithm.
+
+    // Some hashers like bcrypt are self-salting, while other hashers are not.
+    // Applying salt while digesting passwords ensures that hashes are salted
+    // whether we ultimately select a self-salting hasher or not.
+
+    // For legacy compatibility reasons, the VCS and Account password digest
+    // algorithms are significantly more complicated than necessary to achieve
+    // these goals. This is because they once used a different hashing and
+    // salting process. When we upgraded to the modern modular hasher
+    // infrastructure, we just bolted it onto the end of the existing pipelines
+    // so that upgrading didn't break all users' credentials.
+
+    // New implementations can (and, generally, should) safely select the
+    // simple HMAC SHA256 digest at the bottom of the function, which does
+    // everything that a digest callback should without any needless legacy
+    // baggage on top.
+
+    switch ($password->getPasswordType()) {
+      case PhabricatorAuthPassword::PASSWORD_TYPE_VCS:
+        // VCS passwords use an iterated HMAC SHA1 as a digest algorithm. They
+        // originally used this as a hasher, but it became a digest alorithm
+        // once hashing was upgraded to include bcrypt.
+        $digest = $envelope->openEnvelope();
+        $salt = $this->getPHID();
+        for ($ii = 0; $ii < 1000; $ii++) {
+          $digest = PhabricatorHash::weakDigest($digest, $salt);
+        }
+        return new PhutilOpaqueEnvelope($digest);
+    }
+
+    // For passwords which do not have some crazy legacy reason to use some
+    // other digest algorithm, HMAC SHA256 is an excellent choice. It satisfies
+    // the digest requirements and is simple.
+
+    $digest = PhabricatorHash::digestHMACSHA256(
+      $envelope->openEnvelope(),
+      $password->getPasswordSalt());
+
+    return new PhutilOpaqueEnvelope($digest);
+  }
+
+
 }
diff --git a/src/infrastructure/util/PhabricatorHash.php b/src/infrastructure/util/PhabricatorHash.php
index 5ca4e9b53c..4cd1abcf15 100644
--- a/src/infrastructure/util/PhabricatorHash.php
+++ b/src/infrastructure/util/PhabricatorHash.php
@@ -29,24 +29,6 @@ public static function weakDigest($string, $key = null) {
   }
 
 
-  /**
-   * Digest a string into a password hash. This is similar to @{method:digest},
-   * but requires a salt and iterates the hash to increase cost.
-   */
-  public static function digestPassword(PhutilOpaqueEnvelope $envelope, $salt) {
-    $result = $envelope->openEnvelope();
-    if (!$result) {
-      throw new Exception(pht('Trying to digest empty password!'));
-    }
-
-    for ($ii = 0; $ii < 1000; $ii++) {
-      $result = self::weakDigest($result, $salt);
-    }
-
-    return $result;
-  }
-
-
   /**
    * Digest a string for use in, e.g., a MySQL index. This produces a short
    * (12-byte), case-sensitive alphanumeric string with 72 bits of entropy,

From aa3b582c7b72c282a087f31a7eb60342444e89a5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 16:03:10 -0800
Subject: [PATCH 385/865] Remove "set password" from `bin/accountadmin` and let
 `bin/auth recover` recover anyone

Summary:
Ref T13043. This cleans some things up to prepare for moving account passwords to shared infrastructure.

Currently, the (very old, fairly unusual) `bin/accountadmin` tool can set account passwords. This is a bit weird, generally not great, and makes upgrading to shared infrastructure more difficult. Just get rid of this to simplify things. Many installs don't have passwords and this is pointless and unhelpful in those cases.

Instead, let `bin/auth recover` recover any account, not just administrator accounts. This was a guardrail against administrative abuse, but it has always seemed especially flimsy (since anyone who can run the tool can easily comment out the checks) and I use this tool in cluster support with some frequency, occasionally just commenting out the checks. This is generally a better solution than actually setting a password on accounts anyway. Just get rid of the check and give users enough rope to shoot themselves in the foot with if they truly desire.

Test Plan:
  - Ran `bin/accountadmin`, didn't get prompted to swap passwords anymore.
  - Ran `bin/auth recover` to recover a non-admin account.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18901
---
 scripts/user/account_admin.php                | 20 -----------
 ...abricatorAuthManagementRecoverWorkflow.php | 35 +++----------------
 2 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/scripts/user/account_admin.php b/scripts/user/account_admin.php
index 2fa5446648..9e01896637 100755
--- a/scripts/user/account_admin.php
+++ b/scripts/user/account_admin.php
@@ -112,17 +112,6 @@
   $create_email = $email;
 }
 
-$changed_pass = false;
-// This disables local echo, so the user's password is not shown as they type
-// it.
-phutil_passthru('stty -echo');
-$password = phutil_console_prompt(
-  pht('Enter a password for this user [blank to leave unchanged]:'));
-phutil_passthru('stty echo');
-if (strlen($password)) {
-  $changed_pass = $password;
-}
-
 $is_system_agent = $user->getIsSystemAgent();
 $set_system_agent = phutil_console_confirm(
   pht('Is this user a bot?'),
@@ -158,10 +147,6 @@
 if ($is_new) {
   printf($tpl, pht('Email'), '', $create_email);
 }
-printf($tpl, pht('Password'), null,
-  ($changed_pass !== false)
-    ? pht('Updated')
-    : pht('Unchanged'));
 
 printf(
   $tpl,
@@ -218,11 +203,6 @@
   $editor->makeAdminUser($user, $set_admin);
   $editor->makeSystemAgentUser($user, $set_system_agent);
 
-  if ($changed_pass !== false) {
-    $envelope = new PhutilOpaqueEnvelope($changed_pass);
-    $editor->changePassword($user, $envelope);
-  }
-
 $user->saveTransaction();
 
 echo pht('Saved changes.')."\n";
diff --git a/src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php
index a31b108f08..9efd07571a 100644
--- a/src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php
+++ b/src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php
@@ -9,8 +9,8 @@ protected function didConstruct() {
       ->setExamples('**recover** __username__')
       ->setSynopsis(
         pht(
-          'Recover access to an administrative account if you have locked '.
-          'yourself out of Phabricator.'))
+          'Recover access to an account if you have locked yourself out '.
+          'of Phabricator.'))
       ->setArguments(
         array(
           'username' => array(
@@ -21,23 +21,6 @@ protected function didConstruct() {
   }
 
   public function execute(PhutilArgumentParser $args) {
-
-    $can_recover = id(new PhabricatorPeopleQuery())
-      ->setViewer($this->getViewer())
-      ->withIsAdmin(true)
-      ->execute();
-    if (!$can_recover) {
-      throw new PhutilArgumentUsageException(
-        pht(
-          'This Phabricator installation has no recoverable administrator '.
-          'accounts. You can use `%s` to create a new administrator '.
-          'account or make an existing user an administrator.',
-          'bin/accountadmin'));
-    }
-    $can_recover = mpull($can_recover, 'getUsername');
-    sort($can_recover);
-    $can_recover = implode(', ', $can_recover);
-
     $usernames = $args->getArg('username');
     if (!$usernames) {
       throw new PhutilArgumentUsageException(
@@ -57,18 +40,8 @@ public function execute(PhutilArgumentParser $args) {
     if (!$user) {
       throw new PhutilArgumentUsageException(
         pht(
-          'No such user "%s". Recoverable administrator accounts are: %s.',
-          $username,
-          $can_recover));
-    }
-
-    if (!$user->getIsAdmin()) {
-      throw new PhutilArgumentUsageException(
-        pht(
-          'You can only recover administrator accounts, but %s is not an '.
-          'administrator. Recoverable administrator accounts are: %s.',
-          $username,
-          $can_recover));
+          'No such user "%s" to recover.',
+          $username));
     }
 
     if (!$user->canEstablishWebSessions()) {

From b8a515cb29d817287a1e046c589ef5f79d814aa7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 16:20:01 -0800
Subject: [PATCH 386/865] Bring new password validation into AuthPasswordEngine

Summary:
Ref T13043. We have ~4 copies of this logic (registration, lost password recovery, set password, set VCS password).

Currently it varies a bit from case to case, but since it's all going to be basically identical once account passwords swap to the new infrastructure, bring it into the Engine so it can live in one place.

This also fixes VCS passwords not being affected by `account.minimum-password-length`.

Test Plan: Hit all errors in "VCS Password" panel. Successfully changed password.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18902
---
 src/__phutil_library_map__.php                |  2 +
 .../engine/PhabricatorAuthPasswordEngine.php  | 73 ++++++++++++++++
 .../PhabricatorAuthPasswordException.php      | 28 ++++++
 .../DiffusionSetPasswordSettingsPanel.php     | 86 ++++++-------------
 4 files changed, 130 insertions(+), 59 deletions(-)
 create mode 100644 src/applications/auth/password/PhabricatorAuthPasswordException.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index efd8c0ed26..55d7aa3b5f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2092,6 +2092,7 @@
     'PhabricatorAuthPassword' => 'applications/auth/storage/PhabricatorAuthPassword.php',
     'PhabricatorAuthPasswordEditor' => 'applications/auth/editor/PhabricatorAuthPasswordEditor.php',
     'PhabricatorAuthPasswordEngine' => 'applications/auth/engine/PhabricatorAuthPasswordEngine.php',
+    'PhabricatorAuthPasswordException' => 'applications/auth/password/PhabricatorAuthPasswordException.php',
     'PhabricatorAuthPasswordPHIDType' => 'applications/auth/phid/PhabricatorAuthPasswordPHIDType.php',
     'PhabricatorAuthPasswordQuery' => 'applications/auth/query/PhabricatorAuthPasswordQuery.php',
     'PhabricatorAuthPasswordResetTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php',
@@ -7387,6 +7388,7 @@
     ),
     'PhabricatorAuthPasswordEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorAuthPasswordEngine' => 'Phobject',
+    'PhabricatorAuthPasswordException' => 'Exception',
     'PhabricatorAuthPasswordPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorAuthPasswordQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorAuthPasswordResetTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
diff --git a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
index 3ac83c3c59..66d32ad4dc 100644
--- a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
@@ -54,6 +54,79 @@ public function getUpgradeHashers() {
     return $this->upgradeHashers;
   }
 
+  public function checkNewPassword(
+    PhutilOpaqueEnvelope $password,
+    PhutilOpaqueEnvelope $confirm,
+    $can_skip = false) {
+
+    $raw_password = $password->openEnvelope();
+
+    if (!strlen($raw_password)) {
+      if ($can_skip) {
+        throw new PhabricatorAuthPasswordException(
+          pht('You must choose a password or skip this step.'),
+          pht('Required'));
+      } else {
+        throw new PhabricatorAuthPasswordException(
+          pht('You must choose a password.'),
+          pht('Required'));
+      }
+    }
+
+    $min_len = PhabricatorEnv::getEnvConfig('account.minimum-password-length');
+    $min_len = (int)$min_len;
+    if ($min_len) {
+      if (strlen($raw_password) < $min_len) {
+        throw new PhabricatorAuthPasswordException(
+          pht(
+            'The selected password is too short. Passwords must be a minimum '.
+            'of %s characters long.',
+            new PhutilNumber($min_len)),
+          pht('Too Short'));
+      }
+    }
+
+    $raw_confirm = $confirm->openEnvelope();
+
+    if (!strlen($raw_confirm)) {
+      throw new PhabricatorAuthPasswordException(
+        pht('You must confirm the selected password.'),
+        null,
+        pht('Required'));
+    }
+
+    if ($raw_password !== $raw_confirm) {
+      throw new PhabricatorAuthPasswordException(
+        pht('The password and confirmation do not match.'),
+        pht('Invalid'),
+        pht('Invalid'));
+    }
+
+    if (PhabricatorCommonPasswords::isCommonPassword($raw_password)) {
+      throw new PhabricatorAuthPasswordException(
+        pht(
+          'The selected password is very weak: it is one of the most common '.
+          'passwords in use. Choose a stronger password.'),
+        pht('Very Weak'));
+    }
+
+    if ($this->isRevokedPassword($password)) {
+      throw new PhabricatorAuthPasswordException(
+        pht(
+          'The password you entered has been revoked. You can not reuse '.
+          'a password which has been revoked. Choose a new password.'),
+        pht('Revoked'));
+    }
+
+    if (!$this->isUniquePassword($password)) {
+      throw new PhabricatorAuthPasswordException(
+        pht(
+          'The password you entered is the same as another password '.
+          'associated with your account. Each password must be unique.'),
+        pht('Not Unique'));
+    }
+  }
+
   public function isValidPassword(PhutilOpaqueEnvelope $envelope) {
     $this->requireSetup();
 
diff --git a/src/applications/auth/password/PhabricatorAuthPasswordException.php b/src/applications/auth/password/PhabricatorAuthPasswordException.php
new file mode 100644
index 0000000000..d4b13bb10c
--- /dev/null
+++ b/src/applications/auth/password/PhabricatorAuthPasswordException.php
@@ -0,0 +1,28 @@
+<?php
+
+final class PhabricatorAuthPasswordException
+  extends Exception {
+
+  private $passwordError;
+  private $confirmErorr;
+
+  public function __construct(
+    $message,
+    $password_error,
+    $confirm_error = null) {
+
+    $this->passwordError = $password_error;
+    $this->confirmError = $confirm_error;
+
+    parent::__construct($message);
+  }
+
+  public function getPasswordError() {
+    return $this->passwordError;
+  }
+
+  public function getConfirmError() {
+    return $this->confirmError;
+  }
+
+}
diff --git a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
index 2da51e0624..1899302223 100644
--- a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
+++ b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
@@ -58,6 +58,19 @@ public function processRequest(AphrontRequest $request) {
     $e_password = true;
     $e_confirm = true;
 
+    $content_source = PhabricatorContentSource::newFromRequest($request);
+
+    // NOTE: This test is against $viewer (not $user), so that the error
+    // message below makes sense in the case that the two are different,
+    // and because an admin reusing their own password is bad, while
+    // system agents generally do not have passwords anyway.
+
+    $engine = id(new PhabricatorAuthPasswordEngine())
+      ->setViewer($viewer)
+      ->setContentSource($content_source)
+      ->setObject($viewer)
+      ->setPasswordType($vcs_type);
+
     if ($request->isFormPost()) {
       if ($request->getBool('remove')) {
         if ($vcspassword->getID()) {
@@ -68,71 +81,26 @@ public function processRequest(AphrontRequest $request) {
 
       $new_password = $request->getStr('password');
       $confirm = $request->getStr('confirm');
-      if (!strlen($new_password)) {
-        $e_password = pht('Required');
-        $errors[] = pht('Password is required.');
-      } else {
-        $e_password = null;
-      }
 
-      if (!strlen($confirm)) {
-        $e_confirm = pht('Required');
-        $errors[] = pht('You must confirm the new password.');
-      } else {
+      $envelope = new PhutilOpaqueEnvelope($new_password);
+      $confirm_envelope = new PhutilOpaqueEnvelope($confirm);
+
+      try {
+        $engine->checkNewPassword($envelope, $confirm_envelope);
+        $e_password = null;
         $e_confirm = null;
+      } catch (PhabricatorAuthPasswordException $ex) {
+        $errors[] = $ex->getMessage();
+        $e_password = $ex->getPasswordError();
+        $e_confirm = $ex->getConfirmError();
       }
 
       if (!$errors) {
-        $envelope = new PhutilOpaqueEnvelope($new_password);
-        $content_source = PhabricatorContentSource::newFromRequest($request);
-
-        // NOTE: This test is against $viewer (not $user), so that the error
-        // message below makes sense in the case that the two are different,
-        // and because an admin reusing their own password is bad, while
-        // system agents generally do not have passwords anyway.
-
-        $engine = id(new PhabricatorAuthPasswordEngine())
-          ->setViewer($viewer)
-          ->setContentSource($content_source)
-          ->setObject($viewer)
-          ->setPasswordType($vcs_type);
-
-        $same_password = !$engine->isUniquePassword($envelope);
-        $revoked_password = $engine->isRevokedPassword($envelope);
-
-        if ($new_password !== $confirm) {
-          $e_password = pht('Does Not Match');
-          $e_confirm = pht('Does Not Match');
-          $errors[] = pht('Password and confirmation do not match.');
-        } else if ($revoked_password) {
-          $e_password = pht('Revoked');
-          $e_confirm = pht('Revoked');
-          $errors[] = pht(
-            'This password has been revoked. You must choose a new, unique '.
-            'password.');
-        } else if ($same_password) {
-          $e_password = pht('Not Unique');
-          $e_confirm = pht('Not Unique');
-          $errors[] = pht(
-            'This password is the same as another password associated '.
-            'with your account. You must use a unique password for '.
-            'VCS access.');
-        } else if (
-          PhabricatorCommonPasswords::isCommonPassword($new_password)) {
-          $e_password = pht('Very Weak');
-          $e_confirm = pht('Very Weak');
-          $errors[] = pht(
-            'This password is extremely weak: it is one of the most common '.
-            'passwords in use. Choose a stronger password.');
-        }
+        $vcspassword
+          ->setPassword($envelope, $user)
+          ->save();
 
-
-        if (!$errors) {
-          $vcspassword->setPassword($envelope, $user);
-          $vcspassword->save();
-
-          return id(new AphrontRedirectResponse())->setURI($panel_uri);
-        }
+        return id(new AphrontRedirectResponse())->setURI($panel_uri);
       }
     }
 

From 6b99aac49ddf4aff524162b6757cf7491f146c83 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 22 Jan 2018 07:23:04 -0800
Subject: [PATCH 387/865] Digest changeset anchors into purely alphanumeric
 strings

Summary:
Ref T13045. See that task for discussion.

This replaces `digestForIndex()` with a "clever" algorithm in `digestForAnchor()`. The new digest is the same as `digestForIndex()` except when the original output was "." or "_". In those cases, a replacement character is selected based on entropy accumulated by the digest function as it iterates through the string.

Test Plan: Added unit tests.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13045

Differential Revision: https://secure.phabricator.com/D18909
---
 .../storage/DifferentialChangeset.php         |  2 +-
 src/infrastructure/util/PhabricatorHash.php   | 61 ++++++++++++++++++-
 .../__tests__/PhabricatorHashTestCase.php     | 43 +++++++++++++
 3 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/src/applications/differential/storage/DifferentialChangeset.php b/src/applications/differential/storage/DifferentialChangeset.php
index 3656fe6507..ebdaeacd0a 100644
--- a/src/applications/differential/storage/DifferentialChangeset.php
+++ b/src/applications/differential/storage/DifferentialChangeset.php
@@ -173,7 +173,7 @@ public function makeChangesWithContext($num_lines = 3) {
   }
 
   public function getAnchorName() {
-    return 'change-'.PhabricatorHash::digestForIndex($this->getFilename());
+    return 'change-'.PhabricatorHash::digestForAnchor($this->getFilename());
   }
 
   public function getAbsoluteRepositoryPath(
diff --git a/src/infrastructure/util/PhabricatorHash.php b/src/infrastructure/util/PhabricatorHash.php
index 4cd1abcf15..ce48b0966b 100644
--- a/src/infrastructure/util/PhabricatorHash.php
+++ b/src/infrastructure/util/PhabricatorHash.php
@@ -3,6 +3,7 @@
 final class PhabricatorHash extends Phobject {
 
   const INDEX_DIGEST_LENGTH = 12;
+  const ANCHOR_DIGEST_LENGTH = 12;
 
   /**
    * Digest a string using HMAC+SHA1.
@@ -38,8 +39,8 @@ public static function weakDigest($string, $key = null) {
    * related hashing (for general purpose hashing, see @{method:digest}).
    *
    * @param   string  Input string.
-   * @return  string  12-byte, case-sensitive alphanumeric hash of the string
-   *                  which
+   * @return  string  12-byte, case-sensitive, mostly-alphanumeric hash of
+   *                  the string.
    */
   public static function digestForIndex($string) {
     $hash = sha1($string, $raw_output = true);
@@ -63,6 +64,62 @@ public static function digestForIndex($string) {
     return $result;
   }
 
+  /**
+   * Digest a string for use in HTML page anchors. This is similar to
+   * @{method:digestForIndex} but produces purely alphanumeric output.
+   *
+   * This tries to be mostly compatible with the index digest to limit how
+   * much stuff we're breaking by switching to it. For additional discussion,
+   * see T13045.
+   *
+   * @param   string  Input string.
+   * @return  string  12-byte, case-sensitive, purely-alphanumeric hash of
+   *                  the string.
+   */
+  public static function digestForAnchor($string) {
+    $hash = sha1($string, $raw_output = true);
+
+    static $map;
+    if ($map === null) {
+      $map = '0123456789'.
+             'abcdefghij'.
+             'klmnopqrst'.
+             'uvwxyzABCD'.
+             'EFGHIJKLMN'.
+             'OPQRSTUVWX'.
+             'YZ';
+    }
+
+    $result = '';
+    $accum = 0;
+    $map_size = strlen($map);
+    for ($ii = 0; $ii < self::ANCHOR_DIGEST_LENGTH; $ii++) {
+      $byte = ord($hash[$ii]);
+      $low_bits = ($byte & 0x3F);
+      $accum = ($accum + $byte) % $map_size;
+
+      if ($low_bits < $map_size) {
+        // If an index digest would produce any alphanumeric character, just
+        // use that character. This means that these digests are the same as
+        // digests created with "digestForIndex()" in all positions where the
+        // output character is some character other than "." or "_".
+        $result .= $map[$low_bits];
+      } else {
+        // If an index digest would produce a non-alphumeric character ("." or
+        // "_"), pick an alphanumeric character instead. We accumulate an
+        // index into the alphanumeric character list to try to preserve
+        // entropy here. We could use this strategy for all bytes instead,
+        // but then these digests would differ from digests created with
+        // "digestForIndex()" in all positions, instead of just a small number
+        // of positions.
+        $result .= $map[$accum];
+      }
+    }
+
+    return $result;
+  }
+
+
   public static function digestToRange($string, $min, $max) {
     if ($min > $max) {
       throw new Exception(pht('Maximum must be larger than minimum.'));
diff --git a/src/infrastructure/util/__tests__/PhabricatorHashTestCase.php b/src/infrastructure/util/__tests__/PhabricatorHashTestCase.php
index b89515701d..008270e767 100644
--- a/src/infrastructure/util/__tests__/PhabricatorHashTestCase.php
+++ b/src/infrastructure/util/__tests__/PhabricatorHashTestCase.php
@@ -52,4 +52,47 @@ public function testHashForIndex() {
       pht('Distinct characters in hash of: %s', $input));
   }
 
+  public function testHashForAnchor() {
+    $map = array(
+      // For inputs with no "." or "_" in the output, digesting for an index
+      // or an anchor should be the same.
+      'dog' => array(
+        'Aliif7Qjd5ct',
+        'Aliif7Qjd5ct',
+      ),
+      // When an output would contain "." or "_", it should be replaced with
+      // an alphanumeric character in those positions instead.
+      'fig' => array(
+        'OpB9tY4i.MOX',
+        'OpB9tY4imMOX',
+      ),
+      'cot' => array(
+        '_iF26XU_PsVY',
+        '3iF26XUkPsVY',
+      ),
+      // The replacement characters are well-distributed and generally keep
+      // the entropy of the output high: here, "_" characters in the initial
+      // positions of the digests of "cot" (above) and "dug" (this test) have
+      // different outputs.
+      'dug' => array(
+        '_XuQnp0LUlUW',
+        '7XuQnp0LUlUW',
+      ),
+    );
+
+    foreach ($map as $input => $expect) {
+      list($expect_index, $expect_anchor) = $expect;
+
+      $this->assertEqual(
+        $expect_index,
+        PhabricatorHash::digestForIndex($input),
+        pht('Index digest of "%s".', $input));
+
+      $this->assertEqual(
+        $expect_anchor,
+        PhabricatorHash::digestForAnchor($input),
+        pht('Anchor digest of "%s".', $input));
+    }
+  }
+
 }

From abc030fa008b89ca4e9385bac3b155998bab51d1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 15:42:24 -0800
Subject: [PATCH 388/865] Move account passwords to shared infrastructure

Summary:
Ref T13043. This moves user account passwords to the new shared infrastructure.

There's a lot of code changes here, but essentially all of it is the same as the VCS password logic in D18898.

Test Plan:
- Ran migration.
- Spot checked table for general sanity.
- Logged in with an existing password.
- Hit all error conditions on "change password", "set password", "register new account" flows.
- Verified that changing password logs out other sessions.
- Verified that revoked passwords of a different type can't be selected.
- Changed passwords a bunch.
- Verified that salt regenerates properly after password change.
- Tried to login with the wrong password, which didn't work.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18903
---
 .../autopatches/20180120.auth.03.vcsdata.sql  |  3 +-
 .../autopatches/20180120.auth.04.vcsphid.php  |  4 +-
 .../20180121.auth.03.accountdata.sql          |  7 ++
 .../20180121.auth.04.accountphid.php          | 24 ++++++
 .../PhabricatorAuthRegisterController.php     | 47 ++++++-----
 .../PhabricatorAuthSetPasswordController.php  | 82 ++++++++++---------
 .../engine/PhabricatorAuthPasswordEngine.php  | 33 +++++---
 .../PhabricatorPasswordAuthProvider.php       | 23 ++----
 .../auth/storage/PhabricatorAuthPassword.php  |  2 +-
 .../people/editor/PhabricatorUserEditor.php   | 27 ------
 .../people/storage/PhabricatorUser.php        | 78 ++++++------------
 .../PhabricatorPasswordSettingsPanel.php      | 76 ++++++++++-------
 12 files changed, 205 insertions(+), 201 deletions(-)
 create mode 100644 resources/sql/autopatches/20180121.auth.03.accountdata.sql
 create mode 100644 resources/sql/autopatches/20180121.auth.04.accountphid.php

diff --git a/resources/sql/autopatches/20180120.auth.03.vcsdata.sql b/resources/sql/autopatches/20180120.auth.03.vcsdata.sql
index 3d1392bd5c..0cf73f84d9 100644
--- a/resources/sql/autopatches/20180120.auth.03.vcsdata.sql
+++ b/resources/sql/autopatches/20180120.auth.03.vcsdata.sql
@@ -1,5 +1,6 @@
 INSERT INTO {$NAMESPACE}_auth.auth_password
   (objectPHID, phid, passwordType, passwordHash, isRevoked,
     dateCreated, dateModified)
-  SELECT userPHID, '', 'vcs', passwordHash, 0, dateCreated, dateModified
+  SELECT userPHID, CONCAT('XVCS', id), 'vcs', passwordHash, 0,
+      dateCreated, dateModified
     FROM {$NAMESPACE}_repository.repository_vcspassword;
diff --git a/resources/sql/autopatches/20180120.auth.04.vcsphid.php b/resources/sql/autopatches/20180120.auth.04.vcsphid.php
index 40b61a54b9..0a5dd0f067 100644
--- a/resources/sql/autopatches/20180120.auth.04.vcsphid.php
+++ b/resources/sql/autopatches/20180120.auth.04.vcsphid.php
@@ -6,8 +6,10 @@
 $table = new PhabricatorAuthPassword();
 $conn = $table->establishConnection('w');
 
+$password_type = PhabricatorAuthPasswordPHIDType::TYPECONST;
+
 foreach (new LiskMigrationIterator($table) as $row) {
-  if ($row->getPHID()) {
+  if (phid_get_type($row->getPHID()) == $password_type) {
     continue;
   }
 
diff --git a/resources/sql/autopatches/20180121.auth.03.accountdata.sql b/resources/sql/autopatches/20180121.auth.03.accountdata.sql
new file mode 100644
index 0000000000..cbb4dc2a50
--- /dev/null
+++ b/resources/sql/autopatches/20180121.auth.03.accountdata.sql
@@ -0,0 +1,7 @@
+INSERT INTO {$NAMESPACE}_auth.auth_password
+  (objectPHID, phid, passwordType, passwordHash, passwordSalt, isRevoked,
+    dateCreated, dateModified)
+  SELECT phid, CONCAT('XACCOUNT', id), 'account', passwordHash, passwordSalt, 0,
+      dateCreated, dateModified
+    FROM {$NAMESPACE}_user.user
+    WHERE passwordHash != '';
diff --git a/resources/sql/autopatches/20180121.auth.04.accountphid.php b/resources/sql/autopatches/20180121.auth.04.accountphid.php
new file mode 100644
index 0000000000..e0ebc04f4b
--- /dev/null
+++ b/resources/sql/autopatches/20180121.auth.04.accountphid.php
@@ -0,0 +1,24 @@
+<?php
+
+// Populate account passwords (which we copied from the user table in the last
+// migration) with new PHIDs.
+
+$table = new PhabricatorAuthPassword();
+$conn = $table->establishConnection('w');
+
+$password_type = PhabricatorAuthPasswordPHIDType::TYPECONST;
+
+foreach (new LiskMigrationIterator($table) as $row) {
+  if (phid_get_type($row->getPHID()) == $password_type) {
+    continue;
+  }
+
+  $new_phid = $row->generatePHID();
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET phid = %s WHERE id = %d',
+    $table->getTableName(),
+    $new_phid,
+    $row->getID());
+}
diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
index 5a792dc864..1138d52b33 100644
--- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php
+++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php
@@ -61,6 +61,9 @@ public function handleRequest(AphrontRequest $request) {
     $default_username = $account->getUsername();
     $default_realname = $account->getRealName();
 
+    $account_type = PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT;
+    $content_source = PhabricatorContentSource::newFromRequest($request);
+
     $default_email = $account->getEmail();
 
     if ($invite) {
@@ -285,27 +288,22 @@ public function handleRequest(AphrontRequest $request) {
       if ($must_set_password) {
         $value_password = $request->getStr('password');
         $value_confirm = $request->getStr('confirm');
-        if (!strlen($value_password)) {
-          $e_password = pht('Required');
-          $errors[] = pht('You must choose a password.');
-        } else if ($value_password !== $value_confirm) {
-          $e_password = pht('No Match');
-          $errors[] = pht('Password and confirmation must match.');
-        } else if (strlen($value_password) < $min_len) {
-          $e_password = pht('Too Short');
-          $errors[] = pht(
-            'Password is too short (must be at least %d characters long).',
-            $min_len);
-        } else if (
-          PhabricatorCommonPasswords::isCommonPassword($value_password)) {
-
-          $e_password = pht('Very Weak');
-          $errors[] = pht(
-            'Password is pathologically weak. This password is one of the '.
-            'most common passwords in use, and is extremely easy for '.
-            'attackers to guess. You must choose a stronger password.');
-        } else {
+
+        $password_envelope = new PhutilOpaqueEnvelope($value_password);
+        $confirm_envelope = new PhutilOpaqueEnvelope($value_confirm);
+
+        $engine = id(new PhabricatorAuthPasswordEngine())
+          ->setViewer($user)
+          ->setContentSource($content_source)
+          ->setPasswordType($account_type)
+          ->setObject($user);
+
+        try {
+          $engine->checkNewPassword($password_envelope, $confirm_envelope);
           $e_password = null;
+        } catch (PhabricatorAuthPasswordException $ex) {
+          $errors[] = $ex->getMessage();
+          $e_password = $ex->getPasswordError();
         }
       }
 
@@ -408,8 +406,13 @@ public function handleRequest(AphrontRequest $request) {
 
             $editor->createNewUser($user, $email_obj, $allow_reassign_email);
             if ($must_set_password) {
-              $envelope = new PhutilOpaqueEnvelope($value_password);
-              $editor->changePassword($user, $envelope);
+              $password_object = PhabricatorAuthPassword::initializeNewPassword(
+                $user,
+                $account_type);
+
+              $password_object
+                ->setPassword($password_envelope, $user)
+                ->save();
             }
 
             if ($is_setup) {
diff --git a/src/applications/auth/controller/PhabricatorAuthSetPasswordController.php b/src/applications/auth/controller/PhabricatorAuthSetPasswordController.php
index 0db23e52a7..1218276043 100644
--- a/src/applications/auth/controller/PhabricatorAuthSetPasswordController.php
+++ b/src/applications/auth/controller/PhabricatorAuthSetPasswordController.php
@@ -40,8 +40,30 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
-    $min_len = PhabricatorEnv::getEnvConfig('account.minimum-password-length');
-    $min_len = (int)$min_len;
+    $content_source = PhabricatorContentSource::newFromRequest($request);
+    $account_type = PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT;
+
+    $password_objects = id(new PhabricatorAuthPasswordQuery())
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($viewer->getPHID()))
+      ->withPasswordTypes(array($account_type))
+      ->withIsRevoked(false)
+      ->execute();
+    if ($password_objects) {
+      $password_object = head($password_objects);
+      $has_password = true;
+    } else {
+      $password_object = PhabricatorAuthPassword::initializeNewPassword(
+        $viewer,
+        $account_type);
+      $has_password = false;
+    }
+
+    $engine = id(new PhabricatorAuthPasswordEngine())
+      ->setViewer($viewer)
+      ->setContentSource($content_source)
+      ->setPasswordType($account_type)
+      ->setObject($viewer);
 
     $e_password = true;
     $e_confirm = true;
@@ -50,46 +72,23 @@ public function handleRequest(AphrontRequest $request) {
       $password = $request->getStr('password');
       $confirm = $request->getStr('confirm');
 
-      $e_password = null;
-      $e_confirm = null;
-
-      if (!strlen($password)) {
-        $errors[] = pht('You must choose a password or skip this step.');
-        $e_password = pht('Required');
-      } else if (strlen($password) < $min_len) {
-        $errors[] = pht(
-          'The selected password is too short. Passwords must be a minimum '.
-          'of %s characters.',
-          new PhutilNumber($min_len));
-        $e_password = pht('Too Short');
-      } else if (!strlen($confirm)) {
-        $errors[] = pht('You must confirm the selecetd password.');
-        $e_confirm = pht('Required');
-      } else if ($password !== $confirm) {
-        $errors[] = pht('The password and confirmation do not match.');
-        $e_password = pht('Invalid');
-        $e_confirm = pht('Invalid');
-      } else if (PhabricatorCommonPasswords::isCommonPassword($password)) {
-        $e_password = pht('Very Weak');
-        $errors[] = pht(
-          'The selected password is very weak: it is one of the most common '.
-          'passwords in use. Choose a stronger password.');
+      $password_envelope = new PhutilOpaqueEnvelope($password);
+      $confirm_envelope = new PhutilOpaqueEnvelope($confirm);
+
+      try {
+        $engine->checkNewPassword($password_envelope, $confirm_envelope, true);
+        $e_password = null;
+        $e_confirm = null;
+      } catch (PhabricatorAuthPasswordException $ex) {
+        $errors[] = $ex->getMessage();
+        $e_password = $ex->getPasswordError();
+        $e_confirm = $ex->getConfirmError();
       }
 
       if (!$errors) {
-        $envelope = new PhutilOpaqueEnvelope($password);
-
-        // This write is unguarded because the CSRF token has already
-        // been checked in the call to $request->isFormPost() and
-        // the CSRF token depends on the password hash, so when it
-        // is changed here the CSRF token check will fail.
-        $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-
-          id(new PhabricatorUserEditor())
-            ->setActor($viewer)
-            ->changePassword($viewer, $envelope);
-
-        unset($unguarded);
+        $password_object
+          ->setPassword($password_envelope, $viewer)
+          ->save();
 
         // Destroy the token.
         $auth_token->delete();
@@ -98,12 +97,15 @@ public function handleRequest(AphrontRequest $request) {
       }
     }
 
+    $min_len = PhabricatorEnv::getEnvConfig('account.minimum-password-length');
+    $min_len = (int)$min_len;
+
     $len_caption = null;
     if ($min_len) {
       $len_caption = pht('Minimum password length: %d characters.', $min_len);
     }
 
-    if ($viewer->hasPassword()) {
+    if ($has_password) {
       $title = pht('Reset Password');
       $crumb = pht('Reset Password');
       $submit = pht('Reset Password');
diff --git a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
index 66d32ad4dc..595a523083 100644
--- a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
@@ -110,20 +110,27 @@ public function checkNewPassword(
         pht('Very Weak'));
     }
 
-    if ($this->isRevokedPassword($password)) {
-      throw new PhabricatorAuthPasswordException(
-        pht(
-          'The password you entered has been revoked. You can not reuse '.
-          'a password which has been revoked. Choose a new password.'),
-        pht('Revoked'));
-    }
+    // If we're creating a brand new object (like registering a new user)
+    // and it does not have a PHID yet, it isn't possible for it to have any
+    // revoked passwords or colliding passwords either, so we can skip these
+    // checks.
 
-    if (!$this->isUniquePassword($password)) {
-      throw new PhabricatorAuthPasswordException(
-        pht(
-          'The password you entered is the same as another password '.
-          'associated with your account. Each password must be unique.'),
-        pht('Not Unique'));
+    if ($this->getObject()->getPHID()) {
+      if ($this->isRevokedPassword($password)) {
+        throw new PhabricatorAuthPasswordException(
+          pht(
+            'The password you entered has been revoked. You can not reuse '.
+            'a password which has been revoked. Choose a new password.'),
+          pht('Revoked'));
+      }
+
+      if (!$this->isUniquePassword($password)) {
+        throw new PhabricatorAuthPasswordException(
+          pht(
+            'The password you entered is the same as another password '.
+            'associated with your account. Each password must be unique.'),
+          pht('Not Unique'));
+      }
     }
   }
 
diff --git a/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php b/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php
index 206eba4578..75deb9dde5 100644
--- a/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorPasswordAuthProvider.php
@@ -253,6 +253,7 @@ public function processLoginRequest(
 
     $request = $controller->getRequest();
     $viewer = $request->getUser();
+    $content_source = PhabricatorContentSource::newFromRequest($request);
 
     $require_captcha = false;
     $captcha_valid = false;
@@ -285,22 +286,16 @@ public function processLoginRequest(
 
           if ($user) {
             $envelope = new PhutilOpaqueEnvelope($request->getStr('password'));
-            if ($user->comparePassword($envelope)) {
-              $account = $this->loadOrCreateAccount($user->getPHID());
-              $log_user = $user;
-
-              // If the user's password is stored using a less-than-optimal
-              // hash, upgrade them to the strongest available hash.
 
-              $hash_envelope = new PhutilOpaqueEnvelope(
-                $user->getPasswordHash());
-              if (PhabricatorPasswordHasher::canUpgradeHash($hash_envelope)) {
-                $user->setPassword($envelope);
+            $engine = id(new PhabricatorAuthPasswordEngine())
+              ->setViewer($user)
+              ->setContentSource($content_source)
+              ->setPasswordType(PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT)
+              ->setObject($user);
 
-                $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-                  $user->save();
-                unset($unguarded);
-              }
+            if ($engine->isValidPassword($envelope)) {
+              $account = $this->loadOrCreateAccount($user->getPHID());
+              $log_user = $user;
             }
           }
         }
diff --git a/src/applications/auth/storage/PhabricatorAuthPassword.php b/src/applications/auth/storage/PhabricatorAuthPassword.php
index 81e1af7e5c..3a88b990bf 100644
--- a/src/applications/auth/storage/PhabricatorAuthPassword.php
+++ b/src/applications/auth/storage/PhabricatorAuthPassword.php
@@ -127,7 +127,7 @@ public function comparePassword(
     return PhabricatorPasswordHasher::comparePassword($digest, $hash);
   }
 
-  private function newPasswordEnvelope() {
+  public function newPasswordEnvelope() {
     return new PhutilOpaqueEnvelope($this->getPasswordHash());
   }
 
diff --git a/src/applications/people/editor/PhabricatorUserEditor.php b/src/applications/people/editor/PhabricatorUserEditor.php
index 20c9c01370..cda9c1e41b 100644
--- a/src/applications/people/editor/PhabricatorUserEditor.php
+++ b/src/applications/people/editor/PhabricatorUserEditor.php
@@ -129,33 +129,6 @@ public function updateUser(
   }
 
 
-  /**
-   * @task edit
-   */
-  public function changePassword(
-    PhabricatorUser $user,
-    PhutilOpaqueEnvelope $envelope) {
-
-    if (!$user->getID()) {
-      throw new Exception(pht('User has not been created yet!'));
-    }
-
-    $user->openTransaction();
-      $user->reload();
-
-      $user->setPassword($envelope);
-      $user->save();
-
-      $log = PhabricatorUserLog::initializeNewLog(
-        $this->requireActor(),
-        $user->getPHID(),
-        PhabricatorUserLog::ACTION_CHANGE_PASSWORD);
-      $log->save();
-
-    $user->saveTransaction();
-  }
-
-
   /**
    * @task edit
    */
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 455991ca53..18a3f8a2b7 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -263,28 +263,6 @@ public function generatePHID() {
       PhabricatorPeopleUserPHIDType::TYPECONST);
   }
 
-  public function hasPassword() {
-    return (bool)strlen($this->passwordHash);
-  }
-
-  public function setPassword(PhutilOpaqueEnvelope $envelope) {
-    if (!$this->getPHID()) {
-      throw new Exception(
-        pht(
-          'You can not set a password for an unsaved user because their PHID '.
-          'is a salt component in the password hash.'));
-    }
-
-    if (!strlen($envelope->openEnvelope())) {
-      $this->setPasswordHash('');
-    } else {
-      $this->setPasswordSalt(md5(Filesystem::readRandomBytes(32)));
-      $hash = $this->hashPassword($envelope);
-      $this->setPasswordHash($hash->openEnvelope());
-    }
-    return $this;
-  }
-
   public function getMonogram() {
     return '@'.$this->getUsername();
   }
@@ -332,36 +310,6 @@ private function generateConduitCertificate() {
     return Filesystem::readRandomCharacters(255);
   }
 
-  public function comparePassword(PhutilOpaqueEnvelope $envelope) {
-    if (!strlen($envelope->openEnvelope())) {
-      return false;
-    }
-    if (!strlen($this->getPasswordHash())) {
-      return false;
-    }
-
-    return PhabricatorPasswordHasher::comparePassword(
-      $this->getPasswordHashInput($envelope),
-      new PhutilOpaqueEnvelope($this->getPasswordHash()));
-  }
-
-  private function getPasswordHashInput(PhutilOpaqueEnvelope $password) {
-    $input =
-      $this->getUsername().
-      $password->openEnvelope().
-      $this->getPHID().
-      $this->getPasswordSalt();
-
-    return new PhutilOpaqueEnvelope($input);
-  }
-
-  private function hashPassword(PhutilOpaqueEnvelope $password) {
-    $hasher = PhabricatorPasswordHasher::getBestHasher();
-
-    $input_envelope = $this->getPasswordHashInput($password);
-    return $hasher->getPasswordHashForStorage($input_envelope);
-  }
-
   const CSRF_CYCLE_FREQUENCY  = 3600;
   const CSRF_SALT_LENGTH      = 8;
   const CSRF_TOKEN_LENGTH     = 16;
@@ -1669,6 +1617,32 @@ public function newPasswordDigest(
           $digest = PhabricatorHash::weakDigest($digest, $salt);
         }
         return new PhutilOpaqueEnvelope($digest);
+      case PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT:
+        // Account passwords use this weird mess of salt and do not digest
+        // the input to a standard length.
+
+        // TODO: We should build a migration pathway forward from this which
+        // uses a better (HMAC SHA256) digest algorithm. Beyond this being
+        // a weird special case, there are two actual problems with this,
+        // although neither are particularly severe:
+
+        // First, because we do not normalize the length of passwords, this
+        // algorithm may make us vulnerable to DOS attacks where attacker
+        // attempt to use very long inputs to slow down hashers.
+
+        // Second, because the username is part of the hash algorithm, renaming
+        // a user breaks their password. This isn't a huge deal but it's pretty
+        // silly. There's no security justification for this behavior, I just
+        // didn't think about the implication when I wrote it originally.
+
+        $parts = array(
+          $this->getUsername(),
+          $envelope->openEnvelope(),
+          $this->getPHID(),
+          $password->getPasswordSalt(),
+        );
+
+        return new PhutilOpaqueEnvelope(implode('', $parts));
     }
 
     // For passwords which do not have some crazy legacy reason to use some
diff --git a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
index 3807139fe3..793928d5e2 100644
--- a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
@@ -26,6 +26,7 @@ public function isEnabled() {
 
   public function processRequest(AphrontRequest $request) {
     $user = $request->getUser();
+    $content_source = PhabricatorContentSource::newFromRequest($request);
 
     $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $user,
@@ -40,6 +41,22 @@ public function processRequest(AphrontRequest $request) {
     // registration or password reset. If this flow changes, that flow may
     // also need to change.
 
+    $account_type = PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT;
+
+    $password_objects = id(new PhabricatorAuthPasswordQuery())
+      ->setViewer($user)
+      ->withObjectPHIDs(array($user->getPHID()))
+      ->withPasswordTypes(array($account_type))
+      ->withIsRevoked(false)
+      ->execute();
+    if ($password_objects) {
+      $password_object = head($password_objects);
+    } else {
+      $password_object = PhabricatorAuthPassword::initializeNewPassword(
+        $user,
+        $account_type);
+    }
+
     $e_old = true;
     $e_new = true;
     $e_conf = true;
@@ -47,41 +64,42 @@ public function processRequest(AphrontRequest $request) {
     $errors = array();
     if ($request->isFormPost()) {
       $envelope = new PhutilOpaqueEnvelope($request->getStr('old_pw'));
-      if (!$user->comparePassword($envelope)) {
+
+      $engine = id(new PhabricatorAuthPasswordEngine())
+        ->setViewer($user)
+        ->setContentSource($content_source)
+        ->setPasswordType($account_type)
+        ->setObject($user);
+
+      if (!strlen($envelope->openEnvelope())) {
+        $errors[] = pht('You must enter your current password.');
+        $e_old = pht('Required');
+      } else if (!$engine->isValidPassword($envelope)) {
         $errors[] = pht('The old password you entered is incorrect.');
         $e_old = pht('Invalid');
+      } else {
+        $e_old = null;
       }
 
       $pass = $request->getStr('new_pw');
       $conf = $request->getStr('conf_pw');
+      $password_envelope = new PhutilOpaqueEnvelope($pass);
+      $confirm_envelope = new PhutilOpaqueEnvelope($conf);
 
-      if (strlen($pass) < $min_len) {
-        $errors[] = pht('Your new password is too short.');
-        $e_new = pht('Too Short');
-      } else if ($pass !== $conf) {
-        $errors[] = pht('New password and confirmation do not match.');
-        $e_conf = pht('Invalid');
-      } else if (PhabricatorCommonPasswords::isCommonPassword($pass)) {
-        $e_new = pht('Very Weak');
-        $e_conf = pht('Very Weak');
-        $errors[] = pht(
-          'Your new password is very weak: it is one of the most common '.
-          'passwords in use. Choose a stronger password.');
+      try {
+        $engine->checkNewPassword($password_envelope, $confirm_envelope);
+        $e_new = null;
+        $e_conf = null;
+      } catch (PhabricatorAuthPasswordException $ex) {
+        $errors[] = $ex->getMessage();
+        $e_new = $ex->getPasswordError();
+        $e_conf = $ex->getConfirmError();
       }
 
       if (!$errors) {
-        // This write is unguarded because the CSRF token has already
-        // been checked in the call to $request->isFormPost() and
-        // the CSRF token depends on the password hash, so when it
-        // is changed here the CSRF token check will fail.
-        $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-
-        $envelope = new PhutilOpaqueEnvelope($pass);
-          id(new PhabricatorUserEditor())
-            ->setActor($user)
-            ->changePassword($user, $envelope);
-
-        unset($unguarded);
+        $password_object
+          ->setPassword($password_envelope, $user)
+          ->save();
 
         $next = $this->getPanelURI('?saved=true');
 
@@ -93,11 +111,9 @@ public function processRequest(AphrontRequest $request) {
       }
     }
 
-    $hash_envelope = new PhutilOpaqueEnvelope($user->getPasswordHash());
-    if (strlen($hash_envelope->openEnvelope())) {
+    if ($password_object->getID()) {
       try {
-        $can_upgrade = PhabricatorPasswordHasher::canUpgradeHash(
-          $hash_envelope);
+        $can_upgrade = $password_object->canUpgrade();
       } catch (PhabricatorPasswordHasherUnavailableException $ex) {
         $can_upgrade = false;
 
@@ -154,7 +170,7 @@ public function processRequest(AphrontRequest $request) {
     $properties->addProperty(
       pht('Current Algorithm'),
       PhabricatorPasswordHasher::getCurrentAlgorithmName(
-        new PhutilOpaqueEnvelope($user->getPasswordHash())));
+        $password_object->newPasswordEnvelope()));
 
     $properties->addProperty(
       pht('Best Available Algorithm'),

From cab2bba6f2f7d712186e8b88265bfc5e523aca13 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 17:17:36 -0800
Subject: [PATCH 389/865] Remove "passwordHash" and "passwordSalt" from User
 objects

Summary:
Ref T13043. After D18903, this data has migrated to shared infrastructure and has no remaining readers or writers.

Just delete it now, since the cost of a mistake here is very small (users need to "Forgot Password?" and pick a new password).

Test Plan: Grepped for `passwordHash`, `passwordSalt`, and variations.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18904
---
 resources/sql/autopatches/20180121.auth.05.accountnuke.sql | 5 +++++
 src/applications/people/storage/PhabricatorUser.php        | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 resources/sql/autopatches/20180121.auth.05.accountnuke.sql

diff --git a/resources/sql/autopatches/20180121.auth.05.accountnuke.sql b/resources/sql/autopatches/20180121.auth.05.accountnuke.sql
new file mode 100644
index 0000000000..c8dc50bcf2
--- /dev/null
+++ b/resources/sql/autopatches/20180121.auth.05.accountnuke.sql
@@ -0,0 +1,5 @@
+ALTER TABLE {$NAMESPACE}_user.user
+  DROP passwordSalt;
+
+ALTER TABLE {$NAMESPACE}_user.user
+  DROP passwordHash;
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 18a3f8a2b7..840bec7d50 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -29,8 +29,6 @@ final class PhabricatorUser
 
   protected $userName;
   protected $realName;
-  protected $passwordSalt;
-  protected $passwordHash;
   protected $profileImagePHID;
   protected $defaultProfileImagePHID;
   protected $defaultProfileImageVersion;
@@ -217,8 +215,6 @@ protected function getConfiguration() {
       self::CONFIG_COLUMN_SCHEMA => array(
         'userName' => 'sort64',
         'realName' => 'text128',
-        'passwordSalt' => 'text32?',
-        'passwordHash' => 'text128?',
         'profileImagePHID' => 'phid?',
         'conduitCertificate' => 'text255',
         'isSystemAgent' => 'bool',

From 026ec11b9d6bd7f6d7311011b02d0d412c7be320 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 17:44:00 -0800
Subject: [PATCH 390/865] Add a rate limit for guessing old passwords when
 changing passwords

Summary:
Depends on D18904. Ref T13043. If an attacker compromises a victim's session and bypasses their MFA, they can try to guess the user's current account password by making repeated requests to change it: if they guess the right "Old Password", they get a different error than if they don't.

I don't think this is really a very serious concern (the attacker already got a session and MFA, if configured, somehow; many installs don't use passwords anyway) but we get occasional reports about it from HackerOne. Technically, it's better policy to rate limit it, and this should reduce the reports we receive.

Test Plan: Tried to change password over and over again, eventually got rated limited. Used `bin/auth unlimit` to clear the limit, changed password normally without issues.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18906
---
 src/__phutil_library_map__.php                |  2 ++
 .../PhabricatorAuthChangePasswordAction.php   | 22 ++++++++++++++++
 .../PhabricatorPasswordSettingsPanel.php      | 26 +++++++++++++++----
 3 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 src/applications/auth/action/PhabricatorAuthChangePasswordAction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 55d7aa3b5f..c83e336a70 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2033,6 +2033,7 @@
     'PhabricatorAuthApplication' => 'applications/auth/application/PhabricatorAuthApplication.php',
     'PhabricatorAuthAuthFactorPHIDType' => 'applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php',
     'PhabricatorAuthAuthProviderPHIDType' => 'applications/auth/phid/PhabricatorAuthAuthProviderPHIDType.php',
+    'PhabricatorAuthChangePasswordAction' => 'applications/auth/action/PhabricatorAuthChangePasswordAction.php',
     'PhabricatorAuthConduitAPIMethod' => 'applications/auth/conduit/PhabricatorAuthConduitAPIMethod.php',
     'PhabricatorAuthConduitTokenRevoker' => 'applications/auth/revoker/PhabricatorAuthConduitTokenRevoker.php',
     'PhabricatorAuthConfirmLinkController' => 'applications/auth/controller/PhabricatorAuthConfirmLinkController.php',
@@ -7321,6 +7322,7 @@
     'PhabricatorAuthApplication' => 'PhabricatorApplication',
     'PhabricatorAuthAuthFactorPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorAuthAuthProviderPHIDType' => 'PhabricatorPHIDType',
+    'PhabricatorAuthChangePasswordAction' => 'PhabricatorSystemAction',
     'PhabricatorAuthConduitAPIMethod' => 'ConduitAPIMethod',
     'PhabricatorAuthConduitTokenRevoker' => 'PhabricatorAuthRevoker',
     'PhabricatorAuthConfirmLinkController' => 'PhabricatorAuthController',
diff --git a/src/applications/auth/action/PhabricatorAuthChangePasswordAction.php b/src/applications/auth/action/PhabricatorAuthChangePasswordAction.php
new file mode 100644
index 0000000000..323c3e65b6
--- /dev/null
+++ b/src/applications/auth/action/PhabricatorAuthChangePasswordAction.php
@@ -0,0 +1,22 @@
+<?php
+
+final class PhabricatorAuthChangePasswordAction
+  extends PhabricatorSystemAction {
+
+  const TYPECONST = 'auth.password';
+
+  public function getActionConstant() {
+    return self::TYPECONST;
+  }
+
+  public function getScoreThreshold() {
+    return 20 / phutil_units('1 hour in seconds');
+  }
+
+  public function getLimitExplanation() {
+    return pht(
+      'You have failed to enter the correct account password too often in '.
+      'a short period of time.');
+  }
+
+}
diff --git a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
index 793928d5e2..9fb8838cf7 100644
--- a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
@@ -25,11 +25,13 @@ public function isEnabled() {
   }
 
   public function processRequest(AphrontRequest $request) {
-    $user = $request->getUser();
+    $viewer = $request->getUser();
+    $user = $this->getUser();
+
     $content_source = PhabricatorContentSource::newFromRequest($request);
 
     $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
-      $user,
+      $viewer,
       $request,
       '/settings/');
 
@@ -44,7 +46,7 @@ public function processRequest(AphrontRequest $request) {
     $account_type = PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT;
 
     $password_objects = id(new PhabricatorAuthPasswordQuery())
-      ->setViewer($user)
+      ->setViewer($viewer)
       ->withObjectPHIDs(array($user->getPHID()))
       ->withPasswordTypes(array($account_type))
       ->withIsRevoked(false)
@@ -63,10 +65,18 @@ public function processRequest(AphrontRequest $request) {
 
     $errors = array();
     if ($request->isFormPost()) {
+      // Rate limit guesses about the old password. This page requires MFA and
+      // session compromise already, so this is mostly just to stop researchers
+      // from reporting this as a vulnerability.
+      PhabricatorSystemActionEngine::willTakeAction(
+        array($viewer->getPHID()),
+        new PhabricatorAuthChangePasswordAction(),
+        1);
+
       $envelope = new PhutilOpaqueEnvelope($request->getStr('old_pw'));
 
       $engine = id(new PhabricatorAuthPasswordEngine())
-        ->setViewer($user)
+        ->setViewer($viewer)
         ->setContentSource($content_source)
         ->setPasswordType($account_type)
         ->setObject($user);
@@ -79,6 +89,12 @@ public function processRequest(AphrontRequest $request) {
         $e_old = pht('Invalid');
       } else {
         $e_old = null;
+
+        // Refund the user an action credit for getting the password right.
+        PhabricatorSystemActionEngine::willTakeAction(
+          array($viewer->getPHID()),
+          new PhabricatorAuthChangePasswordAction(),
+          -1);
       }
 
       $pass = $request->getStr('new_pw');
@@ -142,7 +158,7 @@ public function processRequest(AphrontRequest $request) {
     }
 
     $form = id(new AphrontFormView())
-      ->setViewer($user)
+      ->setViewer($viewer)
       ->appendChild(
         id(new AphrontFormPasswordControl())
           ->setLabel(pht('Old Password'))

From 13ef5c6f2314c110c6e4a34dd0e8bafe1ac74718 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 17:55:28 -0800
Subject: [PATCH 391/865] When administrators revoke SSH keys, don't include a
 "security warning" in the mail

Summary:
Depends on D18906. Ref T13043. When SSH keys are edited, we normally include a warning that if you don't recognize the activity you might have problems in the mail body.

Currently, this warning is also shown for revocations with `bin/auth revoke --type ssh`. However, these revocations are safe (revocations are generally not dangerous anyway) and almost certainly legitimate and administrative, so don't warn users about them.

Test Plan:
  - Created and revoked a key.
  - Creation mail still had warning; revocation mail no longer did.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18907
---
 .../editor/PhabricatorAuthSSHKeyEditor.php    | 36 ++++++++++++++++---
 .../revoker/PhabricatorAuthSSHRevoker.php     |  1 +
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php b/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
index 1c40af5795..384395c182 100644
--- a/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
+++ b/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
@@ -3,6 +3,17 @@
 final class PhabricatorAuthSSHKeyEditor
   extends PhabricatorApplicationTransactionEditor {
 
+  private $isAdministrativeEdit;
+
+  public function setIsAdministrativeEdit($is_administrative_edit) {
+    $this->isAdministrativeEdit = $is_administrative_edit;
+    return $this;
+  }
+
+  public function getIsAdministrativeEdit() {
+    return $this->isAdministrativeEdit;
+  }
+
   public function getEditorApplicationClass() {
     return 'PhabricatorAuthApplication';
   }
@@ -239,11 +250,13 @@ protected function buildMailBody(
 
     $body = parent::buildMailBody($object, $xactions);
 
-    $body->addTextSection(
-      pht('SECURITY WARNING'),
-      pht(
-        'If you do not recognize this change, it may indicate your account '.
-        'has been compromised.'));
+    if (!$this->getIsAdministrativeEdit()) {
+      $body->addTextSection(
+        pht('SECURITY WARNING'),
+        pht(
+          'If you do not recognize this change, it may indicate your account '.
+          'has been compromised.'));
+    }
 
     $detail_uri = $object->getURI();
     $detail_uri = PhabricatorEnv::getProductionURI($detail_uri);
@@ -253,4 +266,17 @@ protected function buildMailBody(
     return $body;
   }
 
+
+  protected function getCustomWorkerState() {
+    return array(
+      'isAdministrativeEdit' => $this->isAdministrativeEdit,
+    );
+  }
+
+  protected function loadCustomWorkerState(array $state) {
+    $this->isAdministrativeEdit = idx($state, 'isAdministrativeEdit');
+    return $this;
+  }
+
+
 }
diff --git a/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php b/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
index aafb60cfca..a18a2e7812 100644
--- a/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
@@ -43,6 +43,7 @@ private function revokeWithQuery(PhabricatorAuthSSHKeyQuery $query) {
         ->setContinueOnNoEffect(true)
         ->setContinueOnMissingFields(true)
         ->setContentSource($content_source)
+        ->setIsAdministrativeEdit(true)
         ->applyTransactions($ssh_key, $xactions);
     }
 

From 21e415299f265e909eb18925cd5d68dd75c28266 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 21 Jan 2018 18:07:49 -0800
Subject: [PATCH 392/865] Mark all existing password hashes as "legacy" and
 start upgrading digest formats

Summary:
Depends on D18907. Ref T13043. Ref T12509. We have some weird old password digest behavior that isn't terribly concerning, but also isn't great.

Specifically, old passwords were digested in weird ways before being hashed. Notably, account passwords were digested with usernames, so your password stops working if your username is chagned. Not the end of the world, but silly.

Mark all existing hashes as "v1", and automatically upgrade then when they're used or changed. Some day, far in the future, we could stop supporting these legacy digests and delete the code and passwords and just issue upgrade advice ("Passwords which haven't been used in more than two years no longer work."). But at least get things on a path toward sane, modern behavior.

Test Plan: Ran migration. Spot-checked that everthing in the database got marked as "v1". Used an existing password to login successfully. Verified that it was upgraded to a `null` (modern) digest. Logged in with it again.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043, T12509

Differential Revision: https://secure.phabricator.com/D18908
---
 .../20180121.auth.06.legacydigest.sql         |  2 +
 .../20180121.auth.07.marklegacy.sql           |  4 +
 .../auth/storage/PhabricatorAuthPassword.php  | 11 +++
 .../people/storage/PhabricatorUser.php        | 77 ++++++++++---------
 4 files changed, 56 insertions(+), 38 deletions(-)
 create mode 100644 resources/sql/autopatches/20180121.auth.06.legacydigest.sql
 create mode 100644 resources/sql/autopatches/20180121.auth.07.marklegacy.sql

diff --git a/resources/sql/autopatches/20180121.auth.06.legacydigest.sql b/resources/sql/autopatches/20180121.auth.06.legacydigest.sql
new file mode 100644
index 0000000000..af9c7990d0
--- /dev/null
+++ b/resources/sql/autopatches/20180121.auth.06.legacydigest.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_auth.auth_password
+  ADD legacyDigestFormat VARCHAR(32) COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180121.auth.07.marklegacy.sql b/resources/sql/autopatches/20180121.auth.07.marklegacy.sql
new file mode 100644
index 0000000000..798757d348
--- /dev/null
+++ b/resources/sql/autopatches/20180121.auth.07.marklegacy.sql
@@ -0,0 +1,4 @@
+UPDATE {$NAMESPACE}_auth.auth_password
+  SET legacyDigestFormat = 'v1'
+  WHERE passwordType IN ('vcs', 'account')
+  AND legacyDigestFormat IS NULL;
diff --git a/src/applications/auth/storage/PhabricatorAuthPassword.php b/src/applications/auth/storage/PhabricatorAuthPassword.php
index 3a88b990bf..62cca7f130 100644
--- a/src/applications/auth/storage/PhabricatorAuthPassword.php
+++ b/src/applications/auth/storage/PhabricatorAuthPassword.php
@@ -12,6 +12,7 @@ final class PhabricatorAuthPassword
   protected $passwordHash;
   protected $passwordSalt;
   protected $isRevoked;
+  protected $legacyDigestFormat;
 
   private $object = self::ATTACHABLE;
 
@@ -38,6 +39,7 @@ protected function getConfiguration() {
         'passwordHash' => 'text128',
         'passwordSalt' => 'text64',
         'isRevoked' => 'bool',
+        'legacyDigestFormat' => 'text32?',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_role' => array(
@@ -66,6 +68,12 @@ public function getHasher() {
   }
 
   public function canUpgrade() {
+    // If this password uses a legacy digest format, we can upgrade it to the
+    // new digest format even if a better hasher isn't available.
+    if ($this->getLegacyDigestFormat() !== null) {
+      return true;
+    }
+
     $hash = $this->newPasswordEnvelope();
     return PhabricatorPasswordHasher::canUpgradeHash($hash);
   }
@@ -110,6 +118,9 @@ public function setPasswordWithHasher(
     $new_salt = Filesystem::readRandomCharacters(64);
     $this->setPasswordSalt($new_salt);
 
+    // Clear any legacy digest format to force a modern digest.
+    $this->setLegacyDigestFormat(null);
+
     $digest = $this->digestPassword($password, $object);
     $hash = $hasher->getPasswordHashForStorage($digest);
     $raw_hash = $hash->openEnvelope();
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 840bec7d50..7d7b50a4cb 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -1590,7 +1590,7 @@ public function newPasswordDigest(
     // Applying salt while digesting passwords ensures that hashes are salted
     // whether we ultimately select a self-salting hasher or not.
 
-    // For legacy compatibility reasons, the VCS and Account password digest
+    // For legacy compatibility reasons, old VCS and Account password digest
     // algorithms are significantly more complicated than necessary to achieve
     // these goals. This is because they once used a different hashing and
     // salting process. When we upgraded to the modern modular hasher
@@ -1602,43 +1602,44 @@ public function newPasswordDigest(
     // everything that a digest callback should without any needless legacy
     // baggage on top.
 
-    switch ($password->getPasswordType()) {
-      case PhabricatorAuthPassword::PASSWORD_TYPE_VCS:
-        // VCS passwords use an iterated HMAC SHA1 as a digest algorithm. They
-        // originally used this as a hasher, but it became a digest alorithm
-        // once hashing was upgraded to include bcrypt.
-        $digest = $envelope->openEnvelope();
-        $salt = $this->getPHID();
-        for ($ii = 0; $ii < 1000; $ii++) {
-          $digest = PhabricatorHash::weakDigest($digest, $salt);
-        }
-        return new PhutilOpaqueEnvelope($digest);
-      case PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT:
-        // Account passwords use this weird mess of salt and do not digest
-        // the input to a standard length.
-
-        // TODO: We should build a migration pathway forward from this which
-        // uses a better (HMAC SHA256) digest algorithm. Beyond this being
-        // a weird special case, there are two actual problems with this,
-        // although neither are particularly severe:
-
-        // First, because we do not normalize the length of passwords, this
-        // algorithm may make us vulnerable to DOS attacks where attacker
-        // attempt to use very long inputs to slow down hashers.
-
-        // Second, because the username is part of the hash algorithm, renaming
-        // a user breaks their password. This isn't a huge deal but it's pretty
-        // silly. There's no security justification for this behavior, I just
-        // didn't think about the implication when I wrote it originally.
-
-        $parts = array(
-          $this->getUsername(),
-          $envelope->openEnvelope(),
-          $this->getPHID(),
-          $password->getPasswordSalt(),
-        );
-
-        return new PhutilOpaqueEnvelope(implode('', $parts));
+    if ($password->getLegacyDigestFormat() == 'v1') {
+      switch ($password->getPasswordType()) {
+        case PhabricatorAuthPassword::PASSWORD_TYPE_VCS:
+          // Old VCS passwords use an iterated HMAC SHA1 as a digest algorithm.
+          // They originally used this as a hasher, but it became a digest
+          // algorithm once hashing was upgraded to include bcrypt.
+          $digest = $envelope->openEnvelope();
+          $salt = $this->getPHID();
+          for ($ii = 0; $ii < 1000; $ii++) {
+            $digest = PhabricatorHash::weakDigest($digest, $salt);
+          }
+          return new PhutilOpaqueEnvelope($digest);
+        case PhabricatorAuthPassword::PASSWORD_TYPE_ACCOUNT:
+          // Account passwords previously used this weird mess of salt and did
+          // not digest the input to a standard length.
+
+          // Beyond this being a weird special case, there are two actual
+          // problems with this, although neither are particularly severe:
+
+          // First, because we do not normalize the length of passwords, this
+          // algorithm may make us vulnerable to DOS attacks where an attacker
+          // attempts to use a very long input to slow down hashers.
+
+          // Second, because the username is part of the hash algorithm,
+          // renaming a user breaks their password. This isn't a huge deal but
+          // it's pretty silly. There's no security justification for this
+          // behavior, I just didn't think about the implication when I wrote
+          // it originally.
+
+          $parts = array(
+            $this->getUsername(),
+            $envelope->openEnvelope(),
+            $this->getPHID(),
+            $password->getPasswordSalt(),
+          );
+
+          return new PhutilOpaqueEnvelope(implode('', $parts));
+      }
     }
 
     // For passwords which do not have some crazy legacy reason to use some

From 3becd5a57c2732e784b63e4805743caa538839e5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 22 Jan 2018 09:30:12 -0800
Subject: [PATCH 393/865] Add "bin/auth revoke --list" to explain what can be
 revoked

Summary:
Depends on D18908. Ref T13043. Allow users to get information about what revokers do with a new `--list` flag.

You can use `--list --type <key>` to get information about a specfic revoker.

Test Plan: Ran `bin/auth revoke --list`, saw a list of revokers with useful information.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18910
---
 ...habricatorAuthManagementRevokeWorkflow.php | 68 ++++++++++++++++---
 .../PhabricatorAuthConduitTokenRevoker.php    | 13 ++++
 .../PhabricatorAuthPasswordRevoker.php        | 29 ++++++++
 .../auth/revoker/PhabricatorAuthRevoker.php   |  7 ++
 .../revoker/PhabricatorAuthSSHRevoker.php     | 12 ++++
 .../revoker/PhabricatorAuthSessionRevoker.php | 10 +++
 .../PhabricatorAuthTemporaryTokenRevoker.php  | 13 ++++
 7 files changed, 143 insertions(+), 9 deletions(-)

diff --git a/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
index ea46fef540..6d907e67d6 100644
--- a/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
+++ b/src/applications/auth/management/PhabricatorAuthManagementRevokeWorkflow.php
@@ -7,7 +7,8 @@ protected function didConstruct() {
     $this
       ->setName('revoke')
       ->setExamples(
-        "**revoke** --type __type__ --from __user__\n".
+        "**revoke** --list\n".
+        "**revoke** --type __type__ --from __@user__\n".
         "**revoke** --everything --everywhere")
       ->setSynopsis(
         pht(
@@ -16,15 +17,20 @@ protected function didConstruct() {
         array(
           array(
             'name' => 'from',
-            'param' => 'user',
+            'param' => 'object',
             'help' => pht(
-              'Revoke credentials for the specified user.'),
+              'Revoke credentials for the specified object. To revoke '.
+              'credentials for a user, use "@username".'),
           ),
           array(
             'name' => 'type',
             'param' => 'type',
+            'help' => pht('Revoke credentials of the given type.'),
+          ),
+          array(
+            'name' => 'list',
             'help' => pht(
-              'Revoke credentials of the given type.'),
+              'List information about available credential revokers.'),
           ),
           array(
             'name' => 'everything',
@@ -42,18 +48,29 @@ protected function didConstruct() {
   }
 
   public function execute(PhutilArgumentParser $args) {
-    $viewer = PhabricatorUser::getOmnipotentUser();
+    $viewer = $this->getViewer();
 
     $all_types = PhabricatorAuthRevoker::getAllRevokers();
     $is_force = $args->getArg('force');
 
+    // The "--list" flag is compatible with revoker selection flags like
+    // "--type" to filter the list, but not compatible with target selection
+    // flags like "--from".
+    $is_list = $args->getArg('list');
+
     $type = $args->getArg('type');
     $is_everything = $args->getArg('everything');
     if (!strlen($type) && !$is_everything) {
-      throw new PhutilArgumentUsageException(
-        pht(
-          'Specify the credential type to revoke with "--type" or specify '.
-          '"--everything".'));
+      if ($is_list) {
+        // By default, "bin/revoke --list" implies "--everything".
+        $types = $all_types;
+      } else {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Specify the credential type to revoke with "--type" or specify '.
+            '"--everything". Use "--list" to list available credential '.
+            'types.'));
+      }
     } else if (strlen($type) && $is_everything) {
       throw new PhutilArgumentUsageException(
         pht(
@@ -75,6 +92,32 @@ public function execute(PhutilArgumentParser $args) {
 
     $is_everywhere = $args->getArg('everywhere');
     $from = $args->getArg('from');
+
+    if ($is_list) {
+      if (strlen($from) || $is_everywhere) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'You can not "--list" and revoke credentials (with "--from" or '.
+            '"--everywhere") in the same operation.'));
+      }
+    }
+
+    if ($is_list) {
+      $last_key = last_key($types);
+      foreach ($types as $key => $type) {
+        echo tsprintf(
+          "**%s** (%s)\n\n",
+          $type->getRevokerKey(),
+          $type->getRevokerName());
+
+        id(new PhutilConsoleBlock())
+          ->addParagraph(tsprintf('%B', $type->getRevokerDescription()))
+          ->draw();
+      }
+
+      return 0;
+    }
+
     $target = null;
     if (!strlen($from) && !$is_everywhere) {
       throw new PhutilArgumentUsageException(
@@ -133,6 +176,13 @@ public function execute(PhutilArgumentParser $args) {
           'Destroyed %s credential(s) of type "%s".',
           new PhutilNumber($count),
           $type->getRevokerKey()));
+
+      $guidance = $type->getRevokerNextSteps();
+      if ($guidance !== null) {
+        echo tsprintf(
+          "%s\n",
+          $guidance);
+      }
     }
 
     echo tsprintf(
diff --git a/src/applications/auth/revoker/PhabricatorAuthConduitTokenRevoker.php b/src/applications/auth/revoker/PhabricatorAuthConduitTokenRevoker.php
index c3b8572d55..578b489a24 100644
--- a/src/applications/auth/revoker/PhabricatorAuthConduitTokenRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthConduitTokenRevoker.php
@@ -5,6 +5,19 @@ final class PhabricatorAuthConduitTokenRevoker
 
   const REVOKERKEY = 'conduit';
 
+  public function getRevokerName() {
+    return pht('Conduit API Tokens');
+  }
+
+  public function getRevokerDescription() {
+    return pht(
+      "Revokes all Conduit API tokens used to access the API.\n\n".
+      "Users will need to use `arc install-certificate` to install new ".
+      "API tokens before `arc` commands will work. Bots and scripts which ".
+      "access the API will need to have new tokens generated and ".
+      "installed.");
+  }
+
   public function revokeAllCredentials() {
     $table = id(new PhabricatorConduitToken());
     $conn = $table->establishConnection('w');
diff --git a/src/applications/auth/revoker/PhabricatorAuthPasswordRevoker.php b/src/applications/auth/revoker/PhabricatorAuthPasswordRevoker.php
index e42d0db256..646d266b1e 100644
--- a/src/applications/auth/revoker/PhabricatorAuthPasswordRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthPasswordRevoker.php
@@ -5,6 +5,35 @@ final class PhabricatorAuthPasswordRevoker
 
   const REVOKERKEY = 'password';
 
+  public function getRevokerName() {
+    return pht('Passwords');
+  }
+
+  public function getRevokerDescription() {
+    return pht(
+      "Revokes all stored passwords.\n\n".
+      "Account passwords and VCS passwords (used to access repositories ".
+      "over HTTP) will both be revoked. Passwords for any third party ".
+      "applications which use shared password infrastructure will also ".
+      "be revoked.\n\n".
+      "Users will need to reset account passwords, possibly by using the ".
+      "\"Forgot Password?\" link on the login page. They will also need ".
+      "to reset VCS passwords.\n\n".
+      "Passwords are revoked, not just removed. Users will be unable to ".
+      "select the passwords they used previously and must choose new, ".
+      "unique passwords.\n\n".
+      "Revoking passwords will not terminate outstanding login sessions. ".
+      "Use the \"session\" revoker in conjunction with this revoker to force ".
+      "users to login again.");
+  }
+
+  public function getRevokerNextSteps() {
+    return pht(
+      'NOTE: Revoking passwords does not terminate existing sessions which '.
+      'were established using the old passwords. To terminate existing '.
+      'sessions, run the "session" revoker now.');
+  }
+
   public function revokeAllCredentials() {
     $query = new PhabricatorAuthPasswordQuery();
     return $this->revokeWithQuery($query);
diff --git a/src/applications/auth/revoker/PhabricatorAuthRevoker.php b/src/applications/auth/revoker/PhabricatorAuthRevoker.php
index 3a807e3089..9bf44b05bc 100644
--- a/src/applications/auth/revoker/PhabricatorAuthRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthRevoker.php
@@ -8,6 +8,13 @@ abstract class PhabricatorAuthRevoker
   abstract public function revokeAllCredentials();
   abstract public function revokeCredentialsFrom($object);
 
+  abstract public function getRevokerName();
+  abstract public function getRevokerDescription();
+
+  public function getRevokerNextSteps() {
+    return null;
+  }
+
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
diff --git a/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php b/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
index a18a2e7812..3e6b862370 100644
--- a/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthSSHRevoker.php
@@ -5,6 +5,18 @@ final class PhabricatorAuthSSHRevoker
 
   const REVOKERKEY = 'ssh';
 
+  public function getRevokerName() {
+    return pht('SSH Keys');
+  }
+
+  public function getRevokerDescription() {
+    return pht(
+      "Revokes all SSH public keys.\n\n".
+      "SSH public keys are revoked, not just removed. Users will need to ".
+      "generate and upload new, unique keys before they can access ".
+      "repositories or other services over SSH.");
+  }
+
   public function revokeAllCredentials() {
     $query = new PhabricatorAuthSSHKeyQuery();
     return $this->revokeWithQuery($query);
diff --git a/src/applications/auth/revoker/PhabricatorAuthSessionRevoker.php b/src/applications/auth/revoker/PhabricatorAuthSessionRevoker.php
index b5e294e6f1..c3362b0331 100644
--- a/src/applications/auth/revoker/PhabricatorAuthSessionRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthSessionRevoker.php
@@ -5,6 +5,16 @@ final class PhabricatorAuthSessionRevoker
 
   const REVOKERKEY = 'session';
 
+  public function getRevokerName() {
+    return pht('Sessions');
+  }
+
+  public function getRevokerDescription() {
+    return pht(
+      "Revokes all active login sessions.\n\n".
+      "Affected users will be logged out and need to log in again.");
+  }
+
   public function revokeAllCredentials() {
     $table = new PhabricatorAuthSession();
     $conn = $table->establishConnection('w');
diff --git a/src/applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php b/src/applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php
index 8f9fdb2b9e..f274e13a18 100644
--- a/src/applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php
+++ b/src/applications/auth/revoker/PhabricatorAuthTemporaryTokenRevoker.php
@@ -5,6 +5,19 @@ final class PhabricatorAuthTemporaryTokenRevoker
 
   const REVOKERKEY = 'temporary';
 
+  public function getRevokerName() {
+    return pht('Temporary Tokens');
+  }
+
+  public function getRevokerDescription() {
+    return pht(
+      "Revokes temporary authentication tokens.\n\n".
+      "Temporary tokens are used in password reset mail, welcome mail, and ".
+      "by some other systems like Git LFS. Revoking temporary tokens will ".
+      "invalidate existing links in password reset and invite mail that ".
+      "was sent before the revocation occurred.");
+  }
+
   public function revokeAllCredentials() {
     $table = new PhabricatorAuthTemporaryToken();
     $conn = $table->establishConnection('w');

From d4b3cd5255b656c5f8dae01865b1e95b4e9202a5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 22 Jan 2018 10:14:47 -0800
Subject: [PATCH 394/865] Document the "bin/auth revoke" tool

Summary: Depends on D18910. Ref T13043. Provides reasonable user-facing documentation about the general role and utility of this tool.

Test Plan: Read document.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18911
---
 .../user/field/revoking_credentials.diviner   | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 src/docs/user/field/revoking_credentials.diviner

diff --git a/src/docs/user/field/revoking_credentials.diviner b/src/docs/user/field/revoking_credentials.diviner
new file mode 100644
index 0000000000..b1e18bcd97
--- /dev/null
+++ b/src/docs/user/field/revoking_credentials.diviner
@@ -0,0 +1,101 @@
+@title Revoking Credentials
+@group fieldmanual
+
+Revoking credentials, tokens, and sessions.
+
+Overview
+========
+
+If you've become aware of a security breach that affects you, you may want to
+revoke or cycle credentials in case anything was leaked.
+
+You can revoke credentials with the `bin/auth revoke` tool. This document
+describes how to use the tool and how revocation works.
+
+
+bin/auth revoke
+===============
+
+The `bin/auth revoke` tool revokes specified sets of credentials from
+specified targets. For example, if you believe `@alice` may have had her SSH
+key compromised, you can revoke her keys like this:
+
+```
+phabricator/ $ ./bin/auth revoke --type ssh --from @alice
+```
+
+The flag `--everything` revokes all credential types.
+
+The flag `--everywhere` revokes credentials from all objects. For most
+credential types this means "all users", but some credentials (like SSH keys)
+can also be associated with other kinds of objects.
+
+Note that revocation can be disruptive (users must choose new passwords,
+generate new API tokens, configure new SSH keys, etc) and can not be easily
+undone if you perform an excessively broad revocation.
+
+You can use the `--list` flag to get a list of available credential types
+which can be revoked. This includes upstream credential types, and may include
+third-party credential types if you have extensions installed.
+
+To list all revokable credential types:
+
+```
+phabricator/ $ ./bin/auth revoke --list
+```
+
+To get details about exactly how a specific revoker works:
+
+```
+phabricator/ $ ./bin/auth revoke --list --type ssh
+```
+
+
+Revocation vs Removal
+=====================
+
+Generally, `bin/auth revoke` **revokes** credentials, rather than just deleting
+or removing them. That is, the credentials are moved to a permanent revocation
+list of invalid credentials.
+
+For example, revoking an SSH key prevents users from adding that key back to
+their account: they must generate and add a new, unique key. Likewise, revoked
+passwords can not be reused.
+
+Although it is technically possible to reinstate credentials by removing them
+from revocation lists, there are no tools available for this and you should
+treat revocation lists as permanent.
+
+
+Scenarios
+=========
+
+**Network Compromise**: If you believe you may have been affected by a network
+compromise (where an attacker may have observed data transmitted over the
+network), you should revoke the `password`, `conduit`, `session`, and
+`temporary` credentials for all users. This will revoke all credentials which
+are normally sent over the network.
+
+You can revoke these credentials by running these commands:
+
+```
+phabricator/ $ ./bin/auth revoke --type password --everywhere
+phabricator/ $ ./bin/auth revoke --type conduit --everywhere
+phabricator/ $ ./bin/auth revoke --type session --everywhere
+phabricator/ $ ./bin/auth revoke --type temporary --everywhere
+```
+
+Depending on the nature of the compromise you may also consider revoking `ssh`
+credentials, although these are usually not sent over the network because
+they are asymmetric.
+
+**User Compromise**: If you believe a user's credentials have been compromised
+(for example, maybe they lost a phone or laptop) you should revoke
+`--everything` from their account. This will revoke all of their outstanding
+credentials without affecting other users.
+
+You can revoke all credentials for a user by running this command:
+
+```
+phabricator/ $ ./bin/auth revoke --everything --from @alice
+```

From bf2868c0701642069103173f64668966b5393bb8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 23 Jan 2018 08:10:54 -0800
Subject: [PATCH 395/865] Rename "PhabricatorPasswordHashInterface" to
 "PhabricatorAuthPasswordHashInterface"

Summary: Depends on D18911. Ref T13043. Improves consistency with other "PhabricatorAuthPassword..." classes.

Test Plan: Unit tests, `grep`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18916
---
 src/__phutil_library_map__.php                       |  4 ++--
 .../auth/engine/PhabricatorAuthPasswordEngine.php    |  2 +-
 ....php => PhabricatorAuthPasswordHashInterface.php} |  2 +-
 .../auth/storage/PhabricatorAuthPassword.php         | 12 ++++++------
 src/applications/people/storage/PhabricatorUser.php  |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename src/applications/auth/password/{PhabricatorPasswordHashInterface.php => PhabricatorAuthPasswordHashInterface.php} (71%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c83e336a70..4db524a379 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2094,6 +2094,7 @@
     'PhabricatorAuthPasswordEditor' => 'applications/auth/editor/PhabricatorAuthPasswordEditor.php',
     'PhabricatorAuthPasswordEngine' => 'applications/auth/engine/PhabricatorAuthPasswordEngine.php',
     'PhabricatorAuthPasswordException' => 'applications/auth/password/PhabricatorAuthPasswordException.php',
+    'PhabricatorAuthPasswordHashInterface' => 'applications/auth/password/PhabricatorAuthPasswordHashInterface.php',
     'PhabricatorAuthPasswordPHIDType' => 'applications/auth/phid/PhabricatorAuthPasswordPHIDType.php',
     'PhabricatorAuthPasswordQuery' => 'applications/auth/query/PhabricatorAuthPasswordQuery.php',
     'PhabricatorAuthPasswordResetTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php',
@@ -3496,7 +3497,6 @@
     'PhabricatorPassphraseApplication' => 'applications/passphrase/application/PhabricatorPassphraseApplication.php',
     'PhabricatorPasswordAuthProvider' => 'applications/auth/provider/PhabricatorPasswordAuthProvider.php',
     'PhabricatorPasswordDestructionEngineExtension' => 'applications/auth/extension/PhabricatorPasswordDestructionEngineExtension.php',
-    'PhabricatorPasswordHashInterface' => 'applications/auth/password/PhabricatorPasswordHashInterface.php',
     'PhabricatorPasswordHasher' => 'infrastructure/util/password/PhabricatorPasswordHasher.php',
     'PhabricatorPasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorPasswordHasherTestCase.php',
     'PhabricatorPasswordHasherUnavailableException' => 'infrastructure/util/password/PhabricatorPasswordHasherUnavailableException.php',
@@ -9997,7 +9997,7 @@
       'PhabricatorFulltextInterface',
       'PhabricatorFerretInterface',
       'PhabricatorConduitResultInterface',
-      'PhabricatorPasswordHashInterface',
+      'PhabricatorAuthPasswordHashInterface',
     ),
     'PhabricatorUserBadgesCacheType' => 'PhabricatorUserCacheType',
     'PhabricatorUserBlurbField' => 'PhabricatorUserCustomField',
diff --git a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
index 595a523083..c09aa88308 100644
--- a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
@@ -27,7 +27,7 @@ public function getContentSource() {
     return $this->contentSource;
   }
 
-  public function setObject(PhabricatorPasswordHashInterface $object) {
+  public function setObject(PhabricatorAuthPasswordHashInterface $object) {
     $this->object = $object;
     return $this;
   }
diff --git a/src/applications/auth/password/PhabricatorPasswordHashInterface.php b/src/applications/auth/password/PhabricatorAuthPasswordHashInterface.php
similarity index 71%
rename from src/applications/auth/password/PhabricatorPasswordHashInterface.php
rename to src/applications/auth/password/PhabricatorAuthPasswordHashInterface.php
index 10cad716c1..36a296b209 100644
--- a/src/applications/auth/password/PhabricatorPasswordHashInterface.php
+++ b/src/applications/auth/password/PhabricatorAuthPasswordHashInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-interface PhabricatorPasswordHashInterface {
+interface PhabricatorAuthPasswordHashInterface {
 
   public function newPasswordDigest(
     PhutilOpaqueEnvelope $envelope,
diff --git a/src/applications/auth/storage/PhabricatorAuthPassword.php b/src/applications/auth/storage/PhabricatorAuthPassword.php
index 62cca7f130..5343e622fd 100644
--- a/src/applications/auth/storage/PhabricatorAuthPassword.php
+++ b/src/applications/auth/storage/PhabricatorAuthPassword.php
@@ -21,7 +21,7 @@ final class PhabricatorAuthPassword
   const PASSWORD_TYPE_TEST = 'test';
 
   public static function initializeNewPassword(
-    PhabricatorPasswordHashInterface $object,
+    PhabricatorAuthPasswordHashInterface $object,
     $type) {
 
     return id(new self())
@@ -80,7 +80,7 @@ public function canUpgrade() {
 
   public function upgradePasswordHasher(
     PhutilOpaqueEnvelope $envelope,
-    PhabricatorPasswordHashInterface $object) {
+    PhabricatorAuthPasswordHashInterface $object) {
 
     // Before we make changes, double check that this is really the correct
     // password. It could be really bad if we "upgraded" a password and changed
@@ -98,7 +98,7 @@ public function upgradePasswordHasher(
 
   public function setPassword(
     PhutilOpaqueEnvelope $password,
-    PhabricatorPasswordHashInterface $object) {
+    PhabricatorAuthPasswordHashInterface $object) {
 
     $hasher = PhabricatorPasswordHasher::getBestHasher();
     return $this->setPasswordWithHasher($password, $object, $hasher);
@@ -106,7 +106,7 @@ public function setPassword(
 
   public function setPasswordWithHasher(
     PhutilOpaqueEnvelope $password,
-    PhabricatorPasswordHashInterface $object,
+    PhabricatorAuthPasswordHashInterface $object,
     PhabricatorPasswordHasher $hasher) {
 
     if (!strlen($password->openEnvelope())) {
@@ -130,7 +130,7 @@ public function setPasswordWithHasher(
 
   public function comparePassword(
     PhutilOpaqueEnvelope $password,
-    PhabricatorPasswordHashInterface $object) {
+    PhabricatorAuthPasswordHashInterface $object) {
 
     $digest = $this->digestPassword($password, $object);
     $hash = $this->newPasswordEnvelope();
@@ -144,7 +144,7 @@ public function newPasswordEnvelope() {
 
   private function digestPassword(
     PhutilOpaqueEnvelope $password,
-    PhabricatorPasswordHashInterface $object) {
+    PhabricatorAuthPasswordHashInterface $object) {
 
     $object_phid = $object->getPHID();
 
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 7d7b50a4cb..6c8b7ac6b5 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -21,7 +21,7 @@ final class PhabricatorUser
     PhabricatorFulltextInterface,
     PhabricatorFerretInterface,
     PhabricatorConduitResultInterface,
-    PhabricatorPasswordHashInterface {
+    PhabricatorAuthPasswordHashInterface {
 
   const SESSION_TABLE = 'phabricator_session';
   const NAMETOKEN_TABLE = 'user_nametoken';
@@ -1565,7 +1565,7 @@ public function getCSSValue($variable_key) {
     return $variables[$variable_key];
   }
 
-/* -(  PhabricatorPasswordHashInterface  )----------------------------------- */
+/* -(  PhabricatorAuthPasswordHashInterface  )------------------------------- */
 
 
   public function newPasswordDigest(

From 291461344404fb3848e45468848dc33e44f164b8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 22 Jan 2018 15:54:47 -0800
Subject: [PATCH 396/865] Fix failure to record `pullerPHID` in repository pull
 logs

Summary:
See PHI305. Ref T13046.

The SSH workflows currently extend `PhabricatorManagementWorkflow` to benefit from sharing all the standard argument parsing code. Sharing the parsing code is good, but it also means they inherit a `getViewer()` method which returns the ommnipotent viewer.

This is appropriate for everything else which extends `ManagementWorkflow` (like `bin/storage`, `bin/auth`, etc.) but not appropriate for SSH workflows, which have a real user.

This caused a bug with the pull logs where `pullerPHID` was not recorded properly. We used `$this->getViewer()->getPHID()` but the correct code was `$this->getUser()->getPHID()`.

To harden this against future mistakes:

  - Don't extend `ManagementWorkflow`. Extend `PhutilArgumentWorkflow` instead. We **only** want the argument parsing code.
  - Rename `get/setUser()` to `get/setSSHUser()` to make them explicit.

Then, fix the pull log bug by calling `getSSHUser()` instead of `getViewer()`.

Test Plan:
  - Pulled and pushed to a repository over SSH.
  - Grepped all the SSH stuff for the altered symbols.
  -  Saw pulls record a valid `pullerPHID` in the pull log.
  - Used `echo {} | ssh ... conduit conduit.ping` to test conduit over SSH.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13046

Differential Revision: https://secure.phabricator.com/D18912
---
 scripts/ssh/ssh-exec.php                       |  2 +-
 src/__phutil_library_map__.php                 |  2 +-
 .../conduit/ssh/ConduitSSHWorkflow.php         |  4 ++--
 .../ssh/DiffusionGitReceivePackSSHWorkflow.php |  2 +-
 .../ssh/DiffusionGitUploadPackSSHWorkflow.php  |  2 +-
 .../diffusion/ssh/DiffusionSSHWorkflow.php     | 14 +++++++-------
 .../DiffusionSubversionServeSSHWorkflow.php    |  2 +-
 .../ssh/PhabricatorSSHWorkflow.php             | 18 ++++++++++++------
 8 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/scripts/ssh/ssh-exec.php b/scripts/ssh/ssh-exec.php
index 5748e371cf..2ff1bdc198 100755
--- a/scripts/ssh/ssh-exec.php
+++ b/scripts/ssh/ssh-exec.php
@@ -245,7 +245,7 @@
   }
 
   $workflow = $parsed_args->parseWorkflows($workflows);
-  $workflow->setUser($user);
+  $workflow->setSSHUser($user);
   $workflow->setOriginalArguments($original_argv);
   $workflow->setIsClusterRequest($is_cluster_request);
 
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4db524a379..7caf7a6dc2 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -9620,7 +9620,7 @@
     'PhabricatorSSHKeysSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorSSHLog' => 'Phobject',
     'PhabricatorSSHPassthruCommand' => 'Phobject',
-    'PhabricatorSSHWorkflow' => 'PhabricatorManagementWorkflow',
+    'PhabricatorSSHWorkflow' => 'PhutilArgumentWorkflow',
     'PhabricatorSavedQuery' => array(
       'PhabricatorSearchDAO',
       'PhabricatorPolicyInterface',
diff --git a/src/applications/conduit/ssh/ConduitSSHWorkflow.php b/src/applications/conduit/ssh/ConduitSSHWorkflow.php
index 6589fac324..603a479ea0 100644
--- a/src/applications/conduit/ssh/ConduitSSHWorkflow.php
+++ b/src/applications/conduit/ssh/ConduitSSHWorkflow.php
@@ -46,7 +46,7 @@ public function execute(PhutilArgumentParser $args) {
 
     try {
       $call = new ConduitCall($method, $params);
-      $call->setUser($this->getUser());
+      $call->setUser($this->getSSHUser());
 
       $result = $call->execute();
     } catch (ConduitException $ex) {
@@ -77,7 +77,7 @@ public function execute(PhutilArgumentParser $args) {
 
     $connection_id = idx($metadata, 'connectionID');
     $log = id(new PhabricatorConduitMethodCallLog())
-      ->setCallerPHID($this->getUser()->getPHID())
+      ->setCallerPHID($this->getSSHUser()->getPHID())
       ->setConnectionID($connection_id)
       ->setMethod($method)
       ->setError((string)$error_code)
diff --git a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
index 76f8d3c837..91c8238718 100644
--- a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
@@ -15,7 +15,7 @@ protected function didConstruct() {
 
   protected function executeRepositoryOperations() {
     $repository = $this->getRepository();
-    $viewer = $this->getUser();
+    $viewer = $this->getSSHUser();
     $device = AlmanacKeys::getLiveDevice();
 
     // This is a write, and must have write access.
diff --git a/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
index 754bafd850..e0d35c32b9 100644
--- a/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
@@ -15,7 +15,7 @@ protected function didConstruct() {
 
   protected function executeRepositoryOperations() {
     $repository = $this->getRepository();
-    $viewer = $this->getUser();
+    $viewer = $this->getSSHUser();
     $device = AlmanacKeys::getLiveDevice();
 
     $skip_sync = $this->shouldSkipReadSynchronization();
diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
index 0e5ad7bbe1..3882079f69 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
@@ -26,7 +26,7 @@ public function getArgs() {
 
   public function getEnvironment() {
     $env = array(
-      DiffusionCommitHookEngine::ENV_USER => $this->getUser()->getUsername(),
+      DiffusionCommitHookEngine::ENV_USER => $this->getSSHUser()->getUsername(),
       DiffusionCommitHookEngine::ENV_REMOTE_PROTOCOL => 'ssh',
     );
 
@@ -122,14 +122,14 @@ protected function getProxyCommand() {
       $key_path,
       $port,
       $host,
-      '@'.$this->getUser()->getUsername(),
+      '@'.$this->getSSHUser()->getUsername(),
       $this->getOriginalArguments());
   }
 
   final public function execute(PhutilArgumentParser $args) {
     $this->args = $args;
 
-    $viewer = $this->getUser();
+    $viewer = $this->getSSHUser();
     $have_diffusion = PhabricatorApplication::isClassInstalledForViewer(
       'PhabricatorDiffusionApplication',
       $viewer);
@@ -164,7 +164,7 @@ final public function execute(PhutilArgumentParser $args) {
   }
 
   protected function loadRepositoryWithPath($path, $vcs) {
-    $viewer = $this->getUser();
+    $viewer = $this->getSSHUser();
 
     $info = PhabricatorRepository::parseRepositoryServicePath($path, $vcs);
     if ($info === null) {
@@ -214,7 +214,7 @@ protected function requireWriteAccess($protocol_command = null) {
     }
 
     $repository = $this->getRepository();
-    $viewer = $this->getUser();
+    $viewer = $this->getSSHUser();
 
     if ($viewer->isOmnipotent()) {
       throw new Exception(
@@ -252,7 +252,7 @@ protected function requireWriteAccess($protocol_command = null) {
   }
 
   protected function shouldSkipReadSynchronization() {
-    $viewer = $this->getUser();
+    $viewer = $this->getSSHUser();
 
     // Currently, the only case where devices interact over SSH without
     // assuming user credentials is when synchronizing before a read. These
@@ -265,7 +265,7 @@ protected function shouldSkipReadSynchronization() {
   }
 
   protected function newPullEvent() {
-    $viewer = $this->getViewer();
+    $viewer = $this->getSSHUser();
     $repository = $this->getRepository();
     $remote_address = $this->getSSHRemoteAddress();
 
diff --git a/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
index f2a932f2bb..0df4aa17fe 100644
--- a/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
@@ -154,7 +154,7 @@ protected function executeRepositoryOperations() {
     } else {
       $command = csprintf(
         'svnserve -t --tunnel-user=%s',
-        $this->getUser()->getUsername());
+        $this->getSSHUser()->getUsername());
       $cwd = PhabricatorEnv::getEmptyCWD();
     }
 
diff --git a/src/infrastructure/ssh/PhabricatorSSHWorkflow.php b/src/infrastructure/ssh/PhabricatorSSHWorkflow.php
index b6af62d35a..6b6222304c 100644
--- a/src/infrastructure/ssh/PhabricatorSSHWorkflow.php
+++ b/src/infrastructure/ssh/PhabricatorSSHWorkflow.php
@@ -1,8 +1,14 @@
 <?php
 
-abstract class PhabricatorSSHWorkflow extends PhabricatorManagementWorkflow {
+abstract class PhabricatorSSHWorkflow
+  extends PhutilArgumentWorkflow {
 
-  private $user;
+  // NOTE: We are explicitly extending "PhutilArgumentWorkflow", not
+  // "PhabricatorManagementWorkflow". We want to avoid inheriting "getViewer()"
+  // and other methods which assume workflows are administrative commands
+  // like `bin/storage`.
+
+  private $sshUser;
   private $iochannel;
   private $errorChannel;
   private $isClusterRequest;
@@ -21,13 +27,13 @@ public function getErrorChannel() {
     return $this->errorChannel;
   }
 
-  public function setUser(PhabricatorUser $user) {
-    $this->user = $user;
+  public function setSSHUser(PhabricatorUser $ssh_user) {
+    $this->sshUser = $ssh_user;
     return $this;
   }
 
-  public function getUser() {
-    return $this->user;
+  public function getSSHUser() {
+    return $this->sshUser;
   }
 
   public function setIOChannel(PhutilChannel $channel) {

From e6a9db56a96a9ac2aec134ab5084381899b03e35 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 22 Jan 2018 20:09:52 -0800
Subject: [PATCH 397/865] Add a basic view for repository pull logs

Summary:
Depends on D18912. Ref T13046. Add a UI to browse the existing pull log table.

The actual log still has some significant flaws, but get the basics working.

Test Plan: {F5391909}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13046

Differential Revision: https://secure.phabricator.com/D18914
---
 src/__phutil_library_map__.php                |  14 ++-
 .../PhabricatorDiffusionApplication.php       |   3 +
 ...troller.php => DiffusionLogController.php} |   2 +-
 .../DiffusionPullLogListController.php        |  12 ++
 .../DiffusionPushEventViewController.php      |   6 +-
 .../DiffusionPushLogListController.php        |   7 +-
 .../DiffusionRepositoryController.php         |  11 +-
 .../query/DiffusionPullLogSearchEngine.php    |  85 +++++++++++++
 .../view/DiffusionPullLogListView.php         | 115 ++++++++++++++++++
 .../PhabricatorRepositoryPullEventQuery.php   |  26 +++-
 .../PhabricatorRepositoryPullEvent.php        |  44 ++++++-
 11 files changed, 302 insertions(+), 23 deletions(-)
 rename src/applications/diffusion/controller/{DiffusionPushLogController.php => DiffusionLogController.php} (54%)
 create mode 100644 src/applications/diffusion/controller/DiffusionPullLogListController.php
 create mode 100644 src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
 create mode 100644 src/applications/diffusion/view/DiffusionPullLogListView.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7caf7a6dc2..2324ac0205 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -764,6 +764,7 @@
     'DiffusionLintCountQuery' => 'applications/diffusion/query/DiffusionLintCountQuery.php',
     'DiffusionLintSaveRunner' => 'applications/diffusion/DiffusionLintSaveRunner.php',
     'DiffusionLocalRepositoryFilter' => 'applications/diffusion/data/DiffusionLocalRepositoryFilter.php',
+    'DiffusionLogController' => 'applications/diffusion/controller/DiffusionLogController.php',
     'DiffusionLookSoonConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php',
     'DiffusionLowLevelCommitFieldsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelCommitFieldsQuery.php',
     'DiffusionLowLevelCommitQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelCommitQuery.php',
@@ -831,9 +832,11 @@
     'DiffusionPreCommitRefTypeHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefTypeHeraldField.php',
     'DiffusionPreCommitUsesGitLFSHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitUsesGitLFSHeraldField.php',
     'DiffusionPullEventGarbageCollector' => 'applications/diffusion/garbagecollector/DiffusionPullEventGarbageCollector.php',
+    'DiffusionPullLogListController' => 'applications/diffusion/controller/DiffusionPullLogListController.php',
+    'DiffusionPullLogListView' => 'applications/diffusion/view/DiffusionPullLogListView.php',
+    'DiffusionPullLogSearchEngine' => 'applications/diffusion/query/DiffusionPullLogSearchEngine.php',
     'DiffusionPushCapability' => 'applications/diffusion/capability/DiffusionPushCapability.php',
     'DiffusionPushEventViewController' => 'applications/diffusion/controller/DiffusionPushEventViewController.php',
-    'DiffusionPushLogController' => 'applications/diffusion/controller/DiffusionPushLogController.php',
     'DiffusionPushLogListController' => 'applications/diffusion/controller/DiffusionPushLogListController.php',
     'DiffusionPushLogListView' => 'applications/diffusion/view/DiffusionPushLogListView.php',
     'DiffusionPythonExternalSymbolsSource' => 'applications/diffusion/symbol/DiffusionPythonExternalSymbolsSource.php',
@@ -5864,6 +5867,7 @@
     'DiffusionLintCountQuery' => 'PhabricatorQuery',
     'DiffusionLintSaveRunner' => 'Phobject',
     'DiffusionLocalRepositoryFilter' => 'Phobject',
+    'DiffusionLogController' => 'DiffusionController',
     'DiffusionLookSoonConduitAPIMethod' => 'DiffusionConduitAPIMethod',
     'DiffusionLowLevelCommitFieldsQuery' => 'DiffusionLowLevelQuery',
     'DiffusionLowLevelCommitQuery' => 'DiffusionLowLevelQuery',
@@ -5931,10 +5935,12 @@
     'DiffusionPreCommitRefTypeHeraldField' => 'DiffusionPreCommitRefHeraldField',
     'DiffusionPreCommitUsesGitLFSHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPullEventGarbageCollector' => 'PhabricatorGarbageCollector',
+    'DiffusionPullLogListController' => 'DiffusionLogController',
+    'DiffusionPullLogListView' => 'AphrontView',
+    'DiffusionPullLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'DiffusionPushCapability' => 'PhabricatorPolicyCapability',
-    'DiffusionPushEventViewController' => 'DiffusionPushLogController',
-    'DiffusionPushLogController' => 'DiffusionController',
-    'DiffusionPushLogListController' => 'DiffusionPushLogController',
+    'DiffusionPushEventViewController' => 'DiffusionLogController',
+    'DiffusionPushLogListController' => 'DiffusionLogController',
     'DiffusionPushLogListView' => 'AphrontView',
     'DiffusionPythonExternalSymbolsSource' => 'DiffusionExternalSymbolsSource',
     'DiffusionQuery' => 'PhabricatorQuery',
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index 5797b8ba7c..d932149a75 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -124,6 +124,9 @@ public function getRoutes() {
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'DiffusionPushLogListController',
           'view/(?P<id>\d+)/' => 'DiffusionPushEventViewController',
         ),
+        'pulllog/' => array(
+          $this->getQueryRoutePattern() => 'DiffusionPullLogListController',
+        ),
         '(?P<repositoryCallsign>[A-Z]+)' => $repository_routes,
         '(?P<repositoryID>[1-9]\d*)' => $repository_routes,
 
diff --git a/src/applications/diffusion/controller/DiffusionPushLogController.php b/src/applications/diffusion/controller/DiffusionLogController.php
similarity index 54%
rename from src/applications/diffusion/controller/DiffusionPushLogController.php
rename to src/applications/diffusion/controller/DiffusionLogController.php
index f974cc91cd..9e5a4eaa3d 100644
--- a/src/applications/diffusion/controller/DiffusionPushLogController.php
+++ b/src/applications/diffusion/controller/DiffusionLogController.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class DiffusionPushLogController extends DiffusionController {
+abstract class DiffusionLogController extends DiffusionController {
 
   protected function shouldLoadDiffusionRequest() {
     return false;
diff --git a/src/applications/diffusion/controller/DiffusionPullLogListController.php b/src/applications/diffusion/controller/DiffusionPullLogListController.php
new file mode 100644
index 0000000000..29712be2a4
--- /dev/null
+++ b/src/applications/diffusion/controller/DiffusionPullLogListController.php
@@ -0,0 +1,12 @@
+<?php
+
+final class DiffusionPullLogListController
+  extends DiffusionLogController {
+
+  public function handleRequest(AphrontRequest $request) {
+    return id(new DiffusionPullLogSearchEngine())
+      ->setController($this)
+      ->buildResponse();
+  }
+
+}
diff --git a/src/applications/diffusion/controller/DiffusionPushEventViewController.php b/src/applications/diffusion/controller/DiffusionPushEventViewController.php
index c5eb6368b4..21718c256d 100644
--- a/src/applications/diffusion/controller/DiffusionPushEventViewController.php
+++ b/src/applications/diffusion/controller/DiffusionPushEventViewController.php
@@ -1,11 +1,7 @@
 <?php
 
 final class DiffusionPushEventViewController
-  extends DiffusionPushLogController {
-
-  public function shouldAllowPublic() {
-    return true;
-  }
+  extends DiffusionLogController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
diff --git a/src/applications/diffusion/controller/DiffusionPushLogListController.php b/src/applications/diffusion/controller/DiffusionPushLogListController.php
index 5b58881470..658e21674d 100644
--- a/src/applications/diffusion/controller/DiffusionPushLogListController.php
+++ b/src/applications/diffusion/controller/DiffusionPushLogListController.php
@@ -1,10 +1,7 @@
 <?php
 
-final class DiffusionPushLogListController extends DiffusionPushLogController {
-
-  public function shouldAllowPublic() {
-    return true;
-  }
+final class DiffusionPushLogListController
+  extends DiffusionLogController {
 
   public function handleRequest(AphrontRequest $request) {
     return id(new PhabricatorRepositoryPushLogSearchEngine())
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index 35fce7f03d..89c677c081 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -365,7 +365,7 @@ private function buildActionList(PhabricatorRepository $repository) {
 
     if ($repository->isHosted()) {
       $push_uri = $this->getApplicationURI(
-        'pushlog/?repositories='.$repository->getMonogram());
+        'pushlog/?repositories='.$repository->getPHID());
 
       $action_view->addAction(
         id(new PhabricatorActionView())
@@ -374,6 +374,15 @@ private function buildActionList(PhabricatorRepository $repository) {
           ->setHref($push_uri));
     }
 
+    $pull_uri = $this->getApplicationURI(
+      'pulllog/?repositories='.$repository->getPHID());
+
+    $action_view->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('View Pull Logs'))
+        ->setIcon('fa-list-alt')
+        ->setHref($pull_uri));
+
     return $action_view;
   }
 
diff --git a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
new file mode 100644
index 0000000000..85a540f6f5
--- /dev/null
+++ b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
@@ -0,0 +1,85 @@
+<?php
+
+final class DiffusionPullLogSearchEngine
+  extends PhabricatorApplicationSearchEngine {
+
+  public function getResultTypeDescription() {
+    return pht('Pull Logs');
+  }
+
+  public function getApplicationClassName() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
+  public function newQuery() {
+    return new PhabricatorRepositoryPullEventQuery();
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+
+    if ($map['repositoryPHIDs']) {
+      $query->withRepositoryPHIDs($map['repositoryPHIDs']);
+    }
+
+    if ($map['pullerPHIDs']) {
+      $query->withPullerPHIDs($map['pullerPHIDs']);
+    }
+
+    return $query;
+  }
+
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorSearchDatasourceField())
+        ->setDatasource(new DiffusionRepositoryDatasource())
+        ->setKey('repositoryPHIDs')
+        ->setAliases(array('repository', 'repositories', 'repositoryPHID'))
+        ->setLabel(pht('Repositories'))
+        ->setDescription(
+          pht('Search for pull logs for specific repositories.')),
+      id(new PhabricatorUsersSearchField())
+        ->setKey('pullerPHIDs')
+        ->setAliases(array('puller', 'pullers', 'pullerPHID'))
+        ->setLabel(pht('Pullers'))
+        ->setDescription(
+          pht('Search for pull logs by specific users.')),
+    );
+  }
+
+  protected function getURI($path) {
+    return '/diffusion/pulllog/'.$path;
+  }
+
+  protected function getBuiltinQueryNames() {
+    return array(
+      'all' => pht('All Pull Logs'),
+    );
+  }
+
+  public function buildSavedQueryFromBuiltin($query_key) {
+    $query = $this->newSavedQuery();
+    $query->setQueryKey($query_key);
+
+    switch ($query_key) {
+      case 'all':
+        return $query;
+    }
+
+    return parent::buildSavedQueryFromBuiltin($query_key);
+  }
+
+  protected function renderResultList(
+    array $logs,
+    PhabricatorSavedQuery $query,
+    array $handles) {
+
+    $table = id(new DiffusionPullLogListView())
+      ->setViewer($this->requireViewer())
+      ->setLogs($logs);
+
+    return id(new PhabricatorApplicationSearchResultView())
+      ->setTable($table);
+  }
+
+}
diff --git a/src/applications/diffusion/view/DiffusionPullLogListView.php b/src/applications/diffusion/view/DiffusionPullLogListView.php
new file mode 100644
index 0000000000..7babb9c584
--- /dev/null
+++ b/src/applications/diffusion/view/DiffusionPullLogListView.php
@@ -0,0 +1,115 @@
+<?php
+
+final class DiffusionPullLogListView extends AphrontView {
+
+  private $logs;
+
+  public function setLogs(array $logs) {
+    assert_instances_of($logs, 'PhabricatorRepositoryPullEvent');
+    $this->logs = $logs;
+    return $this;
+  }
+
+  public function render() {
+    $events = $this->logs;
+    $viewer = $this->getViewer();
+
+    $handle_phids = array();
+    foreach ($events as $event) {
+      if ($event->getPullerPHID()) {
+        $handle_phids[] = $event->getPullerPHID();
+      }
+    }
+    $handles = $viewer->loadHandles($handle_phids);
+
+    // Figure out which repositories are editable. We only let you see remote
+    // IPs if you have edit capability on a repository.
+    $editable_repos = array();
+    if ($events) {
+      $editable_repos = id(new PhabricatorRepositoryQuery())
+        ->setViewer($viewer)
+        ->requireCapabilities(
+          array(
+            PhabricatorPolicyCapability::CAN_VIEW,
+            PhabricatorPolicyCapability::CAN_EDIT,
+          ))
+        ->withPHIDs(mpull($events, 'getRepositoryPHID'))
+        ->execute();
+      $editable_repos = mpull($editable_repos, null, 'getPHID');
+    }
+
+    $rows = array();
+    $any_host = false;
+    foreach ($events as $event) {
+      if ($event->getRepositoryPHID()) {
+        $repository = $event->getRepository();
+      } else {
+        $repository = null;
+      }
+
+      // Reveal this if it's valid and the user can edit the repository. For
+      // invalid requests you currently have to go fishing in the database.
+      $remote_address = '-';
+      if ($repository) {
+        if (isset($editable_repos[$event->getRepositoryPHID()])) {
+          $remote_address = $event->getRemoteAddress();
+        }
+      }
+
+      $event_id = $event->getID();
+
+      $repository_link = null;
+      if ($repository) {
+        $repository_link = phutil_tag(
+          'a',
+          array(
+            'href' => $repository->getURI(),
+          ),
+          $repository->getDisplayName());
+      }
+
+      $puller_link = null;
+      if ($event->getPullerPHID()) {
+        $puller_link = $viewer->renderHandle($event->getPullerPHID());
+      }
+
+      $rows[] = array(
+        $event_id,
+        $repository_link,
+        $puller_link,
+        $remote_address,
+        $event->getRemoteProtocolDisplayName(),
+        $event->newResultIcon(),
+        $event->getResultCode(),
+        phabricator_datetime($event->getEpoch(), $viewer),
+      );
+    }
+
+    $table = id(new AphrontTableView($rows))
+      ->setHeaders(
+        array(
+          pht('Pull'),
+          pht('Repository'),
+          pht('Puller'),
+          pht('From'),
+          pht('Via'),
+          null,
+          pht('Error'),
+          pht('Date'),
+        ))
+      ->setColumnClasses(
+        array(
+          'n',
+          '',
+          '',
+          'n',
+          'wide',
+          '',
+          'n',
+          'right',
+        ));
+
+    return $table;
+  }
+
+}
diff --git a/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
index 1063cdb48c..af60ee0383 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
@@ -37,19 +37,35 @@ protected function loadPage() {
   }
 
   protected function willFilterPage(array $events) {
+    // If a pull targets an invalid repository or fails before authenticating,
+    // it may not have an associated repository.
+
     $repository_phids = mpull($events, 'getRepositoryPHID');
-    $repositories = id(new PhabricatorRepositoryQuery())
-      ->setViewer($this->getViewer())
-      ->withPHIDs($repository_phids)
-      ->execute();
-    $repositories = mpull($repositories, null, 'getPHID');
+    $repository_phids = array_filter($repository_phids);
+
+    if ($repository_phids) {
+      $repositories = id(new PhabricatorRepositoryQuery())
+        ->setViewer($this->getViewer())
+        ->withPHIDs($repository_phids)
+        ->execute();
+      $repositories = mpull($repositories, null, 'getPHID');
+    } else {
+      $repositories = array();
+    }
 
     foreach ($events as $key => $event) {
       $phid = $event->getRepositoryPHID();
+      if (!$phid) {
+        $event->attachRepository(null);
+        continue;
+      }
+
       if (empty($repositories[$phid])) {
         unset($events[$key]);
+        $this->didRejectResult($event);
         continue;
       }
+
       $event->attachRepository($repositories[$phid]);
     }
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php b/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
index c1227402d7..1b095ce8fd 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
@@ -51,7 +51,7 @@ public function generatePHID() {
       PhabricatorRepositoryPullEventPHIDType::TYPECONST);
   }
 
-  public function attachRepository(PhabricatorRepository $repository) {
+  public function attachRepository(PhabricatorRepository $repository = null) {
     $this->repository = $repository;
     return $this;
   }
@@ -60,6 +60,38 @@ public function getRepository() {
     return $this->assertAttached($this->repository);
   }
 
+  public function getRemoteProtocolDisplayName() {
+    $map = array(
+      'ssh' => pht('SSH'),
+      'http' => pht('HTTP'),
+    );
+
+    $protocol = $this->getRemoteProtocol();
+
+    return idx($map, $protocol, $protocol);
+  }
+
+  public function newResultIcon() {
+    $icon = new PHUIIconView();
+    $type = $this->getResultType();
+
+    switch ($type) {
+      case 'wild':
+        $icon
+          ->setIcon('fa-question indigo')
+          ->setTooltip(pht('Unknown ("%s")', $type));
+        break;
+      case 'pull':
+        $icon
+          ->setIcon('fa-download green')
+          ->setTooltip(pht('Pull'));
+        break;
+    }
+
+    return $icon;
+  }
+
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
@@ -71,10 +103,18 @@ public function getCapabilities() {
   }
 
   public function getPolicy($capability) {
-    return $this->getRepository()->getPolicy($capability);
+    if ($this->getRepository()) {
+      return $this->getRepository()->getPolicy($capability);
+    }
+
+    return PhabricatorPolicies::POLICY_ADMIN;
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
+    if (!$this->getRepository()) {
+      return false;
+    }
+
     return $this->getRepository()->hasAutomaticCapability($capability, $viewer);
   }
 

From a6fbde784c71f166e53ba586555d1a8306583dcc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 23 Jan 2018 08:08:03 -0800
Subject: [PATCH 398/865] Modernize "PhabricatorRepositoryPushEventQuery"

Summary: Depends on D18914. Updates this Query to use slightly more modern construction while I'm working in adjacent code.

Test Plan: Viewed push logs in web UI.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18915
---
 .../PhabricatorRepositoryPushEventQuery.php   | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
index a3bed7abd3..f3e5fc62b4 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
@@ -34,19 +34,12 @@ public function needLogs($need_logs) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new PhabricatorRepositoryPushEvent();
+  }
+
   protected function loadPage() {
-    $table = new PhabricatorRepositoryPushEvent();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($data);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $events) {
@@ -88,40 +81,38 @@ protected function didFilterPage(array $events) {
     return $events;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
-    if ($this->ids) {
+    if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'id IN (%Ld)',
         $this->ids);
     }
 
-    if ($this->phids) {
+    if ($this->phids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'phid IN (%Ls)',
         $this->phids);
     }
 
-    if ($this->repositoryPHIDs) {
+    if ($this->repositoryPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'repositoryPHID IN (%Ls)',
         $this->repositoryPHIDs);
     }
 
-    if ($this->pusherPHIDs) {
+    if ($this->pusherPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'pusherPHID in (%Ls)',
         $this->pusherPHIDs);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {

From 778dfff277dc0e180c568a10204f86ad617b6113 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 23 Jan 2018 08:17:33 -0800
Subject: [PATCH 399/865] Make minor correctness and display improvements to
 pull logs

Summary:
Depends on D18915. Ref T13046.

  - Distinguish between HTTP and HTTPS.
  - Use more constants and fewer magical strings.
  - For HTTP responses, give them better type information and more helpful UI behaviors.

Test Plan: Pulled over SSH and HTTP. Reviewed resulting logs from the web UI. Hit errors like missing/invalid credentials.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13046

Differential Revision: https://secure.phabricator.com/D18917
---
 .../controller/DiffusionServeController.php   | 24 +++++++--
 .../ssh/DiffusionGitUploadPackSSHWorkflow.php |  4 +-
 .../diffusion/ssh/DiffusionSSHWorkflow.php    |  2 +-
 .../view/DiffusionPullLogListView.php         |  2 +-
 .../PhabricatorRepositoryPullEvent.php        | 51 ++++++++++++++++---
 5 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index 0496b93bb6..c0f72ae404 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -104,15 +104,29 @@ public function handleRequest(AphrontRequest $request) {
     try {
       $remote_addr = $request->getRemoteAddress();
 
+      if ($request->isHTTPS()) {
+        $remote_protocol = PhabricatorRepositoryPullEvent::PROTOCOL_HTTPS;
+      } else {
+        $remote_protocol = PhabricatorRepositoryPullEvent::PROTOCOL_HTTP;
+      }
+
       $pull_event = id(new PhabricatorRepositoryPullEvent())
         ->setEpoch(PhabricatorTime::getNow())
         ->setRemoteAddress($remote_addr)
-        ->setRemoteProtocol('http');
+        ->setRemoteProtocol($remote_protocol);
 
       if ($response) {
-        $pull_event
-          ->setResultType('wild')
-          ->setResultCode($response->getHTTPResponseCode());
+        $response_code = $response->getHTTPResponseCode();
+
+        if ($response_code == 200) {
+          $pull_event
+            ->setResultType(PhabricatorRepositoryPullEvent::RESULT_PULL)
+            ->setResultCode($response_code);
+        } else {
+          $pull_event
+            ->setResultType(PhabricatorRepositoryPullEvent::RESULT_ERROR)
+            ->setResultCode($response_code);
+        }
 
         if ($response instanceof PhabricatorVCSResponse) {
           $pull_event->setProperties(
@@ -122,7 +136,7 @@ public function handleRequest(AphrontRequest $request) {
         }
       } else {
         $pull_event
-          ->setResultType('exception')
+          ->setResultType(PhabricatorRepositoryPullEvent::RESULT_EXCEPTION)
           ->setResultCode(500)
           ->setProperties(
             array(
diff --git a/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
index e0d35c32b9..5ed42ba79d 100644
--- a/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
@@ -61,11 +61,11 @@ protected function executeRepositoryOperations() {
 
     if ($err) {
       $pull_event
-        ->setResultType('error')
+        ->setResultType(PhabricatorRepositoryPullEvent::RESULT_ERROR)
         ->setResultCode($err);
     } else {
       $pull_event
-        ->setResultType('pull')
+        ->setResultType(PhabricatorRepositoryPullEvent::RESULT_PULL)
         ->setResultCode(0);
     }
 
diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
index 3882079f69..e40d8e1f51 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
@@ -272,7 +272,7 @@ protected function newPullEvent() {
     return id(new PhabricatorRepositoryPullEvent())
       ->setEpoch(PhabricatorTime::getNow())
       ->setRemoteAddress($remote_address)
-      ->setRemoteProtocol('ssh')
+      ->setRemoteProtocol(PhabricatorRepositoryPullEvent::PROTOCOL_SSH)
       ->setPullerPHID($viewer->getPHID())
       ->setRepositoryPHID($repository->getPHID());
   }
diff --git a/src/applications/diffusion/view/DiffusionPullLogListView.php b/src/applications/diffusion/view/DiffusionPullLogListView.php
index 7babb9c584..f2e3280eba 100644
--- a/src/applications/diffusion/view/DiffusionPullLogListView.php
+++ b/src/applications/diffusion/view/DiffusionPullLogListView.php
@@ -94,7 +94,7 @@ public function render() {
           pht('From'),
           pht('Via'),
           null,
-          pht('Error'),
+          pht('Code'),
           pht('Date'),
         ))
       ->setColumnClasses(
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php b/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
index 1b095ce8fd..85ea27062b 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPullEvent.php
@@ -15,6 +15,14 @@ final class PhabricatorRepositoryPullEvent
 
   private $repository = self::ATTACHABLE;
 
+  const RESULT_PULL = 'pull';
+  const RESULT_ERROR = 'error';
+  const RESULT_EXCEPTION = 'exception';
+
+  const PROTOCOL_HTTP = 'http';
+  const PROTOCOL_HTTPS = 'https';
+  const PROTOCOL_SSH = 'ssh';
+
   public static function initializeNewEvent(PhabricatorUser $viewer) {
     return id(new PhabricatorRepositoryPushEvent())
       ->setPusherPHID($viewer->getPHID());
@@ -62,8 +70,9 @@ public function getRepository() {
 
   public function getRemoteProtocolDisplayName() {
     $map = array(
-      'ssh' => pht('SSH'),
-      'http' => pht('HTTP'),
+      self::PROTOCOL_SSH => pht('SSH'),
+      self::PROTOCOL_HTTP => pht('HTTP'),
+      self::PROTOCOL_HTTPS => pht('HTTPS'),
     );
 
     $protocol = $this->getRemoteProtocol();
@@ -74,25 +83,53 @@ public function getRemoteProtocolDisplayName() {
   public function newResultIcon() {
     $icon = new PHUIIconView();
     $type = $this->getResultType();
+    $code = $this->getResultCode();
+
+    $protocol = $this->getRemoteProtocol();
+
+    $is_any_http =
+      ($protocol === self::PROTOCOL_HTTP) ||
+      ($protocol === self::PROTOCOL_HTTPS);
+
+    // If this was an HTTP request and we responded with a 401, that means
+    // the user didn't provide credentials. This is technically an error, but
+    // it's routine and just causes the client to prompt them. Show a more
+    // comforting icon and description in the UI.
+    if ($is_any_http) {
+      if ($code == 401) {
+        return $icon
+          ->setIcon('fa-key blue')
+          ->setTooltip(pht('Authentication Required'));
+      }
+    }
 
     switch ($type) {
-      case 'wild':
+      case self::RESULT_ERROR:
         $icon
-          ->setIcon('fa-question indigo')
-          ->setTooltip(pht('Unknown ("%s")', $type));
+          ->setIcon('fa-times red')
+          ->setTooltip(pht('Error'));
         break;
-      case 'pull':
+      case self::RESULT_EXCEPTION:
+        $icon
+          ->setIcon('fa-exclamation-triangle red')
+          ->setTooltip(pht('Exception'));
+        break;
+      case self::RESULT_PULL:
         $icon
           ->setIcon('fa-download green')
           ->setTooltip(pht('Pull'));
         break;
+      default:
+        $icon
+          ->setIcon('fa-question indigo')
+          ->setTooltip(pht('Unknown ("%s")', $type));
+        break;
     }
 
     return $icon;
   }
 
 
-
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 

From 167e7932efb537f745f6c452b67eeef758e8c981 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 23 Jan 2018 08:42:52 -0800
Subject: [PATCH 400/865] Modernize "PhabricatorRepositoryPushLogSearchEngine"

Summary: Depends on D18917. Ref T13046. While I'm in here, update this to use more modern construction.

Test Plan: Browed and queried for push logs.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13046

Differential Revision: https://secure.phabricator.com/D18918
---
 ...abricatorRepositoryPushLogSearchEngine.php | 71 +++++++------------
 1 file changed, 24 insertions(+), 47 deletions(-)

diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
index 8fd3baeb54..d171b80999 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
@@ -11,63 +11,40 @@ public function getApplicationClassName() {
     return 'PhabricatorDiffusionApplication';
   }
 
-  public function buildSavedQueryFromRequest(AphrontRequest $request) {
-    $saved = new PhabricatorSavedQuery();
-
-    $saved->setParameter(
-      'repositoryPHIDs',
-      $this->readPHIDsFromRequest(
-        $request,
-        'repositories',
-        array(
-          PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
-        )));
-
-    $saved->setParameter(
-      'pusherPHIDs',
-      $this->readUsersFromRequest(
-        $request,
-        'pushers'));
-
-    return $saved;
+  public function newQuery() {
+    return new PhabricatorRepositoryPushLogQuery();
   }
 
-  public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
-    $query = id(new PhabricatorRepositoryPushLogQuery());
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
 
-    $repository_phids = $saved->getParameter('repositoryPHIDs');
-    if ($repository_phids) {
-      $query->withRepositoryPHIDs($repository_phids);
+    if ($map['repositoryPHIDs']) {
+      $query->withRepositoryPHIDs($map['repositoryPHIDs']);
     }
 
-    $pusher_phids = $saved->getParameter('pusherPHIDs');
-    if ($pusher_phids) {
-      $query->withPusherPHIDs($pusher_phids);
+    if ($map['pusherPHIDs']) {
+      $query->withPusherPHIDs($map['pusherPHIDs']);
     }
 
     return $query;
   }
 
-  public function buildSearchForm(
-    AphrontFormView $form,
-    PhabricatorSavedQuery $saved_query) {
-
-    $repository_phids = $saved_query->getParameter('repositoryPHIDs', array());
-    $pusher_phids = $saved_query->getParameter('pusherPHIDs', array());
-
-    $form
-      ->appendControl(
-        id(new AphrontFormTokenizerControl())
-          ->setDatasource(new DiffusionRepositoryDatasource())
-          ->setName('repositories')
-          ->setLabel(pht('Repositories'))
-          ->setValue($repository_phids))
-      ->appendControl(
-        id(new AphrontFormTokenizerControl())
-          ->setDatasource(new PhabricatorPeopleDatasource())
-          ->setName('pushers')
-          ->setLabel(pht('Pushers'))
-          ->setValue($pusher_phids));
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorSearchDatasourceField())
+        ->setDatasource(new DiffusionRepositoryDatasource())
+        ->setKey('repositoryPHIDs')
+        ->setAliases(array('repository', 'repositories', 'repositoryPHID'))
+        ->setLabel(pht('Repositories'))
+        ->setDescription(
+          pht('Search for pull logs for specific repositories.')),
+      id(new PhabricatorUsersSearchField())
+        ->setKey('pusherPHIDs')
+        ->setAliases(array('pusher', 'pushers', 'pusherPHID'))
+        ->setLabel(pht('Pushers'))
+        ->setDescription(
+          pht('Search for pull logs by specific users.')),
+    );
   }
 
   protected function getURI($path) {

From dabd3f0b417b7937c2c82df261fe8c80448b4926 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 24 Jan 2018 10:43:00 -0800
Subject: [PATCH 401/865] Fix a race between Harbormaster and reviewers (often
 bots) to publish drafts for review

Summary:
See PHI309. There is a window of time between when all builds pass and when Harbormaster actually publishes a revision out of draft.

If any other user tries to interact with the revision during that window, they'll pick up the undraft transaction as a side effect. However, they won't have permission to apply it and will be stopped by a validation error.

Instead, only automatically publish a revision if the actor is the revision author or some system/application user (essentially always Harbormaster).

Test Plan:
  - Added a `echo ...; sleep(30);` to `HarbormasterBuildEngine->updateBuildable()` before the `applyTransactions()` at the bottom.
  - Wrote an "Always, run an HTTP request" Herald rule and Harbormaster build plan.
  - Ran daemons with `bin/phd debug task`.
  - Created a new revision with `arc diff`, as user A.
  - Waited for `phd` to enter the race window.
  - In a separate browser, as user B, submitted a comment via `differential.revision.edit`.
    - Before patch: edits during the race window were rejected with a validation error, "you don't have permission to request review".
    - After patch: edits go through cleanly.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18921
---
 .../editor/DifferentialTransactionEditor.php  | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index e6dfed88a7..b5eaac4b5e 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1565,9 +1565,29 @@ private function loadUnbroadcastTransactions($object) {
 
 
   protected function didApplyTransactions($object, array $xactions) {
+    // In a moment, we're going to try to publish draft revisions which have
+    // completed all their builds. However, we only want to do that if the
+    // actor is either the revision author or an omnipotent user (generally,
+    // the Harbormaster application).
+
+    // If we let any actor publish the revision as a side effect of other
+    // changes then an unlucky third party who innocently comments on the draft
+    // can end up racing Harbormaster and promoting the revision. At best, this
+    // is confusing. It can also run into validation problems with the "Request
+    // Review" transaction. See PHI309 for some discussion.
+    $author_phid = $object->getAuthorPHID();
+    $viewer = $this->requireActor();
+    $can_undraft =
+      ($this->getActingAsPHID() === $author_phid) ||
+      ($viewer->isOmnipotent());
+
     // If a draft revision has no outstanding builds and we're automatically
     // making drafts public after builds finish, make the revision public.
-    $auto_undraft = !$object->getHoldAsDraft();
+    if ($can_undraft) {
+      $auto_undraft = !$object->getHoldAsDraft();
+    } else {
+      $auto_undraft = false;
+    }
 
     if ($object->isDraft() && $auto_undraft) {
       $active_builds = $this->hasActiveBuilds($object);
@@ -1575,7 +1595,6 @@ protected function didApplyTransactions($object, array $xactions) {
         // When Harbormaster moves a revision out of the draft state, we
         // attribute the action to the revision author since this is more
         // natural and more useful.
-        $author_phid = $object->getAuthorPHID();
 
         // Additionally, we change the acting PHID for the transaction set
         // to the author if it isn't already a user so that mail comes from

From c68a78360ecd6690dd01b5d36727a456ec0e770d Mon Sep 17 00:00:00 2001
From: Mike Nicholson <mike.nicholson@uber.com>
Date: Wed, 24 Jan 2018 14:30:30 -0500
Subject: [PATCH 402/865] Include extension name for GDSetupCheck.

Summary: Help for GD SetupChcek was missing the "how to install extension" content.

Test Plan: Uninstalled gd, validated extension installation instructions were present in Setup Issue.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D18922
---
 src/applications/config/check/PhabricatorGDSetupCheck.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/applications/config/check/PhabricatorGDSetupCheck.php b/src/applications/config/check/PhabricatorGDSetupCheck.php
index 750702c706..7ada204801 100644
--- a/src/applications/config/check/PhabricatorGDSetupCheck.php
+++ b/src/applications/config/check/PhabricatorGDSetupCheck.php
@@ -18,7 +18,8 @@ protected function executeChecks() {
 
       $this->newIssue('extension.gd')
         ->setName(pht("Missing '%s' Extension", 'gd'))
-        ->setMessage($message);
+        ->setMessage($message)
+        ->addPHPExtension('gd');
     } else {
       $image_type_map = array(
         'imagecreatefrompng'  => 'PNG',

From d28ddc21a5509627f7cffe079fb969d518b35bc6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 24 Jan 2018 15:14:07 -0800
Subject: [PATCH 403/865] Don't error when trying to mirror or observe an empty
 repository

Summary:
Fixes T5965.

Fixes two issues:

  - Observing an empty repository could write a warning to the log.
  - Mirroring an empty repository to a remote could fail.

For observing:

If newly-created with `git init --bare`, `git ls-remote` will
return the empty string.  Properly return an empty set of refs, rather
than attempting to parse the single "line" that is produced by
splitting that on newlines:

```
[2018-01-23 18:47:00] ERROR 8: Undefined offset: 1 at [/phab_path/phabricator/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php:405]
arcanist(head=master, ref.master=5634f8410176), phabricator(head=master, ref.master=12551a1055ce), phutil(head=master, ref.master=4755785517cf)
  #0 PhabricatorRepositoryPullEngine::loadGitRemoteRefs(PhabricatorRepository) called at [<phabricator>/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php:343]
  #1 PhabricatorRepositoryPullEngine::executeGitUpdate() called at [<phabricator>/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php:126]
  #2 PhabricatorRepositoryPullEngine::pullRepositoryWithLock() called at [<phabricator>/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php:40]
  #3 PhabricatorRepositoryPullEngine::pullRepository() called at [<phabricator>/src/applications/repository/management/PhabricatorRepositoryManagementUpdateWorkflow.php:59]
  ...
```

For mirroring:

`git` treats `git push --mirror` specially when a repository is empty. Detect this case by seeing if `git for-each-ref --count 1` does anything. If the repository is empty, just bail.

Test Plan:
  - Observed an empty and non-empty repository.
  - Mirrored an empty and non-empty repository.

Reviewers: alexmv, amckinley

Reviewed By: alexmv

Subscribers: Korvin, epriestley

Maniphest Tasks: T5965

Differential Revision: https://secure.phabricator.com/D18920
---
 .../engine/PhabricatorRepositoryMirrorEngine.php   | 14 ++++++++++++++
 .../engine/PhabricatorRepositoryPullEngine.php     |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php b/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php
index b18f6b1bf8..ed856957f0 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php
@@ -76,6 +76,20 @@ private function pushToGitRepository(
     PhabricatorRepository $repository,
     PhabricatorRepositoryURI $mirror_uri) {
 
+    // See T5965. Test if we have any refs to mirror. If we have nothing, git
+    // will exit with an error ("No refs in common and none specified; ...")
+    // when we run "git push --mirror".
+
+    // If we don't have any refs, we just bail out. (This is arguably sort of
+    // the wrong behavior: to mirror an empty repository faithfully we should
+    // delete everything in the remote.)
+
+    list($stdout) = $repository->execxLocalCommand(
+      'for-each-ref --count 1 --');
+    if (!strlen($stdout)) {
+      return;
+    }
+
     $argv = array(
       'push --verbose --mirror -- %P',
       $mirror_uri->getURIEnvelope(),
diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
index 10eddd38d4..208a3792b3 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
@@ -399,6 +399,11 @@ private function loadGitRemoteRefs(PhabricatorRepository $repository) {
       'ls-remote %P',
       $remote_envelope);
 
+    // Empty repositories don't have any refs.
+    if (!strlen(rtrim($stdout))) {
+      return array();
+    }
+
     $map = array();
     $lines = phutil_split_lines($stdout, false);
     foreach ($lines as $line) {

From 1059fae6c9b6654a168221697637fab970852d7d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 24 Jan 2018 15:26:13 -0800
Subject: [PATCH 404/865] Set an explicit default value for the bulk action
 control

Summary:
Ref T13025. See <https://discourse.phabricator-community.org/t/bulk-edit-no-actions-available/1011/1>.

I'm not sure if this is what the user is seeing, but in Chrome, the `<select />` does not automatically get set to the first valid value like it does in Safari.

Set it to the first valid value explicitly.

Test Plan: In Chrome, bulk editor previously hit a JS error when trying to read a bad action off the `<select />`. After patch, bulk edits go through cleanly.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13025

Differential Revision: https://secure.phabricator.com/D18923
---
 .../transactions/bulk/PhabricatorBulkEngine.php             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/transactions/bulk/PhabricatorBulkEngine.php b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
index 642cd02a71..534390b518 100644
--- a/src/applications/transactions/bulk/PhabricatorBulkEngine.php
+++ b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
@@ -303,6 +303,7 @@ private function newBulkActionForm() {
 
     $spec = array();
     $option_groups = igroup($edit_map, 'group');
+    $default_value = null;
     foreach ($groups as $group_key => $group) {
       $options = idx($option_groups, $group_key, array());
       if (!$options) {
@@ -315,6 +316,10 @@ private function newBulkActionForm() {
           'key' => $option['xaction'],
           'label' => $option['label'],
         );
+
+        if ($default_value === null) {
+          $default_value = $option['xaction'];
+        }
       }
 
       $spec[] = array(
@@ -332,6 +337,7 @@ private function newBulkActionForm() {
         'inputNodeID' => $input_id,
         'edits' => $edit_map,
         'optgroups' => array(
+          'value' => $default_value,
           'groups' => $spec,
         ),
       ));

From deb754dfe1730c422088dfff33377b4b11c44208 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 06:33:26 -0800
Subject: [PATCH 405/865] Make SSH key revocation actually prevent adding the
 same key back

Summary:
Ref T13043. In an earlier change I updated this langauge from "Deactivate" to "Revoke", but the behavior doesn't quite match.

This table has a unique key on `<isActive, keyBody>`, which enforces the rule that "a key can only be active for one unique user".

However, we set `isActive` to `null` when we revoke a key, and multiple rows are allowed to have the value `<null, "asdf">` (since a `null` column in a unique key basically means "don't enforce this unique key").

This is intentional, to support this workflow:

  - You add key X to bot A.
  - Whoops, wrong account.
  - You revoke key X from bot A.
  - You add key X to bot B.

This isn't necessarily a great workflow -- ideally, you'd throw key X away and go generate a new key after you realize you made a mistake -- but it's the sort of practical workflow that users are likely to expect and want to see work ("I don't want to generate a new key, it's already being used by 5 other services and cycling it is a ton of work and this is just a test install for my dog anyway."), and there's no technical reason we can't support it.

To prevent users from adding keys on the revocation list back to their account, just check explicitly.

(This is probably better in general anyway, because "cert-authority" support from PHI269 may mean that two keys are "equivalent" even if their text differs, and we may not be able to rely on a database test anyway.)

Test Plan:
  - Added the key `ssh-rsa asdf` to my account.
  - Revoked it.
  - Tried to add it again.
    - Before patch: worked.
    - After patch: error, "this key has been revoked".
  - Added it to a different account (the "I put it on the wrong bot" workflow).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18928
---
 .../editor/PhabricatorAuthSSHKeyEditor.php    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php b/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
index 384395c182..569c37403b 100644
--- a/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
+++ b/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
@@ -104,6 +104,7 @@ protected function validateTransaction(
     array $xactions) {
 
     $errors = parent::validateTransaction($object, $type, $xactions);
+    $viewer = $this->requireActor();
 
     switch ($type) {
       case PhabricatorAuthSSHKeyTransaction::TYPE_NAME:
@@ -149,6 +150,30 @@ protected function validateTransaction(
                 pht('Invalid'),
                 $ex->getMessage(),
                 $xaction);
+              continue;
+            }
+
+            // The database does not have a unique key on just the <keyBody>
+            // column because we allow multiple accounts to revoke the same
+            // key, so we can't rely on database constraints to prevent users
+            // from adding keys that are on the revocation list back to their
+            // accounts. Explicitly check for a revoked copy of the key.
+
+            $revoked_keys = id(new PhabricatorAuthSSHKeyQuery())
+              ->setViewer($viewer)
+              ->withObjectPHIDs(array($object->getObjectPHID()))
+              ->withIsActive(0)
+              ->withKeys(array($public_key))
+              ->execute();
+            if ($revoked_keys) {
+              $errors[] = new PhabricatorApplicationTransactionValidationError(
+                $type,
+                pht('Revoked'),
+                pht(
+                  'This key has been revoked. Choose or generate a new, '.
+                  'unique key.'),
+                $xaction);
+              continue;
             }
           }
         }

From 5529458e14ebb64beeb6c22688e8eaade46919b3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 06:52:42 -0800
Subject: [PATCH 406/865] Add test coverage for SSH key revocation

Summary: Depends on D18928. Ref T13043. Add some automated test coverage for SSH revocation rules.

Test Plan: Ran tests, got a clean bill of health.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13043

Differential Revision: https://secure.phabricator.com/D18929
---
 src/__phutil_library_map__.php                |  2 +
 .../PhabricatorAuthSSHKeyTestCase.php         | 78 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 src/applications/auth/__tests__/PhabricatorAuthSSHKeyTestCase.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2324ac0205..59683e5b5c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2133,6 +2133,7 @@
     'PhabricatorAuthSSHKeyRevokeController' => 'applications/auth/controller/PhabricatorAuthSSHKeyRevokeController.php',
     'PhabricatorAuthSSHKeySearchEngine' => 'applications/auth/query/PhabricatorAuthSSHKeySearchEngine.php',
     'PhabricatorAuthSSHKeyTableView' => 'applications/auth/view/PhabricatorAuthSSHKeyTableView.php',
+    'PhabricatorAuthSSHKeyTestCase' => 'applications/auth/__tests__/PhabricatorAuthSSHKeyTestCase.php',
     'PhabricatorAuthSSHKeyTransaction' => 'applications/auth/storage/PhabricatorAuthSSHKeyTransaction.php',
     'PhabricatorAuthSSHKeyTransactionQuery' => 'applications/auth/query/PhabricatorAuthSSHKeyTransactionQuery.php',
     'PhabricatorAuthSSHKeyViewController' => 'applications/auth/controller/PhabricatorAuthSSHKeyViewController.php',
@@ -7441,6 +7442,7 @@
     'PhabricatorAuthSSHKeyRevokeController' => 'PhabricatorAuthSSHKeyController',
     'PhabricatorAuthSSHKeySearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorAuthSSHKeyTableView' => 'AphrontView',
+    'PhabricatorAuthSSHKeyTestCase' => 'PhabricatorTestCase',
     'PhabricatorAuthSSHKeyTransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorAuthSSHKeyTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorAuthSSHKeyViewController' => 'PhabricatorAuthSSHKeyController',
diff --git a/src/applications/auth/__tests__/PhabricatorAuthSSHKeyTestCase.php b/src/applications/auth/__tests__/PhabricatorAuthSSHKeyTestCase.php
new file mode 100644
index 0000000000..4b1e1b4c02
--- /dev/null
+++ b/src/applications/auth/__tests__/PhabricatorAuthSSHKeyTestCase.php
@@ -0,0 +1,78 @@
+<?php
+
+final class PhabricatorAuthSSHKeyTestCase extends PhabricatorTestCase {
+
+  protected function getPhabricatorTestCaseConfiguration() {
+    return array(
+      self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
+    );
+  }
+
+  public function testRevokeSSHKey() {
+    $user = $this->generateNewTestUser();
+    $raw_key = 'ssh-rsa hunter2';
+
+    $ssh_key = PhabricatorAuthSSHKey::initializeNewSSHKey($user, $user);
+
+    // Add the key to the user's account.
+    $xactions = array();
+    $xactions[] = $ssh_key->getApplicationTransactionTemplate()
+      ->setTransactionType(PhabricatorAuthSSHKeyTransaction::TYPE_NAME)
+      ->setNewValue('key1');
+    $xactions[] = $ssh_key->getApplicationTransactionTemplate()
+      ->setTransactionType(PhabricatorAuthSSHKeyTransaction::TYPE_KEY)
+      ->setNewValue($raw_key);
+    $this->applyTransactions($user, $ssh_key, $xactions);
+
+    $ssh_key->reload();
+    $this->assertTrue((bool)$ssh_key->getIsActive());
+
+    // Revoke it.
+    $xactions = array();
+    $xactions[] = $ssh_key->getApplicationTransactionTemplate()
+      ->setTransactionType(PhabricatorAuthSSHKeyTransaction::TYPE_DEACTIVATE)
+      ->setNewValue(true);
+    $this->applyTransactions($user, $ssh_key, $xactions);
+
+    $ssh_key->reload();
+    $this->assertFalse((bool)$ssh_key->getIsActive());
+
+    // Try to add the revoked key back. This should fail with a validation
+    // error because the key was previously revoked by the user.
+    $revoked_key = PhabricatorAuthSSHKey::initializeNewSSHKey($user, $user);
+    $xactions = array();
+    $xactions[] = $ssh_key->getApplicationTransactionTemplate()
+      ->setTransactionType(PhabricatorAuthSSHKeyTransaction::TYPE_NAME)
+      ->setNewValue('key2');
+    $xactions[] = $ssh_key->getApplicationTransactionTemplate()
+      ->setTransactionType(PhabricatorAuthSSHKeyTransaction::TYPE_KEY)
+      ->setNewValue($raw_key);
+
+    $caught = null;
+    try {
+      $this->applyTransactions($user, $ssh_key, $xactions);
+    } catch (PhabricatorApplicationTransactionValidationException $ex) {
+      $errors = $ex->getErrors();
+      $this->assertEqual(1, count($errors));
+      $caught = head($errors)->getType();
+    }
+
+    $this->assertEqual(PhabricatorAuthSSHKeyTransaction::TYPE_KEY, $caught);
+  }
+
+  private function applyTransactions(
+    PhabricatorUser $actor,
+    PhabricatorAuthSSHKey $key,
+    array $xactions) {
+
+    $content_source = $this->newContentSource();
+
+    $editor = $key->getApplicationTransactionEditor()
+      ->setActor($actor)
+      ->setContinueOnNoEffect(true)
+      ->setContinueOnMissingFields(true)
+      ->setContentSource($content_source)
+      ->applyTransactions($key, $xactions);
+  }
+
+}

From 042c43d6d8435d38506f3f88326978c42f74233b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 24 Jan 2018 19:12:48 -0800
Subject: [PATCH 407/865] Remove a very old Herald garbage collection migration

Summary:
Ref T13048. This migration is from January 2012 and probably only impacted Facebook.

It references `HeraldRepetitionPolicyConfig`, which I'd like to change significantly. I initially just replaced the constant with a literal `0`, but I don't think there's any actual value in retaining this migration nowadays.

The cost of removing this migration is: if you installed Phabricator before January 2012 and haven't upgraded since then, you'll have a few more rows in the `APPLIED` table than necessary. Herald will still work correctly.

Test Plan: Reading.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18924
---
 resources/sql/patches/102.heraldcleanup.php | 41 +++------------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/resources/sql/patches/102.heraldcleanup.php b/resources/sql/patches/102.heraldcleanup.php
index 5b885bd670..f7f58131ea 100644
--- a/resources/sql/patches/102.heraldcleanup.php
+++ b/resources/sql/patches/102.heraldcleanup.php
@@ -1,39 +1,8 @@
 <?php
 
-echo pht('Cleaning up old Herald rule applied rows...')."\n";
-$table = new HeraldRule();
-$table->openTransaction();
-$table->beginReadLocking();
+// Once, this migration deleted some unnecessary rows written by Herald before
+// January 2012. These rows don't hurt anything, they just cluttered up the
+// database a bit.
 
-$rules = $table->loadAll();
-foreach ($rules as $key => $rule) {
-  $first_policy = HeraldRepetitionPolicyConfig::toInt(
-    HeraldRepetitionPolicyConfig::FIRST);
-  if ($rule->getRepetitionPolicy() != $first_policy) {
-    unset($rules[$key]);
-  }
-}
-
-$conn_w = $table->establishConnection('w');
-
-$clause = '';
-if ($rules) {
-  $clause = qsprintf(
-    $conn_w,
-    'WHERE ruleID NOT IN (%Ld)',
-    mpull($rules, 'getID'));
-}
-
-echo pht('This may take a moment')."\n";
-do {
-  queryfx(
-    $conn_w,
-    'DELETE FROM %T %Q LIMIT 1000',
-    HeraldRule::TABLE_RULE_APPLIED,
-    $clause);
-  echo '.';
-} while ($conn_w->getAffectedRows());
-
-$table->endReadLocking();
-$table->saveTransaction();
-echo "\n".pht('Done.')."\n";
+// The migration was removed in January 2018 to make maintenance on rule
+// repetition policies easier.

From a90b16e83a33ab7a37c815e43bcd75d006d0bd49 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 24 Jan 2018 19:35:36 -0800
Subject: [PATCH 408/865] Define available Herald rule repetition options in
 terms of "isSingleEventAdapter()"

Summary:
Depends on D18924. Ref T13048. Each adapter defines which repetition options ("every time", "only the first time") users may select for rules.

Currently, this is all explicit and hard-coded. However, every adapter really just implements this rule (except for some bugs, see below):

> You can pick "only the first time" if this adapter fires more than once on the same object.

Since we already have a `isSingleEventAdapter()` method which lets us tell if an adapter fires more than once, just write this rule in the base class and delete all the copy/pasting.

This also fixes two bugs because of the copy/pasting: Pholio Mocks and Phriction Documents did not allow you to write "only the first time" rules. There's no reason for this, they just didn't copy/paste enough methods when they were implemented.

This will make a future diff (which introduces an "if the rule did not match last time" policy) cleaner.

Test Plan:
  - Checked several different types of rules, saw appropriate options in the dropdown (pre-commit: no options; tasks: first or every).
  - Checked mocks and wiki docs, saw that you can now write "only the first time" rules.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18925
---
 .../PhabricatorCalendarEventHeraldAdapter.php    |  7 -------
 .../herald/HeraldDifferentialDiffAdapter.php     |  6 ------
 .../herald/HeraldDifferentialRevisionAdapter.php |  7 -------
 .../herald/adapter/HeraldAdapter.php             | 16 +++++++++++++---
 .../herald/HeraldManiphestTaskAdapter.php        |  7 -------
 .../PhabricatorMailOutboundMailHeraldAdapter.php |  6 ------
 .../phame/herald/HeraldPhameBlogAdapter.php      |  7 -------
 .../phame/herald/HeraldPhamePostAdapter.php      |  7 -------
 .../herald/HeraldPonderQuestionAdapter.php       |  7 -------
 .../herald/PhabricatorProjectHeraldAdapter.php   |  7 -------
 10 files changed, 13 insertions(+), 64 deletions(-)

diff --git a/src/applications/calendar/herald/PhabricatorCalendarEventHeraldAdapter.php b/src/applications/calendar/herald/PhabricatorCalendarEventHeraldAdapter.php
index 1fc3a56317..49d5f38959 100644
--- a/src/applications/calendar/herald/PhabricatorCalendarEventHeraldAdapter.php
+++ b/src/applications/calendar/herald/PhabricatorCalendarEventHeraldAdapter.php
@@ -49,13 +49,6 @@ public function supportsRuleType($rule_type) {
     }
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::EVERY,
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public function getHeraldName() {
     return $this->getObject()->getMonogram();
   }
diff --git a/src/applications/differential/herald/HeraldDifferentialDiffAdapter.php b/src/applications/differential/herald/HeraldDifferentialDiffAdapter.php
index 9528978050..a6b2e7c36e 100644
--- a/src/applications/differential/herald/HeraldDifferentialDiffAdapter.php
+++ b/src/applications/differential/herald/HeraldDifferentialDiffAdapter.php
@@ -53,12 +53,6 @@ public function supportsRuleType($rule_type) {
     }
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public function getHeraldName() {
     return pht('New Diff');
   }
diff --git a/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php b/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php
index e20a4fd37d..9f7f8fe3f2 100644
--- a/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php
+++ b/src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php
@@ -69,13 +69,6 @@ public function supportsRuleType($rule_type) {
     }
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::EVERY,
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public static function newLegacyAdapter(
     DifferentialRevision $revision,
     DifferentialDiff $diff) {
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index 1c50c0b5ee..cdf1d3a864 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -764,9 +764,19 @@ private function buildTokenizerFieldValue(
 
 
   public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::EVERY,
-    );
+    $options = array();
+
+    $options[] = HeraldRepetitionPolicyConfig::EVERY;
+
+    // Some rules, like pre-commit rules, only ever fire once. It doesn't
+    // make sense to use state-based repetition policies like "only the first
+    // time" for these rules.
+
+    if (!$this->isSingleEventAdapter()) {
+      $options[] = HeraldRepetitionPolicyConfig::FIRST;
+    }
+
+    return $options;
   }
 
   protected function initializeNewAdapter() {
diff --git a/src/applications/maniphest/herald/HeraldManiphestTaskAdapter.php b/src/applications/maniphest/herald/HeraldManiphestTaskAdapter.php
index 8503839e3e..1aa544de57 100644
--- a/src/applications/maniphest/herald/HeraldManiphestTaskAdapter.php
+++ b/src/applications/maniphest/herald/HeraldManiphestTaskAdapter.php
@@ -33,13 +33,6 @@ public function supportsApplicationEmail() {
     return true;
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::EVERY,
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public function supportsRuleType($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
diff --git a/src/applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php b/src/applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php
index 6ca797833e..f96a6f86bd 100644
--- a/src/applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php
+++ b/src/applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php
@@ -49,12 +49,6 @@ public function isSingleEventAdapter() {
     return true;
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public function supportsRuleType($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
diff --git a/src/applications/phame/herald/HeraldPhameBlogAdapter.php b/src/applications/phame/herald/HeraldPhameBlogAdapter.php
index d8956ba4a6..d9368a97d2 100644
--- a/src/applications/phame/herald/HeraldPhameBlogAdapter.php
+++ b/src/applications/phame/herald/HeraldPhameBlogAdapter.php
@@ -24,13 +24,6 @@ public function supportsApplicationEmail() {
     return true;
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::EVERY,
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public function supportsRuleType($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
diff --git a/src/applications/phame/herald/HeraldPhamePostAdapter.php b/src/applications/phame/herald/HeraldPhamePostAdapter.php
index 4776bbbdbc..72e7124271 100644
--- a/src/applications/phame/herald/HeraldPhamePostAdapter.php
+++ b/src/applications/phame/herald/HeraldPhamePostAdapter.php
@@ -24,13 +24,6 @@ public function supportsApplicationEmail() {
     return true;
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::EVERY,
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public function supportsRuleType($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
diff --git a/src/applications/ponder/herald/HeraldPonderQuestionAdapter.php b/src/applications/ponder/herald/HeraldPonderQuestionAdapter.php
index f3f47681bb..f9434c7f78 100644
--- a/src/applications/ponder/herald/HeraldPonderQuestionAdapter.php
+++ b/src/applications/ponder/herald/HeraldPonderQuestionAdapter.php
@@ -39,13 +39,6 @@ public function supportsApplicationEmail() {
     return true;
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::EVERY,
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public function supportsRuleType($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
diff --git a/src/applications/project/herald/PhabricatorProjectHeraldAdapter.php b/src/applications/project/herald/PhabricatorProjectHeraldAdapter.php
index f6d0984cb6..72f064a5c6 100644
--- a/src/applications/project/herald/PhabricatorProjectHeraldAdapter.php
+++ b/src/applications/project/herald/PhabricatorProjectHeraldAdapter.php
@@ -24,13 +24,6 @@ public function supportsApplicationEmail() {
     return true;
   }
 
-  public function getRepetitionOptions() {
-    return array(
-      HeraldRepetitionPolicyConfig::EVERY,
-      HeraldRepetitionPolicyConfig::FIRST,
-    );
-  }
-
   public function supportsRuleType($rule_type) {
     switch ($rule_type) {
       case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:

From 1dd1237c92283ef67823b1a277d5fddc86fdbd25 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 24 Jan 2018 20:03:06 -0800
Subject: [PATCH 409/865] Remove "HeraldRepetitionPolicyConfig" and hide
 storage details inside HeraldRule

Summary:
Depends on D18925. Ref T13048. Currently, HeraldRule stores policies as integers (0 or 1) in the database.

The application tries to mostly use strings ("first", "every"), but doesn't do a good job of hiding the fact that the values are integers deeper in the stack. So we end up with a lot of code like this:

```lang=php
$stored_int_value = $rule->getRepetitionPolicy();
$equivalent_string = HeraldRepetitionPolicyConfig::getString($stored_int_value);
$is_first = ($equivalent_string === HeraldRepetitionPolicyConfig::FIRST);
```

This happens in several places and is generally awful. Replace it with:

```lang=php
$is_first = $rule->isRepeatFirst();
```

To do this, merge `HeraldRepetitionPolicyConfig` into `HeraldRule` and hide all the mess inside the methods.

(This may let us just get rid of the integers in a later change, although I'm not sure I want to commit to that.)

Test Plan:
  - Grepped for `HeraldRepetitionPolicyConfig`, no more hits.
  - Grepped for `setRepetitionPolicy(...)` and `getRepetitionPolicy(...)`. There are no remaining callers outside of `HeraldRule`.
  - Browed and edited several rules. I'll vet this more convincingly after adding the new repetition rule.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18926
---
 src/__phutil_library_map__.php                |  2 -
 .../herald/adapter/HeraldAdapter.php          |  9 +--
 .../config/HeraldRepetitionPolicyConfig.php   | 28 --------
 .../controller/HeraldRuleController.php       |  8 +--
 .../herald/editor/HeraldRuleEditor.php        |  6 +-
 .../herald/editor/HeraldRuleSerializer.php    |  2 +-
 .../herald/engine/HeraldEngine.php            |  8 +--
 .../herald/storage/HeraldRule.php             | 71 +++++++++++++++++++
 8 files changed, 84 insertions(+), 50 deletions(-)
 delete mode 100644 src/applications/herald/config/HeraldRepetitionPolicyConfig.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 59683e5b5c..1d9159f714 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1399,7 +1399,6 @@
     'HeraldRelatedFieldGroup' => 'applications/herald/field/HeraldRelatedFieldGroup.php',
     'HeraldRemarkupFieldValue' => 'applications/herald/value/HeraldRemarkupFieldValue.php',
     'HeraldRemarkupRule' => 'applications/herald/remarkup/HeraldRemarkupRule.php',
-    'HeraldRepetitionPolicyConfig' => 'applications/herald/config/HeraldRepetitionPolicyConfig.php',
     'HeraldRule' => 'applications/herald/storage/HeraldRule.php',
     'HeraldRuleController' => 'applications/herald/controller/HeraldRuleController.php',
     'HeraldRuleDatasource' => 'applications/herald/typeahead/HeraldRuleDatasource.php',
@@ -6602,7 +6601,6 @@
     'HeraldRelatedFieldGroup' => 'HeraldFieldGroup',
     'HeraldRemarkupFieldValue' => 'HeraldFieldValue',
     'HeraldRemarkupRule' => 'PhabricatorObjectRemarkupRule',
-    'HeraldRepetitionPolicyConfig' => 'Phobject',
     'HeraldRule' => array(
       'HeraldDAO',
       'PhabricatorApplicationTransactionInterface',
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index cdf1d3a864..bafad0d440 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -766,14 +766,14 @@ private function buildTokenizerFieldValue(
   public function getRepetitionOptions() {
     $options = array();
 
-    $options[] = HeraldRepetitionPolicyConfig::EVERY;
+    $options[] = HeraldRule::REPEAT_EVERY;
 
     // Some rules, like pre-commit rules, only ever fire once. It doesn't
     // make sense to use state-based repetition policies like "only the first
     // time" for these rules.
 
     if (!$this->isSingleEventAdapter()) {
-      $options[] = HeraldRepetitionPolicyConfig::FIRST;
+      $options[] = HeraldRule::REPEAT_FIRST;
     }
 
     return $options;
@@ -897,10 +897,7 @@ public function renderRuleAsText(
         ));
     }
 
-    $integer_code_for_every = HeraldRepetitionPolicyConfig::toInt(
-      HeraldRepetitionPolicyConfig::EVERY);
-
-    if ($rule->getRepetitionPolicy() == $integer_code_for_every) {
+    if ($rule->isRepeatEvery()) {
       $action_text =
         pht('Take these actions every time this rule matches:');
     } else {
diff --git a/src/applications/herald/config/HeraldRepetitionPolicyConfig.php b/src/applications/herald/config/HeraldRepetitionPolicyConfig.php
deleted file mode 100644
index 40e84f0ae4..0000000000
--- a/src/applications/herald/config/HeraldRepetitionPolicyConfig.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-final class HeraldRepetitionPolicyConfig extends Phobject {
-
-  const FIRST   = 'first';  // only execute the first time (no repeating)
-  const EVERY   = 'every';  // repeat every time
-
-  private static $policyIntMap = array(
-    self::FIRST   => 0,
-    self::EVERY   => 1,
-  );
-
-  public static function getMap() {
-    return array(
-      self::EVERY   => pht('every time'),
-      self::FIRST   => pht('only the first time'),
-    );
-  }
-
-  public static function toInt($str) {
-    return idx(self::$policyIntMap, $str, self::$policyIntMap[self::EVERY]);
-  }
-
-  public static function toString($int) {
-    return idx(array_flip(self::$policyIntMap), $int, self::EVERY);
-  }
-
-}
diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
index eaf352a0a7..906afe835e 100644
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -373,8 +373,7 @@ private function saveRule(HeraldAdapter $adapter, $rule, $request) {
     // mutate current rule, so it would be sent to the client in the right state
     $rule->setMustMatchAll((int)$match_all);
     $rule->setName($new_name);
-    $rule->setRepetitionPolicy(
-      HeraldRepetitionPolicyConfig::toInt($repetition_policy_param));
+    $rule->setRepetitionPolicyStringConstant($repetition_policy_param);
     $rule->attachConditions($conditions);
     $rule->attachActions($actions);
 
@@ -594,11 +593,10 @@ private function renderMustMatchSelector($rule) {
    * time) this rule matches..." element.
    */
   private function renderRepetitionSelector($rule, HeraldAdapter $adapter) {
-    $repetition_policy = HeraldRepetitionPolicyConfig::toString(
-      $rule->getRepetitionPolicy());
+    $repetition_policy = $rule->getRepetitionPolicyStringConstant();
 
     $repetition_options = $adapter->getRepetitionOptions();
-    $repetition_names = HeraldRepetitionPolicyConfig::getMap();
+    $repetition_names = HeraldRule::getRepetitionPolicySelectOptionMap();
     $repetition_map = array_select_keys($repetition_names, $repetition_options);
 
     if (count($repetition_map) < 2) {
diff --git a/src/applications/herald/editor/HeraldRuleEditor.php b/src/applications/herald/editor/HeraldRuleEditor.php
index de9bb01ef2..30480108f4 100644
--- a/src/applications/herald/editor/HeraldRuleEditor.php
+++ b/src/applications/herald/editor/HeraldRuleEditor.php
@@ -66,8 +66,10 @@ protected function applyCustomInternalTransaction(
         $object->setMustMatchAll((int)$new_state['match_all']);
         $object->attachConditions($new_state['conditions']);
         $object->attachActions($new_state['actions']);
-        $object->setRepetitionPolicy(
-          HeraldRepetitionPolicyConfig::toInt($new_state['repetition_policy']));
+
+        $new_repetition = $new_state['repetition_policy'];
+        $object->setRepetitionPolicyStringConstant($new_repetition);
+
         return $object;
     }
 
diff --git a/src/applications/herald/editor/HeraldRuleSerializer.php b/src/applications/herald/editor/HeraldRuleSerializer.php
index d1b2527aaa..cf045fc9bf 100644
--- a/src/applications/herald/editor/HeraldRuleSerializer.php
+++ b/src/applications/herald/editor/HeraldRuleSerializer.php
@@ -9,7 +9,7 @@ public function serializeRule(HeraldRule $rule) {
       (bool)$rule->getMustMatchAll(),
       $rule->getConditions(),
       $rule->getActions(),
-      HeraldRepetitionPolicyConfig::toString($rule->getRepetitionPolicy()));
+      $rule->getRepetitionPolicyStringConstant());
   }
 
   public function serializeRuleComponents(
diff --git a/src/applications/herald/engine/HeraldEngine.php b/src/applications/herald/engine/HeraldEngine.php
index b8e1db5626..afeba459ff 100644
--- a/src/applications/herald/engine/HeraldEngine.php
+++ b/src/applications/herald/engine/HeraldEngine.php
@@ -68,9 +68,7 @@ public function applyRules(array $rules, HeraldAdapter $object) {
     foreach ($rules as $phid => $rule) {
       $this->stack = array();
 
-      $policy_first = HeraldRepetitionPolicyConfig::FIRST;
-      $policy_first_int = HeraldRepetitionPolicyConfig::toInt($policy_first);
-      $is_first_only = ($rule->getRepetitionPolicy() == $policy_first_int);
+      $is_first_only = $rule->isRepeatFirst();
 
       try {
         if (!$this->getDryRun() &&
@@ -175,8 +173,6 @@ public function applyEffects(
 
     $rules = mpull($rules, null, 'getID');
     $applied_ids = array();
-    $first_policy = HeraldRepetitionPolicyConfig::toInt(
-      HeraldRepetitionPolicyConfig::FIRST);
 
     // Mark all the rules that have had their effects applied as having been
     // executed for the current object.
@@ -194,7 +190,7 @@ public function applyEffects(
         continue;
       }
 
-      if ($rule->getRepetitionPolicy() == $first_policy) {
+      if ($rule->isRepeatFirst()) {
         $applied_ids[] = $rule_id;
       }
     }
diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php
index cf00e046b7..6d6f04c7c7 100644
--- a/src/applications/herald/storage/HeraldRule.php
+++ b/src/applications/herald/storage/HeraldRule.php
@@ -30,6 +30,9 @@ final class HeraldRule extends HeraldDAO
   private $actions;
   private $triggerObject = self::ATTACHABLE;
 
+  const REPEAT_EVERY = 'every';
+  const REPEAT_FIRST = 'first';
+
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
@@ -254,6 +257,74 @@ public function getMonogram() {
   }
 
 
+/* -(  Repetition Policies  )------------------------------------------------ */
+
+
+  public function getRepetitionPolicyStringConstant() {
+    $map = self::getRepetitionPolicyMap();
+    $map = ipull($map, 'key.string', 'key.int');
+
+    return idx($map, $this->getRepetitionPolicyIntegerConstant());
+  }
+
+  public function getRepetitionPolicyIntegerConstant() {
+    $map = self::getRepetitionPolicyMap();
+    $map = ipull($map, 'key.int', 'key.int');
+    $int = $this->getRepetitionPolicy();
+
+    if (!isset($map[$int])) {
+      return head_key($map);
+    }
+
+    return $int;
+  }
+
+  public function setRepetitionPolicyStringConstant($value) {
+    $map = self::getRepetitionPolicyMap();
+    $map = ipull($map, 'key.int', 'key.string');
+
+    if (!isset($map[$value])) {
+      throw new Exception(
+        pht(
+          'Rule repetition string constant "%s" is unknown.',
+          $value));
+    }
+
+    $int = $map[$value];
+
+    return $this->setRepetitionPolicy($int);
+  }
+
+  public function isRepeatEvery() {
+    return ($this->getRepetitionPolicyStringConstant() === self::REPEAT_EVERY);
+  }
+
+  public function isRepeatFirst() {
+    return ($this->getRepetitionPolicyStringConstant() === self::REPEAT_FIRST);
+  }
+
+  public static function getRepetitionPolicySelectOptionMap() {
+    $map = self::getRepetitionPolicyMap();
+    $map = ipull($map, 'select', 'key.string');
+    return $map;
+  }
+
+  private static function getRepetitionPolicyMap() {
+    return array(
+      self::REPEAT_EVERY => array(
+        'key.int' => 1,
+        'key.string' => self::REPEAT_EVERY,
+        'select' => pht('every time'),
+      ),
+      self::REPEAT_FIRST => array(
+        'key.int' => 0,
+        'key.string' => self::REPEAT_FIRST,
+        'select' => pht('only the first time'),
+      ),
+    );
+  }
+
+
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 

From 204d1de68376083373cb5b0880c66ea5cf6b38fa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 24 Jan 2018 20:21:42 -0800
Subject: [PATCH 410/865] Convert storage for Herald repetition policy to
 "text32"

Summary:
Depends on D18926. Ref T6203. Ref T13048. Herald rule repetition policies are stored as integers but treated as strings in most contexts.

After D18926, the integer stuff is almost totally hidden inside `HeraldRule` and getting rid of it completely isn't too tricky.

Do so now.

Test Plan:
  - Created "only the first time" and "every time" rules. Did a SELECT on their rows in the database.
  - Ran migrations, got a clean bill of health from `storage adjust`.
  - Did another SELECT on the rows, saw a faithful conversion to strings "every" and "first".
  - Edited and reviewed rules, swapping them between "every" and "first".

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048, T6203

Differential Revision: https://secure.phabricator.com/D18927
---
 .../20180124.herald.01.repetition.sql         | 22 ++++++++++++
 .../herald/storage/HeraldRule.php             | 34 +++----------------
 2 files changed, 26 insertions(+), 30 deletions(-)
 create mode 100644 resources/sql/autopatches/20180124.herald.01.repetition.sql

diff --git a/resources/sql/autopatches/20180124.herald.01.repetition.sql b/resources/sql/autopatches/20180124.herald.01.repetition.sql
new file mode 100644
index 0000000000..3be9ec627d
--- /dev/null
+++ b/resources/sql/autopatches/20180124.herald.01.repetition.sql
@@ -0,0 +1,22 @@
+/* This column was previously "uint32?" with these values:
+
+  1: run every time
+  0: run only the first time
+
+*/
+
+ALTER TABLE {$NAMESPACE}_herald.herald_rule
+  CHANGE repetitionPolicy
+    repetitionPolicy VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};
+
+/* If the old value was "0", the new value is "first". */
+
+UPDATE {$NAMESPACE}_herald.herald_rule
+  SET repetitionPolicy = 'first'
+  WHERE repetitionPolicy = '0';
+
+/* If the old value was anything else, the new value is "every". */
+
+UPDATE {$NAMESPACE}_herald.herald_rule
+  SET repetitionPolicy = 'every'
+  WHERE repetitionPolicy NOT IN ('first', '0');
diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php
index 6d6f04c7c7..8fd1127eb7 100644
--- a/src/applications/herald/storage/HeraldRule.php
+++ b/src/applications/herald/storage/HeraldRule.php
@@ -41,13 +41,10 @@ protected function getConfiguration() {
         'contentType' => 'text255',
         'mustMatchAll' => 'bool',
         'configVersion' => 'uint32',
+        'repetitionPolicy' => 'text32',
         'ruleType' => 'text32',
         'isDisabled' => 'uint32',
         'triggerObjectPHID' => 'phid?',
-
-        // T6203/NULLABILITY
-        // This should not be nullable.
-        'repetitionPolicy' => 'uint32?',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_name' => array(
@@ -261,27 +258,11 @@ public function getMonogram() {
 
 
   public function getRepetitionPolicyStringConstant() {
-    $map = self::getRepetitionPolicyMap();
-    $map = ipull($map, 'key.string', 'key.int');
-
-    return idx($map, $this->getRepetitionPolicyIntegerConstant());
-  }
-
-  public function getRepetitionPolicyIntegerConstant() {
-    $map = self::getRepetitionPolicyMap();
-    $map = ipull($map, 'key.int', 'key.int');
-    $int = $this->getRepetitionPolicy();
-
-    if (!isset($map[$int])) {
-      return head_key($map);
-    }
-
-    return $int;
+    return $this->getRepetitionPolicy();
   }
 
   public function setRepetitionPolicyStringConstant($value) {
     $map = self::getRepetitionPolicyMap();
-    $map = ipull($map, 'key.int', 'key.string');
 
     if (!isset($map[$value])) {
       throw new Exception(
@@ -290,9 +271,7 @@ public function setRepetitionPolicyStringConstant($value) {
           $value));
     }
 
-    $int = $map[$value];
-
-    return $this->setRepetitionPolicy($int);
+    return $this->setRepetitionPolicy($value);
   }
 
   public function isRepeatEvery() {
@@ -305,20 +284,15 @@ public function isRepeatFirst() {
 
   public static function getRepetitionPolicySelectOptionMap() {
     $map = self::getRepetitionPolicyMap();
-    $map = ipull($map, 'select', 'key.string');
-    return $map;
+    return ipull($map, 'select');
   }
 
   private static function getRepetitionPolicyMap() {
     return array(
       self::REPEAT_EVERY => array(
-        'key.int' => 1,
-        'key.string' => self::REPEAT_EVERY,
         'select' => pht('every time'),
       ),
       self::REPEAT_FIRST => array(
-        'key.int' => 0,
-        'key.string' => self::REPEAT_FIRST,
         'select' => pht('only the first time'),
       ),
     );

From a34b6bdd06b7005cdfc83fd2c4d1b9c4167757c2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 08:03:29 -0800
Subject: [PATCH 411/865] Implement an "only if the rule did not match last
 time" policy for Herald rules

Summary: Depends on D18927. Ref T13048. This implements a new policy which allows Herald rules to fire on some kinds of state changes.

Test Plan:
Wrote and tested rules with the new policy:

{F5394971}

{F5394972}

Also wrote and tested rules with the old policies:

{F5394973}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18930
---
 .../herald/adapter/HeraldAdapter.php          | 14 ++-
 .../controller/HeraldRuleController.php       |  2 +-
 .../herald/engine/HeraldEngine.php            | 98 ++++++++++++++++---
 .../herald/storage/HeraldRule.php             | 12 ++-
 4 files changed, 102 insertions(+), 24 deletions(-)

diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index bafad0d440..d67c69f584 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -774,6 +774,7 @@ public function getRepetitionOptions() {
 
     if (!$this->isSingleEventAdapter()) {
       $options[] = HeraldRule::REPEAT_FIRST;
+      $options[] = HeraldRule::REPEAT_CHANGE;
     }
 
     return $options;
@@ -897,12 +898,15 @@ public function renderRuleAsText(
         ));
     }
 
-    if ($rule->isRepeatEvery()) {
-      $action_text =
-        pht('Take these actions every time this rule matches:');
+    if ($rule->isRepeatFirst()) {
+      $action_text = pht(
+        'Take these actions the first time this rule matches:');
+    } else if ($rule->isRepeatOnChange()) {
+      $action_text = pht(
+        'Take these actions if this rule did not match the last time:');
     } else {
-      $action_text =
-        pht('Take these actions the first time this rule matches:');
+      $action_text = pht(
+        'Take these actions every time this rule matches:');
     }
 
     $action_title = phutil_tag(
diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
index 906afe835e..c61c29e90e 100644
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -218,7 +218,7 @@ public function handleRequest(AphrontRequest $request) {
             ),
             pht('New Action')))
           ->setDescription(pht(
-            'Take these actions %s this rule matches:',
+            'Take these actions %s',
             $repetition_selector))
           ->setContent(javelin_tag(
               'table',
diff --git a/src/applications/herald/engine/HeraldEngine.php b/src/applications/herald/engine/HeraldEngine.php
index afeba459ff..739e83e4e8 100644
--- a/src/applications/herald/engine/HeraldEngine.php
+++ b/src/applications/herald/engine/HeraldEngine.php
@@ -14,6 +14,7 @@ final class HeraldEngine extends Phobject {
 
   private $forbiddenFields = array();
   private $forbiddenActions = array();
+  private $skipEffects = array();
 
   public function setDryRun($dry_run) {
     $this->dryRun = $dry_run;
@@ -171,13 +172,31 @@ public function applyEffects(
       return;
     }
 
-    $rules = mpull($rules, null, 'getID');
-    $applied_ids = array();
+    // Update the "applied" state table. How this table works depends on the
+    // repetition policy for the rule.
+    //
+    // REPEAT_EVERY: We delete existing rows for the rule, then write nothing.
+    // This policy doesn't use any state.
+    //
+    // REPEAT_FIRST: We keep existing rows, then write additional rows for
+    // rules which fired. This policy accumulates state over the life of the
+    // object.
+    //
+    // REPEAT_CHANGE: We delete existing rows, then write all the rows which
+    // matched. This policy only uses the state from the previous run.
 
-    // Mark all the rules that have had their effects applied as having been
-    // executed for the current object.
+    $rules = mpull($rules, null, 'getID');
     $rule_ids = mpull($xscripts, 'getRuleID');
 
+    $delete_ids = array();
+    foreach ($rules as $rule_id => $rule) {
+      if ($rule->isRepeatFirst()) {
+        continue;
+      }
+      $delete_ids[] = $rule_id;
+    }
+
+    $applied_ids = array();
     foreach ($rule_ids as $rule_id) {
       if (!$rule_id) {
         // Some apply transcripts are purely informational and not associated
@@ -190,26 +209,44 @@ public function applyEffects(
         continue;
       }
 
-      if ($rule->isRepeatFirst()) {
+      if ($rule->isRepeatFirst() || $rule->isRepeatOnChange()) {
         $applied_ids[] = $rule_id;
       }
     }
 
-    if ($applied_ids) {
+    // Also include "only if this rule did not match the last time" rules
+    // which matched but were skipped in the "applied" list.
+    foreach ($this->skipEffects as $rule_id => $ignored) {
+      $applied_ids[] = $rule_id;
+    }
+
+    if ($delete_ids || $applied_ids) {
       $conn_w = id(new HeraldRule())->establishConnection('w');
-      $sql = array();
-      foreach ($applied_ids as $id) {
-        $sql[] = qsprintf(
+
+      if ($delete_ids) {
+        queryfx(
           $conn_w,
-          '(%s, %d)',
+          'DELETE FROM %T WHERE phid = %s AND ruleID IN (%Ld)',
+          HeraldRule::TABLE_RULE_APPLIED,
           $adapter->getPHID(),
-          $id);
+          $delete_ids);
+      }
+
+      if ($applied_ids) {
+        $sql = array();
+        foreach ($applied_ids as $id) {
+          $sql[] = qsprintf(
+            $conn_w,
+            '(%s, %d)',
+            $adapter->getPHID(),
+            $id);
+        }
+        queryfx(
+          $conn_w,
+          'INSERT IGNORE INTO %T (phid, ruleID) VALUES %Q',
+          HeraldRule::TABLE_RULE_APPLIED,
+          implode(', ', $sql));
       }
-      queryfx(
-        $conn_w,
-        'INSERT IGNORE INTO %T (phid, ruleID) VALUES %Q',
-        HeraldRule::TABLE_RULE_APPLIED,
-        implode(', ', $sql));
     }
   }
 
@@ -311,6 +348,30 @@ public function doesRuleMatch(
       }
     }
 
+    // If this rule matched, and is set to run "if it did not match the last
+    // time", and we matched the last time, we're going to return a match in
+    // the transcript but set a flag so we don't actually apply any effects.
+
+    // We need the rule to match so that storage gets updated properly. If we
+    // just pretend the rule didn't match it won't cause any effects (which
+    // is correct), but it also won't set the "it matched" flag in storage,
+    // so the next run after this one would incorrectly trigger again.
+
+    $is_dry_run = $this->getDryRun();
+    if ($result && !$is_dry_run) {
+      $is_on_change = $rule->isRepeatOnChange();
+      if ($is_on_change) {
+        $did_apply = $rule->getRuleApplied($object->getPHID());
+        if ($did_apply) {
+          $reason = pht(
+            'This rule matched, but did not take any actions because it '.
+            'is configured to act only if it did not match the last time.');
+
+          $this->skipEffects[$rule->getID()] = true;
+        }
+      }
+    }
+
     $this->newRuleTranscript($rule)
       ->setResult($result)
       ->setReason($reason);
@@ -363,6 +424,11 @@ protected function getRuleEffects(
     HeraldRule $rule,
     HeraldAdapter $object) {
 
+    $rule_id = $rule->getID();
+    if (isset($this->skipEffects[$rule_id])) {
+      return array();
+    }
+
     $effects = array();
     foreach ($rule->getActions() as $action) {
       $effect = id(new HeraldEffect())
diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php
index 8fd1127eb7..44ef68ac03 100644
--- a/src/applications/herald/storage/HeraldRule.php
+++ b/src/applications/herald/storage/HeraldRule.php
@@ -32,6 +32,7 @@ final class HeraldRule extends HeraldDAO
 
   const REPEAT_EVERY = 'every';
   const REPEAT_FIRST = 'first';
+  const REPEAT_CHANGE = 'change';
 
   protected function getConfiguration() {
     return array(
@@ -282,6 +283,10 @@ public function isRepeatFirst() {
     return ($this->getRepetitionPolicyStringConstant() === self::REPEAT_FIRST);
   }
 
+  public function isRepeatOnChange() {
+    return ($this->getRepetitionPolicyStringConstant() === self::REPEAT_CHANGE);
+  }
+
   public static function getRepetitionPolicySelectOptionMap() {
     $map = self::getRepetitionPolicyMap();
     return ipull($map, 'select');
@@ -290,10 +295,13 @@ public static function getRepetitionPolicySelectOptionMap() {
   private static function getRepetitionPolicyMap() {
     return array(
       self::REPEAT_EVERY => array(
-        'select' => pht('every time'),
+        'select' => pht('every time this rule matches:'),
       ),
       self::REPEAT_FIRST => array(
-        'select' => pht('only the first time'),
+        'select' => pht('only the first time this rule matches:'),
+      ),
+      self::REPEAT_CHANGE => array(
+        'select' => pht('if this rule did not match the last time:'),
       ),
     );
   }

From 5c762d895796d7e5513234d972b570b4cdcce557 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 10:05:13 -0800
Subject: [PATCH 412/865] Document the new "only if this didn't match last
 time" Herald action setting

Summary: Depends on D18930. Ref T13048. Try to explain what this does and give an example since I think it's probably not very obvious from the name.

Test Plan: Read the text.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18931
---
 src/docs/user/userguide/herald.diviner | 40 +++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/docs/user/userguide/herald.diviner b/src/docs/user/userguide/herald.diviner
index c5a008474d..b7cfdeca95 100644
--- a/src/docs/user/userguide/herald.diviner
+++ b/src/docs/user/userguide/herald.diviner
@@ -20,7 +20,7 @@ For example, you can write a personal rule like this which triggers on tasks:
 
 > When [ all of ] these conditions are met:
 > [ Title ][ contains ][ quasar ]
-> Take these actions [ every time ] this rule matches:
+> Take these actions [ every time this rule matches: ]
 > [ Add me as a subscriber ]
 
 This rule will automatically subscribe you to any newly created or updated
@@ -106,6 +106,44 @@ had it actually been updated. Dry runs executed via the test console don't take
 any actions.
 
 
+Action Repetition Settings
+==========================
+
+Rules can be configured to act in different ways:
+
+**Every time the rule matches:** The rule will take actions every time the
+object is updated if the rule's conditions match the current object state.
+
+**Only the first time the rule matches:** The rule will take actions only once
+per object, regardless of how many times the object is updated. After the rule
+acts once, it won't run on the same object again.
+
+**If this rule did not match the last time:** This rule will take actions the
+first time it matches for an object. After that, it won't act unless the object
+just changed from not matching to matching.
+
+For example, suppose you have a rule like this:
+
+> When:
+> [ Title ][ contains ][ duck ]
+> Take actions [ if this rule did not match the last time: ]
+> [ Add comment ][ "Please prefer the term 'budget goose'." ]
+
+If you set this rule to act "every time", it will leave a comment on the task
+for every single update until the title is edited. This is usually pretty noisy.
+
+If you set this rule to act "only the first time", it will only leave one
+comment. This fixes the noise problem, but creates a new problem: if someone
+edits the title, then a later change breaks it again, the rule won't leave
+another reminder comment.
+
+If you set this rule to act "if it did not match the last time", it will leave
+one comment on matching tasks. If the task is fixed (by replacing the term
+"duck" with the term "budget goose", so the object no longer matches the rule)
+and then later changed to violate the rule again (by putting the term
+"duck" back in the title), the rule will act again.
+
+
 Advanced Herald
 ===============
 

From a9f87857af4b168d2a0f551515beaa31dceffe5f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 10:25:49 -0800
Subject: [PATCH 413/865] Mark the "Reviewer" field for Commits as deprecated

Summary:
Depends on D18931. Ref T13048. Ref T13041. This field means "the first accepting reviewer, where order is mostly arbitrary". Modern rules should almost certainly use "Accepting Reviewers" instead.

Getting rid of this completely is a pain, but we can at least reduce confusion by marking it as not-the-new-hotness. Add a "Deprecated" group, move it there, and mark it for exile.

Test Plan:
Edited a commit rule, saw it in "Deprecated" group at the bottom of the list:

{F5395001}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048, T13041

Differential Revision: https://secure.phabricator.com/D18932
---
 src/__phutil_library_map__.php                    |  2 ++
 .../herald/DiffusionCommitReviewerHeraldField.php |  6 +++++-
 .../herald/field/HeraldDeprecatedFieldGroup.php   | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/herald/field/HeraldDeprecatedFieldGroup.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1d9159f714..a134df5e1e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1362,6 +1362,7 @@
     'HeraldController' => 'applications/herald/controller/HeraldController.php',
     'HeraldCoreStateReasons' => 'applications/herald/state/HeraldCoreStateReasons.php',
     'HeraldDAO' => 'applications/herald/storage/HeraldDAO.php',
+    'HeraldDeprecatedFieldGroup' => 'applications/herald/field/HeraldDeprecatedFieldGroup.php',
     'HeraldDifferentialAdapter' => 'applications/differential/herald/HeraldDifferentialAdapter.php',
     'HeraldDifferentialDiffAdapter' => 'applications/differential/herald/HeraldDifferentialDiffAdapter.php',
     'HeraldDifferentialRevisionAdapter' => 'applications/differential/herald/HeraldDifferentialRevisionAdapter.php',
@@ -6561,6 +6562,7 @@
     'HeraldController' => 'PhabricatorController',
     'HeraldCoreStateReasons' => 'HeraldStateReasons',
     'HeraldDAO' => 'PhabricatorLiskDAO',
+    'HeraldDeprecatedFieldGroup' => 'HeraldFieldGroup',
     'HeraldDifferentialAdapter' => 'HeraldAdapter',
     'HeraldDifferentialDiffAdapter' => 'HeraldDifferentialAdapter',
     'HeraldDifferentialRevisionAdapter' => array(
diff --git a/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php
index 2a09eff83e..420c2576ec 100644
--- a/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php
@@ -6,7 +6,11 @@ final class DiffusionCommitReviewerHeraldField
   const FIELDCONST = 'diffusion.commit.reviewer';
 
   public function getHeraldFieldName() {
-    return pht('Reviewer');
+    return pht('Reviewer (Deprecated)');
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldDeprecatedFieldGroup::FIELDGROUPKEY;
   }
 
   public function getHeraldFieldValue($object) {
diff --git a/src/applications/herald/field/HeraldDeprecatedFieldGroup.php b/src/applications/herald/field/HeraldDeprecatedFieldGroup.php
new file mode 100644
index 0000000000..2b3bd5835c
--- /dev/null
+++ b/src/applications/herald/field/HeraldDeprecatedFieldGroup.php
@@ -0,0 +1,15 @@
+<?php
+
+final class HeraldDeprecatedFieldGroup extends HeraldFieldGroup {
+
+  const FIELDGROUPKEY = 'deprecated';
+
+  public function getGroupLabel() {
+    return pht('Deprecated');
+  }
+
+  protected function getGroupOrder() {
+    return 99999;
+  }
+
+}

From 5058cfb9726f6f4d9b93e2da3275fb415edbde69 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 11:24:21 -0800
Subject: [PATCH 414/865] Pass a real viewer to HeraldAdapter when doing test
 console runs

Summary:
Depends on D18932. Ref T13048. See PHI276. In the cluster, we don't have device keys on `web` nodes. This is generally good, since they don't need them, and it means that we aren't putting more credentials than we need on those hosts.

However, it means that when we pull diff content to test "Commit" rules via the Herald test console, we use the omnipotent user and try to use device credentials, and this fails since we don't have any.

Instead, pass the real viewer in this case so we just sign the request as them, like we do for normal Diffusion requests.

Test Plan:
Wrote and ran a commit content rule locally, no issues.

This isn't completely convincing since my local setup does have device credentials, but I'll double-check in production once this deploys.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18933
---
 .../diffusion/herald/HeraldCommitAdapter.php  |  2 +-
 .../herald/adapter/HeraldAdapter.php          | 20 +++++++++++++++++++
 .../HeraldTestConsoleController.php           |  4 +++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/applications/diffusion/herald/HeraldCommitAdapter.php b/src/applications/diffusion/herald/HeraldCommitAdapter.php
index bfcd8e3ccb..e0e15352b6 100644
--- a/src/applications/diffusion/herald/HeraldCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldCommitAdapter.php
@@ -209,7 +209,7 @@ public static function getEnormousTimeLimit() {
   }
 
   private function loadCommitDiff() {
-    $viewer = PhabricatorUser::getOmnipotentUser();
+    $viewer = $this->getViewer();
 
     $byte_limit = self::getEnormousByteLimit();
     $time_limit = self::getEnormousTimeLimit();
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index d67c69f584..9d56f474ff 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -38,6 +38,7 @@ abstract class HeraldAdapter extends Phobject {
   private $actionMap;
   private $edgeCache = array();
   private $forbiddenActions = array();
+  private $viewer;
 
   public function getEmailPHIDs() {
     return array_values($this->emailPHIDs);
@@ -55,10 +56,29 @@ public function addEmailPHID($phid, $force) {
     return $this;
   }
 
+  public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  public function getViewer() {
+    // See PHI276. Normally, Herald runs without regard for policy checks.
+    // However, we use a real viewer during test console runs: this makes
+    // intracluster calls to Diffusion APIs work even if web nodes don't
+    // have privileged credentials.
+
+    if ($this->viewer) {
+      return $this->viewer;
+    }
+
+    return PhabricatorUser::getOmnipotentUser();
+  }
+
   public function setContentSource(PhabricatorContentSource $content_source) {
     $this->contentSource = $content_source;
     return $this;
   }
+
   public function getContentSource() {
     return $this->contentSource;
   }
diff --git a/src/applications/herald/controller/HeraldTestConsoleController.php b/src/applications/herald/controller/HeraldTestConsoleController.php
index 21bedcd848..8a7a94963d 100644
--- a/src/applications/herald/controller/HeraldTestConsoleController.php
+++ b/src/applications/herald/controller/HeraldTestConsoleController.php
@@ -39,7 +39,9 @@ public function handleRequest(AphrontRequest $request) {
     $object = $this->getTestObject();
     $adapter = $this->getTestAdapter();
 
-    $adapter->setIsNewObject(false);
+    $adapter
+      ->setIsNewObject(false)
+      ->setViewer($viewer);
 
     $rules = id(new HeraldRuleQuery())
       ->setViewer($viewer)

From c0b8e4784bfad4ec07c8e5e34f0071f7acf65792 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 23 Jan 2018 09:57:41 -0800
Subject: [PATCH 415/865] Add a basic, general-purpose export workflow for all
 objects with SearchEngine support

Summary:
Depends on D18918. Ref T13046. Ref T5954. Pull logs can currently be browsed in the web UI, but this isn't very powerful, especially if you have thousands of them.

Allow SearchEngine implementations to define exportable fields so that users can "Use Results > Export Data" on any query. In particular, they can use this workflow to download a file with pull logs.

In the future, this can replace the existing "Export to Excel" feature in Maniphest.

For now, we hard-code JSON as the only supported datatype and don't actually make any effort to format the data properly, but this leaves room to add more exporters (CSV, Excel) and data type awareness (integer casting, date formatting, etc) in the future.

For sufficiently large result sets, this will probably time out. At some point, I'll make this use the job queue (like bulk editing) when the export is "large" (affects more than 1K rows?).

Test Plan: Downloaded pull logs in JSON format.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13046, T5954

Differential Revision: https://secure.phabricator.com/D18919
---
 src/__phutil_library_map__.php                |  10 ++
 .../base/PhabricatorApplication.php           |   2 +-
 .../query/DiffusionPullLogSearchEngine.php    |  81 ++++++++++++
 ...PhabricatorApplicationSearchController.php | 123 +++++++++++++++++-
 .../PhabricatorApplicationSearchEngine.php    |  17 +++
 .../export/PhabricatorEpochExportField.php    |   4 +
 .../export/PhabricatorExportField.php         |  27 ++++
 .../export/PhabricatorIDExportField.php       |   4 +
 .../export/PhabricatorPHIDExportField.php     |   4 +
 .../export/PhabricatorStringExportField.php   |   4 +
 10 files changed, 274 insertions(+), 2 deletions(-)
 create mode 100644 src/infrastructure/export/PhabricatorEpochExportField.php
 create mode 100644 src/infrastructure/export/PhabricatorExportField.php
 create mode 100644 src/infrastructure/export/PhabricatorIDExportField.php
 create mode 100644 src/infrastructure/export/PhabricatorPHIDExportField.php
 create mode 100644 src/infrastructure/export/PhabricatorStringExportField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index a134df5e1e..311d643fa5 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2836,12 +2836,14 @@
     'PhabricatorEnv' => 'infrastructure/env/PhabricatorEnv.php',
     'PhabricatorEnvTestCase' => 'infrastructure/env/__tests__/PhabricatorEnvTestCase.php',
     'PhabricatorEpochEditField' => 'applications/transactions/editfield/PhabricatorEpochEditField.php',
+    'PhabricatorEpochExportField' => 'infrastructure/export/PhabricatorEpochExportField.php',
     'PhabricatorEvent' => 'infrastructure/events/PhabricatorEvent.php',
     'PhabricatorEventEngine' => 'infrastructure/events/PhabricatorEventEngine.php',
     'PhabricatorEventListener' => 'infrastructure/events/PhabricatorEventListener.php',
     'PhabricatorEventType' => 'infrastructure/events/constant/PhabricatorEventType.php',
     'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
     'PhabricatorExecFutureFileUploadSource' => 'applications/files/uploadsource/PhabricatorExecFutureFileUploadSource.php',
+    'PhabricatorExportField' => 'infrastructure/export/PhabricatorExportField.php',
     'PhabricatorExtendedPolicyInterface' => 'applications/policy/interface/PhabricatorExtendedPolicyInterface.php',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php',
     'PhabricatorExtensionsSetupCheck' => 'applications/config/check/PhabricatorExtensionsSetupCheck.php',
@@ -3061,6 +3063,7 @@
     'PhabricatorHomeProfileMenuItem' => 'applications/home/menuitem/PhabricatorHomeProfileMenuItem.php',
     'PhabricatorHovercardEngineExtension' => 'applications/search/engineextension/PhabricatorHovercardEngineExtension.php',
     'PhabricatorHovercardEngineExtensionModule' => 'applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php',
+    'PhabricatorIDExportField' => 'infrastructure/export/PhabricatorIDExportField.php',
     'PhabricatorIDsSearchEngineExtension' => 'applications/search/engineextension/PhabricatorIDsSearchEngineExtension.php',
     'PhabricatorIDsSearchField' => 'applications/search/field/PhabricatorIDsSearchField.php',
     'PhabricatorIconDatasource' => 'applications/files/typeahead/PhabricatorIconDatasource.php',
@@ -3412,6 +3415,7 @@
     'PhabricatorPHDConfigOptions' => 'applications/config/option/PhabricatorPHDConfigOptions.php',
     'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
     'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
+    'PhabricatorPHIDExportField' => 'infrastructure/export/PhabricatorPHIDExportField.php',
     'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php',
     'PhabricatorPHIDListEditField' => 'applications/transactions/editfield/PhabricatorPHIDListEditField.php',
     'PhabricatorPHIDListEditType' => 'applications/transactions/edittype/PhabricatorPHIDListEditType.php',
@@ -4177,6 +4181,7 @@
     'PhabricatorStorageSchemaSpec' => 'infrastructure/storage/schema/PhabricatorStorageSchemaSpec.php',
     'PhabricatorStorageSetupCheck' => 'applications/config/check/PhabricatorStorageSetupCheck.php',
     'PhabricatorStringConfigType' => 'applications/config/type/PhabricatorStringConfigType.php',
+    'PhabricatorStringExportField' => 'infrastructure/export/PhabricatorStringExportField.php',
     'PhabricatorStringListConfigType' => 'applications/config/type/PhabricatorStringListConfigType.php',
     'PhabricatorStringListEditField' => 'applications/transactions/editfield/PhabricatorStringListEditField.php',
     'PhabricatorStringSetting' => 'applications/settings/setting/PhabricatorStringSetting.php',
@@ -8255,12 +8260,14 @@
     'PhabricatorEnv' => 'Phobject',
     'PhabricatorEnvTestCase' => 'PhabricatorTestCase',
     'PhabricatorEpochEditField' => 'PhabricatorEditField',
+    'PhabricatorEpochExportField' => 'PhabricatorExportField',
     'PhabricatorEvent' => 'PhutilEvent',
     'PhabricatorEventEngine' => 'Phobject',
     'PhabricatorEventListener' => 'PhutilEventListener',
     'PhabricatorEventType' => 'PhutilEventType',
     'PhabricatorExampleEventListener' => 'PhabricatorEventListener',
     'PhabricatorExecFutureFileUploadSource' => 'PhabricatorFileUploadSource',
+    'PhabricatorExportField' => 'Phobject',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorExtensionsSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorExternalAccount' => array(
@@ -8521,6 +8528,7 @@
     'PhabricatorHomeProfileMenuItem' => 'PhabricatorProfileMenuItem',
     'PhabricatorHovercardEngineExtension' => 'Phobject',
     'PhabricatorHovercardEngineExtensionModule' => 'PhabricatorConfigModule',
+    'PhabricatorIDExportField' => 'PhabricatorExportField',
     'PhabricatorIDsSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
     'PhabricatorIDsSearchField' => 'PhabricatorSearchField',
     'PhabricatorIconDatasource' => 'PhabricatorTypeaheadDatasource',
@@ -8911,6 +8919,7 @@
     'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPHID' => 'Phobject',
     'PhabricatorPHIDConstants' => 'Phobject',
+    'PhabricatorPHIDExportField' => 'PhabricatorExportField',
     'PhabricatorPHIDListEditField' => 'PhabricatorEditField',
     'PhabricatorPHIDListEditType' => 'PhabricatorEditType',
     'PhabricatorPHIDResolver' => 'Phobject',
@@ -9850,6 +9859,7 @@
     'PhabricatorStorageSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'PhabricatorStorageSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorStringConfigType' => 'PhabricatorTextConfigType',
+    'PhabricatorStringExportField' => 'PhabricatorExportField',
     'PhabricatorStringListConfigType' => 'PhabricatorTextListConfigType',
     'PhabricatorStringListEditField' => 'PhabricatorEditField',
     'PhabricatorStringSetting' => 'PhabricatorSetting',
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index 0ae8e75354..4062e4e2fe 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -623,7 +623,7 @@ protected function getBulkRoutePattern($base = null) {
   }
 
   protected function getQueryRoutePattern($base = null) {
-    return $base.'(?:query/(?P<queryKey>[^/]+)/)?';
+    return $base.'(?:query/(?P<queryKey>[^/]+)/(?:(?P<queryAction>[^/]+)/))?';
   }
 
   protected function getProfileMenuRouting($controller) {
diff --git a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
index 85a540f6f5..a0fdc06dfb 100644
--- a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
+++ b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
@@ -47,6 +47,87 @@ protected function buildCustomSearchFields() {
     );
   }
 
+  protected function newExportFields() {
+    return array(
+      id(new PhabricatorIDExportField())
+        ->setKey('id')
+        ->setLabel(pht('ID')),
+      id(new PhabricatorPHIDExportField())
+        ->setKey('phid')
+        ->setLabel(pht('PHID')),
+      id(new PhabricatorPHIDExportField())
+        ->setKey('repositoryPHID')
+        ->setLabel(pht('Repository PHID')),
+      id(new PhabricatorStringExportField())
+        ->setKey('repository')
+        ->setLabel(pht('Repository')),
+      id(new PhabricatorPHIDExportField())
+        ->setKey('pullerPHID')
+        ->setLabel(pht('Puller PHID')),
+      id(new PhabricatorStringExportField())
+        ->setKey('puller')
+        ->setLabel(pht('Puller')),
+      id(new PhabricatorStringExportField())
+        ->setKey('protocol')
+        ->setLabel(pht('Protocol')),
+      id(new PhabricatorStringExportField())
+        ->setKey('result')
+        ->setLabel(pht('Result')),
+      id(new PhabricatorStringExportField())
+        ->setKey('code')
+        ->setLabel(pht('Code')),
+      id(new PhabricatorEpochExportField())
+        ->setKey('date')
+        ->setLabel(pht('Date')),
+    );
+  }
+
+  public function newExport(array $events) {
+    $viewer = $this->requireViewer();
+
+    $phids = array();
+    foreach ($events as $event) {
+      if ($event->getPullerPHID()) {
+        $phids[] = $event->getPullerPHID();
+      }
+    }
+    $handles = $viewer->loadHandles($phids);
+
+    $export = array();
+    foreach ($events as $event) {
+      $repository = $event->getRepository();
+      if ($repository) {
+        $repository_phid = $repository->getPHID();
+        $repository_name = $repository->getDisplayName();
+      } else {
+        $repository_phid = null;
+        $repository_name = null;
+      }
+
+      $puller_phid = $event->getPullerPHID();
+      if ($puller_phid) {
+        $puller_name = $handles[$puller_phid]->getName();
+      } else {
+        $puller_name = null;
+      }
+
+      $export[] = array(
+        'id' => $event->getID(),
+        'phid' => $event->getPHID(),
+        'repositoryPHID' => $repository_phid,
+        'repository' => $repository_name,
+        'pullerPHID' => $puller_phid,
+        'puller' => $puller_name,
+        'protocol' => $event->getRemoteProtocol(),
+        'result' => $event->getResultType(),
+        'code' => $event->getResultCode(),
+        'date' => $event->getEpoch(),
+      );
+    }
+
+    return $export;
+  }
+
   protected function getURI($path) {
     return '/diffusion/pulllog/'.$path;
   }
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index f781e20380..d8f718069c 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -66,6 +66,11 @@ protected function validateDelegatingController() {
   public function processRequest() {
     $this->validateDelegatingController();
 
+    $query_action = $this->getRequest()->getURIData('queryAction');
+    if ($query_action == 'export') {
+      return $this->processExportRequest();
+    }
+
     $key = $this->getQueryKey();
     if ($key == 'edit') {
       return $this->processEditRequest();
@@ -374,6 +379,96 @@ private function processSearchRequest() {
       ->appendChild($body);
   }
 
+  private function processExportRequest() {
+    $viewer = $this->getViewer();
+    $engine = $this->getSearchEngine();
+    $request = $this->getRequest();
+
+    if (!$this->canExport()) {
+      return new Aphront404Response();
+    }
+
+    $query_key = $this->getQueryKey();
+    if ($engine->isBuiltinQuery($query_key)) {
+      $saved_query = $engine->buildSavedQueryFromBuiltin($query_key);
+    } else if ($query_key) {
+      $saved_query = id(new PhabricatorSavedQueryQuery())
+        ->setViewer($viewer)
+        ->withQueryKeys(array($query_key))
+        ->executeOne();
+      if (!$saved_query) {
+        return new Aphront404Response();
+      }
+    }
+
+    $cancel_uri = $engine->getQueryResultsPageURI($query_key);
+
+    $named_query = idx($engine->loadEnabledNamedQueries(), $query_key);
+
+    if ($named_query) {
+      $filename = $named_query->getQueryName();
+    } else {
+      $filename = $engine->getResultTypeDescription();
+    }
+    $filename = phutil_utf8_strtolower($filename);
+    $filename = PhabricatorFile::normalizeFileName($filename);
+
+    if ($request->isFormPost()) {
+      $query = $engine->buildQueryFromSavedQuery($saved_query);
+
+      // NOTE: We aren't reading the pager from the request. Exports always
+      // affect the entire result set.
+      $pager = $engine->newPagerForSavedQuery($saved_query);
+      $pager->setPageSize(0x7FFFFFFF);
+
+      $objects = $engine->executeQuery($query, $pager);
+
+      $extension = 'json';
+      $mime_type = 'application/json';
+      $filename = $filename.'.'.$extension;
+
+      $result = $engine->newExport($objects);
+      $result = id(new PhutilJSON())
+        ->encodeAsList($result);
+
+      $file = PhabricatorFile::newFromFileData(
+        $result,
+        array(
+          'name' => $filename,
+          'authorPHID' => $viewer->getPHID(),
+          'ttl.relative' => phutil_units('15 minutes in seconds'),
+          'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+          'mime-type' => $mime_type,
+        ));
+
+      return $this->newDialog()
+        ->setTitle(pht('Download Results'))
+        ->appendParagraph(
+          pht('Click the download button to download the exported data.'))
+        ->addCancelButton($cancel_uri, pht('Done'))
+        ->setSubmitURI($file->getDownloadURI())
+        ->setDisableWorkflowOnSubmit(true)
+        ->addSubmitButton(pht('Download Results'));
+    }
+
+    $export_form = id(new AphrontFormView())
+      ->setViewer($viewer)
+      ->appendControl(
+        id(new AphrontFormSelectControl())
+          ->setName('format')
+          ->setLabel(pht('Format'))
+          ->setOptions(
+            array(
+              'json' => 'JSON',
+            )));
+
+    return $this->newDialog()
+      ->setTitle(pht('Export Results'))
+      ->appendForm($export_form)
+      ->addCancelButton($cancel_uri)
+      ->addSubmitButton(pht('Continue'));
+  }
+
   private function processEditRequest() {
     $parent = $this->getDelegatingController();
     $request = $this->getRequest();
@@ -720,7 +815,6 @@ private function newBuiltinUseActions() {
       $viewer);
 
     if ($can_use && $is_installed) {
-      $dashboard_uri = '/dashboard/install/';
       $actions[] = id(new PhabricatorActionView())
         ->setIcon('fa-dashboard')
         ->setName(pht('Add to Dashboard'))
@@ -728,6 +822,15 @@ private function newBuiltinUseActions() {
         ->setHref("/dashboard/panel/install/{$engine_class}/{$query_key}/");
     }
 
+    if ($this->canExport()) {
+      $export_uri = $engine->getExportURI($query_key);
+      $actions[] = id(new PhabricatorActionView())
+        ->setIcon('fa-download')
+        ->setName(pht('Export Results'))
+        ->setWorkflow(true)
+        ->setHref($export_uri);
+    }
+
     if ($is_dev) {
       $engine = $this->getSearchEngine();
       $nux_uri = $engine->getQueryBaseURI();
@@ -753,4 +856,22 @@ private function newBuiltinUseActions() {
     return $actions;
   }
 
+  private function canExport() {
+    $engine = $this->getSearchEngine();
+    if (!$engine->canExport()) {
+      return false;
+    }
+
+    // Don't allow logged-out users to perform exports. There's no technical
+    // or policy reason they can't, but we don't normally give them access
+    // to write files or jobs. For now, just err on the side of caution.
+
+    $viewer = $this->getViewer();
+    if (!$viewer->getPHID()) {
+      return false;
+    }
+
+    return true;
+  }
+
 }
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index c0497a0c03..c0fb6ce976 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -413,6 +413,10 @@ public function getQueryBaseURI() {
     return $this->getURI('');
   }
 
+  public function getExportURI($query_key) {
+    return $this->getURI('query/'.$query_key.'/export/');
+  }
+
 
   /**
    * Return the URI to a path within the application. Used to construct default
@@ -1441,4 +1445,17 @@ public function newUseResultsActions(PhabricatorSavedQuery $saved) {
     return array();
   }
 
+
+/* -(  Export  )------------------------------------------------------------- */
+
+
+  public function canExport() {
+    $fields = $this->newExportFields();
+    return (bool)$fields;
+  }
+
+  protected function newExportFields() {
+    return array();
+  }
+
 }
diff --git a/src/infrastructure/export/PhabricatorEpochExportField.php b/src/infrastructure/export/PhabricatorEpochExportField.php
new file mode 100644
index 0000000000..e212dd5d8c
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorEpochExportField.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorEpochExportField
+  extends PhabricatorExportField {}
diff --git a/src/infrastructure/export/PhabricatorExportField.php b/src/infrastructure/export/PhabricatorExportField.php
new file mode 100644
index 0000000000..5c128eff89
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorExportField.php
@@ -0,0 +1,27 @@
+<?php
+
+abstract class PhabricatorExportField
+  extends Phobject {
+
+  private $key;
+  private $label;
+
+  public function setKey($key) {
+    $this->key = $key;
+    return $this;
+  }
+
+  public function getKey() {
+    return $this->key;
+  }
+
+  public function setLabel($label) {
+    $this->label = $label;
+    return $this;
+  }
+
+  public function getLabel() {
+    return $this->label;
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorIDExportField.php b/src/infrastructure/export/PhabricatorIDExportField.php
new file mode 100644
index 0000000000..bf59e3567c
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorIDExportField.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorIDExportField
+  extends PhabricatorExportField {}
diff --git a/src/infrastructure/export/PhabricatorPHIDExportField.php b/src/infrastructure/export/PhabricatorPHIDExportField.php
new file mode 100644
index 0000000000..7c08ae0226
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorPHIDExportField.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorPHIDExportField
+  extends PhabricatorExportField {}
diff --git a/src/infrastructure/export/PhabricatorStringExportField.php b/src/infrastructure/export/PhabricatorStringExportField.php
new file mode 100644
index 0000000000..e8d30c84d0
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorStringExportField.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorStringExportField
+  extends PhabricatorExportField {}

From a79bb55f3f6bb6a026b29c137e2f4721d691d54c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 17:15:49 -0800
Subject: [PATCH 416/865] Support CSV, JSON, and tab-separated text as export
 formats

Summary: Depends on D18919. Ref T13046. Adds some simple modular exporters.

Test Plan: Exported pull logs in each format.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13046

Differential Revision: https://secure.phabricator.com/D18934
---
 src/__phutil_library_map__.php                |  10 ++
 .../query/DiffusionPullLogSearchEngine.php    |   2 +-
 ...PhabricatorApplicationSearchController.php | 105 ++++++++++++------
 .../PhabricatorApplicationSearchEngine.php    |   4 +
 .../export/PhabricatorCSVExportFormat.php     |  47 ++++++++
 .../export/PhabricatorEpochExportField.php    |  25 ++++-
 .../export/PhabricatorExportField.php         |   8 ++
 .../export/PhabricatorExportFormat.php        |  51 +++++++++
 .../export/PhabricatorIDExportField.php       |   8 +-
 .../export/PhabricatorIntExportField.php      |  10 ++
 .../export/PhabricatorJSONExportFormat.php    |  43 +++++++
 .../export/PhabricatorTextExportFormat.php    |  43 +++++++
 12 files changed, 319 insertions(+), 37 deletions(-)
 create mode 100644 src/infrastructure/export/PhabricatorCSVExportFormat.php
 create mode 100644 src/infrastructure/export/PhabricatorExportFormat.php
 create mode 100644 src/infrastructure/export/PhabricatorIntExportField.php
 create mode 100644 src/infrastructure/export/PhabricatorJSONExportFormat.php
 create mode 100644 src/infrastructure/export/PhabricatorTextExportFormat.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 311d643fa5..2f09ae2442 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2231,6 +2231,7 @@
     'PhabricatorBulkEngine' => 'applications/transactions/bulk/PhabricatorBulkEngine.php',
     'PhabricatorBulkManagementMakeSilentWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php',
     'PhabricatorBulkManagementWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php',
+    'PhabricatorCSVExportFormat' => 'infrastructure/export/PhabricatorCSVExportFormat.php',
     'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
     'PhabricatorCacheEngine' => 'applications/system/engine/PhabricatorCacheEngine.php',
     'PhabricatorCacheEngineExtension' => 'applications/system/engine/PhabricatorCacheEngineExtension.php',
@@ -2844,6 +2845,7 @@
     'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
     'PhabricatorExecFutureFileUploadSource' => 'applications/files/uploadsource/PhabricatorExecFutureFileUploadSource.php',
     'PhabricatorExportField' => 'infrastructure/export/PhabricatorExportField.php',
+    'PhabricatorExportFormat' => 'infrastructure/export/PhabricatorExportFormat.php',
     'PhabricatorExtendedPolicyInterface' => 'applications/policy/interface/PhabricatorExtendedPolicyInterface.php',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php',
     'PhabricatorExtensionsSetupCheck' => 'applications/config/check/PhabricatorExtensionsSetupCheck.php',
@@ -3087,6 +3089,7 @@
     'PhabricatorInlineSummaryView' => 'infrastructure/diff/view/PhabricatorInlineSummaryView.php',
     'PhabricatorInstructionsEditField' => 'applications/transactions/editfield/PhabricatorInstructionsEditField.php',
     'PhabricatorIntConfigType' => 'applications/config/type/PhabricatorIntConfigType.php',
+    'PhabricatorIntExportField' => 'infrastructure/export/PhabricatorIntExportField.php',
     'PhabricatorInternalSetting' => 'applications/settings/setting/PhabricatorInternalSetting.php',
     'PhabricatorInternationalizationManagementExtractWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php',
     'PhabricatorInternationalizationManagementWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementWorkflow.php',
@@ -3096,6 +3099,7 @@
     'PhabricatorIteratorFileUploadSource' => 'applications/files/uploadsource/PhabricatorIteratorFileUploadSource.php',
     'PhabricatorJIRAAuthProvider' => 'applications/auth/provider/PhabricatorJIRAAuthProvider.php',
     'PhabricatorJSONConfigType' => 'applications/config/type/PhabricatorJSONConfigType.php',
+    'PhabricatorJSONExportFormat' => 'infrastructure/export/PhabricatorJSONExportFormat.php',
     'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorJiraIssueHasObjectEdgeType.php',
     'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php',
@@ -4245,6 +4249,7 @@
     'PhabricatorTextAreaEditField' => 'applications/transactions/editfield/PhabricatorTextAreaEditField.php',
     'PhabricatorTextConfigType' => 'applications/config/type/PhabricatorTextConfigType.php',
     'PhabricatorTextEditField' => 'applications/transactions/editfield/PhabricatorTextEditField.php',
+    'PhabricatorTextExportFormat' => 'infrastructure/export/PhabricatorTextExportFormat.php',
     'PhabricatorTextListConfigType' => 'applications/config/type/PhabricatorTextListConfigType.php',
     'PhabricatorTime' => 'infrastructure/time/PhabricatorTime.php',
     'PhabricatorTimeFormatSetting' => 'applications/settings/setting/PhabricatorTimeFormatSetting.php',
@@ -7564,6 +7569,7 @@
     'PhabricatorBulkEngine' => 'Phobject',
     'PhabricatorBulkManagementMakeSilentWorkflow' => 'PhabricatorBulkManagementWorkflow',
     'PhabricatorBulkManagementWorkflow' => 'PhabricatorManagementWorkflow',
+    'PhabricatorCSVExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorCacheDAO' => 'PhabricatorLiskDAO',
     'PhabricatorCacheEngine' => 'Phobject',
     'PhabricatorCacheEngineExtension' => 'Phobject',
@@ -8268,6 +8274,7 @@
     'PhabricatorExampleEventListener' => 'PhabricatorEventListener',
     'PhabricatorExecFutureFileUploadSource' => 'PhabricatorFileUploadSource',
     'PhabricatorExportField' => 'Phobject',
+    'PhabricatorExportFormat' => 'Phobject',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorExtensionsSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorExternalAccount' => array(
@@ -8551,6 +8558,7 @@
     'PhabricatorInlineSummaryView' => 'AphrontView',
     'PhabricatorInstructionsEditField' => 'PhabricatorEditField',
     'PhabricatorIntConfigType' => 'PhabricatorTextConfigType',
+    'PhabricatorIntExportField' => 'PhabricatorExportField',
     'PhabricatorInternalSetting' => 'PhabricatorSetting',
     'PhabricatorInternationalizationManagementExtractWorkflow' => 'PhabricatorInternationalizationManagementWorkflow',
     'PhabricatorInternationalizationManagementWorkflow' => 'PhabricatorManagementWorkflow',
@@ -8560,6 +8568,7 @@
     'PhabricatorIteratorFileUploadSource' => 'PhabricatorFileUploadSource',
     'PhabricatorJIRAAuthProvider' => 'PhabricatorOAuth1AuthProvider',
     'PhabricatorJSONConfigType' => 'PhabricatorTextConfigType',
+    'PhabricatorJSONExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorJavelinLinter' => 'ArcanistLinter',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorJumpNavHandler' => 'Phobject',
@@ -9922,6 +9931,7 @@
     'PhabricatorTextAreaEditField' => 'PhabricatorEditField',
     'PhabricatorTextConfigType' => 'PhabricatorConfigType',
     'PhabricatorTextEditField' => 'PhabricatorEditField',
+    'PhabricatorTextExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorTextListConfigType' => 'PhabricatorTextConfigType',
     'PhabricatorTime' => 'Phobject',
     'PhabricatorTimeFormatSetting' => 'PhabricatorSelectSetting',
diff --git a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
index a0fdc06dfb..8d6102d4eb 100644
--- a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
+++ b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
@@ -73,7 +73,7 @@ protected function newExportFields() {
       id(new PhabricatorStringExportField())
         ->setKey('result')
         ->setLabel(pht('Result')),
-      id(new PhabricatorStringExportField())
+      id(new PhabricatorIntExportField())
         ->setKey('code')
         ->setLabel(pht('Code')),
       id(new PhabricatorEpochExportField())
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index d8f718069c..d241a046a1 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -413,42 +413,80 @@ private function processExportRequest() {
     $filename = phutil_utf8_strtolower($filename);
     $filename = PhabricatorFile::normalizeFileName($filename);
 
+    $formats = PhabricatorExportFormat::getAllEnabledExportFormats();
+    $format_options = mpull($formats, 'getExportFormatName');
+
+    $errors = array();
+
+    $e_format = null;
     if ($request->isFormPost()) {
-      $query = $engine->buildQueryFromSavedQuery($saved_query);
+      $format_key = $request->getStr('format');
+      $format = idx($formats, $format_key);
 
-      // NOTE: We aren't reading the pager from the request. Exports always
-      // affect the entire result set.
-      $pager = $engine->newPagerForSavedQuery($saved_query);
-      $pager->setPageSize(0x7FFFFFFF);
+      if (!$format) {
+        $e_format = pht('Invalid');
+        $errors[] = pht('Choose a valid export format.');
+      }
 
-      $objects = $engine->executeQuery($query, $pager);
+      if (!$errors) {
+        $query = $engine->buildQueryFromSavedQuery($saved_query);
 
-      $extension = 'json';
-      $mime_type = 'application/json';
-      $filename = $filename.'.'.$extension;
+        // NOTE: We aren't reading the pager from the request. Exports always
+        // affect the entire result set.
+        $pager = $engine->newPagerForSavedQuery($saved_query);
+        $pager->setPageSize(0x7FFFFFFF);
 
-      $result = $engine->newExport($objects);
-      $result = id(new PhutilJSON())
-        ->encodeAsList($result);
+        $objects = $engine->executeQuery($query, $pager);
 
-      $file = PhabricatorFile::newFromFileData(
-        $result,
-        array(
-          'name' => $filename,
-          'authorPHID' => $viewer->getPHID(),
-          'ttl.relative' => phutil_units('15 minutes in seconds'),
-          'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
-          'mime-type' => $mime_type,
-        ));
+        $extension = $format->getFileExtension();
+        $mime_type = $format->getMIMEContentType();
+        $filename = $filename.'.'.$extension;
+
+        $format = clone $format;
+        $format->setViewer($viewer);
 
-      return $this->newDialog()
-        ->setTitle(pht('Download Results'))
-        ->appendParagraph(
-          pht('Click the download button to download the exported data.'))
-        ->addCancelButton($cancel_uri, pht('Done'))
-        ->setSubmitURI($file->getDownloadURI())
-        ->setDisableWorkflowOnSubmit(true)
-        ->addSubmitButton(pht('Download Results'));
+        $export_data = $engine->newExport($objects);
+
+        if (count($export_data) !== count($objects)) {
+          throw new Exception(
+            pht(
+              'Search engine exported the wrong number of objects, expected '.
+              '%s but got %s.',
+              phutil_count($objects),
+              phutil_count($export_data)));
+        }
+
+        $objects = array_values($objects);
+        $export_data = array_values($export_data);
+
+        $field_list = $engine->newExportFieldList();
+        $field_list = mpull($field_list, null, 'getKey');
+
+        for ($ii = 0; $ii < count($objects); $ii++) {
+          $format->addObject($objects[$ii], $field_list, $export_data[$ii]);
+        }
+
+        $export_result = $format->newFileData();
+
+        $file = PhabricatorFile::newFromFileData(
+          $export_result,
+          array(
+            'name' => $filename,
+            'authorPHID' => $viewer->getPHID(),
+            'ttl.relative' => phutil_units('15 minutes in seconds'),
+            'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+            'mime-type' => $mime_type,
+          ));
+
+        return $this->newDialog()
+          ->setTitle(pht('Download Results'))
+          ->appendParagraph(
+            pht('Click the download button to download the exported data.'))
+          ->addCancelButton($cancel_uri, pht('Done'))
+          ->setSubmitURI($file->getDownloadURI())
+          ->setDisableWorkflowOnSubmit(true)
+          ->addSubmitButton(pht('Download Data'));
+      }
     }
 
     $export_form = id(new AphrontFormView())
@@ -457,13 +495,12 @@ private function processExportRequest() {
         id(new AphrontFormSelectControl())
           ->setName('format')
           ->setLabel(pht('Format'))
-          ->setOptions(
-            array(
-              'json' => 'JSON',
-            )));
+          ->setError($e_format)
+          ->setOptions($format_options));
 
     return $this->newDialog()
       ->setTitle(pht('Export Results'))
+      ->setErrors($errors)
       ->appendForm($export_form)
       ->addCancelButton($cancel_uri)
       ->addSubmitButton(pht('Continue'));
@@ -826,7 +863,7 @@ private function newBuiltinUseActions() {
       $export_uri = $engine->getExportURI($query_key);
       $actions[] = id(new PhabricatorActionView())
         ->setIcon('fa-download')
-        ->setName(pht('Export Results'))
+        ->setName(pht('Export Data'))
         ->setWorkflow(true)
         ->setHref($export_uri);
     }
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index c0fb6ce976..33efd890bb 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1454,6 +1454,10 @@ public function canExport() {
     return (bool)$fields;
   }
 
+  final public function newExportFieldList() {
+    return $this->newExportFields();
+  }
+
   protected function newExportFields() {
     return array();
   }
diff --git a/src/infrastructure/export/PhabricatorCSVExportFormat.php b/src/infrastructure/export/PhabricatorCSVExportFormat.php
new file mode 100644
index 0000000000..d9662467ec
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorCSVExportFormat.php
@@ -0,0 +1,47 @@
+<?php
+
+final class PhabricatorCSVExportFormat
+  extends PhabricatorExportFormat {
+
+  const EXPORTKEY = 'csv';
+
+  private $rows = array();
+
+  public function getExportFormatName() {
+    return pht('Comma-Separated Values (.csv)');
+  }
+
+  public function isExportFormatEnabled() {
+    return true;
+  }
+
+  public function getFileExtension() {
+    return 'csv';
+  }
+
+  public function getMIMEContentType() {
+    return 'text/csv';
+  }
+
+  public function addObject($object, array $fields, array $map) {
+    $values = array();
+    foreach ($fields as $key => $field) {
+      $value = $map[$key];
+      $value = $field->getTextValue($value);
+
+      if (preg_match('/\s|,|\"/', $value)) {
+        $value = str_replace('"', '""', $value);
+        $value = '"'.$value.'"';
+      }
+
+      $values[] = $value;
+    }
+
+    $this->rows[] = implode(',', $values);
+  }
+
+  public function newFileData() {
+    return implode("\n", $this->rows);
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorEpochExportField.php b/src/infrastructure/export/PhabricatorEpochExportField.php
index e212dd5d8c..a19e60b50e 100644
--- a/src/infrastructure/export/PhabricatorEpochExportField.php
+++ b/src/infrastructure/export/PhabricatorEpochExportField.php
@@ -1,4 +1,27 @@
 <?php
 
 final class PhabricatorEpochExportField
-  extends PhabricatorExportField {}
+  extends PhabricatorExportField {
+
+  private $zone;
+
+  public function getTextValue($value) {
+    if (!isset($this->zone)) {
+      $this->zone = new DateTimeZone('UTC');
+    }
+
+    try {
+      $date = new DateTime('@'.$value);
+    } catch (Exception $ex) {
+      return null;
+    }
+
+    $date->setTimezone($this->zone);
+    return $date->format('c');
+  }
+
+  public function getNaturalValue($value) {
+    return (int)$value;
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorExportField.php b/src/infrastructure/export/PhabricatorExportField.php
index 5c128eff89..3efb7a8b9a 100644
--- a/src/infrastructure/export/PhabricatorExportField.php
+++ b/src/infrastructure/export/PhabricatorExportField.php
@@ -24,4 +24,12 @@ public function getLabel() {
     return $this->label;
   }
 
+  public function getTextValue($value) {
+    return (string)$this->getNaturalValue($value);
+  }
+
+  public function getNaturalValue($value) {
+    return $value;
+  }
+
 }
diff --git a/src/infrastructure/export/PhabricatorExportFormat.php b/src/infrastructure/export/PhabricatorExportFormat.php
new file mode 100644
index 0000000000..a1da4e90d8
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorExportFormat.php
@@ -0,0 +1,51 @@
+<?php
+
+abstract class PhabricatorExportFormat
+  extends Phobject {
+
+  private $viewer;
+
+  final public function getExportFormatKey() {
+    return $this->getPhobjectClassConstant('EXPORTKEY');
+  }
+
+  final public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  abstract public function getExportFormatName();
+  abstract public function getMIMEContentType();
+  abstract public function getFileExtension();
+
+  abstract public function addObject($object, array $fields, array $map);
+  abstract public function newFileData();
+
+  public function isExportFormatEnabled() {
+    return true;
+  }
+
+  final public static function getAllExportFormats() {
+    return id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->setUniqueMethod('getExportFormatKey')
+      ->execute();
+  }
+
+  final public static function getAllEnabledExportFormats() {
+    $formats = self::getAllExportFormats();
+
+    foreach ($formats as $key => $format) {
+      if (!$format->isExportFormatEnabled()) {
+        unset($formats[$key]);
+      }
+    }
+
+    return $formats;
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorIDExportField.php b/src/infrastructure/export/PhabricatorIDExportField.php
index bf59e3567c..5b29fdb21d 100644
--- a/src/infrastructure/export/PhabricatorIDExportField.php
+++ b/src/infrastructure/export/PhabricatorIDExportField.php
@@ -1,4 +1,10 @@
 <?php
 
 final class PhabricatorIDExportField
-  extends PhabricatorExportField {}
+  extends PhabricatorExportField {
+
+  public function getNaturalValue($value) {
+    return (int)$value;
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorIntExportField.php b/src/infrastructure/export/PhabricatorIntExportField.php
new file mode 100644
index 0000000000..3363f9b5d5
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorIntExportField.php
@@ -0,0 +1,10 @@
+<?php
+
+final class PhabricatorIntExportField
+  extends PhabricatorExportField {
+
+  public function getNaturalValue($value) {
+    return (int)$value;
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorJSONExportFormat.php b/src/infrastructure/export/PhabricatorJSONExportFormat.php
new file mode 100644
index 0000000000..74c64891c4
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorJSONExportFormat.php
@@ -0,0 +1,43 @@
+<?php
+
+final class PhabricatorJSONExportFormat
+  extends PhabricatorExportFormat {
+
+  const EXPORTKEY = 'json';
+
+  private $objects = array();
+
+  public function getExportFormatName() {
+    return 'JSON (.json)';
+  }
+
+  public function isExportFormatEnabled() {
+    return true;
+  }
+
+  public function getFileExtension() {
+    return 'json';
+  }
+
+  public function getMIMEContentType() {
+    return 'application/json';
+  }
+
+  public function addObject($object, array $fields, array $map) {
+    $values = array();
+    foreach ($fields as $key => $field) {
+      $value = $map[$key];
+      $value = $field->getNaturalValue($value);
+
+      $values[$key] = $value;
+    }
+
+    $this->objects[] = $values;
+  }
+
+  public function newFileData() {
+    return id(new PhutilJSON())
+      ->encodeAsList($this->objects);
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorTextExportFormat.php b/src/infrastructure/export/PhabricatorTextExportFormat.php
new file mode 100644
index 0000000000..ec308f2eb5
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorTextExportFormat.php
@@ -0,0 +1,43 @@
+<?php
+
+final class PhabricatorTextExportFormat
+  extends PhabricatorExportFormat {
+
+  const EXPORTKEY = 'text';
+
+  private $rows = array();
+
+  public function getExportFormatName() {
+    return 'Tab-Separated Text (.txt)';
+  }
+
+  public function isExportFormatEnabled() {
+    return true;
+  }
+
+  public function getFileExtension() {
+    return 'txt';
+  }
+
+  public function getMIMEContentType() {
+    return 'text/plain';
+  }
+
+  public function addObject($object, array $fields, array $map) {
+    $values = array();
+    foreach ($fields as $key => $field) {
+      $value = $map[$key];
+      $value = $field->getTextValue($value);
+      $value = addcslashes($value, "\0..\37\\\177..\377");
+
+      $values[] = $value;
+    }
+
+    $this->rows[] = implode("\t", $values);
+  }
+
+  public function newFileData() {
+    return implode("\n", $this->rows)."\n";
+  }
+
+}

From 0ec83132a8ecf52109c757edf7d2d5259d6e2dc8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 17:48:42 -0800
Subject: [PATCH 417/865] Support basic export of user accounts

Summary:
Depends on D18934. Ref T13046. Add support for the new export flow to a second application.

My goal here is mostly just to make sure that this is general enough to work in more than one place, and exporting user accounts seems plausible as a useful feature, although we do see occasional requests for this feature exactly (like <https://discourse.phabricator-community.org/t/users-export-to-csv/968>).

The exported data may not truly be useful for much (no disabled/admin/verified/MFA flags, no external account data, no email addresses for policy reasons) but we can expand it as use cases arise.

Test Plan: Exported user accounts in several formats.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13046

Differential Revision: https://secure.phabricator.com/D18935
---
 .../base/PhabricatorApplication.php           |  2 +-
 .../PhabricatorPeopleApplication.php          |  4 +-
 .../PhabricatorPeopleListController.php       |  2 +-
 .../query/PhabricatorPeopleSearchEngine.php   | 37 +++++++++++++++++++
 ...PhabricatorApplicationSearchController.php |  9 +++--
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index 4062e4e2fe..420d126507 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -623,7 +623,7 @@ protected function getBulkRoutePattern($base = null) {
   }
 
   protected function getQueryRoutePattern($base = null) {
-    return $base.'(?:query/(?P<queryKey>[^/]+)/(?:(?P<queryAction>[^/]+)/))?';
+    return $base.'(?:query/(?P<queryKey>[^/]+)/(?:(?P<queryAction>[^/]+)/)?)?';
   }
 
   protected function getProfileMenuRouting($controller) {
diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php
index dde82f1d3a..28405ca92c 100644
--- a/src/applications/people/application/PhabricatorPeopleApplication.php
+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
@@ -41,7 +41,7 @@ public function canUninstall() {
   public function getRoutes() {
     return array(
       '/people/' => array(
-        '(query/(?P<key>[^/]+)/)?' => 'PhabricatorPeopleListController',
+        $this->getQueryRoutePattern() => 'PhabricatorPeopleListController',
         'logs/(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorPeopleLogsController',
         'invite/' => array(
@@ -76,7 +76,7 @@ public function getRoutes() {
           'PhabricatorPeopleProfilePictureController',
         'manage/(?P<id>[1-9]\d*)/' =>
           'PhabricatorPeopleProfileManageController',
-        ),
+      ),
       '/p/(?P<username>[\w._-]+)/' => array(
         '' => 'PhabricatorPeopleProfileViewController',
         'item/' => $this->getProfileMenuRouting(
diff --git a/src/applications/people/controller/PhabricatorPeopleListController.php b/src/applications/people/controller/PhabricatorPeopleListController.php
index edcfc7ba0f..511899070c 100644
--- a/src/applications/people/controller/PhabricatorPeopleListController.php
+++ b/src/applications/people/controller/PhabricatorPeopleListController.php
@@ -16,7 +16,7 @@ public function handleRequest(AphrontRequest $request) {
       PeopleBrowseUserDirectoryCapability::CAPABILITY);
 
     $controller = id(new PhabricatorApplicationSearchController())
-      ->setQueryKey($request->getURIData('key'))
+      ->setQueryKey($request->getURIData('queryKey'))
       ->setSearchEngine(new PhabricatorPeopleSearchEngine())
       ->setNavigation($this->buildSideNavView());
 
diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
index 0a4367d367..db2256a8b8 100644
--- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
@@ -320,4 +320,41 @@ protected function renderResultList(
     return $result;
   }
 
+  protected function newExportFields() {
+    return array(
+      id(new PhabricatorIDExportField())
+        ->setKey('id')
+        ->setLabel(pht('ID')),
+      id(new PhabricatorPHIDExportField())
+        ->setKey('phid')
+        ->setLabel(pht('PHID')),
+      id(new PhabricatorStringExportField())
+        ->setKey('username')
+        ->setLabel(pht('Username')),
+      id(new PhabricatorStringExportField())
+        ->setKey('realName')
+        ->setLabel(pht('Real Name')),
+      id(new PhabricatorEpochExportField())
+        ->setKey('created')
+        ->setLabel(pht('Date Created')),
+    );
+  }
+
+  public function newExport(array $users) {
+    $viewer = $this->requireViewer();
+
+    $export = array();
+    foreach ($users as $user) {
+      $export[] = array(
+        'id' => $user->getID(),
+        'phid' => $user->getPHID(),
+        'username' => $user->getUsername(),
+        'realName' => $user->getRealName(),
+        'created' => $user->getDateCreated(),
+      );
+    }
+
+    return $export;
+  }
+
 }
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index d241a046a1..d3b05d1e3e 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -396,9 +396,12 @@ private function processExportRequest() {
         ->setViewer($viewer)
         ->withQueryKeys(array($query_key))
         ->executeOne();
-      if (!$saved_query) {
-        return new Aphront404Response();
-      }
+    } else {
+      $saved_query = null;
+    }
+
+    if (!$saved_query) {
+      return new Aphront404Response();
     }
 
     $cancel_uri = $engine->getQueryResultsPageURI($query_key);

From c37b6c6633972519e8dec8b10fd730842d1dea7b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 18:21:00 -0800
Subject: [PATCH 418/865] When users click a symbol in Differential to jump to
 the definition, include path/line context

Summary:
Ref T13047. In some reasonable cases, knowing the path and line number where a symbol appears is useful in ranking or filtering the set of matching symbols.

Giving symbol sources more information can't hurt, and it's generally free for us to include this context since we just need to grab it out of the document and pass it along.

We can't always get this data (for example, if a user types `s idx` into global search, we have no clue) but this is similar to other types of context which are only available sometimes (like which repository a symbol appears in).

Test Plan: Command-clicked some symbols in 1-up (unified) and 2-up (side-by-side) diff views with symbol indexes configured. Got accurate path and line information in the URI I was redirected to.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13047

Differential Revision: https://secure.phabricator.com/D18936
---
 resources/celerity/map.php                    | 18 +++---
 .../view/DifferentialChangesetDetailView.php  |  1 +
 .../repository/repository-crossreference.js   | 62 +++++++++++++++++++
 3 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 1d8c9f4b64..f88fc5857e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
-    'differential.pkg.js' => '500a75c5',
+    'differential.pkg.js' => 'c1af2de3',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -443,7 +443,7 @@
     'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf',
     'rsrc/js/application/releeph/releeph-request-state-change.js' => 'a0b57eb8',
     'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'de2e896f',
-    'rsrc/js/application/repository/repository-crossreference.js' => '7fe9bc12',
+    'rsrc/js/application/repository/repository-crossreference.js' => 'c5627622',
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
     'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
@@ -692,7 +692,7 @@
     'javelin-behavior-reorder-applications' => '76b9fc3e',
     'javelin-behavior-reorder-columns' => 'e1d25dfb',
     'javelin-behavior-reorder-profile-menu-items' => 'e2e0a072',
-    'javelin-behavior-repository-crossreference' => '7fe9bc12',
+    'javelin-behavior-repository-crossreference' => 'c5627622',
     'javelin-behavior-scrollbar' => '834a1173',
     'javelin-behavior-search-reorder-queries' => 'e9581f08',
     'javelin-behavior-select-content' => 'bf5374ef',
@@ -1555,12 +1555,6 @@
     '7f243deb' => array(
       'javelin-install',
     ),
-    '7fe9bc12' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-uri',
-    ),
     '834a1173' => array(
       'javelin-behavior',
       'javelin-scrollbar',
@@ -1928,6 +1922,12 @@
       'javelin-stratcom',
       'phabricator-tooltip',
     ),
+    'c5627622' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-uri',
+    ),
     'c587b80f' => array(
       'javelin-install',
     ),
diff --git a/src/applications/differential/view/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php
index a1a3de26bb..d4a13745dc 100644
--- a/src/applications/differential/view/DifferentialChangesetDetailView.php
+++ b/src/applications/differential/view/DifferentialChangesetDetailView.php
@@ -204,6 +204,7 @@ public function render() {
           'loaded' => $this->getLoaded(),
           'undoTemplates' => hsprintf('%s', $renderer->renderUndoTemplates()),
           'displayPath' => hsprintf('%s', $display_parts),
+          'path' => $display_filename,
           'icon' => $display_icon,
         ),
         'class' => $class,
diff --git a/webroot/rsrc/js/application/repository/repository-crossreference.js b/webroot/rsrc/js/application/repository/repository-crossreference.js
index 138ce4bf3e..882ccd2960 100644
--- a/webroot/rsrc/js/application/repository/repository-crossreference.js
+++ b/webroot/rsrc/js/application/repository/repository-crossreference.js
@@ -96,6 +96,17 @@ JX.behavior('repository-crossreference', function(config, statics) {
     if (target.hasAttribute('data-symbol-name')) {
       symbol = target.getAttribute('data-symbol-name');
     }
+
+    var line = getLineNumber(target);
+    if (line !== null) {
+      query.line = line;
+    }
+
+    var path = getPath(target);
+    if (path !== null) {
+      query.path = path;
+    }
+
     var uri = JX.$U('/diffusion/symbol/' + symbol + '/');
     uri.addQueryParams(query);
     window.open(uri);
@@ -111,6 +122,57 @@ JX.behavior('repository-crossreference', function(config, statics) {
     }
   }
 
+  function getLineNumber(target) {
+
+    // Figure out the line number by finding the most recent "<th />" in this
+    // row with a number in it. We may need to skip over one "<th />" if the
+    // diff is being displayed in unified mode.
+
+    var cell = JX.DOM.findAbove(target, 'td');
+    if (!cell) {
+      return null;
+    }
+
+    var row = JX.DOM.findAbove(target, 'tr');
+    if (!row) {
+      return null;
+    }
+
+    var ii;
+
+    var cell_list = [];
+    for (ii = 0; ii < row.childNodes.length; ii++) {
+      cell_list.push(row.childNodes[ii]);
+    }
+    cell_list.reverse();
+
+    var found = false;
+    for (ii = 0; ii < cell_list.length; ii++) {
+      if (cell_list[ii] === cell) {
+        found = true;
+      }
+
+      if (found && JX.DOM.isType(cell_list[ii], 'th')) {
+        var int_value = parseInt(cell_list[ii].textContent, 10);
+        if (int_value) {
+          return int_value;
+        }
+      }
+    }
+
+    return null;
+  }
+
+  function getPath(target) {
+    var changeset = JX.DOM.findAbove(target, 'div', 'differential-changeset');
+
+    if (!changeset) {
+      return null;
+    }
+
+    return JX.Stratcom.getData(changeset).path;
+  }
+
   if (config.container) {
     link(JX.$(config.container), config.lang);
   } else if (config.section) {

From d606eb1c38b1ba77e4b539e9c9da053c63afa621 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 19:16:22 -0800
Subject: [PATCH 419/865] When available, pass path, line and repository hints
 to external symbol queries

Summary:
Depends on D18936. Ref T13047. Third parties can define external symbol sources that let users jump to PHP or Python documentation or query some server.

Give these queries more information so they can try to get better results: the path and line where the symbol appeared, and any known repository scope.

Test Plan: Wrote a fake external source that used this data, command-clicked a symbol in Differential, saw a fake external symbol result.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13047

Differential Revision: https://secure.phabricator.com/D18937
---
 .../controller/DiffusionSymbolController.php  | 41 ++++++++++++++++---
 .../symbol/DiffusionExternalSymbolQuery.php   | 38 +++++++++++++++++
 2 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionSymbolController.php b/src/applications/diffusion/controller/DiffusionSymbolController.php
index 3aaccffd22..20c25dad82 100644
--- a/src/applications/diffusion/controller/DiffusionSymbolController.php
+++ b/src/applications/diffusion/controller/DiffusionSymbolController.php
@@ -22,6 +22,7 @@ public function handleRequest(AphrontRequest $request) {
       $query->setLanguage($request->getStr('lang'));
     }
 
+    $repos = array();
     if ($request->getStr('repositories')) {
       $phids = $request->getStr('repositories');
       $phids = explode(',', $phids);
@@ -33,9 +34,9 @@ public function handleRequest(AphrontRequest $request) {
           ->withPHIDs($phids)
           ->execute();
 
-        $repos = mpull($repos, 'getPHID');
-        if ($repos) {
-          $query->withRepositoryPHIDs($repos);
+        $repo_phids = mpull($repos, 'getPHID');
+        if ($repo_phids) {
+          $query->withRepositoryPHIDs($repo_phids);
         }
       }
     }
@@ -45,7 +46,6 @@ public function handleRequest(AphrontRequest $request) {
 
     $symbols = $query->execute();
 
-
     $external_query = id(new DiffusionExternalSymbolQuery())
       ->withNames(array($name));
 
@@ -61,13 +61,44 @@ public function handleRequest(AphrontRequest $request) {
       $external_query->withLanguages(array($request->getStr('lang')));
     }
 
+    if ($request->getStr('path')) {
+      $external_query->withPaths(array($request->getStr('path')));
+    }
+
+    if ($request->getInt('line')) {
+      $external_query->withLines(array($request->getInt('line')));
+    }
+
+    if ($repos) {
+      $external_query->withRepositories($repos);
+    }
+
     $external_sources = id(new PhutilClassMapQuery())
       ->setAncestorClass('DiffusionExternalSymbolsSource')
       ->execute();
 
     $results = array($symbols);
     foreach ($external_sources as $source) {
-      $results[] = $source->executeQuery($external_query);
+      $source_results = $source->executeQuery($external_query);
+
+      if (!is_array($source_results)) {
+        throw new Exception(
+          pht(
+            'Expected a list of results from external symbol source "%s".',
+            get_class($source)));
+      }
+
+      try {
+        assert_instances_of($source_results, 'PhabricatorRepositorySymbol');
+      } catch (InvalidArgumentException $ex) {
+        throw new Exception(
+          pht(
+            'Expected a list of PhabricatorRepositorySymbol objects '.
+            'from external symbol source "%s".',
+            get_class($source)));
+      }
+
+      $results[] = $source_results;
     }
     $symbols = array_mergev($results);
 
diff --git a/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php b/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
index d32f1b3f64..f1f916d9d4 100644
--- a/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
+++ b/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
@@ -1,45 +1,83 @@
 <?php
 
 final class DiffusionExternalSymbolQuery extends Phobject {
+
   private $languages = array();
   private $types = array();
   private $names = array();
   private $contexts = array();
+  private $paths = array();
+  private $lines = array();
+  private $repositories = array();
 
   public function withLanguages(array $languages) {
     $this->languages = $languages;
     return $this;
   }
+
   public function withTypes(array $types) {
     $this->types = $types;
     return $this;
   }
+
   public function withNames(array $names) {
     $this->names = $names;
     return $this;
   }
+
   public function withContexts(array $contexts) {
     $this->contexts = $contexts;
     return $this;
   }
 
+  public function withPaths(array $paths) {
+    $this->paths = $paths;
+    return $this;
+  }
+
+  public function withLines(array $lines) {
+    $this->lines = $lines;
+    return $this;
+  }
+
+  public function withRepositories(array $repositories) {
+    assert_instances_of($repositories, 'PhabricatorRepository');
+    $this->repositories = $repositories;
+    return $this;
+  }
 
   public function getLanguages() {
     return $this->languages;
   }
+
   public function getTypes() {
     return $this->types;
   }
+
   public function getNames() {
     return $this->names;
   }
+
   public function getContexts() {
     return $this->contexts;
   }
 
+  public function getPaths() {
+    return $this->paths;
+  }
+
+  public function getLines() {
+    return $this->lines;
+  }
+
+  public function getRepositories() {
+    return $this->repositories;
+  }
+
   public function matchesAnyLanguage(array $languages) {
     return (!$this->languages) || array_intersect($languages, $this->languages);
   }
+
   public function matchesAnyType(array $types) {
     return (!$this->types) || array_intersect($types, $this->types);
   }

From 3a2d33767986e51705812223ac03677dd9c4658d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 25 Jan 2018 19:36:17 -0800
Subject: [PATCH 420/865] Add a "Revision status" field to Herald for
 Differential revisions

Summary: See PHI280. We have a similar field for tasks already, this is generally a reasonable sort of thing to support, and the addition of "draft" states means there are some pretty reasonable use cases.

Test Plan:
  - Wrote a status-based ("status is needs revision") Herald rule.
  - Tested it against a "Needs Revision" revision (passed) and a "Changes Planned" revision (failed).

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18938
---
 src/__phutil_library_map__.php                |  2 ++
 .../DifferentialRevisionStatusHeraldField.php | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 src/applications/differential/herald/DifferentialRevisionStatusHeraldField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2f09ae2442..44d67c6259 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -590,6 +590,7 @@
     'DifferentialRevisionStatus' => 'applications/differential/constants/DifferentialRevisionStatus.php',
     'DifferentialRevisionStatusDatasource' => 'applications/differential/typeahead/DifferentialRevisionStatusDatasource.php',
     'DifferentialRevisionStatusFunctionDatasource' => 'applications/differential/typeahead/DifferentialRevisionStatusFunctionDatasource.php',
+    'DifferentialRevisionStatusHeraldField' => 'applications/differential/herald/DifferentialRevisionStatusHeraldField.php',
     'DifferentialRevisionStatusTransaction' => 'applications/differential/xaction/DifferentialRevisionStatusTransaction.php',
     'DifferentialRevisionSummaryHeraldField' => 'applications/differential/herald/DifferentialRevisionSummaryHeraldField.php',
     'DifferentialRevisionSummaryTransaction' => 'applications/differential/xaction/DifferentialRevisionSummaryTransaction.php',
@@ -5701,6 +5702,7 @@
     'DifferentialRevisionStatus' => 'Phobject',
     'DifferentialRevisionStatusDatasource' => 'PhabricatorTypeaheadDatasource',
     'DifferentialRevisionStatusFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
+    'DifferentialRevisionStatusHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionStatusTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionSummaryHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionSummaryTransaction' => 'DifferentialRevisionTransactionType',
diff --git a/src/applications/differential/herald/DifferentialRevisionStatusHeraldField.php b/src/applications/differential/herald/DifferentialRevisionStatusHeraldField.php
new file mode 100644
index 0000000000..1f343eeb90
--- /dev/null
+++ b/src/applications/differential/herald/DifferentialRevisionStatusHeraldField.php
@@ -0,0 +1,29 @@
+<?php
+
+final class DifferentialRevisionStatusHeraldField
+  extends DifferentialRevisionHeraldField {
+
+  const FIELDCONST = 'revision.status';
+
+  public function getHeraldFieldName() {
+    return pht('Revision status');
+  }
+
+  public function getHeraldFieldValue($object) {
+    return $object->getStatus();
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID;
+  }
+
+  protected function getDatasource() {
+    return new DifferentialRevisionStatusDatasource();
+  }
+
+  protected function getDatasourceValueMap() {
+    $map = DifferentialRevisionStatus::getAll();
+    return mpull($map, 'getDisplayName', 'getKey');
+  }
+
+}

From fdc36677ba4faf2e0cb9f5f11d77c96fc4434a9a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 06:29:35 -0800
Subject: [PATCH 421/865] Provide character position information to symbol
 queries

Summary: Depends on D18937. Ref T13047. When available, provide character positions so external indexers can return more accurate results.

Test Plan: Clicked symbols in Safari, Firefox and Chrome, got sensible-looking character positions.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13047

Differential Revision: https://secure.phabricator.com/D18939
---
 resources/celerity/map.php                    | 18 ++++----
 .../controller/DiffusionSymbolController.php  |  7 +++
 .../symbol/DiffusionExternalSymbolQuery.php   | 10 +++++
 .../repository/repository-crossreference.js   | 44 +++++++++++++++++--
 4 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f88fc5857e..5a7f117e26 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
-    'differential.pkg.js' => 'c1af2de3',
+    'differential.pkg.js' => 'b69ae3ec',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -443,7 +443,7 @@
     'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf',
     'rsrc/js/application/releeph/releeph-request-state-change.js' => 'a0b57eb8',
     'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'de2e896f',
-    'rsrc/js/application/repository/repository-crossreference.js' => 'c5627622',
+    'rsrc/js/application/repository/repository-crossreference.js' => 'fc2d8ffd',
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
     'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
@@ -692,7 +692,7 @@
     'javelin-behavior-reorder-applications' => '76b9fc3e',
     'javelin-behavior-reorder-columns' => 'e1d25dfb',
     'javelin-behavior-reorder-profile-menu-items' => 'e2e0a072',
-    'javelin-behavior-repository-crossreference' => 'c5627622',
+    'javelin-behavior-repository-crossreference' => 'fc2d8ffd',
     'javelin-behavior-scrollbar' => '834a1173',
     'javelin-behavior-search-reorder-queries' => 'e9581f08',
     'javelin-behavior-select-content' => 'bf5374ef',
@@ -1922,12 +1922,6 @@
       'javelin-stratcom',
       'phabricator-tooltip',
     ),
-    'c5627622' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-uri',
-    ),
     'c587b80f' => array(
       'javelin-install',
     ),
@@ -2165,6 +2159,12 @@
       'javelin-install',
       'javelin-dom',
     ),
+    'fc2d8ffd' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-uri',
+    ),
     'fc91ab6c' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/applications/diffusion/controller/DiffusionSymbolController.php b/src/applications/diffusion/controller/DiffusionSymbolController.php
index 20c25dad82..b855f967db 100644
--- a/src/applications/diffusion/controller/DiffusionSymbolController.php
+++ b/src/applications/diffusion/controller/DiffusionSymbolController.php
@@ -69,6 +69,13 @@ public function handleRequest(AphrontRequest $request) {
       $external_query->withLines(array($request->getInt('line')));
     }
 
+    if ($request->getInt('char')) {
+      $external_query->withCharacterPositions(
+        array(
+          $request->getInt('char'),
+        ));
+    }
+
     if ($repos) {
       $external_query->withRepositories($repos);
     }
diff --git a/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php b/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
index f1f916d9d4..719496dcdf 100644
--- a/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
+++ b/src/applications/diffusion/symbol/DiffusionExternalSymbolQuery.php
@@ -9,6 +9,7 @@ final class DiffusionExternalSymbolQuery extends Phobject {
   private $paths = array();
   private $lines = array();
   private $repositories = array();
+  private $characterPositions = array();
 
   public function withLanguages(array $languages) {
     $this->languages = $languages;
@@ -40,6 +41,11 @@ public function withLines(array $lines) {
     return $this;
   }
 
+  public function withCharacterPositions(array $positions) {
+    $this->characterPositions = $positions;
+    return $this;
+  }
+
   public function withRepositories(array $repositories) {
     assert_instances_of($repositories, 'PhabricatorRepository');
     $this->repositories = $repositories;
@@ -74,6 +80,10 @@ public function getRepositories() {
     return $this->repositories;
   }
 
+  public function getCharacterPositions() {
+    return $this->characterPositions;
+  }
+
   public function matchesAnyLanguage(array $languages) {
     return (!$this->languages) || array_intersect($languages, $this->languages);
   }
diff --git a/webroot/rsrc/js/application/repository/repository-crossreference.js b/webroot/rsrc/js/application/repository/repository-crossreference.js
index 882ccd2960..7a7a4d77b8 100644
--- a/webroot/rsrc/js/application/repository/repository-crossreference.js
+++ b/webroot/rsrc/js/application/repository/repository-crossreference.js
@@ -28,8 +28,8 @@ JX.behavior('repository-crossreference', function(config, statics) {
     nf : 'function',
     na : null,
     nb : 'builtin',
-    n : null,
-    };
+    n : null
+  };
 
   function link(element, lang) {
     JX.DOM.alterClass(element, 'repository-crossreference', true);
@@ -58,8 +58,15 @@ JX.behavior('repository-crossreference', function(config, statics) {
           // Continue if we're not inside an inline comment.
         }
 
+        // If only part of the symbol was edited, the symbol name itself will
+        // have another "<span />" inside of it which highlights only the
+        // edited part. Skip over it.
+        if (JX.DOM.isNode(target, 'span') && (target.className === 'bright')) {
+          target = target.parentNode;
+        }
+
         if (e.getType() === 'mouseover') {
-          while (target !== document.body) {
+          while (target && target !== document.body) {
             if (JX.DOM.isNode(target, 'span') &&
                (target.className in class_map)) {
               highlighted = target;
@@ -107,6 +114,11 @@ JX.behavior('repository-crossreference', function(config, statics) {
       query.path = path;
     }
 
+    var char = getChar(target);
+    if (char !== null) {
+      query.char = char;
+    }
+
     var uri = JX.$U('/diffusion/symbol/' + symbol + '/');
     uri.addQueryParams(query);
     window.open(uri);
@@ -173,6 +185,32 @@ JX.behavior('repository-crossreference', function(config, statics) {
     return JX.Stratcom.getData(changeset).path;
   }
 
+  function getChar(target) {
+    var cell = JX.DOM.findAbove(target, 'td');
+    if (!cell) {
+      return null;
+    }
+
+    var char = 1;
+    for (var ii = 0; ii < cell.childNodes.length; ii++) {
+      var node = cell.childNodes[ii];
+
+      if (node === target) {
+        return char;
+      }
+
+      var content = '' + node.textContent;
+
+      // Strip off any ZWS characters. These are marker characters used to
+      // improve copy/paste behavior.
+      content = content.replace(/\u200B/g, '');
+
+      char += content.length;
+    }
+
+    return null;
+  }
+
   if (config.container) {
     link(JX.$(config.container), config.lang);
   } else if (config.section) {

From ad7755d9a9934b9d2c49184dfff9cd696666355a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 06:42:16 -0800
Subject: [PATCH 422/865] Fix an issue with symbol lookup identifying path
 names in Diffusion

Summary:
Depends on D18939. Ref T13047. Symbol lookup can be activated from a diff (in Differential or Diffusion) or from the static view of a file at a particular commit.

In the latter case, we need to figure out the path a little differently. The character and line number approaches still work as written.

Test Plan:
  - Command-clicked symbols in the Diffusion browse view with blame on and off; saw path, line and char populate properly.
  - Command-clicked symbols in Differential diff view to check I didn't break anything.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13047

Differential Revision: https://secure.phabricator.com/D18940
---
 resources/celerity/map.php                    | 18 +++++++-------
 .../controller/DiffusionBrowseController.php  |  5 ++++
 .../repository/repository-crossreference.js   | 24 +++++++++++++++----
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 5a7f117e26..fece1e10ee 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
-    'differential.pkg.js' => 'b69ae3ec',
+    'differential.pkg.js' => '19ee9979',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -443,7 +443,7 @@
     'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf',
     'rsrc/js/application/releeph/releeph-request-state-change.js' => 'a0b57eb8',
     'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'de2e896f',
-    'rsrc/js/application/repository/repository-crossreference.js' => 'fc2d8ffd',
+    'rsrc/js/application/repository/repository-crossreference.js' => '2ab10a76',
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
     'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
@@ -692,7 +692,7 @@
     'javelin-behavior-reorder-applications' => '76b9fc3e',
     'javelin-behavior-reorder-columns' => 'e1d25dfb',
     'javelin-behavior-reorder-profile-menu-items' => 'e2e0a072',
-    'javelin-behavior-repository-crossreference' => 'fc2d8ffd',
+    'javelin-behavior-repository-crossreference' => '2ab10a76',
     'javelin-behavior-scrollbar' => '834a1173',
     'javelin-behavior-search-reorder-queries' => 'e9581f08',
     'javelin-behavior-select-content' => 'bf5374ef',
@@ -1088,6 +1088,12 @@
       'javelin-install',
       'javelin-util',
     ),
+    '2ab10a76' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-uri',
+    ),
     '2ae077e1' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2159,12 +2165,6 @@
       'javelin-install',
       'javelin-dom',
     ),
-    'fc2d8ffd' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-uri',
-    ),
     'fc91ab6c' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index fac3e48706..8df5579a62 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -658,6 +658,11 @@ private function buildCorpus(
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->appendChild($corpus)
       ->addClass('diffusion-mobile-view')
+      ->addSigil('diffusion-file-content-view')
+      ->setMetadata(
+        array(
+          'path' => $this->getDiffusionRequest()->getPath(),
+        ))
       ->setCollapsed(true);
 
     $messages = array();
diff --git a/webroot/rsrc/js/application/repository/repository-crossreference.js b/webroot/rsrc/js/application/repository/repository-crossreference.js
index 7a7a4d77b8..5f2f8306bf 100644
--- a/webroot/rsrc/js/application/repository/repository-crossreference.js
+++ b/webroot/rsrc/js/application/repository/repository-crossreference.js
@@ -94,12 +94,15 @@ JX.behavior('repository-crossreference', function(config, statics) {
     };
     var c = target.className;
     c = c.replace(classHighlight, '').trim();
+
     if (class_map[c]) {
       query.type = class_map[c];
     }
+
     if (target.hasAttribute('data-symbol-context')) {
       query.context = target.getAttribute('data-symbol-context');
     }
+
     if (target.hasAttribute('data-symbol-name')) {
       symbol = target.getAttribute('data-symbol-name');
     }
@@ -176,13 +179,26 @@ JX.behavior('repository-crossreference', function(config, statics) {
   }
 
   function getPath(target) {
-    var changeset = JX.DOM.findAbove(target, 'div', 'differential-changeset');
+    // This method works in Differential, when browsing a changset.
+    var changeset;
+    try {
+      changeset = JX.DOM.findAbove(target, 'div', 'differential-changeset');
+      return JX.Stratcom.getData(changeset).path;
+    } catch (ex) {
+      // Ignore.
+    }
 
-    if (!changeset) {
-      return null;
+    // This method works in Diffusion, when viewing the content of a file at
+    // a particular commit.
+    var file;
+    try {
+      file = JX.DOM.findAbove(target, 'div', 'diffusion-file-content-view');
+      return JX.Stratcom.getData(file).path;
+    } catch (ex) {
+      // Ignore.
     }
 
-    return JX.Stratcom.getData(changeset).path;
+    return null;
   }
 
   function getChar(target) {

From fd66ab55791ea288632d0ef8cc3a5bfc22b29e1f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 06:47:15 -0800
Subject: [PATCH 423/865] Always use the same set of transactions to generate
 mail and mail tags

Summary:
See PHI307. Currently, when reviews undraft, we retroactively add in older activity to the mail ("alice created this revision...").

However, we don't add that activity to the mail tags, so the relevant tags (like "revision created") are dropped forever.

Instead, use the same set of transactions for both mail body and mail tag construction.

This should be obsoleted in the relatively near future by T10448, but it's a better/more correct behavior in general and we probably can't get rid of tags completely for a while.

Test Plan:
Applied patch, created a revision with builds, saw it auto-undraft after builds finished. Used `bin/mail list-outbound` and `bin/mail show-outbound` to see the mail. Verified that it included retroactive text ("created this revision") AND retroactive tags.

Note that the tag for "A new revision is created" is `DifferentialTransaction::MAILTAG_REVIEW_REQUEST` with literal value `differential-review-request`.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18941
---
 .../editor/DifferentialTransactionEditor.php     | 16 +++++++++++-----
 .../PhabricatorApplicationTransactionEditor.php  | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index b5eaac4b5e..ecd1e6c95c 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -700,20 +700,26 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
       ->addHeader('Thread-Topic', $thread_topic);
   }
 
-  protected function buildMailBody(
+  protected function getTransactionsForMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
-
-    $viewer = $this->requireActor();
-
     // If this is the first time we're sending mail about this revision, we
     // generate mail for all prior transactions, not just whatever is being
     // applied now. This gets the "added reviewers" lines and other relevant
     // information into the mail.
     if ($this->isFirstBroadcast()) {
-      $xactions = $this->loadUnbroadcastTransactions($object);
+      return $this->loadUnbroadcastTransactions($object);
     }
 
+    return $xactions;
+  }
+
+  protected function buildMailBody(
+    PhabricatorLiskDAO $object,
+    array $xactions) {
+
+    $viewer = $this->requireActor();
+
     $body = new PhabricatorMetaMTAMailBody();
     $body->setViewer($this->requireActor());
 
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 829e3ab43d..7dbd41f1e4 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -2546,6 +2546,12 @@ private function buildMail(
     return $messages;
   }
 
+  protected function getTransactionsForMail(
+    PhabricatorLiskDAO $object,
+    array $xactions) {
+    return $xactions;
+  }
+
   private function buildMailForTarget(
     PhabricatorLiskDAO $object,
     array $xactions,
@@ -2566,17 +2572,19 @@ private function buildMailForTarget(
       return null;
     }
 
+    $mail_xactions = $this->getTransactionsForMail($object, $xactions);
+
     $mail = $this->buildMailTemplate($object);
-    $body = $this->buildMailBody($object, $xactions);
+    $body = $this->buildMailBody($object, $mail_xactions);
 
-    $mail_tags = $this->getMailTags($object, $xactions);
-    $action = $this->getMailAction($object, $xactions);
+    $mail_tags = $this->getMailTags($object, $mail_xactions);
+    $action = $this->getMailAction($object, $mail_xactions);
 
     if (PhabricatorEnv::getEnvConfig('metamta.email-preferences')) {
       $this->addEmailPreferenceSectionToMailBody(
         $body,
         $object,
-        $xactions);
+        $mail_xactions);
     }
 
     $mail

From 9d6911866432e6fec34975854008bdc308d135fd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 08:37:13 -0800
Subject: [PATCH 424/865] Add a discovery format hint for date fields in
 SearchEngine UIs

Summary:
See PHI316. Maniphest and other applications currently have controls like `Created After: [_____]` where you just get an empty text field.

Although most formats work -- including relative formats like "3 days ago" -- and we validate inputs so you get an error if you enter something nonsensical, this still isn't very user friendly.

T8060 or some other approach is likely the long term of this control.

In the meantime, add placeholder text to suggest that `YYYY-MM-DD` or `X days ago` will work.

Test Plan: Viewed date inputs, saw placeholder text.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18942
---
 src/applications/search/field/PhabricatorSearchDateField.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/applications/search/field/PhabricatorSearchDateField.php b/src/applications/search/field/PhabricatorSearchDateField.php
index 21b1627de7..41decd9503 100644
--- a/src/applications/search/field/PhabricatorSearchDateField.php
+++ b/src/applications/search/field/PhabricatorSearchDateField.php
@@ -4,7 +4,8 @@ final class PhabricatorSearchDateField
   extends PhabricatorSearchField {
 
   protected function newControl() {
-    return new AphrontFormTextControl();
+    return id(new AphrontFormTextControl())
+      ->setPlaceholder(pht('"2022-12-25" or "7 days ago"...'));
   }
 
   protected function getValueFromRequest(AphrontRequest $request, $key) {

From fd49acd0334b053403970e83e2bbba422ab9951c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 13:16:27 -0800
Subject: [PATCH 425/865] Fix Herald repetition policy migration for NULL

When we change a nullable column to a non-nullable column, we can get a
data truncation error if any value was "NULL".

This is exceptionally unusual, but our two very oldest Herald rules have
a "NULL" policy on `secure`.
---
 resources/sql/autopatches/20180124.herald.01.repetition.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/sql/autopatches/20180124.herald.01.repetition.sql b/resources/sql/autopatches/20180124.herald.01.repetition.sql
index 3be9ec627d..31f1477e01 100644
--- a/resources/sql/autopatches/20180124.herald.01.repetition.sql
+++ b/resources/sql/autopatches/20180124.herald.01.repetition.sql
@@ -5,6 +5,10 @@
 
 */
 
+UPDATE {$NAMESPACE}_herald.herald_rule
+  SET repetitionPolicy = '1'
+  WHERE repetitionPolicy IS NULL;
+
 ALTER TABLE {$NAMESPACE}_herald.herald_rule
   CHANGE repetitionPolicy
     repetitionPolicy VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};

From 7e7720803cdf41ab46b9cac5b3fd40e9848bf135 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 13:21:10 -0800
Subject: [PATCH 426/865] Set GIT_SSH_VARIANT alongside GIT_SSH

A recent version of Git has changed some piece of behavior here and we
now get "fatal: ssh variant 'simple' does not support setting port"
when using a port. Explicitly setting GIT_SSH_VARIANT to `ssh` likely
fixes this.
---
 .../diffusion/protocol/DiffusionGitCommandEngine.php             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php b/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
index 168b18caa5..995e156d8e 100644
--- a/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionGitCommandEngine.php
@@ -27,6 +27,7 @@ protected function newCustomEnvironment() {
     $env['HOME'] = PhabricatorEnv::getEmptyCWD();
 
     $env['GIT_SSH'] = $this->getSSHWrapper();
+    $env['GIT_SSH_VARIANT'] = 'ssh';
 
     if ($this->isAnyHTTPProtocol()) {
       $uri = $this->getURI();

From 4b5a78e3435bee7982a610c0847a09f7e0c445a6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 09:39:00 -0800
Subject: [PATCH 427/865] Add "you can only enter one value" UI limits to
 Herald "set status" and "set priority" actions

Summary:
Ref T13048. Fixes T11112. I mostly fixed this before in D18887, but missed that these other actions are also affected. T11112 had a more complete list of missing limits.

(It's possible there are some others somewhere, but this is everything we know about, I think.)

Test Plan: Created rules using these actions, typed stuff into the box, was only able to enter one value.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048, T11112

Differential Revision: https://secure.phabricator.com/D18943
---
 .../maniphest/herald/ManiphestTaskPriorityHeraldAction.php     | 3 ++-
 .../maniphest/herald/ManiphestTaskStatusHeraldAction.php       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php b/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php
index 2e2db4b62d..8fe5e07122 100644
--- a/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php
+++ b/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php
@@ -61,7 +61,8 @@ public function renderActionDescription($value) {
   }
 
   protected function getDatasource() {
-    return new ManiphestTaskPriorityDatasource();
+    return id(new ManiphestTaskPriorityDatasource())
+      ->setLimit(1);
   }
 
   protected function getDatasourceValueMap() {
diff --git a/src/applications/maniphest/herald/ManiphestTaskStatusHeraldAction.php b/src/applications/maniphest/herald/ManiphestTaskStatusHeraldAction.php
index c1ff3bcdc7..de84b3c245 100644
--- a/src/applications/maniphest/herald/ManiphestTaskStatusHeraldAction.php
+++ b/src/applications/maniphest/herald/ManiphestTaskStatusHeraldAction.php
@@ -58,7 +58,8 @@ public function renderActionDescription($value) {
   }
 
   protected function getDatasource() {
-    return new ManiphestTaskStatusDatasource();
+    return id(new ManiphestTaskStatusDatasource())
+      ->setLimit(1);
   }
 
   protected function getDatasourceValueMap() {

From a80d1e7e7d2d859c11f0bdf752e6d0b1abfa6993 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 13:35:09 -0800
Subject: [PATCH 428/865] Pass "." to `git grep` to satisfy "all paths" for Git
 2.16.0

Summary:
Ref T13050. See <https://discourse.phabricator-community.org/t/issues-with-git-2-16-0/1004/2>.

`secure` picked up 2.16.0 so this reproduces now: <https://secure.phabricator.com/source/phabricator/browse/master/?grep=dog>

Test Plan: Will push.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13050

Differential Revision: https://secure.phabricator.com/D18944
---
 .../conduit/DiffusionSearchQueryConduitAPIMethod.php        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
index af973f102d..4290a7f6b5 100644
--- a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
@@ -95,6 +95,12 @@ protected function getMercurialResult(ConduitAPIRequest $request) {
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
+    // Starting with Git 2.16.0, Git assumes passing an empty argument is
+    // an error and recommends you pass "." instead.
+    if (!strlen($path)) {
+      $path = '.';
+    }
+
     $results = array();
     $future = $repository->getLocalCommandFuture(
       'grep --rev %s --print0 --line-number -- %s %s',

From 162563d40b8b41e811f72177cc1221dd736d113c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 26 Jan 2018 13:42:27 -0800
Subject: [PATCH 429/865] Move the fix for Git 2.16.0 from the "Mercurial" part
 of the code to the "Git" part of the code

Summary: Ref T13050. Oh boy. Both of them run `grep`!

Test Plan: Will push again.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13050

Differential Revision: https://secure.phabricator.com/D18945
---
 .../conduit/DiffusionSearchQueryConduitAPIMethod.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
index 4290a7f6b5..e2c56bb0f8 100644
--- a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
@@ -54,6 +54,12 @@ protected function getGitResult(ConduitAPIRequest $request) {
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
+    // Starting with Git 2.16.0, Git assumes passing an empty argument is
+    // an error and recommends you pass "." instead.
+    if (!strlen($path)) {
+      $path = '.';
+    }
+
     $results = array();
     $future = $repository->getLocalCommandFuture(
       // NOTE: --perl-regexp is available only with libpcre compiled in.
@@ -95,12 +101,6 @@ protected function getMercurialResult(ConduitAPIRequest $request) {
     $limit = $request->getValue('limit');
     $offset = $request->getValue('offset');
 
-    // Starting with Git 2.16.0, Git assumes passing an empty argument is
-    // an error and recommends you pass "." instead.
-    if (!strlen($path)) {
-      $path = '.';
-    }
-
     $results = array();
     $future = $repository->getLocalCommandFuture(
       'grep --rev %s --print0 --line-number -- %s %s',

From de7f836f03e62d08697cb54540d190a715358604 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 27 Jan 2018 05:22:09 -0800
Subject: [PATCH 430/865] Wrap edge transaction readers in a translation layer

Summary:
Ref T13051. This puts a translation layer between the raw edge data in the transaction table and the UI that uses it.

The intent is to start writing new, more compact data soon. This class give us a consistent API for interacting with either the new or old data format, so we don't have to migrate everything upfront.

Test Plan: Browsed around, saw existing edge transactions render properly in transactions and feed. Added and removed subscribers and projects, saw good transaction rendering.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13051

Differential Revision: https://secure.phabricator.com/D18946
---
 src/__phutil_library_map__.php                |  2 +
 .../storage/DifferentialTransaction.php       | 13 ----
 .../PhabricatorApplicationTransaction.php     | 25 ++++---
 .../util/PhabricatorEdgeChangeRecord.php      | 68 +++++++++++++++++++
 4 files changed, 82 insertions(+), 26 deletions(-)
 create mode 100644 src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 44d67c6259..c40f79b052 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2747,6 +2747,7 @@
     'PhabricatorDraftEngine' => 'applications/transactions/draft/PhabricatorDraftEngine.php',
     'PhabricatorDraftInterface' => 'applications/transactions/draft/PhabricatorDraftInterface.php',
     'PhabricatorDrydockApplication' => 'applications/drydock/application/PhabricatorDrydockApplication.php',
+    'PhabricatorEdgeChangeRecord' => 'infrastructure/edges/util/PhabricatorEdgeChangeRecord.php',
     'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php',
     'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php',
     'PhabricatorEdgeCycleException' => 'infrastructure/edges/exception/PhabricatorEdgeCycleException.php',
@@ -8170,6 +8171,7 @@
     'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
     'PhabricatorDraftEngine' => 'Phobject',
     'PhabricatorDrydockApplication' => 'PhabricatorApplication',
+    'PhabricatorEdgeChangeRecord' => 'Phobject',
     'PhabricatorEdgeConfig' => 'PhabricatorEdgeConstants',
     'PhabricatorEdgeConstants' => 'Phobject',
     'PhabricatorEdgeCycleException' => 'Exception',
diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index 667341cef4..f7dcf29860 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -87,19 +87,6 @@ public function shouldHide() {
         }
         break;
 
-      case PhabricatorTransactions::TYPE_EDGE:
-        $add = array_diff_key($new, $old);
-        $rem = array_diff_key($old, $new);
-
-        // Hide metadata-only edge transactions. These correspond to users
-        // accepting or rejecting revisions, but the change is always explicit
-        // because of the TYPE_ACTION transaction. Rendering these transactions
-        // just creates clutter.
-
-        if (!$add && !$rem) {
-          return true;
-        }
-        break;
       case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
         // Don't hide the initial "X requested review: ..." transaction from
         // mail or feed even when it occurs during creation. We need this
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index d49c3bf675..97b57009ec 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -302,8 +302,8 @@ public function getRequiredHandlePHIDs() {
         $phids[] = $new;
         break;
       case PhabricatorTransactions::TYPE_EDGE:
-        $phids[] = ipull($old, 'dst');
-        $phids[] = ipull($new, 'dst');
+        $record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
+        $phids[] = $record->getChangedPHIDs();
         break;
       case PhabricatorTransactions::TYPE_COLUMNS:
         foreach ($new as $move) {
@@ -632,9 +632,8 @@ public function shouldHide() {
             return true;
             break;
           case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
-            $new = ipull($this->getNewValue(), 'dst');
-            $old = ipull($this->getOldValue(), 'dst');
-            $add = array_diff($new, $old);
+            $record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
+            $add = $record->getAddedPHIDs();
             $add_value = reset($add);
             $add_handle = $this->getHandle($add_value);
             if ($add_handle->getPolicyFiltered()) {
@@ -933,10 +932,10 @@ public function getTitle() {
         }
         break;
       case PhabricatorTransactions::TYPE_EDGE:
-        $new = ipull($new, 'dst');
-        $old = ipull($old, 'dst');
-        $add = array_diff($new, $old);
-        $rem = array_diff($old, $new);
+        $record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
+        $add = $record->getAddedPHIDs();
+        $rem = $record->getRemovedPHIDs();
+
         $type = $this->getMetadata('edge:type');
         $type = head($type);
 
@@ -1172,10 +1171,10 @@ public function getTitleForFeed() {
             $this->renderHandleLink($new));
         }
       case PhabricatorTransactions::TYPE_EDGE:
-        $new = ipull($new, 'dst');
-        $old = ipull($old, 'dst');
-        $add = array_diff($new, $old);
-        $rem = array_diff($old, $new);
+        $record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
+        $add = $record->getAddedPHIDs();
+        $rem = $record->getRemovedPHIDs();
+
         $type = $this->getMetadata('edge:type');
         $type = head($type);
 
diff --git a/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php b/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
new file mode 100644
index 0000000000..6e0cb1d3e0
--- /dev/null
+++ b/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
@@ -0,0 +1,68 @@
+<?php
+
+final class PhabricatorEdgeChangeRecord
+  extends Phobject {
+
+  private $xaction;
+
+  public static function newFromTransaction(
+    PhabricatorApplicationTransaction $xaction) {
+    $record = new self();
+    $record->xaction = $xaction;
+    return $record;
+  }
+
+  public function getChangedPHIDs() {
+    $add = $this->getAddedPHIDs();
+    $rem = $this->getRemovedPHIDs();
+
+    $add = array_fuse($add);
+    $rem = array_fuse($rem);
+
+    return array_keys($add + $rem);
+  }
+
+  public function getAddedPHIDs() {
+    $old = $this->getOldDestinationPHIDs();
+    $new = $this->getNewDestinationPHIDs();
+
+    $old = array_fuse($old);
+    $new = array_fuse($new);
+
+    $add = array_diff_key($new, $old);
+    return array_keys($add);
+  }
+
+  public function getRemovedPHIDs() {
+    $old = $this->getOldDestinationPHIDs();
+    $new = $this->getNewDestinationPHIDs();
+
+    $old = array_fuse($old);
+    $new = array_fuse($new);
+
+    $rem = array_diff_key($old, $new);
+    return array_keys($rem);
+  }
+
+  private function getOldDestinationPHIDs() {
+    if ($this->xaction) {
+      $old = $this->xaction->getOldValue();
+      return ipull($old, 'dst');
+    }
+
+    throw new Exception(
+      pht('Edge change record is not configured with any change data.'));
+  }
+
+  private function getNewDestinationPHIDs() {
+    if ($this->xaction) {
+      $new = $this->xaction->getNewValue();
+      return ipull($new, 'dst');
+    }
+
+    throw new Exception(
+      pht('Edge change record is not configured with any change data.'));
+  }
+
+
+}

From e5639a8ed90fad70cc3e61cf01c2c9cfc185ac66 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 27 Jan 2018 05:54:21 -0800
Subject: [PATCH 431/865] Write edge transactions in a more compact way

Summary: Depends on D18946. Ref T13051. Begins writing edge transactions as just a list of changed PHIDs.

Test Plan: Added, edited, and removed projects. Reviewed transaction record and database. Saw no user-facing changes but a far more compact database representation.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13051

Differential Revision: https://secure.phabricator.com/D18947
---
 ...habricatorApplicationTransactionEditor.php | 26 +++++++++++++++++-
 .../util/PhabricatorEdgeChangeRecord.php      | 27 +++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 7dbd41f1e4..155592fc4e 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -999,7 +999,31 @@ final public function applyTransactions(
           $xaction->setPHID($xaction->generatePHID());
           $comment_editor->applyEdit($xaction, $xaction->getComment());
         } else {
-          $xaction->save();
+
+          // TODO: This is a transitional hack to let us migrate edge
+          // transactions to a more efficient storage format. For now, we're
+          // going to write a new slim format to the database but keep the old
+          // bulky format on the objects so we don't have to upgrade all the
+          // edit logic to the new format yet. See T13051.
+
+          $edge_type = PhabricatorTransactions::TYPE_EDGE;
+          if ($xaction->getTransactionType() == $edge_type) {
+            $bulky_old = $xaction->getOldValue();
+            $bulky_new = $xaction->getNewValue();
+
+            $record = PhabricatorEdgeChangeRecord::newFromTransaction($xaction);
+            $slim_old = $record->getModernOldEdgeTransactionData();
+            $slim_new = $record->getModernNewEdgeTransactionData();
+
+            $xaction->setOldValue($slim_old);
+            $xaction->setNewValue($slim_new);
+            $xaction->save();
+
+            $xaction->setOldValue($bulky_old);
+            $xaction->setNewValue($bulky_new);
+          } else {
+            $xaction->save();
+          }
         }
       }
 
diff --git a/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php b/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
index 6e0cb1d3e0..38557dc09f 100644
--- a/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
+++ b/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
@@ -44,10 +44,18 @@ public function getRemovedPHIDs() {
     return array_keys($rem);
   }
 
+  public function getModernOldEdgeTransactionData() {
+    return $this->getRemovedPHIDs();
+  }
+
+  public function getModernNewEdgeTransactionData() {
+    return $this->getAddedPHIDs();
+  }
+
   private function getOldDestinationPHIDs() {
     if ($this->xaction) {
       $old = $this->xaction->getOldValue();
-      return ipull($old, 'dst');
+      return $this->getPHIDsFromTransactionValue($old);
     }
 
     throw new Exception(
@@ -57,12 +65,27 @@ private function getOldDestinationPHIDs() {
   private function getNewDestinationPHIDs() {
     if ($this->xaction) {
       $new = $this->xaction->getNewValue();
-      return ipull($new, 'dst');
+      return $this->getPHIDsFromTransactionValue($new);
     }
 
     throw new Exception(
       pht('Edge change record is not configured with any change data.'));
   }
 
+  private function getPHIDsFromTransactionValue($value) {
+    if (!$value) {
+      return array();
+    }
+
+    // If the list items are arrays, this is an older-style map of
+    // dictionaries.
+    $head = head($value);
+    if (is_array($head)) {
+      return ipull($value, 'dst');
+    }
+
+    // If the list items are not arrays, this is a newer-style list of PHIDs.
+    return $value;
+  }
 
 }

From 6d2d1d3a9770adea6f165a82d42ab9ed613b2876 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 27 Jan 2018 06:12:03 -0800
Subject: [PATCH 432/865] Add `bin/garbage compact-edges` to compact edges into
 the new format

Summary:
Depends on D18947. Ref T13051. This goes through transaction tables and compacts the edge storage into the slim format.

I put this on `bin/garbage` instead of `bin/storage` because `bin/storage` has a lot of weird stuff about how it manages databases so that it can run before configuration (e.g., all the `--user`, `--password` type flags for configuring DB connections).

Test Plan:
Loaded an object with a bunch of transactions. Ran migration. Spot checked table for sanity. Loaded another copy of the object in the web UI, compared the two pages, saw no user-visible changes.

Here's a concrete example of the migration effect -- old row:

```
*************************** 44. row ***************************
             id: 757
           phid: PHID-XACT-PSTE-5gnaaway2vnyen5
     authorPHID: PHID-USER-cvfydnwadpdj7vdon36z
     objectPHID: PHID-PSTE-5uj6oqv4kmhtr6ctwcq7
     viewPolicy: public
     editPolicy: PHID-USER-cvfydnwadpdj7vdon36z
    commentPHID: NULL
 commentVersion: 0
transactionType: core:edge
       oldValue: {"PHID-PROJ-wh32nih7q5scvc5lvipv":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-wh32nih7q5scvc5lvipv","dateCreated":"1449170691","seq":"0","dataID":null,"data":[]},"PHID-PROJ-5r2ed5v27xrgltvou5or":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-5r2ed5v27xrgltvou5or","dateCreated":"1449170683","seq":"0","dataID":null,"data":[]},"PHID-PROJ-zfp44q7loir643b5i4v4":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-zfp44q7loir643b5i4v4","dateCreated":"1449170668","seq":"0","dataID":null,"data":[]},"PHID-PROJ-okljqs7prifhajtvia3t":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-okljqs7prifhajtvia3t","dateCreated":"1448902756","seq":"0","dataID":null,"data":[]},"PHID-PROJ-3cuwfuuh4pwqyuof2hhr":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-3cuwfuuh4pwqyuof2hhr","dateCreated":"1448899367","seq":"0","dataID":null,"data":[]},"PHID-PROJ-amvkc5zw2gsy7tyvocug":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-amvkc5zw2gsy7tyvocug","dateCreated":"1448833330","seq":"0","dataID":null,"data":[]}}
       newValue: {"PHID-PROJ-wh32nih7q5scvc5lvipv":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-wh32nih7q5scvc5lvipv","dateCreated":"1449170691","seq":"0","dataID":null,"data":[]},"PHID-PROJ-5r2ed5v27xrgltvou5or":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-5r2ed5v27xrgltvou5or","dateCreated":"1449170683","seq":"0","dataID":null,"data":[]},"PHID-PROJ-zfp44q7loir643b5i4v4":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-zfp44q7loir643b5i4v4","dateCreated":"1449170668","seq":"0","dataID":null,"data":[]},"PHID-PROJ-okljqs7prifhajtvia3t":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-okljqs7prifhajtvia3t","dateCreated":"1448902756","seq":"0","dataID":null,"data":[]},"PHID-PROJ-3cuwfuuh4pwqyuof2hhr":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-3cuwfuuh4pwqyuof2hhr","dateCreated":"1448899367","seq":"0","dataID":null,"data":[]},"PHID-PROJ-amvkc5zw2gsy7tyvocug":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-amvkc5zw2gsy7tyvocug","dateCreated":"1448833330","seq":"0","dataID":null,"data":[]},"PHID-PROJ-tbowhnwinujwhb346q36":{"dst":"PHID-PROJ-tbowhnwinujwhb346q36","type":41,"data":[]},"PHID-PROJ-izrto7uflimduo6uw2tp":{"dst":"PHID-PROJ-izrto7uflimduo6uw2tp","type":41,"data":[]}}
  contentSource: {"source":"web","params":[]}
       metadata: {"edge:type":41}
    dateCreated: 1450197571
   dateModified: 1450197571
```

New row:

```
*************************** 44. row ***************************
             id: 757
           phid: PHID-XACT-PSTE-5gnaaway2vnyen5
     authorPHID: PHID-USER-cvfydnwadpdj7vdon36z
     objectPHID: PHID-PSTE-5uj6oqv4kmhtr6ctwcq7
     viewPolicy: public
     editPolicy: PHID-USER-cvfydnwadpdj7vdon36z
    commentPHID: NULL
 commentVersion: 0
transactionType: core:edge
       oldValue: []
       newValue: ["PHID-PROJ-tbowhnwinujwhb346q36","PHID-PROJ-izrto7uflimduo6uw2tp"]
  contentSource: {"source":"web","params":[]}
       metadata: {"edge:type":41}
    dateCreated: 1450197571
   dateModified: 1450197571
```

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13051

Differential Revision: https://secure.phabricator.com/D18948
---
 src/__phutil_library_map__.php                |   2 +
 ...ollectorManagementCompactEdgesWorkflow.php | 103 ++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 src/infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c40f79b052..eaaa4d9e66 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3017,6 +3017,7 @@
     'PhabricatorGDSetupCheck' => 'applications/config/check/PhabricatorGDSetupCheck.php',
     'PhabricatorGarbageCollector' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php',
     'PhabricatorGarbageCollectorManagementCollectWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCollectWorkflow.php',
+    'PhabricatorGarbageCollectorManagementCompactEdgesWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php',
     'PhabricatorGarbageCollectorManagementSetPolicyWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementSetPolicyWorkflow.php',
     'PhabricatorGarbageCollectorManagementWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementWorkflow.php',
     'PhabricatorGeneralCachePurger' => 'applications/cache/purger/PhabricatorGeneralCachePurger.php',
@@ -8484,6 +8485,7 @@
     'PhabricatorGDSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorGarbageCollector' => 'Phobject',
     'PhabricatorGarbageCollectorManagementCollectWorkflow' => 'PhabricatorGarbageCollectorManagementWorkflow',
+    'PhabricatorGarbageCollectorManagementCompactEdgesWorkflow' => 'PhabricatorGarbageCollectorManagementWorkflow',
     'PhabricatorGarbageCollectorManagementSetPolicyWorkflow' => 'PhabricatorGarbageCollectorManagementWorkflow',
     'PhabricatorGarbageCollectorManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorGeneralCachePurger' => 'PhabricatorCachePurger',
diff --git a/src/infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php b/src/infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php
new file mode 100644
index 0000000000..c47d159850
--- /dev/null
+++ b/src/infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php
@@ -0,0 +1,103 @@
+<?php
+
+final class PhabricatorGarbageCollectorManagementCompactEdgesWorkflow
+  extends PhabricatorGarbageCollectorManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('compact-edges')
+      ->setExamples('**compact-edges**')
+      ->setSynopsis(
+        pht(
+          'Rebuild old edge transactions storage to use a more compact '.
+          'format.'))
+      ->setArguments(array());
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $tables = id(new PhutilClassMapQuery())
+      ->setAncestorClass('PhabricatorApplicationTransaction')
+      ->execute();
+
+    foreach ($tables as $table) {
+      $this->compactEdges($table);
+    }
+
+    return 0;
+  }
+
+  private function compactEdges(PhabricatorApplicationTransaction $table) {
+    $conn = $table->establishConnection('w');
+    $class = get_class($table);
+
+    echo tsprintf(
+      "%s\n",
+      pht(
+        'Rebuilding transactions for "%s"...',
+        $class));
+
+    $cursor = 0;
+    $updated = 0;
+    while (true) {
+      $rows = $table->loadAllWhere(
+        'transactionType = %s
+          AND id > %d
+          AND (oldValue LIKE %> OR newValue LIKE %>)
+          ORDER BY id ASC LIMIT 100',
+        PhabricatorTransactions::TYPE_EDGE,
+        $cursor,
+        // We're looking for transactions with JSON objects in their value
+        // fields: the new style transactions have JSON lists instead and
+        // start with "[" rather than "{".
+        '{',
+        '{');
+
+      if (!$rows) {
+        break;
+      }
+
+      foreach ($rows as $row) {
+        $id = $row->getID();
+
+        $old = $row->getOldValue();
+        $new = $row->getNewValue();
+
+        if (!is_array($old) || !is_array($new)) {
+          echo tsprintf(
+            "%s\n",
+            pht(
+              'Transaction %s (of type %s) has unexpected data, skipping.',
+              $id,
+              $class));
+        }
+
+        $record = PhabricatorEdgeChangeRecord::newFromTransaction($row);
+
+        $old_data = $record->getModernOldEdgeTransactionData();
+        $old_json = phutil_json_encode($old_data);
+
+        $new_data = $record->getModernNewEdgeTransactionData();
+        $new_json = phutil_json_encode($new_data);
+
+        queryfx(
+          $conn,
+          'UPDATE %T SET oldValue = %s, newValue = %s WHERE id = %d',
+          $table->getTableName(),
+          $old_json,
+          $new_json,
+          $id);
+
+        $updated++;
+
+        $cursor = $row->getID();
+      }
+    }
+
+    echo tsprintf(
+      "%s\n",
+      pht(
+        'Done, compacted %s edge transactions.',
+        new PhutilNumber($updated)));
+  }
+
+}

From 98402b885b62b945499c12efc4e2bb6dc1e59d49 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 27 Jan 2018 07:30:26 -0800
Subject: [PATCH 433/865] Add a bit of test coverage for bulky vs compact edge
 data representations

Summary: Depends on D18948. Ref T13051. The actual logic ended up so simple that this doesn't really feel terribly valuable, but maybe it'll catch something later on.

Test Plan: Ran test.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13051

Differential Revision: https://secure.phabricator.com/D18949
---
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorEdgeChangeRecordTestCase.php   | 158 ++++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 src/infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index eaaa4d9e66..1ad3565809 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2748,6 +2748,7 @@
     'PhabricatorDraftInterface' => 'applications/transactions/draft/PhabricatorDraftInterface.php',
     'PhabricatorDrydockApplication' => 'applications/drydock/application/PhabricatorDrydockApplication.php',
     'PhabricatorEdgeChangeRecord' => 'infrastructure/edges/util/PhabricatorEdgeChangeRecord.php',
+    'PhabricatorEdgeChangeRecordTestCase' => 'infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php',
     'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php',
     'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php',
     'PhabricatorEdgeCycleException' => 'infrastructure/edges/exception/PhabricatorEdgeCycleException.php',
@@ -8173,6 +8174,7 @@
     'PhabricatorDraftEngine' => 'Phobject',
     'PhabricatorDrydockApplication' => 'PhabricatorApplication',
     'PhabricatorEdgeChangeRecord' => 'Phobject',
+    'PhabricatorEdgeChangeRecordTestCase' => 'PhabricatorTestCase',
     'PhabricatorEdgeConfig' => 'PhabricatorEdgeConstants',
     'PhabricatorEdgeConstants' => 'Phobject',
     'PhabricatorEdgeCycleException' => 'Exception',
diff --git a/src/infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php b/src/infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php
new file mode 100644
index 0000000000..cf46c00d4d
--- /dev/null
+++ b/src/infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php
@@ -0,0 +1,158 @@
+<?php
+
+final class PhabricatorEdgeChangeRecordTestCase extends PhabricatorTestCase {
+
+
+  public function testEdgeStorageFormats() {
+    $old_bulky = phutil_json_decode(<<<EOJSON
+{
+   "PHID-PROJ-5r2ed5v27xrgltvou5or" : {
+      "dataID" : null,
+      "dateCreated" : "1449170683",
+      "dst" : "PHID-PROJ-5r2ed5v27xrgltvou5or",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "type" : "41",
+      "data" : [],
+      "seq" : "0"
+   },
+   "PHID-PROJ-wh32nih7q5scvc5lvipv" : {
+      "dataID" : null,
+      "seq" : "0",
+      "type" : "41",
+      "data" : [],
+      "dst" : "PHID-PROJ-wh32nih7q5scvc5lvipv",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1449170691"
+   },
+   "PHID-PROJ-zfp44q7loir643b5i4v4" : {
+      "dataID" : null,
+      "type" : "41",
+      "data" : [],
+      "seq" : "0",
+      "dateCreated" : "1449170668",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dst" : "PHID-PROJ-zfp44q7loir643b5i4v4"
+   },
+   "PHID-PROJ-amvkc5zw2gsy7tyvocug" : {
+      "dataID" : null,
+      "dst" : "PHID-PROJ-amvkc5zw2gsy7tyvocug",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448833330",
+      "seq" : "0",
+      "type" : "41",
+      "data" : []
+   },
+   "PHID-PROJ-3cuwfuuh4pwqyuof2hhr" : {
+      "dataID" : null,
+      "seq" : "0",
+      "type" : "41",
+      "data" : [],
+      "dst" : "PHID-PROJ-3cuwfuuh4pwqyuof2hhr",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448899367"
+   },
+   "PHID-PROJ-okljqs7prifhajtvia3t" : {
+      "dataID" : null,
+      "seq" : "0",
+      "data" : [],
+      "type" : "41",
+      "dst" : "PHID-PROJ-okljqs7prifhajtvia3t",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448902756"
+   }
+}
+EOJSON
+      );
+
+    $new_bulky = phutil_json_decode(<<<EOJSON
+{
+   "PHID-PROJ-5r2ed5v27xrgltvou5or" : {
+      "dataID" : null,
+      "dateCreated" : "1449170683",
+      "dst" : "PHID-PROJ-5r2ed5v27xrgltvou5or",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "type" : "41",
+      "data" : [],
+      "seq" : "0"
+   },
+   "PHID-PROJ-wh32nih7q5scvc5lvipv" : {
+      "dataID" : null,
+      "seq" : "0",
+      "type" : "41",
+      "data" : [],
+      "dst" : "PHID-PROJ-wh32nih7q5scvc5lvipv",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1449170691"
+   },
+   "PHID-PROJ-zfp44q7loir643b5i4v4" : {
+      "dataID" : null,
+      "type" : "41",
+      "data" : [],
+      "seq" : "0",
+      "dateCreated" : "1449170668",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dst" : "PHID-PROJ-zfp44q7loir643b5i4v4"
+   },
+   "PHID-PROJ-amvkc5zw2gsy7tyvocug" : {
+      "dataID" : null,
+      "dst" : "PHID-PROJ-amvkc5zw2gsy7tyvocug",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448833330",
+      "seq" : "0",
+      "type" : "41",
+      "data" : []
+   },
+   "PHID-PROJ-3cuwfuuh4pwqyuof2hhr" : {
+      "dataID" : null,
+      "seq" : "0",
+      "type" : "41",
+      "data" : [],
+      "dst" : "PHID-PROJ-3cuwfuuh4pwqyuof2hhr",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448899367"
+   },
+   "PHID-PROJ-zzzzqs7prifhajtvia3t" : {
+      "dataID" : null,
+      "seq" : "0",
+      "data" : [],
+      "type" : "41",
+      "dst" : "PHID-PROJ-zzzzqs7prifhajtvia3t",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448902756"
+   }
+}
+EOJSON
+      );
+
+    $old_slim = array(
+      'PHID-PROJ-okljqs7prifhajtvia3t',
+    );
+
+    $new_slim = array(
+      'PHID-PROJ-zzzzqs7prifhajtvia3t',
+    );
+
+    $bulky_xaction = new ManiphestTransaction();
+    $bulky_xaction->setOldValue($old_bulky);
+    $bulky_xaction->setNewValue($new_bulky);
+
+    $slim_xaction = new ManiphestTransaction();
+    $slim_xaction->setOldValue($old_slim);
+    $slim_xaction->setNewValue($new_slim);
+
+    $bulky_record = PhabricatorEdgeChangeRecord::newFromTransaction(
+      $bulky_xaction);
+
+    $slim_record = PhabricatorEdgeChangeRecord::newFromTransaction(
+      $slim_xaction);
+
+    $this->assertEqual(
+      $bulky_record->getAddedPHIDs(),
+      $slim_record->getAddedPHIDs());
+
+    $this->assertEqual(
+      $bulky_record->getRemovedPHIDs(),
+      $slim_record->getRemovedPHIDs());
+  }
+
+}

From d8f51dff6ec3d374e13a462e59c63b194570ded7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 28 Jan 2018 17:49:30 -0800
Subject: [PATCH 434/865] Use the configured viewer more consistently in the
 Herald commit adapter

Summary: See PHI276. Ref T13048. The fix in D18933 got one callsite, but missed the one in the `callConduit()` method, so the issue isn't fully fixed in production. Convert this adapter to use a real viewer (if one is available) more thoroughly.

Test Plan: Ran rules in test console, saw field values. Will test in production again.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18950
---
 .../diffusion/herald/HeraldCommitAdapter.php         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/applications/diffusion/herald/HeraldCommitAdapter.php b/src/applications/diffusion/herald/HeraldCommitAdapter.php
index e0e15352b6..fc3c8c4f5b 100644
--- a/src/applications/diffusion/herald/HeraldCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldCommitAdapter.php
@@ -135,13 +135,16 @@ public function getHeraldName() {
   }
 
   public function loadAffectedPaths() {
+    $viewer = $this->getViewer();
+
     if ($this->affectedPaths === null) {
       $result = PhabricatorOwnerPathQuery::loadAffectedPaths(
         $this->getRepository(),
         $this->commit,
-        PhabricatorUser::getOmnipotentUser());
+        $viewer);
       $this->affectedPaths = $result;
     }
+
     return $this->affectedPaths;
   }
 
@@ -172,6 +175,8 @@ public function loadAuditNeededPackages() {
   }
 
   public function loadDifferentialRevision() {
+    $viewer = $this->getViewer();
+
     if ($this->affectedRevision === null) {
       $this->affectedRevision = false;
 
@@ -189,7 +194,7 @@ public function loadDifferentialRevision() {
 
         $revision = id(new DifferentialRevisionQuery())
           ->withIDs(array($revision_id))
-          ->setViewer(PhabricatorUser::getOmnipotentUser())
+          ->setViewer($viewer)
           ->needReviewers(true)
           ->executeOne();
         if ($revision) {
@@ -197,6 +202,7 @@ public function loadDifferentialRevision() {
         }
       }
     }
+
     return $this->affectedRevision;
   }
 
@@ -323,7 +329,7 @@ public function loadIsMergeCommit() {
   }
 
   private function callConduit($method, array $params) {
-    $viewer = PhabricatorUser::getOmnipotentUser();
+    $viewer = $this->getViewer();
 
     $drequest = DiffusionRequest::newFromDictionary(
       array(

From 40e9806e3c88500a67d382a5ec07594325f1b000 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 12:54:04 -0800
Subject: [PATCH 435/865] Remove the caret dropdown from transaction lists when
 no actions are available

Summary:
See PHI325. When a transaction group in Differential (or Pholio) only has an inline comment, it renders with a "V" caret but no actual dropdown menu.

This caret renders in a "disabled" color, but the color is "kinda grey". The "active" color is "kinda grey with a dab of blue". Here's what they look like today:

{F5401581}

Just remove it.

Test Plan: Viewed one of these, no longer saw the inactive caret.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18963
---
 resources/celerity/map.php                   | 6 +++---
 src/view/phui/PHUITimelineEventView.php      | 8 +++-----
 webroot/rsrc/css/phui/phui-timeline-view.css | 4 ----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index fece1e10ee..661ac58c15 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '075f9867',
+    'core.pkg.css' => '51debec3',
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -176,7 +176,7 @@
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
     'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
-    'rsrc/css/phui/phui-timeline-view.css' => 'e2ef62b1',
+    'rsrc/css/phui/phui-timeline-view.css' => '6ddf8126',
     'rsrc/css/phui/phui-two-column-view.css' => '44ec4951',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
@@ -873,7 +873,7 @@
     'phui-status-list-view-css' => 'd5263e49',
     'phui-tag-view-css' => 'b4719c50',
     'phui-theme-css' => '9f261c6b',
-    'phui-timeline-view-css' => 'e2ef62b1',
+    'phui-timeline-view-css' => '6ddf8126',
     'phui-two-column-view-css' => '44ec4951',
     'phui-workboard-color-css' => '783cdff5',
     'phui-workboard-view-css' => '3bc85455',
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index 161dd0c944..e64b9b06b2 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -301,18 +301,14 @@ public function render() {
 
     $menu = null;
     $items = array();
-    $has_menu = false;
     if (!$this->getIsPreview() && !$this->getHideCommentOptions()) {
       foreach ($this->getEventGroup() as $event) {
         $items[] = $event->getMenuItems($this->anchor);
-        if ($event->hasChildren()) {
-          $has_menu = true;
-        }
       }
       $items = array_mergev($items);
     }
 
-    if ($items || $has_menu) {
+    if ($items) {
       $icon = id(new PHUIIconView())
         ->setIcon('fa-caret-down');
       $aural = javelin_tag(
@@ -351,6 +347,8 @@ public function render() {
         ));
 
       $has_menu = true;
+    } else {
+      $has_menu = false;
     }
 
     // Render "extra" information (timestamp, etc).
diff --git a/webroot/rsrc/css/phui/phui-timeline-view.css b/webroot/rsrc/css/phui/phui-timeline-view.css
index b0ae9c0044..6fae6802be 100644
--- a/webroot/rsrc/css/phui/phui-timeline-view.css
+++ b/webroot/rsrc/css/phui/phui-timeline-view.css
@@ -390,10 +390,6 @@
   outline: none;
 }
 
-.phui-timeline-menu .phui-icon-view {
-  color: {$lightgreytext};
-}
-
 a.phui-timeline-menu .phui-icon-view {
   color: {$bluetext};
 }

From 1db281bcd1bbe141817fe6bc14a9d5dae3e612c5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 13:16:46 -0800
Subject: [PATCH 436/865] Fix a possible `count(null)` in PHUIInfoView

Summary:
See <https://discourse.phabricator-community.org/t/php7-2-exception-count-parameter-must-be-an-array-or-an-object-that-implements-countable/1031>.

PHP7.2 raises a warning about `count(scalar)` (GREAT!) and we have one here if the caller doesn't `setErrors(...)`.

Test Plan: Sanity-checked usage of `$this->errors`.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18964
---
 src/view/phui/PHUIInfoView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/phui/PHUIInfoView.php b/src/view/phui/PHUIInfoView.php
index 161e49108b..69d0549299 100644
--- a/src/view/phui/PHUIInfoView.php
+++ b/src/view/phui/PHUIInfoView.php
@@ -10,7 +10,7 @@ final class PHUIInfoView extends AphrontTagView {
   const SEVERITY_PLAIN = 'plain';
 
   private $title;
-  private $errors;
+  private $errors = array();
   private $severity = null;
   private $id;
   private $buttons = array();

From 213eb8e93de567fb4577fa8688873b69f1b01593 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 28 Jan 2018 18:24:42 -0800
Subject: [PATCH 437/865] Define common ID and PHID export fields in
 SearchEngine

Summary:
Ref T13049. All exportable objects should always have these fields, so make them builtins.

This also sets things up for extensions (like custom fields).

Test Plan: Exported user data, got the same export as before.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18951
---
 .../query/DiffusionPullLogSearchEngine.php    | 10 +--
 .../query/PhabricatorPeopleSearchEngine.php   | 10 +--
 ...PhabricatorApplicationSearchController.php | 11 ----
 .../PhabricatorApplicationSearchEngine.php    | 65 ++++++++++++++++++-
 4 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
index 8d6102d4eb..fc7cee52ce 100644
--- a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
+++ b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
@@ -49,12 +49,6 @@ protected function buildCustomSearchFields() {
 
   protected function newExportFields() {
     return array(
-      id(new PhabricatorIDExportField())
-        ->setKey('id')
-        ->setLabel(pht('ID')),
-      id(new PhabricatorPHIDExportField())
-        ->setKey('phid')
-        ->setLabel(pht('PHID')),
       id(new PhabricatorPHIDExportField())
         ->setKey('repositoryPHID')
         ->setLabel(pht('Repository PHID')),
@@ -82,7 +76,7 @@ protected function newExportFields() {
     );
   }
 
-  public function newExport(array $events) {
+  protected function newExportData(array $events) {
     $viewer = $this->requireViewer();
 
     $phids = array();
@@ -112,8 +106,6 @@ public function newExport(array $events) {
       }
 
       $export[] = array(
-        'id' => $event->getID(),
-        'phid' => $event->getPHID(),
         'repositoryPHID' => $repository_phid,
         'repository' => $repository_name,
         'pullerPHID' => $puller_phid,
diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
index db2256a8b8..e0e1b5070e 100644
--- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
@@ -322,12 +322,6 @@ protected function renderResultList(
 
   protected function newExportFields() {
     return array(
-      id(new PhabricatorIDExportField())
-        ->setKey('id')
-        ->setLabel(pht('ID')),
-      id(new PhabricatorPHIDExportField())
-        ->setKey('phid')
-        ->setLabel(pht('PHID')),
       id(new PhabricatorStringExportField())
         ->setKey('username')
         ->setLabel(pht('Username')),
@@ -340,14 +334,12 @@ protected function newExportFields() {
     );
   }
 
-  public function newExport(array $users) {
+  protected function newExportData(array $users) {
     $viewer = $this->requireViewer();
 
     $export = array();
     foreach ($users as $user) {
       $export[] = array(
-        'id' => $user->getID(),
-        'phid' => $user->getPHID(),
         'username' => $user->getUsername(),
         'realName' => $user->getRealName(),
         'created' => $user->getDateCreated(),
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index d3b05d1e3e..037a626f26 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -449,18 +449,7 @@ private function processExportRequest() {
         $format->setViewer($viewer);
 
         $export_data = $engine->newExport($objects);
-
-        if (count($export_data) !== count($objects)) {
-          throw new Exception(
-            pht(
-              'Search engine exported the wrong number of objects, expected '.
-              '%s but got %s.',
-              phutil_count($objects),
-              phutil_count($export_data)));
-        }
-
         $objects = array_values($objects);
-        $export_data = array_values($export_data);
 
         $field_list = $engine->newExportFieldList();
         $field_list = mpull($field_list, null, 'getKey');
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index 33efd890bb..e77c06a62b 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1455,11 +1455,74 @@ public function canExport() {
   }
 
   final public function newExportFieldList() {
-    return $this->newExportFields();
+    $builtin_fields = array(
+      id(new PhabricatorIDExportField())
+        ->setKey('id')
+        ->setLabel(pht('ID')),
+      id(new PhabricatorPHIDExportField())
+        ->setKey('phid')
+        ->setLabel(pht('PHID')),
+    );
+
+    $fields = mpull($builtin_fields, null, 'getKey');
+
+    $export_fields = $this->newExportFields();
+    foreach ($export_fields as $export_field) {
+      $key = $export_field->getKey();
+
+      if (isset($fields[$key])) {
+        throw new Exception(
+          pht(
+            'Search engine ("%s") defines an export field with a key ("%s") '.
+            'that collides with another field. Each field must have a '.
+            'unique key.',
+            get_class($this),
+            $key));
+      }
+
+      $fields[$key] = $export_field;
+    }
+
+    return $fields;
+  }
+
+  final public function newExport(array $objects) {
+    $objects = array_values($objects);
+    $n = count($objects);
+
+    $maps = array();
+    foreach ($objects as $object) {
+      $maps[] = array(
+        'id' => $object->getID(),
+        'phid' => $object->getPHID(),
+      );
+    }
+
+    $export_data = $this->newExportData($objects);
+    $export_data = array_values($export_data);
+    if (count($export_data) !== count($objects)) {
+      throw new Exception(
+        pht(
+          'Search engine ("%s") exported the wrong number of objects, '.
+          'expected %s but got %s.',
+          get_class($this),
+          phutil_count($objects),
+          phutil_count($export_data)));
+    }
+
+    for ($ii = 0; $ii < $n; $ii++) {
+      $maps[$ii] += $export_data[$ii];
+    }
+
+    return $maps;
   }
 
   protected function newExportFields() {
     return array();
   }
 
+  protected function newExportData(array $objects) {
+    throw new PhutilMethodNotImplementedException();
+  }
+
 }

From 0de6210808d7de78b0af0bea4e45f8537435be85 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 28 Jan 2018 18:32:22 -0800
Subject: [PATCH 438/865] Give data exporters a header row

Summary:
Depends on D18951. Ref T13049. When we export to CSV or plain text, add a header row in the first line of the file to explain what each column means. This often isn't obvious with PHIDs, etc.

JSON has keys and is essentially self-labeling, so don't do anything special.

Test Plan: Exported CSV and text, saw new headers. Exported JSON, no changes.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18952
---
 .../PhabricatorApplicationSearchController.php |  1 +
 .../export/PhabricatorCSVExportFormat.php      | 17 +++++++++++++++--
 .../export/PhabricatorExportFormat.php         |  4 ++++
 .../export/PhabricatorTextExportFormat.php     | 18 +++++++++++++++---
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index 037a626f26..0402102e2b 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -454,6 +454,7 @@ private function processExportRequest() {
         $field_list = $engine->newExportFieldList();
         $field_list = mpull($field_list, null, 'getKey');
 
+        $format->addHeaders($field_list);
         for ($ii = 0; $ii < count($objects); $ii++) {
           $format->addObject($objects[$ii], $field_list, $export_data[$ii]);
         }
diff --git a/src/infrastructure/export/PhabricatorCSVExportFormat.php b/src/infrastructure/export/PhabricatorCSVExportFormat.php
index d9662467ec..67f0a4963a 100644
--- a/src/infrastructure/export/PhabricatorCSVExportFormat.php
+++ b/src/infrastructure/export/PhabricatorCSVExportFormat.php
@@ -23,21 +23,34 @@ public function getMIMEContentType() {
     return 'text/csv';
   }
 
+  public function addHeaders(array $fields) {
+    $headers = mpull($fields, 'getLabel');
+    $this->addRow($headers);
+  }
+
   public function addObject($object, array $fields, array $map) {
     $values = array();
     foreach ($fields as $key => $field) {
       $value = $map[$key];
       $value = $field->getTextValue($value);
+      $values[] = $value;
+    }
 
+    $this->addRow($values);
+  }
+
+  private function addRow(array $values) {
+    $row = array();
+    foreach ($values as $value) {
       if (preg_match('/\s|,|\"/', $value)) {
         $value = str_replace('"', '""', $value);
         $value = '"'.$value.'"';
       }
 
-      $values[] = $value;
+      $row[] = $value;
     }
 
-    $this->rows[] = implode(',', $values);
+    $this->rows[] = implode(',', $row);
   }
 
   public function newFileData() {
diff --git a/src/infrastructure/export/PhabricatorExportFormat.php b/src/infrastructure/export/PhabricatorExportFormat.php
index a1da4e90d8..9a8e035c58 100644
--- a/src/infrastructure/export/PhabricatorExportFormat.php
+++ b/src/infrastructure/export/PhabricatorExportFormat.php
@@ -22,6 +22,10 @@ abstract public function getExportFormatName();
   abstract public function getMIMEContentType();
   abstract public function getFileExtension();
 
+  public function addHeaders(array $fields) {
+    return;
+  }
+
   abstract public function addObject($object, array $fields, array $map);
   abstract public function newFileData();
 
diff --git a/src/infrastructure/export/PhabricatorTextExportFormat.php b/src/infrastructure/export/PhabricatorTextExportFormat.php
index ec308f2eb5..d51e199f91 100644
--- a/src/infrastructure/export/PhabricatorTextExportFormat.php
+++ b/src/infrastructure/export/PhabricatorTextExportFormat.php
@@ -23,17 +23,29 @@ public function getMIMEContentType() {
     return 'text/plain';
   }
 
+  public function addHeaders(array $fields) {
+    $headers = mpull($fields, 'getLabel');
+    $this->addRow($headers);
+  }
+
   public function addObject($object, array $fields, array $map) {
     $values = array();
     foreach ($fields as $key => $field) {
       $value = $map[$key];
       $value = $field->getTextValue($value);
-      $value = addcslashes($value, "\0..\37\\\177..\377");
-
       $values[] = $value;
     }
 
-    $this->rows[] = implode("\t", $values);
+    $this->addRow($values);
+  }
+
+  private function addRow(array $values) {
+    $row = array();
+    foreach ($values as $value) {
+      $row[] = addcslashes($value, "\0..\37\\\177..\377");
+    }
+
+    $this->rows[] = implode("\t", $row);
   }
 
   public function newFileData() {

From 8b8a3142b3102fdf8199ee549ff245d90483f50b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 28 Jan 2018 18:47:42 -0800
Subject: [PATCH 439/865] Support export of data in files larger than 8MB

Summary:
Depends on D18952. Ref T13049. For files larger than 8MB, we need to engage the chunk storage engine. `PhabricatorFile::newFromFileData()` always writes a single chunk, and can't handle files larger than the mandatory chunk threshold (8MB).

Use `IteratorUploadSource`, which can, and "stream" the data into it. This should raise the limit from 8MB to 2GB (maximum size of a string in PHP).

If we need to go above 2GB we could stream CSV and text pretty easily, and JSON without too much trouble, but Excel might be trickier. Hopefully no one is trying to export 2GB+ datafiles, though.

Test Plan:
  - Changed the JSON exporter to just export 8MB of the letter "q": `return str_repeat('q', 1024 * 1024 * 9);`.
  - Before change: fatal, "no storage engine can store this file".
  - After change: export works cleanly.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18953
---
 .../files/storage/PhabricatorFile.php         |  8 +++--
 .../PhabricatorFileUploadSource.php           | 30 +++++++++++++++++++
 ...PhabricatorApplicationSearchController.php | 23 ++++++++------
 3 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index d3dc5208d2..2b8624b9c0 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -272,8 +272,12 @@ public static function newChunkedFile(
     $file->setByteSize($length);
 
     // NOTE: Once we receive the first chunk, we'll detect its MIME type and
-    // update the parent file. This matters for large media files like video.
-    $file->setMimeType('application/octet-stream');
+    // update the parent file if a MIME type hasn't been provided. This matters
+    // for large media files like video.
+    $mime_type = idx($params, 'mime-type');
+    if (!strlen($mime_type)) {
+      $file->setMimeType('application/octet-stream');
+    }
 
     $chunked_hash = idx($params, 'chunkedHash');
 
diff --git a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
index bf213a417e..87a4486869 100644
--- a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
+++ b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
@@ -6,6 +6,8 @@ abstract class PhabricatorFileUploadSource
   private $name;
   private $relativeTTL;
   private $viewPolicy;
+  private $mimeType;
+  private $authorPHID;
 
   private $rope;
   private $data;
@@ -51,6 +53,24 @@ public function getByteLimit() {
     return $this->byteLimit;
   }
 
+  public function setMIMEType($mime_type) {
+    $this->mimeType = $mime_type;
+    return $this;
+  }
+
+  public function getMIMEType() {
+    return $this->mimeType;
+  }
+
+  public function setAuthorPHID($author_phid) {
+    $this->authorPHID = $author_phid;
+    return $this;
+  }
+
+  public function getAuthorPHID() {
+    return $this->authorPHID;
+  }
+
   public function uploadFile() {
     if (!$this->shouldChunkFile()) {
       return $this->writeSingleFile();
@@ -245,6 +265,16 @@ private function getNewFileParameters() {
       $parameters['ttl.relative'] = $ttl;
     }
 
+    $mime_type = $this->getMimeType();
+    if ($mime_type !== null) {
+      $parameters['mime-type'] = $mime_type;
+    }
+
+    $author_phid = $this->getAuthorPHID();
+    if ($author_phid !== null) {
+      $parameters['authorPHID'] = $author_phid;
+    }
+
     return $parameters;
   }
 
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index 0402102e2b..e980498c42 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -461,15 +461,20 @@ private function processExportRequest() {
 
         $export_result = $format->newFileData();
 
-        $file = PhabricatorFile::newFromFileData(
-          $export_result,
-          array(
-            'name' => $filename,
-            'authorPHID' => $viewer->getPHID(),
-            'ttl.relative' => phutil_units('15 minutes in seconds'),
-            'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
-            'mime-type' => $mime_type,
-          ));
+        // We have all the data in one big string and aren't actually
+        // streaming it, but pretending that we are allows us to actviate
+        // the chunk engine and store large files.
+        $iterator = new ArrayIterator(array($export_result));
+
+        $source = id(new PhabricatorIteratorFileUploadSource())
+          ->setName($filename)
+          ->setViewPolicy(PhabricatorPolicies::POLICY_NOONE)
+          ->setMIMEType($mime_type)
+          ->setRelativeTTL(phutil_units('60 minutes in seconds'))
+          ->setAuthorPHID($viewer->getPHID())
+          ->setIterator($iterator);
+
+        $file = $source->uploadFile();
 
         return $this->newDialog()
           ->setTitle(pht('Download Results'))

From a067f64ebb326f65078322aabb0790a7ddb34d66 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 28 Jan 2018 19:30:41 -0800
Subject: [PATCH 440/865] Support export engine extensions and implement an
 extension for custom fields

Summary:
Depends on D18953. Ref T13049. Allow applications and infrastructure to supplement exportable fields for objects.

Then, implement an extension for custom fields. Only a couple field types (int, string) are supported for now.

Test Plan: Added some custom fields to Users, populated them, exported users. Saw custom fields in the export.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18954
---
 src/__phutil_library_map__.php                |  4 +
 .../PhabricatorApplicationSearchEngine.php    | 58 +++++++++++++
 .../field/PhabricatorCustomField.php          | 43 ++++++++++
 .../PhabricatorStandardCustomField.php        |  3 +
 .../PhabricatorStandardCustomFieldInt.php     |  4 +
 .../PhabricatorStandardCustomFieldText.php    |  4 +
 ...icatorCustomFieldExportEngineExtension.php | 86 +++++++++++++++++++
 .../PhabricatorExportEngineExtension.php      | 31 +++++++
 8 files changed, 233 insertions(+)
 create mode 100644 src/infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php
 create mode 100644 src/infrastructure/export/PhabricatorExportEngineExtension.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1ad3565809..03ac41fe7f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2583,6 +2583,7 @@
     'PhabricatorCustomFieldEditEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php',
     'PhabricatorCustomFieldEditField' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php',
     'PhabricatorCustomFieldEditType' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php',
+    'PhabricatorCustomFieldExportEngineExtension' => 'infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php',
     'PhabricatorCustomFieldFulltextEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php',
     'PhabricatorCustomFieldHeraldAction' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldAction.php',
     'PhabricatorCustomFieldHeraldActionGroup' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldActionGroup.php',
@@ -2847,6 +2848,7 @@
     'PhabricatorEventType' => 'infrastructure/events/constant/PhabricatorEventType.php',
     'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
     'PhabricatorExecFutureFileUploadSource' => 'applications/files/uploadsource/PhabricatorExecFutureFileUploadSource.php',
+    'PhabricatorExportEngineExtension' => 'infrastructure/export/PhabricatorExportEngineExtension.php',
     'PhabricatorExportField' => 'infrastructure/export/PhabricatorExportField.php',
     'PhabricatorExportFormat' => 'infrastructure/export/PhabricatorExportFormat.php',
     'PhabricatorExtendedPolicyInterface' => 'applications/policy/interface/PhabricatorExtendedPolicyInterface.php',
@@ -7991,6 +7993,7 @@
     'PhabricatorCustomFieldEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorCustomFieldEditField' => 'PhabricatorEditField',
     'PhabricatorCustomFieldEditType' => 'PhabricatorEditType',
+    'PhabricatorCustomFieldExportEngineExtension' => 'PhabricatorExportEngineExtension',
     'PhabricatorCustomFieldFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
     'PhabricatorCustomFieldHeraldAction' => 'HeraldAction',
     'PhabricatorCustomFieldHeraldActionGroup' => 'HeraldActionGroup',
@@ -8280,6 +8283,7 @@
     'PhabricatorEventType' => 'PhutilEventType',
     'PhabricatorExampleEventListener' => 'PhabricatorEventListener',
     'PhabricatorExecFutureFileUploadSource' => 'PhabricatorFileUploadSource',
+    'PhabricatorExportEngineExtension' => 'Phobject',
     'PhabricatorExportField' => 'Phobject',
     'PhabricatorExportFormat' => 'Phobject',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'PhabricatorApplicationConfigOptions',
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index e77c06a62b..3de7b9c4b9 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1483,6 +1483,26 @@ final public function newExportFieldList() {
       $fields[$key] = $export_field;
     }
 
+    $extensions = $this->newExportExtensions();
+    foreach ($extensions as $extension) {
+      $extension_fields = $extension->newExportFields();
+      foreach ($extension_fields as $extension_field) {
+        $key = $extension_field->getKey();
+
+        if (isset($fields[$key])) {
+          throw new Exception(
+            pht(
+              'Export engine extension ("%s") defines an export field with '.
+              'a key ("%s") that collides with another field. Each field '.
+              'must have a unique key.',
+              get_class($extension_field),
+              $key));
+        }
+
+        $fields[$key] = $extension_field;
+      }
+    }
+
     return $fields;
   }
 
@@ -1514,6 +1534,25 @@ final public function newExport(array $objects) {
       $maps[$ii] += $export_data[$ii];
     }
 
+    $extensions = $this->newExportExtensions();
+    foreach ($extensions as $extension) {
+      $extension_data = $extension->newExportData($objects);
+      $extension_data = array_values($extension_data);
+      if (count($export_data) !== count($objects)) {
+        throw new Exception(
+          pht(
+            'Export engine extension ("%s") exported the wrong number of '.
+            'objects, expected %s but got %s.',
+            get_class($extension),
+            phutil_count($objects),
+            phutil_count($export_data)));
+      }
+
+      for ($ii = 0; $ii < $n; $ii++) {
+        $maps[$ii] += $extension_data[$ii];
+      }
+    }
+
     return $maps;
   }
 
@@ -1525,4 +1564,23 @@ protected function newExportData(array $objects) {
     throw new PhutilMethodNotImplementedException();
   }
 
+  private function newExportExtensions() {
+    $object = $this->newResultObject();
+    $viewer = $this->requireViewer();
+
+    $extensions = PhabricatorExportEngineExtension::getAllExtensions();
+
+    $supported = array();
+    foreach ($extensions as $extension) {
+      $extension = clone $extension;
+      $extension->setViewer($viewer);
+
+      if ($extension->supportsObject($object)) {
+        $supported[] = $extension;
+      }
+    }
+
+    return $supported;
+  }
+
 }
diff --git a/src/infrastructure/customfield/field/PhabricatorCustomField.php b/src/infrastructure/customfield/field/PhabricatorCustomField.php
index c96f09f369..818bf119ff 100644
--- a/src/infrastructure/customfield/field/PhabricatorCustomField.php
+++ b/src/infrastructure/customfield/field/PhabricatorCustomField.php
@@ -35,6 +35,7 @@ abstract class PhabricatorCustomField extends Phobject {
   const ROLE_HERALD                   = 'herald';
   const ROLE_EDITENGINE = 'EditEngine';
   const ROLE_HERALDACTION = 'herald.action';
+  const ROLE_EXPORT = 'export';
 
 
 /* -(  Building Applications with Custom Fields  )--------------------------- */
@@ -299,6 +300,8 @@ public function shouldEnableForRole($role) {
       case self::ROLE_EDITENGINE:
         return $this->shouldAppearInEditView() ||
                $this->shouldAppearInEditEngine();
+      case self::ROLE_EXPORT:
+        return $this->shouldAppearInDataExport();
       case self::ROLE_DEFAULT:
         return true;
       default:
@@ -1362,6 +1365,46 @@ public function updateAbstractDocument(
   }
 
 
+/* -(  Data Export  )-------------------------------------------------------- */
+
+
+  public function shouldAppearInDataExport() {
+    if ($this->proxy) {
+      return $this->proxy->shouldAppearInDataExport();
+    }
+
+    try {
+      $this->newExportFieldType();
+      return true;
+    } catch (PhabricatorCustomFieldImplementationIncompleteException $ex) {
+      return false;
+    }
+  }
+
+  public function newExportField() {
+    if ($this->proxy) {
+      return $this->proxy->newExportField();
+    }
+
+    return $this->newExportFieldType()
+      ->setLabel($this->getFieldName());
+  }
+
+  public function newExportData() {
+    if ($this->proxy) {
+      return $this->proxy->newExportData();
+    }
+    throw new PhabricatorCustomFieldImplementationIncompleteException($this);
+  }
+
+  protected function newExportFieldType() {
+    if ($this->proxy) {
+      return $this->proxy->newExportFieldType();
+    }
+    throw new PhabricatorCustomFieldImplementationIncompleteException($this);
+  }
+
+
 /* -(  Conduit  )------------------------------------------------------------ */
 
 
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
index f617d3a849..5bd6256b73 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
@@ -496,5 +496,8 @@ public function getConduitDictionaryValue() {
     return $this->getFieldValue();
   }
 
+  public function newExportData() {
+    return $this->getFieldValue();
+  }
 
 }
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php
index 4a3e45d757..f06c30d482 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php
@@ -124,4 +124,8 @@ protected function newConduitEditParameterType() {
     return new ConduitIntParameterType();
   }
 
+  protected function newExportFieldType() {
+    return new PhabricatorIntExportField();
+  }
+
 }
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
index 8242c477fd..56164bb7b5 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
@@ -76,4 +76,8 @@ public function getConduitEditParameterType() {
     return new ConduitStringParameterType();
   }
 
+  protected function newExportFieldType() {
+    return new PhabricatorStringExportField();
+  }
+
 }
diff --git a/src/infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php b/src/infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php
new file mode 100644
index 0000000000..c2a9eddae2
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php
@@ -0,0 +1,86 @@
+<?php
+
+final class PhabricatorCustomFieldExportEngineExtension
+  extends PhabricatorExportEngineExtension {
+
+  const EXTENSIONKEY = 'custom-field';
+
+  private $object;
+
+  public function supportsObject($object) {
+    $this->object = $object;
+    return ($object instanceof PhabricatorCustomFieldInterface);
+  }
+
+  public function newExportFields() {
+    $prototype = $this->object;
+
+    $fields = $this->newCustomFields($prototype);
+
+    $results = array();
+    foreach ($fields as $field) {
+      $field_key = $field->getModernFieldKey();
+
+      $results[] = $field->newExportField()
+         ->setKey($field_key);
+    }
+
+    return $results;
+  }
+
+  public function newExportData(array $objects) {
+    $viewer = $this->getViewer();
+
+    $field_map = array();
+    foreach ($objects as $object) {
+      $object_phid = $object->getPHID();
+
+      $fields = PhabricatorCustomField::getObjectFields(
+        $object,
+        PhabricatorCustomField::ROLE_EXPORT);
+
+      $fields
+        ->setViewer($viewer)
+        ->readFieldsFromObject($object);
+
+      $field_map[$object_phid] = $fields;
+    }
+
+    $all_fields = array();
+    foreach ($field_map as $field_list) {
+      foreach ($field_list->getFields() as $field) {
+        $all_fields[] = $field;
+      }
+    }
+
+    id(new PhabricatorCustomFieldStorageQuery())
+      ->addFields($all_fields)
+      ->execute();
+
+    $results = array();
+    foreach ($objects as $object) {
+      $object_phid = $object->getPHID();
+      $object_fields = $field_map[$object_phid];
+
+      $map = array();
+      foreach ($object_fields->getFields() as $field) {
+        $key = $field->getModernFieldKey();
+        $map[$key] = $field->newExportData();
+      }
+
+      $results[] = $map;
+    }
+
+    return $results;
+  }
+
+  private function newCustomFields($object) {
+    $fields = PhabricatorCustomField::getObjectFields(
+      $object,
+      PhabricatorCustomField::ROLE_EXPORT);
+    $fields->setViewer($this->getViewer());
+
+    return $fields->getFields();
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorExportEngineExtension.php b/src/infrastructure/export/PhabricatorExportEngineExtension.php
new file mode 100644
index 0000000000..01d4471ef2
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorExportEngineExtension.php
@@ -0,0 +1,31 @@
+<?php
+
+abstract class PhabricatorExportEngineExtension extends Phobject {
+
+  private $viewer;
+
+  final public function getExtensionKey() {
+    return $this->getPhobjectClassConstant('EXTENSIONKEY');
+  }
+
+  final public function setViewer($viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  abstract public function supportsObject($object);
+  abstract public function newExportFields();
+  abstract public function newExportData(array $objects);
+
+  final public static function getAllExtensions() {
+    return id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->setUniqueMethod('getExtensionKey')
+      ->execute();
+  }
+
+}

From 0409279595464924d1dc728a8c6830228d75dc5f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 06:50:11 -0800
Subject: [PATCH 441/865] Support Excel as a data export format

Summary:
Depends on D18954. Ref T13049. This brings over the existing Maniphest Excel export pipeline in a generic way.

The `<Type>ExportField` classes know directly that `PHPExcel` exists, which is a little sketchy, but writing an Excel indirection layer sounds like a lot of work and I don't anticipate us changing Excel backends anytime soon, so trying to abstract this feels YAGNI.

This doesn't bring over the install instructions for PHPExcel or the detection of whether or not it exists. I'll bring that over in a future change.

Test Plan: Exported users as Excel, opened them up, got a sensible-looking Excel sheet.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18955
---
 src/__phutil_library_map__.php                |   2 +
 ...PhabricatorApplicationSearchController.php |   7 +-
 .../export/PhabricatorEpochExportField.php    |  20 +++
 .../export/PhabricatorExcelExportFormat.php   | 145 ++++++++++++++++++
 .../export/PhabricatorExportField.php         |  15 ++
 .../export/PhabricatorExportFormat.php        |  10 ++
 .../export/PhabricatorIDExportField.php       |   4 +
 .../export/PhabricatorIntExportField.php      |  15 ++
 .../export/PhabricatorPHIDExportField.php     |   8 +-
 9 files changed, 223 insertions(+), 3 deletions(-)
 create mode 100644 src/infrastructure/export/PhabricatorExcelExportFormat.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 03ac41fe7f..3ef9f4ec3b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2847,6 +2847,7 @@
     'PhabricatorEventListener' => 'infrastructure/events/PhabricatorEventListener.php',
     'PhabricatorEventType' => 'infrastructure/events/constant/PhabricatorEventType.php',
     'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
+    'PhabricatorExcelExportFormat' => 'infrastructure/export/PhabricatorExcelExportFormat.php',
     'PhabricatorExecFutureFileUploadSource' => 'applications/files/uploadsource/PhabricatorExecFutureFileUploadSource.php',
     'PhabricatorExportEngineExtension' => 'infrastructure/export/PhabricatorExportEngineExtension.php',
     'PhabricatorExportField' => 'infrastructure/export/PhabricatorExportField.php',
@@ -8282,6 +8283,7 @@
     'PhabricatorEventListener' => 'PhutilEventListener',
     'PhabricatorEventType' => 'PhutilEventType',
     'PhabricatorExampleEventListener' => 'PhabricatorEventListener',
+    'PhabricatorExcelExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorExecFutureFileUploadSource' => 'PhabricatorFileUploadSource',
     'PhabricatorExportEngineExtension' => 'Phobject',
     'PhabricatorExportField' => 'Phobject',
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index e980498c42..88cfd3c137 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -410,8 +410,10 @@ private function processExportRequest() {
 
     if ($named_query) {
       $filename = $named_query->getQueryName();
+      $sheet_title = $named_query->getQueryName();
     } else {
       $filename = $engine->getResultTypeDescription();
+      $sheet_title = $engine->getResultTypeDescription();
     }
     $filename = phutil_utf8_strtolower($filename);
     $filename = PhabricatorFile::normalizeFileName($filename);
@@ -445,8 +447,9 @@ private function processExportRequest() {
         $mime_type = $format->getMIMEContentType();
         $filename = $filename.'.'.$extension;
 
-        $format = clone $format;
-        $format->setViewer($viewer);
+        $format = id(clone $format)
+          ->setViewer($viewer)
+          ->setTitle($sheet_title);
 
         $export_data = $engine->newExport($objects);
         $objects = array_values($objects);
diff --git a/src/infrastructure/export/PhabricatorEpochExportField.php b/src/infrastructure/export/PhabricatorEpochExportField.php
index a19e60b50e..4dffde5aa8 100644
--- a/src/infrastructure/export/PhabricatorEpochExportField.php
+++ b/src/infrastructure/export/PhabricatorEpochExportField.php
@@ -24,4 +24,24 @@ public function getNaturalValue($value) {
     return (int)$value;
   }
 
+  public function getPHPExcelValue($value) {
+    $epoch = $this->getNaturalValue($value);
+
+    $seconds_per_day = phutil_units('1 day in seconds');
+    $offset = ($seconds_per_day * 25569);
+
+    return ($epoch + $offset) / $seconds_per_day;
+  }
+
+  /**
+   * @phutil-external-symbol class PHPExcel_Style_NumberFormat
+   */
+  public function formatPHPExcelCell($cell, $style) {
+    $code = PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2;
+
+    $style
+      ->getNumberFormat()
+      ->setFormatCode($code);
+  }
+
 }
diff --git a/src/infrastructure/export/PhabricatorExcelExportFormat.php b/src/infrastructure/export/PhabricatorExcelExportFormat.php
new file mode 100644
index 0000000000..633d98fa53
--- /dev/null
+++ b/src/infrastructure/export/PhabricatorExcelExportFormat.php
@@ -0,0 +1,145 @@
+<?php
+
+final class PhabricatorExcelExportFormat
+  extends PhabricatorExportFormat {
+
+  const EXPORTKEY = 'excel';
+
+  private $workbook;
+  private $sheet;
+  private $rowCursor;
+
+  public function getExportFormatName() {
+    return pht('Excel (.xlsx)');
+  }
+
+  public function isExportFormatEnabled() {
+    return true;
+  }
+
+  public function getFileExtension() {
+    return 'xlsx';
+  }
+
+  public function getMIMEContentType() {
+    return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+  }
+
+  /**
+   * @phutil-external-symbol class PHPExcel_Cell_DataType
+   */
+  public function addHeaders(array $fields) {
+    $sheet = $this->getSheet();
+
+    $header_format = array(
+      'font'  => array(
+        'bold' => true,
+      ),
+    );
+
+    $row = 1;
+    $col = 0;
+    foreach ($fields as $field) {
+      $cell_value = $field->getLabel();
+
+      $cell_name = $this->getCellName($col, $row);
+
+      $cell = $sheet->setCellValue(
+        $cell_name,
+        $cell_value,
+        $return_cell = true);
+
+      $sheet->getStyle($cell_name)->applyFromArray($header_format);
+      $cell->setDataType(PHPExcel_Cell_DataType::TYPE_STRING);
+
+      $width = $field->getCharacterWidth();
+      if ($width !== null) {
+        $col_name = $this->getCellName($col);
+        $sheet->getColumnDimension($col_name)
+          ->setWidth($width);
+      }
+
+      $col++;
+    }
+  }
+
+  public function addObject($object, array $fields, array $map) {
+    $sheet = $this->getSheet();
+
+    $col = 0;
+    foreach ($fields as $key => $field) {
+      $cell_value = $map[$key];
+      $cell_value = $field->getPHPExcelValue($cell_value);
+
+      $cell_name = $this->getCellName($col, $this->rowCursor);
+
+      $cell = $sheet->setCellValue(
+        $cell_name,
+        $cell_value,
+        $return_cell = true);
+
+      $style = $sheet->getStyle($cell_name);
+      $field->formatPHPExcelCell($cell, $style);
+
+      $col++;
+    }
+
+    $this->rowCursor++;
+  }
+
+  /**
+   * @phutil-external-symbol class PHPExcel_IOFactory
+   */
+  public function newFileData() {
+    $workbook = $this->getWorkbook();
+    $writer = PHPExcel_IOFactory::createWriter($workbook, 'Excel2007');
+
+    ob_start();
+    $writer->save('php://output');
+    $data = ob_get_clean();
+
+    return $data;
+  }
+
+  private function getWorkbook() {
+    if (!$this->workbook) {
+      $this->workbook = $this->newWorkbook();
+    }
+    return $this->workbook;
+  }
+
+  /**
+   * @phutil-external-symbol class PHPExcel
+   */
+  private function newWorkbook() {
+    include_once 'PHPExcel.php';
+    return new PHPExcel();
+  }
+
+  private function getSheet() {
+    if (!$this->sheet) {
+      $workbook = $this->getWorkbook();
+
+      $sheet = $workbook->setActiveSheetIndex(0);
+      $sheet->setTitle($this->getTitle());
+
+      $this->sheet = $sheet;
+
+      // The row cursor starts on the second row, after the header row.
+      $this->rowCursor = 2;
+    }
+
+    return $this->sheet;
+  }
+
+  private function getCellName($col, $row = null) {
+    $col_name = chr(ord('A') + $col);
+
+    if ($row === null) {
+      return $col_name;
+    }
+
+    return $col_name.$row;
+  }
+
+}
diff --git a/src/infrastructure/export/PhabricatorExportField.php b/src/infrastructure/export/PhabricatorExportField.php
index 3efb7a8b9a..85e21b3e37 100644
--- a/src/infrastructure/export/PhabricatorExportField.php
+++ b/src/infrastructure/export/PhabricatorExportField.php
@@ -32,4 +32,19 @@ public function getNaturalValue($value) {
     return $value;
   }
 
+  public function getPHPExcelValue($value) {
+    return $this->getTextValue($value);
+  }
+
+  /**
+   * @phutil-external-symbol class PHPExcel_Cell_DataType
+   */
+  public function formatPHPExcelCell($cell, $style) {
+    $cell->setDataType(PHPExcel_Cell_DataType::TYPE_STRING);
+  }
+
+  public function getCharacterWidth() {
+    return 24;
+  }
+
 }
diff --git a/src/infrastructure/export/PhabricatorExportFormat.php b/src/infrastructure/export/PhabricatorExportFormat.php
index 9a8e035c58..7e174f5197 100644
--- a/src/infrastructure/export/PhabricatorExportFormat.php
+++ b/src/infrastructure/export/PhabricatorExportFormat.php
@@ -4,6 +4,7 @@ abstract class PhabricatorExportFormat
   extends Phobject {
 
   private $viewer;
+  private $title;
 
   final public function getExportFormatKey() {
     return $this->getPhobjectClassConstant('EXPORTKEY');
@@ -18,6 +19,15 @@ final public function getViewer() {
     return $this->viewer;
   }
 
+  final public function setTitle($title) {
+    $this->title = $title;
+    return $this;
+  }
+
+  final public function getTitle() {
+    return $this->title;
+  }
+
   abstract public function getExportFormatName();
   abstract public function getMIMEContentType();
   abstract public function getFileExtension();
diff --git a/src/infrastructure/export/PhabricatorIDExportField.php b/src/infrastructure/export/PhabricatorIDExportField.php
index 5b29fdb21d..1ef3d53370 100644
--- a/src/infrastructure/export/PhabricatorIDExportField.php
+++ b/src/infrastructure/export/PhabricatorIDExportField.php
@@ -7,4 +7,8 @@ public function getNaturalValue($value) {
     return (int)$value;
   }
 
+  public function getCharacterWidth() {
+    return 12;
+  }
+
 }
diff --git a/src/infrastructure/export/PhabricatorIntExportField.php b/src/infrastructure/export/PhabricatorIntExportField.php
index 3363f9b5d5..57f7e0ab29 100644
--- a/src/infrastructure/export/PhabricatorIntExportField.php
+++ b/src/infrastructure/export/PhabricatorIntExportField.php
@@ -4,7 +4,22 @@ final class PhabricatorIntExportField
   extends PhabricatorExportField {
 
   public function getNaturalValue($value) {
+    if ($value === null) {
+      return $value;
+    }
+
     return (int)$value;
   }
 
+  /**
+   * @phutil-external-symbol class PHPExcel_Cell_DataType
+   */
+  public function formatPHPExcelCell($cell, $style) {
+    $cell->setDataType(PHPExcel_Cell_DataType::TYPE_NUMERIC);
+  }
+
+  public function getCharacterWidth() {
+    return 8;
+  }
+
 }
diff --git a/src/infrastructure/export/PhabricatorPHIDExportField.php b/src/infrastructure/export/PhabricatorPHIDExportField.php
index 7c08ae0226..052c73fbd6 100644
--- a/src/infrastructure/export/PhabricatorPHIDExportField.php
+++ b/src/infrastructure/export/PhabricatorPHIDExportField.php
@@ -1,4 +1,10 @@
 <?php
 
 final class PhabricatorPHIDExportField
-  extends PhabricatorExportField {}
+  extends PhabricatorExportField {
+
+  public function getCharacterWidth() {
+    return 32;
+  }
+
+}

From 5b61f863fdc10ca88fb06668ab4fde164189d42b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 07:24:32 -0800
Subject: [PATCH 442/865] Organize the export code into subdirectories

Summary:
Depends on D18955. Ref T13049. This directory was getting a little cluttered with different kinds of code.

Put the formats (csv, json, ...), the field types (int, string, epoch, ...) and the engine-related stuff in subdirectories.

Test Plan: wow so aesthetic

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18956
---
 src/__phutil_library_map__.php                | 26 +++++++++----------
 ...icatorCustomFieldExportEngineExtension.php |  0
 .../PhabricatorExportEngineExtension.php      |  0
 .../PhabricatorEpochExportField.php           |  0
 .../{ => field}/PhabricatorExportField.php    |  0
 .../{ => field}/PhabricatorIDExportField.php  |  0
 .../{ => field}/PhabricatorIntExportField.php |  0
 .../PhabricatorPHIDExportField.php            |  0
 .../PhabricatorStringExportField.php          |  0
 .../PhabricatorCSVExportFormat.php            |  0
 .../PhabricatorExcelExportFormat.php          |  0
 .../{ => format}/PhabricatorExportFormat.php  |  0
 .../PhabricatorJSONExportFormat.php           |  0
 .../PhabricatorTextExportFormat.php           |  0
 14 files changed, 13 insertions(+), 13 deletions(-)
 rename src/infrastructure/export/{ => engine}/PhabricatorCustomFieldExportEngineExtension.php (100%)
 rename src/infrastructure/export/{ => engine}/PhabricatorExportEngineExtension.php (100%)
 rename src/infrastructure/export/{ => field}/PhabricatorEpochExportField.php (100%)
 rename src/infrastructure/export/{ => field}/PhabricatorExportField.php (100%)
 rename src/infrastructure/export/{ => field}/PhabricatorIDExportField.php (100%)
 rename src/infrastructure/export/{ => field}/PhabricatorIntExportField.php (100%)
 rename src/infrastructure/export/{ => field}/PhabricatorPHIDExportField.php (100%)
 rename src/infrastructure/export/{ => field}/PhabricatorStringExportField.php (100%)
 rename src/infrastructure/export/{ => format}/PhabricatorCSVExportFormat.php (100%)
 rename src/infrastructure/export/{ => format}/PhabricatorExcelExportFormat.php (100%)
 rename src/infrastructure/export/{ => format}/PhabricatorExportFormat.php (100%)
 rename src/infrastructure/export/{ => format}/PhabricatorJSONExportFormat.php (100%)
 rename src/infrastructure/export/{ => format}/PhabricatorTextExportFormat.php (100%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3ef9f4ec3b..8ada6932ae 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2232,7 +2232,7 @@
     'PhabricatorBulkEngine' => 'applications/transactions/bulk/PhabricatorBulkEngine.php',
     'PhabricatorBulkManagementMakeSilentWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php',
     'PhabricatorBulkManagementWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php',
-    'PhabricatorCSVExportFormat' => 'infrastructure/export/PhabricatorCSVExportFormat.php',
+    'PhabricatorCSVExportFormat' => 'infrastructure/export/format/PhabricatorCSVExportFormat.php',
     'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
     'PhabricatorCacheEngine' => 'applications/system/engine/PhabricatorCacheEngine.php',
     'PhabricatorCacheEngineExtension' => 'applications/system/engine/PhabricatorCacheEngineExtension.php',
@@ -2583,7 +2583,7 @@
     'PhabricatorCustomFieldEditEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php',
     'PhabricatorCustomFieldEditField' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php',
     'PhabricatorCustomFieldEditType' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php',
-    'PhabricatorCustomFieldExportEngineExtension' => 'infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php',
+    'PhabricatorCustomFieldExportEngineExtension' => 'infrastructure/export/engine/PhabricatorCustomFieldExportEngineExtension.php',
     'PhabricatorCustomFieldFulltextEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php',
     'PhabricatorCustomFieldHeraldAction' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldAction.php',
     'PhabricatorCustomFieldHeraldActionGroup' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldActionGroup.php',
@@ -2841,17 +2841,17 @@
     'PhabricatorEnv' => 'infrastructure/env/PhabricatorEnv.php',
     'PhabricatorEnvTestCase' => 'infrastructure/env/__tests__/PhabricatorEnvTestCase.php',
     'PhabricatorEpochEditField' => 'applications/transactions/editfield/PhabricatorEpochEditField.php',
-    'PhabricatorEpochExportField' => 'infrastructure/export/PhabricatorEpochExportField.php',
+    'PhabricatorEpochExportField' => 'infrastructure/export/field/PhabricatorEpochExportField.php',
     'PhabricatorEvent' => 'infrastructure/events/PhabricatorEvent.php',
     'PhabricatorEventEngine' => 'infrastructure/events/PhabricatorEventEngine.php',
     'PhabricatorEventListener' => 'infrastructure/events/PhabricatorEventListener.php',
     'PhabricatorEventType' => 'infrastructure/events/constant/PhabricatorEventType.php',
     'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
-    'PhabricatorExcelExportFormat' => 'infrastructure/export/PhabricatorExcelExportFormat.php',
+    'PhabricatorExcelExportFormat' => 'infrastructure/export/format/PhabricatorExcelExportFormat.php',
     'PhabricatorExecFutureFileUploadSource' => 'applications/files/uploadsource/PhabricatorExecFutureFileUploadSource.php',
-    'PhabricatorExportEngineExtension' => 'infrastructure/export/PhabricatorExportEngineExtension.php',
-    'PhabricatorExportField' => 'infrastructure/export/PhabricatorExportField.php',
-    'PhabricatorExportFormat' => 'infrastructure/export/PhabricatorExportFormat.php',
+    'PhabricatorExportEngineExtension' => 'infrastructure/export/engine/PhabricatorExportEngineExtension.php',
+    'PhabricatorExportField' => 'infrastructure/export/field/PhabricatorExportField.php',
+    'PhabricatorExportFormat' => 'infrastructure/export/format/PhabricatorExportFormat.php',
     'PhabricatorExtendedPolicyInterface' => 'applications/policy/interface/PhabricatorExtendedPolicyInterface.php',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php',
     'PhabricatorExtensionsSetupCheck' => 'applications/config/check/PhabricatorExtensionsSetupCheck.php',
@@ -3072,7 +3072,7 @@
     'PhabricatorHomeProfileMenuItem' => 'applications/home/menuitem/PhabricatorHomeProfileMenuItem.php',
     'PhabricatorHovercardEngineExtension' => 'applications/search/engineextension/PhabricatorHovercardEngineExtension.php',
     'PhabricatorHovercardEngineExtensionModule' => 'applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php',
-    'PhabricatorIDExportField' => 'infrastructure/export/PhabricatorIDExportField.php',
+    'PhabricatorIDExportField' => 'infrastructure/export/field/PhabricatorIDExportField.php',
     'PhabricatorIDsSearchEngineExtension' => 'applications/search/engineextension/PhabricatorIDsSearchEngineExtension.php',
     'PhabricatorIDsSearchField' => 'applications/search/field/PhabricatorIDsSearchField.php',
     'PhabricatorIconDatasource' => 'applications/files/typeahead/PhabricatorIconDatasource.php',
@@ -3096,7 +3096,7 @@
     'PhabricatorInlineSummaryView' => 'infrastructure/diff/view/PhabricatorInlineSummaryView.php',
     'PhabricatorInstructionsEditField' => 'applications/transactions/editfield/PhabricatorInstructionsEditField.php',
     'PhabricatorIntConfigType' => 'applications/config/type/PhabricatorIntConfigType.php',
-    'PhabricatorIntExportField' => 'infrastructure/export/PhabricatorIntExportField.php',
+    'PhabricatorIntExportField' => 'infrastructure/export/field/PhabricatorIntExportField.php',
     'PhabricatorInternalSetting' => 'applications/settings/setting/PhabricatorInternalSetting.php',
     'PhabricatorInternationalizationManagementExtractWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php',
     'PhabricatorInternationalizationManagementWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementWorkflow.php',
@@ -3106,7 +3106,7 @@
     'PhabricatorIteratorFileUploadSource' => 'applications/files/uploadsource/PhabricatorIteratorFileUploadSource.php',
     'PhabricatorJIRAAuthProvider' => 'applications/auth/provider/PhabricatorJIRAAuthProvider.php',
     'PhabricatorJSONConfigType' => 'applications/config/type/PhabricatorJSONConfigType.php',
-    'PhabricatorJSONExportFormat' => 'infrastructure/export/PhabricatorJSONExportFormat.php',
+    'PhabricatorJSONExportFormat' => 'infrastructure/export/format/PhabricatorJSONExportFormat.php',
     'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorJiraIssueHasObjectEdgeType.php',
     'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php',
@@ -3426,7 +3426,7 @@
     'PhabricatorPHDConfigOptions' => 'applications/config/option/PhabricatorPHDConfigOptions.php',
     'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
     'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
-    'PhabricatorPHIDExportField' => 'infrastructure/export/PhabricatorPHIDExportField.php',
+    'PhabricatorPHIDExportField' => 'infrastructure/export/field/PhabricatorPHIDExportField.php',
     'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php',
     'PhabricatorPHIDListEditField' => 'applications/transactions/editfield/PhabricatorPHIDListEditField.php',
     'PhabricatorPHIDListEditType' => 'applications/transactions/edittype/PhabricatorPHIDListEditType.php',
@@ -4192,7 +4192,7 @@
     'PhabricatorStorageSchemaSpec' => 'infrastructure/storage/schema/PhabricatorStorageSchemaSpec.php',
     'PhabricatorStorageSetupCheck' => 'applications/config/check/PhabricatorStorageSetupCheck.php',
     'PhabricatorStringConfigType' => 'applications/config/type/PhabricatorStringConfigType.php',
-    'PhabricatorStringExportField' => 'infrastructure/export/PhabricatorStringExportField.php',
+    'PhabricatorStringExportField' => 'infrastructure/export/field/PhabricatorStringExportField.php',
     'PhabricatorStringListConfigType' => 'applications/config/type/PhabricatorStringListConfigType.php',
     'PhabricatorStringListEditField' => 'applications/transactions/editfield/PhabricatorStringListEditField.php',
     'PhabricatorStringSetting' => 'applications/settings/setting/PhabricatorStringSetting.php',
@@ -4256,7 +4256,7 @@
     'PhabricatorTextAreaEditField' => 'applications/transactions/editfield/PhabricatorTextAreaEditField.php',
     'PhabricatorTextConfigType' => 'applications/config/type/PhabricatorTextConfigType.php',
     'PhabricatorTextEditField' => 'applications/transactions/editfield/PhabricatorTextEditField.php',
-    'PhabricatorTextExportFormat' => 'infrastructure/export/PhabricatorTextExportFormat.php',
+    'PhabricatorTextExportFormat' => 'infrastructure/export/format/PhabricatorTextExportFormat.php',
     'PhabricatorTextListConfigType' => 'applications/config/type/PhabricatorTextListConfigType.php',
     'PhabricatorTime' => 'infrastructure/time/PhabricatorTime.php',
     'PhabricatorTimeFormatSetting' => 'applications/settings/setting/PhabricatorTimeFormatSetting.php',
diff --git a/src/infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php b/src/infrastructure/export/engine/PhabricatorCustomFieldExportEngineExtension.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php
rename to src/infrastructure/export/engine/PhabricatorCustomFieldExportEngineExtension.php
diff --git a/src/infrastructure/export/PhabricatorExportEngineExtension.php b/src/infrastructure/export/engine/PhabricatorExportEngineExtension.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorExportEngineExtension.php
rename to src/infrastructure/export/engine/PhabricatorExportEngineExtension.php
diff --git a/src/infrastructure/export/PhabricatorEpochExportField.php b/src/infrastructure/export/field/PhabricatorEpochExportField.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorEpochExportField.php
rename to src/infrastructure/export/field/PhabricatorEpochExportField.php
diff --git a/src/infrastructure/export/PhabricatorExportField.php b/src/infrastructure/export/field/PhabricatorExportField.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorExportField.php
rename to src/infrastructure/export/field/PhabricatorExportField.php
diff --git a/src/infrastructure/export/PhabricatorIDExportField.php b/src/infrastructure/export/field/PhabricatorIDExportField.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorIDExportField.php
rename to src/infrastructure/export/field/PhabricatorIDExportField.php
diff --git a/src/infrastructure/export/PhabricatorIntExportField.php b/src/infrastructure/export/field/PhabricatorIntExportField.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorIntExportField.php
rename to src/infrastructure/export/field/PhabricatorIntExportField.php
diff --git a/src/infrastructure/export/PhabricatorPHIDExportField.php b/src/infrastructure/export/field/PhabricatorPHIDExportField.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorPHIDExportField.php
rename to src/infrastructure/export/field/PhabricatorPHIDExportField.php
diff --git a/src/infrastructure/export/PhabricatorStringExportField.php b/src/infrastructure/export/field/PhabricatorStringExportField.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorStringExportField.php
rename to src/infrastructure/export/field/PhabricatorStringExportField.php
diff --git a/src/infrastructure/export/PhabricatorCSVExportFormat.php b/src/infrastructure/export/format/PhabricatorCSVExportFormat.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorCSVExportFormat.php
rename to src/infrastructure/export/format/PhabricatorCSVExportFormat.php
diff --git a/src/infrastructure/export/PhabricatorExcelExportFormat.php b/src/infrastructure/export/format/PhabricatorExcelExportFormat.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorExcelExportFormat.php
rename to src/infrastructure/export/format/PhabricatorExcelExportFormat.php
diff --git a/src/infrastructure/export/PhabricatorExportFormat.php b/src/infrastructure/export/format/PhabricatorExportFormat.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorExportFormat.php
rename to src/infrastructure/export/format/PhabricatorExportFormat.php
diff --git a/src/infrastructure/export/PhabricatorJSONExportFormat.php b/src/infrastructure/export/format/PhabricatorJSONExportFormat.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorJSONExportFormat.php
rename to src/infrastructure/export/format/PhabricatorJSONExportFormat.php
diff --git a/src/infrastructure/export/PhabricatorTextExportFormat.php b/src/infrastructure/export/format/PhabricatorTextExportFormat.php
similarity index 100%
rename from src/infrastructure/export/PhabricatorTextExportFormat.php
rename to src/infrastructure/export/format/PhabricatorTextExportFormat.php

From 61b8c12970be2280b38a2842313c4ca9a6d76a42 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 07:33:04 -0800
Subject: [PATCH 443/865] Make the data export format selector remember your
 last setting

Summary:
Depends on D18956. Ref T13049. Make the "Export Format" selector sticky.

This is partly selfish, since it makes testing format changes a bit easier.

It also seems like it's probably a good behavior in general: if you export to Excel once, that's probably what you're going to pick next time.

Test Plan: Exported to excel. Exported again, got excel as the default option.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18957
---
 src/__phutil_library_map__.php                |  2 +
 ...PhabricatorApplicationSearchController.php | 38 +++++++++++++++++++
 .../engine/PhabricatorExportFormatSetting.php | 16 ++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 src/infrastructure/export/engine/PhabricatorExportFormatSetting.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 8ada6932ae..4d4aeda7aa 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2852,6 +2852,7 @@
     'PhabricatorExportEngineExtension' => 'infrastructure/export/engine/PhabricatorExportEngineExtension.php',
     'PhabricatorExportField' => 'infrastructure/export/field/PhabricatorExportField.php',
     'PhabricatorExportFormat' => 'infrastructure/export/format/PhabricatorExportFormat.php',
+    'PhabricatorExportFormatSetting' => 'infrastructure/export/engine/PhabricatorExportFormatSetting.php',
     'PhabricatorExtendedPolicyInterface' => 'applications/policy/interface/PhabricatorExtendedPolicyInterface.php',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php',
     'PhabricatorExtensionsSetupCheck' => 'applications/config/check/PhabricatorExtensionsSetupCheck.php',
@@ -8288,6 +8289,7 @@
     'PhabricatorExportEngineExtension' => 'Phobject',
     'PhabricatorExportField' => 'Phobject',
     'PhabricatorExportFormat' => 'Phobject',
+    'PhabricatorExportFormatSetting' => 'PhabricatorInternalSetting',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorExtensionsSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorExternalAccount' => array(
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index 88cfd3c137..a5c58aac7f 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -421,6 +421,13 @@ private function processExportRequest() {
     $formats = PhabricatorExportFormat::getAllEnabledExportFormats();
     $format_options = mpull($formats, 'getExportFormatName');
 
+    // Try to default to the format the user used last time. If you just
+    // exported to Excel, you probably want to export to Excel again.
+    $format_key = $this->readExportFormatPreference();
+    if (!isset($formats[$format_key])) {
+      $format_key = head_key($format_options);
+    }
+
     $errors = array();
 
     $e_format = null;
@@ -434,6 +441,8 @@ private function processExportRequest() {
       }
 
       if (!$errors) {
+        $this->writeExportFormatPreference($format_key);
+
         $query = $engine->buildQueryFromSavedQuery($saved_query);
 
         // NOTE: We aren't reading the pager from the request. Exports always
@@ -497,6 +506,7 @@ private function processExportRequest() {
           ->setName('format')
           ->setLabel(pht('Format'))
           ->setError($e_format)
+          ->setValue($format_key)
           ->setOptions($format_options));
 
     return $this->newDialog()
@@ -912,4 +922,32 @@ private function canExport() {
     return true;
   }
 
+  private function readExportFormatPreference() {
+    $viewer = $this->getViewer();
+    $export_key = PhabricatorPolicyFavoritesSetting::SETTINGKEY;
+    return $viewer->getUserSetting($export_key);
+  }
+
+  private function writeExportFormatPreference($value) {
+    $viewer = $this->getViewer();
+    $request = $this->getRequest();
+
+    if (!$viewer->isLoggedIn()) {
+      return;
+    }
+
+    $export_key = PhabricatorPolicyFavoritesSetting::SETTINGKEY;
+    $preferences = PhabricatorUserPreferences::loadUserPreferences($viewer);
+
+    $editor = id(new PhabricatorUserPreferencesEditor())
+      ->setActor($viewer)
+      ->setContentSourceFromRequest($request)
+      ->setContinueOnNoEffect(true)
+      ->setContinueOnMissingFields(true);
+
+    $xactions = array();
+    $xactions[] = $preferences->newTransaction($export_key, $value);
+    $editor->applyTransactions($preferences, $xactions);
+  }
+
 }
diff --git a/src/infrastructure/export/engine/PhabricatorExportFormatSetting.php b/src/infrastructure/export/engine/PhabricatorExportFormatSetting.php
new file mode 100644
index 0000000000..625a90719b
--- /dev/null
+++ b/src/infrastructure/export/engine/PhabricatorExportFormatSetting.php
@@ -0,0 +1,16 @@
+<?php
+
+final class PhabricatorExportFormatSetting
+  extends PhabricatorInternalSetting {
+
+  const SETTINGKEY = 'export.format';
+
+  public function getSettingName() {
+    return pht('Export Format');
+  }
+
+  public function getSettingDefaultValue() {
+    return null;
+  }
+
+}

From 00b4eae1f4a80b6ba1e6acaf3166751c69e6509f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 07:53:25 -0800
Subject: [PATCH 444/865] When PHPExcel is not installed, detect it and provide
 install instructions

Summary:
Depends on D18957. Ref T13049. To do Excel exports, PHPExcel needs to be installed on the system somewhere.

This library is enormous (1K files, ~100K SLOC), which is why we don't just include it in `externals/`. This install process is a little weird and we could improve it, but users don't seem to have too much difficulty with it. This shouldn't be worse than the existing workflow in Maniphest, and I tried to make it at least slightly more clear.

Test Plan: Uninstalled PHPExcel, got it marked "Unavailable" and got reasonably-helpful-ish guidance on how to get it to work. Reinstalled, exported, got a sheet.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18958
---
 ...PhabricatorApplicationSearchController.php | 36 +++++++++++++++++--
 .../format/PhabricatorExcelExportFormat.php   | 25 ++++++++++++-
 .../export/format/PhabricatorExportFormat.php | 12 -------
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index a5c58aac7f..f0bf9bb365 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -418,8 +418,24 @@ private function processExportRequest() {
     $filename = phutil_utf8_strtolower($filename);
     $filename = PhabricatorFile::normalizeFileName($filename);
 
-    $formats = PhabricatorExportFormat::getAllEnabledExportFormats();
-    $format_options = mpull($formats, 'getExportFormatName');
+    $all_formats = PhabricatorExportFormat::getAllExportFormats();
+
+    $available_options = array();
+    $unavailable_options = array();
+    $formats = array();
+    $unavailable_formats = array();
+    foreach ($all_formats as $key => $format) {
+      if ($format->isExportFormatEnabled()) {
+        $available_options[$key] = $format->getExportFormatName();
+        $formats[$key] = $format;
+      } else {
+        $unavailable_options[$key] = pht(
+          '%s (Not Available)',
+          $format->getExportFormatName());
+        $unavailable_formats[$key] = $format;
+      }
+    }
+    $format_options = $available_options + $unavailable_options;
 
     // Try to default to the format the user used last time. If you just
     // exported to Excel, you probably want to export to Excel again.
@@ -433,6 +449,22 @@ private function processExportRequest() {
     $e_format = null;
     if ($request->isFormPost()) {
       $format_key = $request->getStr('format');
+
+      if (isset($unavailable_formats[$format_key])) {
+        $unavailable = $unavailable_formats[$format_key];
+        $instructions = $unavailable->getInstallInstructions();
+
+        $markup = id(new PHUIRemarkupView($viewer, $instructions))
+          ->setRemarkupOption(
+            PHUIRemarkupView::OPTION_PRESERVE_LINEBREAKS,
+            false);
+
+        return $this->newDialog()
+          ->setTitle(pht('Export Format Not Available'))
+          ->appendChild($markup)
+          ->addCancelButton($cancel_uri, pht('Done'));
+      }
+
       $format = idx($formats, $format_key);
 
       if (!$format) {
diff --git a/src/infrastructure/export/format/PhabricatorExcelExportFormat.php b/src/infrastructure/export/format/PhabricatorExcelExportFormat.php
index 633d98fa53..2b0c787884 100644
--- a/src/infrastructure/export/format/PhabricatorExcelExportFormat.php
+++ b/src/infrastructure/export/format/PhabricatorExcelExportFormat.php
@@ -14,7 +14,30 @@ public function getExportFormatName() {
   }
 
   public function isExportFormatEnabled() {
-    return true;
+    // TODO: PHPExcel has a dependency on the PHP zip extension. We should test
+    // for that here, since it fatals if we don't have the ZipArchive class.
+    return @include_once 'PHPExcel.php';
+  }
+
+  public function getInstallInstructions() {
+    return pht(<<<EOHELP
+Data can not be exported to Excel because the PHPExcel library is not
+installed. This software component is required for Phabricator to create
+Excel files.
+
+You can install PHPExcel from GitHub:
+
+> https://github.com/PHPOffice/PHPExcel
+
+Briefly:
+
+  - Clone that repository somewhere on the sever
+    (like `/path/to/example/PHPExcel`).
+  - Update your PHP `%s` setting (in `php.ini`) to include the PHPExcel
+    `Classes` directory (like `/path/to/example/PHPExcel/Classes`).
+EOHELP
+      ,
+      'include_path');
   }
 
   public function getFileExtension() {
diff --git a/src/infrastructure/export/format/PhabricatorExportFormat.php b/src/infrastructure/export/format/PhabricatorExportFormat.php
index 7e174f5197..4566814b9d 100644
--- a/src/infrastructure/export/format/PhabricatorExportFormat.php
+++ b/src/infrastructure/export/format/PhabricatorExportFormat.php
@@ -50,16 +50,4 @@ final public static function getAllExportFormats() {
       ->execute();
   }
 
-  final public static function getAllEnabledExportFormats() {
-    $formats = self::getAllExportFormats();
-
-    foreach ($formats as $key => $format) {
-      if (!$format->isExportFormatEnabled()) {
-        unset($formats[$key]);
-      }
-    }
-
-    return $formats;
-  }
-
 }

From 2ac4e1991b4d64972366c5a1e7c7e129eeea0f02 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 08:12:25 -0800
Subject: [PATCH 445/865] Support new data export infrastructure in Maniphest

Summary: Depends on D18958. Ref T13049. Support the new stuff. There are a couple more fields this needs to strictly improve on the old export, but I'll add them as extensions shortly.

Test Plan: Exported tasks to Excel, saw reasonble-looking data in the export.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18959
---
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorManiphestApplication.php       |   2 +-
 .../query/ManiphestTaskSearchEngine.php       | 107 ++++++++++++++++++
 .../field/PhabricatorURIExportField.php       |   4 +
 4 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 src/infrastructure/export/field/PhabricatorURIExportField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4d4aeda7aa..8e7b09a959 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4322,6 +4322,7 @@
     'PhabricatorUIExample' => 'applications/uiexample/examples/PhabricatorUIExample.php',
     'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/PhabricatorUIExampleRenderController.php',
     'PhabricatorUIExamplesApplication' => 'applications/uiexample/application/PhabricatorUIExamplesApplication.php',
+    'PhabricatorURIExportField' => 'infrastructure/export/field/PhabricatorURIExportField.php',
     'PhabricatorUSEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php',
     'PhabricatorUnifiedDiffsSetting' => 'applications/settings/setting/PhabricatorUnifiedDiffsSetting.php',
     'PhabricatorUnitTestContentSource' => 'infrastructure/contentsource/PhabricatorUnitTestContentSource.php',
@@ -10023,6 +10024,7 @@
     'PhabricatorUIExample' => 'Phobject',
     'PhabricatorUIExampleRenderController' => 'PhabricatorController',
     'PhabricatorUIExamplesApplication' => 'PhabricatorApplication',
+    'PhabricatorURIExportField' => 'PhabricatorExportField',
     'PhabricatorUSEnglishTranslation' => 'PhutilTranslation',
     'PhabricatorUnifiedDiffsSetting' => 'PhabricatorSelectSetting',
     'PhabricatorUnitTestContentSource' => 'PhabricatorContentSource',
diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
index 6e4ac0a8f6..4376eb3f32 100644
--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
@@ -50,7 +50,7 @@ public function getRoutes() {
     return array(
       '/T(?P<id>[1-9]\d*)' => 'ManiphestTaskDetailController',
       '/maniphest/' => array(
-        '(?:query/(?P<queryKey>[^/]+)/)?' => 'ManiphestTaskListController',
+        $this->getQueryRoutePattern() => 'ManiphestTaskListController',
         'report/(?:(?P<view>\w+)/)?' => 'ManiphestReportController',
         $this->getBulkRoutePattern('bulk/') => 'ManiphestBulkEditController',
         'task/' => array(
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index ec1956bd8e..caf6eb30f5 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -432,4 +432,111 @@ protected function getNewUserBody() {
     return $view;
   }
 
+
+  protected function newExportFields() {
+    $fields = array(
+      id(new PhabricatorStringExportField())
+        ->setKey('monogram')
+        ->setLabel(pht('Monogram')),
+      id(new PhabricatorPHIDExportField())
+        ->setKey('authorPHID')
+        ->setLabel(pht('Author PHID')),
+      id(new PhabricatorStringExportField())
+        ->setKey('author')
+        ->setLabel(pht('Author')),
+      id(new PhabricatorPHIDExportField())
+        ->setKey('ownerPHID')
+        ->setLabel(pht('Owner PHID')),
+      id(new PhabricatorStringExportField())
+        ->setKey('owner')
+        ->setLabel(pht('Owner')),
+      id(new PhabricatorStringExportField())
+        ->setKey('status')
+        ->setLabel(pht('Status')),
+      id(new PhabricatorStringExportField())
+        ->setKey('statusName')
+        ->setLabel(pht('Status Name')),
+      id(new PhabricatorStringExportField())
+        ->setKey('priority')
+        ->setLabel(pht('Priority')),
+      id(new PhabricatorStringExportField())
+        ->setKey('priorityName')
+        ->setLabel(pht('Priority Name')),
+      id(new PhabricatorStringExportField())
+        ->setKey('subtype')
+        ->setLabel('string'),
+      id(new PhabricatorURIExportField())
+        ->setKey('uri')
+        ->setLabel(pht('URI')),
+      id(new PhabricatorStringExportField())
+        ->setKey('title')
+        ->setLabel(pht('Title')),
+      id(new PhabricatorStringExportField())
+        ->setKey('description')
+        ->setLabel(pht('Description')),
+    );
+
+    if (ManiphestTaskPoints::getIsEnabled()) {
+      $fields[] = id(new PhabricatorIntExportField())
+        ->setKey('points')
+        ->setLabel('Points');
+    }
+
+    return $fields;
+  }
+
+  protected function newExportData(array $tasks) {
+    $viewer = $this->requireViewer();
+
+    $phids = array();
+    foreach ($tasks as $task) {
+      $phids[] = $task->getAuthorPHID();
+      $phids[] = $task->getOwnerPHID();
+    }
+    $handles = $viewer->loadHandles($phids);
+
+    $export = array();
+    foreach ($tasks as $task) {
+
+      $author_phid = $task->getAuthorPHID();
+      if ($author_phid) {
+        $author_name = $handles[$author_phid]->getName();
+      } else {
+        $author_name = null;
+      }
+
+      $owner_phid = $task->getOwnerPHID();
+      if ($owner_phid) {
+        $owner_name = $handles[$owner_phid]->getName();
+      } else {
+        $owner_name = null;
+      }
+
+      $status_value = $task->getStatus();
+      $status_name = ManiphestTaskStatus::getTaskStatusName($status_value);
+
+      $priority_value = $task->getPriority();
+      $priority_name = ManiphestTaskPriority::getTaskPriorityName(
+        $priority_value);
+
+      $export[] = array(
+        'monogram' => $task->getMonogram(),
+        'authorPHID' => $author_phid,
+        'author' => $author_name,
+        'ownerPHID' => $owner_phid,
+        'owner' => $owner_name,
+        'status' => $status_value,
+        'statusName' => $status_name,
+        'priority' => $priority_value,
+        'priorityName' => $priority_name,
+        'points' => $task->getPoints(),
+        'subtype' => $task->getSubtype(),
+        'title' => $task->getTitle(),
+        'uri' => PhabricatorEnv::getProductionURI($task->getURI()),
+        'description' => $task->getDescription(),
+      );
+    }
+
+    return $export;
+  }
 }
diff --git a/src/infrastructure/export/field/PhabricatorURIExportField.php b/src/infrastructure/export/field/PhabricatorURIExportField.php
new file mode 100644
index 0000000000..9ba2cd4b75
--- /dev/null
+++ b/src/infrastructure/export/field/PhabricatorURIExportField.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorURIExportField
+  extends PhabricatorExportField {}

From c00838878a2d1689e27d221c92c54a50c23e046a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 08:37:38 -0800
Subject: [PATCH 446/865] Implement common infrastructure fields as export
 extensions

Summary:
Depends on D18959. Ref T13049. Provide tags, subscribers, spaces, and created/modified as automatic extensions for all objects which support them.

(Also, for JSON export, be a little more consistent about exporting `null` instead of empty string when there's no value in a text field.)

Test Plan: Exported users and tasks, saw relevant fields in the export.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18960
---
 src/__phutil_library_map__.php                | 14 +++++
 .../query/ManiphestTaskSearchEngine.php       |  2 +-
 .../query/PhabricatorPeopleSearchEngine.php   |  4 --
 .../PhabricatorLiskExportEngineExtension.php  | 42 +++++++++++++
 ...abricatorProjectsExportEngineExtension.php | 60 +++++++++++++++++++
 ...PhabricatorSpacesExportEngineExtension.php | 53 ++++++++++++++++
 ...atorSubscriptionsExportEngineExtension.php | 60 +++++++++++++++++++
 .../export/field/PhabricatorExportField.php   |  8 ++-
 .../field/PhabricatorListExportField.php      | 10 ++++
 .../field/PhabricatorPHIDListExportField.php  | 10 ++++
 .../field/PhabricatorStringExportField.php    | 16 ++++-
 .../PhabricatorStringListExportField.php      |  4 ++
 12 files changed, 276 insertions(+), 7 deletions(-)
 create mode 100644 src/infrastructure/export/engine/PhabricatorLiskExportEngineExtension.php
 create mode 100644 src/infrastructure/export/engine/PhabricatorProjectsExportEngineExtension.php
 create mode 100644 src/infrastructure/export/engine/PhabricatorSpacesExportEngineExtension.php
 create mode 100644 src/infrastructure/export/engine/PhabricatorSubscriptionsExportEngineExtension.php
 create mode 100644 src/infrastructure/export/field/PhabricatorListExportField.php
 create mode 100644 src/infrastructure/export/field/PhabricatorPHIDListExportField.php
 create mode 100644 src/infrastructure/export/field/PhabricatorStringListExportField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 8e7b09a959..132c112879 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3130,9 +3130,11 @@
     'PhabricatorLipsumManagementWorkflow' => 'applications/lipsum/management/PhabricatorLipsumManagementWorkflow.php',
     'PhabricatorLipsumMondrianArtist' => 'applications/lipsum/image/PhabricatorLipsumMondrianArtist.php',
     'PhabricatorLiskDAO' => 'infrastructure/storage/lisk/PhabricatorLiskDAO.php',
+    'PhabricatorLiskExportEngineExtension' => 'infrastructure/export/engine/PhabricatorLiskExportEngineExtension.php',
     'PhabricatorLiskFulltextEngineExtension' => 'applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php',
     'PhabricatorLiskSearchEngineExtension' => 'applications/search/engineextension/PhabricatorLiskSearchEngineExtension.php',
     'PhabricatorLiskSerializer' => 'infrastructure/storage/lisk/PhabricatorLiskSerializer.php',
+    'PhabricatorListExportField' => 'infrastructure/export/field/PhabricatorListExportField.php',
     'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php',
     'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
     'PhabricatorLocaleScopeGuard' => 'infrastructure/internationalization/scope/PhabricatorLocaleScopeGuard.php',
@@ -3431,6 +3433,7 @@
     'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php',
     'PhabricatorPHIDListEditField' => 'applications/transactions/editfield/PhabricatorPHIDListEditField.php',
     'PhabricatorPHIDListEditType' => 'applications/transactions/edittype/PhabricatorPHIDListEditType.php',
+    'PhabricatorPHIDListExportField' => 'infrastructure/export/field/PhabricatorPHIDListExportField.php',
     'PhabricatorPHIDResolver' => 'applications/phid/resolver/PhabricatorPHIDResolver.php',
     'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php',
     'PhabricatorPHIDTypeTestCase' => 'applications/phid/type/__tests__/PhabricatorPHIDTypeTestCase.php',
@@ -3839,6 +3842,7 @@
     'PhabricatorProjectsCurtainExtension' => 'applications/project/engineextension/PhabricatorProjectsCurtainExtension.php',
     'PhabricatorProjectsEditEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php',
     'PhabricatorProjectsEditField' => 'applications/transactions/editfield/PhabricatorProjectsEditField.php',
+    'PhabricatorProjectsExportEngineExtension' => 'infrastructure/export/engine/PhabricatorProjectsExportEngineExtension.php',
     'PhabricatorProjectsFulltextEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php',
     'PhabricatorProjectsMembersSearchEngineAttachment' => 'applications/project/engineextension/PhabricatorProjectsMembersSearchEngineAttachment.php',
     'PhabricatorProjectsMembershipIndexEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php',
@@ -4130,6 +4134,7 @@
     'PhabricatorSpacesController' => 'applications/spaces/controller/PhabricatorSpacesController.php',
     'PhabricatorSpacesDAO' => 'applications/spaces/storage/PhabricatorSpacesDAO.php',
     'PhabricatorSpacesEditController' => 'applications/spaces/controller/PhabricatorSpacesEditController.php',
+    'PhabricatorSpacesExportEngineExtension' => 'infrastructure/export/engine/PhabricatorSpacesExportEngineExtension.php',
     'PhabricatorSpacesInterface' => 'applications/spaces/interface/PhabricatorSpacesInterface.php',
     'PhabricatorSpacesListController' => 'applications/spaces/controller/PhabricatorSpacesListController.php',
     'PhabricatorSpacesNamespace' => 'applications/spaces/storage/PhabricatorSpacesNamespace.php',
@@ -4196,6 +4201,7 @@
     'PhabricatorStringExportField' => 'infrastructure/export/field/PhabricatorStringExportField.php',
     'PhabricatorStringListConfigType' => 'applications/config/type/PhabricatorStringListConfigType.php',
     'PhabricatorStringListEditField' => 'applications/transactions/editfield/PhabricatorStringListEditField.php',
+    'PhabricatorStringListExportField' => 'infrastructure/export/field/PhabricatorStringListExportField.php',
     'PhabricatorStringSetting' => 'applications/settings/setting/PhabricatorStringSetting.php',
     'PhabricatorSubmitEditField' => 'applications/transactions/editfield/PhabricatorSubmitEditField.php',
     'PhabricatorSubscribableInterface' => 'applications/subscriptions/interface/PhabricatorSubscribableInterface.php',
@@ -4210,6 +4216,7 @@
     'PhabricatorSubscriptionsEditController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php',
     'PhabricatorSubscriptionsEditEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php',
     'PhabricatorSubscriptionsEditor' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditor.php',
+    'PhabricatorSubscriptionsExportEngineExtension' => 'infrastructure/export/engine/PhabricatorSubscriptionsExportEngineExtension.php',
     'PhabricatorSubscriptionsFulltextEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php',
     'PhabricatorSubscriptionsHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsHeraldAction.php',
     'PhabricatorSubscriptionsListController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsListController.php',
@@ -8608,9 +8615,11 @@
     'PhabricatorLipsumManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorLipsumMondrianArtist' => 'PhabricatorLipsumArtist',
     'PhabricatorLiskDAO' => 'LiskDAO',
+    'PhabricatorLiskExportEngineExtension' => 'PhabricatorExportEngineExtension',
     'PhabricatorLiskFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
     'PhabricatorLiskSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
     'PhabricatorLiskSerializer' => 'Phobject',
+    'PhabricatorListExportField' => 'PhabricatorExportField',
     'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine',
     'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase',
     'PhabricatorLocaleScopeGuard' => 'Phobject',
@@ -8948,6 +8957,7 @@
     'PhabricatorPHIDExportField' => 'PhabricatorExportField',
     'PhabricatorPHIDListEditField' => 'PhabricatorEditField',
     'PhabricatorPHIDListEditType' => 'PhabricatorEditType',
+    'PhabricatorPHIDListExportField' => 'PhabricatorListExportField',
     'PhabricatorPHIDResolver' => 'Phobject',
     'PhabricatorPHIDType' => 'Phobject',
     'PhabricatorPHIDTypeTestCase' => 'PhutilTestCase',
@@ -9448,6 +9458,7 @@
     'PhabricatorProjectsCurtainExtension' => 'PHUICurtainExtension',
     'PhabricatorProjectsEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorProjectsEditField' => 'PhabricatorTokenizerEditField',
+    'PhabricatorProjectsExportEngineExtension' => 'PhabricatorExportEngineExtension',
     'PhabricatorProjectsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
     'PhabricatorProjectsMembersSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'PhabricatorProjectsMembershipIndexEngineExtension' => 'PhabricatorIndexEngineExtension',
@@ -9815,6 +9826,7 @@
     'PhabricatorSpacesController' => 'PhabricatorController',
     'PhabricatorSpacesDAO' => 'PhabricatorLiskDAO',
     'PhabricatorSpacesEditController' => 'PhabricatorSpacesController',
+    'PhabricatorSpacesExportEngineExtension' => 'PhabricatorExportEngineExtension',
     'PhabricatorSpacesInterface' => 'PhabricatorPHIDInterface',
     'PhabricatorSpacesListController' => 'PhabricatorSpacesController',
     'PhabricatorSpacesNamespace' => array(
@@ -9888,6 +9900,7 @@
     'PhabricatorStringExportField' => 'PhabricatorExportField',
     'PhabricatorStringListConfigType' => 'PhabricatorTextListConfigType',
     'PhabricatorStringListEditField' => 'PhabricatorEditField',
+    'PhabricatorStringListExportField' => 'PhabricatorListExportField',
     'PhabricatorStringSetting' => 'PhabricatorSetting',
     'PhabricatorSubmitEditField' => 'PhabricatorEditField',
     'PhabricatorSubscribedToObjectEdgeType' => 'PhabricatorEdgeType',
@@ -9901,6 +9914,7 @@
     'PhabricatorSubscriptionsEditController' => 'PhabricatorController',
     'PhabricatorSubscriptionsEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'PhabricatorSubscriptionsEditor' => 'PhabricatorEditor',
+    'PhabricatorSubscriptionsExportEngineExtension' => 'PhabricatorExportEngineExtension',
     'PhabricatorSubscriptionsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
     'PhabricatorSubscriptionsHeraldAction' => 'HeraldAction',
     'PhabricatorSubscriptionsListController' => 'PhabricatorController',
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index caf6eb30f5..ad668db376 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -464,7 +464,7 @@ protected function newExportFields() {
         ->setLabel(pht('Priority Name')),
       id(new PhabricatorStringExportField())
         ->setKey('subtype')
-        ->setLabel('string'),
+        ->setLabel('Subtype'),
       id(new PhabricatorURIExportField())
         ->setKey('uri')
         ->setLabel(pht('URI')),
diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
index e0e1b5070e..57ed133df4 100644
--- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
@@ -328,9 +328,6 @@ protected function newExportFields() {
       id(new PhabricatorStringExportField())
         ->setKey('realName')
         ->setLabel(pht('Real Name')),
-      id(new PhabricatorEpochExportField())
-        ->setKey('created')
-        ->setLabel(pht('Date Created')),
     );
   }
 
@@ -342,7 +339,6 @@ protected function newExportData(array $users) {
       $export[] = array(
         'username' => $user->getUsername(),
         'realName' => $user->getRealName(),
-        'created' => $user->getDateCreated(),
       );
     }
 
diff --git a/src/infrastructure/export/engine/PhabricatorLiskExportEngineExtension.php b/src/infrastructure/export/engine/PhabricatorLiskExportEngineExtension.php
new file mode 100644
index 0000000000..5162986057
--- /dev/null
+++ b/src/infrastructure/export/engine/PhabricatorLiskExportEngineExtension.php
@@ -0,0 +1,42 @@
+<?php
+
+final class PhabricatorLiskExportEngineExtension
+  extends PhabricatorExportEngineExtension {
+
+  const EXTENSIONKEY = 'lisk';
+
+  public function supportsObject($object) {
+    if (!($object instanceof LiskDAO)) {
+      return false;
+    }
+
+    if (!$object->getConfigOption(LiskDAO::CONFIG_TIMESTAMPS)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  public function newExportFields() {
+    return array(
+      id(new PhabricatorEpochExportField())
+        ->setKey('dateCreated')
+        ->setLabel(pht('Created')),
+      id(new PhabricatorEpochExportField())
+        ->setKey('dateModified')
+        ->setLabel(pht('Modified')),
+    );
+  }
+
+  public function newExportData(array $objects) {
+    $map = array();
+    foreach ($objects as $object) {
+      $map[] = array(
+        'dateCreated' => $object->getDateCreated(),
+        'dateModified' => $object->getDateModified(),
+      );
+    }
+    return $map;
+  }
+
+}
diff --git a/src/infrastructure/export/engine/PhabricatorProjectsExportEngineExtension.php b/src/infrastructure/export/engine/PhabricatorProjectsExportEngineExtension.php
new file mode 100644
index 0000000000..eb3bca3a49
--- /dev/null
+++ b/src/infrastructure/export/engine/PhabricatorProjectsExportEngineExtension.php
@@ -0,0 +1,60 @@
+<?php
+
+final class PhabricatorProjectsExportEngineExtension
+  extends PhabricatorExportEngineExtension {
+
+  const EXTENSIONKEY = 'projects';
+
+  public function supportsObject($object) {
+    return ($object instanceof PhabricatorProjectInterface);
+  }
+
+  public function newExportFields() {
+    return array(
+      id(new PhabricatorPHIDListExportField())
+        ->setKey('tagPHIDs')
+        ->setLabel(pht('Tag PHIDs')),
+      id(new PhabricatorStringListExportField())
+        ->setKey('tags')
+        ->setLabel(pht('Tags')),
+    );
+  }
+
+  public function newExportData(array $objects) {
+    $viewer = $this->getViewer();
+
+    $object_phids = mpull($objects, 'getPHID');
+
+    $projects_query = id(new PhabricatorEdgeQuery())
+      ->withSourcePHIDs($object_phids)
+      ->withEdgeTypes(
+        array(
+          PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
+        ));
+    $projects_query->execute();
+
+    $handles = $viewer->loadHandles($projects_query->getDestinationPHIDs());
+
+    $map = array();
+    foreach ($objects as $object) {
+      $object_phid = $object->getPHID();
+
+      $project_phids = $projects_query->getDestinationPHIDs(
+        array($object_phid),
+        array(PhabricatorProjectObjectHasProjectEdgeType::EDGECONST));
+
+      $handle_list = $handles->newSublist($project_phids);
+      $handle_list = iterator_to_array($handle_list);
+      $handle_names = mpull($handle_list, 'getName');
+      $handle_names = array_values($handle_names);
+
+      $map[] = array(
+        'tagPHIDs' => $project_phids,
+        'tags' => $handle_names,
+      );
+    }
+
+    return $map;
+  }
+
+}
diff --git a/src/infrastructure/export/engine/PhabricatorSpacesExportEngineExtension.php b/src/infrastructure/export/engine/PhabricatorSpacesExportEngineExtension.php
new file mode 100644
index 0000000000..3e187bc8cd
--- /dev/null
+++ b/src/infrastructure/export/engine/PhabricatorSpacesExportEngineExtension.php
@@ -0,0 +1,53 @@
+<?php
+
+final class PhabricatorSpacesExportEngineExtension
+  extends PhabricatorExportEngineExtension {
+
+  const EXTENSIONKEY = 'spaces';
+
+  public function supportsObject($object) {
+    $viewer = $this->getViewer();
+
+    if (!PhabricatorSpacesNamespaceQuery::getViewerSpacesExist($viewer)) {
+      return false;
+    }
+
+    return ($object instanceof PhabricatorSpacesInterface);
+  }
+
+  public function newExportFields() {
+    return array(
+      id(new PhabricatorPHIDExportField())
+        ->setKey('spacePHID')
+        ->setLabel(pht('Space PHID')),
+      id(new PhabricatorStringExportField())
+        ->setKey('space')
+        ->setLabel(pht('Space')),
+    );
+  }
+
+  public function newExportData(array $objects) {
+    $viewer = $this->getViewer();
+
+    $space_phids = array();
+    foreach ($objects as $object) {
+      $space_phids[] = PhabricatorSpacesNamespaceQuery::getObjectSpacePHID(
+        $object);
+    }
+    $handles = $viewer->loadHandles($space_phids);
+
+    $map = array();
+    foreach ($objects as $object) {
+      $space_phid = PhabricatorSpacesNamespaceQuery::getObjectSpacePHID(
+        $object);
+
+      $map[] = array(
+        'spacePHID' => $space_phid,
+        'space' => $handles[$space_phid]->getName(),
+      );
+    }
+
+    return $map;
+  }
+
+}
diff --git a/src/infrastructure/export/engine/PhabricatorSubscriptionsExportEngineExtension.php b/src/infrastructure/export/engine/PhabricatorSubscriptionsExportEngineExtension.php
new file mode 100644
index 0000000000..8aedb38fa8
--- /dev/null
+++ b/src/infrastructure/export/engine/PhabricatorSubscriptionsExportEngineExtension.php
@@ -0,0 +1,60 @@
+<?php
+
+final class PhabricatorSubscriptionsExportEngineExtension
+  extends PhabricatorExportEngineExtension {
+
+  const EXTENSIONKEY = 'subscriptions';
+
+  public function supportsObject($object) {
+    return ($object instanceof PhabricatorSubscribableInterface);
+  }
+
+  public function newExportFields() {
+    return array(
+      id(new PhabricatorPHIDListExportField())
+        ->setKey('subscriberPHIDs')
+        ->setLabel(pht('Subscriber PHIDs')),
+      id(new PhabricatorStringListExportField())
+        ->setKey('subscribers')
+        ->setLabel(pht('Subscribers')),
+    );
+  }
+
+  public function newExportData(array $objects) {
+    $viewer = $this->getViewer();
+
+    $object_phids = mpull($objects, 'getPHID');
+
+    $projects_query = id(new PhabricatorEdgeQuery())
+      ->withSourcePHIDs($object_phids)
+      ->withEdgeTypes(
+        array(
+          PhabricatorObjectHasSubscriberEdgeType::EDGECONST,
+        ));
+    $projects_query->execute();
+
+    $handles = $viewer->loadHandles($projects_query->getDestinationPHIDs());
+
+    $map = array();
+    foreach ($objects as $object) {
+      $object_phid = $object->getPHID();
+
+      $project_phids = $projects_query->getDestinationPHIDs(
+        array($object_phid),
+        array(PhabricatorObjectHasSubscriberEdgeType::EDGECONST));
+
+      $handle_list = $handles->newSublist($project_phids);
+      $handle_list = iterator_to_array($handle_list);
+      $handle_names = mpull($handle_list, 'getName');
+      $handle_names = array_values($handle_names);
+
+      $map[] = array(
+        'subscriberPHIDs' => $project_phids,
+        'subscribers' => $handle_names,
+      );
+    }
+
+    return $map;
+  }
+
+}
diff --git a/src/infrastructure/export/field/PhabricatorExportField.php b/src/infrastructure/export/field/PhabricatorExportField.php
index 85e21b3e37..7ee0918595 100644
--- a/src/infrastructure/export/field/PhabricatorExportField.php
+++ b/src/infrastructure/export/field/PhabricatorExportField.php
@@ -25,7 +25,13 @@ public function getLabel() {
   }
 
   public function getTextValue($value) {
-    return (string)$this->getNaturalValue($value);
+    $natural_value = $this->getNaturalValue($value);
+
+    if ($natural_value === null) {
+      return null;
+    }
+
+    return (string)$natural_value;
   }
 
   public function getNaturalValue($value) {
diff --git a/src/infrastructure/export/field/PhabricatorListExportField.php b/src/infrastructure/export/field/PhabricatorListExportField.php
new file mode 100644
index 0000000000..67c3e06ff5
--- /dev/null
+++ b/src/infrastructure/export/field/PhabricatorListExportField.php
@@ -0,0 +1,10 @@
+<?php
+
+abstract class PhabricatorListExportField
+  extends PhabricatorExportField {
+
+  public function getTextValue($value) {
+    return implode("\n", $value);
+  }
+
+}
diff --git a/src/infrastructure/export/field/PhabricatorPHIDListExportField.php b/src/infrastructure/export/field/PhabricatorPHIDListExportField.php
new file mode 100644
index 0000000000..e75a891a5b
--- /dev/null
+++ b/src/infrastructure/export/field/PhabricatorPHIDListExportField.php
@@ -0,0 +1,10 @@
+<?php
+
+final class PhabricatorPHIDListExportField
+  extends PhabricatorListExportField {
+
+  public function getCharacterWidth() {
+    return 32;
+  }
+
+}
diff --git a/src/infrastructure/export/field/PhabricatorStringExportField.php b/src/infrastructure/export/field/PhabricatorStringExportField.php
index e8d30c84d0..f41548f550 100644
--- a/src/infrastructure/export/field/PhabricatorStringExportField.php
+++ b/src/infrastructure/export/field/PhabricatorStringExportField.php
@@ -1,4 +1,18 @@
 <?php
 
 final class PhabricatorStringExportField
-  extends PhabricatorExportField {}
+  extends PhabricatorExportField {
+
+  public function getNaturalValue($value) {
+    if ($value === null) {
+      return $value;
+    }
+
+    if (!strlen($value)) {
+      return null;
+    }
+
+    return (string)$value;
+  }
+
+}
diff --git a/src/infrastructure/export/field/PhabricatorStringListExportField.php b/src/infrastructure/export/field/PhabricatorStringListExportField.php
new file mode 100644
index 0000000000..3548e51897
--- /dev/null
+++ b/src/infrastructure/export/field/PhabricatorStringListExportField.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorStringListExportField
+  extends PhabricatorListExportField {}

From ea58b6aceae30e27a624184b72adacf0a98148bb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 08:56:49 -0800
Subject: [PATCH 447/865] Remove the old, non-modular Excel export workflow
 from Maniphest

Summary:
Depends on D18960. Ref T13049. Now that Maniphest fully supports "Export Data", remove the old hard-coded version.

This is a backward compatibility break with the handful of installs that might have defined a custom export by subclassing `ManiphestExcelFormat`. I suspect this is almost zero installs, and that the additional data in the new format may serve most of the needs of this tiny number of installs. They can upgrade to `ExportEngineExtensions` fairly easily if this isn't true.

Test Plan:
  - Viewed Maniphest, no longer saw the old export workflow.
  - Grepped for `export` and similar strings to try to hunt everything down.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18961
---
 src/__phutil_library_map__.php                |   8 -
 .../PhabricatorManiphestApplication.php       |   1 -
 .../controller/ManiphestExportController.php  | 135 -----------------
 .../export/ManiphestExcelDefaultFormat.php    | 140 ------------------
 .../maniphest/export/ManiphestExcelFormat.php |  35 -----
 .../ManiphestExcelFormatTestCase.php          |  10 --
 .../view/ManiphestTaskResultListView.php      |  13 +-
 ...PhabricatorApplicationSearchController.php |   2 +-
 8 files changed, 2 insertions(+), 342 deletions(-)
 delete mode 100644 src/applications/maniphest/controller/ManiphestExportController.php
 delete mode 100644 src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
 delete mode 100644 src/applications/maniphest/export/ManiphestExcelFormat.php
 delete mode 100644 src/applications/maniphest/export/__tests__/ManiphestExcelFormatTestCase.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 132c112879..1f71d97460 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1525,10 +1525,6 @@
     'ManiphestEditProjectsCapability' => 'applications/maniphest/capability/ManiphestEditProjectsCapability.php',
     'ManiphestEditStatusCapability' => 'applications/maniphest/capability/ManiphestEditStatusCapability.php',
     'ManiphestEmailCommand' => 'applications/maniphest/command/ManiphestEmailCommand.php',
-    'ManiphestExcelDefaultFormat' => 'applications/maniphest/export/ManiphestExcelDefaultFormat.php',
-    'ManiphestExcelFormat' => 'applications/maniphest/export/ManiphestExcelFormat.php',
-    'ManiphestExcelFormatTestCase' => 'applications/maniphest/export/__tests__/ManiphestExcelFormatTestCase.php',
-    'ManiphestExportController' => 'applications/maniphest/controller/ManiphestExportController.php',
     'ManiphestGetTaskTransactionsConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php',
     'ManiphestHovercardEngineExtension' => 'applications/maniphest/engineextension/ManiphestHovercardEngineExtension.php',
     'ManiphestInfoConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestInfoConduitAPIMethod.php',
@@ -6780,10 +6776,6 @@
     'ManiphestEditProjectsCapability' => 'PhabricatorPolicyCapability',
     'ManiphestEditStatusCapability' => 'PhabricatorPolicyCapability',
     'ManiphestEmailCommand' => 'MetaMTAEmailTransactionCommand',
-    'ManiphestExcelDefaultFormat' => 'ManiphestExcelFormat',
-    'ManiphestExcelFormat' => 'Phobject',
-    'ManiphestExcelFormatTestCase' => 'PhabricatorTestCase',
-    'ManiphestExportController' => 'ManiphestController',
     'ManiphestGetTaskTransactionsConduitAPIMethod' => 'ManiphestConduitAPIMethod',
     'ManiphestHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
     'ManiphestInfoConduitAPIMethod' => 'ManiphestConduitAPIMethod',
diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
index 4376eb3f32..0075770863 100644
--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
@@ -57,7 +57,6 @@ public function getRoutes() {
           $this->getEditRoutePattern('edit/')
             => 'ManiphestTaskEditController',
         ),
-        'export/(?P<key>[^/]+)/' => 'ManiphestExportController',
         'subpriority/' => 'ManiphestSubpriorityController',
       ),
     );
diff --git a/src/applications/maniphest/controller/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php
deleted file mode 100644
index 1201c50478..0000000000
--- a/src/applications/maniphest/controller/ManiphestExportController.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-final class ManiphestExportController extends ManiphestController {
-
-  /**
-   * @phutil-external-symbol class PHPExcel
-   * @phutil-external-symbol class PHPExcel_IOFactory
-   * @phutil-external-symbol class PHPExcel_Style_NumberFormat
-   * @phutil-external-symbol class PHPExcel_Cell_DataType
-   */
-  public function handleRequest(AphrontRequest $request) {
-    $viewer = $this->getViewer();
-    $key = $request->getURIData('key');
-
-    $ok = @include_once 'PHPExcel.php';
-    if (!$ok) {
-      $dialog = $this->newDialog();
-
-      $inst1 = pht(
-        'This system does not have PHPExcel installed. This software '.
-        'component is required to export tasks to Excel. Have your system '.
-        'administrator install it from:');
-
-      $inst2 = pht(
-        'Your PHP "%s" needs to be updated to include the '.
-        'PHPExcel Classes directory.',
-        'include_path');
-
-      $dialog->setTitle(pht('Excel Export Not Configured'));
-      $dialog->appendChild(hsprintf(
-        '<p>%s</p>'.
-        '<br />'.
-        '<p>'.
-          '<a href="https://github.com/PHPOffice/PHPExcel">'.
-            'https://github.com/PHPOffice/PHPExcel'.
-          '</a>'.
-        '</p>'.
-        '<br />'.
-        '<p>%s</p>',
-        $inst1,
-        $inst2));
-
-      $dialog->addCancelButton('/maniphest/');
-      return id(new AphrontDialogResponse())->setDialog($dialog);
-    }
-
-    // TODO: PHPExcel has a dependency on the PHP zip extension. We should test
-    // for that here, since it fatals if we don't have the ZipArchive class.
-
-    $saved = id(new PhabricatorSavedQueryQuery())
-      ->setViewer($viewer)
-      ->withQueryKeys(array($key))
-      ->executeOne();
-    if (!$saved) {
-      $engine = id(new ManiphestTaskSearchEngine())
-        ->setViewer($viewer);
-      if ($engine->isBuiltinQuery($key)) {
-        $saved = $engine->buildSavedQueryFromBuiltin($key);
-      }
-      if (!$saved) {
-        return new Aphront404Response();
-      }
-    }
-
-    $formats = ManiphestExcelFormat::loadAllFormats();
-    $export_formats = array();
-    foreach ($formats as $format_class => $format_object) {
-      $export_formats[$format_class] = $format_object->getName();
-    }
-
-    if (!$request->isDialogFormPost()) {
-      $dialog = new AphrontDialogView();
-      $dialog->setUser($viewer);
-
-      $dialog->setTitle(pht('Export Tasks to Excel'));
-      $dialog->appendChild(
-        phutil_tag(
-          'p',
-          array(),
-          pht('Do you want to export the query results to Excel?')));
-
-      $form = id(new PHUIFormLayoutView())
-        ->appendChild(
-          id(new AphrontFormSelectControl())
-            ->setLabel(pht('Format:'))
-            ->setName('excel-format')
-            ->setOptions($export_formats));
-
-      $dialog->appendChild($form);
-
-      $dialog->addCancelButton('/maniphest/');
-      $dialog->addSubmitButton(pht('Export to Excel'));
-      return id(new AphrontDialogResponse())->setDialog($dialog);
-    }
-
-    $format = idx($formats, $request->getStr('excel-format'));
-    if ($format === null) {
-      throw new Exception(pht('Excel format object not found.'));
-    }
-
-    $saved->makeEphemeral();
-    $saved->setParameter('limit', PHP_INT_MAX);
-
-    $engine = id(new ManiphestTaskSearchEngine())
-      ->setViewer($viewer);
-
-    $query = $engine->buildQueryFromSavedQuery($saved);
-    $query->setViewer($viewer);
-    $tasks = $query->execute();
-
-    $all_projects = array_mergev(mpull($tasks, 'getProjectPHIDs'));
-    $all_assigned = mpull($tasks, 'getOwnerPHID');
-
-    $handles = id(new PhabricatorHandleQuery())
-      ->setViewer($viewer)
-      ->withPHIDs(array_merge($all_projects, $all_assigned))
-      ->execute();
-
-    $workbook = new PHPExcel();
-    $format->buildWorkbook($workbook, $tasks, $handles, $viewer);
-    $writer = PHPExcel_IOFactory::createWriter($workbook, 'Excel2007');
-
-    ob_start();
-    $writer->save('php://output');
-    $data = ob_get_clean();
-
-    $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-
-    return id(new AphrontFileResponse())
-      ->setMimeType($mime)
-      ->setDownload($format->getFileName().'.xlsx')
-      ->setContent($data);
-  }
-
-}
diff --git a/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php b/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
deleted file mode 100644
index 1451ae504e..0000000000
--- a/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-final class ManiphestExcelDefaultFormat extends ManiphestExcelFormat {
-
-  public function getName() {
-    return pht('Default');
-  }
-
-  public function getFileName() {
-    return 'maniphest_tasks_'.date('Ymd');
-  }
-
-  /**
-   * @phutil-external-symbol class PHPExcel
-   * @phutil-external-symbol class PHPExcel_IOFactory
-   * @phutil-external-symbol class PHPExcel_Style_NumberFormat
-   * @phutil-external-symbol class PHPExcel_Cell_DataType
-   */
-  public function buildWorkbook(
-    PHPExcel $workbook,
-    array $tasks,
-    array $handles,
-    PhabricatorUser $user) {
-
-    $sheet = $workbook->setActiveSheetIndex(0);
-    $sheet->setTitle(pht('Tasks'));
-
-    $widths = array(
-      null,
-      15,
-      null,
-      10,
-      15,
-      15,
-      60,
-      30,
-      20,
-      100,
-    );
-
-    foreach ($widths as $col => $width) {
-      if ($width !== null) {
-        $sheet->getColumnDimension($this->col($col))->setWidth($width);
-      }
-    }
-
-    $status_map = ManiphestTaskStatus::getTaskStatusMap();
-    $pri_map = ManiphestTaskPriority::getTaskPriorityMap();
-
-    $date_format = null;
-
-    $rows = array();
-    $rows[] = array(
-      pht('ID'),
-      pht('Owner'),
-      pht('Status'),
-      pht('Priority'),
-      pht('Date Created'),
-      pht('Date Updated'),
-      pht('Title'),
-      pht('Tags'),
-      pht('URI'),
-      pht('Description'),
-    );
-
-    $is_date = array(
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false,
-    );
-
-    $header_format = array(
-      'font'  => array(
-        'bold' => true,
-      ),
-    );
-
-    foreach ($tasks as $task) {
-      $task_owner = null;
-      if ($task->getOwnerPHID()) {
-        $task_owner = $handles[$task->getOwnerPHID()]->getName();
-      }
-
-      $projects = array();
-      foreach ($task->getProjectPHIDs() as $phid) {
-        $projects[] = $handles[$phid]->getName();
-      }
-      $projects = implode(', ', $projects);
-
-      $rows[] = array(
-        'T'.$task->getID(),
-        $task_owner,
-        idx($status_map, $task->getStatus(), '?'),
-        idx($pri_map, $task->getPriority(), '?'),
-        $this->computeExcelDate($task->getDateCreated()),
-        $this->computeExcelDate($task->getDateModified()),
-        $task->getTitle(),
-        $projects,
-        PhabricatorEnv::getProductionURI('/T'.$task->getID()),
-        id(new PhutilUTF8StringTruncator())
-        ->setMaximumBytes(512)
-        ->truncateString($task->getDescription()),
-      );
-    }
-
-    foreach ($rows as $row => $cols) {
-      foreach ($cols as $col => $spec) {
-        $cell_name = $this->col($col).($row + 1);
-        $cell = $sheet
-          ->setCellValue($cell_name, $spec, $return_cell = true);
-
-        if ($row == 0) {
-          $sheet->getStyle($cell_name)->applyFromArray($header_format);
-        }
-
-        if ($is_date[$col]) {
-          $code = PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2;
-          $sheet
-            ->getStyle($cell_name)
-            ->getNumberFormat()
-            ->setFormatCode($code);
-        } else {
-          $cell->setDataType(PHPExcel_Cell_DataType::TYPE_STRING);
-        }
-      }
-    }
-  }
-
-  private function col($n) {
-    return chr(ord('A') + $n);
-  }
-
-}
diff --git a/src/applications/maniphest/export/ManiphestExcelFormat.php b/src/applications/maniphest/export/ManiphestExcelFormat.php
deleted file mode 100644
index e455a63656..0000000000
--- a/src/applications/maniphest/export/ManiphestExcelFormat.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-abstract class ManiphestExcelFormat extends Phobject {
-
-  final public static function loadAllFormats() {
-    return id(new PhutilClassMapQuery())
-      ->setAncestorClass(__CLASS__)
-      ->setSortMethod('getOrder')
-      ->execute();
-  }
-
-  abstract public function getName();
-  abstract public function getFileName();
-
-  public function getOrder() {
-    return 0;
-  }
-
-  protected function computeExcelDate($epoch) {
-    $seconds_per_day = (60 * 60 * 24);
-    $offset = ($seconds_per_day * 25569);
-
-    return ($epoch + $offset) / $seconds_per_day;
-  }
-
-  /**
-   * @phutil-external-symbol class PHPExcel
-   */
-  abstract public function buildWorkbook(
-    PHPExcel $workbook,
-    array $tasks,
-    array $handles,
-    PhabricatorUser $user);
-
-}
diff --git a/src/applications/maniphest/export/__tests__/ManiphestExcelFormatTestCase.php b/src/applications/maniphest/export/__tests__/ManiphestExcelFormatTestCase.php
deleted file mode 100644
index a3c312fcd2..0000000000
--- a/src/applications/maniphest/export/__tests__/ManiphestExcelFormatTestCase.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-final class ManiphestExcelFormatTestCase extends PhabricatorTestCase {
-
-  public function testLoadAllFormats() {
-    ManiphestExcelFormat::loadAllFormats();
-    $this->assertTrue(true);
-  }
-
-}
diff --git a/src/applications/maniphest/view/ManiphestTaskResultListView.php b/src/applications/maniphest/view/ManiphestTaskResultListView.php
index b4cf9a544c..6aafcbdccb 100644
--- a/src/applications/maniphest/view/ManiphestTaskResultListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskResultListView.php
@@ -175,8 +175,7 @@ private function renderBatchEditor(PhabricatorSavedQuery $saved_query) {
     }
 
     if (!$user->isLoggedIn()) {
-      // Don't show the batch editor or excel export for logged-out users.
-      // Technically we //could// let them export, but ehh.
+      // Don't show the batch editor for logged-out users.
       return null;
     }
 
@@ -220,14 +219,6 @@ private function renderBatchEditor(PhabricatorSavedQuery $saved_query) {
       ),
       pht("Bulk Edit Selected \xC2\xBB"));
 
-    $export = javelin_tag(
-      'a',
-      array(
-        'href' => '/maniphest/export/'.$saved_query->getQueryKey().'/',
-        'class' => 'button button-grey',
-      ),
-      pht('Export to Excel'));
-
     $hidden = phutil_tag(
       'div',
       array(
@@ -239,14 +230,12 @@ private function renderBatchEditor(PhabricatorSavedQuery $saved_query) {
         '<table class="maniphest-batch-editor-layout">'.
           '<tr>'.
             '<td>%s%s</td>'.
-            '<td>%s</td>'.
             '<td id="batch-select-status-cell">%s</td>'.
             '<td class="batch-select-submit-cell">%s%s</td>'.
           '</tr>'.
         '</table>',
       $select_all,
       $select_none,
-      $export,
       '',
       $submit,
       $hidden);
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index f0bf9bb365..ea46886a15 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -154,7 +154,7 @@ private function processSearchRequest() {
       $saved_query = $engine->buildSavedQueryFromRequest($request);
 
       // Save the query to generate a query key, so "Save Custom Query..." and
-      // other features like Maniphest's "Export..." work correctly.
+      // other features like "Bulk Edit" and "Export Data" work correctly.
       $engine->saveQuery($saved_query);
     }
 

From 84df1220858f61f13ee33506edfc8ec61af920c7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 10:29:49 -0800
Subject: [PATCH 448/865] When exporting more than 1,000 records, export in the
 background

Summary:
Depends on D18961. Ref T13049. Currently, longer exports don't give the user any feedback, and exports that take longer than 30 seconds are likely to timeout.

For small exports (up to 1,000 rows) continue doing the export in the web process.

For large exports, queue a bulk job and do them in the workers instead. This sends the user through the bulk operation UI and is similar to bulk edits. It's a little clunky for now, but you get your data at the end, which is far better than hanging for 30 seconds and then fataling.

Test Plan: Exported small result sets, got the same workflow as before. Exported very large result sets, went through the bulk flow, got reasonable results out.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18962
---
 src/__phutil_library_map__.php                |   6 +
 ...PhabricatorDaemonBulkJobViewController.php |  12 +-
 ...PhabricatorApplicationSearchController.php |  81 ++++-----
 .../bulk/PhabricatorWorkerBulkJobType.php     |  20 +++
 .../bulk/PhabricatorWorkerBulkJobWorker.php   |   4 +
 .../PhabricatorWorkerSingleBulkJobType.php    |  27 +++
 .../storage/PhabricatorWorkerBulkJob.php      |   4 +
 .../export/engine/PhabricatorExportEngine.php | 168 ++++++++++++++++++
 .../PhabricatorExportEngineBulkJobType.php    | 118 ++++++++++++
 9 files changed, 381 insertions(+), 59 deletions(-)
 create mode 100644 src/infrastructure/daemon/workers/bulk/PhabricatorWorkerSingleBulkJobType.php
 create mode 100644 src/infrastructure/export/engine/PhabricatorExportEngine.php
 create mode 100644 src/infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1f71d97460..06f619d74e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2845,6 +2845,8 @@
     'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
     'PhabricatorExcelExportFormat' => 'infrastructure/export/format/PhabricatorExcelExportFormat.php',
     'PhabricatorExecFutureFileUploadSource' => 'applications/files/uploadsource/PhabricatorExecFutureFileUploadSource.php',
+    'PhabricatorExportEngine' => 'infrastructure/export/engine/PhabricatorExportEngine.php',
+    'PhabricatorExportEngineBulkJobType' => 'infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php',
     'PhabricatorExportEngineExtension' => 'infrastructure/export/engine/PhabricatorExportEngineExtension.php',
     'PhabricatorExportField' => 'infrastructure/export/field/PhabricatorExportField.php',
     'PhabricatorExportFormat' => 'infrastructure/export/format/PhabricatorExportFormat.php',
@@ -4419,6 +4421,7 @@
     'PhabricatorWorkerManagementWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerManagementWorkflow.php',
     'PhabricatorWorkerPermanentFailureException' => 'infrastructure/daemon/workers/exception/PhabricatorWorkerPermanentFailureException.php',
     'PhabricatorWorkerSchemaSpec' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerSchemaSpec.php',
+    'PhabricatorWorkerSingleBulkJobType' => 'infrastructure/daemon/workers/bulk/PhabricatorWorkerSingleBulkJobType.php',
     'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php',
     'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTaskData.php',
     'PhabricatorWorkerTaskDetailController' => 'applications/daemon/controller/PhabricatorWorkerTaskDetailController.php',
@@ -8286,6 +8289,8 @@
     'PhabricatorExampleEventListener' => 'PhabricatorEventListener',
     'PhabricatorExcelExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorExecFutureFileUploadSource' => 'PhabricatorFileUploadSource',
+    'PhabricatorExportEngine' => 'Phobject',
+    'PhabricatorExportEngineBulkJobType' => 'PhabricatorWorkerSingleBulkJobType',
     'PhabricatorExportEngineExtension' => 'Phobject',
     'PhabricatorExportField' => 'Phobject',
     'PhabricatorExportFormat' => 'Phobject',
@@ -10154,6 +10159,7 @@
     'PhabricatorWorkerManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorWorkerPermanentFailureException' => 'Exception',
     'PhabricatorWorkerSchemaSpec' => 'PhabricatorConfigSchemaSpec',
+    'PhabricatorWorkerSingleBulkJobType' => 'PhabricatorWorkerBulkJobType',
     'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO',
     'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',
     'PhabricatorWorkerTaskDetailController' => 'PhabricatorDaemonController',
diff --git a/src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php b/src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php
index f7aa396e94..00fb297fe0 100644
--- a/src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php
+++ b/src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php
@@ -71,18 +71,10 @@ private function buildCurtainView(PhabricatorWorkerBulkJob $job) {
     $viewer = $this->getViewer();
     $curtain = $this->newCurtainView($job);
 
-    if ($job->isConfirming()) {
-      $continue_uri = $job->getMonitorURI();
-    } else {
-      $continue_uri = $job->getDoneURI();
+    foreach ($job->getCurtainActions($viewer) as $action) {
+      $curtain->addAction($action);
     }
 
-    $curtain->addAction(
-      id(new PhabricatorActionView())
-        ->setHref($continue_uri)
-        ->setIcon('fa-arrow-circle-o-right')
-        ->setName(pht('Continue')));
-
     return $curtain;
   }
 
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index ea46886a15..6c7d80eafe 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -444,6 +444,17 @@ private function processExportRequest() {
       $format_key = head_key($format_options);
     }
 
+    // Check if this is a large result set or not. If we're exporting a
+    // large amount of data, we'll build the actual export file in the daemons.
+
+    $threshold = 1000;
+    $query = $engine->buildQueryFromSavedQuery($saved_query);
+    $pager = $engine->newPagerForSavedQuery($saved_query);
+    $pager->setPageSize($threshold + 1);
+    $objects = $engine->executeQuery($query, $pager);
+    $object_count = count($objects);
+    $is_large_export = ($object_count > $threshold);
+
     $errors = array();
 
     $e_format = null;
@@ -475,59 +486,31 @@ private function processExportRequest() {
       if (!$errors) {
         $this->writeExportFormatPreference($format_key);
 
-        $query = $engine->buildQueryFromSavedQuery($saved_query);
-
-        // NOTE: We aren't reading the pager from the request. Exports always
-        // affect the entire result set.
-        $pager = $engine->newPagerForSavedQuery($saved_query);
-        $pager->setPageSize(0x7FFFFFFF);
-
-        $objects = $engine->executeQuery($query, $pager);
-
-        $extension = $format->getFileExtension();
-        $mime_type = $format->getMIMEContentType();
-        $filename = $filename.'.'.$extension;
-
-        $format = id(clone $format)
+        $export_engine = id(new PhabricatorExportEngine())
           ->setViewer($viewer)
-          ->setTitle($sheet_title);
+          ->setSearchEngine($engine)
+          ->setSavedQuery($saved_query)
+          ->setTitle($sheet_title)
+          ->setFilename($filename)
+          ->setExportFormat($format);
 
-        $export_data = $engine->newExport($objects);
-        $objects = array_values($objects);
+        if ($is_large_export) {
+          $job = $export_engine->newBulkJob($request);
 
-        $field_list = $engine->newExportFieldList();
-        $field_list = mpull($field_list, null, 'getKey');
-
-        $format->addHeaders($field_list);
-        for ($ii = 0; $ii < count($objects); $ii++) {
-          $format->addObject($objects[$ii], $field_list, $export_data[$ii]);
+          return id(new AphrontRedirectResponse())
+            ->setURI($job->getMonitorURI());
+        } else {
+          $file = $export_engine->exportFile();
+
+          return $this->newDialog()
+            ->setTitle(pht('Download Results'))
+            ->appendParagraph(
+              pht('Click the download button to download the exported data.'))
+            ->addCancelButton($cancel_uri, pht('Done'))
+            ->setSubmitURI($file->getDownloadURI())
+            ->setDisableWorkflowOnSubmit(true)
+            ->addSubmitButton(pht('Download Data'));
         }
-
-        $export_result = $format->newFileData();
-
-        // We have all the data in one big string and aren't actually
-        // streaming it, but pretending that we are allows us to actviate
-        // the chunk engine and store large files.
-        $iterator = new ArrayIterator(array($export_result));
-
-        $source = id(new PhabricatorIteratorFileUploadSource())
-          ->setName($filename)
-          ->setViewPolicy(PhabricatorPolicies::POLICY_NOONE)
-          ->setMIMEType($mime_type)
-          ->setRelativeTTL(phutil_units('60 minutes in seconds'))
-          ->setAuthorPHID($viewer->getPHID())
-          ->setIterator($iterator);
-
-        $file = $source->uploadFile();
-
-        return $this->newDialog()
-          ->setTitle(pht('Download Results'))
-          ->appendParagraph(
-            pht('Click the download button to download the exported data.'))
-          ->addCancelButton($cancel_uri, pht('Done'))
-          ->setSubmitURI($file->getDownloadURI())
-          ->setDisableWorkflowOnSubmit(true)
-          ->addSubmitButton(pht('Download Data'));
       }
     }
 
diff --git a/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobType.php b/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobType.php
index a5e29bc101..7854730bea 100644
--- a/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobType.php
+++ b/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobType.php
@@ -25,4 +25,24 @@ final public static function getAllJobTypes() {
       ->execute();
   }
 
+  public function getCurtainActions(
+    PhabricatorUser $viewer,
+    PhabricatorWorkerBulkJob $job) {
+
+    if ($job->isConfirming()) {
+      $continue_uri = $job->getMonitorURI();
+    } else {
+      $continue_uri = $job->getDoneURI();
+    }
+
+    $continue = id(new PhabricatorActionView())
+      ->setHref($continue_uri)
+      ->setIcon('fa-arrow-circle-o-right')
+      ->setName(pht('Continue'));
+
+    return array(
+      $continue,
+    );
+  }
+
 }
diff --git a/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobWorker.php b/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobWorker.php
index 9117060da6..d11f7e81af 100644
--- a/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobWorker.php
+++ b/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobWorker.php
@@ -77,6 +77,10 @@ final protected function loadActor(PhabricatorWorkerBulkJob $job) {
         pht('Job actor does not have permission to edit job.'));
     }
 
+    // Allow the worker to fill user caches inline; bulk jobs occasionally
+    // need to access user preferences.
+    $actor->setAllowInlineCacheGeneration(true);
+
     return $actor;
   }
 
diff --git a/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerSingleBulkJobType.php b/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerSingleBulkJobType.php
new file mode 100644
index 0000000000..f80411348c
--- /dev/null
+++ b/src/infrastructure/daemon/workers/bulk/PhabricatorWorkerSingleBulkJobType.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * An bulk job which can not be parallelized and executes only one task.
+ */
+abstract class PhabricatorWorkerSingleBulkJobType
+  extends PhabricatorWorkerBulkJobType {
+
+  public function getDescriptionForConfirm(PhabricatorWorkerBulkJob $job) {
+    return null;
+  }
+
+  public function getJobSize(PhabricatorWorkerBulkJob $job) {
+    return 1;
+  }
+
+  public function createTasks(PhabricatorWorkerBulkJob $job) {
+    $tasks = array();
+
+    $tasks[] = PhabricatorWorkerBulkTask::initializeNewTask(
+      $job,
+      $job->getPHID());
+
+    return $tasks;
+  }
+
+}
diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
index 40e43c2ec7..312281617d 100644
--- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
+++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php
@@ -180,6 +180,10 @@ public function getJobName() {
     return $this->getJobImplementation()->getJobName($this);
   }
 
+  public function getCurtainActions(PhabricatorUser $viewer) {
+    return $this->getJobImplementation()->getCurtainActions($viewer, $this);
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/infrastructure/export/engine/PhabricatorExportEngine.php b/src/infrastructure/export/engine/PhabricatorExportEngine.php
new file mode 100644
index 0000000000..f2c6a1270b
--- /dev/null
+++ b/src/infrastructure/export/engine/PhabricatorExportEngine.php
@@ -0,0 +1,168 @@
+<?php
+
+final class PhabricatorExportEngine
+  extends Phobject {
+
+  private $viewer;
+  private $searchEngine;
+  private $savedQuery;
+  private $exportFormat;
+  private $filename;
+  private $title;
+
+  public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  public function getViewer() {
+    return $this->viewer;
+  }
+
+  public function setSearchEngine(
+    PhabricatorApplicationSearchEngine $search_engine) {
+    $this->searchEngine = $search_engine;
+    return $this;
+  }
+
+  public function getSearchEngine() {
+    return $this->searchEngine;
+  }
+
+  public function setSavedQuery(PhabricatorSavedQuery $saved_query) {
+    $this->savedQuery = $saved_query;
+    return $this;
+  }
+
+  public function getSavedQuery() {
+    return $this->savedQuery;
+  }
+
+  public function setExportFormat(
+    PhabricatorExportFormat $export_format) {
+    $this->exportFormat = $export_format;
+    return $this;
+  }
+
+  public function getExportFormat() {
+    return $this->exportFormat;
+  }
+
+  public function setFilename($filename) {
+    $this->filename = $filename;
+    return $this;
+  }
+
+  public function getFilename() {
+    return $this->filename;
+  }
+
+  public function setTitle($title) {
+    $this->title = $title;
+    return $this;
+  }
+
+  public function getTitle() {
+    return $this->title;
+  }
+
+  public function newBulkJob(AphrontRequest $request) {
+    $viewer = $this->getViewer();
+    $engine = $this->getSearchEngine();
+    $saved_query = $this->getSavedQuery();
+    $format = $this->getExportFormat();
+
+    $params = array(
+      'engineClass' => get_class($engine),
+      'queryKey' => $saved_query->getQueryKey(),
+      'formatKey' => $format->getExportFormatKey(),
+      'title' => $this->getTitle(),
+      'filename' => $this->getFilename(),
+    );
+
+    $job = PhabricatorWorkerBulkJob::initializeNewJob(
+      $viewer,
+      new PhabricatorExportEngineBulkJobType(),
+      $params);
+
+    // We queue these jobs directly into STATUS_WAITING without requiring
+    // a confirmation from the user.
+
+    $xactions = array();
+
+    $xactions[] = id(new PhabricatorWorkerBulkJobTransaction())
+      ->setTransactionType(PhabricatorWorkerBulkJobTransaction::TYPE_STATUS)
+      ->setNewValue(PhabricatorWorkerBulkJob::STATUS_WAITING);
+
+    $editor = id(new PhabricatorWorkerBulkJobEditor())
+      ->setActor($viewer)
+      ->setContentSourceFromRequest($request)
+      ->setContinueOnMissingFields(true)
+      ->applyTransactions($job, $xactions);
+
+    return $job;
+  }
+
+  public function exportFile() {
+    $viewer = $this->getViewer();
+    $engine = $this->getSearchEngine();
+    $saved_query = $this->getSavedQuery();
+    $format = $this->getExportFormat();
+    $title = $this->getTitle();
+    $filename = $this->getFilename();
+
+    $query = $engine->buildQueryFromSavedQuery($saved_query);
+
+    $extension = $format->getFileExtension();
+    $mime_type = $format->getMIMEContentType();
+    $filename = $filename.'.'.$extension;
+
+    $format = id(clone $format)
+      ->setViewer($viewer)
+      ->setTitle($title);
+
+    $field_list = $engine->newExportFieldList();
+    $field_list = mpull($field_list, null, 'getKey');
+    $format->addHeaders($field_list);
+
+    // Iterate over the query results in large page so we don't have to hold
+    // too much stuff in memory.
+    $page_size = 1000;
+    $page_cursor = null;
+    do {
+      $pager = $engine->newPagerForSavedQuery($saved_query);
+      $pager->setPageSize($page_size);
+
+      if ($page_cursor !== null) {
+        $pager->setAfterID($page_cursor);
+      }
+
+      $objects = $engine->executeQuery($query, $pager);
+      $objects = array_values($objects);
+      $page_cursor = $pager->getNextPageID();
+
+      $export_data = $engine->newExport($objects);
+      for ($ii = 0; $ii < count($objects); $ii++) {
+        $format->addObject($objects[$ii], $field_list, $export_data[$ii]);
+      }
+    } while ($pager->getHasMoreResults());
+
+    $export_result = $format->newFileData();
+
+    // We have all the data in one big string and aren't actually
+    // streaming it, but pretending that we are allows us to actviate
+    // the chunk engine and store large files.
+    $iterator = new ArrayIterator(array($export_result));
+
+    $source = id(new PhabricatorIteratorFileUploadSource())
+      ->setName($filename)
+      ->setViewPolicy(PhabricatorPolicies::POLICY_NOONE)
+      ->setMIMEType($mime_type)
+      ->setRelativeTTL(phutil_units('60 minutes in seconds'))
+      ->setAuthorPHID($viewer->getPHID())
+      ->setIterator($iterator);
+
+    return $source->uploadFile();
+  }
+
+}
diff --git a/src/infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php b/src/infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php
new file mode 100644
index 0000000000..712127f479
--- /dev/null
+++ b/src/infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php
@@ -0,0 +1,118 @@
+<?php
+
+final class PhabricatorExportEngineBulkJobType
+   extends PhabricatorWorkerSingleBulkJobType {
+
+  public function getBulkJobTypeKey() {
+    return 'export';
+  }
+
+  public function getJobName(PhabricatorWorkerBulkJob $job) {
+    return pht('Data Export');
+  }
+
+  public function getCurtainActions(
+    PhabricatorUser $viewer,
+    PhabricatorWorkerBulkJob $job) {
+    $actions = array();
+
+    $file_phid = $job->getParameter('filePHID');
+    if (!$file_phid) {
+      $actions[] = id(new PhabricatorActionView())
+        ->setHref('#')
+        ->setIcon('fa-download')
+        ->setDisabled(true)
+        ->setName(pht('Exporting Data...'));
+    } else {
+      $file = id(new PhabricatorFileQuery())
+        ->setViewer($viewer)
+        ->withPHIDs(array($file_phid))
+        ->executeOne();
+      if (!$file) {
+        $actions[] = id(new PhabricatorActionView())
+          ->setHref('#')
+          ->setIcon('fa-download')
+          ->setDisabled(true)
+          ->setName(pht('Temporary File Expired'));
+      } else {
+        $actions[] = id(new PhabricatorActionView())
+          ->setRenderAsForm(true)
+          ->setHref($file->getDownloadURI())
+          ->setIcon('fa-download')
+          ->setName(pht('Download Data Export'));
+      }
+    }
+
+    return $actions;
+  }
+
+
+  public function runTask(
+    PhabricatorUser $actor,
+    PhabricatorWorkerBulkJob $job,
+    PhabricatorWorkerBulkTask $task) {
+
+    $engine_class = $job->getParameter('engineClass');
+    if (!is_subclass_of($engine_class, 'PhabricatorApplicationSearchEngine')) {
+      throw new Exception(
+        pht(
+          'Unknown search engine class "%s".',
+          $engine_class));
+    }
+
+    $engine = newv($engine_class, array())
+      ->setViewer($actor);
+
+    $query_key = $job->getParameter('queryKey');
+    if ($engine->isBuiltinQuery($query_key)) {
+      $saved_query = $engine->buildSavedQueryFromBuiltin($query_key);
+    } else if ($query_key) {
+      $saved_query = id(new PhabricatorSavedQueryQuery())
+        ->setViewer($actor)
+        ->withQueryKeys(array($query_key))
+        ->executeOne();
+    } else {
+      $saved_query = null;
+    }
+
+    if (!$saved_query) {
+      throw new Exception(
+        pht(
+          'Failed to load saved query ("%s").',
+          $query_key));
+    }
+
+    $format_key = $job->getParameter('formatKey');
+
+    $all_formats = PhabricatorExportFormat::getAllExportFormats();
+    $format = idx($all_formats, $format_key);
+    if (!$format) {
+      throw new Exception(
+        pht(
+          'Unknown export format ("%s").',
+          $format_key));
+    }
+
+    if (!$format->isExportFormatEnabled()) {
+      throw new Exception(
+        pht(
+          'Export format ("%s") is not enabled.',
+          $format_key));
+    }
+
+    $export_engine = id(new PhabricatorExportEngine())
+      ->setViewer($actor)
+      ->setTitle($job->getParameter('title'))
+      ->setFilename($job->getParameter('filename'))
+      ->setSearchEngine($engine)
+      ->setSavedQuery($saved_query)
+      ->setExportFormat($format);
+
+    $file = $export_engine->exportFile();
+
+    $job
+      ->setParameter('filePHID', $file->getPHID())
+      ->save();
+  }
+
+}

From 207131d14f8f3d724598a0f5c646d71392069003 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 27 Jan 2018 05:22:09 -0800
Subject: [PATCH 449/865] (stable) Wrap edge transaction readers in a
 translation layer

Summary:
Ref T13051. This puts a translation layer between the raw edge data in the transaction table and the UI that uses it.

The intent is to start writing new, more compact data soon. This class give us a consistent API for interacting with either the new or old data format, so we don't have to migrate everything upfront.

Test Plan: Browsed around, saw existing edge transactions render properly in transactions and feed. Added and removed subscribers and projects, saw good transaction rendering.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13051

Differential Revision: https://secure.phabricator.com/D18946
---
 src/__phutil_library_map__.php                |  2 +
 .../storage/DifferentialTransaction.php       | 13 ----
 .../PhabricatorApplicationTransaction.php     | 25 ++++---
 .../util/PhabricatorEdgeChangeRecord.php      | 68 +++++++++++++++++++
 4 files changed, 82 insertions(+), 26 deletions(-)
 create mode 100644 src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 44d67c6259..c40f79b052 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2747,6 +2747,7 @@
     'PhabricatorDraftEngine' => 'applications/transactions/draft/PhabricatorDraftEngine.php',
     'PhabricatorDraftInterface' => 'applications/transactions/draft/PhabricatorDraftInterface.php',
     'PhabricatorDrydockApplication' => 'applications/drydock/application/PhabricatorDrydockApplication.php',
+    'PhabricatorEdgeChangeRecord' => 'infrastructure/edges/util/PhabricatorEdgeChangeRecord.php',
     'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php',
     'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php',
     'PhabricatorEdgeCycleException' => 'infrastructure/edges/exception/PhabricatorEdgeCycleException.php',
@@ -8170,6 +8171,7 @@
     'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
     'PhabricatorDraftEngine' => 'Phobject',
     'PhabricatorDrydockApplication' => 'PhabricatorApplication',
+    'PhabricatorEdgeChangeRecord' => 'Phobject',
     'PhabricatorEdgeConfig' => 'PhabricatorEdgeConstants',
     'PhabricatorEdgeConstants' => 'Phobject',
     'PhabricatorEdgeCycleException' => 'Exception',
diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index 667341cef4..f7dcf29860 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -87,19 +87,6 @@ public function shouldHide() {
         }
         break;
 
-      case PhabricatorTransactions::TYPE_EDGE:
-        $add = array_diff_key($new, $old);
-        $rem = array_diff_key($old, $new);
-
-        // Hide metadata-only edge transactions. These correspond to users
-        // accepting or rejecting revisions, but the change is always explicit
-        // because of the TYPE_ACTION transaction. Rendering these transactions
-        // just creates clutter.
-
-        if (!$add && !$rem) {
-          return true;
-        }
-        break;
       case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
         // Don't hide the initial "X requested review: ..." transaction from
         // mail or feed even when it occurs during creation. We need this
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index d49c3bf675..97b57009ec 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -302,8 +302,8 @@ public function getRequiredHandlePHIDs() {
         $phids[] = $new;
         break;
       case PhabricatorTransactions::TYPE_EDGE:
-        $phids[] = ipull($old, 'dst');
-        $phids[] = ipull($new, 'dst');
+        $record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
+        $phids[] = $record->getChangedPHIDs();
         break;
       case PhabricatorTransactions::TYPE_COLUMNS:
         foreach ($new as $move) {
@@ -632,9 +632,8 @@ public function shouldHide() {
             return true;
             break;
           case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
-            $new = ipull($this->getNewValue(), 'dst');
-            $old = ipull($this->getOldValue(), 'dst');
-            $add = array_diff($new, $old);
+            $record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
+            $add = $record->getAddedPHIDs();
             $add_value = reset($add);
             $add_handle = $this->getHandle($add_value);
             if ($add_handle->getPolicyFiltered()) {
@@ -933,10 +932,10 @@ public function getTitle() {
         }
         break;
       case PhabricatorTransactions::TYPE_EDGE:
-        $new = ipull($new, 'dst');
-        $old = ipull($old, 'dst');
-        $add = array_diff($new, $old);
-        $rem = array_diff($old, $new);
+        $record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
+        $add = $record->getAddedPHIDs();
+        $rem = $record->getRemovedPHIDs();
+
         $type = $this->getMetadata('edge:type');
         $type = head($type);
 
@@ -1172,10 +1171,10 @@ public function getTitleForFeed() {
             $this->renderHandleLink($new));
         }
       case PhabricatorTransactions::TYPE_EDGE:
-        $new = ipull($new, 'dst');
-        $old = ipull($old, 'dst');
-        $add = array_diff($new, $old);
-        $rem = array_diff($old, $new);
+        $record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
+        $add = $record->getAddedPHIDs();
+        $rem = $record->getRemovedPHIDs();
+
         $type = $this->getMetadata('edge:type');
         $type = head($type);
 
diff --git a/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php b/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
new file mode 100644
index 0000000000..6e0cb1d3e0
--- /dev/null
+++ b/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
@@ -0,0 +1,68 @@
+<?php
+
+final class PhabricatorEdgeChangeRecord
+  extends Phobject {
+
+  private $xaction;
+
+  public static function newFromTransaction(
+    PhabricatorApplicationTransaction $xaction) {
+    $record = new self();
+    $record->xaction = $xaction;
+    return $record;
+  }
+
+  public function getChangedPHIDs() {
+    $add = $this->getAddedPHIDs();
+    $rem = $this->getRemovedPHIDs();
+
+    $add = array_fuse($add);
+    $rem = array_fuse($rem);
+
+    return array_keys($add + $rem);
+  }
+
+  public function getAddedPHIDs() {
+    $old = $this->getOldDestinationPHIDs();
+    $new = $this->getNewDestinationPHIDs();
+
+    $old = array_fuse($old);
+    $new = array_fuse($new);
+
+    $add = array_diff_key($new, $old);
+    return array_keys($add);
+  }
+
+  public function getRemovedPHIDs() {
+    $old = $this->getOldDestinationPHIDs();
+    $new = $this->getNewDestinationPHIDs();
+
+    $old = array_fuse($old);
+    $new = array_fuse($new);
+
+    $rem = array_diff_key($old, $new);
+    return array_keys($rem);
+  }
+
+  private function getOldDestinationPHIDs() {
+    if ($this->xaction) {
+      $old = $this->xaction->getOldValue();
+      return ipull($old, 'dst');
+    }
+
+    throw new Exception(
+      pht('Edge change record is not configured with any change data.'));
+  }
+
+  private function getNewDestinationPHIDs() {
+    if ($this->xaction) {
+      $new = $this->xaction->getNewValue();
+      return ipull($new, 'dst');
+    }
+
+    throw new Exception(
+      pht('Edge change record is not configured with any change data.'));
+  }
+
+
+}

From db8ba29925bed60c25e7675551c5ce00a579dbec Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 27 Jan 2018 05:54:21 -0800
Subject: [PATCH 450/865] (stable) Write edge transactions in a more compact
 way

Summary: Depends on D18946. Ref T13051. Begins writing edge transactions as just a list of changed PHIDs.

Test Plan: Added, edited, and removed projects. Reviewed transaction record and database. Saw no user-facing changes but a far more compact database representation.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13051

Differential Revision: https://secure.phabricator.com/D18947
---
 ...habricatorApplicationTransactionEditor.php | 26 +++++++++++++++++-
 .../util/PhabricatorEdgeChangeRecord.php      | 27 +++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 7dbd41f1e4..155592fc4e 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -999,7 +999,31 @@ final public function applyTransactions(
           $xaction->setPHID($xaction->generatePHID());
           $comment_editor->applyEdit($xaction, $xaction->getComment());
         } else {
-          $xaction->save();
+
+          // TODO: This is a transitional hack to let us migrate edge
+          // transactions to a more efficient storage format. For now, we're
+          // going to write a new slim format to the database but keep the old
+          // bulky format on the objects so we don't have to upgrade all the
+          // edit logic to the new format yet. See T13051.
+
+          $edge_type = PhabricatorTransactions::TYPE_EDGE;
+          if ($xaction->getTransactionType() == $edge_type) {
+            $bulky_old = $xaction->getOldValue();
+            $bulky_new = $xaction->getNewValue();
+
+            $record = PhabricatorEdgeChangeRecord::newFromTransaction($xaction);
+            $slim_old = $record->getModernOldEdgeTransactionData();
+            $slim_new = $record->getModernNewEdgeTransactionData();
+
+            $xaction->setOldValue($slim_old);
+            $xaction->setNewValue($slim_new);
+            $xaction->save();
+
+            $xaction->setOldValue($bulky_old);
+            $xaction->setNewValue($bulky_new);
+          } else {
+            $xaction->save();
+          }
         }
       }
 
diff --git a/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php b/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
index 6e0cb1d3e0..38557dc09f 100644
--- a/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
+++ b/src/infrastructure/edges/util/PhabricatorEdgeChangeRecord.php
@@ -44,10 +44,18 @@ public function getRemovedPHIDs() {
     return array_keys($rem);
   }
 
+  public function getModernOldEdgeTransactionData() {
+    return $this->getRemovedPHIDs();
+  }
+
+  public function getModernNewEdgeTransactionData() {
+    return $this->getAddedPHIDs();
+  }
+
   private function getOldDestinationPHIDs() {
     if ($this->xaction) {
       $old = $this->xaction->getOldValue();
-      return ipull($old, 'dst');
+      return $this->getPHIDsFromTransactionValue($old);
     }
 
     throw new Exception(
@@ -57,12 +65,27 @@ private function getOldDestinationPHIDs() {
   private function getNewDestinationPHIDs() {
     if ($this->xaction) {
       $new = $this->xaction->getNewValue();
-      return ipull($new, 'dst');
+      return $this->getPHIDsFromTransactionValue($new);
     }
 
     throw new Exception(
       pht('Edge change record is not configured with any change data.'));
   }
 
+  private function getPHIDsFromTransactionValue($value) {
+    if (!$value) {
+      return array();
+    }
+
+    // If the list items are arrays, this is an older-style map of
+    // dictionaries.
+    $head = head($value);
+    if (is_array($head)) {
+      return ipull($value, 'dst');
+    }
+
+    // If the list items are not arrays, this is a newer-style list of PHIDs.
+    return $value;
+  }
 
 }

From 918db8c11e58cc2ba5c583025175e4671676d050 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 27 Jan 2018 06:12:03 -0800
Subject: [PATCH 451/865] (stable) Add `bin/garbage compact-edges` to compact
 edges into the new format

Summary:
Depends on D18947. Ref T13051. This goes through transaction tables and compacts the edge storage into the slim format.

I put this on `bin/garbage` instead of `bin/storage` because `bin/storage` has a lot of weird stuff about how it manages databases so that it can run before configuration (e.g., all the `--user`, `--password` type flags for configuring DB connections).

Test Plan:
Loaded an object with a bunch of transactions. Ran migration. Spot checked table for sanity. Loaded another copy of the object in the web UI, compared the two pages, saw no user-visible changes.

Here's a concrete example of the migration effect -- old row:

```
*************************** 44. row ***************************
             id: 757
           phid: PHID-XACT-PSTE-5gnaaway2vnyen5
     authorPHID: PHID-USER-cvfydnwadpdj7vdon36z
     objectPHID: PHID-PSTE-5uj6oqv4kmhtr6ctwcq7
     viewPolicy: public
     editPolicy: PHID-USER-cvfydnwadpdj7vdon36z
    commentPHID: NULL
 commentVersion: 0
transactionType: core:edge
       oldValue: {"PHID-PROJ-wh32nih7q5scvc5lvipv":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-wh32nih7q5scvc5lvipv","dateCreated":"1449170691","seq":"0","dataID":null,"data":[]},"PHID-PROJ-5r2ed5v27xrgltvou5or":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-5r2ed5v27xrgltvou5or","dateCreated":"1449170683","seq":"0","dataID":null,"data":[]},"PHID-PROJ-zfp44q7loir643b5i4v4":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-zfp44q7loir643b5i4v4","dateCreated":"1449170668","seq":"0","dataID":null,"data":[]},"PHID-PROJ-okljqs7prifhajtvia3t":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-okljqs7prifhajtvia3t","dateCreated":"1448902756","seq":"0","dataID":null,"data":[]},"PHID-PROJ-3cuwfuuh4pwqyuof2hhr":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-3cuwfuuh4pwqyuof2hhr","dateCreated":"1448899367","seq":"0","dataID":null,"data":[]},"PHID-PROJ-amvkc5zw2gsy7tyvocug":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-amvkc5zw2gsy7tyvocug","dateCreated":"1448833330","seq":"0","dataID":null,"data":[]}}
       newValue: {"PHID-PROJ-wh32nih7q5scvc5lvipv":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-wh32nih7q5scvc5lvipv","dateCreated":"1449170691","seq":"0","dataID":null,"data":[]},"PHID-PROJ-5r2ed5v27xrgltvou5or":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-5r2ed5v27xrgltvou5or","dateCreated":"1449170683","seq":"0","dataID":null,"data":[]},"PHID-PROJ-zfp44q7loir643b5i4v4":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-zfp44q7loir643b5i4v4","dateCreated":"1449170668","seq":"0","dataID":null,"data":[]},"PHID-PROJ-okljqs7prifhajtvia3t":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-okljqs7prifhajtvia3t","dateCreated":"1448902756","seq":"0","dataID":null,"data":[]},"PHID-PROJ-3cuwfuuh4pwqyuof2hhr":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-3cuwfuuh4pwqyuof2hhr","dateCreated":"1448899367","seq":"0","dataID":null,"data":[]},"PHID-PROJ-amvkc5zw2gsy7tyvocug":{"src":"PHID-PSTE-5uj6oqv4kmhtr6ctwcq7","type":"41","dst":"PHID-PROJ-amvkc5zw2gsy7tyvocug","dateCreated":"1448833330","seq":"0","dataID":null,"data":[]},"PHID-PROJ-tbowhnwinujwhb346q36":{"dst":"PHID-PROJ-tbowhnwinujwhb346q36","type":41,"data":[]},"PHID-PROJ-izrto7uflimduo6uw2tp":{"dst":"PHID-PROJ-izrto7uflimduo6uw2tp","type":41,"data":[]}}
  contentSource: {"source":"web","params":[]}
       metadata: {"edge:type":41}
    dateCreated: 1450197571
   dateModified: 1450197571
```

New row:

```
*************************** 44. row ***************************
             id: 757
           phid: PHID-XACT-PSTE-5gnaaway2vnyen5
     authorPHID: PHID-USER-cvfydnwadpdj7vdon36z
     objectPHID: PHID-PSTE-5uj6oqv4kmhtr6ctwcq7
     viewPolicy: public
     editPolicy: PHID-USER-cvfydnwadpdj7vdon36z
    commentPHID: NULL
 commentVersion: 0
transactionType: core:edge
       oldValue: []
       newValue: ["PHID-PROJ-tbowhnwinujwhb346q36","PHID-PROJ-izrto7uflimduo6uw2tp"]
  contentSource: {"source":"web","params":[]}
       metadata: {"edge:type":41}
    dateCreated: 1450197571
   dateModified: 1450197571
```

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13051

Differential Revision: https://secure.phabricator.com/D18948
---
 src/__phutil_library_map__.php                |   2 +
 ...ollectorManagementCompactEdgesWorkflow.php | 103 ++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 src/infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c40f79b052..eaaa4d9e66 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3017,6 +3017,7 @@
     'PhabricatorGDSetupCheck' => 'applications/config/check/PhabricatorGDSetupCheck.php',
     'PhabricatorGarbageCollector' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php',
     'PhabricatorGarbageCollectorManagementCollectWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCollectWorkflow.php',
+    'PhabricatorGarbageCollectorManagementCompactEdgesWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php',
     'PhabricatorGarbageCollectorManagementSetPolicyWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementSetPolicyWorkflow.php',
     'PhabricatorGarbageCollectorManagementWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementWorkflow.php',
     'PhabricatorGeneralCachePurger' => 'applications/cache/purger/PhabricatorGeneralCachePurger.php',
@@ -8484,6 +8485,7 @@
     'PhabricatorGDSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorGarbageCollector' => 'Phobject',
     'PhabricatorGarbageCollectorManagementCollectWorkflow' => 'PhabricatorGarbageCollectorManagementWorkflow',
+    'PhabricatorGarbageCollectorManagementCompactEdgesWorkflow' => 'PhabricatorGarbageCollectorManagementWorkflow',
     'PhabricatorGarbageCollectorManagementSetPolicyWorkflow' => 'PhabricatorGarbageCollectorManagementWorkflow',
     'PhabricatorGarbageCollectorManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorGeneralCachePurger' => 'PhabricatorCachePurger',
diff --git a/src/infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php b/src/infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php
new file mode 100644
index 0000000000..c47d159850
--- /dev/null
+++ b/src/infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCompactEdgesWorkflow.php
@@ -0,0 +1,103 @@
+<?php
+
+final class PhabricatorGarbageCollectorManagementCompactEdgesWorkflow
+  extends PhabricatorGarbageCollectorManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('compact-edges')
+      ->setExamples('**compact-edges**')
+      ->setSynopsis(
+        pht(
+          'Rebuild old edge transactions storage to use a more compact '.
+          'format.'))
+      ->setArguments(array());
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $tables = id(new PhutilClassMapQuery())
+      ->setAncestorClass('PhabricatorApplicationTransaction')
+      ->execute();
+
+    foreach ($tables as $table) {
+      $this->compactEdges($table);
+    }
+
+    return 0;
+  }
+
+  private function compactEdges(PhabricatorApplicationTransaction $table) {
+    $conn = $table->establishConnection('w');
+    $class = get_class($table);
+
+    echo tsprintf(
+      "%s\n",
+      pht(
+        'Rebuilding transactions for "%s"...',
+        $class));
+
+    $cursor = 0;
+    $updated = 0;
+    while (true) {
+      $rows = $table->loadAllWhere(
+        'transactionType = %s
+          AND id > %d
+          AND (oldValue LIKE %> OR newValue LIKE %>)
+          ORDER BY id ASC LIMIT 100',
+        PhabricatorTransactions::TYPE_EDGE,
+        $cursor,
+        // We're looking for transactions with JSON objects in their value
+        // fields: the new style transactions have JSON lists instead and
+        // start with "[" rather than "{".
+        '{',
+        '{');
+
+      if (!$rows) {
+        break;
+      }
+
+      foreach ($rows as $row) {
+        $id = $row->getID();
+
+        $old = $row->getOldValue();
+        $new = $row->getNewValue();
+
+        if (!is_array($old) || !is_array($new)) {
+          echo tsprintf(
+            "%s\n",
+            pht(
+              'Transaction %s (of type %s) has unexpected data, skipping.',
+              $id,
+              $class));
+        }
+
+        $record = PhabricatorEdgeChangeRecord::newFromTransaction($row);
+
+        $old_data = $record->getModernOldEdgeTransactionData();
+        $old_json = phutil_json_encode($old_data);
+
+        $new_data = $record->getModernNewEdgeTransactionData();
+        $new_json = phutil_json_encode($new_data);
+
+        queryfx(
+          $conn,
+          'UPDATE %T SET oldValue = %s, newValue = %s WHERE id = %d',
+          $table->getTableName(),
+          $old_json,
+          $new_json,
+          $id);
+
+        $updated++;
+
+        $cursor = $row->getID();
+      }
+    }
+
+    echo tsprintf(
+      "%s\n",
+      pht(
+        'Done, compacted %s edge transactions.',
+        new PhutilNumber($updated)));
+  }
+
+}

From 1b4017b889e29eb82eb80931eda3eeebae6b28a0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 27 Jan 2018 07:30:26 -0800
Subject: [PATCH 452/865] (stable) Add a bit of test coverage for bulky vs
 compact edge data representations

Summary: Depends on D18948. Ref T13051. The actual logic ended up so simple that this doesn't really feel terribly valuable, but maybe it'll catch something later on.

Test Plan: Ran test.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13051

Differential Revision: https://secure.phabricator.com/D18949
---
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorEdgeChangeRecordTestCase.php   | 158 ++++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 src/infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index eaaa4d9e66..1ad3565809 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2748,6 +2748,7 @@
     'PhabricatorDraftInterface' => 'applications/transactions/draft/PhabricatorDraftInterface.php',
     'PhabricatorDrydockApplication' => 'applications/drydock/application/PhabricatorDrydockApplication.php',
     'PhabricatorEdgeChangeRecord' => 'infrastructure/edges/util/PhabricatorEdgeChangeRecord.php',
+    'PhabricatorEdgeChangeRecordTestCase' => 'infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php',
     'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php',
     'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php',
     'PhabricatorEdgeCycleException' => 'infrastructure/edges/exception/PhabricatorEdgeCycleException.php',
@@ -8173,6 +8174,7 @@
     'PhabricatorDraftEngine' => 'Phobject',
     'PhabricatorDrydockApplication' => 'PhabricatorApplication',
     'PhabricatorEdgeChangeRecord' => 'Phobject',
+    'PhabricatorEdgeChangeRecordTestCase' => 'PhabricatorTestCase',
     'PhabricatorEdgeConfig' => 'PhabricatorEdgeConstants',
     'PhabricatorEdgeConstants' => 'Phobject',
     'PhabricatorEdgeCycleException' => 'Exception',
diff --git a/src/infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php b/src/infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php
new file mode 100644
index 0000000000..cf46c00d4d
--- /dev/null
+++ b/src/infrastructure/edges/__tests__/PhabricatorEdgeChangeRecordTestCase.php
@@ -0,0 +1,158 @@
+<?php
+
+final class PhabricatorEdgeChangeRecordTestCase extends PhabricatorTestCase {
+
+
+  public function testEdgeStorageFormats() {
+    $old_bulky = phutil_json_decode(<<<EOJSON
+{
+   "PHID-PROJ-5r2ed5v27xrgltvou5or" : {
+      "dataID" : null,
+      "dateCreated" : "1449170683",
+      "dst" : "PHID-PROJ-5r2ed5v27xrgltvou5or",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "type" : "41",
+      "data" : [],
+      "seq" : "0"
+   },
+   "PHID-PROJ-wh32nih7q5scvc5lvipv" : {
+      "dataID" : null,
+      "seq" : "0",
+      "type" : "41",
+      "data" : [],
+      "dst" : "PHID-PROJ-wh32nih7q5scvc5lvipv",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1449170691"
+   },
+   "PHID-PROJ-zfp44q7loir643b5i4v4" : {
+      "dataID" : null,
+      "type" : "41",
+      "data" : [],
+      "seq" : "0",
+      "dateCreated" : "1449170668",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dst" : "PHID-PROJ-zfp44q7loir643b5i4v4"
+   },
+   "PHID-PROJ-amvkc5zw2gsy7tyvocug" : {
+      "dataID" : null,
+      "dst" : "PHID-PROJ-amvkc5zw2gsy7tyvocug",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448833330",
+      "seq" : "0",
+      "type" : "41",
+      "data" : []
+   },
+   "PHID-PROJ-3cuwfuuh4pwqyuof2hhr" : {
+      "dataID" : null,
+      "seq" : "0",
+      "type" : "41",
+      "data" : [],
+      "dst" : "PHID-PROJ-3cuwfuuh4pwqyuof2hhr",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448899367"
+   },
+   "PHID-PROJ-okljqs7prifhajtvia3t" : {
+      "dataID" : null,
+      "seq" : "0",
+      "data" : [],
+      "type" : "41",
+      "dst" : "PHID-PROJ-okljqs7prifhajtvia3t",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448902756"
+   }
+}
+EOJSON
+      );
+
+    $new_bulky = phutil_json_decode(<<<EOJSON
+{
+   "PHID-PROJ-5r2ed5v27xrgltvou5or" : {
+      "dataID" : null,
+      "dateCreated" : "1449170683",
+      "dst" : "PHID-PROJ-5r2ed5v27xrgltvou5or",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "type" : "41",
+      "data" : [],
+      "seq" : "0"
+   },
+   "PHID-PROJ-wh32nih7q5scvc5lvipv" : {
+      "dataID" : null,
+      "seq" : "0",
+      "type" : "41",
+      "data" : [],
+      "dst" : "PHID-PROJ-wh32nih7q5scvc5lvipv",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1449170691"
+   },
+   "PHID-PROJ-zfp44q7loir643b5i4v4" : {
+      "dataID" : null,
+      "type" : "41",
+      "data" : [],
+      "seq" : "0",
+      "dateCreated" : "1449170668",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dst" : "PHID-PROJ-zfp44q7loir643b5i4v4"
+   },
+   "PHID-PROJ-amvkc5zw2gsy7tyvocug" : {
+      "dataID" : null,
+      "dst" : "PHID-PROJ-amvkc5zw2gsy7tyvocug",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448833330",
+      "seq" : "0",
+      "type" : "41",
+      "data" : []
+   },
+   "PHID-PROJ-3cuwfuuh4pwqyuof2hhr" : {
+      "dataID" : null,
+      "seq" : "0",
+      "type" : "41",
+      "data" : [],
+      "dst" : "PHID-PROJ-3cuwfuuh4pwqyuof2hhr",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448899367"
+   },
+   "PHID-PROJ-zzzzqs7prifhajtvia3t" : {
+      "dataID" : null,
+      "seq" : "0",
+      "data" : [],
+      "type" : "41",
+      "dst" : "PHID-PROJ-zzzzqs7prifhajtvia3t",
+      "src" : "PHID-PSTE-5uj6oqv4kmhtr6ctwcq7",
+      "dateCreated" : "1448902756"
+   }
+}
+EOJSON
+      );
+
+    $old_slim = array(
+      'PHID-PROJ-okljqs7prifhajtvia3t',
+    );
+
+    $new_slim = array(
+      'PHID-PROJ-zzzzqs7prifhajtvia3t',
+    );
+
+    $bulky_xaction = new ManiphestTransaction();
+    $bulky_xaction->setOldValue($old_bulky);
+    $bulky_xaction->setNewValue($new_bulky);
+
+    $slim_xaction = new ManiphestTransaction();
+    $slim_xaction->setOldValue($old_slim);
+    $slim_xaction->setNewValue($new_slim);
+
+    $bulky_record = PhabricatorEdgeChangeRecord::newFromTransaction(
+      $bulky_xaction);
+
+    $slim_record = PhabricatorEdgeChangeRecord::newFromTransaction(
+      $slim_xaction);
+
+    $this->assertEqual(
+      $bulky_record->getAddedPHIDs(),
+      $slim_record->getAddedPHIDs());
+
+    $this->assertEqual(
+      $bulky_record->getRemovedPHIDs(),
+      $slim_record->getRemovedPHIDs());
+  }
+
+}

From b27fd05eef0a20176574c7ff433ab59911738a77 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 05:39:09 -0800
Subject: [PATCH 453/865] Add a `bin/bulk export` CLI tool to make debugging
 and profiling large exports easier

Summary:
Ref T13049. When stuff executes asynchronously on the bulk workflow it can be hard to inspect directly, and/or a pain to test because you have to go through a bunch of steps to run it again.

Make future work here easier by making export triggerable from the CLI. This makes it easy to repeat, inspect with `--trace`, profile with `--xprofile`, etc.

Test Plan:
  - Ran several invalid commands, got sensible error messages.
  - Ran some valid commands, got exported data.
  - Used `--xprofile` to look at the profile for a 300MB dump of 100K tasks which took about 40 seconds to export. Nothing jumped out as sketchy to me -- CustomField wrangling is a little slow but most of the time looked like it was being spent legitimately.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18965
---
 src/__phutil_library_map__.php                |   2 +
 ...habricatorBulkManagementExportWorkflow.php | 168 ++++++++++++++++++
 2 files changed, 170 insertions(+)
 create mode 100644 src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 06f619d74e..32985c76c0 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2226,6 +2226,7 @@
     'PhabricatorBulkContentSource' => 'infrastructure/daemon/contentsource/PhabricatorBulkContentSource.php',
     'PhabricatorBulkEditGroup' => 'applications/transactions/bulk/PhabricatorBulkEditGroup.php',
     'PhabricatorBulkEngine' => 'applications/transactions/bulk/PhabricatorBulkEngine.php',
+    'PhabricatorBulkManagementExportWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php',
     'PhabricatorBulkManagementMakeSilentWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php',
     'PhabricatorBulkManagementWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php',
     'PhabricatorCSVExportFormat' => 'infrastructure/export/format/PhabricatorCSVExportFormat.php',
@@ -7579,6 +7580,7 @@
     'PhabricatorBulkContentSource' => 'PhabricatorContentSource',
     'PhabricatorBulkEditGroup' => 'Phobject',
     'PhabricatorBulkEngine' => 'Phobject',
+    'PhabricatorBulkManagementExportWorkflow' => 'PhabricatorBulkManagementWorkflow',
     'PhabricatorBulkManagementMakeSilentWorkflow' => 'PhabricatorBulkManagementWorkflow',
     'PhabricatorBulkManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorCSVExportFormat' => 'PhabricatorExportFormat',
diff --git a/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php b/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
new file mode 100644
index 0000000000..cd0ed346fc
--- /dev/null
+++ b/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
@@ -0,0 +1,168 @@
+<?php
+
+final class PhabricatorBulkManagementExportWorkflow
+  extends PhabricatorBulkManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('export')
+      ->setExamples('**export** [options]')
+      ->setSynopsis(
+        pht('Export data to a flat file (JSON, CSV, Excel, etc).'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'class',
+            'param' => 'class',
+            'help' => pht(
+              'SearchEngine class to export data from.'),
+          ),
+          array(
+            'name' => 'format',
+            'param' => 'format',
+            'help' => pht('Export format.'),
+          ),
+          array(
+            'name' => 'query',
+            'param' => 'key',
+            'help' => pht(
+              'Export the data selected by this query.'),
+          ),
+          array(
+            'name' => 'output',
+            'param' => 'path',
+            'help' => pht(
+              'Write output to a file. If omitted, output will be sent to '.
+              'stdout.'),
+          ),
+          array(
+            'name' => 'overwrite',
+            'help' => pht(
+              'If the output file already exists, overwrite it instead of '.
+              'raising an error.'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+
+    $class = $args->getArg('class');
+
+    if (!strlen($class)) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Specify a search engine class to export data from with '.
+          '"--class".'));
+    }
+
+    if (!is_subclass_of($class, 'PhabricatorApplicationSearchEngine')) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'SearchEngine class ("%s") is unknown.',
+          $class));
+    }
+
+    $engine = newv($class, array())
+      ->setViewer($viewer);
+
+    if (!$engine->canExport()) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'SearchEngine class ("%s") does not support data export.',
+          $class));
+    }
+
+    $query_key = $args->getArg('query');
+    if (!strlen($query_key)) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Specify a query to export with "--query".'));
+    }
+
+    if ($engine->isBuiltinQuery($query_key)) {
+      $saved_query = $engine->buildSavedQueryFromBuiltin($query_key);
+    } else if ($query_key) {
+      $saved_query = id(new PhabricatorSavedQueryQuery())
+        ->setViewer($viewer)
+        ->withQueryKeys(array($query_key))
+        ->executeOne();
+    } else {
+      $saved_query = null;
+    }
+
+    if (!$saved_query) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Failed to load saved query ("%s").',
+          $query_key));
+    }
+
+    $format_key = $args->getArg('format');
+    if (!strlen($format_key)) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Specify an export format with "--format".'));
+    }
+
+    $all_formats = PhabricatorExportFormat::getAllExportFormats();
+    $format = idx($all_formats, $format_key);
+    if (!$format) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Unknown export format ("%s"). Known formats are: %s.',
+          $format_key,
+          implode(', ', array_keys($all_formats))));
+    }
+
+    if (!$format->isExportFormatEnabled()) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Export format ("%s") is not enabled.',
+          $format_key));
+    }
+
+    $is_overwrite = $args->getArg('overwrite');
+    $output_path = $args->getArg('output');
+
+    if (!strlen($output_path) && $is_overwrite) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Flag "--overwrite" has no effect without "--output".'));
+    }
+
+    if (!$is_overwrite) {
+      if (Filesystem::pathExists($output_path)) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Output path already exists. Use "--overwrite" to overwrite '.
+            'it.'));
+      }
+    }
+
+    $export_engine = id(new PhabricatorExportEngine())
+      ->setViewer($viewer)
+      ->setTitle(pht('Export'))
+      ->setFilename(pht('export'))
+      ->setSearchEngine($engine)
+      ->setSavedQuery($saved_query)
+      ->setExportFormat($format);
+
+    $file = $export_engine->exportFile();
+
+    $iterator = $file->getFileDataIterator();
+
+    if (strlen($output_path)) {
+      foreach ($iterator as $chunk) {
+        Filesystem::appendFile($output_path, $chunk);
+      }
+    } else {
+      foreach ($iterator as $chunk) {
+        echo $chunk;
+      }
+    }
+
+    return 0;
+  }
+
+}

From 91108cf83826c4587adcad73008b309669b49dee Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 06:09:35 -0800
Subject: [PATCH 454/865] Upgrade user account activity logs to modern
 construction

Summary: Depends on D18965. Ref T13049. Move this Query and SearchEngine to be a little more modern, to prepare for Export support.

Test Plan:
  - Used all the query fields, viewed activity logs via People and Settings.
  - I'm not sure the "Session" query is used/useful and may remove it before I'm done here, but I just left it in place for now.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18966
---
 .../query/PhabricatorPeopleLogQuery.php       |  39 ++---
 .../PhabricatorPeopleLogSearchEngine.php      | 157 ++++++------------
 .../people/view/PhabricatorUserLogView.php    |  15 +-
 .../PhabricatorActivitySettingsPanel.php      |   3 +-
 4 files changed, 70 insertions(+), 144 deletions(-)

diff --git a/src/applications/people/query/PhabricatorPeopleLogQuery.php b/src/applications/people/query/PhabricatorPeopleLogQuery.php
index 9bcdc53f49..e6e2506bee 100644
--- a/src/applications/people/query/PhabricatorPeopleLogQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleLogQuery.php
@@ -40,70 +40,61 @@ public function withRemoteAddressPrefix($remote_address_prefix) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new PhabricatorUserLog();
+  }
+
   protected function loadPage() {
-    $table  = new PhabricatorUserLog();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($data);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
     if ($this->actorPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'actorPHID IN (%Ls)',
         $this->actorPHIDs);
     }
 
     if ($this->userPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'userPHID IN (%Ls)',
         $this->userPHIDs);
     }
 
     if ($this->relatedPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
-        'actorPHID IN (%Ls) OR userPHID IN (%Ls)',
+        $conn,
+        '(actorPHID IN (%Ls) OR userPHID IN (%Ls))',
         $this->relatedPHIDs,
         $this->relatedPHIDs);
     }
 
     if ($this->sessionKeys !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'session IN (%Ls)',
         $this->sessionKeys);
     }
 
     if ($this->actions !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'action IN (%Ls)',
         $this->actions);
     }
 
     if ($this->remoteAddressPrefix !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'remoteAddr LIKE %>',
         $this->remoteAddressPrefix);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {
diff --git a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
index 851ef113d0..aea576693f 100644
--- a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
@@ -15,34 +15,8 @@ public function getPageSize(PhabricatorSavedQuery $saved) {
     return 500;
   }
 
-  public function buildSavedQueryFromRequest(AphrontRequest $request) {
-    $saved = new PhabricatorSavedQuery();
-
-    $saved->setParameter(
-      'userPHIDs',
-      $this->readUsersFromRequest($request, 'users'));
-
-    $saved->setParameter(
-      'actorPHIDs',
-      $this->readUsersFromRequest($request, 'actors'));
-
-    $saved->setParameter(
-      'actions',
-      $this->readListFromRequest($request, 'actions'));
-
-    $saved->setParameter(
-      'ip',
-      $request->getStr('ip'));
-
-    $saved->setParameter(
-      'sessions',
-      $this->readListFromRequest($request, 'sessions'));
-
-    return $saved;
-  }
-
-  public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
-    $query = id(new PhabricatorPeopleLogQuery());
+  public function newQuery() {
+    $query = new PhabricatorPeopleLogQuery();
 
     // NOTE: If the viewer isn't an administrator, always restrict the query to
     // related records. This echoes the policy logic of these logs. This is
@@ -54,82 +28,61 @@ public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
       $query->withRelatedPHIDs(array($viewer->getPHID()));
     }
 
-    $actor_phids = $saved->getParameter('actorPHIDs', array());
-    if ($actor_phids) {
-      $query->withActorPHIDs($actor_phids);
+    return $query;
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+
+    if ($map['userPHIDs']) {
+      $query->withUserPHIDs($map['userPHIDs']);
     }
 
-    $user_phids = $saved->getParameter('userPHIDs', array());
-    if ($user_phids) {
-      $query->withUserPHIDs($user_phids);
+    if ($map['actorPHIDs']) {
+      $query->withActorPHIDs($map['actorPHIDs']);
     }
 
-    $actions = $saved->getParameter('actions', array());
-    if ($actions) {
-      $query->withActions($actions);
+    if ($map['actions']) {
+      $query->withActions($map['actions']);
     }
 
-    $remote_prefix = $saved->getParameter('ip');
-    if (strlen($remote_prefix)) {
-      $query->withRemoteAddressprefix($remote_prefix);
+    if (strlen($map['ip'])) {
+      $query->withRemoteAddressPrefix($map['ip']);
     }
 
-    $sessions = $saved->getParameter('sessions', array());
-    if ($sessions) {
-      $query->withSessionKeys($sessions);
+    if ($map['sessions']) {
+      $query->withSessionKeys($map['sessions']);
     }
 
     return $query;
   }
 
-  public function buildSearchForm(
-    AphrontFormView $form,
-    PhabricatorSavedQuery $saved) {
-
-    $actor_phids = $saved->getParameter('actorPHIDs', array());
-    $user_phids = $saved->getParameter('userPHIDs', array());
-
-    $actions = $saved->getParameter('actions', array());
-    $remote_prefix = $saved->getParameter('ip');
-    $sessions = $saved->getParameter('sessions', array());
-
-    $actions = array_fuse($actions);
-    $action_control = id(new AphrontFormCheckboxControl())
-      ->setLabel(pht('Actions'));
-    $action_types = PhabricatorUserLog::getActionTypeMap();
-    foreach ($action_types as $type => $label) {
-      $action_control->addCheckbox(
-        'actions[]',
-        $type,
-        $label,
-        isset($actions[$label]));
-    }
-
-    $form
-      ->appendControl(
-        id(new AphrontFormTokenizerControl())
-          ->setDatasource(new PhabricatorPeopleDatasource())
-          ->setName('actors')
-          ->setLabel(pht('Actors'))
-          ->setValue($actor_phids))
-      ->appendControl(
-        id(new AphrontFormTokenizerControl())
-          ->setDatasource(new PhabricatorPeopleDatasource())
-          ->setName('users')
-          ->setLabel(pht('Users'))
-          ->setValue($user_phids))
-      ->appendChild($action_control)
-      ->appendChild(
-        id(new AphrontFormTextControl())
-          ->setLabel(pht('Filter IP'))
-          ->setName('ip')
-          ->setValue($remote_prefix))
-      ->appendChild(
-        id(new AphrontFormTextControl())
-          ->setLabel(pht('Sessions'))
-          ->setName('sessions')
-          ->setValue(implode(', ', $sessions)));
-
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorUsersSearchField())
+        ->setKey('userPHIDs')
+        ->setAliases(array('users', 'user', 'userPHID'))
+        ->setLabel(pht('Users'))
+        ->setDescription(pht('Search for activity affecting specific users.')),
+      id(new PhabricatorUsersSearchField())
+        ->setKey('actorPHIDs')
+        ->setAliases(array('actors', 'actor', 'actorPHID'))
+        ->setLabel(pht('Actors'))
+        ->setDescription(pht('Search for activity by specific users.')),
+      id(new PhabricatorSearchCheckboxesField())
+        ->setKey('actions')
+        ->setLabel(pht('Actions'))
+        ->setDescription(pht('Search for particular types of activity.'))
+        ->setOptions(PhabricatorUserLog::getActionTypeMap()),
+      id(new PhabricatorSearchTextField())
+        ->setKey('ip')
+        ->setLabel(pht('Filter IP'))
+        ->setDescription(pht('Search for actions by remote address.')),
+      id(new PhabricatorSearchStringListField())
+        ->setKey('sessions')
+        ->setLabel(pht('Sessions'))
+        ->setDescription(pht('Search for activity in particular sessions.')),
+    );
   }
 
   protected function getURI($path) {
@@ -156,19 +109,6 @@ public function buildSavedQueryFromBuiltin($query_key) {
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
-  protected function getRequiredHandlePHIDsForResultList(
-    array $logs,
-    PhabricatorSavedQuery $query) {
-
-    $phids = array();
-    foreach ($logs as $log) {
-      $phids[$log->getActorPHID()] = true;
-      $phids[$log->getUserPHID()] = true;
-    }
-
-    return array_keys($phids);
-  }
-
   protected function renderResultList(
     array $logs,
     PhabricatorSavedQuery $query,
@@ -179,16 +119,13 @@ protected function renderResultList(
 
     $table = id(new PhabricatorUserLogView())
       ->setUser($viewer)
-      ->setLogs($logs)
-      ->setHandles($handles);
+      ->setLogs($logs);
 
     if ($viewer->getIsAdmin()) {
       $table->setSearchBaseURI($this->getApplicationURI('logs/'));
     }
 
-    $result = new PhabricatorApplicationSearchResultView();
-    $result->setTable($table);
-
-    return $result;
+    return id(new PhabricatorApplicationSearchResultView())
+      ->setTable($table);
   }
 }
diff --git a/src/applications/people/view/PhabricatorUserLogView.php b/src/applications/people/view/PhabricatorUserLogView.php
index d648b248f7..309540c611 100644
--- a/src/applications/people/view/PhabricatorUserLogView.php
+++ b/src/applications/people/view/PhabricatorUserLogView.php
@@ -3,7 +3,6 @@
 final class PhabricatorUserLogView extends AphrontView {
 
   private $logs;
-  private $handles;
   private $searchBaseURI;
 
   public function setSearchBaseURI($search_base_uri) {
@@ -17,17 +16,17 @@ public function setLogs(array $logs) {
     return $this;
   }
 
-  public function setHandles(array $handles) {
-    assert_instances_of($handles, 'PhabricatorObjectHandle');
-    $this->handles = $handles;
-    return $this;
-  }
-
   public function render() {
     $logs = $this->logs;
-    $handles = $this->handles;
     $viewer = $this->getUser();
 
+    $phids = array();
+    foreach ($logs as $log) {
+      $phids[] = $log->getActorPHID();
+      $phids[] = $log->getUserPHID();
+    }
+    $handles = $viewer->loadHandles($phids);
+
     $action_map = PhabricatorUserLog::getActionTypeMap();
     $base_uri = $this->searchBaseURI;
 
diff --git a/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php b/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
index 50f951d661..eeeca27663 100644
--- a/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
@@ -43,8 +43,7 @@ public function processRequest(AphrontRequest $request) {
 
     $table = id(new PhabricatorUserLogView())
       ->setUser($viewer)
-      ->setLogs($logs)
-      ->setHandles($handles);
+      ->setLogs($logs);
 
     $panel = $this->newBox(pht('Account Activity Logs'), $table);
 

From a5b8be0316ce617208072a3fa402cf61e90b0402 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 06:27:36 -0800
Subject: [PATCH 455/865] Support export of user activity logs

Summary:
Depends on D18966. Ref T13049. Adds export support to user activity logs.

These don't have PHIDs. We could add them, but just make the "phid" column test if the objects have PHIDs or not for now.

Test Plan:
  - Exported user activity logs, got sensible output (with no PHIDs).
  - Exported some users to make sure I didn't break PHIDs, got an export with PHIDs.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18967
---
 .../PhabricatorPeopleApplication.php          |  5 +-
 .../PhabricatorPeopleLogSearchEngine.php      | 98 +++++++++++++++++++
 .../PhabricatorApplicationSearchEngine.php    | 23 ++++-
 3 files changed, 119 insertions(+), 7 deletions(-)

diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php
index 28405ca92c..6322b29b24 100644
--- a/src/applications/people/application/PhabricatorPeopleApplication.php
+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
@@ -42,8 +42,9 @@ public function getRoutes() {
     return array(
       '/people/' => array(
         $this->getQueryRoutePattern() => 'PhabricatorPeopleListController',
-        'logs/(?:query/(?P<queryKey>[^/]+)/)?'
-          => 'PhabricatorPeopleLogsController',
+        'logs/' => array(
+          $this->getQueryRoutePattern() => 'PhabricatorPeopleLogsController',
+        ),
         'invite/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?'
             => 'PhabricatorPeopleInviteListController',
diff --git a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
index aea576693f..1a3ae4dea1 100644
--- a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
@@ -128,4 +128,102 @@ protected function renderResultList(
     return id(new PhabricatorApplicationSearchResultView())
       ->setTable($table);
   }
+
+  protected function newExportFields() {
+    $viewer = $this->requireViewer();
+
+    $fields = array(
+      $fields[] = id(new PhabricatorPHIDExportField())
+        ->setKey('actorPHID')
+        ->setLabel(pht('Actor PHID')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('actor')
+        ->setLabel(pht('Actor')),
+      $fields[] = id(new PhabricatorPHIDExportField())
+        ->setKey('userPHID')
+        ->setLabel(pht('User PHID')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('user')
+        ->setLabel(pht('User')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('action')
+        ->setLabel(pht('Action')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('actionName')
+        ->setLabel(pht('Action Name')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('session')
+        ->setLabel(pht('Session')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('old')
+        ->setLabel(pht('Old Value')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('new')
+        ->setLabel(pht('New Value')),
+    );
+
+    if ($viewer->getIsAdmin()) {
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('remoteAddress')
+        ->setLabel(pht('Remote Address'));
+    }
+
+    return $fields;
+  }
+
+  protected function newExportData(array $logs) {
+    $viewer = $this->requireViewer();
+
+
+    $phids = array();
+    foreach ($logs as $log) {
+      $phids[] = $log->getUserPHID();
+      $phids[] = $log->getActorPHID();
+    }
+    $handles = $viewer->loadHandles($phids);
+
+    $action_map = PhabricatorUserLog::getActionTypeMap();
+
+    $export = array();
+    foreach ($logs as $log) {
+
+      $user_phid = $log->getUserPHID();
+      if ($user_phid) {
+        $user_name = $handles[$user_phid]->getName();
+      } else {
+        $user_name = null;
+      }
+
+      $actor_phid = $log->getActorPHID();
+      if ($actor_phid) {
+        $actor_name = $handles[$actor_phid]->getName();
+      } else {
+        $actor_name = null;
+      }
+
+      $action = $log->getAction();
+      $action_name = idx($action_map, $action, pht('Unknown ("%s")', $action));
+
+      $map = array(
+        'actorPHID' => $actor_phid,
+        'actor' => $actor_name,
+        'userPHID' => $user_phid,
+        'user' => $user_name,
+        'action' => $action,
+        'actionName' => $action_name,
+        'session' => substr($log->getSession(), 0, 6),
+        'old' => $log->getOldValue(),
+        'new' => $log->getNewValue(),
+      );
+
+      if ($viewer->getIsAdmin()) {
+        $map['remoteAddress'] = $log->getRemoteAddr();
+      }
+
+      $export[] = $map;
+    }
+
+    return $export;
+  }
+
 }
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
index 3de7b9c4b9..b808291a52 100644
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1455,15 +1455,20 @@ public function canExport() {
   }
 
   final public function newExportFieldList() {
+    $object = $this->newResultObject();
+
     $builtin_fields = array(
       id(new PhabricatorIDExportField())
         ->setKey('id')
         ->setLabel(pht('ID')),
-      id(new PhabricatorPHIDExportField())
-        ->setKey('phid')
-        ->setLabel(pht('PHID')),
     );
 
+    if ($object->getConfigOption(LiskDAO::CONFIG_AUX_PHID)) {
+      $builtin_fields[] = id(new PhabricatorPHIDExportField())
+        ->setKey('phid')
+        ->setLabel(pht('PHID'));
+    }
+
     $fields = mpull($builtin_fields, null, 'getKey');
 
     $export_fields = $this->newExportFields();
@@ -1507,15 +1512,23 @@ final public function newExportFieldList() {
   }
 
   final public function newExport(array $objects) {
+    $object = $this->newResultObject();
+    $has_phid = $object->getConfigOption(LiskDAO::CONFIG_AUX_PHID);
+
     $objects = array_values($objects);
     $n = count($objects);
 
     $maps = array();
     foreach ($objects as $object) {
-      $maps[] = array(
+      $map = array(
         'id' => $object->getID(),
-        'phid' => $object->getPHID(),
       );
+
+      if ($has_phid) {
+        $map['phid'] = $object->getPHID();
+      }
+
+      $maps[] = $map;
     }
 
     $export_data = $this->newExportData($objects);

From 5b22412f246e74abf0d95d497d416466be488a8f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 07:47:34 -0800
Subject: [PATCH 456/865] Support data export on push logs

Summary: Depends on D18967. Ref T13049. Nothing too fancy going on here.

Test Plan: Exported push logs, looked at the export, seemed sensible.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18968
---
 .../PhabricatorDiffusionApplication.php       |   2 +-
 .../PhabricatorRepositoryPushLogQuery.php     |  53 +++----
 ...abricatorRepositoryPushLogSearchEngine.php | 142 ++++++++++++++++++
 .../storage/PhabricatorRepositoryPushLog.php  |  22 +++
 4 files changed, 187 insertions(+), 32 deletions(-)

diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index d932149a75..e619ecb1ad 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -121,7 +121,7 @@ public function getRoutes() {
         $this->getEditRoutePattern('edit/') =>
           'DiffusionRepositoryEditController',
         'pushlog/' => array(
-          '(?:query/(?P<queryKey>[^/]+)/)?' => 'DiffusionPushLogListController',
+          $this->getQueryRoutePattern() => 'DiffusionPushLogListController',
           'view/(?P<id>\d+)/' => 'DiffusionPushEventViewController',
         ),
         'pulllog/' => array(
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
index 94a0b6922e..2c5f7b0d0d 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
@@ -46,19 +46,12 @@ public function withPushEventPHIDs(array $phids) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new PhabricatorRepositoryPushLog();
+  }
+
   protected function loadPage() {
-    $table = new PhabricatorRepositoryPushLog();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($data);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $logs) {
@@ -82,61 +75,59 @@ protected function willFilterPage(array $logs) {
     return $logs;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
-    if ($this->ids) {
+    if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'id IN (%Ld)',
         $this->ids);
     }
 
-    if ($this->phids) {
+    if ($this->phids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'phid IN (%Ls)',
         $this->phids);
     }
 
-    if ($this->repositoryPHIDs) {
+    if ($this->repositoryPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'repositoryPHID IN (%Ls)',
         $this->repositoryPHIDs);
     }
 
-    if ($this->pusherPHIDs) {
+    if ($this->pusherPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'pusherPHID in (%Ls)',
         $this->pusherPHIDs);
     }
 
-    if ($this->pushEventPHIDs) {
+    if ($this->pushEventPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'pushEventPHID in (%Ls)',
         $this->pushEventPHIDs);
     }
 
-    if ($this->refTypes) {
+    if ($this->refTypes !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'refType IN (%Ls)',
         $this->refTypes);
     }
 
-    if ($this->newRefs) {
+    if ($this->newRefs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'refNew IN (%Ls)',
         $this->newRefs);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
index d171b80999..b2234ab6c7 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
@@ -82,4 +82,146 @@ protected function renderResultList(
       ->setTable($table);
   }
 
+  protected function newExportFields() {
+    $viewer = $this->requireViewer();
+
+    $fields = array(
+      $fields[] = id(new PhabricatorIDExportField())
+        ->setKey('pushID')
+        ->setLabel(pht('Push ID')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('protocol')
+        ->setLabel(pht('Protocol')),
+      $fields[] = id(new PhabricatorPHIDExportField())
+        ->setKey('repositoryPHID')
+        ->setLabel(pht('Repository PHID')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('repository')
+        ->setLabel(pht('Repository')),
+      $fields[] = id(new PhabricatorPHIDExportField())
+        ->setKey('pusherPHID')
+        ->setLabel(pht('Pusher PHID')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('pusher')
+        ->setLabel(pht('Pusher')),
+      $fields[] = id(new PhabricatorPHIDExportField())
+        ->setKey('devicePHID')
+        ->setLabel(pht('Device PHID')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('device')
+        ->setLabel(pht('Device')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('type')
+        ->setLabel(pht('Ref Type')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('name')
+        ->setLabel(pht('Ref Name')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('old')
+        ->setLabel(pht('Ref Old')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('new')
+        ->setLabel(pht('Ref New')),
+      $fields[] = id(new PhabricatorIntExportField())
+        ->setKey('flags')
+        ->setLabel(pht('Flags')),
+      $fields[] = id(new PhabricatorStringListExportField())
+        ->setKey('flagNames')
+        ->setLabel(pht('Flag Names')),
+      $fields[] = id(new PhabricatorIntExportField())
+        ->setKey('result')
+        ->setLabel(pht('Result')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('resultName')
+        ->setLabel(pht('Result Name')),
+    );
+
+    if ($viewer->getIsAdmin()) {
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('remoteAddress')
+        ->setLabel(pht('Remote Address'));
+    }
+
+    return $fields;
+  }
+
+  protected function newExportData(array $logs) {
+    $viewer = $this->requireViewer();
+
+    $phids = array();
+    foreach ($logs as $log) {
+      $phids[] = $log->getPusherPHID();
+      $phids[] = $log->getDevicePHID();
+      $phids[] = $log->getPushEvent()->getRepositoryPHID();
+    }
+    $handles = $viewer->loadHandles($phids);
+
+    $flag_map = PhabricatorRepositoryPushLog::getFlagDisplayNames();
+    $reject_map = PhabricatorRepositoryPushLog::getRejectCodeDisplayNames();
+
+    $export = array();
+    foreach ($logs as $log) {
+      $event = $log->getPushEvent();
+
+      $repository_phid = $event->getRepositoryPHID();
+      if ($repository_phid) {
+        $repository_name = $handles[$repository_phid]->getName();
+      } else {
+        $repository_name = null;
+      }
+
+      $pusher_phid = $log->getPusherPHID();
+      if ($pusher_phid) {
+        $pusher_name = $handles[$pusher_phid]->getName();
+      } else {
+        $pusher_name = null;
+      }
+
+      $device_phid = $log->getDevicePHID();
+      if ($device_phid) {
+        $device_name = $handles[$device_phid]->getName();
+      } else {
+        $device_name = null;
+      }
+
+      $flags = $log->getChangeFlags();
+      $flag_names = array();
+      foreach ($flag_map as $flag_key => $flag_name) {
+        if (($flags & $flag_key) === $flag_key) {
+          $flag_names[] = $flag_name;
+        }
+      }
+
+      $result = $event->getRejectCode();
+      $result_name = idx($reject_map, $result, pht('Unknown ("%s")', $result));
+
+      $map = array(
+        'pushID' => $event->getID(),
+        'protocol' => $event->getRemoteProtocol(),
+        'repositoryPHID' => $repository_phid,
+        'repository' => $repository_name,
+        'pusherPHID' => $pusher_phid,
+        'pusher' => $pusher_name,
+        'devicePHID' => $device_phid,
+        'device' => $device_name,
+        'type' => $log->getRefType(),
+        'name' => $log->getRefName(),
+        'old' => $log->getRefOld(),
+        'new' => $log->getRefNew(),
+        'flags' => $flags,
+        'flagNames' => $flag_names,
+        'result' => $result,
+        'resultName' => $result_name,
+      );
+
+      if ($viewer->getIsAdmin()) {
+        $map['remoteAddress'] = $event->getRemoteAddress();
+      }
+
+      $export[] = $map;
+    }
+
+    return $export;
+  }
+
 }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
index 4e099209c6..81a564a91f 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
@@ -55,6 +55,28 @@ public static function initializeNewLog(PhabricatorUser $viewer) {
       ->setPusherPHID($viewer->getPHID());
   }
 
+  public static function getFlagDisplayNames() {
+    return array(
+      self::CHANGEFLAG_ADD => pht('Create'),
+      self::CHANGEFLAG_DELETE => pht('Delete'),
+      self::CHANGEFLAG_APPEND => pht('Append'),
+      self::CHANGEFLAG_REWRITE => pht('Rewrite'),
+      self::CHANGEFLAG_DANGEROUS => pht('Dangerous'),
+      self::CHANGEFLAG_ENORMOUS => pht('Enormous'),
+    );
+  }
+
+  public static function getRejectCodeDisplayNames() {
+    return array(
+      self::REJECT_ACCEPT => pht('Accepted'),
+      self::REJECT_DANGEROUS => pht('Rejected: Dangerous'),
+      self::REJECT_HERALD => pht('Rejected: Herald'),
+      self::REJECT_EXTERNAL => pht('Rejected: External Hook'),
+      self::REJECT_BROKEN => pht('Rejected: Broken'),
+      self::REJECT_ENORMOUS => pht('Rejected: Enormous'),
+    );
+  }
+
   public static function getHeraldChangeFlagConditionOptions() {
     return array(
       self::CHANGEFLAG_ADD =>

From 0d5379ee1778fd049216c171382b1dbb0173e900 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 08:03:29 -0800
Subject: [PATCH 457/865] Fix an export bug where queries specified in the URI
 ("?param=value") were ignored when filtering the result set

Summary:
Depends on D18968. Ref T13049. Currently, if you visit `/query/?param=value`, there is no `queryKey` for the page but we build a query later on.

Right now, we incorrectly link to `/query/all/export/` in this case (and export too many results), but we should actually link to `/query/<constructed query key>/export/` to export only the desired/previewed results.

Swap the logic around a little bit so we look at the query we're actually executing, not the original URI, to figure out the query key we should use when building the link.

Test Plan: Visited a `/?param=value` page, exported data, got a subset of the full data instead of everything.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18969
---
 .../PhabricatorApplicationSearchController.php  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index 6c7d80eafe..cc8bcefff1 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -7,6 +7,7 @@ final class PhabricatorApplicationSearchController
   private $navigation;
   private $queryKey;
   private $preface;
+  private $activeQuery;
 
   public function setPreface($preface) {
     $this->preface = $preface;
@@ -45,6 +46,14 @@ protected function getSearchEngine() {
     return $this->searchEngine;
   }
 
+  protected function getActiveQuery() {
+    if (!$this->activeQuery) {
+      throw new Exception(pht('There is no active query yet.'));
+    }
+
+    return $this->activeQuery;
+  }
+
   protected function validateDelegatingController() {
     $parent = $this->getDelegatingController();
 
@@ -158,6 +167,8 @@ private function processSearchRequest() {
       $engine->saveQuery($saved_query);
     }
 
+    $this->activeQuery = $saved_query;
+
     $nav->selectFilter(
       'query/'.$saved_query->getQueryKey(),
       'query/advanced');
@@ -867,10 +878,8 @@ private function newBuiltinUseActions() {
 
     $engine = $this->getSearchEngine();
     $engine_class = get_class($engine);
-    $query_key = $this->getQueryKey();
-    if (!$query_key) {
-      $query_key = $engine->getDefaultQueryKey();
-    }
+
+    $query_key = $this->getActiveQuery()->getQueryKey();
 
     $can_use = $engine->canUseInPanelContext();
     $is_installed = PhabricatorApplication::isClassInstalledForViewer(

From 75bc86589f10dd520bba41dc52bd3458e22b1f6a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 11:47:55 -0800
Subject: [PATCH 458/865] Add date range filtering for activity, push, and pull
 logs

Summary: Ref T13049. This is just a general nice-to-have so you don't have to export a 300MB file if you want to check the last month of data or whatever.

Test Plan: Applied filters to all three logs, got appropriate date-range result sets.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18970
---
 .../query/DiffusionPullLogSearchEngine.php    | 12 ++++++++++
 .../query/PhabricatorPeopleLogQuery.php       | 22 +++++++++++++++++++
 .../PhabricatorPeopleLogSearchEngine.php      | 12 ++++++++++
 .../PhabricatorRepositoryPullEventQuery.php   | 22 +++++++++++++++++++
 .../PhabricatorRepositoryPushLogQuery.php     | 22 +++++++++++++++++++
 ...abricatorRepositoryPushLogSearchEngine.php | 12 ++++++++++
 .../storage/PhabricatorRepositoryPushLog.php  |  3 +++
 7 files changed, 105 insertions(+)

diff --git a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
index fc7cee52ce..db5d4b9fcb 100644
--- a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
+++ b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
@@ -26,6 +26,12 @@ protected function buildQueryFromParameters(array $map) {
       $query->withPullerPHIDs($map['pullerPHIDs']);
     }
 
+    if ($map['createdStart'] || $map['createdEnd']) {
+      $query->withEpochBetween(
+        $map['createdStart'],
+        $map['createdEnd']);
+    }
+
     return $query;
   }
 
@@ -44,6 +50,12 @@ protected function buildCustomSearchFields() {
         ->setLabel(pht('Pullers'))
         ->setDescription(
           pht('Search for pull logs by specific users.')),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created After'))
+        ->setKey('createdStart'),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created Before'))
+        ->setKey('createdEnd'),
     );
   }
 
diff --git a/src/applications/people/query/PhabricatorPeopleLogQuery.php b/src/applications/people/query/PhabricatorPeopleLogQuery.php
index e6e2506bee..fc6a87b335 100644
--- a/src/applications/people/query/PhabricatorPeopleLogQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleLogQuery.php
@@ -9,6 +9,8 @@ final class PhabricatorPeopleLogQuery
   private $sessionKeys;
   private $actions;
   private $remoteAddressPrefix;
+  private $dateCreatedMin;
+  private $dateCreatedMax;
 
   public function withActorPHIDs(array $actor_phids) {
     $this->actorPHIDs = $actor_phids;
@@ -40,6 +42,12 @@ public function withRemoteAddressPrefix($remote_address_prefix) {
     return $this;
   }
 
+  public function withDateCreatedBetween($min, $max) {
+    $this->dateCreatedMin = $min;
+    $this->dateCreatedMax = $max;
+    return $this;
+  }
+
   public function newResultObject() {
     return new PhabricatorUserLog();
   }
@@ -94,6 +102,20 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->remoteAddressPrefix);
     }
 
+    if ($this->dateCreatedMin !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'dateCreated >= %d',
+        $this->dateCreatedMin);
+    }
+
+    if ($this->dateCreatedMax !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'dateCreated <= %d',
+        $this->dateCreatedMax);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
index 1a3ae4dea1..b052456cd3 100644
--- a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
@@ -54,6 +54,12 @@ protected function buildQueryFromParameters(array $map) {
       $query->withSessionKeys($map['sessions']);
     }
 
+    if ($map['createdStart'] || $map['createdEnd']) {
+      $query->withDateCreatedBetween(
+        $map['createdStart'],
+        $map['createdEnd']);
+    }
+
     return $query;
   }
 
@@ -82,6 +88,12 @@ protected function buildCustomSearchFields() {
         ->setKey('sessions')
         ->setLabel(pht('Sessions'))
         ->setDescription(pht('Search for activity in particular sessions.')),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created After'))
+        ->setKey('createdStart'),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created Before'))
+        ->setKey('createdEnd'),
     );
   }
 
diff --git a/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
index af60ee0383..ce14a6f831 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
@@ -7,6 +7,8 @@ final class PhabricatorRepositoryPullEventQuery
   private $phids;
   private $repositoryPHIDs;
   private $pullerPHIDs;
+  private $epochMin;
+  private $epochMax;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -28,6 +30,12 @@ public function withPullerPHIDs(array $puller_phids) {
     return $this;
   }
 
+  public function withEpochBetween($min, $max) {
+    $this->epochMin = $min;
+    $this->epochMax = $max;
+    return $this;
+  }
+
   public function newResultObject() {
     return new PhabricatorRepositoryPullEvent();
   }
@@ -103,6 +111,20 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->pullerPHIDs);
     }
 
+    if ($this->epochMin !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'epoch >= %d',
+        $this->epochMin);
+    }
+
+    if ($this->epochMax !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'epoch <= %d',
+        $this->epochMax);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
index 2c5f7b0d0d..cb097fae2f 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
@@ -10,6 +10,8 @@ final class PhabricatorRepositoryPushLogQuery
   private $refTypes;
   private $newRefs;
   private $pushEventPHIDs;
+  private $epochMin;
+  private $epochMax;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -46,6 +48,12 @@ public function withPushEventPHIDs(array $phids) {
     return $this;
   }
 
+  public function withEpochBetween($min, $max) {
+    $this->epochMin = $min;
+    $this->epochMax = $max;
+    return $this;
+  }
+
   public function newResultObject() {
     return new PhabricatorRepositoryPushLog();
   }
@@ -127,6 +135,20 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->newRefs);
     }
 
+    if ($this->epochMin !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'epoch >= %d',
+        $this->epochMin);
+    }
+
+    if ($this->epochMax !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'epoch <= %d',
+        $this->epochMax);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
index b2234ab6c7..8ad76987f9 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
@@ -26,6 +26,12 @@ protected function buildQueryFromParameters(array $map) {
       $query->withPusherPHIDs($map['pusherPHIDs']);
     }
 
+    if ($map['createdStart'] || $map['createdEnd']) {
+      $query->withEpochBetween(
+        $map['createdStart'],
+        $map['createdEnd']);
+    }
+
     return $query;
   }
 
@@ -44,6 +50,12 @@ protected function buildCustomSearchFields() {
         ->setLabel(pht('Pushers'))
         ->setDescription(
           pht('Search for pull logs by specific users.')),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created After'))
+        ->setKey('createdStart'),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created Before'))
+        ->setKey('createdEnd'),
     );
   }
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
index 81a564a91f..c2d3456da6 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
@@ -124,6 +124,9 @@ protected function getConfiguration() {
         'key_pusher' => array(
           'columns' => array('pusherPHID'),
         ),
+        'key_epoch' => array(
+          'columns' => array('epoch'),
+        ),
       ),
     ) + parent::getConfiguration();
   }

From 8a2863e3f7f8de79fbdd25eb3dc05605b0be2784 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 12:01:26 -0800
Subject: [PATCH 459/865] Change the "can see remote address?" policy to "is
 administrator?" everywhere

Summary:
Depends on D18970. Ref T13049. Currently, the policy for viewing remote addresses is:

  - In activity logs: administrators.
  - In push and pull logs: users who can edit the corresponding repository.

This sort of makes sense, but is also sort of weird. Particularly, I think it's kind of hard to understand and predict, and hard to guess that this is the behavior we implement. The actual implementation is complex, too.

Instead, just use the rule "administrators can see remote addresses" consistently across all applications. This should generally be more strict than the old rule, because administrators could usually have seen everyone's address in the activity logs anyway. It's also simpler and more expected, and I don't really know of any legit use cases for the "repository editor" rule.

Test Plan: Viewed pull/push/activity logs as non-admin. Saw remote addresses as an admin, and none as a non-admin.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18971
---
 .../query/DiffusionPullLogSearchEngine.php    | 20 +++++++++--
 .../view/DiffusionPullLogListView.php         | 36 +++++++------------
 .../view/DiffusionPushLogListView.php         | 25 ++++---------
 3 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
index db5d4b9fcb..dfdfceb519 100644
--- a/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
+++ b/src/applications/diffusion/query/DiffusionPullLogSearchEngine.php
@@ -60,7 +60,9 @@ protected function buildCustomSearchFields() {
   }
 
   protected function newExportFields() {
-    return array(
+    $viewer = $this->requireViewer();
+
+    $fields = array(
       id(new PhabricatorPHIDExportField())
         ->setKey('repositoryPHID')
         ->setLabel(pht('Repository PHID')),
@@ -86,6 +88,14 @@ protected function newExportFields() {
         ->setKey('date')
         ->setLabel(pht('Date')),
     );
+
+    if ($viewer->getIsAdmin()) {
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('remoteAddress')
+        ->setLabel(pht('Remote Address'));
+    }
+
+    return $fields;
   }
 
   protected function newExportData(array $events) {
@@ -117,7 +127,7 @@ protected function newExportData(array $events) {
         $puller_name = null;
       }
 
-      $export[] = array(
+      $map = array(
         'repositoryPHID' => $repository_phid,
         'repository' => $repository_name,
         'pullerPHID' => $puller_phid,
@@ -127,6 +137,12 @@ protected function newExportData(array $events) {
         'code' => $event->getResultCode(),
         'date' => $event->getEpoch(),
       );
+
+      if ($viewer->getIsAdmin()) {
+        $map['remoteAddress'] = $event->getRemoteAddress();
+      }
+
+      $export[] = $map;
     }
 
     return $export;
diff --git a/src/applications/diffusion/view/DiffusionPullLogListView.php b/src/applications/diffusion/view/DiffusionPullLogListView.php
index f2e3280eba..8df35e2922 100644
--- a/src/applications/diffusion/view/DiffusionPullLogListView.php
+++ b/src/applications/diffusion/view/DiffusionPullLogListView.php
@@ -22,24 +22,10 @@ public function render() {
     }
     $handles = $viewer->loadHandles($handle_phids);
 
-    // Figure out which repositories are editable. We only let you see remote
-    // IPs if you have edit capability on a repository.
-    $editable_repos = array();
-    if ($events) {
-      $editable_repos = id(new PhabricatorRepositoryQuery())
-        ->setViewer($viewer)
-        ->requireCapabilities(
-          array(
-            PhabricatorPolicyCapability::CAN_VIEW,
-            PhabricatorPolicyCapability::CAN_EDIT,
-          ))
-        ->withPHIDs(mpull($events, 'getRepositoryPHID'))
-        ->execute();
-      $editable_repos = mpull($editable_repos, null, 'getPHID');
-    }
+    // Only administrators can view remote addresses.
+    $remotes_visible = $viewer->getIsAdmin();
 
     $rows = array();
-    $any_host = false;
     foreach ($events as $event) {
       if ($event->getRepositoryPHID()) {
         $repository = $event->getRepository();
@@ -47,13 +33,10 @@ public function render() {
         $repository = null;
       }
 
-      // Reveal this if it's valid and the user can edit the repository. For
-      // invalid requests you currently have to go fishing in the database.
-      $remote_address = '-';
-      if ($repository) {
-        if (isset($editable_repos[$event->getRepositoryPHID()])) {
-          $remote_address = $event->getRemoteAddress();
-        }
+      if ($remotes_visible) {
+        $remote_address = $event->getRemoteAddress();
+      } else {
+        $remote_address = null;
       }
 
       $event_id = $event->getID();
@@ -107,6 +90,13 @@ public function render() {
           '',
           'n',
           'right',
+        ))
+      ->setColumnVisibility(
+        array(
+          true,
+          true,
+          true,
+          $remotes_visible,
         ));
 
     return $table;
diff --git a/src/applications/diffusion/view/DiffusionPushLogListView.php b/src/applications/diffusion/view/DiffusionPushLogListView.php
index 303f0519f6..77f28671c6 100644
--- a/src/applications/diffusion/view/DiffusionPushLogListView.php
+++ b/src/applications/diffusion/view/DiffusionPushLogListView.php
@@ -25,31 +25,18 @@ public function render() {
 
     $handles = $viewer->loadHandles($handle_phids);
 
-    // Figure out which repositories are editable. We only let you see remote
-    // IPs if you have edit capability on a repository.
-    $editable_repos = array();
-    if ($logs) {
-      $editable_repos = id(new PhabricatorRepositoryQuery())
-        ->setViewer($viewer)
-        ->requireCapabilities(
-          array(
-            PhabricatorPolicyCapability::CAN_VIEW,
-            PhabricatorPolicyCapability::CAN_EDIT,
-          ))
-        ->withPHIDs(mpull($logs, 'getRepositoryPHID'))
-        ->execute();
-      $editable_repos = mpull($editable_repos, null, 'getPHID');
-    }
+    // Only administrators can view remote addresses.
+    $remotes_visible = $viewer->getIsAdmin();
 
     $rows = array();
     $any_host = false;
     foreach ($logs as $log) {
       $repository = $log->getRepository();
 
-      // Reveal this if it's valid and the user can edit the repository.
-      $remote_address = '-';
-      if (isset($editable_repos[$log->getRepositoryPHID()])) {
+      if ($remotes_visible) {
         $remote_address = $log->getPushEvent()->getRemoteAddress();
+      } else {
+        $remote_address = null;
       }
 
       $event_id = $log->getPushEvent()->getID();
@@ -142,7 +129,7 @@ public function render() {
           true,
           true,
           true,
-          true,
+          $remotes_visible,
           true,
           $any_host,
         ));

From ff98f6f522b171bcdabf45933c775e1a4089792e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 12:13:28 -0800
Subject: [PATCH 460/865] Make the remote address rules for Settings > Activity
 Logs more consistent

Summary:
Depends on D18971. Ref T13049. The rule is currently "you can see IP addresses for actions which affect your account".

There's some legitimate motivation for this, since it's good if you can see that someone you don't recognize has been trying to log into your account.

However, this includes cases where an administrator disables/enables your account, or promotes/demotes you to administrator. In these cases, //their// IP is shown!

Make the rule:

  - Administrators can see it (consistent with everything else).
  - You can see your own actions.
  - You can see actions which affected you that have no actor (these are things like login attempts).
  - You can't see other stuff: usually, administrators changing your account settings.

Test Plan: Viewed activity log as a non-admin, no longer saw administrator's IP address disclosed in "Demote from Admin" log.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18972
---
 .../people/view/PhabricatorUserLogView.php    | 58 +++++++++++++++----
 .../PhabricatorActivitySettingsPanel.php      | 15 -----
 2 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/src/applications/people/view/PhabricatorUserLogView.php b/src/applications/people/view/PhabricatorUserLogView.php
index 309540c611..72a9378a1a 100644
--- a/src/applications/people/view/PhabricatorUserLogView.php
+++ b/src/applications/people/view/PhabricatorUserLogView.php
@@ -30,31 +30,65 @@ public function render() {
     $action_map = PhabricatorUserLog::getActionTypeMap();
     $base_uri = $this->searchBaseURI;
 
+    $viewer_phid = $viewer->getPHID();
+
     $rows = array();
     foreach ($logs as $log) {
-      $ip = $log->getRemoteAddr();
       $session = substr($log->getSession(), 0, 6);
 
-      if ($base_uri) {
-        $ip = phutil_tag(
-          'a',
-          array(
-            'href' => $base_uri.'?ip='.$ip.'#R',
-          ),
-          $ip);
+      $actor_phid = $log->getActorPHID();
+      $user_phid = $log->getUserPHID();
+
+      if ($viewer->getIsAdmin()) {
+        $can_see_ip = true;
+      } else if ($viewer_phid == $actor_phid) {
+        // You can see the address if you took the action.
+        $can_see_ip = true;
+      } else if (!$actor_phid && ($viewer_phid == $user_phid)) {
+        // You can see the address if it wasn't authenticated and applied
+        // to you (partial login).
+        $can_see_ip = true;
+      } else {
+        // You can't see the address when an administrator disables your
+        // account, since it's their address.
+        $can_see_ip = false;
+      }
+
+      if ($can_see_ip) {
+        $ip = $log->getRemoteAddr();
+        if ($base_uri) {
+          $ip = phutil_tag(
+            'a',
+            array(
+              'href' => $base_uri.'?ip='.$ip.'#R',
+            ),
+            $ip);
+        }
+      } else {
+        $ip = null;
       }
 
       $action = $log->getAction();
       $action_name = idx($action_map, $action, $action);
 
+      if ($actor_phid) {
+        $actor_name = $handles[$actor_phid]->renderLink();
+      } else {
+        $actor_name = null;
+      }
+
+      if ($user_phid) {
+        $user_name = $handles[$user_phid]->renderLink();
+      } else {
+        $user_name = null;
+      }
+
       $rows[] = array(
         phabricator_date($log->getDateCreated(), $viewer),
         phabricator_time($log->getDateCreated(), $viewer),
         $action_name,
-        $log->getActorPHID()
-          ? $handles[$log->getActorPHID()]->getName()
-          : null,
-        $username = $handles[$log->getUserPHID()]->renderLink(),
+        $actor_name,
+        $user_name,
         $ip,
         $session,
       );
diff --git a/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php b/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
index eeeca27663..2759f3a26c 100644
--- a/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
@@ -26,21 +26,6 @@ public function processRequest(AphrontRequest $request) {
       ->withRelatedPHIDs(array($user->getPHID()))
       ->executeWithCursorPager($pager);
 
-    $phids = array();
-    foreach ($logs as $log) {
-      $phids[] = $log->getUserPHID();
-      $phids[] = $log->getActorPHID();
-    }
-
-    if ($phids) {
-      $handles = id(new PhabricatorHandleQuery())
-        ->setViewer($viewer)
-        ->withPHIDs($phids)
-        ->execute();
-    } else {
-      $handles = array();
-    }
-
     $table = id(new PhabricatorUserLogView())
       ->setUser($viewer)
       ->setLogs($logs);

From 1e3d1271ada02ee80693901286152422d6e9d731 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 13:01:09 -0800
Subject: [PATCH 461/865] Make push log "flags", "reject code" human readable;
 add crumbs to pull/push logs

Summary:
Depends on D18972. Ref T13049.

Currently, the "flags" columns renders an inscrutible bitmask which you have to go hunt down in the code. Show a list of flags in human-readable text instead.

The "code" column renders a meaningless integer code. Show a text description instead.

The pull logs and push logs pages don't have a crumb to go back up out of the current query. Add one.

Test Plan: Viewed push logs, no more arcane numbers. Saw and clicked crumbs on each log page.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13049

Differential Revision: https://secure.phabricator.com/D18973
---
 .../DiffusionPullLogListController.php        |  5 ++++
 .../DiffusionPushLogListController.php        |  5 ++++
 .../view/DiffusionPushLogListView.php         | 30 +++++++++++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionPullLogListController.php b/src/applications/diffusion/controller/DiffusionPullLogListController.php
index 29712be2a4..f3b570c815 100644
--- a/src/applications/diffusion/controller/DiffusionPullLogListController.php
+++ b/src/applications/diffusion/controller/DiffusionPullLogListController.php
@@ -9,4 +9,9 @@ public function handleRequest(AphrontRequest $request) {
       ->buildResponse();
   }
 
+  protected function buildApplicationCrumbs() {
+    return parent::buildApplicationCrumbs()
+      ->addTextCrumb(pht('Pull Logs'), $this->getApplicationURI('pulllog/'));
+  }
+
 }
diff --git a/src/applications/diffusion/controller/DiffusionPushLogListController.php b/src/applications/diffusion/controller/DiffusionPushLogListController.php
index 658e21674d..a6c612eebe 100644
--- a/src/applications/diffusion/controller/DiffusionPushLogListController.php
+++ b/src/applications/diffusion/controller/DiffusionPushLogListController.php
@@ -9,4 +9,9 @@ public function handleRequest(AphrontRequest $request) {
       ->buildResponse();
   }
 
+  protected function buildApplicationCrumbs() {
+    return parent::buildApplicationCrumbs()
+      ->addTextCrumb(pht('Push Logs'), $this->getApplicationURI('pushlog/'));
+  }
+
 }
diff --git a/src/applications/diffusion/view/DiffusionPushLogListView.php b/src/applications/diffusion/view/DiffusionPushLogListView.php
index 77f28671c6..e101625752 100644
--- a/src/applications/diffusion/view/DiffusionPushLogListView.php
+++ b/src/applications/diffusion/view/DiffusionPushLogListView.php
@@ -28,6 +28,9 @@ public function render() {
     // Only administrators can view remote addresses.
     $remotes_visible = $viewer->getIsAdmin();
 
+    $flag_map = PhabricatorRepositoryPushLog::getFlagDisplayNames();
+    $reject_map = PhabricatorRepositoryPushLog::getRejectCodeDisplayNames();
+
     $rows = array();
     $any_host = false;
     foreach ($logs as $log) {
@@ -59,6 +62,23 @@ public function render() {
         $device = null;
       }
 
+      $flags = $log->getChangeFlags();
+      $flag_names = array();
+      foreach ($flag_map as $flag_key => $flag_name) {
+        if (($flags & $flag_key) === $flag_key) {
+          $flag_names[] = $flag_name;
+        }
+      }
+      $flag_names = phutil_implode_html(
+        phutil_tag('br'),
+        $flag_names);
+
+      $reject_code = $log->getPushEvent()->getRejectCode();
+      $reject_label = idx(
+        $reject_map,
+        $reject_code,
+        pht('Unknown ("%s")', $reject_code));
+
       $rows[] = array(
         phutil_tag(
           'a',
@@ -85,10 +105,8 @@ public function render() {
             'href' => $repository->getCommitURI($log->getRefNew()),
           ),
           $log->getRefNewShort()),
-
-        // TODO: Make these human-readable.
-        $log->getChangeFlags(),
-        $log->getPushEvent()->getRejectCode(),
+        $flag_names,
+        $reject_label,
         $viewer->formatShortDateTime($log->getEpoch()),
       );
     }
@@ -107,7 +125,7 @@ public function render() {
           pht('Old'),
           pht('New'),
           pht('Flags'),
-          pht('Code'),
+          pht('Result'),
           pht('Date'),
         ))
       ->setColumnClasses(
@@ -122,6 +140,8 @@ public function render() {
           'wide',
           'n',
           'n',
+          '',
+          '',
           'right',
         ))
       ->setColumnVisibility(

From c9df8f77c8b5cabb5fe2a3c8874c82d12d1cf431 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 31 Jan 2018 10:37:38 -0800
Subject: [PATCH 462/865] Fix transcription of single-value bulk edit fields
 ("Assign to")

Summary: See PHI333. Some of the cleanup at the tail end of the bulk edit changes made "Assign To" stop working properly, since we don't strip the `array(...)` off the `array(PHID)` value we receive.

Test Plan:
  - Used bulk editor to assign and unassign tasks (single value datasource).
  - Used bulk editor to change projects (multi-value datasource).

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18975
---
 resources/celerity/map.php                           | 12 ++++++------
 .../edittype/PhabricatorPHIDListEditType.php         | 12 ++++++++++++
 webroot/rsrc/js/phuix/PHUIXFormControl.js            |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 661ac58c15..d9aebf32bc 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -532,7 +532,7 @@
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
-    'rsrc/js/phuix/PHUIXFormControl.js' => '1dd0870c',
+    'rsrc/js/phuix/PHUIXFormControl.js' => '16ad6224',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
   ),
   'symbols' => array(
@@ -884,7 +884,7 @@
     'phuix-autocomplete' => 'e0731603',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
-    'phuix-form-control-view' => '1dd0870c',
+    'phuix-form-control-view' => '16ad6224',
     'phuix-icon-view' => 'bff6884b',
     'policy-css' => '957ea14c',
     'policy-edit-css' => '815c66f7',
@@ -995,6 +995,10 @@
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
     ),
+    '16ad6224' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     '17bb8539' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1029,10 +1033,6 @@
       'javelin-request',
       'javelin-uri',
     ),
-    '1dd0870c' => array(
-      'javelin-install',
-      'javelin-dom',
-    ),
     '1e911d0f' => array(
       'javelin-stratcom',
       'javelin-request',
diff --git a/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php b/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
index eb728a6808..07489521b6 100644
--- a/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
@@ -55,4 +55,16 @@ protected function newConduitParameterType() {
     }
   }
 
+  public function getTransactionValueFromBulkEdit($value) {
+    if (!$this->getIsSingleValue()) {
+      return $value;
+    }
+
+    if ($value) {
+      return head($value);
+    }
+
+    return null;
+  }
+
 }
diff --git a/webroot/rsrc/js/phuix/PHUIXFormControl.js b/webroot/rsrc/js/phuix/PHUIXFormControl.js
index cd67e89691..eb5f32963d 100644
--- a/webroot/rsrc/js/phuix/PHUIXFormControl.js
+++ b/webroot/rsrc/js/phuix/PHUIXFormControl.js
@@ -293,7 +293,7 @@ JX.install('PHUIXFormControl', {
     },
 
     _newPoints: function(spec) {
-      return this._newText();
+      return this._newText(spec);
     },
 
     _newText: function(spec) {

From cff61e4d788283fa46ad3fb8446d93e3da07a4b1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 31 Jan 2018 10:37:38 -0800
Subject: [PATCH 463/865] (stable) Fix transcription of single-value bulk edit
 fields ("Assign to")

Summary: See PHI333. Some of the cleanup at the tail end of the bulk edit changes made "Assign To" stop working properly, since we don't strip the `array(...)` off the `array(PHID)` value we receive.

Test Plan:
  - Used bulk editor to assign and unassign tasks (single value datasource).
  - Used bulk editor to change projects (multi-value datasource).

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18975
---
 resources/celerity/map.php                           | 12 ++++++------
 .../edittype/PhabricatorPHIDListEditType.php         | 12 ++++++++++++
 webroot/rsrc/js/phuix/PHUIXFormControl.js            |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index fece1e10ee..df213204c5 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -532,7 +532,7 @@
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
-    'rsrc/js/phuix/PHUIXFormControl.js' => '1dd0870c',
+    'rsrc/js/phuix/PHUIXFormControl.js' => '16ad6224',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
   ),
   'symbols' => array(
@@ -884,7 +884,7 @@
     'phuix-autocomplete' => 'e0731603',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
-    'phuix-form-control-view' => '1dd0870c',
+    'phuix-form-control-view' => '16ad6224',
     'phuix-icon-view' => 'bff6884b',
     'policy-css' => '957ea14c',
     'policy-edit-css' => '815c66f7',
@@ -995,6 +995,10 @@
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
     ),
+    '16ad6224' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     '17bb8539' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1029,10 +1033,6 @@
       'javelin-request',
       'javelin-uri',
     ),
-    '1dd0870c' => array(
-      'javelin-install',
-      'javelin-dom',
-    ),
     '1e911d0f' => array(
       'javelin-stratcom',
       'javelin-request',
diff --git a/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php b/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
index eb728a6808..07489521b6 100644
--- a/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
@@ -55,4 +55,16 @@ protected function newConduitParameterType() {
     }
   }
 
+  public function getTransactionValueFromBulkEdit($value) {
+    if (!$this->getIsSingleValue()) {
+      return $value;
+    }
+
+    if ($value) {
+      return head($value);
+    }
+
+    return null;
+  }
+
 }
diff --git a/webroot/rsrc/js/phuix/PHUIXFormControl.js b/webroot/rsrc/js/phuix/PHUIXFormControl.js
index cd67e89691..eb5f32963d 100644
--- a/webroot/rsrc/js/phuix/PHUIXFormControl.js
+++ b/webroot/rsrc/js/phuix/PHUIXFormControl.js
@@ -293,7 +293,7 @@ JX.install('PHUIXFormControl', {
     },
 
     _newPoints: function(spec) {
-      return this._newText();
+      return this._newText(spec);
     },
 
     _newText: function(spec) {

From f9336e56940fb9ae00ac7fd967eaf0ef974463c9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 30 Jan 2018 15:58:05 -0800
Subject: [PATCH 464/865] Mangle cells that look a little bit like formulas in
 CSV files

Summary:
Fixes T12800. See that task for discussion. When a cell in a CSV begins with "=", "+", "-", or "@", mangle the content to discourage Excel from executing it.

This is clumsy, but we support other formats (e.g., JSON) which preserve the data faithfully and you should probably be using JSON if you're going to do anything programmatic with it.

We could add two formats or a checkbox or a warning or something but cells with these symbols are fairly rare anyway.

Some possible exceptions I can think of are "user monograms" (but we don't export those right now) and "negative numbers" (but also no direct export today). We can add exceptions for those as they arise.

Test Plan: Exported a task named `=cmd|'/C evil.exe'!A0`, saw the title get mangled with "(!)" in front.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12800

Differential Revision: https://secure.phabricator.com/D18974
---
 .../export/format/PhabricatorCSVExportFormat.php       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/infrastructure/export/format/PhabricatorCSVExportFormat.php b/src/infrastructure/export/format/PhabricatorCSVExportFormat.php
index 67f0a4963a..8f3879d5fb 100644
--- a/src/infrastructure/export/format/PhabricatorCSVExportFormat.php
+++ b/src/infrastructure/export/format/PhabricatorCSVExportFormat.php
@@ -42,6 +42,16 @@ public function addObject($object, array $fields, array $map) {
   private function addRow(array $values) {
     $row = array();
     foreach ($values as $value) {
+
+      // Excel is extremely interested in executing arbitrary code it finds in
+      // untrusted CSV files downloaded from the internet. When a cell looks
+      // like it might be too tempting for Excel to ignore, mangle the value
+      // to dissuade remote code execution. See T12800.
+
+      if (preg_match('/^\s*[+=@-]/', $value)) {
+        $value = '(!) '.$value;
+      }
+
       if (preg_match('/\s|,|\"/', $value)) {
         $value = str_replace('"', '""', $value);
         $value = '"'.$value.'"';

From 6d5f265a57957d9b7bbba54a0355bd004b8619aa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 31 Jan 2018 11:11:29 -0800
Subject: [PATCH 465/865] Accept `null` via `conduit.edit` to unassign a task

Summary:
See <https://discourse.phabricator-community.org/t/maniphest-edit-to-unassign-owner-documentation-is-wrong/1053>. This unusual field doesn't actually accept `null`, although the documentation says it does and that was the intent.

Accept `null`, and show `phid|null` in the docs.

Test Plan: Viewed docs, saw `phid|null`. Unassigned with `null`.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18976
---
 .../ConduitPHIDParameterType.php              | 31 +++++++++++++++++--
 .../maniphest/editor/ManiphestEditEngine.php  |  1 +
 .../PhabricatorPHIDListEditField.php          | 16 ++++++++--
 .../edittype/PhabricatorPHIDListEditType.php  | 21 +++++++------
 4 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/applications/conduit/parametertype/ConduitPHIDParameterType.php b/src/applications/conduit/parametertype/ConduitPHIDParameterType.php
index 3bb45697dc..eafee4d453 100644
--- a/src/applications/conduit/parametertype/ConduitPHIDParameterType.php
+++ b/src/applications/conduit/parametertype/ConduitPHIDParameterType.php
@@ -3,9 +3,26 @@
 final class ConduitPHIDParameterType
   extends ConduitParameterType {
 
+  private $isNullable;
+
+  public function setIsNullable($is_nullable) {
+    $this->isNullable = $is_nullable;
+    return $this;
+  }
+
+  public function getIsNullable() {
+    return $this->isNullable;
+  }
+
   protected function getParameterValue(array $request, $key, $strict) {
     $value = parent::getParameterValue($request, $key, $strict);
 
+    if ($this->getIsNullable()) {
+      if ($value === null) {
+        return $value;
+      }
+    }
+
     if (!is_string($value)) {
       $this->raiseValidationException(
         $request,
@@ -17,7 +34,11 @@ protected function getParameterValue(array $request, $key, $strict) {
   }
 
   protected function getParameterTypeName() {
-    return 'phid';
+    if ($this->getIsNullable()) {
+      return 'phid|null';
+    } else {
+      return 'phid';
+    }
   }
 
   protected function getParameterFormatDescriptions() {
@@ -27,9 +48,15 @@ protected function getParameterFormatDescriptions() {
   }
 
   protected function getParameterExamples() {
-    return array(
+    $examples = array(
       '"PHID-WXYZ-1111222233334444"',
     );
+
+    if ($this->getIsNullable()) {
+      $examples[] = 'null';
+    }
+
+    return $examples;
   }
 
 }
diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php
index 359ba493d4..c270104034 100644
--- a/src/applications/maniphest/editor/ManiphestEditEngine.php
+++ b/src/applications/maniphest/editor/ManiphestEditEngine.php
@@ -196,6 +196,7 @@ protected function buildCustomEditFields($object) {
           pht('New task owner, or `null` to unassign.'))
         ->setTransactionType(ManiphestTaskOwnerTransaction::TRANSACTIONTYPE)
         ->setIsCopyable(true)
+        ->setIsNullable(true)
         ->setSingleValue($object->getOwnerPHID())
         ->setCommentActionLabel(pht('Assign / Claim'))
         ->setCommentActionValue($owner_value),
diff --git a/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php b/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
index b084c142e5..d2b647b9aa 100644
--- a/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
@@ -5,6 +5,7 @@ abstract class PhabricatorPHIDListEditField
 
   private $useEdgeTransactions;
   private $isSingleValue;
+  private $isNullable;
 
   public function setUseEdgeTransactions($use_edge_transactions) {
     $this->useEdgeTransactions = $use_edge_transactions;
@@ -30,13 +31,23 @@ public function getIsSingleValue() {
     return $this->isSingleValue;
   }
 
+  public function setIsNullable($is_nullable) {
+    $this->isNullable = $is_nullable;
+    return $this;
+  }
+
+  public function getIsNullable() {
+    return $this->isNullable;
+  }
+
   protected function newHTTPParameterType() {
     return new AphrontPHIDListHTTPParameterType();
   }
 
   protected function newConduitParameterType() {
     if ($this->getIsSingleValue()) {
-      return new ConduitPHIDParameterType();
+      return id(new ConduitPHIDParameterType())
+        ->setIsNullable($this->getIsNullable());
     } else {
       return new ConduitPHIDListParameterType();
     }
@@ -99,7 +110,8 @@ protected function newEditType() {
     }
 
     return id(new PhabricatorDatasourceEditType())
-      ->setIsSingleValue($this->getIsSingleValue());
+      ->setIsSingleValue($this->getIsSingleValue())
+      ->setIsNullable($this->getIsNullable());
   }
 
   protected function newBulkEditTypes() {
diff --git a/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php b/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
index 07489521b6..763f6ff001 100644
--- a/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
+++ b/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
@@ -6,6 +6,7 @@ abstract class PhabricatorPHIDListEditType
   private $datasource;
   private $isSingleValue;
   private $defaultValue;
+  private $isNullable;
 
   public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
     $this->datasource = $datasource;
@@ -30,16 +31,17 @@ public function setDefaultValue(array $default_value) {
     return $this;
   }
 
-  public function getDefaultValue() {
-    return $this->defaultValue;
+  public function setIsNullable($is_nullable) {
+    $this->isNullable = $is_nullable;
+    return $this;
   }
 
-  public function getValueType() {
-    if ($this->getIsSingleValue()) {
-      return 'phid';
-    } else {
-      return 'list<phid>';
-    }
+  public function getIsNullable() {
+    return $this->isNullable;
+  }
+
+  public function getDefaultValue() {
+    return $this->defaultValue;
   }
 
   protected function newConduitParameterType() {
@@ -49,7 +51,8 @@ protected function newConduitParameterType() {
     }
 
     if ($this->getIsSingleValue()) {
-      return new ConduitPHIDParameterType();
+      return id(new ConduitPHIDParameterType())
+        ->setIsNullable($this->getIsNullable());
     } else {
       return new ConduitPHIDListParameterType();
     }

From f535981c0d61c4ddfa956c0d4baae8573dcc9e94 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 31 Jan 2018 11:21:24 -0800
Subject: [PATCH 466/865] Fix a missing getSSHUser() callsite

Summary:
See <https://discourse.phabricator-community.org/t/after-upgrade-git-lfs-push-ends-up-in-call-to-undefined-method-on-diffusion-git-lfs-authenticate-workflow/1047/1>.

I renamed this method in D18912 but missed this callsite since the workflow doesn't live alongside the other ones.

Test Plan: Ran `git push` in an LFS repository over SSH. Before: fatal; after: clean push.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18977
---
 .../diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php b/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
index 41c009455d..56297f4d8b 100644
--- a/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
+++ b/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
@@ -84,7 +84,7 @@ protected function executeRepositoryOperations() {
     // This works even if normal HTTP repository operations are not available
     // on this host, and does not require the user to have a VCS password.
 
-    $user = $this->getUser();
+    $user = $this->getSSHUser();
 
     $authorization = DiffusionGitLFSTemporaryTokenType::newHTTPAuthorization(
       $repository,

From 4757ff224c7f20e1f4fcc9333c42c3533d9c9b09 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 31 Jan 2018 11:21:24 -0800
Subject: [PATCH 467/865] (stable) Fix a missing getSSHUser() callsite

Summary:
See <https://discourse.phabricator-community.org/t/after-upgrade-git-lfs-push-ends-up-in-call-to-undefined-method-on-diffusion-git-lfs-authenticate-workflow/1047/1>.

I renamed this method in D18912 but missed this callsite since the workflow doesn't live alongside the other ones.

Test Plan: Ran `git push` in an LFS repository over SSH. Before: fatal; after: clean push.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18977
---
 .../diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php b/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
index 41c009455d..56297f4d8b 100644
--- a/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
+++ b/src/applications/diffusion/gitlfs/DiffusionGitLFSAuthenticateWorkflow.php
@@ -84,7 +84,7 @@ protected function executeRepositoryOperations() {
     // This works even if normal HTTP repository operations are not available
     // on this host, and does not require the user to have a VCS password.
 
-    $user = $this->getUser();
+    $user = $this->getSSHUser();
 
     $authorization = DiffusionGitLFSTemporaryTokenType::newHTTPAuthorization(
       $repository,

From f3f1f106b16b3bc296b9bcfc16b3ce48b2036b6a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 29 Jan 2018 13:16:46 -0800
Subject: [PATCH 468/865] (stable) Fix a possible `count(null)` in PHUIInfoView

Summary:
See <https://discourse.phabricator-community.org/t/php7-2-exception-count-parameter-must-be-an-array-or-an-object-that-implements-countable/1031>.

PHP7.2 raises a warning about `count(scalar)` (GREAT!) and we have one here if the caller doesn't `setErrors(...)`.

Test Plan: Sanity-checked usage of `$this->errors`.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18964
---
 src/view/phui/PHUIInfoView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/phui/PHUIInfoView.php b/src/view/phui/PHUIInfoView.php
index 161e49108b..69d0549299 100644
--- a/src/view/phui/PHUIInfoView.php
+++ b/src/view/phui/PHUIInfoView.php
@@ -10,7 +10,7 @@ final class PHUIInfoView extends AphrontTagView {
   const SEVERITY_PLAIN = 'plain';
 
   private $title;
-  private $errors;
+  private $errors = array();
   private $severity = null;
   private $id;
   private $buttons = array();

From 032f5b22941f85340b70da6d164d9dc17cb1b0f9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 31 Jan 2018 12:19:19 -0800
Subject: [PATCH 469/865] Allow revisions to revert commits and one another,
 and commits to revert revisions

Summary:
Ref T13057. This makes "reverts" syntax more visible and useful. In particular, you can now `Reverts Dxx` in a revision or commit, and `Reverts <hash>` from a revision.

When you do, the corresponding object will get a more-visible cross-reference marker in its timeline:

{F5405517}

From here, we can look at surfacing revert information more heavily, since we can now query it on revision/commit pages via edges.

Test Plan: Used "reverts <hash>" and "reverts <revision>" in Differential and Diffusion, got sensible results in the timeline.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13057

Differential Revision: https://secure.phabricator.com/D18978
---
 .../audit/editor/PhabricatorAuditEditor.php   | 56 ++++++++++++++--
 .../editor/DifferentialTransactionEditor.php  | 39 ++++++++++-
 ...iffusionCommitRevertedByCommitEdgeType.php | 12 ++--
 .../DiffusionCommitRevertsCommitEdgeType.php  | 12 ++--
 ...habricatorRepositoryCommitHeraldWorker.php | 26 +-------
 .../PhabricatorApplicationTransaction.php     | 14 ++++
 .../PhabricatorUSEnglishTranslation.php       | 64 +++++++++----------
 7 files changed, 149 insertions(+), 74 deletions(-)

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
index 0cf6339239..049733f777 100644
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -358,9 +358,17 @@ protected function expandCustomRemarkupBlockTransactions(
     array $changes,
     PhutilMarkupEngine $engine) {
 
-    // we are only really trying to find unmentionable phids here...
-    // don't bother with this outside initial commit (i.e. create)
-    // transaction
+    $actor = $this->getActor();
+    $result = array();
+
+    // Some interactions (like "Fixes Txxx" interacting with Maniphest) have
+    // already been processed, so we're only re-parsing them here to avoid
+    // generating an extra redundant mention. Other interactions are being
+    // processed for the first time.
+
+    // We're only recognizing magic in the commit message itself, not in
+    // audit comments.
+
     $is_commit = false;
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
@@ -370,8 +378,6 @@ protected function expandCustomRemarkupBlockTransactions(
       }
     }
 
-    // "result" is always an array....
-    $result = array();
     if (!$is_commit) {
       return $result;
     }
@@ -403,6 +409,46 @@ protected function expandCustomRemarkupBlockTransactions(
       ->withNames($monograms)
       ->execute();
     $phid_map[] = mpull($objects, 'getPHID', 'getPHID');
+
+
+    $reverts_refs = id(new DifferentialCustomFieldRevertsParser())
+      ->parseCorpus($huge_block);
+    $reverts = array_mergev(ipull($reverts_refs, 'monograms'));
+    if ($reverts) {
+      // Only allow commits to revert other commits in the same repository.
+      $reverted_commits = id(new DiffusionCommitQuery())
+        ->setViewer($actor)
+        ->withRepository($object->getRepository())
+        ->withIdentifiers($reverts)
+        ->execute();
+
+      $reverted_revisions = id(new PhabricatorObjectQuery())
+        ->setViewer($actor)
+        ->withNames($reverts)
+        ->withTypes(
+          array(
+            DifferentialRevisionPHIDType::TYPECONST,
+          ))
+        ->execute();
+
+      $reverted_phids =
+        mpull($reverted_commits, 'getPHID', 'getPHID') +
+        mpull($reverted_revisions, 'getPHID', 'getPHID');
+
+      // NOTE: Skip any write attempts if a user cleverly implies a commit
+      // reverts itself, although this would be exceptionally clever in Git
+      // or Mercurial.
+      unset($reverted_phids[$object->getPHID()]);
+
+      $reverts_edge = DiffusionCommitRevertsCommitEdgeType::EDGECONST;
+      $result[] = id(new PhabricatorAuditTransaction())
+        ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
+        ->setMetadataValue('edge:type', $reverts_edge)
+        ->setNewValue(array('+' => $reverted_phids));
+
+      $phid_map[] = $reverted_phids;
+    }
+
     $phid_map = array_mergev($phid_map);
     $this->setUnmentionablePHIDMap($phid_map);
 
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index ecd1e6c95c..3a1537b01d 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -919,7 +919,44 @@ protected function expandCustomRemarkupBlockTransactions(
       }
     }
 
-    $this->setUnmentionablePHIDMap(array_merge($task_phids, $rev_phids));
+    $revert_refs = id(new DifferentialCustomFieldRevertsParser())
+      ->parseCorpus($content_block);
+
+    $revert_monograms = array();
+    foreach ($revert_refs as $match) {
+      foreach ($match['monograms'] as $monogram) {
+        $revert_monograms[] = $monogram;
+      }
+    }
+
+    if ($revert_monograms) {
+      $revert_objects = id(new PhabricatorObjectQuery())
+        ->setViewer($this->getActor())
+        ->withNames($revert_monograms)
+        ->withTypes(
+          array(
+            DifferentialRevisionPHIDType::TYPECONST,
+            PhabricatorRepositoryCommitPHIDType::TYPECONST,
+          ))
+        ->execute();
+
+      $revert_phids = mpull($revert_objects, 'getPHID', 'getPHID');
+
+      // Don't let an object revert itself, although other silly stuff like
+      // cycles of objects reverting each other is not prevented.
+      unset($revert_phids[$object->getPHID()]);
+
+      $revert_type = DiffusionCommitRevertsCommitEdgeType::EDGECONST;
+      $edges[$revert_type] = $revert_phids;
+    } else {
+      $revert_phids = array();
+    }
+
+    $this->setUnmentionablePHIDMap(
+      array_merge(
+        $task_phids,
+        $rev_phids,
+        $revert_phids));
 
     $result = array();
     foreach ($edges as $type => $specs) {
diff --git a/src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php b/src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php
index 53c39e54c9..ae59a3b1e6 100644
--- a/src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php
+++ b/src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php
@@ -19,7 +19,7 @@ public function getTransactionAddString(
     $add_edges) {
 
     return pht(
-      '%s added %s reverting commit(s): %s.',
+      '%s added %s reverting change(s): %s.',
       $actor,
       $add_count,
       $add_edges);
@@ -31,7 +31,7 @@ public function getTransactionRemoveString(
     $rem_edges) {
 
     return pht(
-      '%s removed %s reverting commit(s): %s.',
+      '%s removed %s reverting change(s): %s.',
       $actor,
       $rem_count,
       $rem_edges);
@@ -46,7 +46,7 @@ public function getTransactionEditString(
     $rem_edges) {
 
     return pht(
-      '%s edited reverting commit(s), added %s: %s; removed %s: %s.',
+      '%s edited reverting change(s), added %s: %s; removed %s: %s.',
       $actor,
       $add_count,
       $add_edges,
@@ -61,7 +61,7 @@ public function getFeedAddString(
     $add_edges) {
 
     return pht(
-      '%s added %s reverting commit(s) for %s: %s.',
+      '%s added %s reverting change(s) for %s: %s.',
       $actor,
       $add_count,
       $object,
@@ -75,7 +75,7 @@ public function getFeedRemoveString(
     $rem_edges) {
 
     return pht(
-      '%s removed %s reverting commit(s) for %s: %s.',
+      '%s removed %s reverting change(s) for %s: %s.',
       $actor,
       $rem_count,
       $object,
@@ -92,7 +92,7 @@ public function getFeedEditString(
     $rem_edges) {
 
     return pht(
-      '%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.',
+      '%s edited reverting change(s) for %s, added %s: %s; removed %s: %s.',
       $actor,
       $object,
       $add_count,
diff --git a/src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php b/src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php
index 8f32797173..ee0223c966 100644
--- a/src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php
+++ b/src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php
@@ -22,7 +22,7 @@ public function getTransactionAddString(
     $add_edges) {
 
     return pht(
-      '%s added %s reverted commit(s): %s.',
+      '%s added %s reverted change(s): %s.',
       $actor,
       $add_count,
       $add_edges);
@@ -34,7 +34,7 @@ public function getTransactionRemoveString(
     $rem_edges) {
 
     return pht(
-      '%s removed %s reverted commit(s): %s.',
+      '%s removed %s reverted change(s): %s.',
       $actor,
       $rem_count,
       $rem_edges);
@@ -49,7 +49,7 @@ public function getTransactionEditString(
     $rem_edges) {
 
     return pht(
-      '%s edited reverted commit(s), added %s: %s; removed %s: %s.',
+      '%s edited reverted change(s), added %s: %s; removed %s: %s.',
       $actor,
       $add_count,
       $add_edges,
@@ -64,7 +64,7 @@ public function getFeedAddString(
     $add_edges) {
 
     return pht(
-      '%s added %s reverted commit(s) for %s: %s.',
+      '%s added %s reverted change(s) for %s: %s.',
       $actor,
       $add_count,
       $object,
@@ -78,7 +78,7 @@ public function getFeedRemoveString(
     $rem_edges) {
 
     return pht(
-      '%s removed %s reverted commit(s) for %s: %s.',
+      '%s removed %s reverted change(s) for %s: %s.',
       $actor,
       $rem_count,
       $object,
@@ -95,7 +95,7 @@ public function getFeedEditString(
     $rem_edges) {
 
     return pht(
-      '%s edited reverted commit(s) for %s, added %s: %s; removed %s: %s.',
+      '%s edited reverted change(s) for %s, added %s: %s; removed %s: %s.',
       $actor,
       $object,
       $add_count,
diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
index 9fb6667924..818d1e8781 100644
--- a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
@@ -15,6 +15,7 @@ public function getRequiredLeaseTime() {
   protected function parseCommit(
     PhabricatorRepository $repository,
     PhabricatorRepositoryCommit $commit) {
+    $viewer = PhabricatorUser::getOmnipotentUser();
 
     if ($this->shouldSkipImportStep()) {
       // This worker has no followup tasks, so we can just bail out
@@ -50,7 +51,7 @@ protected function parseCommit(
       id(new PhabricatorDiffusionApplication())->getPHID());
 
     $editor = id(new PhabricatorAuditEditor())
-      ->setActor(PhabricatorUser::getOmnipotentUser())
+      ->setActor($viewer)
       ->setActingAsPHID($acting_as_phid)
       ->setContinueOnMissingFields(true)
       ->setContinueOnNoEffect(true)
@@ -69,29 +70,6 @@ protected function parseCommit(
         'committerPHID' => $data->getCommitDetail('committerPHID'),
       ));
 
-    $reverts_refs = id(new DifferentialCustomFieldRevertsParser())
-      ->parseCorpus($data->getCommitMessage());
-    $reverts = array_mergev(ipull($reverts_refs, 'monograms'));
-
-    if ($reverts) {
-      $reverted_commits = id(new DiffusionCommitQuery())
-        ->setViewer(PhabricatorUser::getOmnipotentUser())
-        ->withRepository($repository)
-        ->withIdentifiers($reverts)
-        ->execute();
-      $reverted_commit_phids = mpull($reverted_commits, 'getPHID', 'getPHID');
-
-      // NOTE: Skip any write attempts if a user cleverly implies a commit
-      // reverts itself.
-      unset($reverted_commit_phids[$commit->getPHID()]);
-
-      $reverts_edge = DiffusionCommitRevertsCommitEdgeType::EDGECONST;
-      $xactions[] = id(new PhabricatorAuditTransaction())
-        ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
-        ->setMetadataValue('edge:type', $reverts_edge)
-        ->setNewValue(array('+' => array_fuse($reverted_commit_phids)));
-    }
-
     try {
       $raw_patch = $this->loadRawPatchText($repository, $commit);
     } catch (Exception $ex) {
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index 97b57009ec..d5c28b83bf 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -458,6 +458,12 @@ public function getIcon() {
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
         return 'fa-lock';
       case PhabricatorTransactions::TYPE_EDGE:
+        switch ($this->getMetadataValue('edge:type')) {
+          case DiffusionCommitRevertedByCommitEdgeType::EDGECONST:
+            return 'fa-undo';
+          case DiffusionCommitRevertsCommitEdgeType::EDGECONST:
+            return 'fa-ambulance';
+        }
         return 'fa-link';
       case PhabricatorTransactions::TYPE_BUILDABLE:
         return 'fa-wrench';
@@ -496,6 +502,14 @@ public function getColor() {
           return 'black';
         }
         break;
+      case PhabricatorTransactions::TYPE_EDGE:
+        switch ($this->getMetadataValue('edge:type')) {
+          case DiffusionCommitRevertedByCommitEdgeType::EDGECONST:
+            return 'pink';
+          case DiffusionCommitRevertsCommitEdgeType::EDGECONST:
+            return 'sky';
+        }
+        break;
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
           case HarbormasterBuildable::STATUS_PASSED:
diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
index 40cedacf06..eb74f8debf 100644
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -676,73 +676,73 @@ protected function getTranslations() {
       '%s edited commit(s), added %s: %s; removed %s: %s.' =>
         '%s edited commits, added %3$s; removed %5$s.',
 
-      '%s added %s reverted commit(s): %s.' => array(
+      '%s added %s reverted change(s): %s.' => array(
         array(
-          '%s added a reverted commit: %3$s.',
-          '%s added reverted commits: %3$s.',
+          '%s added a reverted change: %3$s.',
+          '%s added reverted changes: %3$s.',
         ),
       ),
 
-      '%s removed %s reverted commit(s): %s.' => array(
+      '%s removed %s reverted change(s): %s.' => array(
         array(
-          '%s removed a reverted commit: %3$s.',
-          '%s removed reverted commits: %3$s.',
+          '%s removed a reverted change: %3$s.',
+          '%s removed reverted changes: %3$s.',
         ),
       ),
 
-      '%s edited reverted commit(s), added %s: %s; removed %s: %s.' =>
-        '%s edited reverted commits, added %3$s; removed %5$s.',
+      '%s edited reverted change(s), added %s: %s; removed %s: %s.' =>
+        '%s edited reverted changes, added %3$s; removed %5$s.',
 
-      '%s added %s reverted commit(s) for %s: %s.' => array(
+      '%s added %s reverted change(s) for %s: %s.' => array(
         array(
-          '%s added a reverted commit for %3$s: %4$s.',
-          '%s added reverted commits for %3$s: %4$s.',
+          '%s added a reverted change for %3$s: %4$s.',
+          '%s added reverted changes for %3$s: %4$s.',
         ),
       ),
 
-      '%s removed %s reverted commit(s) for %s: %s.' => array(
+      '%s removed %s reverted change(s) for %s: %s.' => array(
         array(
-          '%s removed a reverted commit for %3$s: %4$s.',
-          '%s removed reverted commits for %3$s: %4$s.',
+          '%s removed a reverted change for %3$s: %4$s.',
+          '%s removed reverted changes for %3$s: %4$s.',
         ),
       ),
 
-      '%s edited reverted commit(s) for %s, added %s: %s; removed %s: %s.' =>
-        '%s edited reverted commits for %2$s, added %4$s; removed %6$s.',
+      '%s edited reverted change(s) for %s, added %s: %s; removed %s: %s.' =>
+        '%s edited reverted changes for %2$s, added %4$s; removed %6$s.',
 
-      '%s added %s reverting commit(s): %s.' => array(
+      '%s added %s reverting change(s): %s.' => array(
         array(
-          '%s added a reverting commit: %3$s.',
-          '%s added reverting commits: %3$s.',
+          '%s added a reverting change: %3$s.',
+          '%s added reverting changes: %3$s.',
         ),
       ),
 
-      '%s removed %s reverting commit(s): %s.' => array(
+      '%s removed %s reverting change(s): %s.' => array(
         array(
-          '%s removed a reverting commit: %3$s.',
-          '%s removed reverting commits: %3$s.',
+          '%s removed a reverting change: %3$s.',
+          '%s removed reverting changes: %3$s.',
         ),
       ),
 
-      '%s edited reverting commit(s), added %s: %s; removed %s: %s.' =>
-        '%s edited reverting commits, added %3$s; removed %5$s.',
+      '%s edited reverting change(s), added %s: %s; removed %s: %s.' =>
+        '%s edited reverting changes, added %3$s; removed %5$s.',
 
-      '%s added %s reverting commit(s) for %s: %s.' => array(
+      '%s added %s reverting change(s) for %s: %s.' => array(
         array(
-          '%s added a reverting commit for %3$s: %4$s.',
-          '%s added reverting commits for %3$s: %4$s.',
+          '%s added a reverting change for %3$s: %4$s.',
+          '%s added reverting changes for %3$s: %4$s.',
         ),
       ),
 
-      '%s removed %s reverting commit(s) for %s: %s.' => array(
+      '%s removed %s reverting change(s) for %s: %s.' => array(
         array(
-          '%s removed a reverting commit for %3$s: %4$s.',
-          '%s removed reverting commits for %3$s: %4$s.',
+          '%s removed a reverting change for %3$s: %4$s.',
+          '%s removed reverting changes for %3$s: %4$s.',
         ),
       ),
 
-      '%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.' =>
-        '%s edited reverting commits for %s, added %4$s; removed %6$s.',
+      '%s edited reverting change(s) for %s, added %s: %s; removed %s: %s.' =>
+        '%s edited reverting changes for %s, added %4$s; removed %6$s.',
 
       '%s changed project member(s), added %d: %s; removed %d: %s.' =>
         '%s changed project members, added %3$s; removed %5$s.',

From 7dd3b53a4b93e1f6d2ddf6ff1b4f213c62e6235a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 2 Feb 2018 13:59:49 -0800
Subject: [PATCH 470/865] (stable) Rebuild Celerity map on stable after various
 cherry-picks

---
 resources/celerity/map.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index df213204c5..d9aebf32bc 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '075f9867',
+    'core.pkg.css' => '51debec3',
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -176,7 +176,7 @@
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
     'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
-    'rsrc/css/phui/phui-timeline-view.css' => 'e2ef62b1',
+    'rsrc/css/phui/phui-timeline-view.css' => '6ddf8126',
     'rsrc/css/phui/phui-two-column-view.css' => '44ec4951',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
@@ -873,7 +873,7 @@
     'phui-status-list-view-css' => 'd5263e49',
     'phui-tag-view-css' => 'b4719c50',
     'phui-theme-css' => '9f261c6b',
-    'phui-timeline-view-css' => 'e2ef62b1',
+    'phui-timeline-view-css' => '6ddf8126',
     'phui-two-column-view-css' => '44ec4951',
     'phui-workboard-color-css' => '783cdff5',
     'phui-workboard-view-css' => '3bc85455',

From 7b2b5cd91e018f3479a20056da79a82dd1008d74 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Feb 2018 06:16:32 -0800
Subject: [PATCH 471/865] Add basic support for a "Must Encrypt" mail flag
 which prevents unsecured content transmission

Summary:
Ref T13053. See PHI291. For particularly sensitive objects (like security issues), installs may reasonably wish to prevent details from being sent in plaintext over email.

This adds a "Must Encrypt" mail behavior, which discards mail content and all identifying details, replacing it with a link to the `/mail/` application. Users can follow the link to view the message over HTTPS.

The flag discards body content, attachments, and headers which imply things about the content of the object. It retains threading headers and headers which may uniquely identify the object as long as they don't disclose anyting about the content.

The `bin/mail list-outbound` command now flags these messages with a `#` mark.

The `bin/mail show-outbound` command now shows sent/suppressed headers and the body content as delivered (if it differs from the original body content).

The `/mail/` web UI now shows a tag for messages marked with this flag.

For now, there is no way to actually set this flag on mail.

Test Plan:
  - Forced this flag on, made comments and took actions to send mail.
  - Reviewed mail with `bin/mail` and `/mail/` in the web UI, saw all content information omitted.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18983
---
 .../PhabricatorMetaMTAMailViewController.php  |  17 ++
 ...atorMailManagementListOutboundWorkflow.php |   2 +
 ...atorMailManagementShowOutboundWorkflow.php |  57 +++++--
 .../storage/PhabricatorMetaMTAMail.php        | 146 ++++++++++++++++--
 4 files changed, 197 insertions(+), 25 deletions(-)

diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
index 80da535a9e..20bbc425b5 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
@@ -32,6 +32,23 @@ public function handleRequest(AphrontRequest $request) {
     $color = PhabricatorMailOutboundStatus::getStatusColor($status);
     $header->setStatus($icon, $color, $name);
 
+    if ($mail->getMustEncrypt()) {
+      Javelin::initBehavior('phabricator-tooltips');
+      $header->addTag(
+        id(new PHUITagView())
+          ->setType(PHUITagView::TYPE_SHADE)
+          ->setColor('blue')
+          ->setName(pht('Must Encrypt'))
+          ->setIcon('fa-shield blue')
+          ->addSigil('has-tooltip')
+          ->setMetadata(
+            array(
+              'tip' => pht(
+                'Message content can only be transmitted over secure '.
+                'channels.'),
+            )));
+    }
+
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb(pht('Mail %d', $mail->getID()))
       ->setBorder(true);
diff --git a/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
index b4aa76379e..a83dafb0a8 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
@@ -37,6 +37,7 @@ public function execute(PhutilArgumentParser $args) {
     $table = id(new PhutilConsoleTable())
       ->setShowHeader(false)
       ->addColumn('id',      array('title' => pht('ID')))
+      ->addColumn('encrypt', array('title' => pht('#')))
       ->addColumn('status',  array('title' => pht('Status')))
       ->addColumn('subject', array('title' => pht('Subject')));
 
@@ -45,6 +46,7 @@ public function execute(PhutilArgumentParser $args) {
 
       $table->addRow(array(
         'id'      => $mail->getID(),
+        'encrypt' => ($mail->getMustEncrypt() ? '#' : ' '),
         'status'  => PhabricatorMailOutboundStatus::getStatusName($status),
         'subject' => $mail->getSubject(),
       ));
diff --git a/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
index 54a91861ae..0fc7dd14b9 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
@@ -79,7 +79,7 @@ public function execute(PhutilArgumentParser $args) {
 
       $info = array();
 
-      $info[] = pht('PROPERTIES');
+      $info[] = $this->newSectionHeader(pht('PROPERTIES'));
       $info[] = pht('ID: %d', $message->getID());
       $info[] = pht('Status: %s', $message->getStatus());
       $info[] = pht('Related PHID: %s', $message->getRelatedPHID());
@@ -87,15 +87,17 @@ public function execute(PhutilArgumentParser $args) {
 
       $ignore = array(
         'body' => true,
+        'body.sent' => true,
         'html-body' => true,
         'headers' => true,
         'attachments' => true,
         'headers.sent' => true,
+        'headers.unfiltered' => true,
         'authors.sent' => true,
       );
 
       $info[] = null;
-      $info[] = pht('PARAMETERS');
+      $info[] = $this->newSectionHeader(pht('PARAMETERS'));
       $parameters = $message->getParameters();
       foreach ($parameters as $key => $value) {
         if (isset($ignore[$key])) {
@@ -110,22 +112,40 @@ public function execute(PhutilArgumentParser $args) {
       }
 
       $info[] = null;
-      $info[] = pht('HEADERS');
+      $info[] = $this->newSectionHeader(pht('HEADERS'));
 
       $headers = $message->getDeliveredHeaders();
-      if (!$headers) {
+      $unfiltered = $message->getUnfilteredHeaders();
+      if (!$unfiltered) {
         $headers = $message->generateHeaders();
+        $unfiltered = $headers;
       }
 
+      $header_map = array();
       foreach ($headers as $header) {
         list($name, $value) = $header;
-        $info[] = "{$name}: {$value}";
+        $header_map[$name.':'.$value] = true;
+      }
+
+      foreach ($unfiltered as $header) {
+        list($name, $value) = $header;
+        $was_sent = isset($header_map[$name.':'.$value]);
+
+        if ($was_sent) {
+          $marker = ' ';
+        } else {
+          $marker = '#';
+        }
+
+        $info[] = "{$marker} {$name}: {$value}";
       }
 
       $attachments = idx($parameters, 'attachments');
       if ($attachments) {
         $info[] = null;
-        $info[] = pht('ATTACHMENTS');
+
+        $info[] = $this->newSectionHeader(pht('ATTACHMENTS'));
+
         foreach ($attachments as $attachment) {
           $info[] = idx($attachment, 'filename', pht('Unnamed File'));
         }
@@ -136,7 +156,9 @@ public function execute(PhutilArgumentParser $args) {
       $actors = $message->getDeliveredActors();
       if ($actors) {
         $info[] = null;
-        $info[] = pht('RECIPIENTS');
+
+        $info[] = $this->newSectionHeader(pht('RECIPIENTS'));
+
         foreach ($actors as $actor_phid => $actor_info) {
           $actor = idx($all_actors, $actor_phid);
           if ($actor) {
@@ -162,15 +184,22 @@ public function execute(PhutilArgumentParser $args) {
       }
 
       $info[] = null;
-      $info[] = pht('TEXT BODY');
+      $info[] = $this->newSectionHeader(pht('TEXT BODY'));
       if (strlen($message->getBody())) {
-        $info[] = $message->getBody();
+        $info[] = tsprintf('%B', $message->getBody());
       } else {
         $info[] = pht('(This message has no text body.)');
       }
 
+      $delivered_body = $message->getDeliveredBody();
+      if ($delivered_body !== null) {
+        $info[] = null;
+        $info[] = $this->newSectionHeader(pht('BODY AS DELIVERED'), true);
+        $info[] = tsprintf('%B', $delivered_body);
+      }
+
       $info[] = null;
-      $info[] = pht('HTML BODY');
+      $info[] = $this->newSectionHeader(pht('HTML BODY'));
       if (strlen($message->getHTMLBody())) {
         $info[] = $message->getHTMLBody();
         $info[] = null;
@@ -186,4 +215,12 @@ public function execute(PhutilArgumentParser $args) {
     }
   }
 
+  private function newSectionHeader($label, $emphasize = false) {
+    if ($emphasize) {
+      return tsprintf('**<bg:yellow> %s </bg>**', $label);
+    } else {
+      return tsprintf('**<bg:blue> %s </bg>**', $label);
+    }
+  }
+
 }
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 20b1482036..c203e86530 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -21,7 +21,10 @@ final class PhabricatorMetaMTAMail
   public function __construct() {
 
     $this->status     = PhabricatorMailOutboundStatus::STATUS_QUEUE;
-    $this->parameters = array('sensitive' => true);
+    $this->parameters = array(
+      'sensitive' => true,
+      'mustEncrypt' => false,
+    );
 
     parent::__construct();
   }
@@ -247,6 +250,15 @@ public function hasSensitiveContent() {
     return $this->getParam('sensitive', true);
   }
 
+  public function setMustEncrypt($bool) {
+    $this->setParam('mustEncrypt', $bool);
+    return $this;
+  }
+
+  public function getMustEncrypt() {
+    return $this->getParam('mustEncrypt', false);
+  }
+
   public function setHTMLBody($html) {
     $this->setParam('html-body', $html);
     return $this;
@@ -431,6 +443,7 @@ public function sendNow(
       unset($params['is-first-message']);
 
       $is_threaded = (bool)idx($params, 'thread-id');
+      $must_encrypt = $this->getMustEncrypt();
 
       $reply_to_name = idx($params, 'reply-to-name', '');
       unset($params['reply-to-name']);
@@ -502,6 +515,11 @@ public function sendNow(
               mpull($cc_actors, 'getEmailAddress'));
             break;
           case 'attachments':
+            // If the mail content must be encrypted, don't add attachments.
+            if ($must_encrypt) {
+              break;
+            }
+
             $value = $this->getAttachments();
             foreach ($value as $attachment) {
               $mailer->addAttachment(
@@ -521,14 +539,20 @@ public function sendNow(
 
             $subject[] = trim(idx($params, 'subject-prefix'));
 
-            $vary_prefix = idx($params, 'vary-subject-prefix');
-            if ($vary_prefix != '') {
-              if ($this->shouldVarySubject($preferences)) {
-                $subject[] = $vary_prefix;
+            // If mail content must be encrypted, we replace the subject with
+            // a generic one.
+            if ($must_encrypt) {
+              $subject[] = pht('Object Updated');
+            } else {
+              $vary_prefix = idx($params, 'vary-subject-prefix');
+              if ($vary_prefix != '') {
+                if ($this->shouldVarySubject($preferences)) {
+                  $subject[] = $vary_prefix;
+                }
               }
-            }
 
-            $subject[] = $value;
+              $subject[] = $value;
+            }
 
             $mailer->setSubject(implode(' ', array_filter($subject)));
             break;
@@ -567,7 +591,22 @@ public function sendNow(
         }
       }
 
-      $body = idx($params, 'body', '');
+      $raw_body = idx($params, 'body', '');
+      $body = $raw_body;
+      if ($must_encrypt) {
+        $parts = array();
+        $parts[] = pht(
+          'The content for this message can only be transmitted over a '.
+          'secure channel. To view the message content, follow this '.
+          'link:');
+
+        $parts[] = PhabricatorEnv::getProductionURI($this->getURI());
+
+        $body = implode("\n\n", $parts);
+      } else {
+        $body = $raw_body;
+      }
+
       $max = PhabricatorEnv::getEnvConfig('metamta.email-body-limit');
       if (strlen($body) > $max) {
         $body = id(new PhutilUTF8StringTruncator())
@@ -578,18 +617,32 @@ public function sendNow(
       }
       $mailer->setBody($body);
 
-      $html_emails = $this->shouldSendHTML($preferences);
-      if ($html_emails && isset($params['html-body'])) {
+      // If we sent a different message body than we were asked to, record
+      // what we actually sent to make debugging and diagnostics easier.
+      if ($body !== $raw_body) {
+        $this->setParam('body.sent', $body);
+      }
+
+      if ($must_encrypt) {
+        $send_html = false;
+      } else {
+        $send_html = $this->shouldSendHTML($preferences);
+      }
+
+      if ($send_html && isset($params['html-body'])) {
         $mailer->setHTMLBody($params['html-body']);
       }
 
       // Pass the headers to the mailer, then save the state so we can show
-      // them in the web UI.
-      foreach ($headers as $header) {
+      // them in the web UI. If the mail must be encrypted, we remove headers
+      // which are not on a strict whitelist to avoid disclosing information.
+      $filtered_headers = $this->filterHeaders($headers, $must_encrypt);
+      foreach ($filtered_headers as $header) {
         list($header_key, $header_value) = $header;
         $mailer->addHeader($header_key, $header_value);
       }
-      $this->setParam('headers.sent', $headers);
+      $this->setParam('headers.unfiltered', $headers);
+      $this->setParam('headers.sent', $filtered_headers);
 
       // Save the final deliverability outcomes and reasoning so we can
       // explain why things happened the way they did.
@@ -1002,8 +1055,6 @@ public function generateHeaders() {
     // Some clients respect this to suppress OOF and other auto-responses.
     $headers[] = array('X-Auto-Response-Suppress', 'All');
 
-    // If the message has mailtags, filter out any recipients who don't want
-    // to receive this type of mail.
     $mailtags = $this->getParam('mailtags');
     if ($mailtags) {
       $tag_header = array();
@@ -1028,6 +1079,10 @@ public function generateHeaders() {
       $headers[] = array('Precedence', 'bulk');
     }
 
+    if ($this->getMustEncrypt()) {
+      $headers[] = array('X-Phabricator-Must-Encrypt', 'Yes');
+    }
+
     return $headers;
   }
 
@@ -1035,6 +1090,19 @@ public function getDeliveredHeaders() {
     return $this->getParam('headers.sent');
   }
 
+  public function getUnfilteredHeaders() {
+    $unfiltered = $this->getParam('headers.unfiltered');
+
+    if ($unfiltered === null) {
+      // Older versions of Phabricator did not filter headers, and thus did
+      // not record unfiltered headers. If we don't have unfiltered header
+      // data just return the delivered headers for compatibility.
+      return $this->getDeliveredHeaders();
+    }
+
+    return $unfiltered;
+  }
+
   public function getDeliveredActors() {
     return $this->getParam('actors.sent');
   }
@@ -1047,6 +1115,54 @@ public function getDeliveredRoutingMap() {
     return $this->getParam('routingmap.sent');
   }
 
+  public function getDeliveredBody() {
+    return $this->getParam('body.sent');
+  }
+
+  private function filterHeaders(array $headers, $must_encrypt) {
+    if (!$must_encrypt) {
+      return $headers;
+    }
+
+    $whitelist = array(
+      'In-Reply-To',
+      'Message-ID',
+      'Precedence',
+      'References',
+      'Thread-Index',
+
+      'X-Mail-Transport-Agent',
+      'X-Auto-Response-Suppress',
+
+      'X-Phabricator-Sent-This-Message',
+      'X-Phabricator-Must-Encrypt',
+    );
+
+    // NOTE: The major header we want to drop is "X-Phabricator-Mail-Tags".
+    // This header contains a significant amount of meaningful information
+    // about the object.
+
+    $whitelist_map = array();
+    foreach ($whitelist as $term) {
+      $whitelist_map[phutil_utf8_strtolower($term)] = true;
+    }
+
+    foreach ($headers as $key => $header) {
+      list($name, $value) = $header;
+      $name = phutil_utf8_strtolower($name);
+
+      if (!isset($whitelist_map[$name])) {
+        unset($headers[$key]);
+      }
+    }
+
+    return $headers;
+  }
+
+  public function getURI() {
+    return '/mail/detail/'.$this->getID().'/';
+  }
+
 
 /* -(  Routing  )------------------------------------------------------------ */
 

From cbe4e68c072239608a5b59d50dec399cb36699b0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Feb 2018 09:19:14 -0800
Subject: [PATCH 472/865] Add a Herald action to trigger "Must Encrypt" for
 mail

Summary: Depends on D18983. Ref T13053. Adds a new Herald action to activate the "must encrypt" flag and drop mail content.

Test Plan:
  - Created a new Herald rule:

{F5407075}

  - Created a "dog task" (woof woof, unsecure) and a "duck task" (quack quack, secure).
  - Viewed mail for both in `bin/mail` and web UI, saw appropriate security/encryption behavior.
  - Viewed "Must Encrypt" in "Headers" tab for the duck mail, saw why the mail was encrypted (link to Herald rule).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18984
---
 src/__phutil_library_map__.php                |  2 +
 .../herald/adapter/HeraldAdapter.php          | 14 +++++
 .../PhabricatorMetaMTAMailViewController.php  |  9 +++
 ...PhabricatorMailMustEncryptHeraldAction.php | 62 +++++++++++++++++++
 .../PhabricatorMetaMTAEmailHeraldAction.php   |  4 ++
 .../storage/PhabricatorMetaMTAMail.php        |  9 +++
 ...habricatorApplicationTransactionEditor.php | 11 ++++
 7 files changed, 111 insertions(+)
 create mode 100644 src/applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 32985c76c0..f0e2d29cfc 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3189,6 +3189,7 @@
     'PhabricatorMailManagementUnverifyWorkflow' => 'applications/metamta/management/PhabricatorMailManagementUnverifyWorkflow.php',
     'PhabricatorMailManagementVolumeWorkflow' => 'applications/metamta/management/PhabricatorMailManagementVolumeWorkflow.php',
     'PhabricatorMailManagementWorkflow' => 'applications/metamta/management/PhabricatorMailManagementWorkflow.php',
+    'PhabricatorMailMustEncryptHeraldAction' => 'applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php',
     'PhabricatorMailOutboundMailHeraldAdapter' => 'applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php',
     'PhabricatorMailOutboundRoutingHeraldAction' => 'applications/metamta/herald/PhabricatorMailOutboundRoutingHeraldAction.php',
     'PhabricatorMailOutboundRoutingSelfEmailHeraldAction' => 'applications/metamta/herald/PhabricatorMailOutboundRoutingSelfEmailHeraldAction.php',
@@ -8674,6 +8675,7 @@
     'PhabricatorMailManagementUnverifyWorkflow' => 'PhabricatorMailManagementWorkflow',
     'PhabricatorMailManagementVolumeWorkflow' => 'PhabricatorMailManagementWorkflow',
     'PhabricatorMailManagementWorkflow' => 'PhabricatorManagementWorkflow',
+    'PhabricatorMailMustEncryptHeraldAction' => 'HeraldAction',
     'PhabricatorMailOutboundMailHeraldAdapter' => 'HeraldAdapter',
     'PhabricatorMailOutboundRoutingHeraldAction' => 'HeraldAction',
     'PhabricatorMailOutboundRoutingSelfEmailHeraldAction' => 'PhabricatorMailOutboundRoutingHeraldAction',
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index 9d56f474ff..cc0fdbd3b5 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -39,6 +39,7 @@ abstract class HeraldAdapter extends Phobject {
   private $edgeCache = array();
   private $forbiddenActions = array();
   private $viewer;
+  private $mustEncryptReasons = array();
 
   public function getEmailPHIDs() {
     return array_values($this->emailPHIDs);
@@ -1182,4 +1183,17 @@ final public function getForbiddenReason($action) {
     return $this->forbiddenActions[$action];
   }
 
+
+/* -(  Must Encrypt  )------------------------------------------------------- */
+
+
+  final public function addMustEncryptReason($reason) {
+    $this->mustEncryptReasons[] = $reason;
+    return $this;
+  }
+
+  final public function getMustEncryptReasons() {
+    return $this->mustEncryptReasons;
+  }
+
 }
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
index 20bbc425b5..1aca34c2ea 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
@@ -175,6 +175,15 @@ private function buildHeaderProperties(PhabricatorMetaMTAMail $mail) {
       $properties->addProperty($key, $value);
     }
 
+    $encrypt_phids = $mail->getMustEncryptReasons();
+    if ($encrypt_phids) {
+      $properties->addProperty(
+        pht('Must Encrypt'),
+        $viewer->loadHandles($encrypt_phids)
+          ->renderList());
+    }
+
+
     return $properties;
   }
 
diff --git a/src/applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php b/src/applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php
new file mode 100644
index 0000000000..f8cf7ee204
--- /dev/null
+++ b/src/applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php
@@ -0,0 +1,62 @@
+<?php
+
+final class PhabricatorMailMustEncryptHeraldAction
+  extends HeraldAction {
+
+  const DO_MUST_ENCRYPT = 'do.must-encrypt';
+
+  const ACTIONCONST = 'email.must-encrypt';
+
+  public function getHeraldActionName() {
+    return pht('Require secure email');
+  }
+
+  public function renderActionDescription($value) {
+    return pht(
+      'Require mail content be transmitted only over secure channels.');
+  }
+  public function supportsObject($object) {
+    return self::isMailGeneratingObject($object);
+  }
+
+  public function getActionGroupKey() {
+    return HeraldUtilityActionGroup::ACTIONGROUPKEY;
+  }
+
+  public function supportsRuleType($rule_type) {
+    return ($rule_type != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
+  }
+
+  public function getHeraldActionStandardType() {
+    return self::STANDARD_NONE;
+  }
+
+  public function applyEffect($object, HeraldEffect $effect) {
+    $rule_phid = $effect->getRule()->getPHID();
+
+    $adapter = $this->getAdapter();
+    $adapter->addMustEncryptReason($rule_phid);
+
+    $this->logEffect(self::DO_MUST_ENCRYPT, array($rule_phid));
+  }
+
+  protected function getActionEffectMap() {
+    return array(
+      self::DO_MUST_ENCRYPT => array(
+        'icon' => 'fa-shield',
+        'color' => 'blue',
+        'name' => pht('Must Encrypt'),
+      ),
+    );
+  }
+
+  protected function renderActionEffectDescription($type, $data) {
+    switch ($type) {
+      case self::DO_MUST_ENCRYPT:
+        return pht(
+          'Made it a requirement that mail content be transmitted only '.
+          'over secure channels.');
+    }
+  }
+
+}
diff --git a/src/applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php b/src/applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php
index 74fb879fe7..383b8ebd36 100644
--- a/src/applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php
+++ b/src/applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php
@@ -13,6 +13,10 @@ public function getRequiredAdapterStates() {
   }
 
   public function supportsObject($object) {
+    return self::isMailGeneratingObject($object);
+  }
+
+  public static function isMailGeneratingObject($object) {
     // NOTE: This implementation lacks generality, but there's no great way to
     // figure out if something generates email right now.
 
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index c203e86530..a9736c1766 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -259,6 +259,15 @@ public function getMustEncrypt() {
     return $this->getParam('mustEncrypt', false);
   }
 
+  public function setMustEncryptReasons(array $reasons) {
+    $this->setParam('mustEncryptReasons', $reasons);
+    return $this;
+  }
+
+  public function getMustEncryptReasons() {
+    return $this->getParam('mustEncryptReasons', array());
+  }
+
   public function setHTMLBody($html) {
     $this->setParam('html-body', $html);
     return $this;
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 155592fc4e..0dc6a06fbf 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -71,6 +71,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $mailShouldSend = false;
   private $modularTypes;
   private $silent;
+  private $mustEncrypt;
 
   private $transactionQueue = array();
 
@@ -2549,6 +2550,13 @@ private function buildMail(
         $this->loadHandles($xactions);
 
         $mail = $this->buildMailForTarget($object, $xactions, $target);
+
+        if ($this->mustEncrypt) {
+          $mail
+            ->setMustEncrypt(true)
+            ->setMustEncryptReasons($this->mustEncrypt);
+        }
+
       } catch (Exception $ex) {
         $caught = $ex;
       }
@@ -3214,6 +3222,8 @@ private function applyHeraldRules(
         $adapter->getQueuedHarbormasterBuildRequests());
     }
 
+    $this->mustEncrypt = $adapter->getMustEncryptReasons();
+
     return array_merge(
       $this->didApplyHeraldRules($object, $adapter, $xscript),
       $adapter->getQueuedTransactions());
@@ -3558,6 +3568,7 @@ private function getAutomaticStateProperties() {
       'feedRelatedPHIDs',
       'feedShouldPublish',
       'mailShouldSend',
+      'mustEncrypt',
     );
   }
 

From eb06aca951cee6b01ceecf57286a892c77348d81 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Feb 2018 11:28:06 -0800
Subject: [PATCH 473/865] Support DestructionEngine in MetaMTAMail

Summary:
Depends on D18984. Ref T13053. See D13408 for the original change and why this doesn't use DestructionEngine right now. The quick version is:

  - It causes us to write a destruction log, which is slightly silly (we're deleting one thing and creating another).
  - It's a little bit slower than not using DestructionEngine.

However, it gets us some stuff for free that's likely relevant now (e.g., Herald Transcript cleanup) and I'm planning to move attachments to Files, but want to be able to delete them when mail is destroyed.

The destruction log is a touch silly, but those records are very small and that log gets GC'd later without generating new logs. We could silence the log from the GC if it's ever an issue.

Test Plan: Used `bin/remove destroy` and `bin/garbage collect --collector mail.sent` to destroy mail and collect garbage.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18985
---
 src/__phutil_library_map__.php                |  1 +
 .../MetaMTAMailSentGarbageCollector.php       |  3 ++-
 .../storage/PhabricatorMetaMTAMail.php        | 26 ++++++++-----------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f0e2d29cfc..aff0d5e36f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -8739,6 +8739,7 @@
     'PhabricatorMetaMTAMail' => array(
       'PhabricatorMetaMTADAO',
       'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'PhabricatorMetaMTAMailBody' => 'Phobject',
     'PhabricatorMetaMTAMailBodyTestCase' => 'PhabricatorTestCase',
diff --git a/src/applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php b/src/applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php
index c9ca274436..dacd46d187 100644
--- a/src/applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php
+++ b/src/applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php
@@ -18,8 +18,9 @@ protected function collectGarbage() {
       'dateCreated < %d LIMIT 100',
       $this->getGarbageEpoch());
 
+    $engine = new PhabricatorDestructionEngine();
     foreach ($mails as $mail) {
-      $mail->delete();
+      $engine->destroyObject($mail);
     }
 
     return (count($mails) == 100);
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index a9736c1766..d5111529f3 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -5,7 +5,9 @@
  */
 final class PhabricatorMetaMTAMail
   extends PhabricatorMetaMTADAO
-  implements PhabricatorPolicyInterface {
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface {
 
   const RETRY_DELAY   = 5;
 
@@ -1041,20 +1043,6 @@ private function shouldRateLimitMail(array $all_recipients) {
     }
   }
 
-  public function delete() {
-    $this->openTransaction();
-      queryfx(
-        $this->establishConnection('w'),
-        'DELETE FROM %T WHERE src = %s AND type = %d',
-        PhabricatorEdgeConfig::TABLE_NAME_EDGE,
-        $this->getPHID(),
-        PhabricatorMetaMTAMailHasRecipientEdgeType::EDGECONST);
-      $ret = parent::delete();
-    $this->saveTransaction();
-
-    return $ret;
-  }
-
   public function generateHeaders() {
     $headers = array();
 
@@ -1306,4 +1294,12 @@ public function describeAutomaticCapability($capability) {
   }
 
 
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $this->delete();
+  }
+
 }

From 6d90c7ad92b35e95ceda1b94772b7120cea84acd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Feb 2018 11:17:47 -0800
Subject: [PATCH 474/865] Save mail attachments in Files, not on the actual
 objects

Summary:
Depends on D18985. Ref T13053. See PHI125. Currently, mail attachments are just encoded onto the actual objects in the `MetaMTAMail` table.

This fails if attachments can't be encoded in JSON -- e.g., they aren't UTF8. This happens most often when revisions or commits attach patches to mail and those patches contain source code changes for files that are not encoded in UTF8.

Instead, save attachments in (and load attachments from) Files.

Test Plan: Enabled patches for mail, created a revision, saw it attach a patch. Viewed mail in web UI, saw link to download patch. Followed link, saw sensible file. Checked database, saw a `filePHID`. Destroyed mail with `bin/remove destroy`, saw attached files also destroyed.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18986
---
 .../PhabricatorMetaMTAMailViewController.php  |  6 +++
 .../storage/PhabricatorMetaMTAAttachment.php  | 44 ++++++++++++++++---
 .../storage/PhabricatorMetaMTAMail.php        | 41 +++++++++++++++++
 3 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
index 1aca34c2ea..03d340bac9 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
@@ -151,6 +151,12 @@ private function buildMessageProperties(PhabricatorMetaMTAMail $mail) {
 
     $properties->addTextContent($body);
 
+    $file_phids = $mail->getAttachmentFilePHIDs();
+    if ($file_phids) {
+      $properties->addProperty(
+        pht('Attached Files'),
+        $viewer->loadHandles($file_phids)->renderList());
+    }
 
     return $properties;
   }
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAAttachment.php b/src/applications/metamta/storage/PhabricatorMetaMTAAttachment.php
index b26bb0b8a7..256bee46e8 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAAttachment.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAAttachment.php
@@ -1,9 +1,12 @@
 <?php
 
 final class PhabricatorMetaMTAAttachment extends Phobject {
-  protected $data;
-  protected $filename;
-  protected $mimetype;
+
+  private $data;
+  private $filename;
+  private $mimetype;
+  private $file;
+  private $filePHID;
 
   public function __construct($data, $filename, $mimetype) {
     $this->setData($data);
@@ -39,18 +42,49 @@ public function setMimeType($mimetype) {
   }
 
   public function toDictionary() {
+    if (!$this->file) {
+      $iterator = new ArrayIterator(array($this->getData()));
+
+      $source = id(new PhabricatorIteratorFileUploadSource())
+        ->setName($this->getFilename())
+        ->setViewPolicy(PhabricatorPolicies::POLICY_NOONE)
+        ->setMIMEType($this->getMimeType())
+        ->setIterator($iterator);
+
+      $this->file = $source->uploadFile();
+    }
+
     return array(
       'filename' => $this->getFilename(),
       'mimetype' => $this->getMimeType(),
-      'data' => $this->getData(),
+      'filePHID' => $this->file->getPHID(),
     );
   }
 
   public static function newFromDictionary(array $dict) {
-    return new PhabricatorMetaMTAAttachment(
+    $file = null;
+
+    $file_phid = idx($dict, 'filePHID');
+    if ($file_phid) {
+      $file = id(new PhabricatorFileQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withPHIDs(array($file_phid))
+        ->executeOne();
+      if ($file) {
+        $dict['data'] = $file->loadFileData();
+      }
+    }
+
+    $attachment = new self(
       idx($dict, 'data'),
       idx($dict, 'filename'),
       idx($dict, 'mimetype'));
+
+    if ($file) {
+      $attachment->file = $file;
+    }
+
+    return $attachment;
   }
 
 }
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index d5111529f3..a61951650c 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -197,6 +197,35 @@ public function getAttachments() {
     return $result;
   }
 
+  public function getAttachmentFilePHIDs() {
+    $file_phids = array();
+
+    $dictionaries = $this->getParam('attachments');
+    if ($dictionaries) {
+      foreach ($dictionaries as $dictionary) {
+        $file_phid = idx($dictionary, 'filePHID');
+        if ($file_phid) {
+          $file_phids[] = $file_phid;
+        }
+      }
+    }
+
+    return $file_phids;
+  }
+
+  public function loadAttachedFiles(PhabricatorUser $viewer) {
+    $file_phids = $this->getAttachmentFilePHIDs();
+
+    if (!$file_phids) {
+      return array();
+    }
+
+    return id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs($file_phids)
+      ->execute();
+  }
+
   public function setAttachments(array $attachments) {
     assert_instances_of($attachments, 'PhabricatorMetaMTAAttachment');
     $this->setParam('attachments', mpull($attachments, 'toDictionary'));
@@ -526,6 +555,12 @@ public function sendNow(
               mpull($cc_actors, 'getEmailAddress'));
             break;
           case 'attachments':
+            $attached_viewer = PhabricatorUser::getOmnipotentUser();
+            $files = $this->loadAttachedFiles($attached_viewer);
+            foreach ($files as $file) {
+              $file->attachToObject($this->getPHID());
+            }
+
             // If the mail content must be encrypted, don't add attachments.
             if ($must_encrypt) {
               break;
@@ -1299,6 +1334,12 @@ public function describeAutomaticCapability($capability) {
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
+
+    $files = $this->loadAttachedFiles($engine->getViewer());
+    foreach ($files as $file) {
+      $engine->destroyObject($file);
+    }
+
     $this->delete();
   }
 

From 55f7cdb99b3f40b94aa07b1d29c8eaf344db34da Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 2 Feb 2018 14:57:25 -0800
Subject: [PATCH 475/865] Fix a bad classname reference in the "Must Encrypt"
 action

---
 .../metamta/herald/PhabricatorMailMustEncryptHeraldAction.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php b/src/applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php
index f8cf7ee204..027e1bb733 100644
--- a/src/applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php
+++ b/src/applications/metamta/herald/PhabricatorMailMustEncryptHeraldAction.php
@@ -16,7 +16,7 @@ public function renderActionDescription($value) {
       'Require mail content be transmitted only over secure channels.');
   }
   public function supportsObject($object) {
-    return self::isMailGeneratingObject($object);
+    return PhabricatorMetaMTAEmailHeraldAction::isMailGeneratingObject($object);
   }
 
   public function getActionGroupKey() {

From 956c4058e64cf3ec338e08e5218980e7f93f72fa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 4 Feb 2018 05:55:01 -0800
Subject: [PATCH 476/865] Add a `bin/conduit call` support binary

Summary:
Ref T13060. See PHI343. Triaging this bug required figuring out where in the pipeline UTF8 was being dropped, and bisecting the pipeline required making calls to Conduit.

Currently, there's no easy way to debug/inspect arbitrary Conduit calls, especially when they are `diffusion.*` calls which route to a different host (even if you have a real session and use the web console for these, you just see an HTTP service call to the target host in DarkConsole).

Add a `bin/conduit` utility to make this kind of debugging easier, with an eye toward the Phacility production cluster (or other similar clusters) specifically.

Test Plan:
  - Ran `echo '{}' | bin/conduit call --method conduit.ping --input -` and similar.
  - Used a similar approach to successfully diagnose the UTF8 issue in T13060.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13060

Differential Revision: https://secure.phabricator.com/D18987
---
 bin/conduit                                   |  1 +
 scripts/setup/manage_conduit.php              | 21 ++++++
 src/__phutil_library_map__.php                |  4 ++
 ...abricatorConduitCallManagementWorkflow.php | 66 +++++++++++++++++++
 .../PhabricatorConduitManagementWorkflow.php  |  4 ++
 5 files changed, 96 insertions(+)
 create mode 120000 bin/conduit
 create mode 100755 scripts/setup/manage_conduit.php
 create mode 100644 src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php
 create mode 100644 src/applications/conduit/management/PhabricatorConduitManagementWorkflow.php

diff --git a/bin/conduit b/bin/conduit
new file mode 120000
index 0000000000..9221340a93
--- /dev/null
+++ b/bin/conduit
@@ -0,0 +1 @@
+../scripts/setup/manage_conduit.php
\ No newline at end of file
diff --git a/scripts/setup/manage_conduit.php b/scripts/setup/manage_conduit.php
new file mode 100755
index 0000000000..07384e7ed8
--- /dev/null
+++ b/scripts/setup/manage_conduit.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+
+$root = dirname(dirname(dirname(__FILE__)));
+require_once $root.'/scripts/init/init-script.php';
+
+$args = new PhutilArgumentParser($argv);
+$args->setTagline(pht('manage Conduit'));
+$args->setSynopsis(<<<EOSYNOPSIS
+**conduit** __command__ [__options__]
+    Manage Conduit.
+
+EOSYNOPSIS
+  );
+$args->parseStandardArguments();
+
+$workflows = id(new PhutilClassMapQuery())
+  ->setAncestorClass('PhabricatorConduitManagementWorkflow')
+  ->execute();
+$workflows[] = new PhutilHelpArgumentWorkflow();
+$args->parseWorkflows($workflows);
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index aff0d5e36f..7076cde010 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2425,6 +2425,7 @@
     'PhabricatorCommonPasswords' => 'applications/auth/constants/PhabricatorCommonPasswords.php',
     'PhabricatorConduitAPIController' => 'applications/conduit/controller/PhabricatorConduitAPIController.php',
     'PhabricatorConduitApplication' => 'applications/conduit/application/PhabricatorConduitApplication.php',
+    'PhabricatorConduitCallManagementWorkflow' => 'applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php',
     'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/PhabricatorConduitCertificateToken.php',
     'PhabricatorConduitConsoleController' => 'applications/conduit/controller/PhabricatorConduitConsoleController.php',
     'PhabricatorConduitContentSource' => 'infrastructure/contentsource/PhabricatorConduitContentSource.php',
@@ -2435,6 +2436,7 @@
     'PhabricatorConduitLogController' => 'applications/conduit/controller/PhabricatorConduitLogController.php',
     'PhabricatorConduitLogQuery' => 'applications/conduit/query/PhabricatorConduitLogQuery.php',
     'PhabricatorConduitLogSearchEngine' => 'applications/conduit/query/PhabricatorConduitLogSearchEngine.php',
+    'PhabricatorConduitManagementWorkflow' => 'applications/conduit/management/PhabricatorConduitManagementWorkflow.php',
     'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/PhabricatorConduitMethodCallLog.php',
     'PhabricatorConduitMethodQuery' => 'applications/conduit/query/PhabricatorConduitMethodQuery.php',
     'PhabricatorConduitRequestExceptionHandler' => 'aphront/handler/PhabricatorConduitRequestExceptionHandler.php',
@@ -7822,6 +7824,7 @@
     'PhabricatorCommonPasswords' => 'Phobject',
     'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
     'PhabricatorConduitApplication' => 'PhabricatorApplication',
+    'PhabricatorConduitCallManagementWorkflow' => 'PhabricatorConduitManagementWorkflow',
     'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
     'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
     'PhabricatorConduitContentSource' => 'PhabricatorContentSource',
@@ -7832,6 +7835,7 @@
     'PhabricatorConduitLogController' => 'PhabricatorConduitController',
     'PhabricatorConduitLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorConduitLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'PhabricatorConduitManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorConduitMethodCallLog' => array(
       'PhabricatorConduitDAO',
       'PhabricatorPolicyInterface',
diff --git a/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php b/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php
new file mode 100644
index 0000000000..6cb3bd2409
--- /dev/null
+++ b/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php
@@ -0,0 +1,66 @@
+<?php
+
+final class PhabricatorConduitCallManagementWorkflow
+  extends PhabricatorConduitManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('call')
+      ->setSynopsis(pht('Call a Conduit method..'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'method',
+            'param' => 'method',
+            'help' => pht('Method to call.'),
+          ),
+          array(
+            'name' => 'input',
+            'param' => 'input',
+            'help' => pht(
+              'File to read parameters from, or "-" to read from '.
+              'stdin.'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+
+    $method = $args->getArg('method');
+    if (!strlen($method)) {
+      throw new PhutilArgumentUsageException(
+        pht('Specify a method to call with "--method".'));
+    }
+
+    $input = $args->getArg('input');
+    if (!strlen($input)) {
+      throw new PhutilArgumentUsageException(
+        pht('Specify a file to read parameters from with "--input".'));
+    }
+
+    if ($input === '-') {
+      fprintf(STDERR, tsprintf("%s\n", pht('Reading input from stdin...')));
+      $input_json = file_get_contents('php://stdin');
+    } else {
+      $input_json = Filesystem::readFile($input);
+    }
+
+    $params = phutil_json_decode($input_json);
+
+    $result = id(new ConduitCall($method, $params))
+      ->setUser($viewer)
+      ->execute();
+
+    $output = array(
+      'result' => $result,
+    );
+
+    echo tsprintf(
+      "%B\n",
+      id(new PhutilJSON())->encodeFormatted($output));
+
+    return 0;
+  }
+
+}
diff --git a/src/applications/conduit/management/PhabricatorConduitManagementWorkflow.php b/src/applications/conduit/management/PhabricatorConduitManagementWorkflow.php
new file mode 100644
index 0000000000..4abb250fc4
--- /dev/null
+++ b/src/applications/conduit/management/PhabricatorConduitManagementWorkflow.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class PhabricatorConduitManagementWorkflow
+  extends PhabricatorManagementWorkflow {}

From 7e6bae471c52e26ad677ab394bddc4db20d890d4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 4 Feb 2018 06:01:49 -0800
Subject: [PATCH 477/865] Always setlocale() to en_US.UTF-8 for the main
 process
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Depends on D18987. See PHI343. Fixes T13060. See also T7339.

When the main process starts up with `LANG=POSIX` (this is the default on Ubuntu) and we later try to run a subprocess with a UTF8 character in the argument list (like `git cat-file blob 🐑.txt`), the argument is not passed to the subprocess correctly.

We already set `LANG=en_US.UTF-8` in the //subprocess// environment, but this only controls behavior for the subprocess itself. It appears that the argument list encoding before the actual subprocess starts depends on the parent process's locale setting, which makes some degree of sense.

Setting `putenv('LANG=en_US.UTF-8')` has no effect on this, but my guess is that the parent process's locale setting is read at startup (rather than read anew from `LANG` every time) and not changed by further modifications of `LANG`.

Using `setlocale(...)` does appear to fix this.

Ideally, installs would probably set some UTF-8-compatible LANG setting as the default. However, this makes setup harder and I couldn't figure out how to do it on our production Ubuntu AMI after spending a reasonable amount of time at it (see T13060).

Since it's very rare that this setting matters, try to just do the right thing. This may fail if "en_US.UTF-8" isn't available, but I think warnings/remedies to this are in the scope of T7339, since we want this locale to exist for other legitimate reasons anyway.

Test Plan:
  - Applied this fix in production, processed the failing worker task from PHI343 after kicking Apache hard enough.
  - Ran locally with `setlocale(LC_ALL, 'duck.quack')` to make sure a bad/invalid/unavailable setting didn't break anything, didn't hit any issues.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13060

Differential Revision: https://secure.phabricator.com/D18988
---
 support/startup/PhabricatorStartup.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/support/startup/PhabricatorStartup.php b/support/startup/PhabricatorStartup.php
index 1911a46b8a..212b057376 100644
--- a/support/startup/PhabricatorStartup.php
+++ b/support/startup/PhabricatorStartup.php
@@ -395,6 +395,11 @@ private static function setupPHP() {
     if (function_exists('libxml_disable_entity_loader')) {
       libxml_disable_entity_loader(true);
     }
+
+    // See T13060. If the locale for this process (the parent process) is not
+    // a UTF-8 locale we can encounter problems when launching subprocesses
+    // which receive UTF-8 parameters in their command line argument list.
+    @setlocale(LC_ALL, 'en_US.UTF-8');
   }
 
 

From b3880975e5a17e0202055e235556316b34146cab Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 10:24:17 -0800
Subject: [PATCH 478/865] =?UTF-8?q?Add=20aliases=20for=20"party"=20emoji?=
 =?UTF-8?q?=20(=F0=9F=8E=89)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
This is currently `:tada:`, which I'd never have guessed.

(This isn't a super scalable approach, but this emoji is in particularly common use. See also T12644.)

Test Plan: Typed `:party`, `:confet`, etc.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D18993
---
 resources/emoji/manifest.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/emoji/manifest.json b/resources/emoji/manifest.json
index 2d8388d277..47568fb43d 100644
--- a/resources/emoji/manifest.json
+++ b/resources/emoji/manifest.json
@@ -1622,5 +1622,9 @@
   "zipper_mouth": "\ud83e\udd10",
   "zzz": "\ud83d\udca4",
   "100": "\ud83d\udcaf",
-  "1234": "\ud83d\udd22"
+  "1234": "\ud83d\udd22",
+
+  "party": "\ud83c\udf89",
+  "celebration": "\ud83c\udf89",
+  "confetti": "\ud83c\udf89"
 }

From ef121b3e17cfa9649820938e2092a5c98183c8f1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 05:58:21 -0800
Subject: [PATCH 479/865] Fix a Herald repetition policy selection error for
 rule types which support only one policy

Summary:
Ref T13048. See <https://discourse.phabricator-community.org/t/configuring-commit-hook-commit-content-rules-fail-with-exception/1077/3>.

When a rule supports only one repetition policy (always "every time") like "Commit Hook" rules, we don't render a control for `repetition_policy` and fail to update it when saving.

Before the changes to support the new "if the rule did not match the last time" policy, this workflow just defaulted to "every time" if the input was invalid, but this was changed by accident in D18926 when I removed some of the toInt/toString juggling code.

(This patch also prevents users from fiddling with the form to create a rule which evaluates with an invalid policy; this wasn't validated before.)

Test Plan:
  - Created new "Commit Hook" (only one policy available) rule.
  - Saved existing "Commit Hook" rule.
  - Created new "Task" (multiple policies) rule.
  - Saved existing Task rule.
  - Set task rule to each repetition policy, saved, verified the save worked.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18992
---
 .../controller/HeraldRuleController.php       | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
index c61c29e90e..d400f8ae90 100644
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -265,7 +265,15 @@ private function saveRule(HeraldAdapter $adapter, $rule, $request) {
     $new_name = $request->getStr('name');
     $match_all = ($request->getStr('must_match') == 'all');
 
-    $repetition_policy_param = $request->getStr('repetition_policy');
+    $repetition_policy = $request->getStr('repetition_policy');
+
+    // If the user selected an invalid policy, or there's only one possible
+    // value so we didn't render a control, adjust the value to the first
+    // valid policy value.
+    $repetition_options = $this->getRepetitionOptionMap($adapter);
+    if (!isset($repetition_options[$repetition_policy])) {
+      $repetition_policy = head_key($repetition_options);
+    }
 
     $e_name = true;
     $errors = array();
@@ -348,7 +356,7 @@ private function saveRule(HeraldAdapter $adapter, $rule, $request) {
         $match_all,
         $conditions,
         $actions,
-        $repetition_policy_param);
+        $repetition_policy);
 
       $xactions = array();
       $xactions[] = id(new HeraldRuleTransaction())
@@ -373,7 +381,7 @@ private function saveRule(HeraldAdapter $adapter, $rule, $request) {
     // mutate current rule, so it would be sent to the client in the right state
     $rule->setMustMatchAll((int)$match_all);
     $rule->setName($new_name);
-    $rule->setRepetitionPolicyStringConstant($repetition_policy_param);
+    $rule->setRepetitionPolicyStringConstant($repetition_policy);
     $rule->attachConditions($conditions);
     $rule->attachActions($actions);
 
@@ -594,13 +602,9 @@ private function renderMustMatchSelector($rule) {
    */
   private function renderRepetitionSelector($rule, HeraldAdapter $adapter) {
     $repetition_policy = $rule->getRepetitionPolicyStringConstant();
-
-    $repetition_options = $adapter->getRepetitionOptions();
-    $repetition_names = HeraldRule::getRepetitionPolicySelectOptionMap();
-    $repetition_map = array_select_keys($repetition_names, $repetition_options);
-
+    $repetition_map = $this->getRepetitionOptionMap($adapter);
     if (count($repetition_map) < 2) {
-      return head($repetition_names);
+      return head($repetition_map);
     } else {
       return AphrontFormSelectControl::renderSelectTag(
         $repetition_policy,
@@ -611,6 +615,11 @@ private function renderRepetitionSelector($rule, HeraldAdapter $adapter) {
     }
   }
 
+  private function getRepetitionOptionMap(HeraldAdapter $adapter) {
+    $repetition_options = $adapter->getRepetitionOptions();
+    $repetition_names = HeraldRule::getRepetitionPolicySelectOptionMap();
+    return array_select_keys($repetition_names, $repetition_options);
+  }
 
   protected function buildTokenizerTemplates() {
     $template = new AphrontTokenizerTemplateView();

From c3f95bc410a3173fc1d2eccc392e0d4b6b6c65a4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 4 Feb 2018 09:04:12 -0800
Subject: [PATCH 480/865] Add basic support for mail "stamps" to improve client
 mail routing

Summary:
Ref T10448. Currently, we use "mail tags" (in {nav Settings > Email Preferences})  to give users some ability to route mail. There are a number of major issues with this:

  - It isn't modular and can't be extended by third-party applications.
  - The UI is a giant mess of 5,000 individual settings.
  - Settings don't map clearly to actual edits.
  - A lot of stuff isn't covered by any setting.

This adds a new system, called "mail stamps", which is similar to "mail tags" but tries to fix all these problems.

I called these "stamps" because: stamps make sense with mail; we can't throw away the old system just yet and need to keep it around for a bit; we don't use this term for anything else; it avoids confusion with project tags.

(Conceptually, imagine these as ink stamps like "RETURN TO SENDER" or "FRAGILE", not actual postage stamps.)

The only real "trick" here is that later versions of this will need to enumerate possible stamps for an object and maybe all possible stamps for all objects in the system. This is why stamp generation is separated into a "template" phase and a "value" phase. In future changes, the "template" phase can be used on its own to generate documentation and typeaheads and let users build rules. This may need some more refinement before it really works since I haven't built any of that yet.

Also adds a preference for getting stamps in the header only (default) or header and body (better for Gmail, which can't route based on headers).

Test Plan:
Fiddled with preference, sent some mail and saw a "STAMPS" setting in the body and an "X-Phabricator-Stamps" header.

{F5411694}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T10448

Differential Revision: https://secure.phabricator.com/D18991
---
 src/__phutil_library_map__.php                |  10 ++
 .../engine/PhabricatorMailEngineExtension.php |  47 ++++++
 .../replyhandler/PhabricatorMailTarget.php    |  33 +++-
 .../metamta/stamp/PhabricatorMailStamp.php    |  88 +++++++++++
 .../stamp/PhabricatorStringMailStamp.php      |  16 ++
 .../storage/PhabricatorMetaMTAMail.php        |  29 ++++
 .../setting/PhabricatorEmailStampsSetting.php |  47 ++++++
 ...habricatorApplicationTransactionEditor.php | 149 ++++++++++++++++++
 ...orApplicationObjectMailEngineExtension.php |  92 +++++++++++
 9 files changed, 507 insertions(+), 4 deletions(-)
 create mode 100644 src/applications/metamta/engine/PhabricatorMailEngineExtension.php
 create mode 100644 src/applications/metamta/stamp/PhabricatorMailStamp.php
 create mode 100644 src/applications/metamta/stamp/PhabricatorStringMailStamp.php
 create mode 100644 src/applications/settings/setting/PhabricatorEmailStampsSetting.php
 create mode 100644 src/applications/transactions/engineextension/PhabricatorApplicationObjectMailEngineExtension.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7076cde010..6fa14fbacb 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1958,6 +1958,7 @@
     'PhabricatorApplicationEditHTTPParameterHelpView' => 'applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php',
     'PhabricatorApplicationEditor' => 'applications/meta/editor/PhabricatorApplicationEditor.php',
     'PhabricatorApplicationEmailCommandsController' => 'applications/meta/controller/PhabricatorApplicationEmailCommandsController.php',
+    'PhabricatorApplicationObjectMailEngineExtension' => 'applications/transactions/engineextension/PhabricatorApplicationObjectMailEngineExtension.php',
     'PhabricatorApplicationPanelController' => 'applications/meta/controller/PhabricatorApplicationPanelController.php',
     'PhabricatorApplicationPolicyChangeTransaction' => 'applications/meta/xactions/PhabricatorApplicationPolicyChangeTransaction.php',
     'PhabricatorApplicationProfileMenuItem' => 'applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php',
@@ -2828,6 +2829,7 @@
     'PhabricatorEmailPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php',
     'PhabricatorEmailRePrefixSetting' => 'applications/settings/setting/PhabricatorEmailRePrefixSetting.php',
     'PhabricatorEmailSelfActionsSetting' => 'applications/settings/setting/PhabricatorEmailSelfActionsSetting.php',
+    'PhabricatorEmailStampsSetting' => 'applications/settings/setting/PhabricatorEmailStampsSetting.php',
     'PhabricatorEmailTagsSetting' => 'applications/settings/setting/PhabricatorEmailTagsSetting.php',
     'PhabricatorEmailVarySubjectsSetting' => 'applications/settings/setting/PhabricatorEmailVarySubjectsSetting.php',
     'PhabricatorEmailVerificationController' => 'applications/auth/controller/PhabricatorEmailVerificationController.php',
@@ -3174,6 +3176,7 @@
     'PhabricatorMailEmailHeraldField' => 'applications/metamta/herald/PhabricatorMailEmailHeraldField.php',
     'PhabricatorMailEmailHeraldFieldGroup' => 'applications/metamta/herald/PhabricatorMailEmailHeraldFieldGroup.php',
     'PhabricatorMailEmailSubjectHeraldField' => 'applications/metamta/herald/PhabricatorMailEmailSubjectHeraldField.php',
+    'PhabricatorMailEngineExtension' => 'applications/metamta/engine/PhabricatorMailEngineExtension.php',
     'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAdapter.php',
     'PhabricatorMailImplementationAmazonSESAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php',
     'PhabricatorMailImplementationMailgunAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php',
@@ -3202,6 +3205,7 @@
     'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/PhabricatorMailReplyHandler.php',
     'PhabricatorMailRoutingRule' => 'applications/metamta/constants/PhabricatorMailRoutingRule.php',
     'PhabricatorMailSetupCheck' => 'applications/config/check/PhabricatorMailSetupCheck.php',
+    'PhabricatorMailStamp' => 'applications/metamta/stamp/PhabricatorMailStamp.php',
     'PhabricatorMailTarget' => 'applications/metamta/replyhandler/PhabricatorMailTarget.php',
     'PhabricatorMailgunConfigOptions' => 'applications/config/option/PhabricatorMailgunConfigOptions.php',
     'PhabricatorMainMenuBarExtension' => 'view/page/menu/PhabricatorMainMenuBarExtension.php',
@@ -4204,6 +4208,7 @@
     'PhabricatorStringListConfigType' => 'applications/config/type/PhabricatorStringListConfigType.php',
     'PhabricatorStringListEditField' => 'applications/transactions/editfield/PhabricatorStringListEditField.php',
     'PhabricatorStringListExportField' => 'infrastructure/export/field/PhabricatorStringListExportField.php',
+    'PhabricatorStringMailStamp' => 'applications/metamta/stamp/PhabricatorStringMailStamp.php',
     'PhabricatorStringSetting' => 'applications/settings/setting/PhabricatorStringSetting.php',
     'PhabricatorSubmitEditField' => 'applications/transactions/editfield/PhabricatorSubmitEditField.php',
     'PhabricatorSubscribableInterface' => 'applications/subscriptions/interface/PhabricatorSubscribableInterface.php',
@@ -7269,6 +7274,7 @@
     'PhabricatorApplicationEditHTTPParameterHelpView' => 'AphrontView',
     'PhabricatorApplicationEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorApplicationEmailCommandsController' => 'PhabricatorApplicationsController',
+    'PhabricatorApplicationObjectMailEngineExtension' => 'PhabricatorMailEngineExtension',
     'PhabricatorApplicationPanelController' => 'PhabricatorApplicationsController',
     'PhabricatorApplicationPolicyChangeTransaction' => 'PhabricatorApplicationTransactionType',
     'PhabricatorApplicationProfileMenuItem' => 'PhabricatorProfileMenuItem',
@@ -8276,6 +8282,7 @@
     'PhabricatorEmailPreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorEmailRePrefixSetting' => 'PhabricatorSelectSetting',
     'PhabricatorEmailSelfActionsSetting' => 'PhabricatorSelectSetting',
+    'PhabricatorEmailStampsSetting' => 'PhabricatorSelectSetting',
     'PhabricatorEmailTagsSetting' => 'PhabricatorInternalSetting',
     'PhabricatorEmailVarySubjectsSetting' => 'PhabricatorSelectSetting',
     'PhabricatorEmailVerificationController' => 'PhabricatorAuthController',
@@ -8662,6 +8669,7 @@
     'PhabricatorMailEmailHeraldField' => 'HeraldField',
     'PhabricatorMailEmailHeraldFieldGroup' => 'HeraldFieldGroup',
     'PhabricatorMailEmailSubjectHeraldField' => 'PhabricatorMailEmailHeraldField',
+    'PhabricatorMailEngineExtension' => 'Phobject',
     'PhabricatorMailImplementationAdapter' => 'Phobject',
     'PhabricatorMailImplementationAmazonSESAdapter' => 'PhabricatorMailImplementationPHPMailerLiteAdapter',
     'PhabricatorMailImplementationMailgunAdapter' => 'PhabricatorMailImplementationAdapter',
@@ -8690,6 +8698,7 @@
     'PhabricatorMailReplyHandler' => 'Phobject',
     'PhabricatorMailRoutingRule' => 'Phobject',
     'PhabricatorMailSetupCheck' => 'PhabricatorSetupCheck',
+    'PhabricatorMailStamp' => 'Phobject',
     'PhabricatorMailTarget' => 'Phobject',
     'PhabricatorMailgunConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorMainMenuBarExtension' => 'Phobject',
@@ -9907,6 +9916,7 @@
     'PhabricatorStringListConfigType' => 'PhabricatorTextListConfigType',
     'PhabricatorStringListEditField' => 'PhabricatorEditField',
     'PhabricatorStringListExportField' => 'PhabricatorListExportField',
+    'PhabricatorStringMailStamp' => 'PhabricatorMailStamp',
     'PhabricatorStringSetting' => 'PhabricatorSetting',
     'PhabricatorSubmitEditField' => 'PhabricatorEditField',
     'PhabricatorSubscribedToObjectEdgeType' => 'PhabricatorEdgeType',
diff --git a/src/applications/metamta/engine/PhabricatorMailEngineExtension.php b/src/applications/metamta/engine/PhabricatorMailEngineExtension.php
new file mode 100644
index 0000000000..36675dda4a
--- /dev/null
+++ b/src/applications/metamta/engine/PhabricatorMailEngineExtension.php
@@ -0,0 +1,47 @@
+<?php
+
+abstract class PhabricatorMailEngineExtension
+  extends Phobject {
+
+  private $viewer;
+  private $editor;
+
+  final public function getExtensionKey() {
+    return $this->getPhobjectClassConstant('EXTENSIONKEY');
+  }
+
+  final public function setViewer($viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  final public function setEditor(
+    PhabricatorApplicationTransactionEditor $editor) {
+    $this->editor = $editor;
+    return $this;
+  }
+
+  final public function getEditor() {
+    return $this->editor;
+  }
+
+  abstract public function supportsObject($object);
+  abstract public function newMailStampTemplates($object);
+  abstract public function newMailStamps($object, array $xactions);
+
+  final public static function getAllExtensions() {
+    return id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->setUniqueMethod('getExtensionKey')
+      ->execute();
+  }
+
+  final protected function getMailStamp($key) {
+    return $this->getEditor()->getMailStamp($key);
+  }
+
+}
diff --git a/src/applications/metamta/replyhandler/PhabricatorMailTarget.php b/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
index c607087b22..0463b6cdd7 100644
--- a/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
+++ b/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
@@ -58,23 +58,48 @@ public function getViewer() {
   public function willSendMail(PhabricatorMetaMTAMail $mail) {
     $viewer = $this->getViewer();
 
+    $show_stamps = $mail->shouldRenderMailStampsInBody($viewer);
+
+    $body = $mail->getBody();
+    $html_body = $mail->getHTMLBody();
+    $has_html = (strlen($html_body) > 0);
+
+    if ($show_stamps) {
+      $stamps = $mail->getMailStamps();
+
+      $body .= "\n";
+      $body .= pht('STAMPS');
+      $body .= "\n";
+      $body .= implode(', ', $stamps);
+      $body .= "\n";
+
+      if ($has_html) {
+        $html = array();
+        $html[] = phutil_tag('strong', array(), pht('STAMPS'));
+        $html[] = phutil_tag('br');
+        $html[] = phutil_implode_html(', ', $stamps);
+        $html[] = phutil_tag('br');
+        $html = phutil_tag('div', array(), $html);
+        $html_body .= hsprintf('%s', $html);
+      }
+    }
+
     $mail->addPHIDHeaders('X-Phabricator-To', $this->rawToPHIDs);
     $mail->addPHIDHeaders('X-Phabricator-Cc', $this->rawCCPHIDs);
 
     $to_handles = $viewer->loadHandles($this->rawToPHIDs);
     $cc_handles = $viewer->loadHandles($this->rawCCPHIDs);
 
-    $body = $mail->getBody();
     $body .= "\n";
     $body .= $this->getRecipientsSummary($to_handles, $cc_handles);
-    $mail->setBody($body);
 
-    $html_body = $mail->getHTMLBody();
-    if (strlen($html_body)) {
+    if ($has_html) {
       $html_body .= hsprintf(
         '%s',
         $this->getRecipientsSummaryHTML($to_handles, $cc_handles));
     }
+
+    $mail->setBody($body);
     $mail->setHTMLBody($html_body);
 
     $reply_to = $this->getReplyTo();
diff --git a/src/applications/metamta/stamp/PhabricatorMailStamp.php b/src/applications/metamta/stamp/PhabricatorMailStamp.php
new file mode 100644
index 0000000000..9b425a4bdf
--- /dev/null
+++ b/src/applications/metamta/stamp/PhabricatorMailStamp.php
@@ -0,0 +1,88 @@
+<?php
+
+abstract class PhabricatorMailStamp
+  extends Phobject {
+
+  private $key;
+  private $value;
+  private $label;
+  private $viewer;
+
+  final public function getStampType() {
+    return $this->getPhobjectClassConstant('STAMPTYPE');
+  }
+
+  final public function setKey($key) {
+    $this->key = $key;
+    return $this;
+  }
+
+  final public function getKey() {
+    return $this->key;
+  }
+
+  final protected function setRawValue($value) {
+    $this->value = $value;
+    return $this;
+  }
+
+  final protected function getRawValue() {
+    return $this->value;
+  }
+
+  final public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  final public function setLabel($label) {
+    $this->label = $label;
+    return $this;
+  }
+
+  final public function getLabel() {
+    return $this->label;
+  }
+
+  public function setValue($value) {
+    return $this->setRawValue($value);
+  }
+
+  final public function toDictionary() {
+    return array(
+      'type' => $this->getStampType(),
+      'key' => $this->getKey(),
+      'value' => $this->getValueForDictionary(),
+    );
+  }
+
+  final public static function getAllStamps() {
+    return id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->setUniqueMethod('getStampType')
+      ->execute();
+  }
+
+  protected function getValueForDictionary() {
+    return $this->getRawValue();
+  }
+
+  public function setValueFromDictionary($value) {
+    return $this->setRawValue($value);
+  }
+
+  public function getValueForRendering() {
+    return $this->getRawValue();
+  }
+
+  abstract public function renderStamps($value);
+
+  final protected function renderStamp($key, $value = null) {
+    return $key.'('.$value.')';
+  }
+
+}
diff --git a/src/applications/metamta/stamp/PhabricatorStringMailStamp.php b/src/applications/metamta/stamp/PhabricatorStringMailStamp.php
new file mode 100644
index 0000000000..98d472ad48
--- /dev/null
+++ b/src/applications/metamta/stamp/PhabricatorStringMailStamp.php
@@ -0,0 +1,16 @@
+<?php
+
+final class PhabricatorStringMailStamp
+  extends PhabricatorMailStamp {
+
+  const STAMPTYPE = 'string';
+
+  public function renderStamps($value) {
+    if (!strlen($value)) {
+      return null;
+    }
+
+    return $this->renderStamp($this->getKey(), $value);
+  }
+
+}
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index a61951650c..a7734b7ae8 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -299,6 +299,22 @@ public function getMustEncryptReasons() {
     return $this->getParam('mustEncryptReasons', array());
   }
 
+  public function setMailStamps(array $stamps) {
+    return $this->setParam('stamps', $stamps);
+  }
+
+  public function getMailStamps() {
+    return $this->getParam('stamps', array());
+  }
+
+  public function setMailStampMetadata($metadata) {
+    return $this->setParam('stampMetadata', $metadata);
+  }
+
+  public function getMailStampMetadata() {
+    return $this->getParam('stampMetadata', array());
+  }
+
   public function setHTMLBody($html) {
     $this->setParam('html-body', $html);
     return $this;
@@ -637,6 +653,11 @@ public function sendNow(
         }
       }
 
+      $stamps = $this->getMailStamps();
+      if ($stamps) {
+        $headers[] = array('X-Phabricator-Stamps', implode(', ', $stamps));
+      }
+
       $raw_body = idx($params, 'body', '');
       $body = $raw_body;
       if ($must_encrypt) {
@@ -1304,6 +1325,14 @@ private function shouldSendHTML(PhabricatorUserPreferences $preferences) {
     return ($value == PhabricatorEmailFormatSetting::VALUE_HTML_EMAIL);
   }
 
+  public function shouldRenderMailStampsInBody($viewer) {
+    $preferences = $this->loadPreferences($viewer->getPHID());
+    $value = $preferences->getSettingValue(
+      PhabricatorEmailStampsSetting::SETTINGKEY);
+
+    return ($value == PhabricatorEmailStampsSetting::VALUE_BODY_STAMPS);
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/settings/setting/PhabricatorEmailStampsSetting.php b/src/applications/settings/setting/PhabricatorEmailStampsSetting.php
new file mode 100644
index 0000000000..39403f40a0
--- /dev/null
+++ b/src/applications/settings/setting/PhabricatorEmailStampsSetting.php
@@ -0,0 +1,47 @@
+<?php
+
+final class PhabricatorEmailStampsSetting
+  extends PhabricatorSelectSetting {
+
+  const SETTINGKEY = 'stamps';
+
+  const VALUE_BODY_STAMPS = 'body';
+  const VALUE_HEADER_STAMPS = 'header';
+
+  public function getSettingName() {
+    return pht('Send Stamps');
+  }
+
+  public function getSettingPanelKey() {
+    return PhabricatorEmailFormatSettingsPanel::PANELKEY;
+  }
+
+  protected function getSettingOrder() {
+    return 400;
+  }
+
+  protected function getControlInstructions() {
+    return pht(<<<EOREMARKUP
+Phabricator stamps mail with labels like `actor(alice)` which can be used to
+write client mail rules to organize mail. By default, these stamps are sent
+in an `X-Phabricator-Stamps` header.
+
+If you use a client which can not use headers to route mail (like Gmail),
+you can also include the stamps in the message body so mail rules based on
+body content can route messages.
+EOREMARKUP
+      );
+  }
+
+  public function getSettingDefaultValue() {
+    return self::VALUE_HEADER_STAMPS;
+  }
+
+  protected function getSelectOptions() {
+    return array(
+      self::VALUE_HEADER_STAMPS => pht('Mail Headers'),
+      self::VALUE_BODY_STAMPS => pht('Mail Headers and Body'),
+    );
+  }
+
+}
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 0dc6a06fbf..47b975c093 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -72,6 +72,8 @@ abstract class PhabricatorApplicationTransactionEditor
   private $modularTypes;
   private $silent;
   private $mustEncrypt;
+  private $stampTemplates = array();
+  private $mailStamps = array();
 
   private $transactionQueue = array();
 
@@ -1181,6 +1183,12 @@ final public function applyTransactions(
         $this->mailShouldSend = true;
         $this->mailToPHIDs = $this->getMailTo($object);
         $this->mailCCPHIDs = $this->getMailCC($object);
+
+        $mail_xactions = $this->getTransactionsForMail($object, $xactions);
+        $stamps = $this->newMailStamps($object, $xactions);
+        foreach ($stamps as $stamp) {
+          $this->mailStamps[] = $stamp->toDictionary();
+        }
       }
 
       if ($this->shouldPublishFeedStory($object, $xactions)) {
@@ -2611,6 +2619,7 @@ private function buildMailForTarget(
 
     $mail_tags = $this->getMailTags($object, $mail_xactions);
     $action = $this->getMailAction($object, $mail_xactions);
+    $stamps = $this->generateMailStamps($object, $this->mailStamps);
 
     if (PhabricatorEnv::getEnvConfig('metamta.email-preferences')) {
       $this->addEmailPreferenceSectionToMailBody(
@@ -2649,6 +2658,18 @@ private function buildMailForTarget(
       $mail->setParentMessageID($this->getParentMessageID());
     }
 
+    // If we have stamps, attach the raw dictionary version (not the actual
+    // objects) to the mail so that debugging tools can see what we used to
+    // render the final list.
+    if ($this->mailStamps) {
+      $mail->setMailStampMetadata($this->mailStamps);
+    }
+
+    // If we have rendered stamps, attach them to the mail.
+    if ($stamps) {
+      $mail->setMailStamps($stamps);
+    }
+
     return $target->willSendMail($mail);
   }
 
@@ -3569,6 +3590,7 @@ private function getAutomaticStateProperties() {
       'feedShouldPublish',
       'mailShouldSend',
       'mustEncrypt',
+      'mailStamps',
     );
   }
 
@@ -3961,4 +3983,131 @@ private function newQueueEditor() {
     return $editor;
   }
 
+
+/* -(  Stamps  )------------------------------------------------------------- */
+
+
+  public function newMailStampTemplates($object) {
+    $actor = $this->getActor();
+
+    $templates = array();
+
+    $extensions = $this->newMailExtensions($object);
+    foreach ($extensions as $extension) {
+      $stamps = $extension->newMailStampTemplates($object);
+      foreach ($stamps as $stamp) {
+        $key = $stamp->getKey();
+        if (isset($templates[$key])) {
+          throw new Exception(
+            pht(
+              'Mail extension ("%s") defines a stamp template with the '.
+              'same key ("%s") as another template. Each stamp template '.
+              'must have a unique key.',
+              get_class($extension),
+              $key));
+        }
+
+        $stamp->setViewer($actor);
+
+        $templates[$key] = $stamp;
+      }
+    }
+
+    return $templates;
+  }
+
+  final public function getMailStamp($key) {
+    if (!isset($this->stampTemplates)) {
+      throw new PhutilInvalidStateException('newMailStampTemplates');
+    }
+
+    if (!isset($this->stampTemplates[$key])) {
+      throw new Exception(
+        pht(
+          'Editor ("%s") has no mail stamp template with provided key ("%s").',
+          get_class($this),
+          $key));
+    }
+
+    return $this->stampTemplates[$key];
+  }
+
+  private function newMailStamps($object, array $xactions) {
+    $actor = $this->getActor();
+
+    $this->stampTemplates = $this->newMailStampTemplates($object);
+
+    $extensions = $this->newMailExtensions($object);
+    $stamps = array();
+    foreach ($extensions as $extension) {
+      $extension->newMailStamps($object, $xactions);
+    }
+
+    return $this->stampTemplates;
+  }
+
+  private function newMailExtensions($object) {
+    $actor = $this->getActor();
+
+    $all_extensions = PhabricatorMailEngineExtension::getAllExtensions();
+
+    $extensions = array();
+    foreach ($all_extensions as $key => $template) {
+      $extension = id(clone $template)
+        ->setViewer($actor)
+        ->setEditor($this);
+
+      if ($extension->supportsObject($object)) {
+        $extensions[$key] = $extension;
+      }
+    }
+
+    return $extensions;
+  }
+
+  private function generateMailStamps($object, $data) {
+    if (!$data || !is_array($data)) {
+      return null;
+    }
+
+    $templates = $this->newMailStampTemplates($object);
+    foreach ($data as $spec) {
+      if (!is_array($spec)) {
+        continue;
+      }
+
+      $key = idx($spec, 'key');
+      if (!isset($templates[$key])) {
+        continue;
+      }
+
+      $type = idx($spec, 'type');
+      if ($templates[$key]->getStampType() !== $type) {
+        continue;
+      }
+
+      $value = idx($spec, 'value');
+      $templates[$key]->setValueFromDictionary($value);
+    }
+
+    $results = array();
+    foreach ($templates as $template) {
+      $value = $template->getValueForRendering();
+
+      $rendered = $template->renderStamps($value);
+      if ($rendered === null) {
+        continue;
+      }
+
+      $rendered = (array)$rendered;
+      foreach ($rendered as $stamp) {
+        $results[] = $stamp;
+      }
+    }
+
+    sort($results);
+
+    return $results;
+  }
+
 }
diff --git a/src/applications/transactions/engineextension/PhabricatorApplicationObjectMailEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorApplicationObjectMailEngineExtension.php
new file mode 100644
index 0000000000..bf441df71c
--- /dev/null
+++ b/src/applications/transactions/engineextension/PhabricatorApplicationObjectMailEngineExtension.php
@@ -0,0 +1,92 @@
+<?php
+
+final class PhabricatorApplicationObjectMailEngineExtension
+  extends PhabricatorMailEngineExtension {
+
+  const EXTENSIONKEY = 'application/object';
+
+  public function supportsObject($object) {
+    return true;
+  }
+
+  public function newMailStampTemplates($object) {
+    $templates = array(
+      id(new PhabricatorStringMailStamp())
+        ->setKey('application')
+        ->setLabel(pht('Application')),
+    );
+
+    if ($this->hasMonogram($object)) {
+      $templates[] = id(new PhabricatorStringMailStamp())
+        ->setKey('monogram')
+        ->setLabel(pht('Object Monogram'));
+    }
+
+    if ($this->hasPHID($object)) {
+      // This is a PHID, but we always want to render it as a raw string, so
+      // use a string mail stamp.
+      $templates[] = id(new PhabricatorStringMailStamp())
+        ->setKey('phid')
+        ->setLabel(pht('Object PHID'));
+
+      $templates[] = id(new PhabricatorStringMailStamp())
+        ->setKey('object-type')
+        ->setLabel(pht('Object Type'));
+    }
+
+    return $templates;
+  }
+
+  public function newMailStamps($object, array $xactions) {
+    $editor = $this->getEditor();
+    $viewer = $this->getViewer();
+
+    $application = null;
+    $class = $editor->getEditorApplicationClass();
+    if (PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
+      $application = newv($class, array());
+    }
+
+    if ($application) {
+      $application_name = $application->getName();
+      $this->getMailStamp('application')
+        ->setValue($application_name);
+    }
+
+    if ($this->hasMonogram($object)) {
+      $monogram = $object->getMonogram();
+      $this->getMailStamp('monogram')
+        ->setValue($monogram);
+    }
+
+    if ($this->hasPHID($object)) {
+      $object_phid = $object->getPHID();
+
+      $this->getMailStamp('phid')
+        ->setValue($object_phid);
+
+      $phid_type = phid_get_type($object_phid);
+      if ($phid_type != PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
+        $this->getMailStamp('object-type')
+          ->setValue($phid_type);
+      }
+    }
+  }
+
+  private function hasPHID($object) {
+    if (!($object instanceof LiskDAO)) {
+      return false;
+    }
+
+    if (!$object->getConfigOption(LiskDAO::CONFIG_AUX_PHID)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  private function hasMonogram($object) {
+    return method_exists($object, 'getMonogram');
+  }
+
+}

From 9de54aedb57801fcee9f9da839cf730063f98ca7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 10:37:39 -0800
Subject: [PATCH 481/865] Remove inconsistent and confusing use of the term
 "multiplex" in mail

Summary:
Ref T13053. Because I previously misunderstood what "multiplex" means, I used it in various contradictory and inconsistent ways.

We can send mail in two ways: either one mail to everyone with a big "To" and a big "Cc" (not default; better for mailing lists) or one mail to each recipient with just them in "To" (default; better for almost everything else).

"Multiplexing" is combining multiple signals over a single channel, so it more accurately describes the big to/cc. However, it is sometimes used to descibe the other approach. Since it's ambiguous and I've tainted it through misuse, get rid of it and use more clear language.

(There's still some likely misuse in the SMS stuff, and a couple of legitimate uses in other contexts.)

Test Plan: Grepped for `multiplex`, saw less of it.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18994
---
 .../config/option/PhabricatorMetaMTAConfigOptions.php     | 6 +++---
 .../PhabricatorMailImplementationPHPMailerAdapter.php     | 4 ++--
 .../PhabricatorMailImplementationPHPMailerLiteAdapter.php | 4 ++--
 .../metamta/storage/PhabricatorMetaMTAMail.php            | 8 ++++----
 .../panel/PhabricatorEmailFormatSettingsPanel.php         | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
index 6c846daa57..8c2d2265bc 100644
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -153,9 +153,9 @@ public function getOptions() {
   $adapter_doc_name));
 
     $placeholder_description = $this->deformat(pht(<<<EODOC
-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.
+When sending a message that has no To recipient (i.e. all recipients are CC'd),
+set the To field to the following value. If no value is set, messages with no
+To will have their CCs upgraded to To.
 EODOC
 ));
 
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
index 2fadd6491f..f4d7e8e156 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
@@ -19,8 +19,8 @@ public function __construct() {
     $this->mailer->Encoding = $encoding;
 
     // By default, PHPMailer sends one mail per recipient. We handle
-    // multiplexing higher in the stack, so tell it to send mail exactly
-    // like we ask.
+    // combining or separating To and Cc higher in the stack, so tell it to
+    // send mail exactly like we ask.
     $this->mailer->SingleTo = false;
 
     $mailer = PhabricatorEnv::getEnvConfig('phpmailer.mailer');
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
index f072e769c3..668f9353ec 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
@@ -22,8 +22,8 @@ public function __construct() {
     $this->mailer->Encoding = $encoding;
 
     // By default, PHPMailerLite sends one mail per recipient. We handle
-    // multiplexing higher in the stack, so tell it to send mail exactly
-    // like we ask.
+    // combining or separating To and Cc higher in the stack, so tell it to
+    // send mail exactly like we ask.
     $this->mailer->SingleTo = false;
   }
 
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index a7734b7ae8..f19e5e951a 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -507,8 +507,8 @@ public function sendNow(
       $add_cc = array();
       $add_to = array();
 
-      // If multiplexing is enabled, some recipients will be in "Cc"
-      // rather than "To". We'll move them to "To" later (or supply a
+      // If we're sending one mail to everyone, some recipients will be in
+      // "Cc" rather than "To". We'll move them to "To" later (or supply a
       // dummy "To") but need to look for the recipient in either the
       // "To" or "Cc" fields here.
       $target_phid = head(idx($params, 'to', array()));
@@ -847,7 +847,7 @@ private function generateThreadIndex($seed, $is_first_mail) {
     return base64_encode($base);
   }
 
-  public static function shouldMultiplexAllMail() {
+  public static function shouldMailEachRecipient() {
     return PhabricatorEnv::getEnvConfig('metamta.one-mail-per-recipient');
   }
 
@@ -1290,7 +1290,7 @@ private function getRoutingRuleMap() {
   private function loadPreferences($target_phid) {
     $viewer = PhabricatorUser::getOmnipotentUser();
 
-    if (self::shouldMultiplexAllMail()) {
+    if (self::shouldMailEachRecipient()) {
       $preferences = id(new PhabricatorUserPreferencesQuery())
         ->setViewer($viewer)
         ->withUserPHIDs(array($target_phid))
diff --git a/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
index 107816f2eb..bdc3c994b3 100644
--- a/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
@@ -14,7 +14,7 @@ public function getPanelGroupKey() {
   }
 
   public function isUserPanel() {
-    return PhabricatorMetaMTAMail::shouldMultiplexAllMail();
+    return PhabricatorMetaMTAMail::shouldMailEachRecipient();
   }
 
   public function isManagementPanel() {

From 3131e733a85cb8be5f6119ca8d4d7a0b23f29009 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 10:31:56 -0800
Subject: [PATCH 482/865] Add Editor-based mail stamps: actor, via, silent,
 encrypted, new, mention, self-actor, self-mention

Summary: Ref T13053. Adds more mail tags with information available on the Editor object.

Test Plan: Banged around in Maniphest, viewed the resulting mail, all the stamps seemed to align with reality.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18995
---
 src/__phutil_library_map__.php                |  8 ++
 .../stamp/PhabricatorBoolMailStamp.php        | 16 ++++
 .../stamp/PhabricatorPHIDMailStamp.php        | 36 +++++++++
 .../stamp/PhabricatorViewerMailStamp.php      | 35 ++++++++
 .../phid/PhabricatorPeopleUserPHIDType.php    | 13 +--
 .../phid/PhabricatorObjectHandle.php          | 10 +++
 .../PhabricatorProjectProjectPHIDType.php     |  3 +-
 ...habricatorApplicationTransactionEditor.php |  6 +-
 .../PhabricatorEditorMailEngineExtension.php  | 81 +++++++++++++++++++
 9 files changed, 201 insertions(+), 7 deletions(-)
 create mode 100644 src/applications/metamta/stamp/PhabricatorBoolMailStamp.php
 create mode 100644 src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
 create mode 100644 src/applications/metamta/stamp/PhabricatorViewerMailStamp.php
 create mode 100644 src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 6fa14fbacb..2a84849171 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2220,6 +2220,7 @@
     'PhabricatorBoardResponseEngine' => 'applications/project/engine/PhabricatorBoardResponseEngine.php',
     'PhabricatorBoolConfigType' => 'applications/config/type/PhabricatorBoolConfigType.php',
     'PhabricatorBoolEditField' => 'applications/transactions/editfield/PhabricatorBoolEditField.php',
+    'PhabricatorBoolMailStamp' => 'applications/metamta/stamp/PhabricatorBoolMailStamp.php',
     'PhabricatorBritishEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorBritishEnglishTranslation.php',
     'PhabricatorBuiltinDraftEngine' => 'applications/transactions/draft/PhabricatorBuiltinDraftEngine.php',
     'PhabricatorBuiltinFileCachePurger' => 'applications/cache/purger/PhabricatorBuiltinFileCachePurger.php',
@@ -2813,6 +2814,7 @@
     'PhabricatorEditPage' => 'applications/transactions/editengine/PhabricatorEditPage.php',
     'PhabricatorEditType' => 'applications/transactions/edittype/PhabricatorEditType.php',
     'PhabricatorEditor' => 'infrastructure/PhabricatorEditor.php',
+    'PhabricatorEditorMailEngineExtension' => 'applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php',
     'PhabricatorEditorMultipleSetting' => 'applications/settings/setting/PhabricatorEditorMultipleSetting.php',
     'PhabricatorEditorSetting' => 'applications/settings/setting/PhabricatorEditorSetting.php',
     'PhabricatorElasticFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php',
@@ -3440,6 +3442,7 @@
     'PhabricatorPHIDListEditField' => 'applications/transactions/editfield/PhabricatorPHIDListEditField.php',
     'PhabricatorPHIDListEditType' => 'applications/transactions/edittype/PhabricatorPHIDListEditType.php',
     'PhabricatorPHIDListExportField' => 'infrastructure/export/field/PhabricatorPHIDListExportField.php',
+    'PhabricatorPHIDMailStamp' => 'applications/metamta/stamp/PhabricatorPHIDMailStamp.php',
     'PhabricatorPHIDResolver' => 'applications/phid/resolver/PhabricatorPHIDResolver.php',
     'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php',
     'PhabricatorPHIDTypeTestCase' => 'applications/phid/type/__tests__/PhabricatorPHIDTypeTestCase.php',
@@ -4395,6 +4398,7 @@
     'PhabricatorVersionedDraft' => 'applications/draft/storage/PhabricatorVersionedDraft.php',
     'PhabricatorVeryWowEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorVeryWowEnglishTranslation.php',
     'PhabricatorViewerDatasource' => 'applications/people/typeahead/PhabricatorViewerDatasource.php',
+    'PhabricatorViewerMailStamp' => 'applications/metamta/stamp/PhabricatorViewerMailStamp.php',
     'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php',
     'PhabricatorWebContentSource' => 'infrastructure/contentsource/PhabricatorWebContentSource.php',
     'PhabricatorWebServerSetupCheck' => 'applications/config/check/PhabricatorWebServerSetupCheck.php',
@@ -7582,6 +7586,7 @@
     'PhabricatorBoardResponseEngine' => 'Phobject',
     'PhabricatorBoolConfigType' => 'PhabricatorTextConfigType',
     'PhabricatorBoolEditField' => 'PhabricatorEditField',
+    'PhabricatorBoolMailStamp' => 'PhabricatorMailStamp',
     'PhabricatorBritishEnglishTranslation' => 'PhutilTranslation',
     'PhabricatorBuiltinDraftEngine' => 'PhabricatorDraftEngine',
     'PhabricatorBuiltinFileCachePurger' => 'PhabricatorCachePurger',
@@ -8267,6 +8272,7 @@
     'PhabricatorEditPage' => 'Phobject',
     'PhabricatorEditType' => 'Phobject',
     'PhabricatorEditor' => 'Phobject',
+    'PhabricatorEditorMailEngineExtension' => 'PhabricatorMailEngineExtension',
     'PhabricatorEditorMultipleSetting' => 'PhabricatorSelectSetting',
     'PhabricatorEditorSetting' => 'PhabricatorStringSetting',
     'PhabricatorElasticFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine',
@@ -8973,6 +8979,7 @@
     'PhabricatorPHIDListEditField' => 'PhabricatorEditField',
     'PhabricatorPHIDListEditType' => 'PhabricatorEditType',
     'PhabricatorPHIDListExportField' => 'PhabricatorListExportField',
+    'PhabricatorPHIDMailStamp' => 'PhabricatorMailStamp',
     'PhabricatorPHIDResolver' => 'Phobject',
     'PhabricatorPHIDType' => 'Phobject',
     'PhabricatorPHIDTypeTestCase' => 'PhutilTestCase',
@@ -10137,6 +10144,7 @@
     'PhabricatorVersionedDraft' => 'PhabricatorDraftDAO',
     'PhabricatorVeryWowEnglishTranslation' => 'PhutilTranslation',
     'PhabricatorViewerDatasource' => 'PhabricatorTypeaheadDatasource',
+    'PhabricatorViewerMailStamp' => 'PhabricatorMailStamp',
     'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorWebContentSource' => 'PhabricatorContentSource',
     'PhabricatorWebServerSetupCheck' => 'PhabricatorSetupCheck',
diff --git a/src/applications/metamta/stamp/PhabricatorBoolMailStamp.php b/src/applications/metamta/stamp/PhabricatorBoolMailStamp.php
new file mode 100644
index 0000000000..d274df67fe
--- /dev/null
+++ b/src/applications/metamta/stamp/PhabricatorBoolMailStamp.php
@@ -0,0 +1,16 @@
+<?php
+
+final class PhabricatorBoolMailStamp
+  extends PhabricatorMailStamp {
+
+  const STAMPTYPE = 'bool';
+
+  public function renderStamps($value) {
+    if (!$value) {
+      return null;
+    }
+
+    return $this->renderStamp($this->getKey());
+  }
+
+}
diff --git a/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php b/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
new file mode 100644
index 0000000000..575ad16f6a
--- /dev/null
+++ b/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
@@ -0,0 +1,36 @@
+<?php
+
+final class PhabricatorPHIDMailStamp
+  extends PhabricatorMailStamp {
+
+  const STAMPTYPE = 'phid';
+
+  public function renderStamps($value) {
+    if ($value === null) {
+      return null;
+    }
+
+    $value = (array)$value;
+    if (!$value) {
+      return null;
+    }
+
+    $viewer = $this->getViewer();
+    $handles = $viewer->loadHandles($value);
+
+    $results = array();
+    foreach ($value as $phid) {
+      $handle = $handles[$phid];
+
+      $mail_name = $handle->getMailStampName();
+      if ($mail_name === null) {
+        $mail_name = $handle->getPHID();
+      }
+
+      $results[] = $this->renderStamp($this->getKey(), $mail_name);
+    }
+
+    return $results;
+  }
+
+}
diff --git a/src/applications/metamta/stamp/PhabricatorViewerMailStamp.php b/src/applications/metamta/stamp/PhabricatorViewerMailStamp.php
new file mode 100644
index 0000000000..4eb2028ed8
--- /dev/null
+++ b/src/applications/metamta/stamp/PhabricatorViewerMailStamp.php
@@ -0,0 +1,35 @@
+<?php
+
+final class PhabricatorViewerMailStamp
+  extends PhabricatorMailStamp {
+
+  const STAMPTYPE = 'viewer';
+
+  public function renderStamps($value) {
+    // If we're sending one mail to everyone, we never include viewer-based
+    // stamps since they'll only be accurate for one recipient. Recipients
+    // can still use the corresponding stamps with their usernames or PHIDs.
+    if (!PhabricatorMetaMTAMail::shouldMailEachRecipient()) {
+      return null;
+    }
+
+    $viewer_phid = $this->getViewer()->getPHID();
+    if (!$viewer_phid) {
+      return null;
+    }
+
+    if (!$value) {
+      return null;
+    }
+
+    $value = (array)$value;
+    $value = array_fuse($value);
+
+    if (!isset($value[$viewer_phid])) {
+      return null;
+    }
+
+    return $this->renderStamp($this->getKey());
+  }
+
+}
diff --git a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
index f0512e91f1..7867f098f1 100644
--- a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
+++ b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
@@ -39,11 +39,14 @@ public function loadHandles(
     foreach ($handles as $phid => $handle) {
       $user = $objects[$phid];
       $realname = $user->getRealName();
-
-      $handle->setName($user->getUsername());
-      $handle->setURI('/p/'.$user->getUsername().'/');
-      $handle->setFullName($user->getFullName());
-      $handle->setImageURI($user->getProfileImageURI());
+      $username = $user->getUsername();
+
+      $handle
+        ->setName($username)
+        ->setURI('/p/'.$username.'/')
+        ->setFullName($user->getFullName())
+        ->setImageURI($user->getProfileImageURI())
+        ->setMailStampName('@'.$username);
 
       if ($user->getIsMailingList()) {
         $handle->setIcon('fa-envelope-o');
diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php
index 1e6812b53b..ba93dbcead 100644
--- a/src/applications/phid/PhabricatorObjectHandle.php
+++ b/src/applications/phid/PhabricatorObjectHandle.php
@@ -31,6 +31,7 @@ final class PhabricatorObjectHandle
   private $subtitle;
   private $tokenIcon;
   private $commandLineObjectName;
+  private $mailStampName;
 
   private $stateIcon;
   private $stateColor;
@@ -134,6 +135,15 @@ public function getObjectName() {
     return $this->objectName;
   }
 
+  public function setMailStampName($mail_stamp_name) {
+    $this->mailStampName = $mail_stamp_name;
+    return $this;
+  }
+
+  public function getMailStampName() {
+    return $this->mailStampName;
+  }
+
   public function setURI($uri) {
     $this->uri = $uri;
     return $this;
diff --git a/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
index 3aa6088780..9247966d75 100644
--- a/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
+++ b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
@@ -45,11 +45,12 @@ public function loadHandles(
 
       if (strlen($slug)) {
         $handle->setObjectName('#'.$slug);
+        $handle->setMailStampName('#'.$slug);
         $handle->setURI("/tag/{$slug}/");
       } else {
         // We set the name to the project's PHID to avoid a parse error when a
         // project has no hashtag (as is the case with milestones by default).
-        // See T12659 for more details
+        // See T12659 for more details.
         $handle->setCommandLineObjectName($project->getPHID());
         $handle->setURI("/project/view/{$id}/");
       }
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 47b975c093..f82cd91701 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -179,7 +179,7 @@ public function getIsNewObject() {
     return $this->isNewObject;
   }
 
-  protected function getMentionedPHIDs() {
+  public function getMentionedPHIDs() {
     return $this->mentionedPHIDs;
   }
 
@@ -201,6 +201,10 @@ public function getIsSilent() {
     return $this->silent;
   }
 
+  public function getMustEncrypt() {
+    return $this->mustEncrypt;
+  }
+
   public function setIsInverseEdgeEditor($is_inverse_edge_editor) {
     $this->isInverseEdgeEditor = $is_inverse_edge_editor;
     return $this;
diff --git a/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php
new file mode 100644
index 0000000000..acfc7ec833
--- /dev/null
+++ b/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php
@@ -0,0 +1,81 @@
+<?php
+
+final class PhabricatorEditorMailEngineExtension
+  extends PhabricatorMailEngineExtension {
+
+  const EXTENSIONKEY = 'editor';
+
+  public function supportsObject($object) {
+    return true;
+  }
+
+  public function newMailStampTemplates($object) {
+    $templates = array();
+
+    $templates[] = id(new PhabricatorPHIDMailStamp())
+      ->setKey('actor')
+      ->setLabel(pht('Acting User'));
+
+    $templates[] = id(new PhabricatorStringMailStamp())
+      ->setKey('via')
+      ->setLabel(pht('Via Content Source'));
+
+    $templates[] = id(new PhabricatorBoolMailStamp())
+      ->setKey('silent')
+      ->setLabel(pht('Silent Edit'));
+
+    $templates[] = id(new PhabricatorBoolMailStamp())
+      ->setKey('encrypted')
+      ->setLabel(pht('Encryption Required'));
+
+    $templates[] = id(new PhabricatorBoolMailStamp())
+      ->setKey('new')
+      ->setLabel(pht('New Object'));
+
+    $templates[] = id(new PhabricatorPHIDMailStamp())
+      ->setKey('mention')
+      ->setLabel(pht('Mentioned User'));
+
+    $templates[] = id(new PhabricatorViewerMailStamp())
+      ->setKey('self-actor')
+      ->setLabel(pht('You Acted'));
+
+    $templates[] = id(new PhabricatorViewerMailStamp())
+      ->setKey('self-mention')
+      ->setLabel(pht('You Were Mentioned'));
+
+    return $templates;
+  }
+
+  public function newMailStamps($object, array $xactions) {
+    $editor = $this->getEditor();
+    $viewer = $this->getViewer();
+
+    $this->getMailStamp('actor')
+      ->setValue($editor->getActingAsPHID());
+
+    $content_source = $editor->getContentSource();
+    $this->getMailStamp('via')
+      ->setValue($content_source->getSourceTypeConstant());
+
+    $this->getMailStamp('silent')
+      ->setValue($editor->getIsSilent());
+
+    $this->getMailStamp('encrypted')
+      ->setValue($editor->getMustEncrypt());
+
+    $this->getMailStamp('new')
+      ->setValue($editor->getIsNewObject());
+
+    $mentioned_phids = $editor->getMentionedPHIDs();
+    $this->getMailStamp('mention')
+      ->setValue($mentioned_phids);
+
+    $this->getMailStamp('self-actor')
+      ->setValue($editor->getActingAsPHID());
+
+    $this->getMailStamp('self-mention')
+      ->setValue($mentioned_phids);
+  }
+
+}

From 7d475eb09af74b42da52ca258d2fbf130fca6a3e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 11:09:36 -0800
Subject: [PATCH 483/865] Add more mail stamps: tasks, subscribers, projects,
 spaces

Summary: Ref T13053. Adds task stamps plus the major infrastructure applications.

Test Plan: {F5413058}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18996
---
 src/__phutil_library_map__.php                |  8 +++
 .../ManiphestMailEngineExtension.php          | 58 +++++++++++++++++++
 .../phid/PhabricatorOwnersPackagePHIDType.php |  1 +
 ...PhabricatorProjectsMailEngineExtension.php | 32 ++++++++++
 .../PhabricatorSpacesMailEngineExtension.php  | 35 +++++++++++
 .../PhabricatorSpacesNamespacePHIDType.php    |  8 ++-
 ...icatorSubscriptionsMailEngineExtension.php | 32 ++++++++++
 7 files changed, 171 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/maniphest/engineextension/ManiphestMailEngineExtension.php
 create mode 100644 src/applications/project/engineextension/PhabricatorProjectsMailEngineExtension.php
 create mode 100644 src/applications/spaces/engineextension/PhabricatorSpacesMailEngineExtension.php
 create mode 100644 src/applications/subscriptions/engineextension/PhabricatorSubscriptionsMailEngineExtension.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2a84849171..4742ce410e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1528,6 +1528,7 @@
     'ManiphestGetTaskTransactionsConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php',
     'ManiphestHovercardEngineExtension' => 'applications/maniphest/engineextension/ManiphestHovercardEngineExtension.php',
     'ManiphestInfoConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestInfoConduitAPIMethod.php',
+    'ManiphestMailEngineExtension' => 'applications/maniphest/engineextension/ManiphestMailEngineExtension.php',
     'ManiphestNameIndex' => 'applications/maniphest/storage/ManiphestNameIndex.php',
     'ManiphestPointsConfigType' => 'applications/maniphest/config/ManiphestPointsConfigType.php',
     'ManiphestPrioritiesConfigType' => 'applications/maniphest/config/ManiphestPrioritiesConfigType.php',
@@ -3853,6 +3854,7 @@
     'PhabricatorProjectsEditField' => 'applications/transactions/editfield/PhabricatorProjectsEditField.php',
     'PhabricatorProjectsExportEngineExtension' => 'infrastructure/export/engine/PhabricatorProjectsExportEngineExtension.php',
     'PhabricatorProjectsFulltextEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php',
+    'PhabricatorProjectsMailEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsMailEngineExtension.php',
     'PhabricatorProjectsMembersSearchEngineAttachment' => 'applications/project/engineextension/PhabricatorProjectsMembersSearchEngineAttachment.php',
     'PhabricatorProjectsMembershipIndexEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php',
     'PhabricatorProjectsPolicyRule' => 'applications/project/policyrule/PhabricatorProjectsPolicyRule.php',
@@ -4146,6 +4148,7 @@
     'PhabricatorSpacesExportEngineExtension' => 'infrastructure/export/engine/PhabricatorSpacesExportEngineExtension.php',
     'PhabricatorSpacesInterface' => 'applications/spaces/interface/PhabricatorSpacesInterface.php',
     'PhabricatorSpacesListController' => 'applications/spaces/controller/PhabricatorSpacesListController.php',
+    'PhabricatorSpacesMailEngineExtension' => 'applications/spaces/engineextension/PhabricatorSpacesMailEngineExtension.php',
     'PhabricatorSpacesNamespace' => 'applications/spaces/storage/PhabricatorSpacesNamespace.php',
     'PhabricatorSpacesNamespaceArchiveTransaction' => 'applications/spaces/xaction/PhabricatorSpacesNamespaceArchiveTransaction.php',
     'PhabricatorSpacesNamespaceDatasource' => 'applications/spaces/typeahead/PhabricatorSpacesNamespaceDatasource.php',
@@ -4230,6 +4233,7 @@
     'PhabricatorSubscriptionsFulltextEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php',
     'PhabricatorSubscriptionsHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsHeraldAction.php',
     'PhabricatorSubscriptionsListController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsListController.php',
+    'PhabricatorSubscriptionsMailEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsMailEngineExtension.php',
     'PhabricatorSubscriptionsRemoveSelfHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSelfHeraldAction.php',
     'PhabricatorSubscriptionsRemoveSubscribersHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSubscribersHeraldAction.php',
     'PhabricatorSubscriptionsSearchEngineAttachment' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineAttachment.php',
@@ -6795,6 +6799,7 @@
     'ManiphestGetTaskTransactionsConduitAPIMethod' => 'ManiphestConduitAPIMethod',
     'ManiphestHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
     'ManiphestInfoConduitAPIMethod' => 'ManiphestConduitAPIMethod',
+    'ManiphestMailEngineExtension' => 'PhabricatorMailEngineExtension',
     'ManiphestNameIndex' => 'ManiphestDAO',
     'ManiphestPointsConfigType' => 'PhabricatorJSONConfigType',
     'ManiphestPrioritiesConfigType' => 'PhabricatorJSONConfigType',
@@ -9482,6 +9487,7 @@
     'PhabricatorProjectsEditField' => 'PhabricatorTokenizerEditField',
     'PhabricatorProjectsExportEngineExtension' => 'PhabricatorExportEngineExtension',
     'PhabricatorProjectsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
+    'PhabricatorProjectsMailEngineExtension' => 'PhabricatorMailEngineExtension',
     'PhabricatorProjectsMembersSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'PhabricatorProjectsMembershipIndexEngineExtension' => 'PhabricatorIndexEngineExtension',
     'PhabricatorProjectsPolicyRule' => 'PhabricatorPolicyRule',
@@ -9851,6 +9857,7 @@
     'PhabricatorSpacesExportEngineExtension' => 'PhabricatorExportEngineExtension',
     'PhabricatorSpacesInterface' => 'PhabricatorPHIDInterface',
     'PhabricatorSpacesListController' => 'PhabricatorSpacesController',
+    'PhabricatorSpacesMailEngineExtension' => 'PhabricatorMailEngineExtension',
     'PhabricatorSpacesNamespace' => array(
       'PhabricatorSpacesDAO',
       'PhabricatorPolicyInterface',
@@ -9941,6 +9948,7 @@
     'PhabricatorSubscriptionsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
     'PhabricatorSubscriptionsHeraldAction' => 'HeraldAction',
     'PhabricatorSubscriptionsListController' => 'PhabricatorController',
+    'PhabricatorSubscriptionsMailEngineExtension' => 'PhabricatorMailEngineExtension',
     'PhabricatorSubscriptionsRemoveSelfHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
     'PhabricatorSubscriptionsRemoveSubscribersHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
     'PhabricatorSubscriptionsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
diff --git a/src/applications/maniphest/engineextension/ManiphestMailEngineExtension.php b/src/applications/maniphest/engineextension/ManiphestMailEngineExtension.php
new file mode 100644
index 0000000000..ee38bdf604
--- /dev/null
+++ b/src/applications/maniphest/engineextension/ManiphestMailEngineExtension.php
@@ -0,0 +1,58 @@
+<?php
+
+final class ManiphestMailEngineExtension
+  extends PhabricatorMailEngineExtension {
+
+  const EXTENSIONKEY = 'maniphest';
+
+  public function supportsObject($object) {
+    return ($object instanceof ManiphestTask);
+  }
+
+  public function newMailStampTemplates($object) {
+    return array(
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('author')
+        ->setLabel(pht('Author')),
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('task-owner')
+        ->setLabel(pht('Task Owner')),
+      id(new PhabricatorBoolMailStamp())
+        ->setKey('task-unassigned')
+        ->setLabel(pht('Task Unassigned')),
+      id(new PhabricatorStringMailStamp())
+        ->setKey('task-priority')
+        ->setLabel(pht('Task Priority')),
+      id(new PhabricatorStringMailStamp())
+        ->setKey('task-status')
+        ->setLabel(pht('Task Status')),
+      id(new PhabricatorStringMailStamp())
+        ->setKey('subtype')
+        ->setLabel(pht('Subtype')),
+    );
+  }
+
+  public function newMailStamps($object, array $xactions) {
+    $editor = $this->getEditor();
+    $viewer = $this->getViewer();
+
+    $this->getMailStamp('author')
+      ->setValue($object->getAuthorPHID());
+
+    $this->getMailStamp('task-owner')
+      ->setValue($object->getOwnerPHID());
+
+    $this->getMailStamp('task-unassigned')
+      ->setValue(!$object->getOwnerPHID());
+
+    $this->getMailStamp('task-priority')
+      ->setValue($object->getPriority());
+
+    $this->getMailStamp('task-status')
+      ->setValue($object->getStatus());
+
+    $this->getMailStamp('subtype')
+      ->setValue($object->getSubtype());
+  }
+
+}
diff --git a/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php b/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
index cfbaf6eeb2..fbff6a2103 100644
--- a/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
+++ b/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
@@ -45,6 +45,7 @@ public function loadHandles(
         ->setName($monogram)
         ->setFullName("{$monogram}: {$name}")
         ->setCommandLineObjectName("{$monogram} {$name}")
+        ->setMailStampName($monogram)
         ->setURI($uri);
 
       if ($package->isArchived()) {
diff --git a/src/applications/project/engineextension/PhabricatorProjectsMailEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsMailEngineExtension.php
new file mode 100644
index 0000000000..6f92f87b11
--- /dev/null
+++ b/src/applications/project/engineextension/PhabricatorProjectsMailEngineExtension.php
@@ -0,0 +1,32 @@
+<?php
+
+final class PhabricatorProjectsMailEngineExtension
+  extends PhabricatorMailEngineExtension {
+
+  const EXTENSIONKEY = 'projects';
+
+  public function supportsObject($object) {
+    return ($object instanceof PhabricatorProjectInterface);
+  }
+
+  public function newMailStampTemplates($object) {
+    return array(
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('tag')
+        ->setLabel(pht('Tagged with Project')),
+    );
+  }
+
+  public function newMailStamps($object, array $xactions) {
+    $editor = $this->getEditor();
+    $viewer = $this->getViewer();
+
+    $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
+      $object->getPHID(),
+      PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
+
+    $this->getMailStamp('tag')
+      ->setValue($project_phids);
+  }
+
+}
diff --git a/src/applications/spaces/engineextension/PhabricatorSpacesMailEngineExtension.php b/src/applications/spaces/engineextension/PhabricatorSpacesMailEngineExtension.php
new file mode 100644
index 0000000000..7ddbda05fe
--- /dev/null
+++ b/src/applications/spaces/engineextension/PhabricatorSpacesMailEngineExtension.php
@@ -0,0 +1,35 @@
+<?php
+
+final class PhabricatorSpacesMailEngineExtension
+  extends PhabricatorMailEngineExtension {
+
+  const EXTENSIONKEY = 'spaces';
+
+  public function supportsObject($object) {
+    return ($object instanceof PhabricatorSpacesInterface);
+  }
+
+  public function newMailStampTemplates($object) {
+    return array(
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('space')
+        ->setLabel(pht('Space')),
+    );
+  }
+
+  public function newMailStamps($object, array $xactions) {
+    $editor = $this->getEditor();
+    $viewer = $this->getViewer();
+
+    if (!PhabricatorSpacesNamespaceQuery::getSpacesExist()) {
+      return;
+    }
+
+    $space_phid = PhabricatorSpacesNamespaceQuery::getObjectSpacePHID(
+      $object);
+
+    $this->getMailStamp('space')
+      ->setValue($space_phid);
+  }
+
+}
diff --git a/src/applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php b/src/applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php
index 86371d6420..1399e71c8e 100644
--- a/src/applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php
+++ b/src/applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php
@@ -36,9 +36,11 @@ public function loadHandles(
       $monogram = $namespace->getMonogram();
       $name = $namespace->getNamespaceName();
 
-      $handle->setName($name);
-      $handle->setFullName(pht('%s %s', $monogram, $name));
-      $handle->setURI('/'.$monogram);
+      $handle
+        ->setName($name)
+        ->setFullName(pht('%s %s', $monogram, $name))
+        ->setURI('/'.$monogram)
+        ->setMailStampName($monogram);
 
       if ($namespace->getIsArchived()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
diff --git a/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsMailEngineExtension.php b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsMailEngineExtension.php
new file mode 100644
index 0000000000..122fad4b0d
--- /dev/null
+++ b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsMailEngineExtension.php
@@ -0,0 +1,32 @@
+<?php
+
+final class PhabricatorSubscriptionsMailEngineExtension
+  extends PhabricatorMailEngineExtension {
+
+  const EXTENSIONKEY = 'subscriptions';
+
+  public function supportsObject($object) {
+    return ($object instanceof PhabricatorSubscribableInterface);
+  }
+
+  public function newMailStampTemplates($object) {
+    return array(
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('subscriber')
+        ->setLabel(pht('Subscriber')),
+    );
+  }
+
+  public function newMailStamps($object, array $xactions) {
+    $editor = $this->getEditor();
+    $viewer = $this->getViewer();
+
+    $subscriber_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
+      $object->getPHID(),
+      PhabricatorObjectHasSubscriberEdgeType::EDGECONST);
+
+    $this->getMailStamp('subscriber')
+      ->setValue($subscriber_phids);
+  }
+
+}

From 1bf64e5cbcf48adf05ef60cb9eb948d4056092b2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 11:44:31 -0800
Subject: [PATCH 484/865] Add Differential and Herald mail stamps and some
 refinements

Summary:
Ref T13053. Adds revision stamps (status, reviewers, etc). Adds Herald rule stamps, like the existing X-Herald-Rules header.

Removes the "self" stamps, since you can just write a rule against `whatever(@epriestley)` equivalently. If there's routing logic around this, it can live in the routing layer. This avoids tons of self-actor, self-mention, self-reviewer, self-blocking-reviewer, self-resigned-reviewer, etc., stamps.

Use `natcasesort()` instead of `sort()` so that numeric values (like monograms) sort `9, 80, 700` instead of `700, 80, 9`.

Remove the commas from rendering since they don't really add anything.

Test Plan: Edited tasks and revisions, looked at mail stamps, saw stamps that looked pretty reasonable (with no more self stuff, no more commas, sorting numbers, and Herald stamps).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18997
---
 src/__phutil_library_map__.php                |  4 +-
 .../DifferentialMailEngineExtension.php       | 80 +++++++++++++++++++
 .../storage/DifferentialReviewer.php          |  5 ++
 .../replyhandler/PhabricatorMailTarget.php    |  4 +-
 .../stamp/PhabricatorStringMailStamp.php      | 14 +++-
 .../stamp/PhabricatorViewerMailStamp.php      | 35 --------
 ...habricatorRepositoryRepositoryPHIDType.php |  8 +-
 ...habricatorApplicationTransactionEditor.php | 21 ++++-
 .../PhabricatorEditorMailEngineExtension.php  | 17 ++--
 9 files changed, 131 insertions(+), 57 deletions(-)
 create mode 100644 src/applications/differential/engineextension/DifferentialMailEngineExtension.php
 delete mode 100644 src/applications/metamta/stamp/PhabricatorViewerMailStamp.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4742ce410e..c642f13f90 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -487,6 +487,7 @@
     'DifferentialLintField' => 'applications/differential/customfield/DifferentialLintField.php',
     'DifferentialLintStatus' => 'applications/differential/constants/DifferentialLintStatus.php',
     'DifferentialLocalCommitsView' => 'applications/differential/view/DifferentialLocalCommitsView.php',
+    'DifferentialMailEngineExtension' => 'applications/differential/engineextension/DifferentialMailEngineExtension.php',
     'DifferentialMailView' => 'applications/differential/mail/DifferentialMailView.php',
     'DifferentialManiphestTasksField' => 'applications/differential/customfield/DifferentialManiphestTasksField.php',
     'DifferentialModernHunk' => 'applications/differential/storage/DifferentialModernHunk.php',
@@ -4402,7 +4403,6 @@
     'PhabricatorVersionedDraft' => 'applications/draft/storage/PhabricatorVersionedDraft.php',
     'PhabricatorVeryWowEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorVeryWowEnglishTranslation.php',
     'PhabricatorViewerDatasource' => 'applications/people/typeahead/PhabricatorViewerDatasource.php',
-    'PhabricatorViewerMailStamp' => 'applications/metamta/stamp/PhabricatorViewerMailStamp.php',
     'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php',
     'PhabricatorWebContentSource' => 'infrastructure/contentsource/PhabricatorWebContentSource.php',
     'PhabricatorWebServerSetupCheck' => 'applications/config/check/PhabricatorWebServerSetupCheck.php',
@@ -5612,6 +5612,7 @@
     'DifferentialLintField' => 'DifferentialHarbormasterField',
     'DifferentialLintStatus' => 'Phobject',
     'DifferentialLocalCommitsView' => 'AphrontView',
+    'DifferentialMailEngineExtension' => 'PhabricatorMailEngineExtension',
     'DifferentialMailView' => 'Phobject',
     'DifferentialManiphestTasksField' => 'DifferentialCoreCustomField',
     'DifferentialModernHunk' => 'DifferentialHunk',
@@ -10152,7 +10153,6 @@
     'PhabricatorVersionedDraft' => 'PhabricatorDraftDAO',
     'PhabricatorVeryWowEnglishTranslation' => 'PhutilTranslation',
     'PhabricatorViewerDatasource' => 'PhabricatorTypeaheadDatasource',
-    'PhabricatorViewerMailStamp' => 'PhabricatorMailStamp',
     'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorWebContentSource' => 'PhabricatorContentSource',
     'PhabricatorWebServerSetupCheck' => 'PhabricatorSetupCheck',
diff --git a/src/applications/differential/engineextension/DifferentialMailEngineExtension.php b/src/applications/differential/engineextension/DifferentialMailEngineExtension.php
new file mode 100644
index 0000000000..24aa9fb329
--- /dev/null
+++ b/src/applications/differential/engineextension/DifferentialMailEngineExtension.php
@@ -0,0 +1,80 @@
+<?php
+
+final class DifferentialMailEngineExtension
+  extends PhabricatorMailEngineExtension {
+
+  const EXTENSIONKEY = 'differential';
+
+  public function supportsObject($object) {
+    return ($object instanceof DifferentialRevision);
+  }
+
+  public function newMailStampTemplates($object) {
+    return array(
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('author')
+        ->setLabel(pht('Author')),
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('reviewer')
+        ->setLabel(pht('Reviewer')),
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('blocking-reviewer')
+        ->setLabel(pht('Reviewer')),
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('resigned-reviewer')
+        ->setLabel(pht('Reviewer')),
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('revision-repository')
+        ->setLabel(pht('Revision Repository')),
+      id(new PhabricatorPHIDMailStamp())
+        ->setKey('revision-status')
+        ->setLabel(pht('Revision Status')),
+    );
+  }
+
+  public function newMailStamps($object, array $xactions) {
+    $editor = $this->getEditor();
+    $viewer = $this->getViewer();
+
+    $revision = id(new DifferentialRevisionQuery())
+      ->setViewer($viewer)
+      ->needReviewers(true)
+      ->withPHIDs(array($object->getPHID()))
+      ->executeOne();
+
+    $reviewers = array();
+    $blocking = array();
+    $resigned = array();
+    foreach ($revision->getReviewers() as $reviewer) {
+      $reviewer_phid = $reviewer->getReviewerPHID();
+
+      if ($reviewer->isResigned()) {
+        $resigned[] = $reviewer_phid;
+      } else {
+        $reviewers[] = $reviewer_phid;
+        if ($reviewer->isBlocking()) {
+          $reviewers[] = $blocking;
+        }
+      }
+    }
+
+    $this->getMailStamp('author')
+      ->setValue($revision->getAuthorPHID());
+
+    $this->getMailStamp('reviewer')
+      ->setValue($reviewers);
+
+    $this->getMailStamp('blocking-reviewer')
+      ->setValue($blocking);
+
+    $this->getMailStamp('resigned-reviewer')
+      ->setValue($resigned);
+
+    $this->getMailStamp('revision-repository')
+      ->setValue($revision->getRepositoryPHID());
+
+    $this->getMailStamp('revision-status')
+      ->setValue($revision->getModernRevisionStatus());
+  }
+
+}
diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewer.php
index 9df149e788..e3f9bdaf8d 100644
--- a/src/applications/differential/storage/DifferentialReviewer.php
+++ b/src/applications/differential/storage/DifferentialReviewer.php
@@ -69,6 +69,11 @@ public function isResigned() {
     return ($this->getReviewerStatus() == $status_resigned);
   }
 
+  public function isBlocking() {
+    $status_blocking = DifferentialReviewerStatus::STATUS_BLOCKING;
+    return ($this->getReviewerStatus() == $status_blocking);
+  }
+
   public function isRejected($diff_phid) {
     $status_rejected = DifferentialReviewerStatus::STATUS_REJECTED;
 
diff --git a/src/applications/metamta/replyhandler/PhabricatorMailTarget.php b/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
index 0463b6cdd7..bbf17be3fd 100644
--- a/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
+++ b/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
@@ -70,14 +70,14 @@ public function willSendMail(PhabricatorMetaMTAMail $mail) {
       $body .= "\n";
       $body .= pht('STAMPS');
       $body .= "\n";
-      $body .= implode(', ', $stamps);
+      $body .= implode(' ', $stamps);
       $body .= "\n";
 
       if ($has_html) {
         $html = array();
         $html[] = phutil_tag('strong', array(), pht('STAMPS'));
         $html[] = phutil_tag('br');
-        $html[] = phutil_implode_html(', ', $stamps);
+        $html[] = phutil_implode_html(' ', $stamps);
         $html[] = phutil_tag('br');
         $html = phutil_tag('div', array(), $html);
         $html_body .= hsprintf('%s', $html);
diff --git a/src/applications/metamta/stamp/PhabricatorStringMailStamp.php b/src/applications/metamta/stamp/PhabricatorStringMailStamp.php
index 98d472ad48..b6210afb4e 100644
--- a/src/applications/metamta/stamp/PhabricatorStringMailStamp.php
+++ b/src/applications/metamta/stamp/PhabricatorStringMailStamp.php
@@ -6,11 +6,21 @@ final class PhabricatorStringMailStamp
   const STAMPTYPE = 'string';
 
   public function renderStamps($value) {
-    if (!strlen($value)) {
+    if ($value === null || $value === '') {
       return null;
     }
 
-    return $this->renderStamp($this->getKey(), $value);
+    $value = (array)$value;
+    if (!$value) {
+      return null;
+    }
+
+    $results = array();
+    foreach ($value as $v) {
+      $results[] = $this->renderStamp($this->getKey(), $v);
+    }
+
+    return $results;
   }
 
 }
diff --git a/src/applications/metamta/stamp/PhabricatorViewerMailStamp.php b/src/applications/metamta/stamp/PhabricatorViewerMailStamp.php
deleted file mode 100644
index 4eb2028ed8..0000000000
--- a/src/applications/metamta/stamp/PhabricatorViewerMailStamp.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-final class PhabricatorViewerMailStamp
-  extends PhabricatorMailStamp {
-
-  const STAMPTYPE = 'viewer';
-
-  public function renderStamps($value) {
-    // If we're sending one mail to everyone, we never include viewer-based
-    // stamps since they'll only be accurate for one recipient. Recipients
-    // can still use the corresponding stamps with their usernames or PHIDs.
-    if (!PhabricatorMetaMTAMail::shouldMailEachRecipient()) {
-      return null;
-    }
-
-    $viewer_phid = $this->getViewer()->getPHID();
-    if (!$viewer_phid) {
-      return null;
-    }
-
-    if (!$value) {
-      return null;
-    }
-
-    $value = (array)$value;
-    $value = array_fuse($value);
-
-    if (!isset($value[$viewer_phid])) {
-      return null;
-    }
-
-    return $this->renderStamp($this->getKey());
-  }
-
-}
diff --git a/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
index c938b31a65..ba78b0fe7a 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
@@ -41,9 +41,11 @@ public function loadHandles(
       $name = $repository->getName();
       $uri = $repository->getURI();
 
-      $handle->setName($monogram);
-      $handle->setFullName("{$monogram} {$name}");
-      $handle->setURI($uri);
+      $handle
+        ->setName($monogram)
+        ->setFullName("{$monogram} {$name}")
+        ->setURI($uri)
+        ->setMailStampName($monogram);
     }
   }
 
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index f82cd91701..ac4d56ba16 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -205,6 +205,25 @@ public function getMustEncrypt() {
     return $this->mustEncrypt;
   }
 
+  public function getHeraldRuleMonograms() {
+    // Convert the stored "<123>, <456>" string into a list: "H123", "H456".
+    $list = $this->heraldHeader;
+    $list = preg_split('/[, ]+/', $list);
+
+    foreach ($list as $key => $item) {
+      $item = trim($item, '<>');
+
+      if (!is_numeric($item)) {
+        unset($list[$key]);
+        continue;
+      }
+
+      $list[$key] = 'H'.$item;
+    }
+
+    return $list;
+  }
+
   public function setIsInverseEdgeEditor($is_inverse_edge_editor) {
     $this->isInverseEdgeEditor = $is_inverse_edge_editor;
     return $this;
@@ -4109,7 +4128,7 @@ private function generateMailStamps($object, $data) {
       }
     }
 
-    sort($results);
+    natcasesort($results);
 
     return $results;
   }
diff --git a/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php
index acfc7ec833..29d10d641f 100644
--- a/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php
@@ -36,13 +36,9 @@ public function newMailStampTemplates($object) {
       ->setKey('mention')
       ->setLabel(pht('Mentioned User'));
 
-    $templates[] = id(new PhabricatorViewerMailStamp())
-      ->setKey('self-actor')
-      ->setLabel(pht('You Acted'));
-
-    $templates[] = id(new PhabricatorViewerMailStamp())
-      ->setKey('self-mention')
-      ->setLabel(pht('You Were Mentioned'));
+    $templates[] = id(new PhabricatorStringMailStamp())
+      ->setKey('herald')
+      ->setLabel(pht('Herald Rule'));
 
     return $templates;
   }
@@ -71,11 +67,8 @@ public function newMailStamps($object, array $xactions) {
     $this->getMailStamp('mention')
       ->setValue($mentioned_phids);
 
-    $this->getMailStamp('self-actor')
-      ->setValue($editor->getActingAsPHID());
-
-    $this->getMailStamp('self-mention')
-      ->setValue($mentioned_phids);
+    $this->getMailStamp('herald')
+      ->setValue($editor->getHeraldRuleMonograms());
   }
 
 }

From 4c14dd1e8925677f407b5ef4f1bd268a7d460daf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 05:58:21 -0800
Subject: [PATCH 485/865] (stable) Fix a Herald repetition policy selection
 error for rule types which support only one policy

Summary:
Ref T13048. See <https://discourse.phabricator-community.org/t/configuring-commit-hook-commit-content-rules-fail-with-exception/1077/3>.

When a rule supports only one repetition policy (always "every time") like "Commit Hook" rules, we don't render a control for `repetition_policy` and fail to update it when saving.

Before the changes to support the new "if the rule did not match the last time" policy, this workflow just defaulted to "every time" if the input was invalid, but this was changed by accident in D18926 when I removed some of the toInt/toString juggling code.

(This patch also prevents users from fiddling with the form to create a rule which evaluates with an invalid policy; this wasn't validated before.)

Test Plan:
  - Created new "Commit Hook" (only one policy available) rule.
  - Saved existing "Commit Hook" rule.
  - Created new "Task" (multiple policies) rule.
  - Saved existing Task rule.
  - Set task rule to each repetition policy, saved, verified the save worked.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13048

Differential Revision: https://secure.phabricator.com/D18992
---
 .../controller/HeraldRuleController.php       | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
index c61c29e90e..d400f8ae90 100644
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -265,7 +265,15 @@ private function saveRule(HeraldAdapter $adapter, $rule, $request) {
     $new_name = $request->getStr('name');
     $match_all = ($request->getStr('must_match') == 'all');
 
-    $repetition_policy_param = $request->getStr('repetition_policy');
+    $repetition_policy = $request->getStr('repetition_policy');
+
+    // If the user selected an invalid policy, or there's only one possible
+    // value so we didn't render a control, adjust the value to the first
+    // valid policy value.
+    $repetition_options = $this->getRepetitionOptionMap($adapter);
+    if (!isset($repetition_options[$repetition_policy])) {
+      $repetition_policy = head_key($repetition_options);
+    }
 
     $e_name = true;
     $errors = array();
@@ -348,7 +356,7 @@ private function saveRule(HeraldAdapter $adapter, $rule, $request) {
         $match_all,
         $conditions,
         $actions,
-        $repetition_policy_param);
+        $repetition_policy);
 
       $xactions = array();
       $xactions[] = id(new HeraldRuleTransaction())
@@ -373,7 +381,7 @@ private function saveRule(HeraldAdapter $adapter, $rule, $request) {
     // mutate current rule, so it would be sent to the client in the right state
     $rule->setMustMatchAll((int)$match_all);
     $rule->setName($new_name);
-    $rule->setRepetitionPolicyStringConstant($repetition_policy_param);
+    $rule->setRepetitionPolicyStringConstant($repetition_policy);
     $rule->attachConditions($conditions);
     $rule->attachActions($actions);
 
@@ -594,13 +602,9 @@ private function renderMustMatchSelector($rule) {
    */
   private function renderRepetitionSelector($rule, HeraldAdapter $adapter) {
     $repetition_policy = $rule->getRepetitionPolicyStringConstant();
-
-    $repetition_options = $adapter->getRepetitionOptions();
-    $repetition_names = HeraldRule::getRepetitionPolicySelectOptionMap();
-    $repetition_map = array_select_keys($repetition_names, $repetition_options);
-
+    $repetition_map = $this->getRepetitionOptionMap($adapter);
     if (count($repetition_map) < 2) {
-      return head($repetition_names);
+      return head($repetition_map);
     } else {
       return AphrontFormSelectControl::renderSelectTag(
         $repetition_policy,
@@ -611,6 +615,11 @@ private function renderRepetitionSelector($rule, HeraldAdapter $adapter) {
     }
   }
 
+  private function getRepetitionOptionMap(HeraldAdapter $adapter) {
+    $repetition_options = $adapter->getRepetitionOptions();
+    $repetition_names = HeraldRule::getRepetitionPolicySelectOptionMap();
+    return array_select_keys($repetition_names, $repetition_options);
+  }
 
   protected function buildTokenizerTemplates() {
     $template = new AphrontTokenizerTemplateView();

From 56bf0690804fe4c77085b1320df9a5e994d3163c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 04:07:22 -0800
Subject: [PATCH 486/865] Try running Herald when performing inverse edge edits

Summary:
Ref T13053. When you mention one object on another (or link two objects together with an action like "Edit Parent Revisions"), we write a transaction on each side to add the "alice added subtask X" and "alice added parent task Y" items to the timeline.

This behavior now causes problems in T13053 with the "Must Encrypt" flag because it prevents the flag from being applied to the corresponding "inverse edge" mail.

This was added in rP5050389f as a quick workaround for a fatal related to Editors not having enough data to apply Herald on mentions. However, that was in 2014, and since then:

  - Herald got a significant rewrite to modularize all the rules and adapters.
  - Editing got a significant upgrade in EditEngine and most edit workflows now operate through EditEngine.
  - We generally do more editing on more pathways, everything is more modular, and we have standardized how data is loaded to a greater degree.

I suspect there's no longer a problem with just running Herald here, and can't reproduce one. If anything does crop up, it's probably easy (and desirable) to fix it.

This makes Herald fire a little more often: if someone writes a rule, mentioning or creating a relationship to old tasks will now make the rule act. Offhand, that seems fine. If it turns out to be weird, we can probably tailor Herald's behavior.

Test Plan:
I wasn't able to break anything:

  - Mentioned a task on another task (original issue).
  - Linked tasks with commits, mocks, revisions.
  - Linked revisions with commits, tasks.
  - Mentioned users, revisions, and commits.
  - Verified that mail generated by creating links (e.g., Revision > Edit Tasks) now gets the "Must Encrypt" flag properly.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D18999
---
 .../editor/PhabricatorApplicationTransactionEditor.php     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index ac4d56ba16..c5390de362 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -1095,13 +1095,6 @@ final public function applyTransactions(
       // We are the Herald editor, so stop work here and return the updated
       // transactions.
       return $xactions;
-    } else if ($this->getIsInverseEdgeEditor()) {
-      // If we're applying inverse edge transactions, don't trigger Herald.
-      // From a product perspective, the current set of inverse edges (most
-      // often, mentions) aren't things users would expect to trigger Herald.
-      // From a technical perspective, objects loaded by the inverse editor may
-      // not have enough data to execute rules. At least for now, just stop
-      // Herald from executing when applying inverse edges.
     } else if ($this->shouldApplyHeraldRules($object, $xactions)) {
       // We are not the Herald editor, so try to apply Herald rules.
       $herald_xactions = $this->applyHeraldRules($object, $xactions);

From a5bbadbaba0259350ccc6f6a86786373e935aee5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 16:00:45 -0800
Subject: [PATCH 487/865] Fix another Git 2.16.0 CLI compatibility issue

Summary:
This command also needs a "." instead of an empty string now.

(This powers the file browser typeahead in Diffusion.)

Test Plan: Will test in production since there's still no easy 2.16 installer for macOS.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19010
---
 .../conduit/DiffusionQueryPathsConduitAPIMethod.php         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
index be2f07f2c6..09c07ec28f 100644
--- a/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
@@ -37,7 +37,11 @@ protected function getGitResult(ConduitAPIRequest $request) {
     $commit = $request->getValue('commit');
     $repository = $drequest->getRepository();
 
-    // http://comments.gmane.org/gmane.comp.version-control.git/197735
+    // Recent versions of Git don't work if you pass the empty string, and
+    // require "." to list everything.
+    if (!strlen($path)) {
+      $path = '.';
+    }
 
     $future = $repository->getLocalCommandFuture(
       'ls-tree --name-only -r -z %s -- %s',

From 150a04791c06c91ab587fe11ea2a50ba8b40cd45 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 05:43:37 -0800
Subject: [PATCH 488/865] Fix bad NUX link in Legalpad search view

Summary:
See <https://discourse.phabricator-community.org/t/clicking-the-create-a-document-button-on-fresly-installed-phabricators-legalpad-results-in-404/1088>.

This URI isn't correct.

Test Plan: Visited {nav Use Results > New User State} in developer mode, clicked green button. Before: 404. After: taken to the edit screen.

Differential Revision: https://secure.phabricator.com/D19024
---
 .../legalpad/query/LegalpadDocumentSearchEngine.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
index 1b608b02e3..a245417483 100644
--- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
+++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
@@ -176,7 +176,7 @@ protected function getNewUserBody() {
     $create_button = id(new PHUIButtonView())
       ->setTag('a')
       ->setText(pht('Create a Document'))
-      ->setHref('/legalpad/create/')
+      ->setHref('/legalpad/edit/')
       ->setColor(PHUIButtonView::GREEN);
 
     $icon = $this->getApplication()->getIcon();

From 1485debcbda2bae25884dbd54055ccb3fecd9580 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 14:22:54 -0800
Subject: [PATCH 489/865] Prepare mail transmission to support failover across
 multiple mailers

Summary:
Ref T13053. Ref T12677. This restructures the calls and error handling logic so that we can pass in a list of multiple mailers and get retry logic.

This doesn't actually ever use multiple mailers yet, and shouldn't change any behavior. I'll add multiple-mailer coverage a little further in, since there's currently no way to effectively test which of several mailers ended up transmitting a message.

Test Plan:
  - This has test coverage; tests still pass.
  - Poked around locally doing things that send mail, saw mail appear to send. I'm not attached to a real mailer though so my confidence in local testing is only so-so.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053, T12677

Differential Revision: https://secure.phabricator.com/D18998
---
 .../storage/PhabricatorMetaMTAMail.php        | 627 +++++++++---------
 .../PhabricatorMetaMTAMailTestCase.php        |   8 +-
 2 files changed, 334 insertions(+), 301 deletions(-)

diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index f19e5e951a..179eb18088 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -461,359 +461,392 @@ public function buildDefaultMailer() {
   /**
    * Attempt to deliver an email immediately, in this process.
    *
-   * @param bool  Try to deliver this email even if it has already been
-   *              delivered or is in backoff after a failed delivery attempt.
-   * @param PhabricatorMailImplementationAdapter Use a specific mail adapter,
-   *              instead of the default.
-   *
    * @return void
    */
-  public function sendNow(
-    $force_send = false,
-    PhabricatorMailImplementationAdapter $mailer = null) {
-
-    if ($mailer === null) {
-      $mailer = $this->buildDefaultMailer();
+  public function sendNow() {
+    if ($this->getStatus() != PhabricatorMailOutboundStatus::STATUS_QUEUE) {
+      throw new Exception(pht('Trying to send an already-sent mail!'));
     }
 
-    if (!$force_send) {
-      if ($this->getStatus() != PhabricatorMailOutboundStatus::STATUS_QUEUE) {
-        throw new Exception(pht('Trying to send an already-sent mail!'));
+    $mailers = array(
+      $this->buildDefaultMailer(),
+    );
+
+    return $this->sendWithMailers($mailers);
+  }
+
+
+  public function sendWithMailers(array $mailers) {
+    $exceptions = array();
+    foreach ($mailers as $template_mailer) {
+      $mailer = null;
+
+      try {
+        $mailer = $this->buildMailer($template_mailer);
+      } catch (Exception $ex) {
+        $exceptions[] = $ex;
+        continue;
+      }
+
+      if (!$mailer) {
+        // If we don't get a mailer back, that means the mail doesn't
+        // actually need to be sent (for example, because recipients have
+        // declined to receive the mail). Void it and return.
+        return $this
+          ->setStatus(PhabricatorMailOutboundStatus::STATUS_VOID)
+          ->save();
+      }
+
+      try {
+        $ok = $mailer->send();
+        if (!$ok) {
+          // TODO: At some point, we should clean this up and make all mailers
+          // throw.
+          throw new Exception(
+            pht(
+              'Mail adapter encountered an unexpected, unspecified '.
+              'failure.'));
+        }
+      } catch (PhabricatorMetaMTAPermanentFailureException $ex) {
+        // If any mailer raises a permanent failure, stop trying to send the
+        // mail with other mailers.
+        $this
+          ->setStatus(PhabricatorMailOutboundStatus::STATUS_FAIL)
+          ->setMessage($ex->getMessage())
+          ->save();
+
+        throw $ex;
+      } catch (Exception $ex) {
+        $exceptions[] = $ex;
+        continue;
       }
+
+      return $this
+        ->setStatus(PhabricatorMailOutboundStatus::STATUS_SENT)
+        ->save();
     }
 
-    try {
-      $headers = $this->generateHeaders();
+    // If we make it here, no mailer could send the mail but no mailer failed
+    // permanently either. We update the error message for the mail, but leave
+    // it in the current status (usually, STATUS_QUEUE) and try again later.
 
-      $params = $this->parameters;
+    $messages = array();
+    foreach ($exceptions as $ex) {
+      $messages[] = $ex->getMessage();
+    }
+    $messages = implode("\n\n", $messages);
 
-      $actors = $this->loadAllActors();
-      $deliverable_actors = $this->filterDeliverableActors($actors);
+    $this
+      ->setMessage($messages)
+      ->save();
 
-      $default_from = PhabricatorEnv::getEnvConfig('metamta.default-address');
-      if (empty($params['from'])) {
-        $mailer->setFrom($default_from);
-      }
+    if (count($exceptions) === 1) {
+      throw head($exceptions);
+    }
 
-      $is_first = idx($params, 'is-first-message');
-      unset($params['is-first-message']);
+    throw new PhutilAggregateException(
+      pht('Encountered multiple exceptions while transmitting mail.'),
+      $exceptions);
+  }
 
-      $is_threaded = (bool)idx($params, 'thread-id');
-      $must_encrypt = $this->getMustEncrypt();
+  private function buildMailer(PhabricatorMailImplementationAdapter $mailer) {
+    $headers = $this->generateHeaders();
 
-      $reply_to_name = idx($params, 'reply-to-name', '');
-      unset($params['reply-to-name']);
+    $params = $this->parameters;
 
-      $add_cc = array();
-      $add_to = array();
+    $actors = $this->loadAllActors();
+    $deliverable_actors = $this->filterDeliverableActors($actors);
 
-      // If we're sending one mail to everyone, some recipients will be in
-      // "Cc" rather than "To". We'll move them to "To" later (or supply a
-      // dummy "To") but need to look for the recipient in either the
-      // "To" or "Cc" fields here.
-      $target_phid = head(idx($params, 'to', array()));
-      if (!$target_phid) {
-        $target_phid = head(idx($params, 'cc', array()));
-      }
+    $default_from = PhabricatorEnv::getEnvConfig('metamta.default-address');
+    if (empty($params['from'])) {
+      $mailer->setFrom($default_from);
+    }
 
-      $preferences = $this->loadPreferences($target_phid);
+    $is_first = idx($params, 'is-first-message');
+    unset($params['is-first-message']);
 
-      foreach ($params as $key => $value) {
-        switch ($key) {
-          case 'raw-from':
-            list($from_email, $from_name) = $value;
-            $mailer->setFrom($from_email, $from_name);
-            break;
-          case 'from':
-            $from = $value;
-            $actor_email = null;
-            $actor_name = null;
-            $actor = idx($actors, $from);
-            if ($actor) {
-              $actor_email = $actor->getEmailAddress();
-              $actor_name = $actor->getName();
-            }
-            $can_send_as_user = $actor_email &&
-              PhabricatorEnv::getEnvConfig('metamta.can-send-as-user');
-
-            if ($can_send_as_user) {
-              $mailer->setFrom($actor_email, $actor_name);
-            } else {
-              $from_email = coalesce($actor_email, $default_from);
-              $from_name = coalesce($actor_name, pht('Phabricator'));
-
-              if (empty($params['reply-to'])) {
-                $params['reply-to'] = $from_email;
-                $params['reply-to-name'] = $from_name;
-              }
+    $is_threaded = (bool)idx($params, 'thread-id');
+    $must_encrypt = $this->getMustEncrypt();
+
+    $reply_to_name = idx($params, 'reply-to-name', '');
+    unset($params['reply-to-name']);
 
-              $mailer->setFrom($default_from, $from_name);
+    $add_cc = array();
+    $add_to = array();
+
+    // If we're sending one mail to everyone, some recipients will be in
+    // "Cc" rather than "To". We'll move them to "To" later (or supply a
+    // dummy "To") but need to look for the recipient in either the
+    // "To" or "Cc" fields here.
+    $target_phid = head(idx($params, 'to', array()));
+    if (!$target_phid) {
+      $target_phid = head(idx($params, 'cc', array()));
+    }
+
+    $preferences = $this->loadPreferences($target_phid);
+
+    foreach ($params as $key => $value) {
+      switch ($key) {
+        case 'raw-from':
+          list($from_email, $from_name) = $value;
+          $mailer->setFrom($from_email, $from_name);
+          break;
+        case 'from':
+          $from = $value;
+          $actor_email = null;
+          $actor_name = null;
+          $actor = idx($actors, $from);
+          if ($actor) {
+            $actor_email = $actor->getEmailAddress();
+            $actor_name = $actor->getName();
+          }
+          $can_send_as_user = $actor_email &&
+            PhabricatorEnv::getEnvConfig('metamta.can-send-as-user');
+
+          if ($can_send_as_user) {
+            $mailer->setFrom($actor_email, $actor_name);
+          } else {
+            $from_email = coalesce($actor_email, $default_from);
+            $from_name = coalesce($actor_name, pht('Phabricator'));
+
+            if (empty($params['reply-to'])) {
+              $params['reply-to'] = $from_email;
+              $params['reply-to-name'] = $from_name;
             }
+
+            $mailer->setFrom($default_from, $from_name);
+          }
+          break;
+        case 'reply-to':
+          $mailer->addReplyTo($value, $reply_to_name);
+          break;
+        case 'to':
+          $to_phids = $this->expandRecipients($value);
+          $to_actors = array_select_keys($deliverable_actors, $to_phids);
+          $add_to = array_merge(
+            $add_to,
+            mpull($to_actors, 'getEmailAddress'));
+          break;
+        case 'raw-to':
+          $add_to = array_merge($add_to, $value);
+          break;
+        case 'cc':
+          $cc_phids = $this->expandRecipients($value);
+          $cc_actors = array_select_keys($deliverable_actors, $cc_phids);
+          $add_cc = array_merge(
+            $add_cc,
+            mpull($cc_actors, 'getEmailAddress'));
+          break;
+        case 'attachments':
+          $attached_viewer = PhabricatorUser::getOmnipotentUser();
+          $files = $this->loadAttachedFiles($attached_viewer);
+          foreach ($files as $file) {
+            $file->attachToObject($this->getPHID());
+          }
+
+          // If the mail content must be encrypted, don't add attachments.
+          if ($must_encrypt) {
             break;
-          case 'reply-to':
-            $mailer->addReplyTo($value, $reply_to_name);
-            break;
-          case 'to':
-            $to_phids = $this->expandRecipients($value);
-            $to_actors = array_select_keys($deliverable_actors, $to_phids);
-            $add_to = array_merge(
-              $add_to,
-              mpull($to_actors, 'getEmailAddress'));
-            break;
-          case 'raw-to':
-            $add_to = array_merge($add_to, $value);
-            break;
-          case 'cc':
-            $cc_phids = $this->expandRecipients($value);
-            $cc_actors = array_select_keys($deliverable_actors, $cc_phids);
-            $add_cc = array_merge(
-              $add_cc,
-              mpull($cc_actors, 'getEmailAddress'));
-            break;
-          case 'attachments':
-            $attached_viewer = PhabricatorUser::getOmnipotentUser();
-            $files = $this->loadAttachedFiles($attached_viewer);
-            foreach ($files as $file) {
-              $file->attachToObject($this->getPHID());
-            }
+          }
 
-            // If the mail content must be encrypted, don't add attachments.
-            if ($must_encrypt) {
-              break;
-            }
+          $value = $this->getAttachments();
+          foreach ($value as $attachment) {
+            $mailer->addAttachment(
+              $attachment->getData(),
+              $attachment->getFilename(),
+              $attachment->getMimeType());
+          }
+          break;
+        case 'subject':
+          $subject = array();
 
-            $value = $this->getAttachments();
-            foreach ($value as $attachment) {
-              $mailer->addAttachment(
-                $attachment->getData(),
-                $attachment->getFilename(),
-                $attachment->getMimeType());
+          if ($is_threaded) {
+            if ($this->shouldAddRePrefix($preferences)) {
+              $subject[] = 'Re:';
             }
-            break;
-          case 'subject':
-            $subject = array();
+          }
+
+          $subject[] = trim(idx($params, 'subject-prefix'));
 
-            if ($is_threaded) {
-              if ($this->shouldAddRePrefix($preferences)) {
-                $subject[] = 'Re:';
+          // If mail content must be encrypted, we replace the subject with
+          // a generic one.
+          if ($must_encrypt) {
+            $subject[] = pht('Object Updated');
+          } else {
+            $vary_prefix = idx($params, 'vary-subject-prefix');
+            if ($vary_prefix != '') {
+              if ($this->shouldVarySubject($preferences)) {
+                $subject[] = $vary_prefix;
               }
             }
 
-            $subject[] = trim(idx($params, 'subject-prefix'));
-
-            // If mail content must be encrypted, we replace the subject with
-            // a generic one.
-            if ($must_encrypt) {
-              $subject[] = pht('Object Updated');
-            } else {
-              $vary_prefix = idx($params, 'vary-subject-prefix');
-              if ($vary_prefix != '') {
-                if ($this->shouldVarySubject($preferences)) {
-                  $subject[] = $vary_prefix;
-                }
-              }
+            $subject[] = $value;
+          }
 
-              $subject[] = $value;
-            }
+          $mailer->setSubject(implode(' ', array_filter($subject)));
+          break;
+        case 'thread-id':
 
-            $mailer->setSubject(implode(' ', array_filter($subject)));
-            break;
-          case 'thread-id':
-
-            // NOTE: Gmail freaks out about In-Reply-To and References which
-            // aren't in the form "<string@domain.tld>"; this is also required
-            // by RFC 2822, although some clients are more liberal in what they
-            // accept.
-            $domain = PhabricatorEnv::getEnvConfig('metamta.domain');
-            $value = '<'.$value.'@'.$domain.'>';
-
-            if ($is_first && $mailer->supportsMessageIDHeader()) {
-              $headers[] = array('Message-ID',  $value);
-            } else {
-              $in_reply_to = $value;
-              $references = array($value);
-              $parent_id = $this->getParentMessageID();
-              if ($parent_id) {
-                $in_reply_to = $parent_id;
-                // By RFC 2822, the most immediate parent should appear last
-                // in the "References" header, so this order is intentional.
-                $references[] = $parent_id;
-              }
-              $references = implode(' ', $references);
-              $headers[] = array('In-Reply-To', $in_reply_to);
-              $headers[] = array('References',  $references);
-            }
-            $thread_index = $this->generateThreadIndex($value, $is_first);
-            $headers[] = array('Thread-Index', $thread_index);
-            break;
-          default:
-            // Other parameters are handled elsewhere or are not relevant to
-            // constructing the message.
-            break;
-        }
-      }
+          // NOTE: Gmail freaks out about In-Reply-To and References which
+          // aren't in the form "<string@domain.tld>"; this is also required
+          // by RFC 2822, although some clients are more liberal in what they
+          // accept.
+          $domain = PhabricatorEnv::getEnvConfig('metamta.domain');
+          $value = '<'.$value.'@'.$domain.'>';
 
-      $stamps = $this->getMailStamps();
-      if ($stamps) {
-        $headers[] = array('X-Phabricator-Stamps', implode(', ', $stamps));
+          if ($is_first && $mailer->supportsMessageIDHeader()) {
+            $headers[] = array('Message-ID',  $value);
+          } else {
+            $in_reply_to = $value;
+            $references = array($value);
+            $parent_id = $this->getParentMessageID();
+            if ($parent_id) {
+              $in_reply_to = $parent_id;
+              // By RFC 2822, the most immediate parent should appear last
+              // in the "References" header, so this order is intentional.
+              $references[] = $parent_id;
+            }
+            $references = implode(' ', $references);
+            $headers[] = array('In-Reply-To', $in_reply_to);
+            $headers[] = array('References',  $references);
+          }
+          $thread_index = $this->generateThreadIndex($value, $is_first);
+          $headers[] = array('Thread-Index', $thread_index);
+          break;
+        default:
+          // Other parameters are handled elsewhere or are not relevant to
+          // constructing the message.
+          break;
       }
+    }
 
-      $raw_body = idx($params, 'body', '');
-      $body = $raw_body;
-      if ($must_encrypt) {
-        $parts = array();
-        $parts[] = pht(
-          'The content for this message can only be transmitted over a '.
-          'secure channel. To view the message content, follow this '.
-          'link:');
+    $stamps = $this->getMailStamps();
+    if ($stamps) {
+      $headers[] = array('X-Phabricator-Stamps', implode(', ', $stamps));
+    }
 
-        $parts[] = PhabricatorEnv::getProductionURI($this->getURI());
+    $raw_body = idx($params, 'body', '');
+    $body = $raw_body;
+    if ($must_encrypt) {
+      $parts = array();
+      $parts[] = pht(
+        'The content for this message can only be transmitted over a '.
+        'secure channel. To view the message content, follow this '.
+        'link:');
 
-        $body = implode("\n\n", $parts);
-      } else {
-        $body = $raw_body;
-      }
+      $parts[] = PhabricatorEnv::getProductionURI($this->getURI());
 
-      $max = PhabricatorEnv::getEnvConfig('metamta.email-body-limit');
-      if (strlen($body) > $max) {
-        $body = id(new PhutilUTF8StringTruncator())
-          ->setMaximumBytes($max)
-          ->truncateString($body);
-        $body .= "\n";
-        $body .= pht('(This email was truncated at %d bytes.)', $max);
-      }
-      $mailer->setBody($body);
+      $body = implode("\n\n", $parts);
+    } else {
+      $body = $raw_body;
+    }
 
-      // If we sent a different message body than we were asked to, record
-      // what we actually sent to make debugging and diagnostics easier.
-      if ($body !== $raw_body) {
-        $this->setParam('body.sent', $body);
-      }
+    $max = PhabricatorEnv::getEnvConfig('metamta.email-body-limit');
+    if (strlen($body) > $max) {
+      $body = id(new PhutilUTF8StringTruncator())
+        ->setMaximumBytes($max)
+        ->truncateString($body);
+      $body .= "\n";
+      $body .= pht('(This email was truncated at %d bytes.)', $max);
+    }
+    $mailer->setBody($body);
 
-      if ($must_encrypt) {
-        $send_html = false;
-      } else {
-        $send_html = $this->shouldSendHTML($preferences);
-      }
+    // If we sent a different message body than we were asked to, record
+    // what we actually sent to make debugging and diagnostics easier.
+    if ($body !== $raw_body) {
+      $this->setParam('body.sent', $body);
+    }
 
-      if ($send_html && isset($params['html-body'])) {
-        $mailer->setHTMLBody($params['html-body']);
-      }
+    if ($must_encrypt) {
+      $send_html = false;
+    } else {
+      $send_html = $this->shouldSendHTML($preferences);
+    }
 
-      // Pass the headers to the mailer, then save the state so we can show
-      // them in the web UI. If the mail must be encrypted, we remove headers
-      // which are not on a strict whitelist to avoid disclosing information.
-      $filtered_headers = $this->filterHeaders($headers, $must_encrypt);
-      foreach ($filtered_headers as $header) {
-        list($header_key, $header_value) = $header;
-        $mailer->addHeader($header_key, $header_value);
-      }
-      $this->setParam('headers.unfiltered', $headers);
-      $this->setParam('headers.sent', $filtered_headers);
+    if ($send_html && isset($params['html-body'])) {
+      $mailer->setHTMLBody($params['html-body']);
+    }
 
-      // Save the final deliverability outcomes and reasoning so we can
-      // explain why things happened the way they did.
-      $actor_list = array();
-      foreach ($actors as $actor) {
-        $actor_list[$actor->getPHID()] = array(
-          'deliverable' => $actor->isDeliverable(),
-          'reasons' => $actor->getDeliverabilityReasons(),
-        );
-      }
-      $this->setParam('actors.sent', $actor_list);
+    // Pass the headers to the mailer, then save the state so we can show
+    // them in the web UI. If the mail must be encrypted, we remove headers
+    // which are not on a strict whitelist to avoid disclosing information.
+    $filtered_headers = $this->filterHeaders($headers, $must_encrypt);
+    foreach ($filtered_headers as $header) {
+      list($header_key, $header_value) = $header;
+      $mailer->addHeader($header_key, $header_value);
+    }
+    $this->setParam('headers.unfiltered', $headers);
+    $this->setParam('headers.sent', $filtered_headers);
+
+    // Save the final deliverability outcomes and reasoning so we can
+    // explain why things happened the way they did.
+    $actor_list = array();
+    foreach ($actors as $actor) {
+      $actor_list[$actor->getPHID()] = array(
+        'deliverable' => $actor->isDeliverable(),
+        'reasons' => $actor->getDeliverabilityReasons(),
+      );
+    }
+    $this->setParam('actors.sent', $actor_list);
 
-      $this->setParam('routing.sent', $this->getParam('routing'));
-      $this->setParam('routingmap.sent', $this->getRoutingRuleMap());
+    $this->setParam('routing.sent', $this->getParam('routing'));
+    $this->setParam('routingmap.sent', $this->getRoutingRuleMap());
 
-      if (!$add_to && !$add_cc) {
-        $this->setStatus(PhabricatorMailOutboundStatus::STATUS_VOID);
-        $this->setMessage(
-          pht(
-            'Message has no valid recipients: all To/Cc are disabled, '.
-            'invalid, or configured not to receive this mail.'));
-        return $this->save();
-      }
+    if (!$add_to && !$add_cc) {
+      $this->setMessage(
+        pht(
+          'Message has no valid recipients: all To/Cc are disabled, '.
+          'invalid, or configured not to receive this mail.'));
 
-      if ($this->getIsErrorEmail()) {
-        $all_recipients = array_merge($add_to, $add_cc);
-        if ($this->shouldRateLimitMail($all_recipients)) {
-          $this->setStatus(PhabricatorMailOutboundStatus::STATUS_VOID);
-          $this->setMessage(
-            pht(
-              'This is an error email, but one or more recipients have '.
-              'exceeded the error email rate limit. Declining to deliver '.
-              'message.'));
-          return $this->save();
-        }
-      }
+      return null;
+    }
 
-      if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
-        $this->setStatus(PhabricatorMailOutboundStatus::STATUS_VOID);
+    if ($this->getIsErrorEmail()) {
+      $all_recipients = array_merge($add_to, $add_cc);
+      if ($this->shouldRateLimitMail($all_recipients)) {
         $this->setMessage(
           pht(
-            'Phabricator is running in silent mode. See `%s` '.
-            'in the configuration to change this setting.',
-            'phabricator.silent'));
-        return $this->save();
-      }
+            'This is an error email, but one or more recipients have '.
+            'exceeded the error email rate limit. Declining to deliver '.
+            'message.'));
 
-      // Some mailers require a valid "To:" in order to deliver mail. If we
-      // don't have any "To:", try to fill it in with a placeholder "To:".
-      // If that also fails, move the "Cc:" line to "To:".
-      if (!$add_to) {
-        $placeholder_key = 'metamta.placeholder-to-recipient';
-        $placeholder = PhabricatorEnv::getEnvConfig($placeholder_key);
-        if ($placeholder !== null) {
-          $add_to = array($placeholder);
-        } else {
-          $add_to = $add_cc;
-          $add_cc = array();
-        }
+        return null;
       }
+    }
 
-      $add_to = array_unique($add_to);
-      $add_cc = array_diff(array_unique($add_cc), $add_to);
-
-      $mailer->addTos($add_to);
-      if ($add_cc) {
-        $mailer->addCCs($add_cc);
-      }
-    } catch (Exception $ex) {
-      $this
-        ->setStatus(PhabricatorMailOutboundStatus::STATUS_FAIL)
-        ->setMessage($ex->getMessage())
-        ->save();
+    if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
+      $this->setMessage(
+        pht(
+          'Phabricator is running in silent mode. See `%s` '.
+          'in the configuration to change this setting.',
+          'phabricator.silent'));
 
-      throw $ex;
+      return null;
     }
 
-    try {
-      $ok = $mailer->send();
-      if (!$ok) {
-        // TODO: At some point, we should clean this up and make all mailers
-        // throw.
-        throw new Exception(
-          pht('Mail adapter encountered an unexpected, unspecified failure.'));
+    // Some mailers require a valid "To:" in order to deliver mail. If we
+    // don't have any "To:", try to fill it in with a placeholder "To:".
+    // If that also fails, move the "Cc:" line to "To:".
+    if (!$add_to) {
+      $placeholder_key = 'metamta.placeholder-to-recipient';
+      $placeholder = PhabricatorEnv::getEnvConfig($placeholder_key);
+      if ($placeholder !== null) {
+        $add_to = array($placeholder);
+      } else {
+        $add_to = $add_cc;
+        $add_cc = array();
       }
+    }
 
-      $this->setStatus(PhabricatorMailOutboundStatus::STATUS_SENT);
-      $this->save();
-
-      return $this;
-    } catch (PhabricatorMetaMTAPermanentFailureException $ex) {
-      $this
-        ->setStatus(PhabricatorMailOutboundStatus::STATUS_FAIL)
-        ->setMessage($ex->getMessage())
-        ->save();
-
-      throw $ex;
-    } catch (Exception $ex) {
-      $this
-        ->setMessage($ex->getMessage()."\n".$ex->getTraceAsString())
-        ->save();
+    $add_to = array_unique($add_to);
+    $add_cc = array_diff(array_unique($add_cc), $add_to);
 
-      throw $ex;
+    $mailer->addTos($add_to);
+    if ($add_cc) {
+      $mailer->addCCs($add_cc);
     }
+
+    return $mailer;
   }
 
   private function generateThreadIndex($seed, $is_first_mail) {
diff --git a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
index 635913439d..9f14e0c4e1 100644
--- a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
+++ b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
@@ -18,7 +18,7 @@ public function testMailSendFailures() {
     $mail->addTos(array($phid));
 
     $mailer = new PhabricatorMailImplementationTestAdapter();
-    $mail->sendNow($force = true, $mailer);
+    $mail->sendWithMailers(array($mailer));
     $this->assertEqual(
       PhabricatorMailOutboundStatus::STATUS_SENT,
       $mail->getStatus());
@@ -31,7 +31,7 @@ public function testMailSendFailures() {
     $mailer = new PhabricatorMailImplementationTestAdapter();
     $mailer->setFailTemporarily(true);
     try {
-      $mail->sendNow($force = true, $mailer);
+      $mail->sendWithMailers(array($mailer));
     } catch (Exception $ex) {
       // Ignore.
     }
@@ -47,7 +47,7 @@ public function testMailSendFailures() {
     $mailer = new PhabricatorMailImplementationTestAdapter();
     $mailer->setFailPermanently(true);
     try {
-      $mail->sendNow($force = true, $mailer);
+      $mail->sendWithMailers(array($mailer));
     } catch (Exception $ex) {
       // Ignore.
     }
@@ -191,7 +191,7 @@ private function runThreadIDHeadersWithConfiguration(
 
     $mail = new PhabricatorMetaMTAMail();
     $mail->setThreadID($thread_id, $is_first_mail);
-    $mail->sendNow($force = true, $mailer);
+    $mail->sendWithMailers(array($mailer));
 
     $guts = $mailer->getGuts();
     $dict = ipull($guts['headers'], 1, 0);

From 7765299f8399f58ed96b91ee1ef0b2cabf562617 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 04:28:03 -0800
Subject: [PATCH 490/865] Mask the sender for "Must Encrypt" mail

Summary:
Depends on D18998. Ref T13053. When we send "Must Encrypt" mail, we currently send it with a normal "From" address.

This discloses a little information about the object (for example, if the Director of Silly Walks is interacting with a "must encrypt" object, the vulnerability is probably related to Silly Walks), so anonymize who is interacting with the object.

Test Plan: Processed some mail. (The actual final "From" is ephemeral and a little tricky to examine and I didn't actually transmit mail over the network, but it should be obvious if this works or not on `secure`.)

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19000
---
 src/applications/metamta/storage/PhabricatorMetaMTAMail.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 179eb18088..317f9be8df 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -592,6 +592,12 @@ private function buildMailer(PhabricatorMailImplementationAdapter $mailer) {
           $mailer->setFrom($from_email, $from_name);
           break;
         case 'from':
+          // If the mail content must be encrypted, disguise the sender.
+          if ($must_encrypt) {
+            $mailer->setFrom($default_from, pht('Phabricator'));
+            break;
+          }
+
           $from = $value;
           $actor_email = null;
           $actor_name = null;

From 7f2c90fbd12b10e10abc3098c080baae96d4040f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Feb 2018 15:58:07 -0800
Subject: [PATCH 491/865] Prepare for multiple mailers of the same type

Summary:
Depends on D19000. Ref T13053. Ref T12677. Currently, most mailers are configured with a bunch of `<mailer>.setting-name` global config options.

This means that you can't configure two different SMTP servers, which is a reasonable thing to want to do in the brave new world of mail failover.

It also means you can't configure two Mailgun accounts or two SES accounts. Although this might seem a little silly, we've had more service disruptions because of policy issues / administrative error (where a particular account was disabled) than actual downtime, so maybe it's not completely ridiculous.

Realign mailers so they can take configuration directly in an explicit way. A later change will add new configuration to take advantage of this and let us move away from having ~10 global options for this stuff eventually.

(This also makes writing third-party mailers easier.)

Test Plan:
Processed some mail, ran existing unit tests. But I wasn't especially thorough.

I expect later changes to provide some tools to make this more testable, so I'll vet each provider more thoroughly and add coverage for multiple mailers after that stuff is ready.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053, T12677

Differential Revision: https://secure.phabricator.com/D19002
---
 .../PhabricatorMailImplementationAdapter.php  | 40 ++++++++++++++
 ...atorMailImplementationAmazonSESAdapter.php | 36 ++++++++++--
 ...icatorMailImplementationMailgunAdapter.php | 27 ++++++++-
 ...atorMailImplementationPHPMailerAdapter.php | 55 ++++++++++++++++---
 ...MailImplementationPHPMailerLiteAdapter.php | 24 +++++++-
 ...catorMailImplementationSendGridAdapter.php | 27 ++++++++-
 ...abricatorMailImplementationTestAdapter.php | 18 +++++-
 .../storage/PhabricatorMetaMTAMail.php        | 29 +++++++---
 .../PhabricatorMetaMTAMailTestCase.php        |  4 +-
 9 files changed, 229 insertions(+), 31 deletions(-)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
index 3363301909..514306758d 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
@@ -2,6 +2,9 @@
 
 abstract class PhabricatorMailImplementationAdapter extends Phobject {
 
+  private $key;
+  private $options = array();
+
   abstract public function setFrom($email, $name = '');
   abstract public function addReplyTo($email, $name = '');
   abstract public function addTos(array $emails);
@@ -12,6 +15,7 @@ abstract public function setBody($plaintext_body);
   abstract public function setHTMLBody($html_body);
   abstract public function setSubject($subject);
 
+
   /**
    * Some mailers, notably Amazon SES, do not support us setting a specific
    * Message-ID header.
@@ -32,4 +36,40 @@ abstract public function supportsMessageIDHeader();
    */
   abstract public function send();
 
+  final public function setKey($key) {
+    $this->key = $key;
+    return $this;
+  }
+
+  final public function getKey() {
+    return $this->key;
+  }
+
+  final public function getOption($key) {
+    if (!array_key_exists($key, $this->options)) {
+      throw new Exception(
+        pht(
+          'Mailer ("%s") is attempting to access unknown option ("%s").',
+          get_class($this),
+          $key));
+    }
+
+    return $this->options[$key];
+  }
+
+  final public function setOptions(array $options) {
+    $this->validateOptions($options);
+    $this->options = $options;
+    return $this;
+  }
+
+  abstract protected function validateOptions(array $options);
+
+  abstract public function newDefaultOptions();
+  abstract public function newLegacyOptions();
+
+  public function prepareForSend() {
+    return;
+  }
+
 }
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
index 5b03cd86ac..850b83f1dd 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
@@ -6,8 +6,8 @@ final class PhabricatorMailImplementationAmazonSESAdapter
   private $message;
   private $isHTML;
 
-  public function __construct() {
-    parent::__construct();
+  public function prepareForSend() {
+    parent::prepareForSend();
     $this->mailer->Mailer = 'amazon-ses';
     $this->mailer->customMailer = $this;
   }
@@ -17,13 +17,39 @@ public function supportsMessageIDHeader() {
     return false;
   }
 
+  protected function validateOptions(array $options) {
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'access-key' => 'string',
+        'secret-key' => 'string',
+        'endpoint' => 'string',
+      ));
+  }
+
+  public function newDefaultOptions() {
+    return array(
+      'access-key' => null,
+      'secret-key' => null,
+      'endpoint' => null,
+    );
+  }
+
+  public function newLegacyOptions() {
+    return array(
+      'access-key' => PhabricatorEnv::getEnvConfig('amazon-ses.access-key'),
+      'secret-key' => PhabricatorEnv::getEnvConfig('amazon-ses.secret-key'),
+      'endpoint' => PhabricatorEnv::getEnvConfig('amazon-ses.endpoint'),
+    );
+  }
+
   /**
    * @phutil-external-symbol class SimpleEmailService
    */
   public function executeSend($body) {
-    $key = PhabricatorEnv::getEnvConfig('amazon-ses.access-key');
-    $secret = PhabricatorEnv::getEnvConfig('amazon-ses.secret-key');
-    $endpoint = PhabricatorEnv::getEnvConfig('amazon-ses.endpoint');
+    $key = $this->getOption('access-key');
+    $secret = $this->getOption('secret-key');
+    $endpoint = $this->getOption('endpoint');
 
     $root = phutil_get_library_root('phabricator');
     $root = dirname($root);
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
index cfe6491fe0..a7be6731eb 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
@@ -71,9 +71,32 @@ public function supportsMessageIDHeader() {
     return true;
   }
 
+  protected function validateOptions(array $options) {
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'api-key' => 'string',
+        'domain' => 'string',
+      ));
+  }
+
+  public function newDefaultOptions() {
+    return array(
+      'api-key' => null,
+      'domain' => null,
+    );
+  }
+
+  public function newLegacyOptions() {
+    return array(
+      'api-key' => PhabricatorEnv::getEnvConfig('mailgun.api-key'),
+      'domain' => PhabricatorEnv::getEnvConfig('mailgun.domain'),
+    );
+  }
+
   public function send() {
-    $key = PhabricatorEnv::getEnvConfig('mailgun.api-key');
-    $domain = PhabricatorEnv::getEnvConfig('mailgun.domain');
+    $key = $this->getOption('api-key');
+    $domain = $this->getOption('domain');
     $params = array();
 
     $params['to'] = implode(', ', idx($this->params, 'tos', array()));
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
index f4d7e8e156..0eb59629a6 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
@@ -5,17 +5,55 @@ final class PhabricatorMailImplementationPHPMailerAdapter
 
   private $mailer;
 
+  protected function validateOptions(array $options) {
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'host' => 'string|null',
+        'port' => 'int',
+        'user' => 'string|null',
+        'password' => 'string|null',
+        'protocol' => 'string|null',
+        'encoding' => 'string',
+        'mailer' => 'string',
+      ));
+  }
+
+  public function newDefaultOptions() {
+    return array(
+      'host' => null,
+      'port' => 25,
+      'user' => null,
+      'password' => null,
+      'protocol' => null,
+      'encoding' => 'base64',
+      'mailer' => 'smtp',
+    );
+  }
+
+  public function newLegacyOptions() {
+    return array(
+      'host' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-host'),
+      'port' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-port'),
+      'user' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-user'),
+      'password' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-passsword'),
+      'protocol' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-protocol'),
+      'encoding' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding'),
+      'mailer' => PhabricatorEnv::getEnvConfig('phpmailer.mailer'),
+    );
+  }
+
   /**
    * @phutil-external-symbol class PHPMailer
    */
-  public function __construct() {
+  public function prepareForSend() {
     $root = phutil_get_library_root('phabricator');
     $root = dirname($root);
     require_once $root.'/externals/phpmailer/class.phpmailer.php';
     $this->mailer = new PHPMailer($use_exceptions = true);
     $this->mailer->CharSet = 'utf-8';
 
-    $encoding = PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding');
+    $encoding = $this->getOption('encoding');
     $this->mailer->Encoding = $encoding;
 
     // By default, PHPMailer sends one mail per recipient. We handle
@@ -23,20 +61,19 @@ public function __construct() {
     // send mail exactly like we ask.
     $this->mailer->SingleTo = false;
 
-    $mailer = PhabricatorEnv::getEnvConfig('phpmailer.mailer');
+    $mailer = $this->getOption('mailer');
     if ($mailer == 'smtp') {
       $this->mailer->IsSMTP();
-      $this->mailer->Host = PhabricatorEnv::getEnvConfig('phpmailer.smtp-host');
-      $this->mailer->Port = PhabricatorEnv::getEnvConfig('phpmailer.smtp-port');
-      $user = PhabricatorEnv::getEnvConfig('phpmailer.smtp-user');
+      $this->mailer->Host = $this->getOption('host');
+      $this->mailer->Port = $this->getOption('port');
+      $user = $this->getOption('user');
       if ($user) {
         $this->mailer->SMTPAuth = true;
         $this->mailer->Username = $user;
-        $this->mailer->Password =
-          PhabricatorEnv::getEnvConfig('phpmailer.smtp-password');
+        $this->mailer->Password = $this->getOption('password');
       }
 
-      $protocol = PhabricatorEnv::getEnvConfig('phpmailer.smtp-protocol');
+      $protocol = $this->getOption('protocol');
       if ($protocol) {
         $protocol = phutil_utf8_strtolower($protocol);
         $this->mailer->SMTPSecure = $protocol;
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
index 668f9353ec..4fd8387252 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
@@ -8,17 +8,37 @@ class PhabricatorMailImplementationPHPMailerLiteAdapter
 
   protected $mailer;
 
+  protected function validateOptions(array $options) {
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'encoding' => 'string',
+      ));
+  }
+
+  public function newDefaultOptions() {
+    return array(
+      'encoding' => 'base64',
+    );
+  }
+
+  public function newLegacyOptions() {
+    return array(
+      'encoding' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding'),
+    );
+  }
+
   /**
    * @phutil-external-symbol class PHPMailerLite
    */
-  public function __construct() {
+  public function prepareForSend() {
     $root = phutil_get_library_root('phabricator');
     $root = dirname($root);
     require_once $root.'/externals/phpmailer/class.phpmailer-lite.php';
     $this->mailer = new PHPMailerLite($use_exceptions = true);
     $this->mailer->CharSet = 'utf-8';
 
-    $encoding = PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding');
+    $encoding = $this->getOption('encoding');
     $this->mailer->Encoding = $encoding;
 
     // By default, PHPMailerLite sends one mail per recipient. We handle
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
index 566d33fd14..9cd8dd19b4 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
@@ -8,6 +8,29 @@ final class PhabricatorMailImplementationSendGridAdapter
 
   private $params = array();
 
+  protected function validateOptions(array $options) {
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'api-user' => 'string',
+        'api-key' => 'string',
+      ));
+  }
+
+  public function newDefaultOptions() {
+    return array(
+      'api-user' => null,
+      'api-key' => null,
+    );
+  }
+
+  public function newLegacyOptions() {
+    return array(
+      'api-user' => PhabricatorEnv::getEnvConfig('sendgrid.api-user'),
+      'api-key' => PhabricatorEnv::getEnvConfig('sendgrid.api-key'),
+    );
+  }
+
   public function setFrom($email, $name = '') {
     $this->params['from'] = $email;
     $this->params['from-name'] = $name;
@@ -73,8 +96,8 @@ public function supportsMessageIDHeader() {
 
   public function send() {
 
-    $user = PhabricatorEnv::getEnvConfig('sendgrid.api-user');
-    $key  = PhabricatorEnv::getEnvConfig('sendgrid.api-key');
+    $user = $this->getOption('api-user');
+    $key = $this->getOption('api-key');
 
     if (!$user || !$key) {
       throw new Exception(
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
index 0ea2af916f..bd64076a59 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
@@ -8,9 +8,23 @@ final class PhabricatorMailImplementationTestAdapter
   extends PhabricatorMailImplementationAdapter {
 
   private $guts = array();
-  private $config;
+  private $config = array();
 
-  public function __construct(array $config = array()) {
+  protected function validateOptions(array $options) {
+    PhutilTypeSpec::checkMap(
+      $options,
+      array());
+  }
+
+  public function newDefaultOptions() {
+    return array();
+  }
+
+  public function newLegacyOptions() {
+    return array();
+  }
+
+  public function prepareForSend(array $config = array()) {
     $this->config = $config;
   }
 
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 317f9be8df..eb1f1fbea2 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -453,11 +453,6 @@ public function save() {
     return $result;
   }
 
-  public function buildDefaultMailer() {
-    return PhabricatorEnv::newObjectFromConfig('metamta.mail-adapter');
-  }
-
-
   /**
    * Attempt to deliver an email immediately, in this process.
    *
@@ -468,13 +463,31 @@ public function sendNow() {
       throw new Exception(pht('Trying to send an already-sent mail!'));
     }
 
-    $mailers = array(
-      $this->buildDefaultMailer(),
-    );
+    $mailers = $this->newMailers();
 
     return $this->sendWithMailers($mailers);
   }
 
+  private function newMailers() {
+    $mailers = array();
+
+    $mailer = PhabricatorEnv::newObjectFromConfig('metamta.mail-adapter');
+
+    $defaults = $mailer->newDefaultOptions();
+    $options = $mailer->newLegacyOptions();
+
+    $options = $options + $defaults;
+
+    $mailer
+      ->setKey('default')
+      ->setOptions($options);
+
+    $mailer->prepareForSend();
+
+    $mailers[] = $mailer;
+
+    return $mailers;
+  }
 
   public function sendWithMailers(array $mailers) {
     $exceptions = array();
diff --git a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
index 9f14e0c4e1..6e72b129b1 100644
--- a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
+++ b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
@@ -182,7 +182,9 @@ private function runThreadIDHeadersWithConfiguration(
     $supports_message_id,
     $is_first_mail) {
 
-    $mailer = new PhabricatorMailImplementationTestAdapter(
+    $mailer = new PhabricatorMailImplementationTestAdapter();
+
+    $mailer->prepareForSend(
       array(
         'supportsMessageIDHeader' => $supports_message_id,
       ));

From c868ee9c07d0e8b7a6622f1de263027efa0773ea Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 05:23:47 -0800
Subject: [PATCH 492/865] Introduce and document a new `cluster.mailers` option
 for configuring multiple mailers

Summary:
Depends on D19002. Ref T13053. Ref T12677. Adds a new option to allow configuration of multiple mailers.

Nothing actually uses this yet.

Test Plan: Tried to set it to various bad values, got reasonable error messages. Read documentation.

Reviewers: amckinley

Maniphest Tasks: T13053, T12677

Differential Revision: https://secure.phabricator.com/D19003
---
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorMetaMTAConfigOptions.php       |  20 +-
 .../PhabricatorMailImplementationAdapter.php  |  12 +
 ...atorMailImplementationAmazonSESAdapter.php |   2 +
 ...icatorMailImplementationMailgunAdapter.php |   2 +
 ...atorMailImplementationPHPMailerAdapter.php |   2 +
 ...MailImplementationPHPMailerLiteAdapter.php |   2 +
 ...catorMailImplementationSendGridAdapter.php |   2 +
 ...abricatorMailImplementationTestAdapter.php |   2 +
 .../configuring_outbound_email.diviner        | 297 +++++++++++-------
 .../PhabricatorClusterMailersConfigType.php   | 100 ++++++
 11 files changed, 320 insertions(+), 123 deletions(-)
 create mode 100644 src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c642f13f90..fb2b0ccf0c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2411,6 +2411,7 @@
     'PhabricatorClusterExceptionHandler' => 'infrastructure/cluster/exception/PhabricatorClusterExceptionHandler.php',
     'PhabricatorClusterImpossibleWriteException' => 'infrastructure/cluster/exception/PhabricatorClusterImpossibleWriteException.php',
     'PhabricatorClusterImproperWriteException' => 'infrastructure/cluster/exception/PhabricatorClusterImproperWriteException.php',
+    'PhabricatorClusterMailersConfigType' => 'infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php',
     'PhabricatorClusterNoHostForRoleException' => 'infrastructure/cluster/exception/PhabricatorClusterNoHostForRoleException.php',
     'PhabricatorClusterSearchConfigType' => 'infrastructure/cluster/config/PhabricatorClusterSearchConfigType.php',
     'PhabricatorClusterServiceHealthRecord' => 'infrastructure/cluster/PhabricatorClusterServiceHealthRecord.php',
@@ -7824,6 +7825,7 @@
     'PhabricatorClusterExceptionHandler' => 'PhabricatorRequestExceptionHandler',
     'PhabricatorClusterImpossibleWriteException' => 'PhabricatorClusterException',
     'PhabricatorClusterImproperWriteException' => 'PhabricatorClusterException',
+    'PhabricatorClusterMailersConfigType' => 'PhabricatorJSONConfigType',
     'PhabricatorClusterNoHostForRoleException' => 'Exception',
     'PhabricatorClusterSearchConfigType' => 'PhabricatorJSONConfigType',
     'PhabricatorClusterServiceHealthRecord' => 'Phobject',
diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
index 8c2d2265bc..43734abea0 100644
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -138,19 +138,14 @@ public function getOptions() {
   ,
   'metamta.public-replies'));
 
-    $adapter_doc_href = PhabricatorEnv::getDoclink(
-      'Configuring Outbound Email');
-    $adapter_doc_name = pht('Configuring Outbound Email');
     $adapter_description = $this->deformat(pht(<<<EODOC
 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 [[ %s | %s ]] for details.
+custom mailers). This option is deprecated in favor of 'cluster.mailers'.
 EODOC
-  ,
-  $adapter_doc_href,
-  $adapter_doc_name));
+));
 
     $placeholder_description = $this->deformat(pht(<<<EODOC
 When sending a message that has no To recipient (i.e. all recipients are CC'd),
@@ -197,7 +192,18 @@ public function getOptions() {
 EODOC
 ));
 
+    $mailers_description = $this->deformat(pht(<<<EODOC
+Define one or more mail transmission services. For help with configuring
+mailers, see **[[ %s | %s ]]** in the documentation.
+EODOC
+      ,
+      PhabricatorEnv::getDoclink('Configuring Outbound Email'),
+      pht('Configuring Outbound Email')));
+
     return array(
+      $this->newOption('cluster.mailers', 'cluster.mailers', null)
+        ->setLocked(true)
+        ->setDescription($mailers_description),
       $this->newOption(
         'metamta.default-address',
         'string',
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
index 514306758d..923574d16d 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
@@ -5,6 +5,18 @@ abstract class PhabricatorMailImplementationAdapter extends Phobject {
   private $key;
   private $options = array();
 
+  final public function getAdapterType() {
+    return $this->getPhobjectClassConstant('ADAPTERTYPE');
+  }
+
+  final public static function getAllAdapters() {
+    return id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->setUniqueMethod('getAdapterType')
+      ->execute();
+  }
+
+
   abstract public function setFrom($email, $name = '');
   abstract public function addReplyTo($email, $name = '');
   abstract public function addTos(array $emails);
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
index 850b83f1dd..22cc102262 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
@@ -3,6 +3,8 @@
 final class PhabricatorMailImplementationAmazonSESAdapter
   extends PhabricatorMailImplementationPHPMailerLiteAdapter {
 
+  const ADAPTERTYPE = 'ses';
+
   private $message;
   private $isHTML;
 
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
index a7be6731eb..bed0dada63 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
@@ -6,6 +6,8 @@
 final class PhabricatorMailImplementationMailgunAdapter
   extends PhabricatorMailImplementationAdapter {
 
+  const ADAPTERTYPE = 'mailgun';
+
   private $params = array();
   private $attachments = array();
 
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
index 0eb59629a6..3ca6366730 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
@@ -3,6 +3,8 @@
 final class PhabricatorMailImplementationPHPMailerAdapter
   extends PhabricatorMailImplementationAdapter {
 
+  const ADAPTERTYPE = 'smtp';
+
   private $mailer;
 
   protected function validateOptions(array $options) {
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
index 4fd8387252..1f21a993c9 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
@@ -6,6 +6,8 @@
 class PhabricatorMailImplementationPHPMailerLiteAdapter
   extends PhabricatorMailImplementationAdapter {
 
+  const ADAPTERTYPE = 'sendmail';
+
   protected $mailer;
 
   protected function validateOptions(array $options) {
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
index 9cd8dd19b4..be2a837053 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
@@ -6,6 +6,8 @@
 final class PhabricatorMailImplementationSendGridAdapter
   extends PhabricatorMailImplementationAdapter {
 
+  const ADAPTERTYPE = 'sendgrid';
+
   private $params = array();
 
   protected function validateOptions(array $options) {
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
index bd64076a59..8a8d0de0c2 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
@@ -7,6 +7,8 @@
 final class PhabricatorMailImplementationTestAdapter
   extends PhabricatorMailImplementationAdapter {
 
+  const ADAPTERTYPE = 'test';
+
   private $guts = array();
   private $config = array();
 
diff --git a/src/docs/user/configuration/configuring_outbound_email.diviner b/src/docs/user/configuration/configuring_outbound_email.diviner
index 2a95f49bc3..0c7ef529fa 100644
--- a/src/docs/user/configuration/configuring_outbound_email.diviner
+++ b/src/docs/user/configuration/configuring_outbound_email.diviner
@@ -3,43 +3,40 @@
 
 Instructions for configuring Phabricator to send mail.
 
-= Overview =
+Overview
+========
 
-Phabricator can send outbound email via several different providers, called
-"Adapters".
+Phabricator can send outbound email through several different mail services,
+including a local mailer or various third-party services. Options include:
 
 | Send Mail With | Setup | Cost | Inbound | Notes |
 |---------|-------|------|---------|-------|
 | Mailgun | Easy | Cheap | Yes | Recommended |
 | Amazon SES | Easy | Cheap | No | Recommended |
-| SendGrid | Medium | Cheap | Yes | Discouraged (See Note) |
+| SendGrid | Medium | Cheap | Yes | Discouraged |
 | External SMTP | Medium | Varies | No | Gmail, etc. |
-| Local SMTP | Hard | Free | No | (Default) sendmail, postfix, etc |
-| Custom | Hard | Free | No | Write an adapter for some other service. |
+| Local SMTP | Hard | Free | No | sendmail, postfix, etc |
+| Custom | Hard | Free | No | Write a custom mailer for some other service. |
 | Drop in a Hole | Easy | Free | No | Drops mail in a deep, dark hole. |
 
-Of these options, sending mail via local SMTP is the default, but usually
-requires some configuration to get working. See below for details on how to
-select and configure a delivery method.
+See below for details on how to select and configure mail delivery for each
+mailer.
 
 Overall, Mailgun and SES are much easier to set up, and using one of them is
 recommended. In particular, Mailgun will also let you set up inbound email
 easily.
 
 If you have some internal mail service you'd like to use you can also
-write a custom adapter, but this requires digging into the code.
+write a custom mailer, but this requires digging into the code.
 
 Phabricator sends mail in the background, so the daemons need to be running for
 it to be able to deliver mail. You should receive setup warnings if they are
 not. For more information on using daemons, see
 @{article:Managing Daemons with phd}.
 
-**Note on SendGrid**: Users have experienced a number of odd issues with
-SendGrid, compared to fewer issues with other mailers. We discourage SendGrid
-unless you're already using it. If you send to SendGrid via SMTP, you may need
-to adjust `phpmailer.smtp-encoding`.
 
-= Basics =
+Basics
+======
 
 Regardless of how outbound email is delivered, you should configure these keys
 in your configuration:
@@ -51,133 +48,149 @@ in your configuration:
   - **metamta.can-send-as-user** should be left as `false` in most cases,
     but see the documentation for details.
 
-= Configuring Mail Adapters =
-
-To choose how mail will be sent, change the `metamta.mail-adapter` key in
-your configuration. Possible values are listed in the UI:
-
-  - `PhabricatorMailImplementationAmazonMailgunAdapter`: use Mailgun, see
-    "Adapter: Mailgun".
-  - `PhabricatorMailImplementationAmazonSESAdapter`: use Amazon SES, see
-    "Adapter: Amazon SES".
-  - `PhabricatorMailImplementationPHPMailerLiteAdapter`: default, uses
-    "sendmail", see "Adapter: Sendmail".
-  - `PhabricatorMailImplementationPHPMailerAdapter`: uses SMTP, see
-    "Adapter: SMTP".
-  - `PhabricatorMailImplementationSendGridAdapter`: use SendGrid, see
-    "Adapter: SendGrid".
-  - `Some Custom Class You Write`: use a custom adapter you write, see
-    "Adapter: Custom".
-  - `PhabricatorMailImplementationTestAdapter`: this will
-    **completely disable** outbound mail. You can use this if you don't want to
-    send outbound mail, or want to skip this step for now and configure it
-    later.
-
-= Adapter: Sendmail =
-
-This is the default, and selected by choosing
-`PhabricatorMailImplementationPHPMailerLiteAdapter` as the value for
-**metamta.mail-adapter**. This requires a `sendmail` binary to be installed on
-the system. Most MTAs (e.g., sendmail, qmail, postfix) should do this, but your
-machine may not have one installed by default. For install instructions, consult
-the documentation for your favorite MTA.
 
-Since you'll be sending the mail yourself, you are subject to things like SPF
-rules, blackholes, and MTA configuration which are beyond the scope of this
-document. If you can already send outbound email from the command line or know
-how to configure it, this option is straightforward. If you have no idea how to
-do any of this, strongly consider using Mailgun or Amazon SES instead.
+Configuring Mailers
+===================
 
-If you experience issues with mail getting mangled (for example, arriving with
-too many or too few newlines) you may try adjusting `phpmailer.smtp-encoding`.
+Configure one or more mailers by listing them in the the `cluster.mailers`
+configuration option. Most installs only need to configure one mailer, but you
+can configure multiple mailers to provide greater availability in the event of
+a service disruption.
 
-= Adapter: SMTP =
+A valid `cluster.mailers` configuration looks something like this:
 
-You can use this adapter to send mail via an external SMTP server, like Gmail.
-To do this, set these configuration keys:
-
-  - **metamta.mail-adapter**: set to
-    `PhabricatorMailImplementationPHPMailerAdapter`.
-  - **phpmailer.mailer**: set to `smtp`.
-  - **phpmailer.smtp-host**: set to hostname of your SMTP server.
-  - **phpmailer.smtp-port**: set to port of your SMTP server.
-  - **phpmailer.smtp-user**: set to your username used for authentication.
-  - **phpmailer.smtp-password**: set to your password used for authentication.
-  - **phpmailer.smtp-protocol**: set to `tls` or `ssl` if necessary. Use
-    `ssl` for Gmail.
-  - **phpmailer.smtp-encoding**: Normally safe to leave as the default, but
-    adjusting it may help resolve mail mangling issues (for example, mail
-    arriving with too many or too few newlines).
+```lang=json
+[
+  {
+    "key": "mycompany-mailgun",
+    "type": "mailgun",
+    "options": {
+      "domain": "mycompany.com",
+      "api-key": "..."
+    }
+  },
+  ...
+]
+```
+
+The supported keys for each mailer are:
 
-= Adapter: Mailgun =
+  - `key`: Required string. A unique name for this mailer.
+  - `type`: Required string. Identifies the type of mailer. See below for
+    options.
+  - `priority`: Optional string. Advanced option which controls load balancing
+    and failover behavior. See below for details.
+  - `options`: Optional map. Additional options for the mailer type.
 
-Mailgun is an email delivery service. You can learn more at
-<http://www.mailgun.com>. Mailgun isn't free, but is very easy to configure
-and works well.
+The `type` field can be used to select these third-party mailers:
 
-To use Mailgun, sign up for an account, then set these configuration keys:
+  - `mailgun`: Use Mailgun.
+  - `ses`: Use Amazon SES.
+  - `sendgrid`: Use Sendgrid.
 
-  - **metamta.mail-adapter**: set to
-    `PhabricatorMailImplementationMailgunAdapter`.
-  - **mailgun.api-key**: set to your Mailgun API key.
-  - **mailgun.domain**: set to your Mailgun domain.
+It also supports these local mailers:
 
-= Adapter: Amazon SES =
+  - `sendmail`: Use the local `sendmail` binary.
+  - `smtp`: Connect directly to an SMTP server.
+  - `test`: Internal mailer for testing. Does not send mail.
 
-Amazon SES is Amazon's cloud email service. It is not free, but is easier to
-configure than sendmail and can simplify outbound email configuration. To use
-Amazon SES, you need to sign up for an account with Amazon at
+You can also write your own mailer by extending
+`PhabricatorMailImplementationAdapter`.
+
+Once you've selected a mailer, find the corresponding section below for
+instructions on configuring it.
+
+
+Mailer: Mailgun
+===============
+
+Mailgun is a third-party email delivery service. You can learn more at
+<http://www.mailgun.com>. Mailgun is easy to configure and works well.
+
+To use this mailer, set `type` to `mailgun`, then configure these `options`:
+
+  - `api-key`: Required string. Your Mailgun API key.
+  - `domain`: Required string. Your Mailgun domain.
+
+
+Mailer: Amazon SES
+==================
+
+Amazon SES is Amazon's cloud email service. You can learn more at
 <http://aws.amazon.com/ses/>.
 
-To configure Phabricator to use Amazon SES, set these configuration keys:
+To use this mailer, set `type` to `ses`, then configure these `options`:
+
+  - `access-key`: Required string. Your Amazon SES access key.
+  - `secret-key`: Required string. Your Amazon SES secret key.
+  - `endpoint`: Required string. Your Amazon SES endpoint.
 
-  - **metamta.mail-adapter**: set to
-    "PhabricatorMailImplementationAmazonSESAdapter".
-  - **amazon-ses.access-key**: set to your Amazon SES access key.
-  - **amazon-ses.secret-key**: set to your Amazon SES secret key.
-  - **amazon-ses.endpoint**: Set to your Amazon SES endpoint.
+NOTE: Amazon SES **requires you to verify your "From" address**. Configure
+which "From" address to use by setting "`metamta.default-address`" in your
+config, then follow the Amazon SES verification process to verify it. You
+won't be able to send email until you do this!
 
-NOTE: Amazon SES **requires you to verify your "From" address**. Configure which
-"From" address to use by setting "`metamta.default-address`" in your config,
-then follow the Amazon SES verification process to verify it. You won't be able
-to send email until you do this!
 
-= Adapter: SendGrid =
+Mailer: SendGrid
+================
 
-SendGrid is an email delivery service like Amazon SES. You can learn more at
-<http://sendgrid.com/>. It is easy to configure, but not free.
+SendGrid is a third-party email delivery service. You can learn more at
+<http://sendgrid.com/>.
 
 You can configure SendGrid in two ways: you can send via SMTP or via the REST
-API. To use SMTP, just configure `sendmail` and leave Phabricator's setup
-with defaults. To use the REST API, follow the instructions in this section.
+API. To use SMTP, configure Phabricator to use an `smtp` mailer.
 
-To configure Phabricator to use SendGrid, set these configuration keys:
+To use the REST API mailer, set `type` to `sendgrid`, then configure
+these `options`:
 
-  - **metamta.mail-adapter**: set to
-    "PhabricatorMailImplementationSendGridAdapter".
-  - **sendgrid.api-user**: set to your SendGrid login name.
-  - **sendgrid.api-key**: set to your SendGrid password.
+  - `api-user`: Required string. Your SendGrid login name.
+  - `api-key`: Required string. Your SendGrid API key.
 
-If you're logged into your SendGrid account, you may be able to find this
-information easily by visiting <http://sendgrid.com/developer>.
+NOTE: Users have experienced a number of odd issues with SendGrid, compared to
+fewer issues with other mailers. We discourage SendGrid unless you're already
+using it.
 
-= Adapter: Custom =
 
-You can provide a custom adapter by writing a concrete subclass of
-@{class:PhabricatorMailImplementationAdapter} and setting it as the
-`metamta.mail-adapter`.
+Mailer: Sendmail
+================
 
-TODO: This should be better documented once extending Phabricator is better
-documented.
+This requires a `sendmail` binary to be installed on
+the system. Most MTAs (e.g., sendmail, qmail, postfix) should do this, but your
+machine may not have one installed by default. For install instructions, consult
+the documentation for your favorite MTA.
+
+Since you'll be sending the mail yourself, you are subject to things like SPF
+rules, blackholes, and MTA configuration which are beyond the scope of this
+document. If you can already send outbound email from the command line or know
+how to configure it, this option is straightforward. If you have no idea how to
+do any of this, strongly consider using Mailgun or Amazon SES instead.
+
+To use this mailer, set `type` to `sendmail`. There are no `options` to
+configure.
 
-= Adapter: Disable Outbound Mail =
 
-You can use the @{class:PhabricatorMailImplementationTestAdapter} to completely
-disable outbound mail, if you don't want to send mail or don't want to configure
-it yet. Just set **metamta.mail-adapter** to
-`PhabricatorMailImplementationTestAdapter`.
+Mailer: STMP
+============
+
+You can use this adapter to send mail via an external SMTP server, like Gmail.
+
+To use this mailer, set `type` to `smtp`, then configure these `options`:
+
+  - `host`: Required string. The hostname of your SMTP server.
+  - `user`: Optional string. Username used for authentication.
+  - `password`: Optional string. Password for authentication.
+  - `protocol`: Optional string. Set to `tls` or `ssl` if necessary. Use
+    `ssl` for Gmail.
 
-= Testing and Debugging Outbound Email =
+
+Disable Mail
+============
+
+To disable mail, just don't configure any mailers.
+
+
+Testing and Debugging Outbound Email
+====================================
 
 You can use the `bin/mail` utility to test, debug, and examine outbound mail. In
 particular:
@@ -191,7 +204,59 @@ Run `bin/mail help <command>` for more help on using these commands.
 You can monitor daemons using the Daemon Console (`/daemon/`, or click
 **Daemon Console** from the homepage).
 
-= Next Steps =
+
+Priorities
+==========
+
+By default, Phabricator will try each mailer in order: it will try the first
+mailer first. If that fails (for example, because the service is not available
+at the moment) it will try the second mailer, and so on.
+
+If you want to load balance between multiple mailers instead of using one as
+a primary, you can set `priority`. Phabricator will start with mailers in the
+highest priority group and go through them randomly, then fall back to the
+next group.
+
+For example, if you have two SMTP servers and you want to balance requests
+between them and then fall back to Mailgun if both fail, configure priorities
+like this:
+
+```lang=json
+[
+  {
+    "key": "smtp-uswest",
+    "type": "smtp",
+    "priority": 300,
+    "options": "..."
+  },
+  {
+    "key": "smtp-useast",
+    "type": "smtp",
+    "priority": 300,
+    "options": "..."
+  },
+  {
+    "key": "mailgun-fallback",
+    "type": "mailgun",
+    "options": "..."
+  }
+}
+```
+
+Phabricator will start with servers in the highest priority group (the group
+with the **largest** `priority` number). In this example, the highest group is
+`300`, which has the two SMTP servers. They'll be tried in random order first.
+
+If both fail, Phabricator will move on to the next priority group. In this
+example, there are no other priority groups.
+
+If it still hasn't sent the mail, Phabricator will try servers which are not
+in any priority group, in the configured order. In this example there is
+only one such server, so it will try to send via Mailgun.
+
+
+Next Steps
+==========
 
 Continue by:
 
diff --git a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
new file mode 100644
index 0000000000..2a7550c419
--- /dev/null
+++ b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
@@ -0,0 +1,100 @@
+<?php
+
+final class PhabricatorClusterMailersConfigType
+  extends PhabricatorJSONConfigType {
+
+  const TYPEKEY = 'cluster.mailers';
+
+  public function validateStoredValue(
+    PhabricatorConfigOption $option,
+    $value) {
+
+    if ($value === null) {
+      return;
+    }
+
+    if (!is_array($value)) {
+      throw $this->newException(
+        pht(
+          'Mailer cluster configuration is not valid: it should be a list '.
+          'of mailer configurations.'));
+    }
+
+    foreach ($value as $index => $spec) {
+      if (!is_array($spec)) {
+        throw $this->newException(
+          pht(
+            'Mailer cluster configuration is not valid: each entry in the '.
+            'list must be a dictionary describing a mailer, but the value '.
+            'with index "%s" is not a dictionary.',
+            $index));
+      }
+    }
+
+    $adapters = PhabricatorMailImplementationAdapter::getAllAdapters();
+
+    $map = array();
+    foreach ($value as $index => $spec) {
+      try {
+        PhutilTypeSpec::checkMap(
+          $spec,
+          array(
+            'key' => 'string',
+            'type' => 'string',
+            'priority' => 'optional int',
+            'options' => 'optional wild',
+          ));
+      } catch (Exception $ex) {
+        throw $this->newException(
+          pht(
+            'Mailer configuration has an invalid mailer specification '.
+            '(at index "%s"): %s.',
+            $index,
+            $ex->getMessage()));
+      }
+
+      $key = $spec['key'];
+      if (isset($map[$key])) {
+        throw $this->newException(
+          pht(
+            'Mailer configuration is invalid: multiple mailers have the same '.
+            'key ("%s"). Each mailer must have a unique key.',
+            $key));
+      }
+      $map[$key] = true;
+
+      $priority = idx($spec, 'priority', 0);
+      if ($priority <= 0) {
+        throw $this->newException(
+          pht(
+            'Mailer configuration ("%s") is invalid: priority must be '.
+            'greater than 0.',
+            $key));
+      }
+
+      $type = $spec['type'];
+      if (!isset($adapters[$type])) {
+        throw $this->newException(
+          pht(
+            'Mailer configuration ("%s") is invalid: mailer type ("%s") is '.
+            'unknown. Supported mailer types are: %s.',
+            $key,
+            $type,
+            implode(', ', array_keys($adapters))));
+      }
+
+      $options = idx($spec, 'options', array());
+      try {
+        id(clone $adapters[$type])->validateOptions($options);
+      } catch (Exception $ex) {
+        throw $this->newException(
+          pht(
+            'Mailer configuration ("%s") specifies invalid options for '.
+            'mailer: %s',
+            $key,
+            $ex->getMessage()));
+      }
+    }
+  }
+
+}

From 4236952cdbc0e1f8af11b126dc28172997827627 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 06:20:24 -0800
Subject: [PATCH 493/865] Add a `bin/config set <key> --stdin < value.json`
 flag to make CLI configuration of complex values easier

Summary:
Depends on D19003. Ref T12677. Ref T13053. For the first time, we're requiring CLI configuration of a complex value (not just a string, integer, bool, etc) to do something fairly standard (send mail).

Users sometimes have very reasonable difficulty figuring out how to `./bin/config set key <some big JSON mess>`. Provide an easy way to handle this and make sure it gets appropriate callouts in the documentation.

(Also, hide the `cluster.mailers` value rather than just locking it, since it may have API keys or SMTP passwords.)

Test Plan: Read documentation, used old and new flags to set configuration.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053, T12677

Differential Revision: https://secure.phabricator.com/D19004
---
 ...PhabricatorConfigManagementSetWorkflow.php | 44 ++++++++++++++-----
 .../PhabricatorMetaMTAConfigOptions.php       |  2 +-
 .../configuration_locked.diviner              | 20 +++++++++
 .../configuring_outbound_email.diviner        | 34 ++++++++++++++
 4 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php b/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
index 9f50d2eeed..22b760872e 100644
--- a/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
+++ b/src/applications/config/management/PhabricatorConfigManagementSetWorkflow.php
@@ -6,7 +6,9 @@ final class PhabricatorConfigManagementSetWorkflow
   protected function didConstruct() {
     $this
       ->setName('set')
-      ->setExamples('**set** __key__ __value__')
+      ->setExamples(
+        "**set** __key__ __value__\n".
+        "**set** __key__ --stdin < value.json")
       ->setSynopsis(pht('Set a local configuration value.'))
       ->setArguments(
         array(
@@ -16,6 +18,10 @@ protected function didConstruct() {
               'Update configuration in the database instead of '.
               'in local configuration.'),
           ),
+          array(
+            'name' => 'stdin',
+            'help' => pht('Read option value from stdin.'),
+          ),
           array(
             'name'      => 'args',
             'wildcard'  => true,
@@ -31,23 +37,37 @@ public function execute(PhutilArgumentParser $args) {
         pht('Specify a configuration key and a value to set it to.'));
     }
 
+    $is_stdin = $args->getArg('stdin');
+
     $key = $argv[0];
 
-    if (count($argv) == 1) {
-      throw new PhutilArgumentUsageException(
-        pht(
-          "Specify a value to set the key '%s' to.",
-          $key));
-    }
+    if ($is_stdin) {
+      if (count($argv) > 1) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Too many arguments: expected only a key when using "--stdin".'));
+      }
 
-    $value = $argv[1];
+      fprintf(STDERR, tsprintf("%s\n", pht('Reading value from stdin...')));
+      $value = file_get_contents('php://stdin');
+    } else {
+      if (count($argv) == 1) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            "Specify a value to set the key '%s' to.",
+            $key));
+      }
 
-    if (count($argv) > 2) {
-      throw new PhutilArgumentUsageException(
-        pht(
-          'Too many arguments: expected one key and one value.'));
+      if (count($argv) > 2) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Too many arguments: expected one key and one value.'));
+      }
+
+      $value = $argv[1];
     }
 
+
     $options = PhabricatorApplicationConfigOptions::loadAllOptions();
     if (empty($options[$key])) {
       throw new PhutilArgumentUsageException(
diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
index 43734abea0..0b916150bc 100644
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -202,7 +202,7 @@ public function getOptions() {
 
     return array(
       $this->newOption('cluster.mailers', 'cluster.mailers', null)
-        ->setLocked(true)
+        ->setHidden(true)
         ->setDescription($mailers_description),
       $this->newOption(
         'metamta.default-address',
diff --git a/src/docs/user/configuration/configuration_locked.diviner b/src/docs/user/configuration/configuration_locked.diviner
index 040b838177..fff0da9bdc 100644
--- a/src/docs/user/configuration/configuration_locked.diviner
+++ b/src/docs/user/configuration/configuration_locked.diviner
@@ -27,6 +27,24 @@ can edit it from the CLI instead, with `bin/config`:
 phabricator/ $ ./bin/config set <key> <value>
 ```
 
+Some configuration options take complicated values which can be difficult
+to escape properly for the shell. The easiest way to set these options is
+to use the `--stdin` flag. First, put your desired value in a `config.json`
+file:
+
+```name=config.json, lang=json
+{
+  "duck": "quack",
+  "cow": "moo"
+}
+```
+
+Then, set it with `--stdin` like this:
+
+```
+phabricator/ $ ./bin/config set <key> --stdin < config.json
+```
+
 A few settings have alternate CLI tools. Refer to the setting page for
 details.
 
@@ -98,4 +116,6 @@ Next Steps
 
 Continue by:
 
+  - learning more about advanced options with
+    @{Configuration User Guide: Advanced Configuration}; or
   - returning to the @{article: Configuration Guide}.
diff --git a/src/docs/user/configuration/configuring_outbound_email.diviner b/src/docs/user/configuration/configuring_outbound_email.diviner
index 0c7ef529fa..21abf92736 100644
--- a/src/docs/user/configuration/configuring_outbound_email.diviner
+++ b/src/docs/user/configuration/configuring_outbound_email.diviner
@@ -101,6 +101,40 @@ Once you've selected a mailer, find the corresponding section below for
 instructions on configuring it.
 
 
+Setting Complex Configuration
+=============================
+
+Mailers can not be edited from the web UI. If mailers could be edited from
+the web UI, it would give an attacker who compromised an administrator account
+a lot of power: they could redirect mail to a server they control and then
+intercept mail for any other account, including password reset mail.
+
+For more information about locked configuration options, see
+@{article:Configuration Guide: Locked and Hidden Configuration}.
+
+Setting `cluster.mailers` from the command line using `bin/config set` can be
+tricky because of shell escaping. The easiest way to do it is to use the
+`--stdin` flag. First, put your desired configuration in a file like this:
+
+```lang=json, name=mailers.json
+[
+  {
+    "key": "test-mailer",
+    "type": "test"
+  }
+]
+```
+
+Then set the value like this:
+
+```
+phabricator/ $ ./bin/config set --stdin < mailers.json
+```
+
+For alternatives and more information on configuration, see
+@{article:Configuration User Guide: Advanced Configuration}
+
+
 Mailer: Mailgun
 ===============
 

From 994d2e8e156323e0684dac897e65bc9ba6db42e8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 06:31:37 -0800
Subject: [PATCH 494/865] Use "cluster.mailers" if it is configured

Summary:
Depends on D19004. Ref T13053. Ref T12677. If the new `cluster.mailers` is configured, make use of it. Also use it in the Sengrid/Mailgun inbound stuff.

Also fix a bug where "Must Encrypt" mail to no recipients could fatal because no `$mail` was returned.

Test Plan: Processed some mail locally. The testing on this is still pretty flimsy, but I plan to solidify it in an upcoming change.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053, T12677

Differential Revision: https://secure.phabricator.com/D19005
---
 .../PhabricatorMailImplementationAdapter.php  | 10 +++
 ...ricatorMetaMTAMailgunReceiveController.php | 23 +++++-
 ...icatorMetaMTASendGridReceiveController.php | 20 +++++
 .../storage/PhabricatorMetaMTAMail.php        | 82 ++++++++++++++++---
 ...habricatorApplicationTransactionEditor.php | 11 +--
 5 files changed, 126 insertions(+), 20 deletions(-)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
index 923574d16d..14c7a63663 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
@@ -3,6 +3,7 @@
 abstract class PhabricatorMailImplementationAdapter extends Phobject {
 
   private $key;
+  private $priority;
   private $options = array();
 
   final public function getAdapterType() {
@@ -57,6 +58,15 @@ final public function getKey() {
     return $this->key;
   }
 
+  final public function setPriority($priority) {
+    $this->priority = $priority;
+    return $this;
+  }
+
+  final public function getPriority() {
+    return $this->priority;
+  }
+
   final public function getOption($key) {
     if (!array_key_exists($key, $this->options)) {
       throw new Exception(
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
index 467995a186..4eb53b7120 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
@@ -8,14 +8,31 @@ public function shouldRequireLogin() {
   }
 
   private function verifyMessage() {
-    $api_key = PhabricatorEnv::getEnvConfig('mailgun.api-key');
     $request = $this->getRequest();
     $timestamp = $request->getStr('timestamp');
     $token = $request->getStr('token');
     $sig = $request->getStr('signature');
-    $hash = hash_hmac('sha256', $timestamp.$token, $api_key);
 
-    return phutil_hashes_are_identical($sig, $hash);
+    // An install may configure multiple Mailgun mailers, and we might receive
+    // inbound mail from any of them. Test the signature to see if it matches
+    // any configured Mailgun mailer.
+
+    $mailers = PhabricatorMetaMTAMail::newMailers();
+    $mailgun_type = PhabricatorMailImplementationMailgunAdapter::ADAPTERTYPE;
+    foreach ($mailers as $mailer) {
+      if ($mailer->getAdapterType() != $mailgun_type) {
+        continue;
+      }
+
+      $api_key = $mailer->getOption('api-key');
+
+      $hash = hash_hmac('sha256', $timestamp.$token, $api_key);
+      if (phutil_hashes_are_identical($sig, $hash)) {
+        return true;
+      }
+    }
+
+    return false;
   }
 
   public function handleRequest(AphrontRequest $request) {
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php
index 0a5e28fcee..99e60caa05 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php
@@ -8,6 +8,26 @@ public function shouldRequireLogin() {
   }
 
   public function handleRequest(AphrontRequest $request) {
+    $mailers = PhabricatorMetaMTAMail::newMailers();
+    $sendgrid_type = PhabricatorMailImplementationSendGridAdapter::ADAPTERTYPE;
+
+    // SendGrid doesn't sign payloads so we can't be sure that SendGrid
+    // actually sent this request, but require a configured SendGrid mailer
+    // before we activate this endpoint.
+
+    $has_sendgrid = false;
+    foreach ($mailers as $mailer) {
+      if ($mailer->getAdapterType() != $sendgrid_type) {
+        continue;
+      }
+
+      $has_sendgrid = true;
+      break;
+    }
+
+    if (!$has_sendgrid) {
+      return new Aphront404Response();
+    }
 
     // No CSRF for SendGrid.
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index eb1f1fbea2..2ab3299c34 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -463,33 +463,85 @@ public function sendNow() {
       throw new Exception(pht('Trying to send an already-sent mail!'));
     }
 
-    $mailers = $this->newMailers();
+    $mailers = self::newMailers();
 
     return $this->sendWithMailers($mailers);
   }
 
-  private function newMailers() {
+  public static function newMailers() {
     $mailers = array();
 
-    $mailer = PhabricatorEnv::newObjectFromConfig('metamta.mail-adapter');
+    $config = PhabricatorEnv::getEnvConfig('cluster.mailers');
+    if ($config === null) {
+      $mailer = PhabricatorEnv::newObjectFromConfig('metamta.mail-adapter');
 
-    $defaults = $mailer->newDefaultOptions();
-    $options = $mailer->newLegacyOptions();
+      $defaults = $mailer->newDefaultOptions();
+      $options = $mailer->newLegacyOptions();
 
-    $options = $options + $defaults;
+      $options = $options + $defaults;
 
-    $mailer
-      ->setKey('default')
-      ->setOptions($options);
+      $mailer
+        ->setKey('default')
+        ->setPriority(-1)
+        ->setOptions($options);
 
-    $mailer->prepareForSend();
+      $mailers[] = $mailer;
+    } else {
+      $adapters = PhabricatorMailImplementationAdapter::getAllAdapters();
+      $next_priority = -1;
+
+      foreach ($config as $spec) {
+        $type = $spec['type'];
+        if (!isset($adapters[$type])) {
+          throw new Exception(
+            pht(
+              'Unknown mailer ("%s")!',
+              $type));
+        }
 
-    $mailers[] = $mailer;
+        $key = $spec['key'];
+        $mailer = id(clone $adapters[$type])
+          ->setKey($key);
 
-    return $mailers;
+        $priority = idx($spec, 'priority');
+        if (!$priority) {
+          $priority = $next_priority;
+          $next_priority--;
+        }
+        $mailer->setPriority($priority);
+
+        $defaults = $mailer->newDefaultOptions();
+        $options = idx($spec, 'options', array()) + $defaults;
+        $mailer->setOptions($options);
+      }
+    }
+
+    $sorted = array();
+    $groups = mgroup($mailers, 'getPriority');
+    ksort($groups);
+    foreach ($groups as $group) {
+      // Reorder services within the same priority group randomly.
+      shuffle($group);
+      foreach ($group as $mailer) {
+        $sorted[] = $mailer;
+      }
+    }
+
+    foreach ($sorted as $mailer) {
+      $mailer->prepareForSend();
+    }
+
+    return $sorted;
   }
 
   public function sendWithMailers(array $mailers) {
+    if (!$mailers) {
+      return $this
+        ->setStatus(PhabricatorMailOutboundStatus::STATUS_VOID)
+        ->setMessage(pht('No mailers are configured.'))
+        ->save();
+    }
+
     $exceptions = array();
     foreach ($mailers as $template_mailer) {
       $mailer = null;
@@ -865,6 +917,12 @@ private function buildMailer(PhabricatorMailImplementationAdapter $mailer) {
       $mailer->addCCs($add_cc);
     }
 
+    // Keep track of which mailer actually ended up accepting the message.
+    $mailer_key = $mailer->getKey();
+    if ($mailer_key !== null) {
+      $this->setParam('mailer.key', $mailer_key);
+    }
+
     return $mailer;
   }
 
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index c5390de362..e4f9607801 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -2575,12 +2575,13 @@ private function buildMail(
 
         $mail = $this->buildMailForTarget($object, $xactions, $target);
 
-        if ($this->mustEncrypt) {
-          $mail
-            ->setMustEncrypt(true)
-            ->setMustEncryptReasons($this->mustEncrypt);
+        if ($mail) {
+          if ($this->mustEncrypt) {
+            $mail
+              ->setMustEncrypt(true)
+              ->setMustEncryptReasons($this->mustEncrypt);
+          }
         }
-
       } catch (Exception $ex) {
         $caught = $ex;
       }

From 9947eee182aa9fe04e926098eb00dfd1a758e185 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 06:56:44 -0800
Subject: [PATCH 495/865] Add some test coverage for mailers configuration

Summary: Depends on D19005. Ref T12677. Ref T13053. Tests that turning `cluster.mailers` into an actual list of mailers more or less works as expected.

Test Plan: Ran unit tests.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053, T12677

Differential Revision: https://secure.phabricator.com/D19006
---
 src/__phutil_library_map__.php                |   2 +
 .../storage/PhabricatorMetaMTAMail.php        |   4 +-
 .../PhabricatorMailConfigTestCase.php         | 131 ++++++++++++++++++
 3 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/metamta/storage/__tests__/PhabricatorMailConfigTestCase.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index fb2b0ccf0c..29a97c43d2 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3178,6 +3178,7 @@
     'PhabricatorMacroTransactionQuery' => 'applications/macro/query/PhabricatorMacroTransactionQuery.php',
     'PhabricatorMacroTransactionType' => 'applications/macro/xaction/PhabricatorMacroTransactionType.php',
     'PhabricatorMacroViewController' => 'applications/macro/controller/PhabricatorMacroViewController.php',
+    'PhabricatorMailConfigTestCase' => 'applications/metamta/storage/__tests__/PhabricatorMailConfigTestCase.php',
     'PhabricatorMailEmailHeraldField' => 'applications/metamta/herald/PhabricatorMailEmailHeraldField.php',
     'PhabricatorMailEmailHeraldFieldGroup' => 'applications/metamta/herald/PhabricatorMailEmailHeraldFieldGroup.php',
     'PhabricatorMailEmailSubjectHeraldField' => 'applications/metamta/herald/PhabricatorMailEmailSubjectHeraldField.php',
@@ -8680,6 +8681,7 @@
     'PhabricatorMacroTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorMacroTransactionType' => 'PhabricatorModularTransactionType',
     'PhabricatorMacroViewController' => 'PhabricatorMacroController',
+    'PhabricatorMailConfigTestCase' => 'PhabricatorTestCase',
     'PhabricatorMailEmailHeraldField' => 'HeraldField',
     'PhabricatorMailEmailHeraldFieldGroup' => 'HeraldFieldGroup',
     'PhabricatorMailEmailSubjectHeraldField' => 'PhabricatorMailEmailHeraldField',
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 2ab3299c34..141d3b5e1c 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -513,12 +513,14 @@ public static function newMailers() {
         $defaults = $mailer->newDefaultOptions();
         $options = idx($spec, 'options', array()) + $defaults;
         $mailer->setOptions($options);
+
+        $mailers[] = $mailer;
       }
     }
 
     $sorted = array();
     $groups = mgroup($mailers, 'getPriority');
-    ksort($groups);
+    krsort($groups);
     foreach ($groups as $group) {
       // Reorder services within the same priority group randomly.
       shuffle($group);
diff --git a/src/applications/metamta/storage/__tests__/PhabricatorMailConfigTestCase.php b/src/applications/metamta/storage/__tests__/PhabricatorMailConfigTestCase.php
new file mode 100644
index 0000000000..25984a2c1d
--- /dev/null
+++ b/src/applications/metamta/storage/__tests__/PhabricatorMailConfigTestCase.php
@@ -0,0 +1,131 @@
+<?php
+
+final class PhabricatorMailConfigTestCase
+  extends PhabricatorTestCase {
+
+  public function testMailerPriorities() {
+    $mailers = $this->newMailersWithConfig(
+      array(
+        array(
+          'key' => 'A',
+          'type' => 'test',
+        ),
+        array(
+          'key' => 'B',
+          'type' => 'test',
+        ),
+      ));
+
+    $this->assertEqual(
+      array('A', 'B'),
+      mpull($mailers, 'getKey'));
+
+    $mailers = $this->newMailersWithConfig(
+      array(
+        array(
+          'key' => 'A',
+          'priority' => 1,
+          'type' => 'test',
+        ),
+        array(
+          'key' => 'B',
+          'priority' => 2,
+          'type' => 'test',
+        ),
+      ));
+
+    $this->assertEqual(
+      array('B', 'A'),
+      mpull($mailers, 'getKey'));
+
+    $mailers = $this->newMailersWithConfig(
+      array(
+        array(
+          'key' => 'A1',
+          'priority' => 300,
+          'type' => 'test',
+        ),
+        array(
+          'key' => 'A2',
+          'priority' => 300,
+          'type' => 'test',
+        ),
+        array(
+          'key' => 'B',
+          'type' => 'test',
+        ),
+        array(
+          'key' => 'C',
+          'priority' => 400,
+          'type' => 'test',
+        ),
+        array(
+          'key' => 'D',
+          'type' => 'test',
+        ),
+      ));
+
+    // The "A" servers should be shuffled randomly, so either outcome is
+    // acceptable.
+    $option_1 = array('C', 'A1', 'A2', 'B', 'D');
+    $option_2 = array('C', 'A2', 'A1', 'B', 'D');
+    $actual = mpull($mailers, 'getKey');
+
+    $this->assertTrue(($actual === $option_1) || ($actual === $option_2));
+
+    // Make sure that when we're load balancing we actually send traffic to
+    // both servers reasonably often.
+    $saw_a1 = false;
+    $saw_a2 = false;
+    $attempts = 0;
+    while (true) {
+      $mailers = $this->newMailersWithConfig(
+        array(
+          array(
+            'key' => 'A1',
+            'priority' => 300,
+            'type' => 'test',
+          ),
+          array(
+            'key' => 'A2',
+            'priority' => 300,
+            'type' => 'test',
+          ),
+        ));
+
+      $first_key = head($mailers)->getKey();
+
+      if ($first_key == 'A1') {
+        $saw_a1 = true;
+      }
+
+      if ($first_key == 'A2') {
+        $saw_a2 = true;
+      }
+
+      if ($saw_a1 && $saw_a2) {
+        break;
+      }
+
+      if ($attempts++ > 1024) {
+        throw new Exception(
+          pht(
+            'Load balancing between two mail servers did not select both '.
+            'servers after an absurd number of attempts.'));
+      }
+    }
+
+    $this->assertTrue($saw_a1 && $saw_a2);
+  }
+
+  private function newMailersWithConfig(array $config) {
+    $env = PhabricatorEnv::beginScopedEnv();
+    $env->overrideEnvConfig('cluster.mailers', $config);
+
+    $mailers = PhabricatorMetaMTAMail::newMailers();
+
+    unset($env);
+    return $mailers;
+  }
+
+}

From 1f53aa27e4596754cd347c3a74fab3876c66f4c8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 08:24:00 -0800
Subject: [PATCH 496/865] Add unit tests for mail failover behaviors when
 multiple mailers are configured

Summary: Depends on D19006. Ref T13053. Ref T12677. When multiple mailers are configured but one or more fail, test that we recover (or don't) appropriately.

Test Plan: Ran unit tests.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13053, T12677

Differential Revision: https://secure.phabricator.com/D19007
---
 .../storage/PhabricatorMetaMTAMail.php        | 16 ++--
 .../PhabricatorMetaMTAMailTestCase.php        | 78 +++++++++++++++++++
 2 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 141d3b5e1c..5f859fd1d9 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -315,6 +315,10 @@ public function getMailStampMetadata() {
     return $this->getParam('stampMetadata', array());
   }
 
+  public function getMailerKey() {
+    return $this->getParam('mailer.key');
+  }
+
   public function setHTMLBody($html) {
     $this->setParam('html-body', $html);
     return $this;
@@ -588,6 +592,12 @@ public function sendWithMailers(array $mailers) {
         continue;
       }
 
+      // Keep track of which mailer actually ended up accepting the message.
+      $mailer_key = $mailer->getKey();
+      if ($mailer_key !== null) {
+        $this->setParam('mailer.key', $mailer_key);
+      }
+
       return $this
         ->setStatus(PhabricatorMailOutboundStatus::STATUS_SENT)
         ->save();
@@ -919,12 +929,6 @@ private function buildMailer(PhabricatorMailImplementationAdapter $mailer) {
       $mailer->addCCs($add_cc);
     }
 
-    // Keep track of which mailer actually ended up accepting the message.
-    $mailer_key = $mailer->getKey();
-    if ($mailer_key !== null) {
-      $this->setParam('mailer.key', $mailer_key);
-    }
-
     return $mailer;
   }
 
diff --git a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
index 6e72b129b1..c0045301fd 100644
--- a/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
+++ b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
@@ -253,4 +253,82 @@ private function writeSetting(PhabricatorUser $user, $key, $value) {
       ->executeOne();
   }
 
+  public function testMailerFailover() {
+    $user = $this->generateNewTestUser();
+    $phid = $user->getPHID();
+
+    $status_sent = PhabricatorMailOutboundStatus::STATUS_SENT;
+    $status_queue = PhabricatorMailOutboundStatus::STATUS_QUEUE;
+    $status_fail = PhabricatorMailOutboundStatus::STATUS_FAIL;
+
+    $mailer1 = id(new PhabricatorMailImplementationTestAdapter())
+      ->setKey('mailer1');
+
+    $mailer2 = id(new PhabricatorMailImplementationTestAdapter())
+      ->setKey('mailer2');
+
+    $mailers = array(
+      $mailer1,
+      $mailer2,
+    );
+
+    // Send mail with both mailers active. The first mailer should be used.
+    $mail = id(new PhabricatorMetaMTAMail())
+      ->addTos(array($phid))
+      ->sendWithMailers($mailers);
+    $this->assertEqual($status_sent, $mail->getStatus());
+    $this->assertEqual('mailer1', $mail->getMailerKey());
+
+
+    // If the first mailer fails, the mail should be sent with the second
+    // mailer. Since we transmitted the mail, this doesn't raise an exception.
+    $mailer1->setFailTemporarily(true);
+
+    $mail = id(new PhabricatorMetaMTAMail())
+      ->addTos(array($phid))
+      ->sendWithMailers($mailers);
+    $this->assertEqual($status_sent, $mail->getStatus());
+    $this->assertEqual('mailer2', $mail->getMailerKey());
+
+
+    // If both mailers fail, the mail should remain in queue.
+    $mailer2->setFailTemporarily(true);
+
+    $mail = id(new PhabricatorMetaMTAMail())
+      ->addTos(array($phid));
+
+    $caught = null;
+    try {
+      $mail->sendWithMailers($mailers);
+    } catch (Exception $ex) {
+      $caught = $ex;
+    }
+
+    $this->assertTrue($caught instanceof Exception);
+    $this->assertEqual($status_queue, $mail->getStatus());
+    $this->assertEqual(null, $mail->getMailerKey());
+
+    $mailer1->setFailTemporarily(false);
+    $mailer2->setFailTemporarily(false);
+
+
+    // If the first mailer fails permanently, the mail should fail even though
+    // the second mailer isn't configured to fail.
+    $mailer1->setFailPermanently(true);
+
+    $mail = id(new PhabricatorMetaMTAMail())
+      ->addTos(array($phid));
+
+    $caught = null;
+    try {
+      $mail->sendWithMailers($mailers);
+    } catch (Exception $ex) {
+      $caught = $ex;
+    }
+
+    $this->assertTrue($caught instanceof Exception);
+    $this->assertEqual($status_fail, $mail->getStatus());
+    $this->assertEqual(null, $mail->getMailerKey());
+  }
+
 }

From 19b3fb8863d6b72dbb08d904069dc9a914f95c69 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Feb 2018 09:29:40 -0800
Subject: [PATCH 497/865] Add a Postmark mail adapter so it can be configured
 as an outbound mailer

Summary: Depends on D19007. Ref T12677.

Test Plan: Used `bin/mail send-test ... --mailer postmark` to deliver some mail via Postmark.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12677

Differential Revision: https://secure.phabricator.com/D19009
---
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorMailImplementationAdapter.php  |   9 ++
 ...catorMailImplementationPostmarkAdapter.php | 112 ++++++++++++++++++
 ...bricatorMailManagementSendTestWorkflow.php |  20 ++++
 .../storage/PhabricatorMetaMTAMail.php        |  10 ++
 .../configuring_outbound_email.diviner        |  12 ++
 6 files changed, 165 insertions(+)
 create mode 100644 src/applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 29a97c43d2..16b3e1257a 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3188,6 +3188,7 @@
     'PhabricatorMailImplementationMailgunAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php',
     'PhabricatorMailImplementationPHPMailerAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php',
     'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php',
+    'PhabricatorMailImplementationPostmarkAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php',
     'PhabricatorMailImplementationSendGridAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php',
     'PhabricatorMailImplementationTestAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php',
     'PhabricatorMailManagementListInboundWorkflow' => 'applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php',
@@ -8691,6 +8692,7 @@
     'PhabricatorMailImplementationMailgunAdapter' => 'PhabricatorMailImplementationAdapter',
     'PhabricatorMailImplementationPHPMailerAdapter' => 'PhabricatorMailImplementationAdapter',
     'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'PhabricatorMailImplementationAdapter',
+    'PhabricatorMailImplementationPostmarkAdapter' => 'PhabricatorMailImplementationAdapter',
     'PhabricatorMailImplementationSendGridAdapter' => 'PhabricatorMailImplementationAdapter',
     'PhabricatorMailImplementationTestAdapter' => 'PhabricatorMailImplementationAdapter',
     'PhabricatorMailManagementListInboundWorkflow' => 'PhabricatorMailManagementWorkflow',
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
index 14c7a63663..ce56345194 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
@@ -94,4 +94,13 @@ public function prepareForSend() {
     return;
   }
 
+  protected function renderAddress($email, $name = null) {
+    if (strlen($name)) {
+      // TODO: This needs to be escaped correctly.
+      return "{$name} <{$email}>";
+    } else {
+      return $email;
+    }
+  }
+
 }
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php
new file mode 100644
index 0000000000..bd5ee820af
--- /dev/null
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php
@@ -0,0 +1,112 @@
+<?php
+
+final class PhabricatorMailImplementationPostmarkAdapter
+  extends PhabricatorMailImplementationAdapter {
+
+  const ADAPTERTYPE = 'postmark';
+
+  private $parameters = array();
+
+  public function setFrom($email, $name = '') {
+    $this->parameters['From'] = $this->renderAddress($email, $name);
+    return $this;
+  }
+
+  public function addReplyTo($email, $name = '') {
+    $this->parameters['ReplyTo'] = $this->renderAddress($email, $name);
+    return $this;
+  }
+
+  public function addTos(array $emails) {
+    foreach ($emails as $email) {
+      $this->parameters['To'][] = $email;
+    }
+    return $this;
+  }
+
+  public function addCCs(array $emails) {
+    foreach ($emails as $email) {
+      $this->parameters['Cc'][] = $email;
+    }
+    return $this;
+  }
+
+  public function addAttachment($data, $filename, $mimetype) {
+    $this->parameters['Attachments'][] = array(
+      'Name' => $filename,
+      'ContentType' => $mimetype,
+      'Content' => base64_encode($data),
+    );
+
+    return $this;
+  }
+
+  public function addHeader($header_name, $header_value) {
+    $this->parameters['Headers'][] = array(
+      'Name' => $header_name,
+      'Value' => $header_value,
+    );
+    return $this;
+  }
+
+  public function setBody($body) {
+    $this->parameters['TextBody'] = $body;
+    return $this;
+  }
+
+  public function setHTMLBody($html_body) {
+    $this->parameters['HtmlBody'] = $html_body;
+    return $this;
+  }
+
+  public function setSubject($subject) {
+    $this->parameters['Subject'] = $subject;
+    return $this;
+  }
+
+  public function supportsMessageIDHeader() {
+    return true;
+  }
+
+  protected function validateOptions(array $options) {
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'access-token' => 'string',
+      ));
+  }
+
+  public function newDefaultOptions() {
+    return array(
+      'access-token' => null,
+    );
+  }
+
+  public function newLegacyOptions() {
+    return array();
+  }
+
+  public function send() {
+    $access_token = $this->getOption('access-token');
+
+    $parameters = $this->parameters;
+    $flatten = array(
+      'To',
+      'Cc',
+    );
+
+    foreach ($flatten as $key) {
+      if (isset($parameters[$key])) {
+        $parameters[$key] = implode(', ', $parameters[$key]);
+      }
+    }
+
+    id(new PhutilPostmarkFuture())
+      ->setAccessToken($access_token)
+      ->setMethod('email', $parameters)
+      ->resolve();
+
+    return true;
+  }
+
+}
diff --git a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
index 9f4e91ca22..152b62fd3f 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
@@ -47,6 +47,11 @@ protected function didConstruct() {
             'help'    => pht('Attach a file.'),
             'repeat'  => true,
           ),
+          array(
+            'name' => 'mailer',
+            'param' => 'key',
+            'help' => pht('Send with a specific configured mailer.'),
+          ),
           array(
             'name'    => 'html',
             'help'    => pht('Send as HTML mail.'),
@@ -161,6 +166,21 @@ public function execute(PhutilArgumentParser $args) {
       $mail->setFrom($from->getPHID());
     }
 
+    $mailer_key = $args->getArg('mailer');
+    if ($mailer_key !== null) {
+      $mailers = PhabricatorMetaMTAMail::newMailers();
+      $mailers = mpull($mailers, null, 'getKey');
+      if (!isset($mailers[$mailer_key])) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Mailer key ("%s") is not configured. Available keys are: %s.',
+            $mailer_key,
+            implode(', ', array_keys($mailers))));
+      }
+
+      $mail->setTryMailers(array($mailer_key));
+    }
+
     foreach ($attach as $attachment) {
       $data = Filesystem::readFile($attachment);
       $name = basename($attachment);
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 5f859fd1d9..83cdc7c40f 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -319,6 +319,10 @@ public function getMailerKey() {
     return $this->getParam('mailer.key');
   }
 
+  public function setTryMailers(array $mailers) {
+    return $this->setParam('mailers.try', $mailers);
+  }
+
   public function setHTMLBody($html) {
     $this->setParam('html-body', $html);
     return $this;
@@ -469,6 +473,12 @@ public function sendNow() {
 
     $mailers = self::newMailers();
 
+    $try_mailers = $this->getParam('mailers.try');
+    if ($try_mailers) {
+      $mailers = mpull($mailers, null, 'getKey');
+      $mailers = array_select_keys($mailers, $try_mailers);
+    }
+
     return $this->sendWithMailers($mailers);
   }
 
diff --git a/src/docs/user/configuration/configuring_outbound_email.diviner b/src/docs/user/configuration/configuring_outbound_email.diviner
index 21abf92736..d2daf7a40a 100644
--- a/src/docs/user/configuration/configuring_outbound_email.diviner
+++ b/src/docs/user/configuration/configuring_outbound_email.diviner
@@ -12,6 +12,7 @@ including a local mailer or various third-party services. Options include:
 | Send Mail With | Setup | Cost | Inbound | Notes |
 |---------|-------|------|---------|-------|
 | Mailgun | Easy | Cheap | Yes | Recommended |
+| Postmark | Easy | Cheap | Yes | Recommended |
 | Amazon SES | Easy | Cheap | No | Recommended |
 | SendGrid | Medium | Cheap | Yes | Discouraged |
 | External SMTP | Medium | Varies | No | Gmail, etc. |
@@ -147,6 +148,17 @@ To use this mailer, set `type` to `mailgun`, then configure these `options`:
   - `domain`: Required string. Your Mailgun domain.
 
 
+Mailer: Postmark
+================
+
+Postmark is a third-party email delivery serivice. You can learn more at
+<https://www.postmarkapp.com/>.
+
+To use this mailer, set `type` to `postmark`, then configure these `options`:
+
+  - `access-token`: Required string. Your Postmark access token.
+
+
 Mailer: Amazon SES
 ==================
 

From f090fa7426e42bc085e6be25c2eead0af73eb1b4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 02:57:28 -0800
Subject: [PATCH 498/865] Use object PHIDs for "Thread-Topic" headers in mail

Summary:
Depends on D19009. Ref T13053. For "Must Encrypt" mail, we must currently strip the "Thread-Topic" header because it sometimes contains sensitive information about the object.

I don't actually know if this header is useful or anyting uses it. My understanding is that it's an Outlook/Exchange thing, but we also implement "Thread-Index" which I think is what Outlook/Exchange actually look at. This header may have done something before we implemented "Thread-Index", or maybe never done anything. Or maybe older versions of Excel/Outlook did something with it and newer versions don't, or do less. So it's possible that an even better fix here would be to simply remove this, but I wasn't able to convince myself of that after Googling for 10 minutes and I don't think it's worth hours of installing Exchange/Outlook to figure out. Instead, I'm just trying to simplify our handling of this header for now, and maybe some day we'll learn more about Exchange/Outlook and can remove it.

In a number of cases we already use the object monogram or PHID as a "Thread-Topic" without users ever complaining, so I think that if this header is useful it probably isn't shown to users, or isn't shown very often (e.g., only in a specific "conversation" sub-view?). Just use the object PHID (which should be unique and stable) as a thread-topic, everywhere, automatically.

Then allow this header through for "Must Encrypt" mail.

Test Plan: Processed some local mail, saw object PHIDs for "Thread-Topic" headers.

Reviewers: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19012
---
 src/applications/audit/editor/PhabricatorAuditEditor.php   | 5 +----
 .../auth/editor/PhabricatorAuthSSHKeyEditor.php            | 4 +---
 src/applications/badges/editor/PhabricatorBadgesEditor.php | 4 +---
 .../calendar/editor/PhabricatorCalendarEventEditor.php     | 4 +---
 src/applications/conpherence/editor/ConpherenceEditor.php  | 4 +---
 .../countdown/editor/PhabricatorCountdownEditor.php        | 3 +--
 .../differential/editor/DifferentialTransactionEditor.php  | 7 +------
 src/applications/files/editor/PhabricatorFileEditor.php    | 3 +--
 src/applications/fund/editor/FundInitiativeEditor.php      | 3 +--
 .../legalpad/editor/LegalpadDocumentEditor.php             | 4 +---
 src/applications/macro/editor/PhabricatorMacroEditor.php   | 3 +--
 .../maniphest/editor/ManiphestTransactionEditor.php        | 3 +--
 .../metamta/storage/PhabricatorMetaMTAMail.php             | 6 ++++++
 .../editor/PhabricatorOwnersPackageTransactionEditor.php   | 4 +---
 src/applications/paste/editor/PhabricatorPasteEditor.php   | 3 +--
 src/applications/phame/editor/PhameBlogEditor.php          | 4 +---
 src/applications/phame/editor/PhamePostEditor.php          | 4 +---
 src/applications/pholio/editor/PholioMockEditor.php        | 4 +---
 src/applications/phortune/editor/PhortuneCartEditor.php    | 3 +--
 .../phriction/editor/PhrictionTransactionEditor.php        | 4 +---
 .../phurl/editor/PhabricatorPhurlURLEditor.php             | 3 +--
 src/applications/ponder/editor/PonderAnswerEditor.php      | 3 +--
 src/applications/ponder/editor/PonderQuestionEditor.php    | 4 +---
 .../project/editor/PhabricatorProjectTransactionEditor.php | 4 +---
 .../releeph/editor/ReleephRequestTransactionalEditor.php   | 4 +---
 .../worker/PhabricatorRepositoryPushMailWorker.php         | 1 -
 .../slowvote/editor/PhabricatorSlowvoteEditor.php          | 3 +--
 27 files changed, 31 insertions(+), 70 deletions(-)

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
index 049733f777..c39be75366 100644
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -473,17 +473,14 @@ protected function getMailThreadID(PhabricatorLiskDAO $object) {
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $identifier = $object->getCommitIdentifier();
     $repository = $object->getRepository();
-    $monogram = $repository->getMonogram();
 
     $summary = $object->getSummary();
     $name = $repository->formatCommitName($identifier);
 
     $subject = "{$name}: {$summary}";
-    $thread_topic = "Commit {$monogram}{$identifier}";
 
     $template = id(new PhabricatorMetaMTAMail())
-      ->setSubject($subject)
-      ->addHeader('Thread-Topic', $thread_topic);
+      ->setSubject($subject);
 
     $this->attachPatch(
       $template,
diff --git a/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php b/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
index 569c37403b..3f178c9855 100644
--- a/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
+++ b/src/applications/auth/editor/PhabricatorAuthSSHKeyEditor.php
@@ -255,11 +255,9 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $name = $object->getName();
-    $phid = $object->getPHID();
 
     $mail = id(new PhabricatorMetaMTAMail())
-      ->setSubject(pht('SSH Key %d: %s', $id, $name))
-      ->addHeader('Thread-Topic', $phid);
+      ->setSubject(pht('SSH Key %d: %s', $id, $name));
 
     // The primary value of this mail is alerting users to account compromises,
     // so force delivery. In particular, this mail should still be delivered
diff --git a/src/applications/badges/editor/PhabricatorBadgesEditor.php b/src/applications/badges/editor/PhabricatorBadgesEditor.php
index fddc55747c..785d8c989b 100644
--- a/src/applications/badges/editor/PhabricatorBadgesEditor.php
+++ b/src/applications/badges/editor/PhabricatorBadgesEditor.php
@@ -87,12 +87,10 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = $object->getName();
     $id = $object->getID();
-    $topic = pht('Badge %d', $id);
     $subject = pht('Badge %d: %s', $id, $name);
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject($subject)
-      ->addHeader('Thread-Topic', $topic);
+      ->setSubject($subject);
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
diff --git a/src/applications/calendar/editor/PhabricatorCalendarEventEditor.php b/src/applications/calendar/editor/PhabricatorCalendarEventEditor.php
index 4ab13fd360..f1b72dc0ea 100644
--- a/src/applications/calendar/editor/PhabricatorCalendarEventEditor.php
+++ b/src/applications/calendar/editor/PhabricatorCalendarEventEditor.php
@@ -309,13 +309,11 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    $id = $object->getID();
     $name = $object->getName();
     $monogram = $object->getMonogram();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("{$monogram}: {$name}")
-      ->addHeader('Thread-Topic', $monogram);
+      ->setSubject("{$monogram}: {$name}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
index 29ffc22251..7896055f64 100644
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -227,11 +227,9 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
         '%s sent you a message.',
         $this->getActor()->getUserName());
     }
-    $phid = $object->getPHID();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("Z{$id}: {$title}")
-      ->addHeader('Thread-Topic', "Z{$id}: {$phid}");
+      ->setSubject("Z{$id}: {$title}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
diff --git a/src/applications/countdown/editor/PhabricatorCountdownEditor.php b/src/applications/countdown/editor/PhabricatorCountdownEditor.php
index 322b2ee2c3..2102b3785b 100644
--- a/src/applications/countdown/editor/PhabricatorCountdownEditor.php
+++ b/src/applications/countdown/editor/PhabricatorCountdownEditor.php
@@ -45,8 +45,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = $object->getTitle();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("{$monogram}: {$name}")
-      ->addHeader('Thread-Topic', $monogram);
+      ->setSubject("{$monogram}: {$name}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 3a1537b01d..f3583438c8 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -689,15 +689,10 @@ protected function buildReplyHandler(PhabricatorLiskDAO $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);
+      ->setSubject($subject);
   }
 
   protected function getTransactionsForMail(
diff --git a/src/applications/files/editor/PhabricatorFileEditor.php b/src/applications/files/editor/PhabricatorFileEditor.php
index 6a2b797b40..db974cec65 100644
--- a/src/applications/files/editor/PhabricatorFileEditor.php
+++ b/src/applications/files/editor/PhabricatorFileEditor.php
@@ -47,8 +47,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("F{$id}: {$name}")
-      ->addHeader('Thread-Topic', "F{$id}");
+      ->setSubject("F{$id}: {$name}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/fund/editor/FundInitiativeEditor.php b/src/applications/fund/editor/FundInitiativeEditor.php
index e5c372fd12..9175156ffd 100644
--- a/src/applications/fund/editor/FundInitiativeEditor.php
+++ b/src/applications/fund/editor/FundInitiativeEditor.php
@@ -50,8 +50,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("{$monogram}: {$name}")
-      ->addHeader('Thread-Topic', $monogram);
+      ->setSubject("{$monogram}: {$name}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/legalpad/editor/LegalpadDocumentEditor.php b/src/applications/legalpad/editor/LegalpadDocumentEditor.php
index 35f2487a81..e4b43186ee 100644
--- a/src/applications/legalpad/editor/LegalpadDocumentEditor.php
+++ b/src/applications/legalpad/editor/LegalpadDocumentEditor.php
@@ -124,12 +124,10 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
-    $phid = $object->getPHID();
     $title = $object->getDocumentBody()->getTitle();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("L{$id}: {$title}")
-      ->addHeader('Thread-Topic', "L{$id}: {$phid}");
+      ->setSubject("L{$id}: {$title}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
diff --git a/src/applications/macro/editor/PhabricatorMacroEditor.php b/src/applications/macro/editor/PhabricatorMacroEditor.php
index 5d28b78f5f..f59c29b426 100644
--- a/src/applications/macro/editor/PhabricatorMacroEditor.php
+++ b/src/applications/macro/editor/PhabricatorMacroEditor.php
@@ -35,8 +35,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = 'Image Macro "'.$name.'"';
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject($name)
-      ->addHeader('Thread-Topic', $name);
+      ->setSubject($name);
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
index caf70b8f3c..9c8e3869dc 100644
--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
@@ -206,8 +206,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $title = $object->getTitle();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("T{$id}: {$title}")
-      ->addHeader('Thread-Topic', "T{$id}: ".$object->getOriginalTitle());
+      ->setSubject("T{$id}: {$title}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 83cdc7c40f..f2c8939132 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -1262,6 +1262,11 @@ public function generateHeaders() {
       $headers[] = array('X-Phabricator-Must-Encrypt', 'Yes');
     }
 
+    $related_phid = $this->getRelatedPHID();
+    if ($related_phid) {
+      $headers[] = array('Thread-Topic', $related_phid);
+    }
+
     return $headers;
   }
 
@@ -1309,6 +1314,7 @@ private function filterHeaders(array $headers, $must_encrypt) {
       'Precedence',
       'References',
       'Thread-Index',
+      'Thread-Topic',
 
       'X-Mail-Transport-Agent',
       'X-Auto-Response-Suppress',
diff --git a/src/applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php b/src/applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php
index 40657abd57..c6aad6e2bd 100644
--- a/src/applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php
+++ b/src/applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php
@@ -46,12 +46,10 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    $id = $object->getID();
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject($name)
-      ->addHeader('Thread-Topic', $object->getPHID());
+      ->setSubject($name);
   }
 
   protected function buildMailBody(
diff --git a/src/applications/paste/editor/PhabricatorPasteEditor.php b/src/applications/paste/editor/PhabricatorPasteEditor.php
index 063b72cfc0..c312915727 100644
--- a/src/applications/paste/editor/PhabricatorPasteEditor.php
+++ b/src/applications/paste/editor/PhabricatorPasteEditor.php
@@ -72,8 +72,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = $object->getTitle();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("P{$id}: {$name}")
-      ->addHeader('Thread-Topic', "P{$id}");
+      ->setSubject("P{$id}: {$name}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/phame/editor/PhameBlogEditor.php b/src/applications/phame/editor/PhameBlogEditor.php
index f30a74065e..c122d8fa3b 100644
--- a/src/applications/phame/editor/PhameBlogEditor.php
+++ b/src/applications/phame/editor/PhameBlogEditor.php
@@ -48,12 +48,10 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    $phid = $object->getPHID();
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject($name)
-      ->addHeader('Thread-Topic', $phid);
+      ->setSubject($name);
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
diff --git a/src/applications/phame/editor/PhamePostEditor.php b/src/applications/phame/editor/PhamePostEditor.php
index 488d7a4938..d95389e549 100644
--- a/src/applications/phame/editor/PhamePostEditor.php
+++ b/src/applications/phame/editor/PhamePostEditor.php
@@ -61,12 +61,10 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    $phid = $object->getPHID();
     $title = $object->getTitle();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject($title)
-      ->addHeader('Thread-Topic', $phid);
+      ->setSubject($title);
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
diff --git a/src/applications/pholio/editor/PholioMockEditor.php b/src/applications/pholio/editor/PholioMockEditor.php
index c0fcf31f83..6bd49d2e7b 100644
--- a/src/applications/pholio/editor/PholioMockEditor.php
+++ b/src/applications/pholio/editor/PholioMockEditor.php
@@ -112,11 +112,9 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $name = $object->getName();
-    $original_name = $object->getOriginalName();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("M{$id}: {$name}")
-      ->addHeader('Thread-Topic', "M{$id}: {$original_name}");
+      ->setSubject("M{$id}: {$name}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
diff --git a/src/applications/phortune/editor/PhortuneCartEditor.php b/src/applications/phortune/editor/PhortuneCartEditor.php
index 5196e12429..dcf1f2d0e0 100644
--- a/src/applications/phortune/editor/PhortuneCartEditor.php
+++ b/src/applications/phortune/editor/PhortuneCartEditor.php
@@ -123,8 +123,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject(pht('Order %d: %s', $id, $name))
-      ->addHeader('Thread-Topic', pht('Order %s', $id));
+      ->setSubject(pht('Order %d: %s', $id, $name));
   }
 
   protected function buildMailBody(
diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index fcc9fe0474..73aee3fd4c 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -299,12 +299,10 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    $id = $object->getID();
     $title = $object->getContent()->getTitle();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject($title)
-      ->addHeader('Thread-Topic', $object->getPHID());
+      ->setSubject($title);
   }
 
   protected function buildMailBody(
diff --git a/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php b/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php
index 439d62f84a..49f290c343 100644
--- a/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php
+++ b/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php
@@ -68,8 +68,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("U{$id}: {$name}")
-      ->addHeader('Thread-Topic', "U{$id}: ".$object->getName());
+      ->setSubject("U{$id}: {$name}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/ponder/editor/PonderAnswerEditor.php b/src/applications/ponder/editor/PonderAnswerEditor.php
index bab0e1f72d..37b2fe2cd0 100644
--- a/src/applications/ponder/editor/PonderAnswerEditor.php
+++ b/src/applications/ponder/editor/PonderAnswerEditor.php
@@ -57,8 +57,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("ANSR{$id}")
-      ->addHeader('Thread-Topic', "ANSR{$id}");
+      ->setSubject("ANSR{$id}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/ponder/editor/PonderQuestionEditor.php b/src/applications/ponder/editor/PonderQuestionEditor.php
index 0720f436b9..ba9687bd0d 100644
--- a/src/applications/ponder/editor/PonderQuestionEditor.php
+++ b/src/applications/ponder/editor/PonderQuestionEditor.php
@@ -146,11 +146,9 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $title = $object->getTitle();
-    $original_title = $object->getOriginalTitle();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("Q{$id}: {$title}")
-      ->addHeader('Thread-Topic', "Q{$id}: {$original_title}");
+      ->setSubject("Q{$id}: {$title}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
index 2764ce6322..de61c2a09b 100644
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -219,12 +219,10 @@ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    $id = $object->getID();
     $name = $object->getName();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("{$name}")
-      ->addHeader('Thread-Topic', "Project {$id}");
+      ->setSubject("{$name}");
   }
 
   protected function buildMailBody(
diff --git a/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php b/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
index 4710557043..da488d9c72 100644
--- a/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
+++ b/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php
@@ -196,11 +196,9 @@ protected function getMailSubjectPrefix() {
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
-    $phid = $object->getPHID();
     $title = $object->getSummaryForDisplay();
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("RQ{$id}: {$title}")
-      ->addHeader('Thread-Topic', "RQ{$id}: {$phid}");
+      ->setSubject("RQ{$id}: {$title}");
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
diff --git a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php b/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
index 17226a1377..5ffaf0a5c2 100644
--- a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
@@ -124,7 +124,6 @@ private function sendMail(
       ->setFrom($event->getPusherPHID())
       ->setBody($body->render())
       ->setThreadID($event->getPHID(), $is_new = true)
-      ->addHeader('Thread-Topic', $subject)
       ->setIsBulk(true);
 
     return $target->willSendMail($mail);
diff --git a/src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php b/src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php
index 38dbfb12d6..cf088f37d4 100644
--- a/src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php
+++ b/src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php
@@ -48,8 +48,7 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $name = $object->getQuestion();
 
     return id(new PhabricatorMetaMTAMail())
-      ->setSubject("{$monogram}: {$name}")
-      ->addHeader('Thread-Topic', $monogram);
+      ->setSubject("{$monogram}: {$name}");
   }
 
   protected function buildMailBody(

From aa74af19834ba96ccaa7bcd54a5f7fa14bcc97bc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 03:29:33 -0800
Subject: [PATCH 499/865] Remove all "originalTitle"/"originalName" fields from
 objects

Summary:
Depends on D19012. Ref T13053. In D19012, I've changed "Thread-Topic" to always use PHIDs.

This change drops the selective on-object storage we have to track the original, human-readable title for objects.

Even if we end up backing out the "Thread-Topic" change, we'd be better off storing this in a table in the Mail app which just has `<objectPHID, first subject we used when sending mail for that object>`, since then we get the right behavior without needing every object to have this separate field.

Test Plan: Grepped for `original`, `originalName`, `originalTitle`, etc.

Reviewers: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19013
---
 resources/sql/autopatches/20180207.mail.01.task.sql    |  2 ++
 .../sql/autopatches/20180207.mail.02.revision.sql      |  2 ++
 resources/sql/autopatches/20180207.mail.03.mock.sql    |  2 ++
 .../differential/storage/DifferentialRevision.php      | 10 ----------
 .../maniphest/editor/ManiphestTransactionEditor.php    |  1 -
 src/applications/maniphest/storage/ManiphestTask.php   | 10 ----------
 src/applications/pholio/storage/PholioMock.php         |  2 --
 .../pholio/xaction/PholioMockNameTransaction.php       |  3 ---
 src/applications/ponder/storage/PonderQuestion.php     |  5 -----
 9 files changed, 6 insertions(+), 31 deletions(-)
 create mode 100644 resources/sql/autopatches/20180207.mail.01.task.sql
 create mode 100644 resources/sql/autopatches/20180207.mail.02.revision.sql
 create mode 100644 resources/sql/autopatches/20180207.mail.03.mock.sql

diff --git a/resources/sql/autopatches/20180207.mail.01.task.sql b/resources/sql/autopatches/20180207.mail.01.task.sql
new file mode 100644
index 0000000000..f04b90c809
--- /dev/null
+++ b/resources/sql/autopatches/20180207.mail.01.task.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_maniphest.maniphest_task
+  DROP originalTitle;
diff --git a/resources/sql/autopatches/20180207.mail.02.revision.sql b/resources/sql/autopatches/20180207.mail.02.revision.sql
new file mode 100644
index 0000000000..881efbcc94
--- /dev/null
+++ b/resources/sql/autopatches/20180207.mail.02.revision.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_differential.differential_revision
+  DROP originalTitle;
diff --git a/resources/sql/autopatches/20180207.mail.03.mock.sql b/resources/sql/autopatches/20180207.mail.03.mock.sql
new file mode 100644
index 0000000000..360d7cf9a7
--- /dev/null
+++ b/resources/sql/autopatches/20180207.mail.03.mock.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_pholio.pholio_mock
+  DROP originalName;
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 2c82de164a..938c588857 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -20,7 +20,6 @@ final class DifferentialRevision extends DifferentialDAO
     PhabricatorDraftInterface {
 
   protected $title = '';
-  protected $originalTitle;
   protected $status;
 
   protected $summary = '';
@@ -98,7 +97,6 @@ protected function getConfiguration() {
       ),
       self::CONFIG_COLUMN_SCHEMA => array(
         'title' => 'text255',
-        'originalTitle' => 'text255',
         'status' => 'text32',
         'summary' => 'text',
         'testPlan' => 'text',
@@ -155,14 +153,6 @@ public function getURI() {
     return '/'.$this->getMonogram();
   }
 
-  public function setTitle($title) {
-    $this->title = $title;
-    if (!$this->getID()) {
-      $this->originalTitle = $title;
-    }
-    return $this;
-  }
-
   public function loadIDsByCommitPHIDs($phids) {
     if (!$phids) {
       return array();
diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
index 9c8e3869dc..66247ca6d0 100644
--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
@@ -522,7 +522,6 @@ private static function disperseBlock(
       'status' => '""',
       'priority' => 0,
       'title' => '""',
-      'originalTitle' => '""',
       'description' => '""',
       'dateCreated' => 0,
       'dateModified' => 0,
diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php
index f72977c5b2..e19886d3ff 100644
--- a/src/applications/maniphest/storage/ManiphestTask.php
+++ b/src/applications/maniphest/storage/ManiphestTask.php
@@ -31,7 +31,6 @@ final class ManiphestTask extends ManiphestDAO
   protected $subpriority = 0;
 
   protected $title = '';
-  protected $originalTitle = '';
   protected $description = '';
   protected $originalEmailSource;
   protected $mailKey;
@@ -83,7 +82,6 @@ protected function getConfiguration() {
         'status' => 'text64',
         'priority' => 'uint32',
         'title' => 'sort',
-        'originalTitle' => 'text',
         'description' => 'text',
         'mailKey' => 'bytes20',
         'ownerOrdering' => 'text64?',
@@ -176,14 +174,6 @@ public function setOwnerPHID($phid) {
     return $this;
   }
 
-  public function setTitle($title) {
-    $this->title = $title;
-    if (!$this->getID()) {
-      $this->originalTitle = $title;
-    }
-    return $this;
-  }
-
   public function getMonogram() {
     return 'T'.$this->getID();
   }
diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php
index 4aa9ef4055..523733b3df 100644
--- a/src/applications/pholio/storage/PholioMock.php
+++ b/src/applications/pholio/storage/PholioMock.php
@@ -25,7 +25,6 @@ final class PholioMock extends PholioDAO
   protected $editPolicy;
 
   protected $name;
-  protected $originalName;
   protected $description;
   protected $coverPHID;
   protected $mailKey;
@@ -65,7 +64,6 @@ protected function getConfiguration() {
       self::CONFIG_COLUMN_SCHEMA => array(
         'name' => 'text128',
         'description' => 'text',
-        'originalName' => 'text128',
         'mailKey' => 'bytes20',
         'status' => 'text12',
       ),
diff --git a/src/applications/pholio/xaction/PholioMockNameTransaction.php b/src/applications/pholio/xaction/PholioMockNameTransaction.php
index d1231636af..82fb92fe40 100644
--- a/src/applications/pholio/xaction/PholioMockNameTransaction.php
+++ b/src/applications/pholio/xaction/PholioMockNameTransaction.php
@@ -15,9 +15,6 @@ public function getActionStrength() {
 
   public function applyInternalEffects($object, $value) {
     $object->setName($value);
-    if ($object->getOriginalName() === null) {
-      $object->setOriginalName($this->getNewValue());
-    }
   }
 
   public function getTitle() {
diff --git a/src/applications/ponder/storage/PonderQuestion.php b/src/applications/ponder/storage/PonderQuestion.php
index eefcdba9be..17f7ee3fdc 100644
--- a/src/applications/ponder/storage/PonderQuestion.php
+++ b/src/applications/ponder/storage/PonderQuestion.php
@@ -194,11 +194,6 @@ public function save() {
     return parent::save();
   }
 
-  public function getOriginalTitle() {
-    // TODO: Make this actually save/return the original title.
-    return $this->getTitle();
-  }
-
   public function getFullTitle() {
     $id = $this->getID();
     $title = $this->getTitle();

From 6e5df2dd714e8360251026eb112af9d2930ba789 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 03:49:16 -0800
Subject: [PATCH 500/865] Document that disabling
 "metamta.one-mail-per-recipient" leaks recipients for "Must Encrypt"

Summary:
Depends on D19013. Ref T13053. When mail is marked "Must Encrypt", we normally do not include recipient information.

However, when `metamta.one-mail-per-recipient` is disabled, the recipient list will leak in the "To" and "Cc" headers. This interaction is probably not very surprising, but document it explicitly for completeness.

(Also use "Mail messages" instead of "Mails".)

Test Plan: Read documentation in the "Config" application.

Reviewers: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19014
---
 .../config/option/PhabricatorMetaMTAConfigOptions.php       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
index 0b916150bc..8a236a883b 100644
--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
@@ -66,7 +66,9 @@ public function getOptions() {
       received a similar message, but can not prevent all stray email arising
       from "Reply All".
     - Not supported with a private reply-to address.
-    - Mails are sent in the server default translation.
+    - Mail messages are sent in the server default translation.
+    - Mail that must be delivered over secure channels will leak the recipient
+      list in the "To" and "Cc" headers.
   - One mail to each user:
     - Policy controls work correctly and are enforced per-user.
     - Recipients need to look in the mail body to see To/Cc.
@@ -77,7 +79,7 @@ public function getOptions() {
     - "Reply All" will never send extra mail to other users involved in the
       thread.
     - Required if private reply-to addresses are configured.
-    - Mails are sent in the language of user preference.
+    - Mail messages are sent in the language of user preference.
 
 EODOC
 ));

From 085221b0d6f6150047cd38ad5174822fa8f279af Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 03:56:29 -0800
Subject: [PATCH 501/865] In HTML mail, make the text for mail stamps in mail
 bodies smaller and lighter

Summary: Depends on D19014. Ref T13053.

Test Plan: Used `./bin/mail show-outbound --id <id> --dump-html > out.html && open out.html` to look at HTML mail, saw smaller, lighter stamp text with better spacing.

Reviewers: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19015
---
 .../metamta/replyhandler/PhabricatorMailTarget.php        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/applications/metamta/replyhandler/PhabricatorMailTarget.php b/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
index bbf17be3fd..5d8378e8af 100644
--- a/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
+++ b/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
@@ -77,7 +77,13 @@ public function willSendMail(PhabricatorMetaMTAMail $mail) {
         $html = array();
         $html[] = phutil_tag('strong', array(), pht('STAMPS'));
         $html[] = phutil_tag('br');
-        $html[] = phutil_implode_html(' ', $stamps);
+        $html[] = phutil_tag(
+          'span',
+          array(
+            'style' => 'font-size: smaller; color: #92969D',
+          ),
+          phutil_implode_html(' ', $stamps));
+        $html[] = phutil_tag('br');
         $html[] = phutil_tag('br');
         $html = phutil_tag('div', array(), $html);
         $html_body .= hsprintf('%s', $html);

From 0986c7f6732e02d14f8c8f6a192595d90b9416c9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 04:05:44 -0800
Subject: [PATCH 502/865] Add a "View Object" button on the web mail view page

Summary:
Depends on D19015. Ref T13053. Currently, we don't link up hyperlinks in the body of mail viewed in the web UI. We should, but this is a little tricky (see T13053#235074).

As a general improvement to make working with "Must Encrypt" mail less painful, add a big button to jump to the related object.

Test Plan: {F5415990}

Reviewers: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19016
---
 .../PhabricatorMetaMTAMailViewController.php  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
index 03d340bac9..9b33397831 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
@@ -75,8 +75,26 @@ public function handleRequest(AphrontRequest $request) {
           ->setKey('metadata')
           ->appendChild($this->buildMetadataProperties($mail)));
 
+    $header_view = id(new PHUIHeaderView())
+      ->setHeader(pht('Mail'));
+
+    $object_phid = $mail->getRelatedPHID();
+    if ($object_phid) {
+      $handles = $viewer->loadHandles(array($object_phid));
+      $handle = $handles[$object_phid];
+      if ($handle->isComplete() && $handle->getURI()) {
+        $view_button = id(new PHUIButtonView())
+          ->setTag('a')
+          ->setText(pht('View Object'))
+          ->setIcon('fa-chevron-right')
+          ->setHref($handle->getURI());
+
+        $header_view->addActionLink($view_button);
+      }
+    }
+
     $object_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Mail'))
+      ->setHeader($header_view)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->addTabGroup($tab_group);
 

From 5792032dc9c939112542ec32d0021e6cff9e0aea Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 04:51:09 -0800
Subject: [PATCH 503/865] Support Postmark inbound mail via webhook

Summary: Depends on D19016. Ref T13053. Adds a listener for the Postmark webhook.

Test Plan:
Processed some test mail locally, at least:

{F5416053}

Reviewers: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19017
---
 src/__phutil_library_map__.php                |  2 +
 .../PhabricatorMetaMTAApplication.php         |  1 +
 ...ricatorMetaMTAMailgunReceiveController.php | 11 +--
 ...icatorMetaMTAPostmarkReceiveController.php | 87 +++++++++++++++++++
 ...icatorMetaMTASendGridReceiveController.php | 20 ++---
 .../storage/PhabricatorMetaMTAMail.php        | 14 +++
 .../configuring_inbound_email.diviner         | 12 +++
 7 files changed, 125 insertions(+), 22 deletions(-)
 create mode 100644 src/applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 16b3e1257a..301459869f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3272,6 +3272,7 @@
     'PhabricatorMetaMTAMailgunReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php',
     'PhabricatorMetaMTAMemberQuery' => 'applications/metamta/query/PhabricatorMetaMTAMemberQuery.php',
     'PhabricatorMetaMTAPermanentFailureException' => 'applications/metamta/exception/PhabricatorMetaMTAPermanentFailureException.php',
+    'PhabricatorMetaMTAPostmarkReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php',
     'PhabricatorMetaMTAReceivedMail' => 'applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php',
     'PhabricatorMetaMTAReceivedMailProcessingException' => 'applications/metamta/exception/PhabricatorMetaMTAReceivedMailProcessingException.php',
     'PhabricatorMetaMTAReceivedMailTestCase' => 'applications/metamta/storage/__tests__/PhabricatorMetaMTAReceivedMailTestCase.php',
@@ -8787,6 +8788,7 @@
     'PhabricatorMetaMTAMailgunReceiveController' => 'PhabricatorMetaMTAController',
     'PhabricatorMetaMTAMemberQuery' => 'PhabricatorQuery',
     'PhabricatorMetaMTAPermanentFailureException' => 'Exception',
+    'PhabricatorMetaMTAPostmarkReceiveController' => 'PhabricatorMetaMTAController',
     'PhabricatorMetaMTAReceivedMail' => 'PhabricatorMetaMTADAO',
     'PhabricatorMetaMTAReceivedMailProcessingException' => 'Exception',
     'PhabricatorMetaMTAReceivedMailTestCase' => 'PhabricatorTestCase',
diff --git a/src/applications/metamta/application/PhabricatorMetaMTAApplication.php b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
index adb08aaa24..f53af55035 100644
--- a/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
+++ b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
@@ -42,6 +42,7 @@ public function getRoutes() {
         'detail/(?P<id>[1-9]\d*)/' => 'PhabricatorMetaMTAMailViewController',
         'sendgrid/' => 'PhabricatorMetaMTASendGridReceiveController',
         'mailgun/'  => 'PhabricatorMetaMTAMailgunReceiveController',
+        'postmark/'  => 'PhabricatorMetaMTAPostmarkReceiveController',
       ),
     );
   }
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
index 4eb53b7120..3ca2711dcf 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php
@@ -17,15 +17,12 @@ private function verifyMessage() {
     // inbound mail from any of them. Test the signature to see if it matches
     // any configured Mailgun mailer.
 
-    $mailers = PhabricatorMetaMTAMail::newMailers();
-    $mailgun_type = PhabricatorMailImplementationMailgunAdapter::ADAPTERTYPE;
+    $mailers = PhabricatorMetaMTAMail::newMailersWithTypes(
+      array(
+        PhabricatorMailImplementationMailgunAdapter::ADAPTERTYPE,
+      ));
     foreach ($mailers as $mailer) {
-      if ($mailer->getAdapterType() != $mailgun_type) {
-        continue;
-      }
-
       $api_key = $mailer->getOption('api-key');
-
       $hash = hash_hmac('sha256', $timestamp.$token, $api_key);
       if (phutil_hashes_are_identical($sig, $hash)) {
         return true;
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php
new file mode 100644
index 0000000000..a54da6fb40
--- /dev/null
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php
@@ -0,0 +1,87 @@
+<?php
+
+final class PhabricatorMetaMTAPostmarkReceiveController
+  extends PhabricatorMetaMTAController {
+
+  public function shouldRequireLogin() {
+    return false;
+  }
+
+  /**
+   * @phutil-external-symbol class PhabricatorStartup
+   */
+  public function handleRequest(AphrontRequest $request) {
+    // Don't process requests if we don't have a configured Postmark adapter.
+    $mailers = PhabricatorMetaMTAMail::newMailersWithTypes(
+      array(
+        PhabricatorMailImplementationPostmarkAdapter::ADAPTERTYPE,
+      ));
+    if (!$mailers) {
+      return new Aphront404Response();
+    }
+
+    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+    $raw_input = PhabricatorStartup::getRawInput();
+
+    try {
+      $data = phutil_json_decode($raw_input);
+    } catch (Exception $ex) {
+      return new Aphront400Response();
+    }
+
+    $raw_headers = array();
+    $header_items = idx($data, 'Headers', array());
+    foreach ($header_items as $header_item) {
+      $name = idx($header_item, 'Name');
+      $value = idx($header_item, 'Value');
+      $raw_headers[$name] = $value;
+    }
+
+    $headers = array(
+      'to' => idx($data, 'To'),
+      'from' => idx($data, 'From'),
+      'cc' => idx($data, 'Cc'),
+      'subject' => idx($data, 'Subject'),
+    ) + $raw_headers;
+
+
+    $received = id(new PhabricatorMetaMTAReceivedMail())
+      ->setHeaders($headers)
+      ->setBodies(
+        array(
+          'text' => idx($data, 'TextBody'),
+          'html' => idx($data, 'HtmlBody'),
+        ));
+
+    $file_phids = array();
+    $attachments = idx($data, 'Attachments', array());
+    foreach ($attachments as $attachment) {
+      $file_data = idx($attachment, 'Content');
+      $file_data = base64_decode($file_data);
+
+      try {
+        $file = PhabricatorFile::newFromFileData(
+          $file_data,
+          array(
+            'name' => idx($attachment, 'Name'),
+            'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+          ));
+        $file_phids[] = $file->getPHID();
+      } catch (Exception $ex) {
+        phlog($ex);
+      }
+    }
+    $received->setAttachments($file_phids);
+
+    try {
+      $received->save();
+      $received->processReceivedMail();
+    } catch (Exception $ex) {
+      phlog($ex);
+    }
+
+    return id(new AphrontWebpageResponse())
+      ->setContent(pht("Got it! Thanks, Postmark!\n"));
+  }
+
+}
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php
index 99e60caa05..6651f85d6c 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php
@@ -8,24 +8,14 @@ public function shouldRequireLogin() {
   }
 
   public function handleRequest(AphrontRequest $request) {
-    $mailers = PhabricatorMetaMTAMail::newMailers();
-    $sendgrid_type = PhabricatorMailImplementationSendGridAdapter::ADAPTERTYPE;
-
     // SendGrid doesn't sign payloads so we can't be sure that SendGrid
     // actually sent this request, but require a configured SendGrid mailer
     // before we activate this endpoint.
-
-    $has_sendgrid = false;
-    foreach ($mailers as $mailer) {
-      if ($mailer->getAdapterType() != $sendgrid_type) {
-        continue;
-      }
-
-      $has_sendgrid = true;
-      break;
-    }
-
-    if (!$has_sendgrid) {
+    $mailers = PhabricatorMetaMTAMail::newMailersWithTypes(
+      array(
+        PhabricatorMailImplementationSendGridAdapter::ADAPTERTYPE,
+      ));
+    if (!$mailers) {
       return new Aphront404Response();
     }
 
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index f2c8939132..4a9bc68322 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -482,6 +482,20 @@ public function sendNow() {
     return $this->sendWithMailers($mailers);
   }
 
+  public static function newMailersWithTypes(array $types) {
+    $mailers = self::newMailers();
+    $types = array_fuse($types);
+
+    foreach ($mailers as $key => $mailer) {
+      $mailer_type = $mailer->getAdapterType();
+      if (!isset($types[$mailer_type])) {
+        unset($mailers[$key]);
+      }
+    }
+
+    return array_values($mailers);
+  }
+
   public static function newMailers() {
     $mailers = array();
 
diff --git a/src/docs/user/configuration/configuring_inbound_email.diviner b/src/docs/user/configuration/configuring_inbound_email.diviner
index 5b47a17831..ada4ddb828 100644
--- a/src/docs/user/configuration/configuring_inbound_email.diviner
+++ b/src/docs/user/configuration/configuring_inbound_email.diviner
@@ -14,6 +14,7 @@ There are a few approaches available:
 | Receive Mail With | Setup | Cost | Notes |
 |--------|-------|------|-------|
 | Mailgun | Easy | Cheap | Recommended |
+| Postmark | Easy | Cheap | Recommended |
 | SendGrid | Easy | Cheap | |
 | Local MTA | Extremely Difficult | Free | Strongly discouraged! |
 
@@ -130,6 +131,17 @@ like this:
     example domain with your actual domain.
   - Set the `mailgun.api-key` config key to your Mailgun API key.
 
+Postmark Setup
+==============
+
+To process inbound mail from Postmark, configure this URI as your inbound
+webhook URI in the Postmark control panel:
+
+```
+https://<phabricator.yourdomain.com>/mail/postmark/
+```
+
+
 = SendGrid Setup =
 
 To use SendGrid, you need a SendGrid account with access to the "Parse API" for

From dbe479f0d9dee38aee22808dc6321cd32e766a1f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 05:09:21 -0800
Subject: [PATCH 504/865] Don't send error/exception mail to unverified
 addresses

Summary:
Depends on D19017. Fixes T12491. Ref T13053. After SES threw us in the dungeon for sending mail to a spamtrap we changed outbound mail rules to stop sending to unverified addresses, except a small amount of registration mail which we can't avoid.

However, we'll still reply to random inbound messages with a helpful error, even if the sender is unverified.

Instead, only send exception mail back if we know who the sender is.

Test Plan: Processed inbound mail with `scripts/mail/mail_handler.php`. No more outbound mail for "bad address", etc. Still got outbound mail for "unknown command !quack".

Reviewers: amckinley

Maniphest Tasks: T13053, T12491

Differential Revision: https://secure.phabricator.com/D19018
---
 .../PhabricatorMetaMTAReceivedMail.php        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
index 18fa7dd2ba..fc98d17010 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
@@ -105,6 +105,7 @@ private function loadPHIDsFromAddresses(array $addresses) {
 
   public function processReceivedMail() {
 
+    $sender = null;
     try {
       $this->dropMailFromPhabricator();
       $this->dropMailAlreadyReceived();
@@ -140,7 +141,7 @@ public function processReceivedMail() {
           // This error is explicitly ignored.
           break;
         default:
-          $this->sendExceptionMail($ex);
+          $this->sendExceptionMail($ex, $sender);
           break;
       }
 
@@ -150,7 +151,7 @@ public function processReceivedMail() {
         ->save();
       return $this;
     } catch (Exception $ex) {
-      $this->sendExceptionMail($ex);
+      $this->sendExceptionMail($ex, $sender);
 
       $this
         ->setStatus(MetaMTAReceivedMailStatus::STATUS_UNHANDLED_EXCEPTION)
@@ -305,9 +306,14 @@ private function loadReceiver() {
     return head($accept);
   }
 
-  private function sendExceptionMail(Exception $ex) {
-    $from = $this->getHeader('from');
-    if (!strlen($from)) {
+  private function sendExceptionMail(
+    Exception $ex,
+    PhabricatorUser $viewer = null) {
+
+    // If we've failed to identify a legitimate sender, we don't send them
+    // an error message back. We want to avoid sending mail to unverified
+    // addresses. See T12491.
+    if (!$viewer) {
       return;
     }
 
@@ -364,9 +370,8 @@ private function sendExceptionMail(Exception $ex) {
 
     $mail = id(new PhabricatorMetaMTAMail())
       ->setIsErrorEmail(true)
-      ->setForceDelivery(true)
       ->setSubject($title)
-      ->addRawTos(array($from))
+      ->addTos(array($viewer->getPHID()))
       ->setBody($body)
       ->saveAndSend();
   }

From f214abb63f9df8eb17a0438c7256d9f46957f48b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 05:52:52 -0800
Subject: [PATCH 505/865] When a change removes recipients from an object, send
 them one last email

Summary:
Depends on D19018. Fixes T4776. Ref T13053. When you remove someone from an object's recipient list (for example, by removing them a reviewer, auditor, subscriber, owner or author) we currently do not send them mail about it because they're no longer connected to the object.

In many of these cases (Commandeer, Reassign) the actual action in the UI adds them back to the object somehow (as a reviewer or subscriber, respectively) so this doesn't actually matter. However, there's no recovery mechanism for reviewer or subscriber removal.

This is slightly bad from a policy/threat viewpoint since it means an attacker can remove all the recipients of an object "somewhat" silently. This isn't really silent, but it's less un-silent than it should be.

It's also just not very good from a human interaction perspective: if Alice removes Bob as a reviewer, possibly "against his will", he should be notified about that. In the good case, Alice wrote a nice goodbye note that he should get to read. In the bad case, he should get a chance to correct the mistake.

Also add a `removed(@user)` mail stamp so you can route these locally if you want.

Test Plan:
  - Created and edited some different objects without catching anything broken.
  - Removed subscribers from tasks, saw the final email include the removed recipients with a `removed()` stamp.

I'm not totally sure this doesn't have any surprising behavior or break any weird objects, but I think anything that crops up should be easy to fix.

Reviewers: amckinley

Subscribers: sophiebits

Maniphest Tasks: T13053, T4776

Differential Revision: https://secure.phabricator.com/D19019
---
 ...habricatorApplicationTransactionEditor.php | 70 +++++++++++++++++++
 .../PhabricatorEditorMailEngineExtension.php  |  7 ++
 2 files changed, 77 insertions(+)

diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index e4f9607801..6bb7679fdc 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -74,6 +74,9 @@ abstract class PhabricatorApplicationTransactionEditor
   private $mustEncrypt;
   private $stampTemplates = array();
   private $mailStamps = array();
+  private $oldTo = array();
+  private $oldCC = array();
+  private $mailRemovedPHIDs = array();
 
   private $transactionQueue = array();
 
@@ -916,6 +919,8 @@ final public function applyTransactions(
       $this->willApplyTransactions($object, $xactions);
 
       if ($object->getID()) {
+        $this->buildOldRecipientLists($object, $xactions);
+
         foreach ($xactions as $xaction) {
 
           // If any of the transactions require a read lock, hold one and
@@ -1200,6 +1205,10 @@ final public function applyTransactions(
         $this->mailToPHIDs = $this->getMailTo($object);
         $this->mailCCPHIDs = $this->getMailCC($object);
 
+        // Add any recipients who were previously on the notification list
+        // but were removed by this change.
+        $this->applyOldRecipientLists();
+
         $mail_xactions = $this->getTransactionsForMail($object, $xactions);
         $stamps = $this->newMailStamps($object, $xactions);
         foreach ($stamps as $stamp) {
@@ -4127,4 +4136,65 @@ private function generateMailStamps($object, $data) {
     return $results;
   }
 
+  public function getRemovedRecipientPHIDs() {
+    return $this->mailRemovedPHIDs;
+  }
+
+  private function buildOldRecipientLists($object, $xactions) {
+    // See T4776. Before we start making any changes, build a list of the old
+    // recipients. If a change removes a user from the recipient list for an
+    // object we still want to notify the user about that change. This allows
+    // them to respond if they didn't want to be removed.
+
+    if (!$this->shouldSendMail($object, $xactions)) {
+      return;
+    }
+
+    $this->oldTo = $this->getMailTo($object);
+    $this->oldCC = $this->getMailCC($object);
+
+    return $this;
+  }
+
+  private function applyOldRecipientLists() {
+    $actor_phid = $this->getActingAsPHID();
+
+    // If you took yourself off the recipient list (for example, by
+    // unsubscribing or resigning) assume that you know what you did and
+    // don't need to be notified.
+
+    // If you just moved from "To" to "Cc" (or vice versa), you're still a
+    // recipient so we don't need to add you back in.
+
+    $map = array_fuse($this->mailToPHIDs) + array_fuse($this->mailCCPHIDs);
+
+    foreach ($this->oldTo as $phid) {
+      if ($phid === $actor_phid) {
+        continue;
+      }
+
+      if (isset($map[$phid])) {
+        continue;
+      }
+
+      $this->mailToPHIDs[] = $phid;
+      $this->mailRemovedPHIDs[] = $phid;
+    }
+
+    foreach ($this->oldCC as $phid) {
+      if ($phid === $actor_phid) {
+        continue;
+      }
+
+      if (isset($map[$phid])) {
+        continue;
+      }
+
+      $this->mailCCPHIDs[] = $phid;
+      $this->mailRemovedPHIDs[] = $phid;
+    }
+
+    return $this;
+  }
+
 }
diff --git a/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php
index 29d10d641f..5365894429 100644
--- a/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php
+++ b/src/applications/transactions/engineextension/PhabricatorEditorMailEngineExtension.php
@@ -40,6 +40,10 @@ public function newMailStampTemplates($object) {
       ->setKey('herald')
       ->setLabel(pht('Herald Rule'));
 
+    $templates[] = id(new PhabricatorPHIDMailStamp())
+      ->setKey('removed')
+      ->setLabel(pht('Recipient Removed'));
+
     return $templates;
   }
 
@@ -69,6 +73,9 @@ public function newMailStamps($object, array $xactions) {
 
     $this->getMailStamp('herald')
       ->setValue($editor->getHeraldRuleMonograms());
+
+    $this->getMailStamp('removed')
+      ->setValue($editor->getRemovedRecipientPHIDs());
   }
 
 }

From 1cd3a593784a95c9925bce443d790aaa6c90e996 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 07:08:36 -0800
Subject: [PATCH 506/865] When users resign from revisions, stop expanding
 projects/packages to include them

Summary:
Depends on D19019. Ref T13053. Fixes T12689. See PHI178.

Currently, if `@alice` resigns from a revision but `#alice-fan-club` is still a subscriber or reviewer, she'll continue to get mail. This is undesirable.

When users are associated with an object but have explicitly disengaged in an individal role (currently, only resign in audit/differential) mark them "unexpandable", so that they can no longer be included through implicit membership in a group (a project or package).

`@alice` can still get mail if she's a explicit recipient: as an author, owner, or if she adds herself back as a subscriber.

Test Plan:
  - Added `@ducker` and `#users-named-ducker` as reviewers. Ducker got mail.
  - Resigned as ducker, stopped getting future mail.
  - Subscribed explicitly, got mail again.
  - (Plus some `var_dump()` sanity checking in the internals.)

Reviewers: amckinley

Maniphest Tasks: T13053, T12689

Differential Revision: https://secure.phabricator.com/D19021
---
 .../audit/editor/PhabricatorAuditEditor.php   | 15 ++++++++--
 .../editor/DifferentialTransactionEditor.php  | 12 ++++++++
 .../storage/DifferentialRevision.php          | 10 +++++--
 .../PhabricatorMailReplyHandler.php           | 30 +++++++++++++++++++
 .../PhabricatorRepositoryAuditRequest.php     |  9 ++++++
 .../storage/PhabricatorRepositoryCommit.php   |  3 +-
 ...habricatorApplicationTransactionEditor.php | 14 +++++++++
 7 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
index c39be75366..d142bd60cd 100644
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -496,7 +496,6 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
       $phids[] = $object->getAuthorPHID();
     }
 
-    $status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
     foreach ($object->getAudits() as $audit) {
       if (!$audit->isInteresting()) {
         // Don't send mail to uninteresting auditors, like packages which
@@ -504,7 +503,7 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
         continue;
       }
 
-      if ($audit->getAuditStatus() != $status_resigned) {
+      if (!$audit->isResigned()) {
         $phids[] = $audit->getAuditorPHID();
       }
     }
@@ -514,6 +513,18 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
     return $phids;
   }
 
+  protected function newMailUnexpandablePHIDs(PhabricatorLiskDAO $object) {
+    $phids = array();
+
+    foreach ($object->getAudits() as $auditor) {
+      if ($auditor->isResigned()) {
+        $phids[] = $auditor->getAuditorPHID();
+      }
+    }
+
+    return $phids;
+  }
+
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index f3583438c8..cc29d69fe0 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -644,6 +644,18 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
     return $phids;
   }
 
+  protected function newMailUnexpandablePHIDs(PhabricatorLiskDAO $object) {
+    $phids = array();
+
+    foreach ($object->getReviewers() as $reviewer) {
+      if ($reviewer->isResigned()) {
+        $phids[] = $reviewer->getReviewerPHID();
+      }
+    }
+
+    return $phids;
+  }
+
   protected function getMailAction(
     PhabricatorLiskDAO $object,
     array $xactions) {
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 938c588857..4591315207 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -820,9 +820,15 @@ public function isAutomaticallySubscribed($phid) {
     }
 
     foreach ($reviewers as $reviewer) {
-      if ($reviewer->getReviewerPHID() == $phid) {
-        return true;
+      if ($reviewer->getReviewerPHID() !== $phid) {
+        continue;
       }
+
+      if ($reviewer->isResigned()) {
+        continue;
+      }
+
+      return true;
     }
 
     return false;
diff --git a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
index b0ae2de494..f8dd784e3b 100644
--- a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
+++ b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
@@ -6,6 +6,7 @@ abstract class PhabricatorMailReplyHandler extends Phobject {
   private $applicationEmail;
   private $actor;
   private $excludePHIDs = array();
+  private $unexpandablePHIDs = array();
 
   final public function setMailReceiver($mail_receiver) {
     $this->validateMailReceiver($mail_receiver);
@@ -45,6 +46,15 @@ final public function getExcludeMailRecipientPHIDs() {
     return $this->excludePHIDs;
   }
 
+  public function setUnexpandablePHIDs(array $phids) {
+    $this->unexpandablePHIDs = $phids;
+    return $this;
+  }
+
+  public function getUnexpandablePHIDs() {
+    return $this->unexpandablePHIDs;
+  }
+
   abstract public function validateMailReceiver($mail_receiver);
   abstract public function getPrivateReplyHandlerEmailAddress(
     PhabricatorUser $user);
@@ -297,6 +307,16 @@ private function expandRecipientPHIDs(array $to, array $cc) {
     $to_result = array();
     $cc_result = array();
 
+    // "Unexpandable" users have disengaged from an object (for example,
+    // by resigning from a revision).
+
+    // If such a user is still a direct recipient (for example, they're still
+    // on the Subscribers list) they're fair game, but group targets (like
+    // projects) will no longer include them when expanded.
+
+    $unexpandable = $this->getUnexpandablePHIDs();
+    $unexpandable = array_fuse($unexpandable);
+
     $all_phids = array_merge($to, $cc);
     if ($all_phids) {
       $map = id(new PhabricatorMetaMTAMemberQuery())
@@ -305,11 +325,21 @@ private function expandRecipientPHIDs(array $to, array $cc) {
         ->execute();
       foreach ($to as $phid) {
         foreach ($map[$phid] as $expanded) {
+          if ($expanded !== $phid) {
+            if (isset($unexpandable[$expanded])) {
+              continue;
+            }
+          }
           $to_result[$expanded] = $expanded;
         }
       }
       foreach ($cc as $phid) {
         foreach ($map[$phid] as $expanded) {
+          if ($expanded !== $phid) {
+            if (isset($unexpandable[$expanded])) {
+              continue;
+            }
+          }
           $cc_result[$expanded] = $expanded;
         }
       }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php b/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
index ea86594d9e..e05820c825 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
@@ -72,6 +72,15 @@ public function isInteresting() {
     return true;
   }
 
+  public function isResigned() {
+    switch ($this->getAuditStatus()) {
+      case PhabricatorAuditStatusConstants::RESIGNED:
+        return true;
+    }
+
+    return false;
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 31a06dcbd4..1c5998d583 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -657,7 +657,8 @@ public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
   public function isAutomaticallySubscribed($phid) {
 
     // TODO: This should also list auditors, but handling that is a bit messy
-    // right now because we are not guaranteed to have the data.
+    // right now because we are not guaranteed to have the data. (It should not
+    // include resigned auditors.)
 
     return ($phid == $this->getAuthorPHID());
   }
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 6bb7679fdc..167aa05fed 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -77,6 +77,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $oldTo = array();
   private $oldCC = array();
   private $mailRemovedPHIDs = array();
+  private $mailUnexpandablePHIDs = array();
 
   private $transactionQueue = array();
 
@@ -1204,6 +1205,7 @@ final public function applyTransactions(
         $this->mailShouldSend = true;
         $this->mailToPHIDs = $this->getMailTo($object);
         $this->mailCCPHIDs = $this->getMailCC($object);
+        $this->mailUnexpandablePHIDs = $this->newMailUnexpandablePHIDs($object);
 
         // Add any recipients who were previously on the notification list
         // but were removed by this change.
@@ -2562,7 +2564,13 @@ private function buildMail(
     $email_cc = $this->mailCCPHIDs;
     $email_cc = array_merge($email_cc, $this->heraldEmailPHIDs);
 
+    $unexpandable = $this->mailUnexpandablePHIDs;
+    if (!is_array($unexpandable)) {
+      $unexpandable = array();
+    }
+
     $targets = $this->buildReplyHandler($object)
+      ->setUnexpandablePHIDs($unexpandable)
       ->getMailTargets($email_to, $email_cc);
 
     // Set this explicitly before we start swapping out the effective actor.
@@ -2817,6 +2825,11 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
   }
 
 
+  protected function newMailUnexpandablePHIDs(PhabricatorLiskDAO $object) {
+    return array();
+  }
+
+
   /**
    * @task mail
    */
@@ -3617,6 +3630,7 @@ private function getAutomaticStateProperties() {
       'mailShouldSend',
       'mustEncrypt',
       'mailStamps',
+      'mailUnexpandablePHIDs',
     );
   }
 

From d0a2e3c54f9ae254c7158965480c892d1c03d70c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 09:39:27 -0800
Subject: [PATCH 507/865] Fix an issue where some Differential edit pathways
 may not have reviewers attached

Summary:
Depends on D19021. Ref T13053. When you "Subscribe", or make some other types of edits, we don't necessarily have reviewer data, but may now need it to do the new recipient list logic.

I don't have a totally clean way to deal with this in the general case in mind, but just load it for now so that things don't fatal.

Test Plan: Subscribed to a revision with the "Subscribe" action.

Reviewers: amckinley

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19022
---
 .../editor/DifferentialTransactionEditor.php  | 25 +++++++++++++++++++
 .../storage/DifferentialRevision.php          |  4 +++
 2 files changed, 29 insertions(+)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index cc29d69fe0..063df6c602 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -632,6 +632,8 @@ protected function shouldSendMail(
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
+    $this->requireReviewers($object);
+
     $phids = array();
     $phids[] = $object->getAuthorPHID();
     foreach ($object->getReviewers() as $reviewer) {
@@ -645,6 +647,8 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
   }
 
   protected function newMailUnexpandablePHIDs(PhabricatorLiskDAO $object) {
+    $this->requireReviewers($object);
+
     $phids = array();
 
     foreach ($object->getReviewers() as $reviewer) {
@@ -1737,4 +1741,25 @@ private function updateRevisionLineCounts(
     }
   }
 
+  private function requireReviewers(DifferentialRevision $revision) {
+    if ($revision->hasAttachedReviewers()) {
+      return;
+    }
+
+    $with_reviewers = id(new DifferentialRevisionQuery())
+      ->setViewer($this->getActor())
+      ->needReviewers(true)
+      ->withPHIDs(array($revision->getPHID()))
+      ->executeOne();
+    if (!$with_reviewers) {
+      throw new Exception(
+        pht(
+          'Failed to reload revision ("%s").',
+          $revision->getPHID()));
+    }
+
+    $revision->attachReviewers($with_reviewers->getReviewers());
+  }
+
+
 }
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 4591315207..e8fdf7e514 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -583,6 +583,10 @@ public function attachReviewers(array $reviewers) {
     return $this;
   }
 
+  public function hasAttachedReviewers() {
+    return ($this->reviewerStatus !== self::ATTACHABLE);
+  }
+
   public function getReviewerPHIDs() {
     $reviewers = $this->getReviewers();
     return mpull($reviewers, 'getReviewerPHID');

From 2bb4fc9ecea567b8df06a4965b6d1008a615c078 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 07:13:57 -0800
Subject: [PATCH 508/865] Fix a Phortune billing issue where subscription
 autopay could charge disabled cards

Summary:
See support email. There's nothing tricky here, we were just missing a check. The different parts of this got built at different times so I think this was simply overlooked.

Also add a redundant check just to future-proof this and be on the safe side.

Test Plan: Used `bin/phortune invoice` to charge a pact subscription. After deleting the card, the charge failed with an appropriate error.

Reviewers: amckinley

Differential Revision: https://secure.phabricator.com/D19020
---
 .../query/PhortunePaymentMethodQuery.php      | 25 ++++++-------------
 .../phortune/storage/PhortuneCart.php         |  7 ++++++
 .../storage/PhortunePaymentMethod.php         |  4 +++
 .../worker/PhortuneSubscriptionWorker.php     |  4 +++
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/applications/phortune/query/PhortunePaymentMethodQuery.php b/src/applications/phortune/query/PhortunePaymentMethodQuery.php
index 07d49a5909..42d54805e6 100644
--- a/src/applications/phortune/query/PhortunePaymentMethodQuery.php
+++ b/src/applications/phortune/query/PhortunePaymentMethodQuery.php
@@ -34,19 +34,12 @@ public function withStatuses(array $statuses) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new PhortunePaymentMethod();
+  }
+
   protected function loadPage() {
-    $table = new PhortunePaymentMethod();
-    $conn = $table->establishConnection('r');
-
-    $rows = queryfx_all(
-      $conn,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn),
-      $this->buildOrderClause($conn),
-      $this->buildLimitClause($conn));
-
-    return $table->loadAllFromArray($rows);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $methods) {
@@ -106,8 +99,8 @@ protected function willFilterPage(array $methods) {
     return $methods;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
@@ -144,9 +137,7 @@ protected function buildWhereClause(AphrontDatabaseConnection $conn) {
         $this->statuses);
     }
 
-    $where[] = $this->buildPagingClause($conn);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {
diff --git a/src/applications/phortune/storage/PhortuneCart.php b/src/applications/phortune/storage/PhortuneCart.php
index af2b386dfe..07554ccb87 100644
--- a/src/applications/phortune/storage/PhortuneCart.php
+++ b/src/applications/phortune/storage/PhortuneCart.php
@@ -118,6 +118,13 @@ public function willApplyCharge(
       ->setAmountAsCurrency($this->getTotalPriceAsCurrency());
 
     if ($method) {
+      if (!$method->isActive()) {
+        throw new Exception(
+          pht(
+            'Attempting to apply a charge using an inactive '.
+            'payment method ("%s")!',
+            $method->getPHID()));
+      }
       $charge->setPaymentMethodPHID($method->getPHID());
     }
 
diff --git a/src/applications/phortune/storage/PhortunePaymentMethod.php b/src/applications/phortune/storage/PhortunePaymentMethod.php
index 8044168ba4..1712d3f973 100644
--- a/src/applications/phortune/storage/PhortunePaymentMethod.php
+++ b/src/applications/phortune/storage/PhortunePaymentMethod.php
@@ -128,6 +128,10 @@ public function getDisplayExpires() {
     return $month.'/'.$year;
   }
 
+  public function isActive() {
+    return ($this->getStatus() === self::STATUS_ACTIVE);
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/phortune/worker/PhortuneSubscriptionWorker.php b/src/applications/phortune/worker/PhortuneSubscriptionWorker.php
index 097fb54dd9..d05aacbb7c 100644
--- a/src/applications/phortune/worker/PhortuneSubscriptionWorker.php
+++ b/src/applications/phortune/worker/PhortuneSubscriptionWorker.php
@@ -141,6 +141,10 @@ private function chargeSubscription(
     $method = id(new PhortunePaymentMethodQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($subscription->getDefaultPaymentMethodPHID()))
+      ->withStatuses(
+        array(
+          PhortunePaymentMethod::STATUS_ACTIVE,
+        ))
       ->executeOne();
     if (!$method) {
       $issues[] = pht(

From 0b62981c898114573faf79917ac94161d2b17331 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Feb 2018 07:13:57 -0800
Subject: [PATCH 509/865] (stable) Fix a Phortune billing issue where
 subscription autopay could charge disabled cards

Summary:
See support email. There's nothing tricky here, we were just missing a check. The different parts of this got built at different times so I think this was simply overlooked.

Also add a redundant check just to future-proof this and be on the safe side.

Test Plan: Used `bin/phortune invoice` to charge a pact subscription. After deleting the card, the charge failed with an appropriate error.

Reviewers: amckinley

Differential Revision: https://secure.phabricator.com/D19020
---
 .../query/PhortunePaymentMethodQuery.php      | 25 ++++++-------------
 .../phortune/storage/PhortuneCart.php         |  7 ++++++
 .../storage/PhortunePaymentMethod.php         |  4 +++
 .../worker/PhortuneSubscriptionWorker.php     |  4 +++
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/applications/phortune/query/PhortunePaymentMethodQuery.php b/src/applications/phortune/query/PhortunePaymentMethodQuery.php
index 07d49a5909..42d54805e6 100644
--- a/src/applications/phortune/query/PhortunePaymentMethodQuery.php
+++ b/src/applications/phortune/query/PhortunePaymentMethodQuery.php
@@ -34,19 +34,12 @@ public function withStatuses(array $statuses) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new PhortunePaymentMethod();
+  }
+
   protected function loadPage() {
-    $table = new PhortunePaymentMethod();
-    $conn = $table->establishConnection('r');
-
-    $rows = queryfx_all(
-      $conn,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn),
-      $this->buildOrderClause($conn),
-      $this->buildLimitClause($conn));
-
-    return $table->loadAllFromArray($rows);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $methods) {
@@ -106,8 +99,8 @@ protected function willFilterPage(array $methods) {
     return $methods;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
@@ -144,9 +137,7 @@ protected function buildWhereClause(AphrontDatabaseConnection $conn) {
         $this->statuses);
     }
 
-    $where[] = $this->buildPagingClause($conn);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {
diff --git a/src/applications/phortune/storage/PhortuneCart.php b/src/applications/phortune/storage/PhortuneCart.php
index af2b386dfe..07554ccb87 100644
--- a/src/applications/phortune/storage/PhortuneCart.php
+++ b/src/applications/phortune/storage/PhortuneCart.php
@@ -118,6 +118,13 @@ public function willApplyCharge(
       ->setAmountAsCurrency($this->getTotalPriceAsCurrency());
 
     if ($method) {
+      if (!$method->isActive()) {
+        throw new Exception(
+          pht(
+            'Attempting to apply a charge using an inactive '.
+            'payment method ("%s")!',
+            $method->getPHID()));
+      }
       $charge->setPaymentMethodPHID($method->getPHID());
     }
 
diff --git a/src/applications/phortune/storage/PhortunePaymentMethod.php b/src/applications/phortune/storage/PhortunePaymentMethod.php
index 8044168ba4..1712d3f973 100644
--- a/src/applications/phortune/storage/PhortunePaymentMethod.php
+++ b/src/applications/phortune/storage/PhortunePaymentMethod.php
@@ -128,6 +128,10 @@ public function getDisplayExpires() {
     return $month.'/'.$year;
   }
 
+  public function isActive() {
+    return ($this->getStatus() === self::STATUS_ACTIVE);
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/phortune/worker/PhortuneSubscriptionWorker.php b/src/applications/phortune/worker/PhortuneSubscriptionWorker.php
index 097fb54dd9..d05aacbb7c 100644
--- a/src/applications/phortune/worker/PhortuneSubscriptionWorker.php
+++ b/src/applications/phortune/worker/PhortuneSubscriptionWorker.php
@@ -141,6 +141,10 @@ private function chargeSubscription(
     $method = id(new PhortunePaymentMethodQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($subscription->getDefaultPaymentMethodPHID()))
+      ->withStatuses(
+        array(
+          PhortunePaymentMethod::STATUS_ACTIVE,
+        ))
       ->executeOne();
     if (!$method) {
       $issues[] = pht(

From 948b0ceca466457b97798eb920554aa353aa112b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 06:47:24 -0800
Subject: [PATCH 510/865] Configure a whitelist of remote addresses for
 Postmark inbound webhooks

Summary:
Ref T13053. Postmark support recommends testing requests against a whitelist of known remote addresses to determine request authenticity. Today, the list can be found here:

<https://postmarkapp.com/support/article/800-ips-for-firewalls>

This is potentially less robust than, e.g., HMAC verification, since they may need to add new datacenters or support IPv6 or something. Users might also have weird network topologies where everything is proxied, and this makes testing/simulating more difficult.

Allow users to configure the list so that they don't need to hack things apart if Postmark adds a new datacenter or remote addresses are unreliable for some other reason, but ship with safe defaults for today.

Test Plan:
Tried to make local requests, got kicked out. Added `0.0.0.0/0` to the list, stopped getting kicked out.

I don't have a convenient way to route real Postmark traffic to my development laptop with an authentic remote address so I haven't verified that the published remote address is legitimate, but I'll vet that in production when I go through all the other mailers.

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19025
---
 ...ricatorMailImplementationPostmarkAdapter.php | 12 ++++++++++++
 ...bricatorMetaMTAPostmarkReceiveController.php | 15 +++++++++++++++
 .../configuring_inbound_email.diviner           |  4 ++++
 .../configuring_outbound_email.diviner          | 17 +++++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php
index bd5ee820af..5792ba08f8 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPostmarkAdapter.php
@@ -73,12 +73,24 @@ protected function validateOptions(array $options) {
       $options,
       array(
         'access-token' => 'string',
+        'inbound-addresses' => 'list<string>',
       ));
+
+    // Make sure this is properly formatted.
+    PhutilCIDRList::newList($options['inbound-addresses']);
   }
 
   public function newDefaultOptions() {
     return array(
       'access-token' => null,
+      'inbound-addresses' => array(
+        // Via Postmark support circa February 2018, see:
+        //
+        // https://postmarkapp.com/support/article/800-ips-for-firewalls
+        //
+        // "Configuring Outbound Email" should be updated if this changes.
+        '50.31.156.6/32',
+      ),
     );
   }
 
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php
index a54da6fb40..345cd93fe1 100644
--- a/src/applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAPostmarkReceiveController.php
@@ -20,6 +20,21 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
+    $remote_address = $request->getRemoteAddress();
+    $any_remote_match = false;
+    foreach ($mailers as $mailer) {
+      $inbound_addresses = $mailer->getOption('inbound-addresses');
+      $cidr_list = PhutilCIDRList::newList($inbound_addresses);
+      if ($cidr_list->containsAddress($remote_address)) {
+        $any_remote_match = true;
+        break;
+      }
+    }
+
+    if (!$any_remote_match) {
+      return new Aphront400Response();
+    }
+
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
     $raw_input = PhabricatorStartup::getRawInput();
 
diff --git a/src/docs/user/configuration/configuring_inbound_email.diviner b/src/docs/user/configuration/configuring_inbound_email.diviner
index ada4ddb828..f4f367d57e 100644
--- a/src/docs/user/configuration/configuring_inbound_email.diviner
+++ b/src/docs/user/configuration/configuring_inbound_email.diviner
@@ -141,6 +141,10 @@ webhook URI in the Postmark control panel:
 https://<phabricator.yourdomain.com>/mail/postmark/
 ```
 
+See also the Postmark section in @{article:Configuring Outbound Email} for
+discussion of the remote address whitelist used to verify that requests this
+endpoint receives are authentic requests originating from Postmark.
+
 
 = SendGrid Setup =
 
diff --git a/src/docs/user/configuration/configuring_outbound_email.diviner b/src/docs/user/configuration/configuring_outbound_email.diviner
index d2daf7a40a..37a344c275 100644
--- a/src/docs/user/configuration/configuring_outbound_email.diviner
+++ b/src/docs/user/configuration/configuring_outbound_email.diviner
@@ -157,6 +157,23 @@ Postmark is a third-party email delivery serivice. You can learn more at
 To use this mailer, set `type` to `postmark`, then configure these `options`:
 
   - `access-token`: Required string. Your Postmark access token.
+  - `inbound-addresses`: Optional list<string>. Address ranges which you
+    will accept inbound Postmark HTTP webook requests from.
+
+The default address list is preconfigured with Postmark's address range, so
+you generally will not need to set or adjust it.
+
+The option accepts a list of CIDR ranges, like `1.2.3.4/16` (IPv4) or
+`::ffff:0:0/96` (IPv6). The default ranges are:
+
+```lang=json
+[
+  "50.31.156.6/32"
+]
+```
+
+The default address ranges were last updated in February 2018, and were
+documented at: <https://postmarkapp.com/support/article/800-ips-for-firewalls>
 
 
 Mailer: Amazon SES

From 942b17a980888b09980217735b12c9dd583a3b8c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 08:57:07 -0800
Subject: [PATCH 511/865] Improve correctness of email address escaping in
 Mailgun/Postmark

Summary: Ref T13053. Uses the changes in D19026 to escape mail addresses. Those rules may not be right yet, but they're at least all in one place, have test coverage, and aren't obviously incorrect.

Test Plan: Will vet this more extensively when re-testing all mailers.

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19027
---
 .../adapter/PhabricatorMailImplementationAdapter.php     | 5 +++--
 .../PhabricatorMailImplementationMailgunAdapter.php      | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
index ce56345194..dfbe891651 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
@@ -96,8 +96,9 @@ public function prepareForSend() {
 
   protected function renderAddress($email, $name = null) {
     if (strlen($name)) {
-      // TODO: This needs to be escaped correctly.
-      return "{$name} <{$email}>";
+      return (string)id(new PhutilEmailAddress())
+        ->setDisplayName($name)
+        ->setAddress($email);
     } else {
       return $email;
     }
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
index bed0dada63..12c54e0d6a 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
@@ -21,7 +21,7 @@ public function addReplyTo($email, $name = '') {
     if (empty($this->params['reply-to'])) {
       $this->params['reply-to'] = array();
     }
-    $this->params['reply-to'][] = "{$name} <{$email}>";
+    $this->params['reply-to'][] = $this->renderAddress($name, $email);
     return $this;
   }
 
@@ -110,11 +110,8 @@ public function send() {
     }
 
     $from = idx($this->params, 'from');
-    if (idx($this->params, 'from-name')) {
-      $params['from'] = "\"{$this->params['from-name']}\" <{$from}>";
-    } else {
-      $params['from'] = $from;
-    }
+    $from_name = idx($this->params, 'from-name');
+    $params['from'] = $this->renderAddress($from, $from_name);
 
     if (idx($this->params, 'reply-to')) {
       $replyto = $this->params['reply-to'];

From a8f937d3138a4b02203964e995945c58be49293c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 09:03:26 -0800
Subject: [PATCH 512/865] Only add the Mail "STAMPS" body section if there are
 stamps

Summary: Ref T13053. Some mail (like push notification mail) doesn't currently generate any stamps. Drop this section if there aren't any stamps on the mail.

Test Plan: Will check push mail in production.

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19028
---
 .../replyhandler/PhabricatorMailTarget.php    | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/applications/metamta/replyhandler/PhabricatorMailTarget.php b/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
index 5d8378e8af..4bd5105135 100644
--- a/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
+++ b/src/applications/metamta/replyhandler/PhabricatorMailTarget.php
@@ -66,27 +66,28 @@ public function willSendMail(PhabricatorMetaMTAMail $mail) {
 
     if ($show_stamps) {
       $stamps = $mail->getMailStamps();
-
-      $body .= "\n";
-      $body .= pht('STAMPS');
-      $body .= "\n";
-      $body .= implode(' ', $stamps);
-      $body .= "\n";
-
-      if ($has_html) {
-        $html = array();
-        $html[] = phutil_tag('strong', array(), pht('STAMPS'));
-        $html[] = phutil_tag('br');
-        $html[] = phutil_tag(
-          'span',
-          array(
-            'style' => 'font-size: smaller; color: #92969D',
-          ),
-          phutil_implode_html(' ', $stamps));
-        $html[] = phutil_tag('br');
-        $html[] = phutil_tag('br');
-        $html = phutil_tag('div', array(), $html);
-        $html_body .= hsprintf('%s', $html);
+      if ($stamps) {
+        $body .= "\n";
+        $body .= pht('STAMPS');
+        $body .= "\n";
+        $body .= implode(' ', $stamps);
+        $body .= "\n";
+
+        if ($has_html) {
+          $html = array();
+          $html[] = phutil_tag('strong', array(), pht('STAMPS'));
+          $html[] = phutil_tag('br');
+          $html[] = phutil_tag(
+            'span',
+            array(
+              'style' => 'font-size: smaller; color: #92969D',
+            ),
+            phutil_implode_html(' ', $stamps));
+          $html[] = phutil_tag('br');
+          $html[] = phutil_tag('br');
+          $html = phutil_tag('div', array(), $html);
+          $html_body .= hsprintf('%s', $html);
+        }
       }
     }
 

From bae9f459ab7f0e1dd0a71d4f4dac27d94d518907 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 09:06:40 -0800
Subject: [PATCH 513/865] Pass HTML bodies to push email

Summary: Depends on D19028. Ref T13053. Fixes T6576. An HTML body was built here, but not passed to the actual mail message.

Test Plan: Will verify production push mail.

Maniphest Tasks: T13053, T6576

Differential Revision: https://secure.phabricator.com/D19029
---
 .../repository/worker/PhabricatorRepositoryPushMailWorker.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php b/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
index 5ffaf0a5c2..554c2cf772 100644
--- a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
@@ -123,6 +123,7 @@ private function sendMail(
       ->setSubject($subject)
       ->setFrom($event->getPusherPHID())
       ->setBody($body->render())
+      ->setHTMLBody($body->renderHTML())
       ->setThreadID($event->getPHID(), $is_new = true)
       ->setIsBulk(true);
 

From 6186f0aa91b6c5d8faa6eecc2a0e98571bb34153 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 09:19:43 -0800
Subject: [PATCH 514/865] Briefly document mail stamps and remove obsolete
 header documentation

Summary: Fixes T10189. Ref T13053. We haven't sent these headers in a very long time. Briefly mention the new stamps header instead, although I expect to integrate stamp documentation into the UI in a more cohesive way in the future.

Test Plan: Read documentation.

Maniphest Tasks: T13053, T10189

Differential Revision: https://secure.phabricator.com/D19030
---
 .../storage/PhabricatorMetaMTAMail.php        |  2 +-
 src/docs/user/userguide/mail_rules.diviner    | 71 +++++--------------
 2 files changed, 20 insertions(+), 53 deletions(-)

diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 4a9bc68322..f16b50bf11 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -829,7 +829,7 @@ private function buildMailer(PhabricatorMailImplementationAdapter $mailer) {
 
     $stamps = $this->getMailStamps();
     if ($stamps) {
-      $headers[] = array('X-Phabricator-Stamps', implode(', ', $stamps));
+      $headers[] = array('X-Phabricator-Stamps', implode(' ', $stamps));
     }
 
     $raw_body = idx($params, 'body', '');
diff --git a/src/docs/user/userguide/mail_rules.diviner b/src/docs/user/userguide/mail_rules.diviner
index 3640f5e5a5..61bc3210e9 100644
--- a/src/docs/user/userguide/mail_rules.diviner
+++ b/src/docs/user/userguide/mail_rules.diviner
@@ -3,7 +3,8 @@
 
 How to effectively manage Phabricator email notifications.
 
-= Overview =
+Overview
+========
 
 Phabricator uses email as a major notification channel, but the amount of email
 it sends can seem overwhelming if you're working on an active team. This
@@ -13,69 +14,35 @@ By far the best approach to managing mail is to **write mail rules** to
 categorize mail. Essentially all modern mail clients allow you to quickly
 write sophisticated rules to route, categorize, or delete email.
 
-= Reducing Email =
+Reducing Email
+==============
 
 You can reduce the amount of email you receive by turning off some types of
 email in {nav Settings > Email Preferences}. For example, you can turn off email
 produced by your own actions (like when you comment on a revision), and some
 types of less-important notifications about events.
 
-= Mail Rules =
+Mail Rules
+==========
 
 The best approach to managing mail is to write mail rules. Simply writing rules
 to move mail from Differential, Maniphest and Herald to separate folders will
 vastly simplify mail management.
 
-Phabricator also sets a large number of headers (see below) which can allow you
-to write more sophisticated mail rules.
+Phabricator also adds mail headers (see below) which can allow you to write
+more sophisticated mail rules.
 
-= Mail Headers =
+Mail Headers
+============
 
-Phabricator sends a variety of mail headers that can be useful in crafting rules
-to route and manage mail.
+Phabricator sends various information in mail headers that can be useful in
+crafting rules to route and manage mail. To see a full list of headers, use
+the "View Raw Message" feature in your mail client.
 
-Headers in plural contain lists. A list containing two items, `1` and
-`15` will generally be formatted like this:
+The most useful header for routing is generally `X-Phabricator-Stamps`. This
+is a list of attributes which describe the object the mail is about and the
+actions which the mail informs you about.
 
-  X-Header: <1>, <15>
-
-The intent is to allow you to write a rule which matches against "<1>". If you
-just match against "1", you'll incorrectly match "15", but matching "<1>" will
-correctly match only "<1>".
-
-Some other headers use a single value but can be presented multiple times.
-It is to support e-mail clients which are not able to create rules using regular
-expressions or wildcards (namely Outlook).
-
-The headers Phabricator adds to mail are:
-
-  - `X-Phabricator-Sent-This-Message`: this is attached to all mail
-    Phabricator sends. You can use it to differentiate between email from
-    Phabricator and replies/forwards of Phabricator mail from human beings.
-  - `X-Phabricator-To`: this is attached to all mail Phabricator sends.
-    It shows the PHIDs of the original "To" line, before any mutation
-    by the mailer configuration.
-  - `X-Phabricator-Cc`: this is attached to all mail Phabricator sends.
-    It shows the PHIDs of the original "Cc" line, before any mutation by the
-    mailer configuration.
-  - `X-Differential-Author`: this is attached to Differential mail and shows
-    the revision's author. You can use it to filter mail about your revisions
-    (or other users' revisions).
-  - `X-Differential-Reviewer`: this is attached to Differential mail and
-    shows the reviewers. You can use it to filter mail about revisions you
-    are reviewing, versus revisions you are explicitly CC'd on or CC'd as
-    a result of Herald rules.
-  - `X-Differential-Reviewers`: list version of the previous.
-  - `X-Differential-CC`: this is attached to Differential mail and shows
-    the CCs on the revision.
-  - `X-Differential-CCs`: list version of the previous.
-  - `X-Differential-Explicit-CC`: this is attached to Differential mail and
-    shows the explicit CCs on the revision (those that were added by humans,
-    not by Herald).
-  - `X-Differential-Explicit-CCs`: list version of the previous.
-  - `X-Phabricator-Mail-Tags`: this is attached to some mail and has
-    a list of descriptors about the mail. (This is fairly new and subject
-    to some change.)
-  - `X-Herald-Rules`: this is attached to some mail and shows Herald rule
-    IDs which have triggered for the object. You can use this to sort or
-    categorize mail that has triggered specific rules.
+If you use a client which can not perform header matching (like Gmail), you can
+change the {nav Settings > Email Format > Send Stamps} setting to include the
+stamps in the mail body and then match them with body rules.

From bca9c08953bd40c0c534f7d94651e37c3513af85 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 09:36:47 -0800
Subject: [PATCH 515/865] Add an "Acting user" field to Herald

Summary:
Ref T13053. Fixes T7804. Adds "Acting user" so you can have "always email me" stuff skip things you did or keep an eye on suspicious interns.

For the test console, the current user is the acting user.

For pushes, the pusher is the acting user.

Test Plan: Wrote acting user rules, triggered them via test console and via multiple actors on real objects.

Maniphest Tasks: T13053, T7804

Differential Revision: https://secure.phabricator.com/D19031
---
 src/__phutil_library_map__.php                |  2 ++
 .../engine/DiffusionCommitHookEngine.php      |  6 +++-
 .../herald/adapter/HeraldAdapter.php          | 10 ++++++
 .../HeraldTestConsoleController.php           |  1 +
 .../herald/field/HeraldActingUserField.php    | 32 +++++++++++++++++++
 ...habricatorApplicationTransactionEditor.php |  1 +
 6 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/herald/field/HeraldActingUserField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 301459869f..73632d11b4 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1346,6 +1346,7 @@
     'HarbormasterWaitForPreviousBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php',
     'HarbormasterWorker' => 'applications/harbormaster/worker/HarbormasterWorker.php',
     'HarbormasterWorkingCopyArtifact' => 'applications/harbormaster/artifact/HarbormasterWorkingCopyArtifact.php',
+    'HeraldActingUserField' => 'applications/herald/field/HeraldActingUserField.php',
     'HeraldAction' => 'applications/herald/action/HeraldAction.php',
     'HeraldActionGroup' => 'applications/herald/action/HeraldActionGroup.php',
     'HeraldActionRecord' => 'applications/herald/storage/HeraldActionRecord.php',
@@ -6589,6 +6590,7 @@
     'HarbormasterWaitForPreviousBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterWorker' => 'PhabricatorWorker',
     'HarbormasterWorkingCopyArtifact' => 'HarbormasterDrydockLeaseArtifact',
+    'HeraldActingUserField' => 'HeraldField',
     'HeraldAction' => 'Phobject',
     'HeraldActionGroup' => 'HeraldGroup',
     'HeraldActionRecord' => 'HeraldDAO',
diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index 99df0e54af..a0769a51f0 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -297,7 +297,11 @@ private function applyHeraldRules(
       return;
     }
 
-    $adapter_template->setHookEngine($this);
+    $viewer = $this->getViewer();
+
+    $adapter_template
+      ->setHookEngine($this)
+      ->setActingAsPHID($viewer->getPHID());
 
     $engine = new HeraldEngine();
     $rules = null;
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index cc0fdbd3b5..940d604019 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -40,6 +40,7 @@ abstract class HeraldAdapter extends Phobject {
   private $forbiddenActions = array();
   private $viewer;
   private $mustEncryptReasons = array();
+  private $actingAsPHID;
 
   public function getEmailPHIDs() {
     return array_values($this->emailPHIDs);
@@ -49,6 +50,15 @@ public function getForcedEmailPHIDs() {
     return array_values($this->forcedEmailPHIDs);
   }
 
+  final public function setActingAsPHID($acting_as_phid) {
+    $this->actingAsPHID = $acting_as_phid;
+    return $this;
+  }
+
+  final public function getActingAsPHID() {
+    return $this->actingAsPHID;
+  }
+
   public function addEmailPHID($phid, $force) {
     $this->emailPHIDs[$phid] = $phid;
     if ($force) {
diff --git a/src/applications/herald/controller/HeraldTestConsoleController.php b/src/applications/herald/controller/HeraldTestConsoleController.php
index 8a7a94963d..4ddab2669b 100644
--- a/src/applications/herald/controller/HeraldTestConsoleController.php
+++ b/src/applications/herald/controller/HeraldTestConsoleController.php
@@ -41,6 +41,7 @@ public function handleRequest(AphrontRequest $request) {
 
     $adapter
       ->setIsNewObject(false)
+      ->setActingAsPHID($viewer->getPHID())
       ->setViewer($viewer);
 
     $rules = id(new HeraldRuleQuery())
diff --git a/src/applications/herald/field/HeraldActingUserField.php b/src/applications/herald/field/HeraldActingUserField.php
new file mode 100644
index 0000000000..2245c7e9f7
--- /dev/null
+++ b/src/applications/herald/field/HeraldActingUserField.php
@@ -0,0 +1,32 @@
+<?php
+
+final class HeraldActingUserField
+  extends HeraldField {
+
+  const FIELDCONST = 'herald.acting-user';
+
+  public function getHeraldFieldName() {
+    return pht('Acting user');
+  }
+
+  public function getHeraldFieldValue($object) {
+    return $this->getAdapter()->getActingAsPHID();
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID;
+  }
+
+  protected function getDatasource() {
+    return new PhabricatorPeopleDatasource();
+  }
+
+  public function supportsObject($object) {
+    return true;
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldEditFieldGroup::FIELDGROUPKEY;
+  }
+
+}
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 167aa05fed..8c319fc61e 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -3254,6 +3254,7 @@ private function applyHeraldRules(
     $adapter = $this->buildHeraldAdapter($object, $xactions)
       ->setContentSource($this->getContentSource())
       ->setIsNewObject($this->getIsNewObject())
+      ->setActingAsPHID($this->getActingAsPHID())
       ->setAppliedTransactions($xactions);
 
     if ($this->getApplicationEmail()) {

From 0402a79e0e5723a54ecffaf5c6bc1c1d89cbe51b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 09:46:56 -0800
Subject: [PATCH 516/865] Render object remarkup references in a text context
 as "Dxxx <uri>"

Summary:
Depends on D19031. Fixes T11389. Currently, we render `Dxxx` in a text context (plain text email) as just a URI.

Instead, render it like `Dxxx <uri>`. This is more faithful to the original intent and preserves `T123/T456` as two separate, usable links.

Test Plan: Wrote `T123/T234` in a task, pulled mail for it with `bin/mail show-outbound`, saw separate clickable links.

Maniphest Tasks: T11389

Differential Revision: https://secure.phabricator.com/D19032
---
 .../markup/rule/PhabricatorObjectRemarkupRule.php               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php b/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
index 35c0ecfad0..fbbfa36805 100644
--- a/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
+++ b/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
@@ -75,7 +75,7 @@ protected function renderObjectRefForAnyMedia(
     }
 
     if ($this->getEngine()->isTextMode()) {
-      return PhabricatorEnv::getProductionURI($href);
+      return $text.' <'.PhabricatorEnv::getProductionURI($href).'>';
     } else if ($this->getEngine()->isHTMLMailMode()) {
       $href = PhabricatorEnv::getProductionURI($href);
       return $this->renderObjectTagForMail($text, $href, $handle);

From ab04d2179bf1322ec31f03e46c28bebb0334f135 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 10:37:47 -0800
Subject: [PATCH 517/865] Add "Mute/Unmute" for subscribable objects

Summary: Ref T13053. See PHI126. Add an explicit "Mute" action to kill mail and notifications for a particular object.

Test Plan: Muted and umuted an object while interacting with it. Saw mail route appropriately.

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19033
---
 resources/celerity/map.php                    |  6 +-
 src/__phutil_library_map__.php                |  6 ++
 .../metamta/query/PhabricatorMetaMTAActor.php |  4 +
 .../storage/PhabricatorMetaMTAMail.php        | 21 +++++
 .../PhabricatorSubscriptionsApplication.php   |  5 +-
 ...PhabricatorSubscriptionsMuteController.php | 92 +++++++++++++++++++
 ...habricatorSubscriptionsUIEventListener.php | 55 ++++++++---
 .../edges/PhabricatorMutedByEdgeType.php      | 16 ++++
 .../edges/PhabricatorMutedEdgeType.php        | 16 ++++
 ...habricatorApplicationTransactionEditor.php | 28 ++++++
 .../PhabricatorApplicationTransaction.php     |  2 +
 src/view/layout/PhabricatorActionView.php     | 10 ++
 webroot/rsrc/css/phui/phui-action-list.css    | 17 ++--
 13 files changed, 254 insertions(+), 24 deletions(-)
 create mode 100644 src/applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php
 create mode 100644 src/applications/transactions/edges/PhabricatorMutedByEdgeType.php
 create mode 100644 src/applications/transactions/edges/PhabricatorMutedEdgeType.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d9aebf32bc..17138d6604 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '51debec3',
+    'core.pkg.css' => 'ce8c2a58',
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -136,7 +136,7 @@
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
     'rsrc/css/phui/object-item/phui-oi-list-view.css' => '6ae18df0',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
-    'rsrc/css/phui/phui-action-list.css' => 'f7f61a34',
+    'rsrc/css/phui/phui-action-list.css' => '0bcd9a45',
     'rsrc/css/phui/phui-action-panel.css' => 'b4798122',
     'rsrc/css/phui/phui-badge.css' => '22c0cf4f',
     'rsrc/css/phui/phui-basic-nav-view.css' => '98c11ab3',
@@ -766,7 +766,7 @@
     'path-typeahead' => 'f7fc67ec',
     'people-picture-menu-item-css' => 'a06f7f34',
     'people-profile-css' => '4df76faf',
-    'phabricator-action-list-view-css' => 'f7f61a34',
+    'phabricator-action-list-view-css' => '0bcd9a45',
     'phabricator-busy' => '59a7976a',
     'phabricator-chatlog-css' => 'd295b020',
     'phabricator-content-source-view-css' => '4b8b05d4',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 73632d11b4..9342935ca1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3291,6 +3291,8 @@
     'PhabricatorMultiFactorSettingsPanel' => 'applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php',
     'PhabricatorMultimeterApplication' => 'applications/multimeter/application/PhabricatorMultimeterApplication.php',
     'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/PhabricatorMustVerifyEmailController.php',
+    'PhabricatorMutedByEdgeType' => 'applications/transactions/edges/PhabricatorMutedByEdgeType.php',
+    'PhabricatorMutedEdgeType' => 'applications/transactions/edges/PhabricatorMutedEdgeType.php',
     'PhabricatorMySQLConfigOptions' => 'applications/config/option/PhabricatorMySQLConfigOptions.php',
     'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/PhabricatorMySQLFileStorageEngine.php',
     'PhabricatorMySQLSearchHost' => 'infrastructure/cluster/search/PhabricatorMySQLSearchHost.php',
@@ -4240,6 +4242,7 @@
     'PhabricatorSubscriptionsHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsHeraldAction.php',
     'PhabricatorSubscriptionsListController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsListController.php',
     'PhabricatorSubscriptionsMailEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsMailEngineExtension.php',
+    'PhabricatorSubscriptionsMuteController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php',
     'PhabricatorSubscriptionsRemoveSelfHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSelfHeraldAction.php',
     'PhabricatorSubscriptionsRemoveSubscribersHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSubscribersHeraldAction.php',
     'PhabricatorSubscriptionsSearchEngineAttachment' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineAttachment.php',
@@ -8808,6 +8811,8 @@
     'PhabricatorMultiFactorSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorMultimeterApplication' => 'PhabricatorApplication',
     'PhabricatorMustVerifyEmailController' => 'PhabricatorAuthController',
+    'PhabricatorMutedByEdgeType' => 'PhabricatorEdgeType',
+    'PhabricatorMutedEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorMySQLConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorMySQLFileStorageEngine' => 'PhabricatorFileStorageEngine',
     'PhabricatorMySQLSearchHost' => 'PhabricatorSearchHost',
@@ -9960,6 +9965,7 @@
     'PhabricatorSubscriptionsHeraldAction' => 'HeraldAction',
     'PhabricatorSubscriptionsListController' => 'PhabricatorController',
     'PhabricatorSubscriptionsMailEngineExtension' => 'PhabricatorMailEngineExtension',
+    'PhabricatorSubscriptionsMuteController' => 'PhabricatorController',
     'PhabricatorSubscriptionsRemoveSelfHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
     'PhabricatorSubscriptionsRemoveSubscribersHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
     'PhabricatorSubscriptionsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
diff --git a/src/applications/metamta/query/PhabricatorMetaMTAActor.php b/src/applications/metamta/query/PhabricatorMetaMTAActor.php
index 1f4cc7da12..cf2060a8f7 100644
--- a/src/applications/metamta/query/PhabricatorMetaMTAActor.php
+++ b/src/applications/metamta/query/PhabricatorMetaMTAActor.php
@@ -21,6 +21,7 @@ final class PhabricatorMetaMTAActor extends Phobject {
   const REASON_ROUTE_AS_NOTIFICATION = 'route-as-notification';
   const REASON_ROUTE_AS_MAIL = 'route-as-mail';
   const REASON_UNVERIFIED = 'unverified';
+  const REASON_MUTED = 'muted';
 
   private $phid;
   private $emailAddress;
@@ -116,6 +117,7 @@ public static function getReasonName($reason) {
       self::REASON_ROUTE_AS_NOTIFICATION => pht('Route as Notification'),
       self::REASON_ROUTE_AS_MAIL => pht('Route as Mail'),
       self::REASON_UNVERIFIED => pht('Address Not Verified'),
+      self::REASON_MUTED => pht('Muted'),
     );
 
     return idx($names, $reason, pht('Unknown ("%s")', $reason));
@@ -172,6 +174,8 @@ public static function getReasonDescription($reason) {
         'in Herald.'),
       self::REASON_UNVERIFIED => pht(
         'This recipient does not have a verified primary email address.'),
+      self::REASON_MUTED => pht(
+        'This recipient has muted notifications for this object.'),
     );
 
     return idx($descriptions, $reason, pht('Unknown Reason ("%s")', $reason));
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index f16b50bf11..9dfd6a3eb6 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -160,6 +160,15 @@ private function getExcludeMailRecipientPHIDs() {
     return $this->getParam('exclude', array());
   }
 
+  public function setMutedPHIDs(array $muted) {
+    $this->setParam('muted', $muted);
+    return $this;
+  }
+
+  private function getMutedPHIDs() {
+    return $this->getParam('muted', array());
+  }
+
   public function setForceHeraldMailRecipientPHIDs(array $force) {
     $this->setParam('herald-force-recipients', $force);
     return $this;
@@ -1113,6 +1122,18 @@ private function loadActors(array $actor_phids) {
       }
     }
 
+    // Exclude muted recipients. We're doing this after saving deliverability
+    // so that Herald "Send me an email" actions can still punch through a
+    // mute.
+
+    foreach ($this->getMutedPHIDs() as $muted_phid) {
+      $muted_actor = idx($actors, $muted_phid);
+      if (!$muted_actor) {
+        continue;
+      }
+      $muted_actor->setUndeliverable(PhabricatorMetaMTAActor::REASON_MUTED);
+    }
+
     // For the rest of the rules, order matters. We're going to run all the
     // possible rules in order from weakest to strongest, and let the strongest
     // matching rule win. The weaker rules leave annotations behind which help
diff --git a/src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php b/src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php
index 56759f5dc3..2de2994a92 100644
--- a/src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php
+++ b/src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php
@@ -24,7 +24,10 @@ public function getRoutes() {
     return array(
       '/subscriptions/' => array(
         '(?P<action>add|delete)/'.
-        '(?P<phid>[^/]+)/' => 'PhabricatorSubscriptionsEditController',
+          '(?P<phid>[^/]+)/' => 'PhabricatorSubscriptionsEditController',
+        'mute/' => array(
+          '(?P<phid>[^/]+)/' => 'PhabricatorSubscriptionsMuteController',
+        ),
         'list/(?P<phid>[^/]+)/' => 'PhabricatorSubscriptionsListController',
         'transaction/(?P<type>add|rem)/(?<phid>[^/]+)/'
           => 'PhabricatorSubscriptionsTransactionController',
diff --git a/src/applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php b/src/applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php
new file mode 100644
index 0000000000..1369643ffc
--- /dev/null
+++ b/src/applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php
@@ -0,0 +1,92 @@
+<?php
+
+final class PhabricatorSubscriptionsMuteController
+  extends PhabricatorController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+    $phid = $request->getURIData('phid');
+
+    $handle = id(new PhabricatorHandleQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($phid))
+      ->executeOne();
+
+    $object = id(new PhabricatorObjectQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($phid))
+      ->executeOne();
+
+    if (!($object instanceof PhabricatorSubscribableInterface)) {
+      return new Aphront400Response();
+    }
+
+    $muted_type = PhabricatorMutedByEdgeType::EDGECONST;
+
+    $edge_query = id(new PhabricatorEdgeQuery())
+      ->withSourcePHIDs(array($object->getPHID()))
+      ->withEdgeTypes(array($muted_type))
+      ->withDestinationPHIDs(array($viewer->getPHID()));
+
+    $edge_query->execute();
+
+    $is_mute = !$edge_query->getDestinationPHIDs();
+    $object_uri = $handle->getURI();
+
+    if ($request->isFormPost()) {
+      if ($is_mute) {
+        $xaction_value = array(
+          '+' => array_fuse(array($viewer->getPHID())),
+        );
+      } else {
+        $xaction_value = array(
+          '-' => array_fuse(array($viewer->getPHID())),
+        );
+      }
+
+      $muted_type = PhabricatorMutedByEdgeType::EDGECONST;
+
+      $xaction = id($object->getApplicationTransactionTemplate())
+        ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
+        ->setMetadataValue('edge:type', $muted_type)
+        ->setNewValue($xaction_value);
+
+      $editor = id($object->getApplicationTransactionEditor())
+        ->setActor($viewer)
+        ->setContinueOnNoEffect(true)
+        ->setContinueOnMissingFields(true)
+        ->setContentSourceFromRequest($request);
+
+      $editor->applyTransactions(
+        $object->getApplicationTransactionObject(),
+        array($xaction));
+
+      return id(new AphrontReloadResponse())->setURI($object_uri);
+    }
+
+    $dialog = $this->newDialog()
+      ->addCancelButton($object_uri);
+
+    if ($is_mute) {
+      $dialog
+        ->setTitle(pht('Mute Notifications'))
+        ->appendParagraph(
+          pht(
+            'Mute this object? You will no longer receive notifications or '.
+            'email about it.'))
+        ->addSubmitButton(pht('Mute'));
+    } else {
+      $dialog
+        ->setTitle(pht('Unmute Notifications'))
+        ->appendParagraph(
+          pht(
+            'Unmute this object? You will receive notifications and email '.
+            'again.'))
+        ->addSubmitButton(pht('Unmute'));
+    }
+
+    return $dialog;
+  }
+
+
+}
diff --git a/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php b/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
index 5f371d69f3..caf860117e 100644
--- a/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
+++ b/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
@@ -42,6 +42,28 @@ private function handleActionEvent($event) {
       return;
     }
 
+    $src_phid = $object->getPHID();
+    $subscribed_type = PhabricatorObjectHasSubscriberEdgeType::EDGECONST;
+    $muted_type = PhabricatorMutedByEdgeType::EDGECONST;
+
+    $edges = id(new PhabricatorEdgeQuery())
+      ->withSourcePHIDs(array($src_phid))
+      ->withEdgeTypes(
+        array(
+          $subscribed_type,
+          $muted_type,
+        ))
+      ->withDestinationPHIDs(array($user_phid))
+      ->execute();
+
+    if ($user_phid) {
+      $is_subscribed = isset($edges[$src_phid][$subscribed_type][$user_phid]);
+      $is_muted = isset($edges[$src_phid][$muted_type][$user_phid]);
+    } else {
+      $is_subscribed = false;
+      $is_muted = false;
+    }
+
     if ($user_phid && $object->isAutomaticallySubscribed($user_phid)) {
       $sub_action = id(new PhabricatorActionView())
         ->setWorkflow(true)
@@ -51,22 +73,9 @@ private function handleActionEvent($event) {
         ->setName(pht('Automatically Subscribed'))
         ->setIcon('fa-check-circle lightgreytext');
     } else {
-      $subscribed = false;
-      if ($user->isLoggedIn()) {
-        $src_phid = $object->getPHID();
-        $edge_type = PhabricatorObjectHasSubscriberEdgeType::EDGECONST;
-
-        $edges = id(new PhabricatorEdgeQuery())
-          ->withSourcePHIDs(array($src_phid))
-          ->withEdgeTypes(array($edge_type))
-          ->withDestinationPHIDs(array($user_phid))
-          ->execute();
-        $subscribed = isset($edges[$src_phid][$edge_type][$user_phid]);
-      }
-
       $can_interact = PhabricatorPolicyFilter::canInteract($user, $object);
 
-      if ($subscribed) {
+      if ($is_subscribed) {
         $sub_action = id(new PhabricatorActionView())
           ->setWorkflow(true)
           ->setRenderAsForm(true)
@@ -89,8 +98,26 @@ private function handleActionEvent($event) {
       }
     }
 
+    $mute_action = id(new PhabricatorActionView())
+      ->setWorkflow(true)
+      ->setHref('/subscriptions/mute/'.$object->getPHID().'/')
+      ->setDisabled(!$user_phid);
+
+    if (!$is_muted) {
+      $mute_action
+        ->setName(pht('Mute Notifications'))
+        ->setIcon('fa-volume-up');
+    } else {
+      $mute_action
+        ->setName(pht('Unmute Notifications'))
+        ->setIcon('fa-volume-off')
+        ->setColor(PhabricatorActionView::RED);
+    }
+
+
     $actions = $event->getValue('actions');
     $actions[] = $sub_action;
+    $actions[] = $mute_action;
     $event->setValue('actions', $actions);
   }
 
diff --git a/src/applications/transactions/edges/PhabricatorMutedByEdgeType.php b/src/applications/transactions/edges/PhabricatorMutedByEdgeType.php
new file mode 100644
index 0000000000..1f592239ba
--- /dev/null
+++ b/src/applications/transactions/edges/PhabricatorMutedByEdgeType.php
@@ -0,0 +1,16 @@
+<?php
+
+final class PhabricatorMutedByEdgeType
+  extends PhabricatorEdgeType {
+
+  const EDGECONST = 68;
+
+  public function getInverseEdgeConstant() {
+    return PhabricatorMutedEdgeType::EDGECONST;
+  }
+
+  public function shouldWriteInverseTransactions() {
+    return true;
+  }
+
+}
diff --git a/src/applications/transactions/edges/PhabricatorMutedEdgeType.php b/src/applications/transactions/edges/PhabricatorMutedEdgeType.php
new file mode 100644
index 0000000000..f473e0c61d
--- /dev/null
+++ b/src/applications/transactions/edges/PhabricatorMutedEdgeType.php
@@ -0,0 +1,16 @@
+<?php
+
+final class PhabricatorMutedEdgeType
+  extends PhabricatorEdgeType {
+
+  const EDGECONST = 67;
+
+  public function getInverseEdgeConstant() {
+    return PhabricatorMutedByEdgeType::EDGECONST;
+  }
+
+  public function shouldWriteInverseTransactions() {
+    return true;
+  }
+
+}
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 8c319fc61e..5e6a311a85 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -78,6 +78,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $oldCC = array();
   private $mailRemovedPHIDs = array();
   private $mailUnexpandablePHIDs = array();
+  private $mailMutedPHIDs = array();
 
   private $transactionQueue = array();
 
@@ -1211,6 +1212,14 @@ final public function applyTransactions(
         // but were removed by this change.
         $this->applyOldRecipientLists();
 
+        if ($object instanceof PhabricatorSubscribableInterface) {
+          $this->mailMutedPHIDs = PhabricatorEdgeQuery::loadDestinationPHIDs(
+            $object->getPHID(),
+            PhabricatorMutedByEdgeType::EDGECONST);
+        } else {
+          $this->mailMutedPHIDs = array();
+        }
+
         $mail_xactions = $this->getTransactionsForMail($object, $xactions);
         $stamps = $this->newMailStamps($object, $xactions);
         foreach ($stamps as $stamp) {
@@ -2662,6 +2671,11 @@ private function buildMailForTarget(
         $mail_xactions);
     }
 
+    $muted_phids = $this->mailMutedPHIDs;
+    if (!is_array($muted_phids)) {
+      $muted_phids = array();
+    }
+
     $mail
       ->setSensitiveContent(false)
       ->setFrom($this->getActingAsPHID())
@@ -2670,6 +2684,7 @@ private function buildMailForTarget(
       ->setThreadID($this->getMailThreadID($object), $this->getIsNewObject())
       ->setRelatedPHID($object->getPHID())
       ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
+      ->setMutedPHIDs($muted_phids)
       ->setForceHeraldMailRecipientPHIDs($this->heraldForcedEmailPHIDs)
       ->setMailTags($mail_tags)
       ->setIsBulk(true)
@@ -3186,6 +3201,18 @@ protected function publishFeedStory(
     $related_phids = $this->feedRelatedPHIDs;
     $subscribed_phids = $this->feedNotifyPHIDs;
 
+    // Remove muted users from the subscription list so they don't get
+    // notifications, either.
+    $muted_phids = $this->mailMutedPHIDs;
+    if (!is_array($muted_phids)) {
+      $muted_phids = array();
+    }
+    $subscribed_phids = array_fuse($subscribed_phids);
+    foreach ($muted_phids as $muted_phid) {
+      unset($subscribed_phids[$muted_phid]);
+    }
+    $subscribed_phids = array_values($subscribed_phids);
+
     $story_type = $this->getFeedStoryType();
     $story_data = $this->getFeedStoryData($object, $xactions);
 
@@ -3632,6 +3659,7 @@ private function getAutomaticStateProperties() {
       'mustEncrypt',
       'mailStamps',
       'mailUnexpandablePHIDs',
+      'mailMutedPHIDs',
     );
   }
 
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index d5c28b83bf..d27370cd44 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -643,6 +643,8 @@ public function shouldHide() {
           case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
           case ManiphestTaskHasDuplicateTaskEdgeType::EDGECONST:
           case ManiphestTaskIsDuplicateOfTaskEdgeType::EDGECONST:
+          case PhabricatorMutedEdgeType::EDGECONST:
+          case PhabricatorMutedByEdgeType::EDGECONST:
             return true;
             break;
           case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php
index f6de8eca5b..d43cc9428b 100644
--- a/src/view/layout/PhabricatorActionView.php
+++ b/src/view/layout/PhabricatorActionView.php
@@ -21,6 +21,7 @@ final class PhabricatorActionView extends AphrontView {
   private $order;
   private $color;
   private $type;
+  private $highlight;
 
   const TYPE_DIVIDER  = 'type-divider';
   const TYPE_LABEL  = 'label';
@@ -72,6 +73,15 @@ public function getHref() {
     return $this->href;
   }
 
+  public function setHighlight($highlight) {
+    $this->highlight = $highlight;
+    return $this;
+  }
+
+  public function getHighlight() {
+    return $this->highlight;
+  }
+
   public function setIcon($icon) {
     $this->icon = $icon;
     return $this;
diff --git a/webroot/rsrc/css/phui/phui-action-list.css b/webroot/rsrc/css/phui/phui-action-list.css
index 5e32a1ea0a..e7ee38a8bf 100644
--- a/webroot/rsrc/css/phui/phui-action-list.css
+++ b/webroot/rsrc/css/phui/phui-action-list.css
@@ -95,15 +95,20 @@
     color: {$sky};
 }
 
-.device-desktop .phabricator-action-view-href.action-item-red:hover
-  .phabricator-action-view-item {
-    background-color: {$sh-redbackground};
-    color: {$sh-redtext};
+.phabricator-action-view.action-item-red {
+  background-color: {$sh-redbackground};
+}
+
+.phabricator-action-view.action-item-red .phabricator-action-view-item,
+.phabricator-action-view.action-item-red .phabricator-action-view-icon {
+  color: {$sh-redtext};
 }
 
-.device-desktop .phabricator-action-view-href.action-item-red:hover
+.device-desktop .phabricator-action-view.action-item-red:hover
+  .phabricator-action-view-item,
+.device-desktop .phabricator-action-view.action-item-red:hover
   .phabricator-action-view-icon {
-    color: {$red};
+  color: {$red};
 }
 
 .phabricator-action-view-label .phabricator-action-view-item,

From 705ff8d33de04b09a31753426850d2c7da9a046a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 11:40:12 -0800
Subject: [PATCH 518/865] Remove `addHighlight()` action view methods

Summary: These didn't actually get used by D19033.

Test Plan: Grep.

Differential Revision: https://secure.phabricator.com/D19034
---
 src/view/layout/PhabricatorActionView.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php
index d43cc9428b..f6de8eca5b 100644
--- a/src/view/layout/PhabricatorActionView.php
+++ b/src/view/layout/PhabricatorActionView.php
@@ -21,7 +21,6 @@ final class PhabricatorActionView extends AphrontView {
   private $order;
   private $color;
   private $type;
-  private $highlight;
 
   const TYPE_DIVIDER  = 'type-divider';
   const TYPE_LABEL  = 'label';
@@ -73,15 +72,6 @@ public function getHref() {
     return $this->href;
   }
 
-  public function setHighlight($highlight) {
-    $this->highlight = $highlight;
-    return $this;
-  }
-
-  public function getHighlight() {
-    return $this->highlight;
-  }
-
   public function setIcon($icon) {
     $this->icon = $icon;
     return $this;

From d1e273daf62fc12393f107804b7e19c55bbb25d9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 12:41:11 -0800
Subject: [PATCH 519/865] Remove completely pointless load of every repository
 when viewing a repository URI

Summary:
See D18176. This query has no effect (other than wasting resources) and the result is unused.

`$repository` already has the URI loaded because we load them unconditionally during request initialization.

Test Plan: Viewed repository URIs.

Subscribers: jmeador

Differential Revision: https://secure.phabricator.com/D19036
---
 .../controller/DiffusionRepositoryURIViewController.php     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionRepositoryURIViewController.php b/src/applications/diffusion/controller/DiffusionRepositoryURIViewController.php
index 91ffbb473f..e923ebfc20 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryURIViewController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryURIViewController.php
@@ -23,14 +23,10 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
-    // For display, reload the URI by loading it through the repository. This
+    // For display, access the URI by loading it through the repository. This
     // may adjust builtin URIs for repository configuration, so we may end up
     // with a different view of builtin URIs than we'd see if we loaded them
     // directly from the database. See T12884.
-    $repository_with_uris = id(new PhabricatorRepositoryQuery())
-      ->setViewer($viewer)
-      ->needURIs(true)
-      ->execute();
 
     $repository_uris = $repository->getURIs();
     $repository_uris = mpull($repository_uris, null, 'getID');

From f028aa6f60dd6382b59153e681645b478cdd0e62 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 14:20:32 -0800
Subject: [PATCH 520/865] Track closed date and closing user for tasks
 explicitly

Summary:
Ref T4434. Although some of the use cases for this data are better fits for Facts, this data is reasonable to track separately.

I have an approximate view of it already ("closed, ordered by date modified") that's useful to review things that were fixed recently. This lets us make that view more effective.

This just adds (and populates) the storage. Followups will add Conduit, Export, Search, and UI support.

This is slightly tricky because merges work oddly (see T13020).

Test Plan:
  - Ran migration, checked database for sensible results.
  - Created a task in open/closed status, got the right database values.
  - Modified a task to close/open it, got the right values.
  - Merged an open task, got updates.

Maniphest Tasks: T4434

Differential Revision: https://secure.phabricator.com/D19037
---
 .../20180208.maniphest.01.close.sql           |  5 ++
 .../20180208.maniphest.02.populate.php        | 65 +++++++++++++++++++
 .../maniphest/storage/ManiphestTask.php       | 11 ++++
 .../ManiphestTaskMergedIntoTransaction.php    |  2 +-
 .../ManiphestTaskStatusTransaction.php        |  2 +-
 .../xaction/ManiphestTaskTransactionType.php  | 23 +++++++
 6 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 resources/sql/autopatches/20180208.maniphest.01.close.sql
 create mode 100644 resources/sql/autopatches/20180208.maniphest.02.populate.php

diff --git a/resources/sql/autopatches/20180208.maniphest.01.close.sql b/resources/sql/autopatches/20180208.maniphest.01.close.sql
new file mode 100644
index 0000000000..856300e9ba
--- /dev/null
+++ b/resources/sql/autopatches/20180208.maniphest.01.close.sql
@@ -0,0 +1,5 @@
+ALTER TABLE {$NAMESPACE}_maniphest.maniphest_task
+  ADD closedEpoch INT UNSIGNED;
+
+ALTER TABLE {$NAMESPACE}_maniphest.maniphest_task
+  ADD closerPHID VARBINARY(64);
diff --git a/resources/sql/autopatches/20180208.maniphest.02.populate.php b/resources/sql/autopatches/20180208.maniphest.02.populate.php
new file mode 100644
index 0000000000..16aa2bf57b
--- /dev/null
+++ b/resources/sql/autopatches/20180208.maniphest.02.populate.php
@@ -0,0 +1,65 @@
+<?php
+
+$table = new ManiphestTask();
+$conn = $table->establishConnection('w');
+$viewer = PhabricatorUser::getOmnipotentUser();
+
+foreach (new LiskMigrationIterator($table) as $task) {
+  if ($task->getClosedEpoch()) {
+    // Task already has a closed date.
+    continue;
+  }
+
+  $status = $task->getStatus();
+  if (!ManiphestTaskStatus::isClosedStatus($status)) {
+    // Task isn't closed.
+    continue;
+  }
+
+  // Look through the transactions from newest to oldest until we find one
+  // where the task was closed. A merge also counts as a close, even though
+  // it doesn't currently produce a separate transaction.
+
+  $type_merge = ManiphestTaskStatusTransaction::TRANSACTIONTYPE;
+  $type_status = ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE;
+
+  $xactions = id(new ManiphestTransactionQuery())
+    ->setViewer($viewer)
+    ->withObjectPHIDs(array($task->getPHID()))
+    ->withTransactionTypes(
+      array(
+        $type_merge,
+        $type_status,
+      ))
+    ->execute();
+  foreach ($xactions as $xaction) {
+    $old = $xaction->getOldValue();
+    $new = $xaction->getNewValue();
+
+    $type = $xaction->getTransactionType();
+
+    // If this is a status change, but is not a close, don't use it.
+    // (We always use merges, even though it's possible to merge a task which
+    // was previously closed: we can't tell when this happens very easily.)
+    if ($type === $type_status) {
+      if (!ManiphestTaskStatus::isClosedStatus($new)) {
+        continue;
+      }
+
+      if ($old && ManiphestTaskStatus::isClosedStatus($old)) {
+        continue;
+      }
+    }
+
+    queryfx(
+      $conn,
+      'UPDATE %T SET closedEpoch = %d, closerPHID = %ns
+        WHERE id = %d',
+      $table->getTableName(),
+      $xaction->getDateCreated(),
+      $xaction->getAuthorPHID(),
+      $task->getID());
+
+    break;
+  }
+}
diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php
index e19886d3ff..7ff70abd80 100644
--- a/src/applications/maniphest/storage/ManiphestTask.php
+++ b/src/applications/maniphest/storage/ManiphestTask.php
@@ -44,6 +44,9 @@ final class ManiphestTask extends ManiphestDAO
   protected $points;
   protected $subtype;
 
+  protected $closedEpoch;
+  protected $closerPHID;
+
   private $subscriberPHIDs = self::ATTACHABLE;
   private $groupByProjectPHID = self::ATTACHABLE;
   private $customFields = self::ATTACHABLE;
@@ -90,6 +93,8 @@ protected function getConfiguration() {
         'points' => 'double?',
         'bridgedObjectPHID' => 'phid?',
         'subtype' => 'text64',
+        'closedEpoch' => 'epoch?',
+        'closerPHID' => 'phid?',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_phid' => null,
@@ -131,6 +136,12 @@ protected function getConfiguration() {
         'key_subtype' => array(
           'columns' => array('subtype'),
         ),
+        'key_closed' => array(
+          'columns' => array('closedEpoch'),
+        ),
+        'key_closer' => array(
+          'columns' => array('closerPHID', 'closedEpoch'),
+        ),
       ),
     ) + parent::getConfiguration();
   }
diff --git a/src/applications/maniphest/xaction/ManiphestTaskMergedIntoTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskMergedIntoTransaction.php
index cd0cad6a39..630f5190ce 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskMergedIntoTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskMergedIntoTransaction.php
@@ -10,7 +10,7 @@ public function generateOldValue($object) {
   }
 
   public function applyInternalEffects($object, $value) {
-    $object->setStatus(ManiphestTaskStatus::getDuplicateStatus());
+    $this->updateStatus($object, ManiphestTaskStatus::getDuplicateStatus());
   }
 
   public function getActionName() {
diff --git a/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
index dd51a63799..6f4b558e05 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskStatusTransaction.php
@@ -10,7 +10,7 @@ public function generateOldValue($object) {
   }
 
   public function applyInternalEffects($object, $value) {
-    $object->setStatus($value);
+    $this->updateStatus($object, $value);
   }
 
   public function shouldHide() {
diff --git a/src/applications/maniphest/xaction/ManiphestTaskTransactionType.php b/src/applications/maniphest/xaction/ManiphestTaskTransactionType.php
index c59de163c6..836e7765b8 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskTransactionType.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskTransactionType.php
@@ -3,4 +3,27 @@
 abstract class ManiphestTaskTransactionType
   extends PhabricatorModularTransactionType {
 
+  protected function updateStatus($object, $new_value) {
+    $old_value = $object->getStatus();
+    $object->setStatus($new_value);
+
+    // If this status change closes or opens the task, update the closed
+    // date and actor PHID.
+    $old_closed = ManiphestTaskStatus::isClosedStatus($old_value);
+    $new_closed = ManiphestTaskStatus::isClosedStatus($new_value);
+
+    $is_close = ($new_closed && !$old_closed);
+    $is_open = (!$new_closed && $old_closed);
+
+    if ($is_close) {
+      $object
+        ->setClosedEpoch(PhabricatorTime::getNow())
+        ->setCloserPHID($this->getActingAsPHID());
+    } else if ($is_open) {
+      $object
+        ->setClosedEpoch(null)
+        ->setCloserPHID(null);
+    }
+  }
+
 }

From 4c4707e467633032fc56797d6b620b626ff21e18 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 14:48:16 -0800
Subject: [PATCH 521/865] Provide task closed date via Conduit API, data export
 pipeline, and in list UI

Summary:
Depends on D19037. Ref T4434. Adds closed date to `maniphest.search` and "Export Data".

When a task has been closed, show the closed date with a checkmark in the UI instead of the modified date.

Test Plan:
  - Exported data to CSV, saw close information.
  - Saw close information in `/maniphest/`.
  - Queried for close information via `maniphest.search`.

Maniphest Tasks: T4434

Differential Revision: https://secure.phabricator.com/D19038
---
 .../query/ManiphestTaskSearchEngine.php       | 20 ++++++++++++++++++
 .../maniphest/storage/ManiphestTask.php       | 17 +++++++++++++++
 .../maniphest/view/ManiphestTaskListView.php  | 21 ++++++++++++++++---
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index ad668db376..a5c98dc202 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -456,6 +456,15 @@ protected function newExportFields() {
       id(new PhabricatorStringExportField())
         ->setKey('statusName')
         ->setLabel(pht('Status Name')),
+      id(new PhabricatorEpochExportField())
+        ->setKey('dateClosed')
+        ->setLabel(pht('Date Closed')),
+      id(new PhabricatorPHIDExportField())
+        ->setKey('closerPHID')
+        ->setLabel(pht('Closer PHID')),
+      id(new PhabricatorStringExportField())
+        ->setKey('closer')
+        ->setLabel(pht('Closer')),
       id(new PhabricatorStringExportField())
         ->setKey('priority')
         ->setLabel(pht('Priority')),
@@ -492,6 +501,7 @@ protected function newExportData(array $tasks) {
     foreach ($tasks as $task) {
       $phids[] = $task->getAuthorPHID();
       $phids[] = $task->getOwnerPHID();
+      $phids[] = $task->getCloserPHID();
     }
     $handles = $viewer->loadHandles($phids);
 
@@ -512,6 +522,13 @@ protected function newExportData(array $tasks) {
         $owner_name = null;
       }
 
+      $closer_phid = $task->getCloserPHID();
+      if ($closer_phid) {
+        $closer_name = $handles[$closer_phid]->getName();
+      } else {
+        $closer_name = null;
+      }
+
       $status_value = $task->getStatus();
       $status_name = ManiphestTaskStatus::getTaskStatusName($status_value);
 
@@ -534,6 +551,9 @@ protected function newExportData(array $tasks) {
         'title' => $task->getTitle(),
         'uri' => PhabricatorEnv::getProductionURI($task->getURI()),
         'description' => $task->getDescription(),
+        'dateClosed' => $task->getClosedEpoch(),
+        'closerPHID' => $closer_phid,
+        'closer' => $closer_name,
       );
     }
 
diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php
index 7ff70abd80..a93fe58c3f 100644
--- a/src/applications/maniphest/storage/ManiphestTask.php
+++ b/src/applications/maniphest/storage/ManiphestTask.php
@@ -513,6 +513,16 @@ public function getFieldSpecificationsForConduit() {
         ->setKey('subtype')
         ->setType('string')
         ->setDescription(pht('Subtype of the task.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('closerPHID')
+        ->setType('phid?')
+        ->setDescription(
+          pht('User who closed the task, if the task is closed.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('dateClosed')
+        ->setType('int?')
+        ->setDescription(
+          pht('Epoch timestamp when the task was closed.')),
     );
   }
 
@@ -532,6 +542,11 @@ public function getFieldValuesForConduit() {
       'color' => ManiphestTaskPriority::getTaskPriorityColor($priority_value),
     );
 
+    $closed_epoch = $this->getClosedEpoch();
+    if ($closed_epoch !== null) {
+      $closed_epoch = (int)$closed_epoch;
+    }
+
     return array(
       'name' => $this->getTitle(),
       'description' => array(
@@ -543,6 +558,8 @@ public function getFieldValuesForConduit() {
       'priority' => $priority_info,
       'points' => $this->getPoints(),
       'subtype' => $this->getSubtype(),
+      'closerPHID' => $this->getCloserPHID(),
+      'dateClosed' => $closed_epoch,
     );
   }
 
diff --git a/src/applications/maniphest/view/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php
index de6b386ac8..ba17b8e25d 100644
--- a/src/applications/maniphest/view/ManiphestTaskListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskListView.php
@@ -86,9 +86,24 @@ public function render() {
 
       $item->setStatusIcon($icon.' '.$color, $tooltip);
 
-      $item->addIcon(
-        'none',
-        phabricator_datetime($task->getDateModified(), $this->getUser()));
+      if ($task->isClosed()) {
+        $closed_epoch = $task->getClosedEpoch();
+
+        // We don't expect a task to be closed without a closed epoch, but
+        // recover if we find one. This can happen with older objects or with
+        // lipsum test data.
+        if (!$closed_epoch) {
+          $closed_epoch = $task->getDateModified();
+        }
+
+        $item->addIcon(
+          'fa-check-square-o grey',
+          phabricator_datetime($closed_epoch, $this->getUser()));
+      } else {
+        $item->addIcon(
+          'none',
+          phabricator_datetime($task->getDateModified(), $this->getUser()));
+      }
 
       if ($this->showSubpriorityControls) {
         $item->setGrippable(true);

From e26a784dcf3e2e90c05229f3d6f71dfd9594348b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 15:13:03 -0800
Subject: [PATCH 522/865] Allow tasks to be filtered and ordered by closed date

Summary: Depends on D19038. Fixes T4434. Updates the SearchEngine and Query to handle these fields.

Test Plan: Filtered and ordered by date and closer.

Maniphest Tasks: T4434

Differential Revision: https://secure.phabricator.com/D19039
---
 .../maniphest/query/ManiphestTaskQuery.php    | 49 ++++++++++++++++++-
 .../query/ManiphestTaskSearchEngine.php       | 22 +++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php
index cfc69722d8..f7c1551be7 100644
--- a/src/applications/maniphest/query/ManiphestTaskQuery.php
+++ b/src/applications/maniphest/query/ManiphestTaskQuery.php
@@ -23,6 +23,9 @@ final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery {
   private $parentTaskIDs;
   private $subtaskIDs;
   private $subtypes;
+  private $closedEpochMin;
+  private $closedEpochMax;
+  private $closerPHIDs;
 
   private $status           = 'status-any';
   const STATUS_ANY          = 'status-any';
@@ -179,6 +182,17 @@ public function withDateModifiedAfter($date_modified_after) {
     return $this;
   }
 
+  public function withClosedEpochBetween($min, $max) {
+    $this->closedEpochMin = $min;
+    $this->closedEpochMax = $max;
+    return $this;
+  }
+
+  public function withCloserPHIDs(array $phids) {
+    $this->closerPHIDs = $phids;
+    return $this;
+  }
+
   public function needSubscriberPHIDs($bool) {
     $this->needSubscriberPHIDs = $bool;
     return $this;
@@ -379,6 +393,27 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->dateModifiedBefore);
     }
 
+    if ($this->closedEpochMin !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'task.closedEpoch >= %d',
+        $this->closedEpochMin);
+    }
+
+    if ($this->closedEpochMax !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'task.closedEpoch <= %d',
+        $this->closedEpochMax);
+    }
+
+    if ($this->closerPHIDs !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'task.closerPHID IN (%Ls)',
+        $this->closerPHIDs);
+    }
+
     if ($this->priorities !== null) {
       $where[] = qsprintf(
         $conn,
@@ -722,7 +757,11 @@ public function getBuiltinOrders() {
       'outdated' => array(
         'vector' => array('-updated', '-id'),
         'name' => pht('Date Updated (Oldest First)'),
-       ),
+      ),
+      'closed' => array(
+        'vector' => array('closed', 'id'),
+        'name' => pht('Date Closed (Latest First)'),
+      ),
       'title' => array(
         'vector' => array('title', 'id'),
         'name' => pht('Title'),
@@ -741,6 +780,7 @@ public function getBuiltinOrders() {
         'outdated',
         'newest',
         'oldest',
+        'closed',
         'title',
       )) + $orders;
 
@@ -790,6 +830,12 @@ public function getOrderableColumns() {
         'column' => 'dateModified',
         'type' => 'int',
       ),
+      'closed' => array(
+        'table' => 'task',
+        'column' => 'closedEpoch',
+        'type' => 'int',
+        'null' => 'tail',
+      ),
     );
   }
 
@@ -808,6 +854,7 @@ protected function getPagingValueMap($cursor, array $keys) {
       'status' => $task->getStatus(),
       'title' => $task->getTitle(),
       'updated' => $task->getDateModified(),
+      'closed' => $task->getClosedEpoch(),
     );
 
     foreach ($keys as $key) {
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index a5c98dc202..565bc7a8f4 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -126,6 +126,17 @@ protected function buildCustomSearchFields() {
       id(new PhabricatorSearchDateField())
         ->setLabel(pht('Updated Before'))
         ->setKey('modifiedEnd'),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Closed After'))
+        ->setKey('closedStart'),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Closed Before'))
+        ->setKey('closedEnd'),
+      id(new PhabricatorUsersSearchField())
+        ->setLabel(pht('Closed By'))
+        ->setKey('closerPHIDs')
+        ->setAliases(array('closer', 'closerPHID', 'closers'))
+        ->setDescription(pht('Search for tasks closed by certain users.')),
       id(new PhabricatorSearchTextField())
         ->setLabel(pht('Page Size'))
         ->setKey('limit'),
@@ -153,6 +164,9 @@ protected function getDefaultFieldOrder() {
       'createdEnd',
       'modifiedStart',
       'modifiedEnd',
+      'closedStart',
+      'closedEnd',
+      'closerPHIDs',
       'limit',
     );
   }
@@ -208,6 +222,14 @@ protected function buildQueryFromParameters(array $map) {
       $query->withDateModifiedBefore($map['modifiedEnd']);
     }
 
+    if ($map['closedStart'] || $map['closedEnd']) {
+      $query->withClosedEpochBetween($map['closedStart'], $map['closedEnd']);
+    }
+
+    if ($map['closerPHIDs']) {
+      $query->withCloserPHIDs($map['closerPHIDs']);
+    }
+
     if ($map['hasParents'] !== null) {
       $query->withOpenParents($map['hasParents']);
     }

From 6ea1b8df9bbb0e6f6f365659b6a6ff14e49168e6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 15:52:59 -0800
Subject: [PATCH 523/865] Colorize filetree for adds, moves, and deletes

Summary: See PHI356. Makes it easier to pick out change types in the filetree view in Differential.

Test Plan: Created a diff with adds, copies, moves, deletions, and binary files. Viewed in Differential, had an easier time picking stuff out.

Differential Revision: https://secure.phabricator.com/D19040
---
 resources/celerity/map.php                    |  6 +--
 .../storage/DifferentialChangeset.php         | 45 +++++++++++++++++++
 ...rentialChangesetFileTreeSideNavBuilder.php | 10 +++--
 .../css/layout/phabricator-filetree-view.css  | 12 +++++
 4 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 17138d6604..70896d400d 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -12,7 +12,7 @@
     'core.pkg.css' => 'ce8c2a58',
     'core.pkg.js' => '4c79d74f',
     'darkconsole.pkg.js' => '1f9a31bc',
-    'differential.pkg.css' => '45951e9e',
+    'differential.pkg.css' => '1522c3ad',
     'differential.pkg.js' => '19ee9979',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
@@ -121,7 +121,7 @@
     'rsrc/css/font/font-awesome.css' => 'e838e088',
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
-    'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
+    'rsrc/css/layout/phabricator-filetree-view.css' => 'ea5b30a9',
     'rsrc/css/layout/phabricator-source-code-view.css' => 'aea41829',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
@@ -784,7 +784,7 @@
     'phabricator-favicon' => '1fe2510c',
     'phabricator-feed-css' => 'ecd4ec57',
     'phabricator-file-upload' => '680ea2c8',
-    'phabricator-filetree-view-css' => 'fccf9f82',
+    'phabricator-filetree-view-css' => 'ea5b30a9',
     'phabricator-flag-css' => 'bba8f811',
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => 'c19dd9b9',
diff --git a/src/applications/differential/storage/DifferentialChangeset.php b/src/applications/differential/storage/DifferentialChangeset.php
index ebdaeacd0a..dbb06fe72b 100644
--- a/src/applications/differential/storage/DifferentialChangeset.php
+++ b/src/applications/differential/storage/DifferentialChangeset.php
@@ -221,6 +221,51 @@ public function getDiff() {
     return $this->assertAttached($this->diff);
   }
 
+  public function newFileTreeIcon() {
+    $file_type = $this->getFileType();
+    $change_type = $this->getChangeType();
+
+    $change_icons = array(
+      DifferentialChangeType::TYPE_DELETE => 'fa-file-o',
+    );
+
+    if (isset($change_icons[$change_type])) {
+      $icon = $change_icons[$change_type];
+    } else {
+      $icon = DifferentialChangeType::getIconForFileType($file_type);
+    }
+
+    $change_colors = array(
+      DifferentialChangeType::TYPE_ADD => 'green',
+      DifferentialChangeType::TYPE_DELETE => 'red',
+      DifferentialChangeType::TYPE_MOVE_AWAY => 'orange',
+      DifferentialChangeType::TYPE_MOVE_HERE => 'orange',
+      DifferentialChangeType::TYPE_COPY_HERE => 'orange',
+      DifferentialChangeType::TYPE_MULTICOPY => 'orange',
+    );
+
+    $color = idx($change_colors, $change_type, 'bluetext');
+
+    return id(new PHUIIconView())
+      ->setIcon($icon.' '.$color);
+  }
+
+  public function getFileTreeClass() {
+    switch ($this->getChangeType()) {
+      case DifferentialChangeType::TYPE_ADD:
+        return 'filetree-added';
+      case DifferentialChangeType::TYPE_DELETE:
+        return 'filetree-deleted';
+      case DifferentialChangeType::TYPE_MOVE_AWAY:
+      case DifferentialChangeType::TYPE_MOVE_HERE:
+      case DifferentialChangeType::TYPE_COPY_HERE:
+      case DifferentialChangeType::TYPE_MULTICOPY:
+        return 'filetree-movecopy';
+    }
+
+    return null;
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
index 14050e942c..9781fb0d02 100644
--- a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
+++ b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
@@ -83,6 +83,9 @@ public function build(array $changesets) {
     while (($path = $path->getNextNode())) {
       $data = $path->getData();
 
+      $classes = array();
+      $classes[] = 'phabricator-filetree-item';
+
       $name = $path->getName();
       $style = 'padding-left: '.(2 + (3 * $path->getDepth())).'px';
 
@@ -90,8 +93,9 @@ public function build(array $changesets) {
       if ($data) {
         $href = '#'.$data->getAnchorName();
         $title = $name;
-        $icon = id(new PHUIIconView())
-          ->setIcon('fa-file-text-o bluetext');
+
+        $icon = $data->newFileTreeIcon();
+        $classes[] = $data->getFileTreeClass();
       } else {
         $name .= '/';
         $title = $path->getFullPath().'/';
@@ -112,7 +116,7 @@ public function build(array $changesets) {
           'href' => $href,
           'style' => $style,
           'title' => $title,
-          'class' => 'phabricator-filetree-item',
+          'class' => implode(' ', $classes),
         ),
         array($icon, $name_element));
     }
diff --git a/webroot/rsrc/css/layout/phabricator-filetree-view.css b/webroot/rsrc/css/layout/phabricator-filetree-view.css
index b247f5e4f9..21bbe9f0af 100644
--- a/webroot/rsrc/css/layout/phabricator-filetree-view.css
+++ b/webroot/rsrc/css/layout/phabricator-filetree-view.css
@@ -54,3 +54,15 @@
   background-color: {$hovergrey};
   border-left: 4px solid {$sky};
 }
+
+.phabricator-filetree .filetree-added {
+  background: {$sh-greenbackground};
+}
+
+.phabricator-filetree .filetree-deleted {
+  background: {$sh-redbackground};
+}
+
+.phabricator-filetree .filetree-movecopy {
+  background: {$sh-orangebackground};
+}

From 261a4a0e51fd1be6f5b1a89bba620f4ef9ad7e6d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 16:55:54 -0800
Subject: [PATCH 524/865] Add inline comment counts to the filetree view

Summary: See PHI356. Adds inline comment and done counts to the filetree. Also makes the filetree wider by default.

Test Plan: Fiddled with filetrees in different browsers on different revisions. Added inlines, marked them done/undone.

Differential Revision: https://secure.phabricator.com/D19041
---
 resources/celerity/map.php                    | 78 +++++++++----------
 .../view/DifferentialChangesetDetailView.php  |  1 +
 ...rentialChangesetFileTreeSideNavBuilder.php | 12 ++-
 .../rsrc/css/aphront/phabricator-nav-view.css |  6 +-
 .../css/layout/phabricator-filetree-view.css  | 33 ++++++--
 .../rsrc/js/application/diff/DiffChangeset.js | 74 +++++++++++++++++-
 .../js/application/diff/DiffChangesetList.js  |  5 ++
 .../rsrc/js/core/behavior-phabricator-nav.js  |  4 +
 8 files changed, 164 insertions(+), 49 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 70896d400d..f3ead4de53 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,11 +9,11 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'ce8c2a58',
-    'core.pkg.js' => '4c79d74f',
+    'core.pkg.css' => 'e4f098a5',
+    'core.pkg.js' => '3ac6e174',
     'darkconsole.pkg.js' => '1f9a31bc',
-    'differential.pkg.css' => '1522c3ad',
-    'differential.pkg.js' => '19ee9979',
+    'differential.pkg.css' => '113e692c',
+    'differential.pkg.js' => '5d53d5ce',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -31,7 +31,7 @@
     'rsrc/css/aphront/multi-column.css' => '84cc6640',
     'rsrc/css/aphront/notification.css' => '457861ec',
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
-    'rsrc/css/aphront/phabricator-nav-view.css' => 'faf6a6fc',
+    'rsrc/css/aphront/phabricator-nav-view.css' => '028126f6',
     'rsrc/css/aphront/table-view.css' => '8c9bbafe',
     'rsrc/css/aphront/tokenizer.css' => '15d5ff71',
     'rsrc/css/aphront/tooltip.css' => '173b9431',
@@ -121,7 +121,7 @@
     'rsrc/css/font/font-awesome.css' => 'e838e088',
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
-    'rsrc/css/layout/phabricator-filetree-view.css' => 'ea5b30a9',
+    'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
     'rsrc/css/layout/phabricator-source-code-view.css' => 'aea41829',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
@@ -395,8 +395,8 @@
     'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '408bf173',
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
-    'rsrc/js/application/diff/DiffChangeset.js' => '99abf4cd',
-    'rsrc/js/application/diff/DiffChangesetList.js' => '3b77efdd',
+    'rsrc/js/application/diff/DiffChangeset.js' => 'b49b59d6',
+    'rsrc/js/application/diff/DiffChangesetList.js' => '1f2e5265',
     'rsrc/js/application/diff/DiffInline.js' => 'e83d28f3',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
@@ -498,7 +498,7 @@
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
-    'rsrc/js/core/behavior-phabricator-nav.js' => '947753e0',
+    'rsrc/js/core/behavior-phabricator-nav.js' => '81144dfa',
     'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'acd29eee',
     'rsrc/js/core/behavior-read-only-warning.js' => 'ba158207',
     'rsrc/js/core/behavior-refresh-csrf.js' => 'ab2f381b',
@@ -657,7 +657,7 @@
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
     'javelin-behavior-phabricator-line-linker' => '1499a8cb',
-    'javelin-behavior-phabricator-nav' => '947753e0',
+    'javelin-behavior-phabricator-nav' => '81144dfa',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
     'javelin-behavior-phabricator-oncopy' => '2926fff2',
@@ -775,8 +775,8 @@
     'phabricator-darklog' => 'c8e1ffe3',
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
-    'phabricator-diff-changeset' => '99abf4cd',
-    'phabricator-diff-changeset-list' => '3b77efdd',
+    'phabricator-diff-changeset' => 'b49b59d6',
+    'phabricator-diff-changeset-list' => '1f2e5265',
     'phabricator-diff-inline' => 'e83d28f3',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
@@ -784,12 +784,12 @@
     'phabricator-favicon' => '1fe2510c',
     'phabricator-feed-css' => 'ecd4ec57',
     'phabricator-file-upload' => '680ea2c8',
-    'phabricator-filetree-view-css' => 'ea5b30a9',
+    'phabricator-filetree-view-css' => 'b912ad97',
     'phabricator-flag-css' => 'bba8f811',
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => 'c19dd9b9',
     'phabricator-main-menu-view' => '1802a242',
-    'phabricator-nav-view-css' => 'faf6a6fc',
+    'phabricator-nav-view-css' => '028126f6',
     'phabricator-notification' => '008faf9c',
     'phabricator-notification-css' => '457861ec',
     'phabricator-notification-menu-css' => '10685bd4',
@@ -1044,6 +1044,10 @@
       'javelin-uri',
       'javelin-routable',
     ),
+    '1f2e5265' => array(
+      'javelin-install',
+      'phuix-button-view',
+    ),
     '1f6794f6' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1143,10 +1147,6 @@
       'javelin-dom',
       'javelin-magical-init',
     ),
-    '3b77efdd' => array(
-      'javelin-install',
-      'phuix-button-view',
-    ),
     '3cb0b2fc' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1561,6 +1561,16 @@
     '7f243deb' => array(
       'javelin-install',
     ),
+    '81144dfa' => array(
+      'javelin-behavior',
+      'javelin-behavior-device',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-magical-init',
+      'javelin-vector',
+      'javelin-request',
+      'javelin-util',
+    ),
     '834a1173' => array(
       'javelin-behavior',
       'javelin-scrollbar',
@@ -1648,16 +1658,6 @@
       'javelin-workflow',
       'javelin-dom',
     ),
-    '947753e0' => array(
-      'javelin-behavior',
-      'javelin-behavior-device',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-magical-init',
-      'javelin-vector',
-      'javelin-request',
-      'javelin-util',
-    ),
     '949c0fe5' => array(
       'javelin-install',
     ),
@@ -1678,17 +1678,6 @@
       'javelin-mask',
       'phabricator-drag-and-drop-file-upload',
     ),
-    '99abf4cd' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-      'javelin-router',
-      'javelin-behavior-device',
-      'javelin-vector',
-      'phabricator-diff-inline',
-    ),
     '9a6dd75c' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1837,6 +1826,17 @@
     'b3e7d692' => array(
       'javelin-install',
     ),
+    'b49b59d6' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-workflow',
+      'javelin-router',
+      'javelin-behavior-device',
+      'javelin-vector',
+      'phabricator-diff-inline',
+    ),
     'b59e1e96' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/applications/differential/view/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php
index d4a13745dc..cb697c2e9d 100644
--- a/src/applications/differential/view/DifferentialChangesetDetailView.php
+++ b/src/applications/differential/view/DifferentialChangesetDetailView.php
@@ -206,6 +206,7 @@ public function render() {
           'displayPath' => hsprintf('%s', $display_parts),
           'path' => $display_filename,
           'icon' => $display_icon,
+          'treeNodeID' => 'tree-node-'.$changeset->getAnchorName(),
         ),
         'class' => $class,
         'id'    => $id,
diff --git a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
index 9781fb0d02..1f699be8eb 100644
--- a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
+++ b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
@@ -96,11 +96,20 @@ public function build(array $changesets) {
 
         $icon = $data->newFileTreeIcon();
         $classes[] = $data->getFileTreeClass();
+
+        $count = phutil_tag(
+          'span',
+          array(
+            'class' => 'filetree-progress-hint',
+            'id' => 'tree-node-'.$data->getAnchorName(),
+          ));
       } else {
         $name .= '/';
         $title = $path->getFullPath().'/';
         $icon = id(new PHUIIconView())
           ->setIcon('fa-folder-open blue');
+
+        $count = null;
       }
 
       $name_element = phutil_tag(
@@ -110,6 +119,7 @@ public function build(array $changesets) {
         ),
         $name);
 
+
       $filetree[] = javelin_tag(
         $href ? 'a' : 'span',
         array(
@@ -118,7 +128,7 @@ public function build(array $changesets) {
           'title' => $title,
           'class' => implode(' ', $classes),
         ),
-        array($icon, $name_element));
+        array($count, $icon, $name_element));
     }
     $tree->destroy();
 
diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css
index e8081a55e6..f3320e3eae 100644
--- a/webroot/rsrc/css/aphront/phabricator-nav-view.css
+++ b/webroot/rsrc/css/aphront/phabricator-nav-view.css
@@ -44,7 +44,7 @@
   position: fixed;
   top: 0;
   bottom: 0;
-  left: 205px;
+  left: 410px;
   width: 7px;
 
   cursor: col-resize;
@@ -66,7 +66,7 @@
 
 .device-desktop .phabricator-standard-page-body .has-drag-nav
   .phabricator-nav-content {
-  margin-left: 212px;
+  margin-left: 417px;
 }
 
 .device-desktop .phabricator-standard-page-body .has-drag-nav
@@ -81,7 +81,7 @@
 }
 
 .device-desktop .phui-navigation-shell .has-drag-nav .phabricator-nav-local {
-  width: 205px;
+  width: 410px;
   padding: 0;
   background: transparent;
 }
diff --git a/webroot/rsrc/css/layout/phabricator-filetree-view.css b/webroot/rsrc/css/layout/phabricator-filetree-view.css
index 21bbe9f0af..6497c37056 100644
--- a/webroot/rsrc/css/layout/phabricator-filetree-view.css
+++ b/webroot/rsrc/css/layout/phabricator-filetree-view.css
@@ -50,11 +50,6 @@
   background-color: {$hovergrey};
 }
 
-.phabricator-filetree .phabricator-active-nav-focus {
-  background-color: {$hovergrey};
-  border-left: 4px solid {$sky};
-}
-
 .phabricator-filetree .filetree-added {
   background: {$sh-greenbackground};
 }
@@ -66,3 +61,31 @@
 .phabricator-filetree .filetree-movecopy {
   background: {$sh-orangebackground};
 }
+
+.phabricator-filetree .phabricator-active-nav-focus {
+  background-color: {$hovergrey};
+  border-left: 4px solid {$sky};
+}
+
+.phabricator-filetree .filetree-progress-hint {
+  width: 24px;
+  margin-right: 6px;
+  display: inline-block;
+  padding: 0 4px;
+  border-radius: 4px;
+  font-size: smaller;
+  background: {$greybackground};
+  text-align: center;
+  opacity: 0.5;
+}
+
+.phabricator-filetree .filetree-comments-visible {
+  background: {$lightblue};
+  opacity: 0.75;
+  color: {$darkgreytext};
+}
+
+.phabricator-filetree .filetree-comments-completed {
+  background: {$darkgreybackground};
+  color: {$greytext};
+}
diff --git a/webroot/rsrc/js/application/diff/DiffChangeset.js b/webroot/rsrc/js/application/diff/DiffChangeset.js
index 72eeae294a..24d734573d 100644
--- a/webroot/rsrc/js/application/diff/DiffChangeset.js
+++ b/webroot/rsrc/js/application/diff/DiffChangeset.js
@@ -27,6 +27,7 @@ JX.install('DiffChangeset', {
     this._highlight = data.highlight;
     this._encoding = data.encoding;
     this._loaded = data.loaded;
+    this._treeNodeID = data.treeNodeID;
 
     this._leftID = data.left;
     this._rightID = data.right;
@@ -62,6 +63,7 @@ JX.install('DiffChangeset', {
 
     _changesetList: null,
     _icon: null,
+    _treeNodeID: null,
 
     getLeftChangesetID: function() {
       return this._leftID;
@@ -737,7 +739,8 @@ JX.install('DiffChangeset', {
 
     _rebuildAllInlines: function() {
       var rows = JX.DOM.scry(this._node, 'tr');
-      for (var ii = 0; ii < rows.length; ii++) {
+      var ii;
+      for (ii = 0; ii < rows.length; ii++) {
         var row = rows[ii];
         if (this._getRowType(row) != 'comment') {
           continue;
@@ -749,6 +752,75 @@ JX.install('DiffChangeset', {
       }
     },
 
+    redrawFileTree: function() {
+      var tree;
+      try {
+        tree = JX.$(this._treeNodeID);
+      } catch (e) {
+        return;
+      }
+
+      var inlines = this._inlines;
+      var done = [];
+      var undone = [];
+      var inline;
+
+      for (var ii = 0; ii < inlines.length; ii++) {
+        inline = inlines[ii];
+
+        if (inline.isDeleted()) {
+          continue;
+        }
+
+        if (inline.isSynthetic()) {
+          continue;
+        }
+
+        if (inline.isEditing()) {
+          continue;
+        }
+
+        if (!inline.getID()) {
+          // These are new comments which have been cancelled, and do not
+          // count as anything.
+          continue;
+        }
+
+        if (inline.isDraft()) {
+          continue;
+        }
+
+        if (!inline.isDone()) {
+          undone.push(inline);
+        } else {
+          done.push(inline);
+        }
+      }
+
+      var total = done.length + undone.length;
+
+      var hint;
+      var is_visible;
+      var is_completed;
+      if (total) {
+        if (done.length) {
+          hint = [done.length, '/', total];
+        } else  {
+          hint = total;
+        }
+        is_visible = true;
+        is_completed = (done.length == total);
+      } else {
+        hint = '-';
+        is_visible = false;
+        is_completed = false;
+      }
+
+      JX.DOM.setContent(tree, hint);
+      JX.DOM.alterClass(tree, 'filetree-comments-visible', is_visible);
+      JX.DOM.alterClass(tree, 'filetree-comments-completed', is_completed);
+    },
+
     toggleVisibility: function() {
       this._visible = !this._visible;
 
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index ec0270ac12..e62d2f51dd 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -915,6 +915,11 @@ JX.install('DiffChangesetList', {
       this._bannerChangeset = null;
 
       this._redrawBanner();
+
+      var changesets = this._changesets;
+      for (var ii = 0; ii < changesets.length; ii++) {
+        changesets[ii].redrawFileTree();
+      }
     },
 
     _onscroll: function() {
diff --git a/webroot/rsrc/js/core/behavior-phabricator-nav.js b/webroot/rsrc/js/core/behavior-phabricator-nav.js
index e37680abf0..74909e447d 100644
--- a/webroot/rsrc/js/core/behavior-phabricator-nav.js
+++ b/webroot/rsrc/js/core/behavior-phabricator-nav.js
@@ -28,6 +28,10 @@ JX.behavior('phabricator-nav', function(config) {
   JX.enableDispatch(document.body, 'mousemove');
 
   JX.DOM.listen(drag, 'mousedown', null, function(e) {
+    if (!e.isNormalMouseEvent()) {
+      return;
+    }
+
     dragging = JX.$V(e);
 
     // Show the "col-resize" cursor on the whole document while we're

From 7d4362690f1c8e616fd9ff6d917f676f163918f6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 17:26:01 -0800
Subject: [PATCH 525/865] Fix transposed name/email in Mailgun adapter

Summary: Ref T12677. This argument order was swapped.

Test Plan: Will push/verify.

Maniphest Tasks: T12677

Differential Revision: https://secure.phabricator.com/D19042
---
 .../adapter/PhabricatorMailImplementationMailgunAdapter.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
index 12c54e0d6a..349dae2d27 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php
@@ -21,7 +21,7 @@ public function addReplyTo($email, $name = '') {
     if (empty($this->params['reply-to'])) {
       $this->params['reply-to'] = array();
     }
-    $this->params['reply-to'][] = $this->renderAddress($name, $email);
+    $this->params['reply-to'][] = $this->renderAddress($email, $name);
     return $this;
   }
 

From 09b446b269f5cec0ba154872fddc354db44fd5e1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 17:48:59 -0800
Subject: [PATCH 526/865] Don't run older mail setup checks if
 "cluster.mailers" is configured

Summary: Ref T12677. Skip these checks if we're doing the new stuff. Also, allow priority to be unspecified.

Test Plan: Will deploy.

Maniphest Tasks: T12677

Differential Revision: https://secure.phabricator.com/D19043
---
 src/applications/config/check/PhabricatorMailSetupCheck.php   | 4 ++++
 .../cluster/config/PhabricatorClusterMailersConfigType.php    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/applications/config/check/PhabricatorMailSetupCheck.php b/src/applications/config/check/PhabricatorMailSetupCheck.php
index 2b8e4e12d5..b3b6143ad0 100644
--- a/src/applications/config/check/PhabricatorMailSetupCheck.php
+++ b/src/applications/config/check/PhabricatorMailSetupCheck.php
@@ -7,6 +7,10 @@ public function getDefaultGroup() {
   }
 
   protected function executeChecks() {
+    if (PhabricatorEnv::getEnvConfig('cluster.mailers')) {
+      return;
+    }
+
     $adapter = PhabricatorEnv::getEnvConfig('metamta.mail-adapter');
 
     switch ($adapter) {
diff --git a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
index 2a7550c419..b3b110298f 100644
--- a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
+++ b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
@@ -63,8 +63,8 @@ public function validateStoredValue(
       }
       $map[$key] = true;
 
-      $priority = idx($spec, 'priority', 0);
-      if ($priority <= 0) {
+      $priority = idx($spec, 'priority');
+      if ($priority !== null && $priority <= 0) {
         throw $this->newException(
           pht(
             'Mailer configuration ("%s") is invalid: priority must be '.

From d45952344bd020b196c635b158fdcc905803865a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 17:55:02 -0800
Subject: [PATCH 527/865] Use setOptions() to trigger mailer option validation,
 not validateOptions()

---
 .../cluster/config/PhabricatorClusterMailersConfigType.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
index b3b110298f..60547eea44 100644
--- a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
+++ b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
@@ -85,7 +85,7 @@ public function validateStoredValue(
 
       $options = idx($spec, 'options', array());
       try {
-        id(clone $adapters[$type])->validateOptions($options);
+        id(clone $adapters[$type])->setOptions($options);
       } catch (Exception $ex) {
         throw $this->newException(
           pht(

From 8de794d3c28a11f1a30e93e7bd74e71031de6ab5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 17:58:14 -0800
Subject: [PATCH 528/865] Make optional options actually optional in cluster
 mailer config validation

---
 .../cluster/config/PhabricatorClusterMailersConfigType.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
index 60547eea44..03f30506bd 100644
--- a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
+++ b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
@@ -85,6 +85,8 @@ public function validateStoredValue(
 
       $options = idx($spec, 'options', array());
       try {
+        $defaults = $adapters[$type]->newDefaultOptions();
+        $options = $options + $defaults;
         id(clone $adapters[$type])->setOptions($options);
       } catch (Exception $ex) {
         throw $this->newException(

From 9386e436fe35c7972116f2df26702a4b390c9985 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 18:14:25 -0800
Subject: [PATCH 529/865] Remove red coloration from "Logout" menu item

Summary: I made the red stronger (always visible, not just a hover state) for the "Mute" feature, but this made Logout look a little intense. Just make it normal-colored, logging out isn't a big deal.

Test Plan: No longer saw bright red logout action in profile dropdown menu.

Differential Revision: https://secure.phabricator.com/D19044
---
 .../people/engineextension/PeopleMainMenuBarExtension.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
index bed9dde44e..152fb2becf 100644
--- a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
+++ b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
@@ -113,7 +113,6 @@ private function newDropdown(
         ->setName(pht('Log Out %s', $viewer->getUsername()))
         ->addSigil('logout-item')
         ->setHref('/logout/')
-        ->setColor(PhabricatorActionView::RED)
         ->setWorkflow(true));
 
     return $view;

From 0470125d9e5f10ea7f0c3ffacc4faf71fcd40ffe Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 06:14:29 -0800
Subject: [PATCH 530/865] Add skeleton code for webhooks

Summary: Ref T11330. Adds general support for webhooks. This is still rough and missing a lot of pieces -- and not yet useful for anything -- but can make HTTP requests.

Test Plan: Used `bin/webhook call ...` to complete requests to a test endpoint.

Maniphest Tasks: T11330

Differential Revision: https://secure.phabricator.com/D19045
---
 bin/webhook                                   |   1 +
 .../sql/autopatches/20180209.hook.01.hook.sql |  12 +
 .../20180209.hook.02.hookxaction.sql          |  19 ++
 .../20180209.hook.03.hookrequest.sql          |  12 +
 scripts/setup/manage_webhook.php              |  21 ++
 src/__phutil_library_map__.php                |  59 +++++
 .../PhabricatorHeraldApplication.php          |  14 ++
 .../HeraldCreateWebhooksCapability.php        |  16 ++
 .../herald/controller/HeraldController.php    |  19 +-
 .../controller/HeraldRuleListController.php   |  11 +
 .../controller/HeraldWebhookController.php    |  15 ++
 .../HeraldWebhookEditController.php           |  12 +
 .../HeraldWebhookListController.php           |  26 ++
 .../HeraldWebhookTestController.php           |  45 ++++
 .../HeraldWebhookViewController.php           | 160 ++++++++++++
 .../herald/editor/HeraldWebhookEditEngine.php | 105 ++++++++
 .../herald/editor/HeraldWebhookEditor.php     |  22 ++
 .../HeraldWebhookCallManagementWorkflow.php   |  64 +++++
 .../HeraldWebhookManagementWorkflow.php       |   4 +
 .../herald/phid/HeraldWebhookPHIDType.php     |  49 ++++
 .../phid/HeraldWebhookRequestPHIDType.php     |  39 +++
 .../herald/query/HeraldWebhookQuery.php       |  64 +++++
 .../query/HeraldWebhookRequestQuery.php       | 126 ++++++++++
 .../query/HeraldWebhookSearchEngine.php       |  95 ++++++++
 .../query/HeraldWebhookTransactionQuery.php   |  10 +
 .../herald/storage/HeraldWebhook.php          | 177 ++++++++++++++
 .../herald/storage/HeraldWebhookRequest.php   | 191 +++++++++++++++
 .../storage/HeraldWebhookTransaction.php      |  22 ++
 .../view/HeraldWebhookRequestListView.php     |  78 ++++++
 .../herald/worker/HeraldWebhookWorker.php     | 229 ++++++++++++++++++
 .../xaction/HeraldWebhookNameTransaction.php  |  60 +++++
 .../HeraldWebhookStatusTransaction.php        |  55 +++++
 .../xaction/HeraldWebhookTransactionType.php  |   4 +
 .../xaction/HeraldWebhookURITransaction.php   |  74 ++++++
 34 files changed, 1896 insertions(+), 14 deletions(-)
 create mode 120000 bin/webhook
 create mode 100644 resources/sql/autopatches/20180209.hook.01.hook.sql
 create mode 100644 resources/sql/autopatches/20180209.hook.02.hookxaction.sql
 create mode 100644 resources/sql/autopatches/20180209.hook.03.hookrequest.sql
 create mode 100755 scripts/setup/manage_webhook.php
 create mode 100644 src/applications/herald/capability/HeraldCreateWebhooksCapability.php
 create mode 100644 src/applications/herald/controller/HeraldWebhookController.php
 create mode 100644 src/applications/herald/controller/HeraldWebhookEditController.php
 create mode 100644 src/applications/herald/controller/HeraldWebhookListController.php
 create mode 100644 src/applications/herald/controller/HeraldWebhookTestController.php
 create mode 100644 src/applications/herald/controller/HeraldWebhookViewController.php
 create mode 100644 src/applications/herald/editor/HeraldWebhookEditEngine.php
 create mode 100644 src/applications/herald/editor/HeraldWebhookEditor.php
 create mode 100644 src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
 create mode 100644 src/applications/herald/management/HeraldWebhookManagementWorkflow.php
 create mode 100644 src/applications/herald/phid/HeraldWebhookPHIDType.php
 create mode 100644 src/applications/herald/phid/HeraldWebhookRequestPHIDType.php
 create mode 100644 src/applications/herald/query/HeraldWebhookQuery.php
 create mode 100644 src/applications/herald/query/HeraldWebhookRequestQuery.php
 create mode 100644 src/applications/herald/query/HeraldWebhookSearchEngine.php
 create mode 100644 src/applications/herald/query/HeraldWebhookTransactionQuery.php
 create mode 100644 src/applications/herald/storage/HeraldWebhook.php
 create mode 100644 src/applications/herald/storage/HeraldWebhookRequest.php
 create mode 100644 src/applications/herald/storage/HeraldWebhookTransaction.php
 create mode 100644 src/applications/herald/view/HeraldWebhookRequestListView.php
 create mode 100644 src/applications/herald/worker/HeraldWebhookWorker.php
 create mode 100644 src/applications/herald/xaction/HeraldWebhookNameTransaction.php
 create mode 100644 src/applications/herald/xaction/HeraldWebhookStatusTransaction.php
 create mode 100644 src/applications/herald/xaction/HeraldWebhookTransactionType.php
 create mode 100644 src/applications/herald/xaction/HeraldWebhookURITransaction.php

diff --git a/bin/webhook b/bin/webhook
new file mode 120000
index 0000000000..d320336874
--- /dev/null
+++ b/bin/webhook
@@ -0,0 +1 @@
+../scripts/setup/manage_webhook.php
\ No newline at end of file
diff --git a/resources/sql/autopatches/20180209.hook.01.hook.sql b/resources/sql/autopatches/20180209.hook.01.hook.sql
new file mode 100644
index 0000000000..58b79227a1
--- /dev/null
+++ b/resources/sql/autopatches/20180209.hook.01.hook.sql
@@ -0,0 +1,12 @@
+CREATE TABLE {$NAMESPACE}_herald.herald_webhook (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  name VARCHAR(128) NOT NULL COLLATE {$COLLATE_TEXT},
+  webhookURI VARCHAR(255) NOT NULL COLLATE {$COLLATE_TEXT},
+  viewPolicy VARBINARY(64) NOT NULL,
+  editPolicy VARBINARY(64) NOT NULL,
+  status VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  hmacKey VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180209.hook.02.hookxaction.sql b/resources/sql/autopatches/20180209.hook.02.hookxaction.sql
new file mode 100644
index 0000000000..8da594f6bd
--- /dev/null
+++ b/resources/sql/autopatches/20180209.hook.02.hookxaction.sql
@@ -0,0 +1,19 @@
+CREATE TABLE {$NAMESPACE}_herald.herald_webhooktransaction (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  authorPHID VARBINARY(64) NOT NULL,
+  objectPHID VARBINARY(64) NOT NULL,
+  viewPolicy VARBINARY(64) NOT NULL,
+  editPolicy VARBINARY(64) NOT NULL,
+  commentPHID VARBINARY(64) DEFAULT NULL,
+  commentVersion INT UNSIGNED NOT NULL,
+  transactionType VARCHAR(32) COLLATE {$COLLATE_TEXT} NOT NULL,
+  oldValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  newValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  contentSource LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  metadata LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_phid` (`phid`),
+  KEY `key_object` (`objectPHID`)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180209.hook.03.hookrequest.sql b/resources/sql/autopatches/20180209.hook.03.hookrequest.sql
new file mode 100644
index 0000000000..f20b3a549d
--- /dev/null
+++ b/resources/sql/autopatches/20180209.hook.03.hookrequest.sql
@@ -0,0 +1,12 @@
+CREATE TABLE {$NAMESPACE}_herald.herald_webhookrequest (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  webhookPHID VARBINARY(64) NOT NULL,
+  objectPHID VARBINARY(64) NOT NULL,
+  status VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  properties LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  lastRequestResult VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT},
+  lastRequestEpoch INT UNSIGNED NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/scripts/setup/manage_webhook.php b/scripts/setup/manage_webhook.php
new file mode 100755
index 0000000000..afe662617a
--- /dev/null
+++ b/scripts/setup/manage_webhook.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+
+$root = dirname(dirname(dirname(__FILE__)));
+require_once $root.'/scripts/init/init-script.php';
+
+$args = new PhutilArgumentParser($argv);
+$args->setTagline(pht('manage webhooks'));
+$args->setSynopsis(<<<EOSYNOPSIS
+**webhook** __command__ [__options__]
+    Manage webhooks.
+
+EOSYNOPSIS
+  );
+$args->parseStandardArguments();
+
+$workflows = id(new PhutilClassMapQuery())
+  ->setAncestorClass('HeraldWebhookManagementWorkflow')
+  ->execute();
+$workflows[] = new PhutilHelpArgumentWorkflow();
+$args->parseWorkflows($workflows);
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 9342935ca1..bb1706a7ee 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1364,6 +1364,7 @@
     'HeraldContentSourceField' => 'applications/herald/field/HeraldContentSourceField.php',
     'HeraldController' => 'applications/herald/controller/HeraldController.php',
     'HeraldCoreStateReasons' => 'applications/herald/state/HeraldCoreStateReasons.php',
+    'HeraldCreateWebhooksCapability' => 'applications/herald/capability/HeraldCreateWebhooksCapability.php',
     'HeraldDAO' => 'applications/herald/storage/HeraldDAO.php',
     'HeraldDeprecatedFieldGroup' => 'applications/herald/field/HeraldDeprecatedFieldGroup.php',
     'HeraldDifferentialAdapter' => 'applications/differential/herald/HeraldDifferentialAdapter.php',
@@ -1440,6 +1441,30 @@
     'HeraldTranscriptSearchEngine' => 'applications/herald/query/HeraldTranscriptSearchEngine.php',
     'HeraldTranscriptTestCase' => 'applications/herald/storage/__tests__/HeraldTranscriptTestCase.php',
     'HeraldUtilityActionGroup' => 'applications/herald/action/HeraldUtilityActionGroup.php',
+    'HeraldWebhook' => 'applications/herald/storage/HeraldWebhook.php',
+    'HeraldWebhookCallManagementWorkflow' => 'applications/herald/management/HeraldWebhookCallManagementWorkflow.php',
+    'HeraldWebhookController' => 'applications/herald/controller/HeraldWebhookController.php',
+    'HeraldWebhookEditController' => 'applications/herald/controller/HeraldWebhookEditController.php',
+    'HeraldWebhookEditEngine' => 'applications/herald/editor/HeraldWebhookEditEngine.php',
+    'HeraldWebhookEditor' => 'applications/herald/editor/HeraldWebhookEditor.php',
+    'HeraldWebhookListController' => 'applications/herald/controller/HeraldWebhookListController.php',
+    'HeraldWebhookManagementWorkflow' => 'applications/herald/management/HeraldWebhookManagementWorkflow.php',
+    'HeraldWebhookNameTransaction' => 'applications/herald/xaction/HeraldWebhookNameTransaction.php',
+    'HeraldWebhookPHIDType' => 'applications/herald/phid/HeraldWebhookPHIDType.php',
+    'HeraldWebhookQuery' => 'applications/herald/query/HeraldWebhookQuery.php',
+    'HeraldWebhookRequest' => 'applications/herald/storage/HeraldWebhookRequest.php',
+    'HeraldWebhookRequestListView' => 'applications/herald/view/HeraldWebhookRequestListView.php',
+    'HeraldWebhookRequestPHIDType' => 'applications/herald/phid/HeraldWebhookRequestPHIDType.php',
+    'HeraldWebhookRequestQuery' => 'applications/herald/query/HeraldWebhookRequestQuery.php',
+    'HeraldWebhookSearchEngine' => 'applications/herald/query/HeraldWebhookSearchEngine.php',
+    'HeraldWebhookStatusTransaction' => 'applications/herald/xaction/HeraldWebhookStatusTransaction.php',
+    'HeraldWebhookTestController' => 'applications/herald/controller/HeraldWebhookTestController.php',
+    'HeraldWebhookTransaction' => 'applications/herald/storage/HeraldWebhookTransaction.php',
+    'HeraldWebhookTransactionQuery' => 'applications/herald/query/HeraldWebhookTransactionQuery.php',
+    'HeraldWebhookTransactionType' => 'applications/herald/xaction/HeraldWebhookTransactionType.php',
+    'HeraldWebhookURITransaction' => 'applications/herald/xaction/HeraldWebhookURITransaction.php',
+    'HeraldWebhookViewController' => 'applications/herald/controller/HeraldWebhookViewController.php',
+    'HeraldWebhookWorker' => 'applications/herald/worker/HeraldWebhookWorker.php',
     'Javelin' => 'infrastructure/javelin/Javelin.php',
     'LegalpadController' => 'applications/legalpad/controller/LegalpadController.php',
     'LegalpadCreateDocumentsCapability' => 'applications/legalpad/capability/LegalpadCreateDocumentsCapability.php',
@@ -6614,6 +6639,7 @@
     'HeraldContentSourceField' => 'HeraldField',
     'HeraldController' => 'PhabricatorController',
     'HeraldCoreStateReasons' => 'HeraldStateReasons',
+    'HeraldCreateWebhooksCapability' => 'PhabricatorPolicyCapability',
     'HeraldDAO' => 'PhabricatorLiskDAO',
     'HeraldDeprecatedFieldGroup' => 'HeraldFieldGroup',
     'HeraldDifferentialAdapter' => 'HeraldAdapter',
@@ -6704,6 +6730,39 @@
     'HeraldTranscriptSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'HeraldTranscriptTestCase' => 'PhabricatorTestCase',
     'HeraldUtilityActionGroup' => 'HeraldActionGroup',
+    'HeraldWebhook' => array(
+      'HeraldDAO',
+      'PhabricatorPolicyInterface',
+      'PhabricatorApplicationTransactionInterface',
+      'PhabricatorDestructibleInterface',
+    ),
+    'HeraldWebhookCallManagementWorkflow' => 'HeraldWebhookManagementWorkflow',
+    'HeraldWebhookController' => 'HeraldController',
+    'HeraldWebhookEditController' => 'HeraldWebhookController',
+    'HeraldWebhookEditEngine' => 'PhabricatorEditEngine',
+    'HeraldWebhookEditor' => 'PhabricatorApplicationTransactionEditor',
+    'HeraldWebhookListController' => 'HeraldWebhookController',
+    'HeraldWebhookManagementWorkflow' => 'PhabricatorManagementWorkflow',
+    'HeraldWebhookNameTransaction' => 'HeraldWebhookTransactionType',
+    'HeraldWebhookPHIDType' => 'PhabricatorPHIDType',
+    'HeraldWebhookQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'HeraldWebhookRequest' => array(
+      'HeraldDAO',
+      'PhabricatorPolicyInterface',
+      'PhabricatorExtendedPolicyInterface',
+    ),
+    'HeraldWebhookRequestListView' => 'AphrontView',
+    'HeraldWebhookRequestPHIDType' => 'PhabricatorPHIDType',
+    'HeraldWebhookRequestQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'HeraldWebhookSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'HeraldWebhookStatusTransaction' => 'HeraldWebhookTransactionType',
+    'HeraldWebhookTestController' => 'HeraldWebhookController',
+    'HeraldWebhookTransaction' => 'PhabricatorModularTransaction',
+    'HeraldWebhookTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'HeraldWebhookTransactionType' => 'PhabricatorModularTransactionType',
+    'HeraldWebhookURITransaction' => 'HeraldWebhookTransactionType',
+    'HeraldWebhookViewController' => 'HeraldWebhookController',
+    'HeraldWebhookWorker' => 'PhabricatorWorker',
     'Javelin' => 'Phobject',
     'LegalpadController' => 'PhabricatorController',
     'LegalpadCreateDocumentsCapability' => 'PhabricatorPolicyCapability',
diff --git a/src/applications/herald/application/PhabricatorHeraldApplication.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
index 9160b0e9d9..240aae8dd3 100644
--- a/src/applications/herald/application/PhabricatorHeraldApplication.php
+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
@@ -62,6 +62,17 @@ public function getRoutes() {
           '(?P<id>[1-9]\d*)/'
             => 'HeraldTranscriptController',
         ),
+        'webhook/' => array(
+          $this->getQueryRoutePattern() => 'HeraldWebhookListController',
+          'view/(?P<id>\d+)/(?:request/(?P<requestID>[^/]+)/)?' =>
+            'HeraldWebhookViewController',
+          $this->getEditRoutePattern('edit/') => 'HeraldWebhookEditController',
+          'test/(?P<id>\d+)/' => 'HeraldWebhookTestController',
+          'key/' => array(
+            'view/(?P<id>\d+)/' => 'HeraldWebhookViewKeyController',
+            'cycle/(?P<id>\d+)/' => 'HeraldWebhookCycleKeyController',
+          ),
+        ),
       ),
     );
   }
@@ -72,6 +83,9 @@ protected function getCustomCapabilities() {
         'caption' => pht('Global rules can bypass access controls.'),
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
+      HeraldCreateWebhooksCapability::CAPABILITY => array(
+        'default' => PhabricatorPolicies::POLICY_ADMIN,
+      ),
     );
   }
 
diff --git a/src/applications/herald/capability/HeraldCreateWebhooksCapability.php b/src/applications/herald/capability/HeraldCreateWebhooksCapability.php
new file mode 100644
index 0000000000..7537a61900
--- /dev/null
+++ b/src/applications/herald/capability/HeraldCreateWebhooksCapability.php
@@ -0,0 +1,16 @@
+<?php
+
+final class HeraldCreateWebhooksCapability
+  extends PhabricatorPolicyCapability {
+
+  const CAPABILITY = 'herald.webhooks';
+
+  public function getCapabilityName() {
+    return pht('Can Create Webhooks');
+  }
+
+  public function describeCapabilityRejection() {
+    return pht('You do not have permission to create webhooks.');
+  }
+
+}
diff --git a/src/applications/herald/controller/HeraldController.php b/src/applications/herald/controller/HeraldController.php
index 1a5d2084dd..48d50b12b9 100644
--- a/src/applications/herald/controller/HeraldController.php
+++ b/src/applications/herald/controller/HeraldController.php
@@ -6,18 +6,6 @@ public function buildApplicationMenu() {
     return $this->buildSideNavView()->getMenu();
   }
 
-  protected function buildApplicationCrumbs() {
-    $crumbs = parent::buildApplicationCrumbs();
-
-    $crumbs->addAction(
-      id(new PHUIListItemView())
-        ->setName(pht('Create Herald Rule'))
-        ->setHref($this->getApplicationURI('create/'))
-        ->setIcon('fa-plus-square'));
-
-    return $crumbs;
-  }
-
   public function buildSideNavView() {
     $viewer = $this->getViewer();
 
@@ -29,8 +17,11 @@ public function buildSideNavView() {
       ->addNavigationItems($nav->getMenu());
 
     $nav->addLabel(pht('Utilities'))
-        ->addFilter('test', pht('Test Console'))
-        ->addFilter('transcript', pht('Transcripts'));
+      ->addFilter('test', pht('Test Console'))
+      ->addFilter('transcript', pht('Transcripts'));
+
+    $nav->addLabel(pht('Webhooks'))
+      ->addFilter('webhook', pht('Webhooks'));
 
     $nav->selectFilter(null);
 
diff --git a/src/applications/herald/controller/HeraldRuleListController.php b/src/applications/herald/controller/HeraldRuleListController.php
index 490d84212d..846116333f 100644
--- a/src/applications/herald/controller/HeraldRuleListController.php
+++ b/src/applications/herald/controller/HeraldRuleListController.php
@@ -17,5 +17,16 @@ public function handleRequest(AphrontRequest $request) {
     return $this->delegateToController($controller);
   }
 
+  protected function buildApplicationCrumbs() {
+    $crumbs = parent::buildApplicationCrumbs();
+
+    $crumbs->addAction(
+      id(new PHUIListItemView())
+        ->setName(pht('Create Herald Rule'))
+        ->setHref($this->getApplicationURI('create/'))
+        ->setIcon('fa-plus-square'));
+
+    return $crumbs;
+  }
 
 }
diff --git a/src/applications/herald/controller/HeraldWebhookController.php b/src/applications/herald/controller/HeraldWebhookController.php
new file mode 100644
index 0000000000..6c210640c6
--- /dev/null
+++ b/src/applications/herald/controller/HeraldWebhookController.php
@@ -0,0 +1,15 @@
+<?php
+
+abstract class HeraldWebhookController extends HeraldController {
+
+  protected function buildApplicationCrumbs() {
+    $crumbs = parent::buildApplicationCrumbs();
+
+    $crumbs->addTextCrumb(
+      pht('Webhooks'),
+      $this->getApplicationURI('webhook/'));
+
+    return $crumbs;
+  }
+
+}
diff --git a/src/applications/herald/controller/HeraldWebhookEditController.php b/src/applications/herald/controller/HeraldWebhookEditController.php
new file mode 100644
index 0000000000..94c24187ec
--- /dev/null
+++ b/src/applications/herald/controller/HeraldWebhookEditController.php
@@ -0,0 +1,12 @@
+<?php
+
+final class HeraldWebhookEditController
+  extends HeraldWebhookController {
+
+  public function handleRequest(AphrontRequest $request) {
+    return id(new HeraldWebhookEditEngine())
+      ->setController($this)
+      ->buildResponse();
+  }
+
+}
diff --git a/src/applications/herald/controller/HeraldWebhookListController.php b/src/applications/herald/controller/HeraldWebhookListController.php
new file mode 100644
index 0000000000..85c53b2fa6
--- /dev/null
+++ b/src/applications/herald/controller/HeraldWebhookListController.php
@@ -0,0 +1,26 @@
+<?php
+
+final class HeraldWebhookListController
+  extends HeraldWebhookController {
+
+  public function shouldAllowPublic() {
+    return true;
+  }
+
+  public function handleRequest(AphrontRequest $request) {
+    return id(new HeraldWebhookSearchEngine())
+      ->setController($this)
+      ->buildResponse();
+  }
+
+  protected function buildApplicationCrumbs() {
+    $crumbs = parent::buildApplicationCrumbs();
+
+    id(new HeraldWebhookEditEngine())
+      ->setViewer($this->getViewer())
+      ->addActionToCrumbs($crumbs);
+
+    return $crumbs;
+  }
+
+}
diff --git a/src/applications/herald/controller/HeraldWebhookTestController.php b/src/applications/herald/controller/HeraldWebhookTestController.php
new file mode 100644
index 0000000000..fdc1494af9
--- /dev/null
+++ b/src/applications/herald/controller/HeraldWebhookTestController.php
@@ -0,0 +1,45 @@
+<?php
+
+final class HeraldWebhookTestController
+  extends HeraldWebhookController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $this->getViewer();
+
+    $hook = id(new HeraldWebhookQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($request->getURIData('id')))
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->executeOne();
+    if (!$hook) {
+      return new Aphront404Response();
+    }
+
+    if ($request->isFormPost()) {
+      $object = $hook;
+
+      $request = HeraldWebhookRequest::initializeNewWebhookRequest($hook)
+        ->setObjectPHID($object->getPHID())
+        ->save();
+
+      $request->queueCall();
+
+      $next_uri = $hook->getURI().'request/'.$request->getID().'/';
+
+      return id(new AphrontRedirectResponse())->setURI($next_uri);
+    }
+
+    return $this->newDialog()
+      ->setTitle(pht('New Test Request'))
+      ->appendParagraph(
+        pht('This will make a new test request to the configured URI.'))
+      ->addCancelButton($hook->getURI())
+      ->addSubmitButton(pht('Make Request'));
+  }
+
+
+}
diff --git a/src/applications/herald/controller/HeraldWebhookViewController.php b/src/applications/herald/controller/HeraldWebhookViewController.php
new file mode 100644
index 0000000000..db52b5bf8f
--- /dev/null
+++ b/src/applications/herald/controller/HeraldWebhookViewController.php
@@ -0,0 +1,160 @@
+<?php
+
+final class HeraldWebhookViewController
+  extends HeraldWebhookController {
+
+  public function shouldAllowPublic() {
+    return true;
+  }
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $this->getViewer();
+
+    $hook = id(new HeraldWebhookQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($request->getURIData('id')))
+      ->executeOne();
+    if (!$hook) {
+      return new Aphront404Response();
+    }
+
+    $header = $this->buildHeaderView($hook);
+
+    $warnings = null;
+    if ($hook->isInErrorBackoff($viewer)) {
+      $message = pht(
+        'Many requests to this webhook have failed recently (at least %s '.
+        'errors in the last %s seconds). New requests are temporarily paused.',
+        $hook->getErrorBackoffThreshold(),
+        $hook->getErrorBackoffWindow());
+
+      $warnings = id(new PHUIInfoView())
+        ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
+        ->setErrors(
+          array(
+            $message,
+          ));
+    }
+
+    $curtain = $this->buildCurtain($hook);
+    $properties_view = $this->buildPropertiesView($hook);
+
+    $timeline = $this->buildTransactionTimeline(
+      $hook,
+      new HeraldWebhookTransactionQuery());
+    $timeline->setShouldTerminate(true);
+
+    $requests = id(new HeraldWebhookRequestQuery())
+      ->setViewer($viewer)
+      ->withWebhookPHIDs(array($hook->getPHID()))
+      ->setLimit(20)
+      ->execute();
+
+    $requests_table = id(new HeraldWebhookRequestListView())
+      ->setViewer($viewer)
+      ->setRequests($requests)
+      ->setHighlightID($request->getURIData('requestID'));
+
+    $requests_view = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Recent Requests'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setTable($requests_table);
+
+    $hook_view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setMainColumn(
+        array(
+          $warnings,
+          $properties_view,
+          $requests_view,
+          $timeline,
+        ))
+      ->setCurtain($curtain);
+
+    $crumbs = $this->buildApplicationCrumbs()
+      ->addTextCrumb(pht('Webhook %d', $hook->getID()))
+      ->setBorder(true);
+
+    return $this->newPage()
+      ->setTitle(
+        array(
+          pht('Webhook %d', $hook->getID()),
+          $hook->getName(),
+        ))
+      ->setCrumbs($crumbs)
+      ->setPageObjectPHIDs(
+        array(
+          $hook->getPHID(),
+        ))
+      ->appendChild($hook_view);
+  }
+
+  private function buildHeaderView(HeraldWebhook $hook) {
+    $viewer = $this->getViewer();
+
+    $title = $hook->getName();
+
+    $header = id(new PHUIHeaderView())
+      ->setHeader($title)
+      ->setViewer($viewer)
+      ->setPolicyObject($hook)
+      ->setHeaderIcon('fa-cloud-upload');
+
+    return $header;
+  }
+
+
+  private function buildCurtain(HeraldWebhook $hook) {
+    $viewer = $this->getViewer();
+    $curtain = $this->newCurtainView($hook);
+
+    $can_edit = PhabricatorPolicyFilter::hasCapability(
+      $viewer,
+      $hook,
+      PhabricatorPolicyCapability::CAN_EDIT);
+
+    $id = $hook->getID();
+    $edit_uri = $this->getApplicationURI("webhook/edit/{$id}/");
+    $test_uri = $this->getApplicationURI("webhook/test/{$id}/");
+
+    $curtain->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('Edit Webhook'))
+        ->setIcon('fa-pencil')
+        ->setDisabled(!$can_edit)
+        ->setWorkflow(!$can_edit)
+        ->setHref($edit_uri));
+
+    $curtain->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('New Test Request'))
+        ->setIcon('fa-cloud-upload')
+        ->setDisabled(!$can_edit)
+        ->setWorkflow(true)
+        ->setHref($test_uri));
+
+    return $curtain;
+  }
+
+
+  private function buildPropertiesView(HeraldWebhook $hook) {
+    $viewer = $this->getViewer();
+
+    $properties = id(new PHUIPropertyListView())
+      ->setViewer($viewer);
+
+    $properties->addProperty(
+      pht('URI'),
+      $hook->getWebhookURI());
+
+    $properties->addProperty(
+      pht('Status'),
+      $hook->getStatusDisplayName());
+
+    return id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Details'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->appendChild($properties);
+  }
+
+}
diff --git a/src/applications/herald/editor/HeraldWebhookEditEngine.php b/src/applications/herald/editor/HeraldWebhookEditEngine.php
new file mode 100644
index 0000000000..5bca0af542
--- /dev/null
+++ b/src/applications/herald/editor/HeraldWebhookEditEngine.php
@@ -0,0 +1,105 @@
+<?php
+
+final class HeraldWebhookEditEngine
+  extends PhabricatorEditEngine {
+
+  const ENGINECONST = 'herald.webhook';
+
+  public function isEngineConfigurable() {
+    return false;
+  }
+
+  public function getEngineName() {
+    return pht('Webhooks');
+  }
+
+  public function getSummaryHeader() {
+    return pht('Edit Webhook Configurations');
+  }
+
+  public function getSummaryText() {
+    return pht('This engine is used to edit webhooks.');
+  }
+
+  public function getEngineApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  protected function newEditableObject() {
+    $viewer = $this->getViewer();
+    return HeraldWebhook::initializeNewWebhook($viewer);
+  }
+
+  protected function newObjectQuery() {
+    return new HeraldWebhookQuery();
+  }
+
+  protected function getObjectCreateTitleText($object) {
+    return pht('Create Webhook');
+  }
+
+  protected function getObjectCreateButtonText($object) {
+    return pht('Create Webhook');
+  }
+
+  protected function getObjectEditTitleText($object) {
+    return pht('Edit Webhook: %s', $object->getName());
+  }
+
+  protected function getObjectEditShortText($object) {
+    return pht('Edit Webhook');
+  }
+
+  protected function getObjectCreateShortText() {
+    return pht('Create Webhook');
+  }
+
+  protected function getObjectName() {
+    return pht('Webhook');
+  }
+
+  protected function getEditorURI() {
+    return '/herald/webhook/edit/';
+  }
+
+  protected function getObjectCreateCancelURI($object) {
+    return '/herald/webhook/';
+  }
+
+  protected function getObjectViewURI($object) {
+    return $object->getURI();
+  }
+
+  protected function getCreateNewObjectPolicy() {
+    return $this->getApplication()->getPolicy(
+      HeraldCreateWebhooksCapability::CAPABILITY);
+  }
+
+  protected function buildCustomEditFields($object) {
+    return array(
+      id(new PhabricatorTextEditField())
+        ->setKey('name')
+        ->setLabel(pht('Name'))
+        ->setDescription(pht('Name of the webhook.'))
+        ->setTransactionType(HeraldWebhookNameTransaction::TRANSACTIONTYPE)
+        ->setIsRequired(true)
+        ->setValue($object->getName()),
+      id(new PhabricatorTextEditField())
+        ->setKey('uri')
+        ->setLabel(pht('URI'))
+        ->setDescription(pht('URI for the webhook.'))
+        ->setTransactionType(HeraldWebhookURITransaction::TRANSACTIONTYPE)
+        ->setIsRequired(true)
+        ->setValue($object->getWebhookURI()),
+      id(new PhabricatorSelectEditField())
+        ->setKey('status')
+        ->setLabel(pht('Status'))
+        ->setDescription(pht('Status mode for the webhook.'))
+        ->setTransactionType(HeraldWebhookStatusTransaction::TRANSACTIONTYPE)
+        ->setOptions(HeraldWebhook::getStatusDisplayNameMap())
+        ->setValue($object->getStatus()),
+
+    );
+  }
+
+}
diff --git a/src/applications/herald/editor/HeraldWebhookEditor.php b/src/applications/herald/editor/HeraldWebhookEditor.php
new file mode 100644
index 0000000000..2206a59411
--- /dev/null
+++ b/src/applications/herald/editor/HeraldWebhookEditor.php
@@ -0,0 +1,22 @@
+<?php
+
+final class HeraldWebhookEditor
+  extends PhabricatorApplicationTransactionEditor {
+
+  public function getEditorApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  public function getEditorObjectsDescription() {
+    return pht('Webhooks');
+  }
+
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this webhook.', $author);
+  }
+
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
+  }
+
+}
diff --git a/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php b/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
new file mode 100644
index 0000000000..49904a37b8
--- /dev/null
+++ b/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
@@ -0,0 +1,64 @@
+<?php
+
+final class HeraldWebhookCallManagementWorkflow
+  extends HeraldWebhookManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('call')
+      ->setExamples('**call** --id __id__')
+      ->setSynopsis(pht('Call a webhook.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'id',
+            'param' => 'id',
+            'help' => pht('Webhook ID to call'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+
+    $id = $args->getArg('id');
+    if (!$id) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Specify a webhook to call with "--id".'));
+    }
+
+    $hook = id(new HeraldWebhookQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($id))
+      ->executeOne();
+    if (!$hook) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Unable to load specified webhook ("%s").',
+          $id));
+    }
+
+    $object = $hook;
+
+    $application_phid = id(new PhabricatorHeraldApplication())->getPHID();
+
+    $request = HeraldWebhookRequest::initializeNewWebhookRequest($hook)
+      ->setObjectPHID($object->getPHID())
+      ->save();
+
+    PhabricatorWorker::setRunAllTasksInProcess(true);
+    $request->queueCall();
+
+    $request->reload();
+
+    echo tsprintf(
+      "%s\n",
+      pht(
+        'Success, got HTTP %s from webhook.',
+        $request->getErrorCode()));
+
+    return 0;
+  }
+
+}
diff --git a/src/applications/herald/management/HeraldWebhookManagementWorkflow.php b/src/applications/herald/management/HeraldWebhookManagementWorkflow.php
new file mode 100644
index 0000000000..4bbfda79fe
--- /dev/null
+++ b/src/applications/herald/management/HeraldWebhookManagementWorkflow.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class HeraldWebhookManagementWorkflow
+  extends PhabricatorManagementWorkflow {}
diff --git a/src/applications/herald/phid/HeraldWebhookPHIDType.php b/src/applications/herald/phid/HeraldWebhookPHIDType.php
new file mode 100644
index 0000000000..bf16e22b1a
--- /dev/null
+++ b/src/applications/herald/phid/HeraldWebhookPHIDType.php
@@ -0,0 +1,49 @@
+<?php
+
+final class HeraldWebhookPHIDType extends PhabricatorPHIDType {
+
+  const TYPECONST = 'HWBH';
+
+  public function getTypeName() {
+    return pht('Webhook');
+  }
+
+  public function newObject() {
+    return new HeraldWebhook();
+  }
+
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  protected function buildQueryForObjects(
+    PhabricatorObjectQuery $query,
+    array $phids) {
+
+    return id(new HeraldWebhookQuery())
+      ->withPHIDs($phids);
+  }
+
+  public function loadHandles(
+    PhabricatorHandleQuery $query,
+    array $handles,
+    array $objects) {
+
+    foreach ($handles as $phid => $handle) {
+      $hook = $objects[$phid];
+
+      $name = $hook->getName();
+      $id = $hook->getID();
+
+      $handle
+        ->setName($name)
+        ->setURI($hook->getURI())
+        ->setFullName(pht('Webhook %d %s', $id, $name));
+
+      if ($hook->isDisabled()) {
+        $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
+      }
+    }
+  }
+
+}
diff --git a/src/applications/herald/phid/HeraldWebhookRequestPHIDType.php b/src/applications/herald/phid/HeraldWebhookRequestPHIDType.php
new file mode 100644
index 0000000000..8263ba7484
--- /dev/null
+++ b/src/applications/herald/phid/HeraldWebhookRequestPHIDType.php
@@ -0,0 +1,39 @@
+<?php
+
+final class HeraldWebhookRequestPHIDType extends PhabricatorPHIDType {
+
+  const TYPECONST = 'HWBR';
+
+  public function getTypeName() {
+    return pht('Webhook Request');
+  }
+
+  public function newObject() {
+    return new HeraldWebhook();
+  }
+
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  protected function buildQueryForObjects(
+    PhabricatorObjectQuery $query,
+    array $phids) {
+
+    return id(new HeraldWebhookRequestQuery())
+      ->withPHIDs($phids);
+  }
+
+  public function loadHandles(
+    PhabricatorHandleQuery $query,
+    array $handles,
+    array $objects) {
+
+    foreach ($handles as $phid => $handle) {
+      $request = $objects[$phid];
+
+      // TODO: Fill this in.
+    }
+  }
+
+}
diff --git a/src/applications/herald/query/HeraldWebhookQuery.php b/src/applications/herald/query/HeraldWebhookQuery.php
new file mode 100644
index 0000000000..ca46880613
--- /dev/null
+++ b/src/applications/herald/query/HeraldWebhookQuery.php
@@ -0,0 +1,64 @@
+<?php
+
+final class HeraldWebhookQuery
+  extends PhabricatorCursorPagedPolicyAwareQuery {
+
+  private $ids;
+  private $phids;
+  private $statuses;
+
+  public function withIDs(array $ids) {
+    $this->ids = $ids;
+    return $this;
+  }
+
+  public function withPHIDs(array $phids) {
+    $this->phids = $phids;
+    return $this;
+  }
+
+  public function withStatuses(array $statuses) {
+    $this->statuses = $statuses;
+    return $this;
+  }
+
+  public function newResultObject() {
+    return new HeraldWebhook();
+  }
+
+  protected function loadPage() {
+    return $this->loadStandardPage($this->newResultObject());
+  }
+
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
+
+    if ($this->ids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'id IN (%Ld)',
+        $this->ids);
+    }
+
+    if ($this->phids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'phid IN (%Ls)',
+        $this->phids);
+    }
+
+    if ($this->statuses !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'status IN (%Ls)',
+        $this->statuses);
+    }
+
+    return $where;
+  }
+
+  public function getQueryApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+}
diff --git a/src/applications/herald/query/HeraldWebhookRequestQuery.php b/src/applications/herald/query/HeraldWebhookRequestQuery.php
new file mode 100644
index 0000000000..4c71d48e05
--- /dev/null
+++ b/src/applications/herald/query/HeraldWebhookRequestQuery.php
@@ -0,0 +1,126 @@
+<?php
+
+final class HeraldWebhookRequestQuery
+  extends PhabricatorCursorPagedPolicyAwareQuery {
+
+  private $ids;
+  private $phids;
+  private $webhookPHIDs;
+  private $lastRequestEpochMin;
+  private $lastRequestEpochMax;
+  private $lastRequestResults;
+
+  public function withIDs(array $ids) {
+    $this->ids = $ids;
+    return $this;
+  }
+
+  public function withPHIDs(array $phids) {
+    $this->phids = $phids;
+    return $this;
+  }
+
+  public function withWebhookPHIDs(array $phids) {
+    $this->webhookPHIDs = $phids;
+    return $this;
+  }
+
+  public function newResultObject() {
+    return new HeraldWebhookRequest();
+  }
+
+  protected function loadPage() {
+    return $this->loadStandardPage($this->newResultObject());
+  }
+
+  public function withLastRequestEpochBetween($epoch_min, $epoch_max) {
+    $this->lastRequestEpochMin = $epoch_min;
+    $this->lastRequestEpochMax = $epoch_max;
+    return $this;
+  }
+
+  public function withLastRequestResults(array $results) {
+    $this->lastRequestResults = $results;
+    return $this;
+  }
+
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
+
+    if ($this->ids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'id IN (%Ld)',
+        $this->ids);
+    }
+
+    if ($this->phids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'phid IN (%Ls)',
+        $this->phids);
+    }
+
+    if ($this->webhookPHIDs !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'webhookPHID IN (%Ls)',
+        $this->webhookPHIDs);
+    }
+
+    if ($this->lastRequestEpochMin !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'lastRequestEpoch >= %d',
+        $this->lastRequestEpochMin);
+    }
+
+    if ($this->lastRequestEpochMax !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'lastRequestEpoch <= %d',
+        $this->lastRequestEpochMax);
+    }
+
+    if ($this->lastRequestResults !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'lastRequestResult IN (%Ls)',
+        $this->lastRequestResults);
+    }
+
+    return $where;
+  }
+
+  protected function willFilterPage(array $requests) {
+    $hook_phids = mpull($requests, 'getWebhookPHID');
+
+    $hooks = id(new HeraldWebhookQuery())
+      ->setViewer($this->getViewer())
+      ->setParentQuery($this)
+      ->withPHIDs($hook_phids)
+      ->execute();
+    $hooks = mpull($hooks, null, 'getPHID');
+
+    foreach ($requests as $key => $request) {
+      $hook_phid = $request->getWebhookPHID();
+      $hook = idx($hooks, $hook_phid);
+
+      if (!$hook) {
+        unset($requests[$key]);
+        $this->didRejectResult($request);
+        continue;
+      }
+
+      $request->attachWebhook($hook);
+    }
+
+    return $requests;
+  }
+
+
+  public function getQueryApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+}
diff --git a/src/applications/herald/query/HeraldWebhookSearchEngine.php b/src/applications/herald/query/HeraldWebhookSearchEngine.php
new file mode 100644
index 0000000000..10852f305f
--- /dev/null
+++ b/src/applications/herald/query/HeraldWebhookSearchEngine.php
@@ -0,0 +1,95 @@
+<?php
+
+final class HeraldWebhookSearchEngine
+  extends PhabricatorApplicationSearchEngine {
+
+  public function getResultTypeDescription() {
+    return pht('Webhooks');
+  }
+
+  public function getApplicationClassName() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  public function newQuery() {
+    return new HeraldWebhookQuery();
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+
+    if ($map['statuses']) {
+      $query->withStatuses($map['statuses']);
+    }
+
+    return $query;
+  }
+
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorSearchCheckboxesField())
+        ->setKey('statuses')
+        ->setLabel(pht('Status'))
+        ->setDescription(
+          pht('Search for archived or active pastes.'))
+        ->setOptions(HeraldWebhook::getStatusDisplayNameMap()),
+    );
+  }
+
+  protected function getURI($path) {
+    return '/herald/webhook/'.$path;
+  }
+
+  protected function getBuiltinQueryNames() {
+    $names = array();
+
+    $names['active'] = pht('Active');
+    $names['all'] = pht('All');
+
+    return $names;
+  }
+
+  public function buildSavedQueryFromBuiltin($query_key) {
+    $query = $this->newSavedQuery();
+    $query->setQueryKey($query_key);
+
+    switch ($query_key) {
+      case 'all':
+        return $query;
+      case 'active':
+        return $query->setParameter(
+          'statuses',
+          array(
+            HeraldWebhook::HOOKSTATUS_FIREHOSE,
+            HeraldWebhook::HOOKSTATUS_ENABLED,
+          ));
+    }
+
+    return parent::buildSavedQueryFromBuiltin($query_key);
+  }
+
+  protected function renderResultList(
+    array $hooks,
+    PhabricatorSavedQuery $query,
+    array $handles) {
+    assert_instances_of($hooks, 'HeraldWebhook');
+
+    $viewer = $this->requireViewer();
+
+    $list = id(new PHUIObjectItemListView())
+      ->setViewer($viewer);
+    foreach ($hooks as $hook) {
+      $item = id(new PHUIObjectItemView())
+        ->setObjectName(pht('Hook %d', $hook->getID()))
+        ->setHeader($hook->getName())
+        ->setHref($hook->getURI());
+
+      $list->addItem($item);
+    }
+
+    return id(new PhabricatorApplicationSearchResultView())
+      ->setObjectList($list)
+      ->setNoDataString(pht('No webhooks found.'));
+  }
+
+}
diff --git a/src/applications/herald/query/HeraldWebhookTransactionQuery.php b/src/applications/herald/query/HeraldWebhookTransactionQuery.php
new file mode 100644
index 0000000000..b812305e56
--- /dev/null
+++ b/src/applications/herald/query/HeraldWebhookTransactionQuery.php
@@ -0,0 +1,10 @@
+<?php
+
+final class HeraldWebhookTransactionQuery
+  extends PhabricatorApplicationTransactionQuery {
+
+  public function getTemplateApplicationTransaction() {
+    return new HeraldWebhookTransaction();
+  }
+
+}
diff --git a/src/applications/herald/storage/HeraldWebhook.php b/src/applications/herald/storage/HeraldWebhook.php
new file mode 100644
index 0000000000..1f3da0e0fb
--- /dev/null
+++ b/src/applications/herald/storage/HeraldWebhook.php
@@ -0,0 +1,177 @@
+<?php
+
+final class HeraldWebhook
+  extends HeraldDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorApplicationTransactionInterface,
+    PhabricatorDestructibleInterface {
+
+  protected $name;
+  protected $webhookURI;
+  protected $viewPolicy;
+  protected $editPolicy;
+  protected $status;
+  protected $hmacKey;
+
+  const HOOKSTATUS_FIREHOSE = 'firehose';
+  const HOOKSTATUS_ENABLED = 'enabled';
+  const HOOKSTATUS_DISABLED = 'disabled';
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_AUX_PHID => true,
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'name' => 'text128',
+        'webhookURI' => 'text255',
+        'status' => 'text32',
+        'hmacKey' => 'text32',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_status' => array(
+          'columns' => array('status'),
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  public function getPHIDType() {
+    return HeraldWebhookPHIDType::TYPECONST;
+  }
+
+  public static function initializeNewWebhook(PhabricatorUser $viewer) {
+    return id(new self())
+      ->setStatus(self::HOOKSTATUS_ENABLED)
+      ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
+      ->setEditPolicy($viewer->getPHID())
+      ->setHmacKey(Filesystem::readRandomCharacters(32));
+  }
+
+  public function getURI() {
+    return '/herald/webhook/view/'.$this->getID().'/';
+  }
+
+  public function isDisabled() {
+    return ($this->getStatus() === self::HOOKSTATUS_DISABLED);
+  }
+
+  public static function getStatusDisplayNameMap() {
+    return array(
+      self::HOOKSTATUS_FIREHOSE => pht('Firehose'),
+      self::HOOKSTATUS_ENABLED => pht('Enabled'),
+      self::HOOKSTATUS_DISABLED => pht('Disabled'),
+    );
+  }
+
+  public function getStatusDisplayName() {
+    $status = $this->getStatus();
+    return idx($this->getStatusDisplayNameMap(), $status);
+  }
+
+  public function getErrorBackoffWindow() {
+    return phutil_units('5 minutes in seconds');
+  }
+
+  public function getErrorBackoffThreshold() {
+    return 10;
+  }
+
+  public function isInErrorBackoff(PhabricatorUser $viewer) {
+    $backoff_window = $this->getErrorBackoffWindow();
+    $backoff_threshold = $this->getErrorBackoffThreshold();
+
+    $now = PhabricatorTime::getNow();
+
+    $window_start = ($now - $backoff_window);
+
+    $requests = id(new HeraldWebhookRequestQuery())
+      ->setViewer($viewer)
+      ->withWebhookPHIDs(array($this->getPHID()))
+      ->withLastRequestEpochBetween($window_start, null)
+      ->withLastRequestResults(
+        array(
+          HeraldWebhookRequest::RESULT_FAIL,
+        ))
+      ->execute();
+
+    if (count($requests) >= $backoff_threshold) {
+      return true;
+    }
+
+    return false;
+  }
+
+
+/* -(  PhabricatorPolicyInterface  )----------------------------------------- */
+
+
+  public function getCapabilities() {
+    return array(
+      PhabricatorPolicyCapability::CAN_VIEW,
+      PhabricatorPolicyCapability::CAN_EDIT,
+    );
+  }
+
+  public function getPolicy($capability) {
+    switch ($capability) {
+      case PhabricatorPolicyCapability::CAN_VIEW:
+        return $this->getViewPolicy();
+      case PhabricatorPolicyCapability::CAN_EDIT:
+        return $this->getEditPolicy();
+    }
+  }
+
+  public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
+    return false;
+  }
+
+
+/* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
+
+
+  public function getApplicationTransactionEditor() {
+    return new HeraldWebhookEditor();
+  }
+
+  public function getApplicationTransactionObject() {
+    return $this;
+  }
+
+  public function getApplicationTransactionTemplate() {
+    return new HeraldWebhookTransaction();
+  }
+
+  public function willRenderTimeline(
+    PhabricatorApplicationTransactionView $timeline,
+    AphrontRequest $request) {
+    return $timeline;
+  }
+
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+
+    while (true) {
+      $requests = id(new HeraldWebhookRequestQuery())
+        ->setViewer($engine->getViewer())
+        ->withWebhookPHIDs(array($this->getPHID()))
+        ->setLimit(100)
+        ->execute();
+
+      if (!$requests) {
+        break;
+      }
+
+      foreach ($requests as $request) {
+        $request->delete();
+      }
+    }
+
+    $this->delete();
+  }
+
+
+}
diff --git a/src/applications/herald/storage/HeraldWebhookRequest.php b/src/applications/herald/storage/HeraldWebhookRequest.php
new file mode 100644
index 0000000000..19e9bbbc39
--- /dev/null
+++ b/src/applications/herald/storage/HeraldWebhookRequest.php
@@ -0,0 +1,191 @@
+<?php
+
+final class HeraldWebhookRequest
+  extends HeraldDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorExtendedPolicyInterface {
+
+  protected $webhookPHID;
+  protected $objectPHID;
+  protected $status;
+  protected $properties = array();
+  protected $lastRequestResult;
+  protected $lastRequestEpoch;
+
+  private $webhook = self::ATTACHABLE;
+
+  const RETRY_NEVER = 'never';
+  const RETRY_FOREVER = 'forever';
+
+  const STATUS_QUEUED = 'queued';
+  const STATUS_FAILED = 'failed';
+  const STATUS_SENT = 'sent';
+
+  const RESULT_NONE = 'none';
+  const RESULT_OKAY = 'okay';
+  const RESULT_FAIL = 'fail';
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_AUX_PHID => true,
+      self::CONFIG_SERIALIZATION => array(
+        'properties' => self::SERIALIZATION_JSON,
+      ),
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'status' => 'text32',
+        'lastRequestResult' => 'text32',
+        'lastRequestEpoch' => 'epoch',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_ratelimit' => array(
+          'columns' => array(
+            'webhookPHID',
+            'lastRequestResult',
+            'lastRequestEpoch',
+          ),
+        ),
+        'key_collect' => array(
+          'columns' => array('dateCreated'),
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  public function getPHIDType() {
+    return HeraldWebhookRequestPHIDType::TYPECONST;
+  }
+
+  public static function initializeNewWebhookRequest(HeraldWebhook $hook) {
+    return id(new self())
+      ->setWebhookPHID($hook->getPHID())
+      ->attachWebhook($hook)
+      ->setStatus(self::STATUS_QUEUED)
+      ->setRetryMode(self::RETRY_NEVER)
+      ->setLastRequestResult(self::RESULT_NONE)
+      ->setLastRequestEpoch(0);
+  }
+
+  public function getWebhook() {
+    return $this->assertAttached($this->webhook);
+  }
+
+  public function attachWebhook(HeraldWebhook $hook) {
+    $this->webhook = $hook;
+    return $this;
+  }
+
+  protected function setProperty($key, $value) {
+    $this->properties[$key] = $value;
+    return $this;
+  }
+
+  protected function getProperty($key, $default = null) {
+    return idx($this->properties, $key, $default);
+  }
+
+  public function setRetryMode($mode) {
+    return $this->setProperty('retry', $mode);
+  }
+
+  public function getRetryMode() {
+    return $this->getProperty('retry');
+  }
+
+  public function setErrorType($error_type) {
+    return $this->setProperty('errorType', $error_type);
+  }
+
+  public function getErrorType() {
+    return $this->getProperty('errorType');
+  }
+
+  public function setErrorCode($error_code) {
+    return $this->setProperty('errorCode', $error_code);
+  }
+
+  public function getErrorCode() {
+    return $this->getProperty('errorCode');
+  }
+
+  public function setTransactionPHIDs(array $phids) {
+    return $this->setProperty('transactionPHIDs', $phids);
+  }
+
+  public function getTransactionPHIDs() {
+    return $this->getProperty('transactionPHIDs', array());
+  }
+
+  public function queueCall() {
+    PhabricatorWorker::scheduleTask(
+      'HeraldWebhookWorker',
+      array(
+        'webhookRequestPHID' => $this->getPHID(),
+      ),
+      array(
+        'objectPHID' => $this->getPHID(),
+      ));
+
+    return $this;
+  }
+
+  public function newStatusIcon() {
+    switch ($this->getStatus()) {
+      case self::STATUS_QUEUED:
+        $icon = 'fa-refresh';
+        $color = 'blue';
+        $tooltip = pht('Queued');
+        break;
+      case self::STATUS_SENT:
+        $icon = 'fa-check';
+        $color = 'green';
+        $tooltip = pht('Sent');
+        break;
+      case self::STATUS_FAILED:
+      default:
+        $icon = 'fa-times';
+        $color = 'red';
+        $tooltip = pht('Failed');
+        break;
+
+    }
+
+    return id(new PHUIIconView())
+      ->setIcon($icon, $color)
+      ->setTooltip($tooltip);
+  }
+
+
+/* -(  PhabricatorPolicyInterface  )----------------------------------------- */
+
+
+  public function getCapabilities() {
+    return array(
+      PhabricatorPolicyCapability::CAN_VIEW,
+    );
+  }
+
+  public function getPolicy($capability) {
+    switch ($capability) {
+      case PhabricatorPolicyCapability::CAN_VIEW:
+        return PhabricatorPolicies::getMostOpenPolicy();
+    }
+  }
+
+  public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
+    return false;
+  }
+
+
+/* -(  PhabricatorExtendedPolicyInterface  )--------------------------------- */
+
+
+  public function getExtendedPolicy($capability, PhabricatorUser $viewer) {
+    return array(
+      array($this->getWebhook(), PhabricatorPolicyCapability::CAN_VIEW),
+    );
+  }
+
+
+
+}
diff --git a/src/applications/herald/storage/HeraldWebhookTransaction.php b/src/applications/herald/storage/HeraldWebhookTransaction.php
new file mode 100644
index 0000000000..03c8cbb776
--- /dev/null
+++ b/src/applications/herald/storage/HeraldWebhookTransaction.php
@@ -0,0 +1,22 @@
+<?php
+
+final class HeraldWebhookTransaction
+  extends PhabricatorModularTransaction {
+
+  public function getApplicationName() {
+    return 'herald';
+  }
+
+  public function getApplicationTransactionType() {
+    return HeraldWebhookPHIDType::TYPECONST;
+  }
+
+  public function getApplicationTransactionCommentObject() {
+    return null;
+  }
+
+  public function getBaseTransactionClass() {
+    return 'HeraldWebhookTransactionType';
+  }
+
+}
diff --git a/src/applications/herald/view/HeraldWebhookRequestListView.php b/src/applications/herald/view/HeraldWebhookRequestListView.php
new file mode 100644
index 0000000000..e44a136d41
--- /dev/null
+++ b/src/applications/herald/view/HeraldWebhookRequestListView.php
@@ -0,0 +1,78 @@
+<?php
+
+final class HeraldWebhookRequestListView
+  extends AphrontView {
+
+  private $requests;
+  private $highlightID;
+
+  public function setRequests(array $requests) {
+    assert_instances_of($requests, 'HeraldWebhookRequest');
+    $this->requests = $requests;
+    return $this;
+  }
+
+  public function setHighlightID($highlight_id) {
+    $this->highlightID = $highlight_id;
+    return $this;
+  }
+
+  public function getHighlightID() {
+    return $this->highlightID;
+  }
+
+  public function render() {
+    $viewer = $this->getViewer();
+    $requests = $this->requests;
+
+    $handle_phids = array();
+    foreach ($requests as $request) {
+      $handle_phids[] = $request->getObjectPHID();
+    }
+    $handles = $viewer->loadHandles($handle_phids);
+
+    $highlight_id = $this->getHighlightID();
+
+    $rows = array();
+    $rowc = array();
+    foreach ($requests as $request) {
+      $icon = $request->newStatusIcon();
+
+      if ($highlight_id == $request->getID()) {
+        $rowc[] = 'highlighted';
+      } else {
+        $rowc[] = null;
+      }
+
+      $rows[] = array(
+        $request->getID(),
+        $icon,
+        $handles[$request->getObjectPHID()]->renderLink(),
+        $request->getErrorType(),
+        $request->getErrorCode(),
+      );
+    }
+
+    $table = id(new AphrontTableView($rows))
+      ->setRowClasses($rowc)
+      ->setHeaders(
+        array(
+          pht('ID'),
+          '',
+          pht('Object'),
+          pht('Type'),
+          pht('Code'),
+        ))
+      ->setColumnClasses(
+        array(
+          'n',
+          '',
+          'wide',
+          '',
+          '',
+        ));
+
+    return $table;
+  }
+
+}
diff --git a/src/applications/herald/worker/HeraldWebhookWorker.php b/src/applications/herald/worker/HeraldWebhookWorker.php
new file mode 100644
index 0000000000..a3d1ab64fc
--- /dev/null
+++ b/src/applications/herald/worker/HeraldWebhookWorker.php
@@ -0,0 +1,229 @@
+<?php
+
+final class HeraldWebhookWorker
+  extends PhabricatorWorker {
+
+  protected function doWork() {
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+    $data = $this->getTaskData();
+    $request_phid = idx($data, 'webhookRequestPHID');
+
+    $request = id(new HeraldWebhookRequestQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($request_phid))
+      ->executeOne();
+    if (!$request) {
+      throw new PhabricatorWorkerPermanentFailureException(
+        pht(
+          'Unable to load webhook request ("%s"). It may have been '.
+          'garbage collected.',
+          $request_phid));
+    }
+
+    $status = $request->getStatus();
+    if ($status !== HeraldWebhookRequest::STATUS_QUEUED) {
+      throw new PhabricatorWorkerPermanentFailureException(
+        pht(
+          'Webhook request ("%s") is not in "%s" status (actual '.
+          'status is "%s"). Declining call to hook.',
+          $request_phid,
+          HeraldWebhookRequest::STATUS_QUEUED,
+          $status));
+    }
+
+    $hook = $request->getWebhook();
+
+    if ($hook->isDisabled()) {
+      $this->failRequest($request, 'hook', 'disabled');
+      throw new PhabricatorWorkerPermanentFailureException(
+        pht(
+          'Associated hook ("%s") for webhook request ("%s") is disabled.',
+          $hook->getPHID(),
+          $request_phid));
+    }
+
+    $uri = $hook->getWebhookURI();
+    try {
+      PhabricatorEnv::requireValidRemoteURIForFetch(
+        $uri,
+        array(
+          'http',
+          'https',
+        ));
+    } catch (Exception $ex) {
+      $this->failRequest($request, 'hook', 'uri');
+      throw new PhabricatorWorkerPermanentFailureException(
+        pht(
+          'Associated hook ("%s") for webhook request ("%s") has invalid '.
+          'fetch URI: %s',
+          $hook->getPHID(),
+          $request_phid,
+          $ex->getMessage()));
+    }
+
+    $object_phid = $request->getObjectPHID();
+
+    $object = id(new PhabricatorObjectQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($object_phid))
+      ->executeOne();
+    if (!$object) {
+      $this->failRequest($request, 'hook', 'object');
+      throw new PhabricatorWorkerPermanentFailureException(
+        pht(
+          'Unable to load object ("%s") for webhook request ("%s").',
+          $object_phid,
+          $request_phid));
+    }
+
+    $xaction_query = PhabricatorApplicationTransactionQuery::newQueryForObject(
+      $object);
+    $xaction_phids = $request->getTransactionPHIDs();
+    if ($xaction_phids) {
+      $xactions = $xaction_query
+        ->setViewer($viewer)
+        ->withObjectPHIDs(array($object_phid))
+        ->withPHIDs($xaction_phids)
+        ->execute();
+      $xactions = mpull($xactions, null, 'getPHID');
+    } else {
+      $xactions = array();
+    }
+
+    // To prevent thundering herd issues for high volume webhooks (where
+    // a large number of workers might try to work through a request backlog
+    // simultaneously, before the error backoff can catch up), we never
+    // parallelize requests to a particular webhook.
+
+    $lock_key = 'webhook('.$hook->getPHID().')';
+    $lock = PhabricatorGlobalLock::newLock($lock_key);
+
+    try {
+      $lock->lock();
+    } catch (Exception $ex) {
+      phlog($ex);
+      throw new PhabricatorWorkerYieldException(15);
+    }
+
+    $caught = null;
+    try {
+      $this->callWebhookWithLock($hook, $request, $object, $xactions);
+    } catch (Exception $ex) {
+      $caught = $ex;
+    }
+
+    $lock->unlock();
+
+    if ($caught) {
+      throw $caught;
+    }
+  }
+
+  private function callWebhookWithLock(
+    HeraldWebhook $hook,
+    HeraldWebhookRequest $request,
+    $object,
+    array $xactions) {
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+    if ($hook->isInErrorBackoff($viewer)) {
+      throw new PhabricatorWorkerYieldException($hook->getErrorBackoffWindow());
+    }
+
+    $xaction_data = array();
+    foreach ($xactions as $xaction) {
+      $xaction_data[] = array(
+        'phid' => $xaction->getPHID(),
+      );
+    }
+
+    $payload = array(
+      'triggers' => array(),
+      'object' => array(
+        'phid' => $object->getPHID(),
+      ),
+      'transactions' => $xaction_data,
+    );
+
+    $payload = phutil_json_encode($payload);
+    $key = $hook->getHmacKey();
+    $signature = PhabricatorHash::digestHMACSHA256($payload, $key);
+    $uri = $hook->getWebhookURI();
+
+    $future = id(new HTTPSFuture($uri))
+      ->setMethod('POST')
+      ->addHeader('Content-Type', 'application/json')
+      ->addHeader('X-Phabricator-Webhook-Signature', $signature)
+      ->setTimeout(15)
+      ->setData($payload);
+
+    list($status) = $future->resolve();
+
+    if ($status->isTimeout()) {
+      $error_type = 'timeout';
+    } else {
+      $error_type = 'http';
+    }
+    $error_code = $status->getStatusCode();
+
+    $request
+      ->setErrorType($error_type)
+      ->setErrorCode($error_code)
+      ->setLastRequestEpoch(PhabricatorTime::getNow());
+
+    $retry_forever = HeraldWebhookRequest::RETRY_FOREVER;
+    if ($status->isTimeout() || $status->isError()) {
+      $should_retry = ($request->getRetryMode() === $retry_forever);
+
+      $request
+        ->setLastRequestResult(HeraldWebhookRequest::RESULT_FAIL);
+
+      if ($should_retry) {
+        $request->save();
+
+        throw new Exception(
+          pht(
+            'Webhook request ("%s", to "%s") failed (%s / %s). The request '.
+            'will be retried.',
+            $request->getPHID(),
+            $uri,
+            $error_type,
+            $error_code));
+      } else {
+        $request
+          ->setStatus(HeraldWebhookRequest::STATUS_FAILED)
+          ->save();
+
+        throw new PhabricatorWorkerPermanentFailureException(
+          pht(
+            'Webhook request ("%s", to "%s") failed (%s / %s). The request '.
+            'will not be retried.',
+            $request->getPHID(),
+            $uri,
+            $error_type,
+            $error_code));
+      }
+    } else {
+      $request
+        ->setLastRequestResult(HeraldWebhookRequest::RESULT_OKAY)
+        ->setStatus(HeraldWebhookRequest::STATUS_SENT)
+        ->save();
+    }
+  }
+
+  private function failRequest(
+    HeraldWebhookRequest $request,
+    $error_type,
+    $error_code) {
+
+    $request
+      ->setStatus(HeraldWebhookRequest::STATUS_FAILED)
+      ->setErrorType($error_type)
+      ->setErrorCode($error_code)
+      ->setLastRequestResult(HeraldWebhookRequest::RESULT_NONE)
+      ->setLastRequestEpoch(0)
+      ->save();
+  }
+
+}
diff --git a/src/applications/herald/xaction/HeraldWebhookNameTransaction.php b/src/applications/herald/xaction/HeraldWebhookNameTransaction.php
new file mode 100644
index 0000000000..6224292711
--- /dev/null
+++ b/src/applications/herald/xaction/HeraldWebhookNameTransaction.php
@@ -0,0 +1,60 @@
+<?php
+
+final class HeraldWebhookNameTransaction
+  extends HeraldWebhookTransactionType {
+
+  const TRANSACTIONTYPE = 'name';
+
+  public function generateOldValue($object) {
+    return $object->getName();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setName($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s renamed this webhook from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s renamed %s from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderObject(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+    $viewer = $this->getActor();
+
+    if ($this->isEmptyTextTransaction($object->getName(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Webhooks must have a name.'));
+      return $errors;
+    }
+
+    $max_length = $object->getColumnMaximumByteLength('name');
+    foreach ($xactions as $xaction) {
+      $old_value = $this->generateOldValue($object);
+      $new_value = $xaction->getNewValue();
+
+      $new_length = strlen($new_value);
+      if ($new_length > $max_length) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Webhook names can be no longer than %s characters.',
+            new PhutilNumber($max_length)));
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/herald/xaction/HeraldWebhookStatusTransaction.php b/src/applications/herald/xaction/HeraldWebhookStatusTransaction.php
new file mode 100644
index 0000000000..4051b6c597
--- /dev/null
+++ b/src/applications/herald/xaction/HeraldWebhookStatusTransaction.php
@@ -0,0 +1,55 @@
+<?php
+
+final class HeraldWebhookStatusTransaction
+  extends HeraldWebhookTransactionType {
+
+  const TRANSACTIONTYPE = 'status';
+
+  public function generateOldValue($object) {
+    return $object->getStatus();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setStatus($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s changed hook status from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s changed %s from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderObject(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+    $viewer = $this->getActor();
+
+    $options = HeraldWebhook::getStatusDisplayNameMap();
+
+    foreach ($xactions as $xaction) {
+      $new_value = $xaction->getNewValue();
+
+      if (!isset($options[$new_value])) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Webhook status "%s" is not valid. Valid statuses are: %s.',
+            $new_value,
+            implode(', ', array_keys($options))),
+          $xaction);
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/herald/xaction/HeraldWebhookTransactionType.php b/src/applications/herald/xaction/HeraldWebhookTransactionType.php
new file mode 100644
index 0000000000..d49fcfed86
--- /dev/null
+++ b/src/applications/herald/xaction/HeraldWebhookTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class HeraldWebhookTransactionType
+  extends PhabricatorModularTransactionType {}
diff --git a/src/applications/herald/xaction/HeraldWebhookURITransaction.php b/src/applications/herald/xaction/HeraldWebhookURITransaction.php
new file mode 100644
index 0000000000..e0162085cb
--- /dev/null
+++ b/src/applications/herald/xaction/HeraldWebhookURITransaction.php
@@ -0,0 +1,74 @@
+<?php
+
+final class HeraldWebhookURITransaction
+  extends HeraldWebhookTransactionType {
+
+  const TRANSACTIONTYPE = 'uri';
+
+  public function generateOldValue($object) {
+    return $object->getWebhookURI();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setWebhookURI($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s changed the URI for this webhook from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s changed the URI for %s from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderObject(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+    $viewer = $this->getActor();
+
+    if ($this->isEmptyTextTransaction($object->getName(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Webhooks must have a URI.'));
+      return $errors;
+    }
+
+    $max_length = $object->getColumnMaximumByteLength('webhookURI');
+    foreach ($xactions as $xaction) {
+      $old_value = $this->generateOldValue($object);
+      $new_value = $xaction->getNewValue();
+
+      $new_length = strlen($new_value);
+      if ($new_length > $max_length) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Webhook URIs can be no longer than %s characters.',
+            new PhutilNumber($max_length)),
+          $xaction);
+      }
+
+      try {
+        PhabricatorEnv::requireValidRemoteURIForFetch(
+          $new_value,
+          array(
+            'http',
+            'https',
+          ));
+      } catch (Exception $ex) {
+        $errors[] = $this->newInvalidError(
+          $ex->getMessage(),
+          $xaction);
+      }
+    }
+
+    return $errors;
+  }
+
+}

From dc2995c4ca3f2d8b01a782f44493295a624213a7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 10:45:18 -0800
Subject: [PATCH 531/865] Refine core webhook implementation somewhat

Summary:
Depends on D19045. Ref T11330.

  - View/regenerate HMAC keys.
  - Pretty JSON.
  - Readable status transactions.
  - test, silent, secure flags.
  - Dates on request view.
  - More icons.
  - Can test any object.
  - GC for requests.

Test Plan: Went through each feature poking at it in the web UI and with `bin/webhook call ...` / `bin/garbage collect ...`.

Subscribers: ftdysa

Maniphest Tasks: T11330

Differential Revision: https://secure.phabricator.com/D19046
---
 src/__phutil_library_map__.php                |  5 ++
 .../PhabricatorHeraldApplication.php          |  6 +-
 .../controller/HeraldWebhookKeyController.php | 56 +++++++++++++
 .../HeraldWebhookTestController.php           | 68 +++++++++++++---
 .../HeraldWebhookViewController.php           | 24 ++++++
 .../HeraldWebhookRequestGarbageCollector.php  | 29 +++++++
 .../HeraldWebhookCallManagementWorkflow.php   | 45 ++++++++++-
 .../query/HeraldWebhookSearchEngine.php       | 11 ++-
 .../herald/storage/HeraldWebhook.php          | 79 +++++++++++++++++--
 .../herald/storage/HeraldWebhookRequest.php   | 24 ++++++
 .../view/HeraldWebhookRequestListView.php     | 10 +++
 .../herald/worker/HeraldWebhookWorker.php     |  7 +-
 .../HeraldWebhookStatusTransaction.php        | 20 ++++-
 13 files changed, 354 insertions(+), 30 deletions(-)
 create mode 100644 src/applications/herald/controller/HeraldWebhookKeyController.php
 create mode 100644 src/applications/herald/garbagecollector/HeraldWebhookRequestGarbageCollector.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index bb1706a7ee..e078e6c10a 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1447,12 +1447,14 @@
     'HeraldWebhookEditController' => 'applications/herald/controller/HeraldWebhookEditController.php',
     'HeraldWebhookEditEngine' => 'applications/herald/editor/HeraldWebhookEditEngine.php',
     'HeraldWebhookEditor' => 'applications/herald/editor/HeraldWebhookEditor.php',
+    'HeraldWebhookKeyController' => 'applications/herald/controller/HeraldWebhookKeyController.php',
     'HeraldWebhookListController' => 'applications/herald/controller/HeraldWebhookListController.php',
     'HeraldWebhookManagementWorkflow' => 'applications/herald/management/HeraldWebhookManagementWorkflow.php',
     'HeraldWebhookNameTransaction' => 'applications/herald/xaction/HeraldWebhookNameTransaction.php',
     'HeraldWebhookPHIDType' => 'applications/herald/phid/HeraldWebhookPHIDType.php',
     'HeraldWebhookQuery' => 'applications/herald/query/HeraldWebhookQuery.php',
     'HeraldWebhookRequest' => 'applications/herald/storage/HeraldWebhookRequest.php',
+    'HeraldWebhookRequestGarbageCollector' => 'applications/herald/garbagecollector/HeraldWebhookRequestGarbageCollector.php',
     'HeraldWebhookRequestListView' => 'applications/herald/view/HeraldWebhookRequestListView.php',
     'HeraldWebhookRequestPHIDType' => 'applications/herald/phid/HeraldWebhookRequestPHIDType.php',
     'HeraldWebhookRequestQuery' => 'applications/herald/query/HeraldWebhookRequestQuery.php',
@@ -6735,12 +6737,14 @@
       'PhabricatorPolicyInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorDestructibleInterface',
+      'PhabricatorProjectInterface',
     ),
     'HeraldWebhookCallManagementWorkflow' => 'HeraldWebhookManagementWorkflow',
     'HeraldWebhookController' => 'HeraldController',
     'HeraldWebhookEditController' => 'HeraldWebhookController',
     'HeraldWebhookEditEngine' => 'PhabricatorEditEngine',
     'HeraldWebhookEditor' => 'PhabricatorApplicationTransactionEditor',
+    'HeraldWebhookKeyController' => 'HeraldWebhookController',
     'HeraldWebhookListController' => 'HeraldWebhookController',
     'HeraldWebhookManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'HeraldWebhookNameTransaction' => 'HeraldWebhookTransactionType',
@@ -6751,6 +6755,7 @@
       'PhabricatorPolicyInterface',
       'PhabricatorExtendedPolicyInterface',
     ),
+    'HeraldWebhookRequestGarbageCollector' => 'PhabricatorGarbageCollector',
     'HeraldWebhookRequestListView' => 'AphrontView',
     'HeraldWebhookRequestPHIDType' => 'PhabricatorPHIDType',
     'HeraldWebhookRequestQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
diff --git a/src/applications/herald/application/PhabricatorHeraldApplication.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
index 240aae8dd3..47e7bd7bfa 100644
--- a/src/applications/herald/application/PhabricatorHeraldApplication.php
+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
@@ -68,10 +68,8 @@ public function getRoutes() {
             'HeraldWebhookViewController',
           $this->getEditRoutePattern('edit/') => 'HeraldWebhookEditController',
           'test/(?P<id>\d+)/' => 'HeraldWebhookTestController',
-          'key/' => array(
-            'view/(?P<id>\d+)/' => 'HeraldWebhookViewKeyController',
-            'cycle/(?P<id>\d+)/' => 'HeraldWebhookCycleKeyController',
-          ),
+          'key/(?P<action>view|cycle)/(?P<id>\d+)/' =>
+            'HeraldWebhookKeyController',
         ),
       ),
     );
diff --git a/src/applications/herald/controller/HeraldWebhookKeyController.php b/src/applications/herald/controller/HeraldWebhookKeyController.php
new file mode 100644
index 0000000000..8e8bd03f4a
--- /dev/null
+++ b/src/applications/herald/controller/HeraldWebhookKeyController.php
@@ -0,0 +1,56 @@
+<?php
+
+final class HeraldWebhookKeyController
+  extends HeraldWebhookController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $this->getViewer();
+
+    $hook = id(new HeraldWebhookQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($request->getURIData('id')))
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->executeOne();
+    if (!$hook) {
+      return new Aphront404Response();
+    }
+
+    $action = $request->getURIData('action');
+    if ($action === 'cycle') {
+      if (!$request->isFormPost()) {
+        return $this->newDialog()
+          ->setTitle(pht('Regenerate HMAC Key'))
+          ->appendParagraph(
+            pht(
+              'Regenerate the HMAC key used to sign requests made by this '.
+              'webhook?'))
+          ->appendParagraph(
+            pht(
+              'Requests which are currently authenticated with the old key '.
+              'may fail.'))
+          ->addCancelButton($hook->getURI())
+          ->addSubmitButton(pht('Regnerate Key'));
+      } else {
+        $hook->regenerateHMACKey()->save();
+      }
+    }
+
+    $form = id(new AphrontFormView())
+      ->setViewer($viewer)
+      ->appendControl(
+        id(new AphrontFormTextControl())
+          ->setLabel(pht('HMAC Key'))
+          ->setValue($hook->getHMACKey()));
+
+    return $this->newDialog()
+      ->setTitle(pht('Webhook HMAC Key'))
+      ->appendForm($form)
+      ->addCancelButton($hook->getURI(), pht('Done'));
+  }
+
+
+}
diff --git a/src/applications/herald/controller/HeraldWebhookTestController.php b/src/applications/herald/controller/HeraldWebhookTestController.php
index fdc1494af9..b791ba783b 100644
--- a/src/applications/herald/controller/HeraldWebhookTestController.php
+++ b/src/applications/herald/controller/HeraldWebhookTestController.php
@@ -19,26 +19,74 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
+    $v_object = null;
+    $e_object = null;
+    $errors = array();
     if ($request->isFormPost()) {
-      $object = $hook;
 
-      $request = HeraldWebhookRequest::initializeNewWebhookRequest($hook)
-        ->setObjectPHID($object->getPHID())
-        ->save();
+      $v_object = $request->getStr('object');
+      if (!strlen($v_object)) {
+        $object = $hook;
+      } else {
+        $objects = id(new PhabricatorObjectQuery())
+          ->setViewer($viewer)
+          ->withNames(array($v_object))
+          ->execute();
+        if ($objects) {
+          $object = head($objects);
+        } else {
+          $e_object = pht('Invalid');
+          $errors[] = pht('Specified object could not be loaded.');
+        }
+      }
 
-      $request->queueCall();
+      if (!$errors) {
+        $xaction_query =
+          PhabricatorApplicationTransactionQuery::newQueryForObject($object);
 
-      $next_uri = $hook->getURI().'request/'.$request->getID().'/';
+        $xactions = $xaction_query
+          ->withObjectPHIDs(array($object->getPHID()))
+          ->setViewer($viewer)
+          ->setLimit(10)
+          ->execute();
 
-      return id(new AphrontRedirectResponse())->setURI($next_uri);
+        $request = HeraldWebhookRequest::initializeNewWebhookRequest($hook)
+          ->setObjectPHID($object->getPHID())
+          ->setIsTestAction(true)
+          ->setTransactionPHIDs(mpull($xactions, 'getPHID'))
+          ->save();
+
+        $request->queueCall();
+
+        $next_uri = $hook->getURI().'request/'.$request->getID().'/';
+
+        return id(new AphrontRedirectResponse())->setURI($next_uri);
+      }
     }
 
+    $instructions = <<<EOREMARKUP
+Optionally, choose an object to generate test data for (like `D123` or `T234`).
+
+The 10 most recent transactions for the object will be submitted to the webhook.
+EOREMARKUP;
+
+    $form = id(new AphrontFormView())
+      ->setViewer($viewer)
+      ->appendControl(
+        id(new AphrontFormTextControl())
+          ->setLabel(pht('Object'))
+          ->setName('object')
+          ->setError($e_object)
+          ->setValue($v_object));
+
     return $this->newDialog()
+      ->setErrors($errors)
+      ->setWidth(AphrontDialogView::WIDTH_FORM)
       ->setTitle(pht('New Test Request'))
-      ->appendParagraph(
-        pht('This will make a new test request to the configured URI.'))
+      ->appendParagraph(new PHUIRemarkupView($viewer, $instructions))
+      ->appendForm($form)
       ->addCancelButton($hook->getURI())
-      ->addSubmitButton(pht('Make Request'));
+      ->addSubmitButton(pht('Test Webhook'));
   }
 
 
diff --git a/src/applications/herald/controller/HeraldWebhookViewController.php b/src/applications/herald/controller/HeraldWebhookViewController.php
index db52b5bf8f..9b11f5d433 100644
--- a/src/applications/herald/controller/HeraldWebhookViewController.php
+++ b/src/applications/herald/controller/HeraldWebhookViewController.php
@@ -94,10 +94,15 @@ private function buildHeaderView(HeraldWebhook $hook) {
 
     $title = $hook->getName();
 
+    $status_icon = $hook->getStatusIcon();
+    $status_color = $hook->getStatusColor();
+    $status_name = $hook->getStatusDisplayName();
+
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setViewer($viewer)
       ->setPolicyObject($hook)
+      ->setStatus($status_icon, $status_color, $status_name)
       ->setHeaderIcon('fa-cloud-upload');
 
     return $header;
@@ -117,6 +122,9 @@ private function buildCurtain(HeraldWebhook $hook) {
     $edit_uri = $this->getApplicationURI("webhook/edit/{$id}/");
     $test_uri = $this->getApplicationURI("webhook/test/{$id}/");
 
+    $key_view_uri = $this->getApplicationURI("webhook/key/view/{$id}/");
+    $key_cycle_uri = $this->getApplicationURI("webhook/key/cycle/{$id}/");
+
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Webhook'))
@@ -133,6 +141,22 @@ private function buildCurtain(HeraldWebhook $hook) {
         ->setWorkflow(true)
         ->setHref($test_uri));
 
+    $curtain->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('View HMAC Key'))
+        ->setIcon('fa-key')
+        ->setDisabled(!$can_edit)
+        ->setWorkflow(true)
+        ->setHref($key_view_uri));
+
+    $curtain->addAction(
+      id(new PhabricatorActionView())
+        ->setName(pht('Regenerate HMAC Key'))
+        ->setIcon('fa-refresh')
+        ->setDisabled(!$can_edit)
+        ->setWorkflow(true)
+        ->setHref($key_cycle_uri));
+
     return $curtain;
   }
 
diff --git a/src/applications/herald/garbagecollector/HeraldWebhookRequestGarbageCollector.php b/src/applications/herald/garbagecollector/HeraldWebhookRequestGarbageCollector.php
new file mode 100644
index 0000000000..7626f70f00
--- /dev/null
+++ b/src/applications/herald/garbagecollector/HeraldWebhookRequestGarbageCollector.php
@@ -0,0 +1,29 @@
+<?php
+
+final class HeraldWebhookRequestGarbageCollector
+  extends PhabricatorGarbageCollector {
+
+  const COLLECTORCONST = 'herald.webhooks';
+
+  public function getCollectorName() {
+    return pht('Herald Webhooks');
+  }
+
+  public function getDefaultRetentionPolicy() {
+    return phutil_units('7 days in seconds');
+  }
+
+  protected function collectGarbage() {
+    $table = new HeraldWebhookRequest();
+    $conn_w = $table->establishConnection('w');
+
+    queryfx(
+      $conn_w,
+      'DELETE FROM %T WHERE dateCreated < %d LIMIT 100',
+      $table->getTableName(),
+      $this->getGarbageEpoch());
+
+    return ($conn_w->getAffectedRows() == 100);
+  }
+
+}
diff --git a/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php b/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
index 49904a37b8..abc9a40e17 100644
--- a/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
+++ b/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
@@ -6,7 +6,7 @@ final class HeraldWebhookCallManagementWorkflow
   protected function didConstruct() {
     $this
       ->setName('call')
-      ->setExamples('**call** --id __id__')
+      ->setExamples('**call** --id __id__ [--object __object__]')
       ->setSynopsis(pht('Call a webhook.'))
       ->setArguments(
         array(
@@ -15,6 +15,19 @@ protected function didConstruct() {
             'param' => 'id',
             'help' => pht('Webhook ID to call'),
           ),
+          array(
+            'name' => 'object',
+            'param' => 'object',
+            'help' => pht('Submit transactions for a particular object.'),
+          ),
+          array(
+            'name' => 'silent',
+            'help' => pht('Set the "silent" flag on the request.'),
+          ),
+          array(
+            'name' => 'secure',
+            'help' => pht('Set the "secure" flag on the request.'),
+          ),
         ));
   }
 
@@ -39,12 +52,38 @@ public function execute(PhutilArgumentParser $args) {
           $id));
     }
 
-    $object = $hook;
+    $object_name = $args->getArg('object');
+    if ($object_name === null) {
+      $object = $hook;
+    } else {
+      $objects = id(new PhabricatorObjectQuery())
+        ->setViewer($viewer)
+        ->withNames(array($object_name))
+        ->execute();
+      if (!$objects) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Unable to load specified object ("%s").',
+            $object_name));
+      }
+      $object = head($objects);
+    }
+
+    $xaction_query =
+      PhabricatorApplicationTransactionQuery::newQueryForObject($object);
 
-    $application_phid = id(new PhabricatorHeraldApplication())->getPHID();
+    $xactions = $xaction_query
+      ->withObjectPHIDs(array($object->getPHID()))
+      ->setViewer($viewer)
+      ->setLimit(10)
+      ->execute();
 
     $request = HeraldWebhookRequest::initializeNewWebhookRequest($hook)
       ->setObjectPHID($object->getPHID())
+      ->setIsTestAction(true)
+      ->setIsSilentAction((bool)$args->getArg('silent'))
+      ->setIsSecureAction((bool)$args->getArg('secure'))
+      ->setTransactionPHIDs(mpull($xactions, 'getPHID'))
       ->save();
 
     PhabricatorWorker::setRunAllTasksInProcess(true);
diff --git a/src/applications/herald/query/HeraldWebhookSearchEngine.php b/src/applications/herald/query/HeraldWebhookSearchEngine.php
index 10852f305f..84997b60b1 100644
--- a/src/applications/herald/query/HeraldWebhookSearchEngine.php
+++ b/src/applications/herald/query/HeraldWebhookSearchEngine.php
@@ -80,9 +80,16 @@ protected function renderResultList(
       ->setViewer($viewer);
     foreach ($hooks as $hook) {
       $item = id(new PHUIObjectItemView())
-        ->setObjectName(pht('Hook %d', $hook->getID()))
+        ->setObjectName(pht('Webhook %d', $hook->getID()))
         ->setHeader($hook->getName())
-        ->setHref($hook->getURI());
+        ->setHref($hook->getURI())
+        ->addAttribute($hook->getWebhookURI());
+
+      $item->addIcon($hook->getStatusIcon(), $hook->getStatusDisplayName());
+
+      if ($hook->isDisabled()) {
+        $item->setDisabled(true);
+      }
 
       $list->addItem($item);
     }
diff --git a/src/applications/herald/storage/HeraldWebhook.php b/src/applications/herald/storage/HeraldWebhook.php
index 1f3da0e0fb..05ec69e194 100644
--- a/src/applications/herald/storage/HeraldWebhook.php
+++ b/src/applications/herald/storage/HeraldWebhook.php
@@ -5,7 +5,8 @@ final class HeraldWebhook
   implements
     PhabricatorPolicyInterface,
     PhabricatorApplicationTransactionInterface,
-    PhabricatorDestructibleInterface {
+    PhabricatorDestructibleInterface,
+    PhabricatorProjectInterface {
 
   protected $name;
   protected $webhookURI;
@@ -44,7 +45,7 @@ public static function initializeNewWebhook(PhabricatorUser $viewer) {
       ->setStatus(self::HOOKSTATUS_ENABLED)
       ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
       ->setEditPolicy($viewer->getPHID())
-      ->setHmacKey(Filesystem::readRandomCharacters(32));
+      ->regenerateHMACKey();
   }
 
   public function getURI() {
@@ -56,16 +57,79 @@ public function isDisabled() {
   }
 
   public static function getStatusDisplayNameMap() {
+    $specs = self::getStatusSpecifications();
+    return ipull($specs, 'name', 'key');
+  }
+
+  private static function getStatusSpecifications() {
+    $specs = array(
+      array(
+        'key' => self::HOOKSTATUS_FIREHOSE,
+        'name' => pht('Firehose'),
+        'color' => 'orange',
+        'icon' => 'fa-star-o',
+      ),
+      array(
+        'key' => self::HOOKSTATUS_ENABLED,
+        'name' => pht('Enabled'),
+        'color' => 'bluegrey',
+        'icon' => 'fa-check',
+      ),
+      array(
+        'key' => self::HOOKSTATUS_DISABLED,
+        'name' => pht('Disabled'),
+        'color' => 'dark',
+        'icon' => 'fa-ban',
+      ),
+    );
+
+    return ipull($specs, null, 'key');
+  }
+
+
+  private static function getSpecificationForStatus($status) {
+    $specs = self::getStatusSpecifications();
+
+    if (isset($specs[$status])) {
+      return $specs[$status];
+    }
+
     return array(
-      self::HOOKSTATUS_FIREHOSE => pht('Firehose'),
-      self::HOOKSTATUS_ENABLED => pht('Enabled'),
-      self::HOOKSTATUS_DISABLED => pht('Disabled'),
+      'key' => $status,
+      'name' => pht('Unknown ("%s")', $status),
+      'icon' => 'fa-question',
+      'color' => 'indigo',
     );
   }
 
+  public static function getDisplayNameForStatus($status) {
+    $spec = self::getSpecificationForStatus($status);
+    return $spec['name'];
+  }
+
+  public static function getIconForStatus($status) {
+    $spec = self::getSpecificationForStatus($status);
+    return $spec['icon'];
+  }
+
+  public static function getColorForStatus($status) {
+    $spec = self::getSpecificationForStatus($status);
+    return $spec['color'];
+  }
+
   public function getStatusDisplayName() {
     $status = $this->getStatus();
-    return idx($this->getStatusDisplayNameMap(), $status);
+    return self::getDisplayNameForStatus($status);
+  }
+
+  public function getStatusIcon() {
+    $status = $this->getStatus();
+    return self::getIconForStatus($status);
+  }
+
+  public function getStatusColor() {
+    $status = $this->getStatus();
+    return self::getColorForStatus($status);
   }
 
   public function getErrorBackoffWindow() {
@@ -101,6 +165,9 @@ public function isInErrorBackoff(PhabricatorUser $viewer) {
     return false;
   }
 
+  public function regenerateHMACKey() {
+    return $this->setHMACKey(Filesystem::readRandomCharacters(32));
+  }
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/herald/storage/HeraldWebhookRequest.php b/src/applications/herald/storage/HeraldWebhookRequest.php
index 19e9bbbc39..d6e1364aaa 100644
--- a/src/applications/herald/storage/HeraldWebhookRequest.php
+++ b/src/applications/herald/storage/HeraldWebhookRequest.php
@@ -116,6 +116,30 @@ public function getTransactionPHIDs() {
     return $this->getProperty('transactionPHIDs', array());
   }
 
+  public function setIsSilentAction($bool) {
+    return $this->setProperty('silent', $bool);
+  }
+
+  public function getIsSilentAction() {
+    return $this->getProperty('silent', false);
+  }
+
+  public function setIsTestAction($bool) {
+    return $this->setProperty('test', $bool);
+  }
+
+  public function getIsTestAction() {
+    return $this->getProperty('test', false);
+  }
+
+  public function setIsSecureAction($bool) {
+    return $this->setProperty('secure', $bool);
+  }
+
+  public function getIsSecureAction() {
+    return $this->getProperty('secure', false);
+  }
+
   public function queueCall() {
     PhabricatorWorker::scheduleTask(
       'HeraldWebhookWorker',
diff --git a/src/applications/herald/view/HeraldWebhookRequestListView.php b/src/applications/herald/view/HeraldWebhookRequestListView.php
index e44a136d41..4e0f6510b9 100644
--- a/src/applications/herald/view/HeraldWebhookRequestListView.php
+++ b/src/applications/herald/view/HeraldWebhookRequestListView.php
@@ -44,12 +44,20 @@ public function render() {
         $rowc[] = null;
       }
 
+      $last_epoch = $request->getLastRequestEpoch();
+      if ($request->getLastRequestEpoch()) {
+        $last_request = phabricator_datetime($last_epoch, $viewer);
+      } else {
+        $last_request = null;
+      }
+
       $rows[] = array(
         $request->getID(),
         $icon,
         $handles[$request->getObjectPHID()]->renderLink(),
         $request->getErrorType(),
         $request->getErrorCode(),
+        $last_request,
       );
     }
 
@@ -62,6 +70,7 @@ public function render() {
           pht('Object'),
           pht('Type'),
           pht('Code'),
+          pht('Requested At'),
         ))
       ->setColumnClasses(
         array(
@@ -70,6 +79,7 @@ public function render() {
           'wide',
           '',
           '',
+          '',
         ));
 
     return $table;
diff --git a/src/applications/herald/worker/HeraldWebhookWorker.php b/src/applications/herald/worker/HeraldWebhookWorker.php
index a3d1ab64fc..fdf4bf7dc1 100644
--- a/src/applications/herald/worker/HeraldWebhookWorker.php
+++ b/src/applications/herald/worker/HeraldWebhookWorker.php
@@ -143,10 +143,15 @@ private function callWebhookWithLock(
       'object' => array(
         'phid' => $object->getPHID(),
       ),
+      'action' => array(
+        'test' => $request->getIsTestAction(),
+        'silent' => $request->getIsSilentAction(),
+        'secure' => $request->getIsSecureAction(),
+      ),
       'transactions' => $xaction_data,
     );
 
-    $payload = phutil_json_encode($payload);
+    $payload = id(new PhutilJSON())->encodeFormatted($payload);
     $key = $hook->getHmacKey();
     $signature = PhabricatorHash::digestHMACSHA256($payload, $key);
     $uri = $hook->getWebhookURI();
diff --git a/src/applications/herald/xaction/HeraldWebhookStatusTransaction.php b/src/applications/herald/xaction/HeraldWebhookStatusTransaction.php
index 4051b6c597..951001e0b6 100644
--- a/src/applications/herald/xaction/HeraldWebhookStatusTransaction.php
+++ b/src/applications/herald/xaction/HeraldWebhookStatusTransaction.php
@@ -14,20 +14,32 @@ public function applyInternalEffects($object, $value) {
   }
 
   public function getTitle() {
+    $old_value = $this->getOldValue();
+    $new_value = $this->getNewValue();
+
+    $old_status = HeraldWebhook::getDisplayNameForStatus($old_value);
+    $new_status = HeraldWebhook::getDisplayNameForStatus($new_value);
+
     return pht(
       '%s changed hook status from %s to %s.',
       $this->renderAuthor(),
-      $this->renderOldValue(),
-      $this->renderNewValue());
+      $this->renderValue($old_status),
+      $this->renderValue($new_status));
   }
 
   public function getTitleForFeed() {
+    $old_value = $this->getOldValue();
+    $new_value = $this->getNewValue();
+
+    $old_status = HeraldWebhook::getDisplayNameForStatus($old_value);
+    $new_status = HeraldWebhook::getDisplayNameForStatus($new_value);
+
     return pht(
       '%s changed %s from %s to %s.',
       $this->renderAuthor(),
       $this->renderObject(),
-      $this->renderOldValue(),
-      $this->renderNewValue());
+      $this->renderValue($old_status),
+      $this->renderValue($new_status));
   }
 
   public function validateTransactions($object, array $xactions) {

From 4887c6aa803d2b231b316b5273a11fa98d462547 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 11:46:02 -0800
Subject: [PATCH 532/865] Allow "transaction.search" to be constrained by PHIDs

Summary: Depends on D19046. Ref T11330. Supports querying for specific transactions while responding to webhooks.

Test Plan: Called `transaction.search` with and without PHID constraints.

Maniphest Tasks: T11330

Differential Revision: https://secure.phabricator.com/D19047
---
 .../TransactionSearchConduitAPIMethod.php     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php b/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
index 43b94874bf..66285547b3 100644
--- a/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
+++ b/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
@@ -22,6 +22,7 @@ public function getMethodStatusDescription() {
   protected function defineParamTypes() {
     return array(
       'objectIdentifier' => 'phid|string',
+      'constraints' => 'map<string, wild>',
     ) + $this->getPagerParamTypes();
   }
 
@@ -66,10 +67,23 @@ protected function execute(ConduitAPIRequest $request) {
     $xaction_query = PhabricatorApplicationTransactionQuery::newQueryForObject(
       $object);
 
-    $xactions = $xaction_query
+    $xaction_query
       ->withObjectPHIDs(array($object->getPHID()))
-      ->setViewer($viewer)
-      ->executeWithCursorPager($pager);
+      ->setViewer($viewer);
+
+    $constraints = $request->getValue('constraints', array());
+    PhutilTypeSpec::checkMap(
+      $constraints,
+      array(
+        'phids' => 'optional list<string>',
+      ));
+
+    $with_phids = idx($constraints, 'phids');
+    if ($with_phids) {
+      $xaction_query->withPHIDs($with_phids);
+    }
+
+    $xactions = $xaction_query->executeWithCursorPager($pager);
 
     if ($xactions) {
       $template = head($xactions)->getApplicationTransactionCommentObject();

From 41d28abfcc46f8c139046fd909e148ec23d95135 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 11:48:41 -0800
Subject: [PATCH 533/865] Trigger all "Firehose" webhooks on all transactional
 edits

Summary: Depends on D19047. Ref T11330. Triggers every firehose hook on every edit; prepares for Herald triggers.

Test Plan: Configured a firehose hook, edited some objects, saw callbacks.

Maniphest Tasks: T11330

Differential Revision: https://secure.phabricator.com/D19048
---
 .../HeraldWebhookTestController.php           |  1 +
 .../herald/editor/HeraldWebhookEditor.php     |  9 +++
 .../HeraldWebhookCallManagementWorkflow.php   |  3 +
 .../phid/HeraldWebhookRequestPHIDType.php     |  3 +-
 .../herald/storage/HeraldWebhookRequest.php   |  8 +++
 .../herald/worker/HeraldWebhookWorker.php     | 10 +++-
 ...habricatorApplicationTransactionEditor.php | 57 +++++++++++++++++++
 7 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/src/applications/herald/controller/HeraldWebhookTestController.php b/src/applications/herald/controller/HeraldWebhookTestController.php
index b791ba783b..510e7f3f81 100644
--- a/src/applications/herald/controller/HeraldWebhookTestController.php
+++ b/src/applications/herald/controller/HeraldWebhookTestController.php
@@ -52,6 +52,7 @@ public function handleRequest(AphrontRequest $request) {
 
         $request = HeraldWebhookRequest::initializeNewWebhookRequest($hook)
           ->setObjectPHID($object->getPHID())
+          ->setTriggerPHIDs(array($viewer->getPHID()))
           ->setIsTestAction(true)
           ->setTransactionPHIDs(mpull($xactions, 'getPHID'))
           ->save();
diff --git a/src/applications/herald/editor/HeraldWebhookEditor.php b/src/applications/herald/editor/HeraldWebhookEditor.php
index 2206a59411..1f138e5028 100644
--- a/src/applications/herald/editor/HeraldWebhookEditor.php
+++ b/src/applications/herald/editor/HeraldWebhookEditor.php
@@ -19,4 +19,13 @@ public function getCreateObjectTitleForFeed($author, $object) {
     return pht('%s created %s.', $author, $object);
   }
 
+  public function getTransactionTypes() {
+    $types = parent::getTransactionTypes();
+
+    $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
+    $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
+
+    return $types;
+  }
+
 }
diff --git a/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php b/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
index abc9a40e17..10249cca68 100644
--- a/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
+++ b/src/applications/herald/management/HeraldWebhookCallManagementWorkflow.php
@@ -78,11 +78,14 @@ public function execute(PhutilArgumentParser $args) {
       ->setLimit(10)
       ->execute();
 
+    $application_phid = id(new PhabricatorHeraldApplication())->getPHID();
+
     $request = HeraldWebhookRequest::initializeNewWebhookRequest($hook)
       ->setObjectPHID($object->getPHID())
       ->setIsTestAction(true)
       ->setIsSilentAction((bool)$args->getArg('silent'))
       ->setIsSecureAction((bool)$args->getArg('secure'))
+      ->setTriggerPHIDs(array($application_phid))
       ->setTransactionPHIDs(mpull($xactions, 'getPHID'))
       ->save();
 
diff --git a/src/applications/herald/phid/HeraldWebhookRequestPHIDType.php b/src/applications/herald/phid/HeraldWebhookRequestPHIDType.php
index 8263ba7484..bcf5afb0d3 100644
--- a/src/applications/herald/phid/HeraldWebhookRequestPHIDType.php
+++ b/src/applications/herald/phid/HeraldWebhookRequestPHIDType.php
@@ -31,8 +31,7 @@ public function loadHandles(
 
     foreach ($handles as $phid => $handle) {
       $request = $objects[$phid];
-
-      // TODO: Fill this in.
+      $handle->setName(pht('Webhook Request %d', $request->getID()));
     }
   }
 
diff --git a/src/applications/herald/storage/HeraldWebhookRequest.php b/src/applications/herald/storage/HeraldWebhookRequest.php
index d6e1364aaa..5db5b2916e 100644
--- a/src/applications/herald/storage/HeraldWebhookRequest.php
+++ b/src/applications/herald/storage/HeraldWebhookRequest.php
@@ -116,6 +116,14 @@ public function getTransactionPHIDs() {
     return $this->getProperty('transactionPHIDs', array());
   }
 
+  public function setTriggerPHIDs(array $phids) {
+    return $this->setProperty('triggerPHIDs', $phids);
+  }
+
+  public function getTriggerPHIDs() {
+    return $this->getProperty('triggerPHIDs', array());
+  }
+
   public function setIsSilentAction($bool) {
     return $this->setProperty('silent', $bool);
   }
diff --git a/src/applications/herald/worker/HeraldWebhookWorker.php b/src/applications/herald/worker/HeraldWebhookWorker.php
index fdf4bf7dc1..f74268c694 100644
--- a/src/applications/herald/worker/HeraldWebhookWorker.php
+++ b/src/applications/herald/worker/HeraldWebhookWorker.php
@@ -138,11 +138,19 @@ private function callWebhookWithLock(
       );
     }
 
+    $trigger_data = array();
+    foreach ($request->getTriggerPHIDs() as $trigger_phid) {
+      $trigger_data[] = array(
+        'phid' => $trigger_phid,
+      );
+    }
+
     $payload = array(
-      'triggers' => array(),
       'object' => array(
+        'type' => phid_get_type($object->getPHID()),
         'phid' => $object->getPHID(),
       ),
+      'triggers' => $trigger_data,
       'action' => array(
         'test' => $request->getIsTestAction(),
         'silent' => $request->getIsSilentAction(),
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 5e6a311a85..09c6af62b7 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -79,6 +79,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $mailRemovedPHIDs = array();
   private $mailUnexpandablePHIDs = array();
   private $mailMutedPHIDs = array();
+  private $webhookMap = array();
 
   private $transactionQueue = array();
 
@@ -1307,6 +1308,8 @@ public function publishTransactions(
       $mail->save();
     }
 
+    $this->queueWebhooks($object, $xactions);
+
     return $xactions;
   }
 
@@ -3660,6 +3663,8 @@ private function getAutomaticStateProperties() {
       'mailStamps',
       'mailUnexpandablePHIDs',
       'mailMutedPHIDs',
+      'webhookMap',
+      'silent',
     );
   }
 
@@ -4240,4 +4245,56 @@ private function applyOldRecipientLists() {
     return $this;
   }
 
+  private function queueWebhooks($object, array $xactions) {
+    $hook_viewer = PhabricatorUser::getOmnipotentUser();
+
+    $webhook_map = $this->webhookMap;
+    if (!is_array($webhook_map)) {
+      $webhook_map = array();
+    }
+
+    // Add any "Firehose" hooks to the list of hooks we're going to call.
+    $firehose_hooks = id(new HeraldWebhookQuery())
+      ->setViewer($hook_viewer)
+      ->withStatuses(
+        array(
+          HeraldWebhook::HOOKSTATUS_FIREHOSE,
+        ))
+      ->execute();
+    foreach ($firehose_hooks as $firehose_hook) {
+      // This is "the hook itself is the reason this hook is being called",
+      // since we're including it because it's configured as a firehose
+      // hook.
+      $hook_phid = $firehose_hook->getPHID();
+      $webhook_map[$hook_phid][] = $hook_phid;
+    }
+
+    if (!$webhook_map) {
+      return;
+    }
+
+    // NOTE: We're going to queue calls to disabled webhooks, they'll just
+    // immediately fail in the worker queue. This makes the behavior more
+    // visible.
+
+    $call_hooks = id(new HeraldWebhookQuery())
+      ->setViewer($hook_viewer)
+      ->withPHIDs(array_keys($webhook_map))
+      ->execute();
+
+    foreach ($call_hooks as $call_hook) {
+      $trigger_phids = idx($webhook_map, $call_hook->getPHID());
+
+      $request = HeraldWebhookRequest::initializeNewWebhookRequest($call_hook)
+        ->setObjectPHID($object->getPHID())
+        ->setTransactionPHIDs(mpull($xactions, 'getPHID'))
+        ->setTriggerPHIDs($trigger_phids)
+        ->setIsSilentAction((bool)$this->getIsSilent())
+        ->setIsSecureAction((bool)$this->getMustEncrypt())
+        ->save();
+
+      $request->queueCall();
+    }
+  }
+
 }

From 98c701ffc55f59fd565156b1a83dc9af4b19c634 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 12:18:15 -0800
Subject: [PATCH 534/865] Add a "Call webhooks" action to Herald

Summary: Depends on D19048. Fixes T11330.

Test Plan: Wrote rules to call webhooks selectively, saw them fire appropriately with correct trigger attribution.

Maniphest Tasks: T11330

Differential Revision: https://secure.phabricator.com/D19049
---
 src/__phutil_library_map__.php                |  4 ++
 .../herald/action/HeraldCallWebhookAction.php | 62 +++++++++++++++++++
 .../herald/adapter/HeraldAdapter.php          | 14 +++++
 .../typeahead/HeraldWebhookDatasource.php     | 48 ++++++++++++++
 ...habricatorApplicationTransactionEditor.php |  1 +
 5 files changed, 129 insertions(+)
 create mode 100644 src/applications/herald/action/HeraldCallWebhookAction.php
 create mode 100644 src/applications/herald/typeahead/HeraldWebhookDatasource.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e078e6c10a..6c3514a2c9 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1357,6 +1357,7 @@
     'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
     'HeraldBasicFieldGroup' => 'applications/herald/field/HeraldBasicFieldGroup.php',
     'HeraldBuildableState' => 'applications/herald/state/HeraldBuildableState.php',
+    'HeraldCallWebhookAction' => 'applications/herald/action/HeraldCallWebhookAction.php',
     'HeraldCommentAction' => 'applications/herald/action/HeraldCommentAction.php',
     'HeraldCommitAdapter' => 'applications/diffusion/herald/HeraldCommitAdapter.php',
     'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
@@ -1444,6 +1445,7 @@
     'HeraldWebhook' => 'applications/herald/storage/HeraldWebhook.php',
     'HeraldWebhookCallManagementWorkflow' => 'applications/herald/management/HeraldWebhookCallManagementWorkflow.php',
     'HeraldWebhookController' => 'applications/herald/controller/HeraldWebhookController.php',
+    'HeraldWebhookDatasource' => 'applications/herald/typeahead/HeraldWebhookDatasource.php',
     'HeraldWebhookEditController' => 'applications/herald/controller/HeraldWebhookEditController.php',
     'HeraldWebhookEditEngine' => 'applications/herald/editor/HeraldWebhookEditEngine.php',
     'HeraldWebhookEditor' => 'applications/herald/editor/HeraldWebhookEditor.php',
@@ -6631,6 +6633,7 @@
     'HeraldApplyTranscript' => 'Phobject',
     'HeraldBasicFieldGroup' => 'HeraldFieldGroup',
     'HeraldBuildableState' => 'HeraldState',
+    'HeraldCallWebhookAction' => 'HeraldAction',
     'HeraldCommentAction' => 'HeraldAction',
     'HeraldCommitAdapter' => array(
       'HeraldAdapter',
@@ -6741,6 +6744,7 @@
     ),
     'HeraldWebhookCallManagementWorkflow' => 'HeraldWebhookManagementWorkflow',
     'HeraldWebhookController' => 'HeraldController',
+    'HeraldWebhookDatasource' => 'PhabricatorTypeaheadDatasource',
     'HeraldWebhookEditController' => 'HeraldWebhookController',
     'HeraldWebhookEditEngine' => 'PhabricatorEditEngine',
     'HeraldWebhookEditor' => 'PhabricatorApplicationTransactionEditor',
diff --git a/src/applications/herald/action/HeraldCallWebhookAction.php b/src/applications/herald/action/HeraldCallWebhookAction.php
new file mode 100644
index 0000000000..a2003f4f33
--- /dev/null
+++ b/src/applications/herald/action/HeraldCallWebhookAction.php
@@ -0,0 +1,62 @@
+<?php
+
+final class HeraldCallWebhookAction extends HeraldAction {
+
+  const ACTIONCONST = 'webhook';
+  const DO_WEBHOOK = 'do.call-webhook';
+
+  public function getHeraldActionName() {
+    return pht('Call webhooks');
+  }
+
+  public function getActionGroupKey() {
+    return HeraldUtilityActionGroup::ACTIONGROUPKEY;
+  }
+
+  public function supportsObject($object) {
+    return true;
+  }
+
+  public function supportsRuleType($rule_type) {
+    return ($rule_type !== HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
+  }
+
+  public function applyEffect($object, HeraldEffect $effect) {
+    $adapter = $this->getAdapter();
+    $rule = $effect->getRule();
+    $target = $effect->getTarget();
+
+    foreach ($target as $webhook_phid) {
+      $adapter->queueWebhook($webhook_phid, $rule->getPHID());
+    }
+
+    $this->logEffect(self::DO_WEBHOOK, $target);
+  }
+
+  public function getHeraldActionStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getActionEffectMap() {
+    return array(
+      self::DO_WEBHOOK => array(
+        'icon' => 'fa-cloud-upload',
+        'color' => 'green',
+        'name' => pht('Called Webhooks'),
+      ),
+    );
+  }
+
+  public function renderActionDescription($value) {
+    return pht('Call webhooks: %s.', $this->renderHandleList($value));
+  }
+
+  protected function renderActionEffectDescription($type, $data) {
+    return pht('Called webhooks: %s.', $this->renderHandleList($data));
+  }
+
+  protected function getDatasource() {
+    return new HeraldWebhookDatasource();
+  }
+
+}
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index 940d604019..7764332f11 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -41,6 +41,7 @@ abstract class HeraldAdapter extends Phobject {
   private $viewer;
   private $mustEncryptReasons = array();
   private $actingAsPHID;
+  private $webhookMap = array();
 
   public function getEmailPHIDs() {
     return array_values($this->emailPHIDs);
@@ -1206,4 +1207,17 @@ final public function getMustEncryptReasons() {
     return $this->mustEncryptReasons;
   }
 
+
+/* -(  Webhooks  )----------------------------------------------------------- */
+
+
+  final public function queueWebhook($webhook_phid, $rule_phid) {
+    $this->webhookMap[$webhook_phid][] = $rule_phid;
+    return $this;
+  }
+
+  final public function getWebhookMap() {
+    return $this->webhookMap;
+  }
+
 }
diff --git a/src/applications/herald/typeahead/HeraldWebhookDatasource.php b/src/applications/herald/typeahead/HeraldWebhookDatasource.php
new file mode 100644
index 0000000000..a66431d515
--- /dev/null
+++ b/src/applications/herald/typeahead/HeraldWebhookDatasource.php
@@ -0,0 +1,48 @@
+<?php
+
+final class HeraldWebhookDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  public function getPlaceholderText() {
+    return pht('Type a webhook name...');
+  }
+
+  public function getBrowseTitle() {
+    return pht('Browse Webhooks');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  public function loadResults() {
+    $viewer = $this->getViewer();
+    $raw_query = $this->getRawQuery();
+
+    $hooks = id(new HeraldWebhookQuery())
+      ->setViewer($viewer)
+      ->execute();
+
+    $handles = id(new PhabricatorHandleQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(mpull($hooks, 'getPHID'))
+      ->execute();
+
+    $results = array();
+    foreach ($hooks as $hook) {
+      $handle = $handles[$hook->getPHID()];
+
+      $result = id(new PhabricatorTypeaheadResult())
+        ->setName($handle->getFullName())
+        ->setPHID($handle->getPHID());
+
+      if ($hook->isDisabled()) {
+        $result->setClosed(pht('Disabled'));
+      }
+
+      $results[] = $result;
+    }
+
+    return $results;
+  }
+}
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 09c6af62b7..20d745555a 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -1156,6 +1156,7 @@ final public function applyTransactions(
       $adapter = $this->getHeraldAdapter();
       $this->heraldEmailPHIDs = $adapter->getEmailPHIDs();
       $this->heraldForcedEmailPHIDs = $adapter->getForcedEmailPHIDs();
+      $this->webhookMap = $adapter->getWebhookMap();
     }
 
     $xactions = $this->didApplyTransactions($object, $xactions);

From 64177cb16e77ad574ec215f523ec3f6b6593cd17 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 12:59:55 -0800
Subject: [PATCH 535/865] Document how webhooks work

Summary: Depends on D19049. Ref T11330. Adds some documentation for webhooks.

Test Plan: Read the documentation and found it to be exceptionally accurate and helpful.

Maniphest Tasks: T11330

Differential Revision: https://secure.phabricator.com/D19050
---
 .../PhabricatorHeraldApplication.php          |   4 +
 .../herald/worker/HeraldWebhookWorker.php     |   1 +
 .../bulk/PhabricatorBulkEngine.php            |   2 +-
 ...habricatorApplicationTransactionEditor.php |   1 +
 src/docs/user/userguide/webhooks.diviner      | 212 ++++++++++++++++++
 5 files changed, 219 insertions(+), 1 deletion(-)
 create mode 100644 src/docs/user/userguide/webhooks.diviner

diff --git a/src/applications/herald/application/PhabricatorHeraldApplication.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
index 47e7bd7bfa..753c03b266 100644
--- a/src/applications/herald/application/PhabricatorHeraldApplication.php
+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
@@ -28,6 +28,10 @@ public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
         'name' => pht('Herald User Guide'),
         'href' => PhabricatorEnv::getDoclink('Herald User Guide'),
       ),
+      array(
+        'name' => pht('User Guide: Webhooks'),
+        'href' => PhabricatorEnv::getDoclink('User Guide: Webhooks'),
+      ),
     );
   }
 
diff --git a/src/applications/herald/worker/HeraldWebhookWorker.php b/src/applications/herald/worker/HeraldWebhookWorker.php
index f74268c694..837ec0bb23 100644
--- a/src/applications/herald/worker/HeraldWebhookWorker.php
+++ b/src/applications/herald/worker/HeraldWebhookWorker.php
@@ -155,6 +155,7 @@ private function callWebhookWithLock(
         'test' => $request->getIsTestAction(),
         'silent' => $request->getIsSilentAction(),
         'secure' => $request->getIsSecureAction(),
+        'epoch' => (int)$request->getDateCreated(),
       ),
       'transactions' => $xaction_data,
     );
diff --git a/src/applications/transactions/bulk/PhabricatorBulkEngine.php b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
index 534390b518..0091321245 100644
--- a/src/applications/transactions/bulk/PhabricatorBulkEngine.php
+++ b/src/applications/transactions/bulk/PhabricatorBulkEngine.php
@@ -377,7 +377,7 @@ private function newBulkActionForm() {
               '')))
       ->appendChild(
         id(new AphrontFormSubmitControl())
-          ->setValue(pht('Apply Bulk Edit'))
+          ->setValue(pht('Continue'))
           ->addCancelButton($cancel_uri));
   }
 
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 20d745555a..d1413b49a6 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -4290,6 +4290,7 @@ private function queueWebhooks($object, array $xactions) {
         ->setObjectPHID($object->getPHID())
         ->setTransactionPHIDs(mpull($xactions, 'getPHID'))
         ->setTriggerPHIDs($trigger_phids)
+        ->setRetryMode(HeraldWebhookRequest::RETRY_FOREVER)
         ->setIsSilentAction((bool)$this->getIsSilent())
         ->setIsSecureAction((bool)$this->getMustEncrypt())
         ->save();
diff --git a/src/docs/user/userguide/webhooks.diviner b/src/docs/user/userguide/webhooks.diviner
new file mode 100644
index 0000000000..51521b462b
--- /dev/null
+++ b/src/docs/user/userguide/webhooks.diviner
@@ -0,0 +1,212 @@
+@title User Guide: Webhooks
+@group userguide
+
+Guide to configuring webhooks.
+
+
+Overview
+========
+
+If you'd like to react to events in Phabricator or publish them into external
+systems, you can configure webhooks.
+
+Configure webhooks in {nav Herald > Webhooks}. Users must have the
+"Can Create Webhooks" permission to create new webhooks.
+
+
+Triggering Hooks
+================
+
+Webhooks can be triggered in two ways:
+
+  - Set the hook mode to **Firehose**. In this mode, your hook will be called
+    for every event.
+  - Set the hook mode to **Enabled**, then write Herald rules which use the
+    **Call webhooks** action to choose when the hook is called. This allows
+    you to choose a narrower range of events to be notified about.
+
+
+Testing Hooks
+=============
+
+To test a webhook, use {nav New Test Request} from the web interface.
+
+You can also use the command-line tool, which supports a few additional
+options:
+
+```
+phabricator/ $ ./bin/webhook call --id 42 --object D123
+```
+
+You can use a tool like [[ https://requestb.in | RequestBin ]] to inspect
+the headers and payload for calls to hooks.
+
+
+Verifying Requests
+==================
+
+When your webhook callback URI receives a request, it didn't necessarily come
+from Phabricator. An attacker or mischievous user can normally call your hook
+directly and pretend to be notifying you of an event.
+
+To verify that the request is authentic, first retrieve the webhook key from
+the web UI with {nav View HMAC Key}. This is a shared secret which will let you
+verify that Phabricator originated a request.
+
+When you receive a request, compute the SHA256 HMAC value of the request body
+using the HMAC key as the key. The value should match the value in the
+`X-Phabricator-Webhook-Signature` field.
+
+To compute the SHA256 HMAC of a string in PHP, do this:
+
+```lang=php
+$signature = hash_hmac('sha256', $request_body, $hmac_key);
+```
+
+To compute the SHA256 HMAC of a string in Python, do this:
+
+```lang=python
+from subprocess import check_output
+
+signature = check_output(
+  [
+    "php",
+    "-r",
+    "echo hash_hmac('sha256', $argv[1], $argv[2]);",
+    "--",
+    request_body,
+    hmac_key
+  ])
+```
+
+Other languages often provide similar support.
+
+If you somehow disclose the key by accident, use {nav Regenerate HMAC Key} to
+throw it away and generate a new one.
+
+
+Request Format
+==============
+
+Webhook callbacks are POST requests with a JSON payload in the body. The
+payload looks like this:
+
+```lang=json
+{
+  "object": {
+    "type": "TASK",
+    "phid": "PHID-TASK-abcd..."
+  },
+  "triggers": [
+    {
+      "phid": "PHID-HRUL-abcd..."
+    }
+  ],
+  "action": {
+    "test": false,
+    "silent": false,
+    "secure": false,
+    "epoch": 12345
+  },
+  "transactions": [
+    {
+      "phid": "PHID-XACT-TASK-abcd..."
+    }
+  ]
+}
+```
+
+The **object** map describes the object which was edited.
+
+The **triggers** are a list of reasons why the hook was called. When the hook
+is triggered by Herald rules, the specific rules which triggered the call will
+be listed. For firehose rules, the rule itself will be listed as the trigger.
+For test calls, the user making the request will be listed as a trigger.
+
+The **action** map has metadata about the action:
+
+  - `test` This was a test call from the web UI or console.
+  - `silent` This is a silent edit which won't send mail or notifications in
+    Phabricator. If your hook is doing something like copying events into
+    a chatroom, it may want to respect this flag.
+  - `secure` Details about this object should only be transmitted over
+    secure channels. Your hook may want to respect this flag.
+  - `epoch` The epoch timestamp when the callback was queued.
+
+The **transactions** list contains information about the actual changes which
+triggered the callback.
+
+
+Responding to Requests
+======================
+
+Although trivial hooks may not need any more information than this to act, the
+information conveyed in the hook body is a minimum set of pointers to relevant
+data and likely insufficient for more complex hooks.
+
+Complex hooks should expect to react to receiving a request by making API
+calls to Conduit to retrieve additional information about the object and
+transactions.
+
+Hooks that are interested in reading object state should generally make a call
+to a method like `maniphest.search` or `differential.revision.search` using
+the PHID from the `object` field to retrieve full details about the object
+state.
+
+Hooks that are interested in changes should generally make a call to
+`transaction.search`, passing the transaction PHIDs as a constraint to retrieve
+details about the transactions.
+
+The `phid.query` method can also be used to retrieve generic information about
+a list of objects.
+
+
+Retries and Rate Limiting
+=========================
+
+Test requests are never retried: they execute exactly once.
+
+Live requests are automatically retried. If your endpoint does not return a
+HTTP 2XX response, the request will be retried regularly until it suceeds.
+
+Retries will continue until the request succeeds or is garbage collected. By
+default, this is after 7 days.
+
+If a webhook is disabled, outstanding queued requests will be failed
+permanently. Activity which occurs while it is disabled will never be sent to
+the callback URI. (Disabling a hook does not "pause" it so that it can be
+"resumed" later and pick back up where it left off in the event stream.)
+
+If a webhook encounters a significant number of errors in a short period of
+time, the webhook will be paused for a few minutes before additional requests
+are made. The web UI shows a warning indicator when a hook is paused because of
+errors.
+
+Hook requests time out after 10 seconds. Consider offloading response handling
+to some kind of worker queue if you expect to routinely require more than 10
+seconds to respond to requests.
+
+Hook callbacks are single-threaded: you will never receive more than one
+simultaneous call to the same webhook from Phabricator. If you have a firehose
+hook on an active install, it may be important to respond to requests quickly
+to avoid accumulating a backlog.
+
+Callbacks may be invoked out-of-order. You should not assume that the order
+you receive requests in is chronological order. If your hook is order-dependent,
+you can ignore the transactions in the callback and use `transaction.search` to
+retrieve a consistent list of ordered changes to the object.
+
+Callbacks may be delayed for an arbitrarily long amount of time, up to the
+garbage collection limit. You should not assume that calls are real time. If
+your hook is doing something time-sensitive, you can measure the delivery delay
+by comparing the current time to the `epoch` value in the `action` field and
+ignoring old actions or handling them in some special way.
+
+
+Next Steps
+==========
+
+Continue by:
+
+  - learning more about Herald with @{article:Herald User Guide}; or
+  - interacting with the Conduit API with @{article:Conduit API Overview}.

From 4fef0a6128244b90d0ba60f4758214a6518d4508 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 14:23:39 -0800
Subject: [PATCH 536/865] Allow a wider range of characters in macro names,
 including emoji
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Fixes T6121. See PHI357.

  - Allow emoji and other unicode (like Chinese characters) as long as you have at least three of them.
  - Disallow macros with only latin symbols. These were previously allowed.

Test Plan: Created a macro for "🐶🐶🐶", then used it in a comment.

Maniphest Tasks: T6121

Differential Revision: https://secure.phabricator.com/D19051
---
 src/__phutil_library_map__.php                |  2 +
 .../PhabricatorImageMacroRemarkupRule.php     |  2 +-
 .../PhabricatorMacroNameTransaction.php       | 47 ++++++++++++++++---
 .../__tests__/PhabricatorMacroTestCase.php    | 46 ++++++++++++++++++
 4 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 src/applications/macro/xaction/__tests__/PhabricatorMacroTestCase.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 6c3514a2c9..13dd7374d2 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3203,6 +3203,7 @@
     'PhabricatorMacroQuery' => 'applications/macro/query/PhabricatorMacroQuery.php',
     'PhabricatorMacroReplyHandler' => 'applications/macro/mail/PhabricatorMacroReplyHandler.php',
     'PhabricatorMacroSearchEngine' => 'applications/macro/query/PhabricatorMacroSearchEngine.php',
+    'PhabricatorMacroTestCase' => 'applications/macro/xaction/__tests__/PhabricatorMacroTestCase.php',
     'PhabricatorMacroTransaction' => 'applications/macro/storage/PhabricatorMacroTransaction.php',
     'PhabricatorMacroTransactionComment' => 'applications/macro/storage/PhabricatorMacroTransactionComment.php',
     'PhabricatorMacroTransactionQuery' => 'applications/macro/query/PhabricatorMacroTransactionQuery.php',
@@ -8751,6 +8752,7 @@
     'PhabricatorMacroQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorMacroReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
     'PhabricatorMacroSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'PhabricatorMacroTestCase' => 'PhabricatorTestCase',
     'PhabricatorMacroTransaction' => 'PhabricatorModularTransaction',
     'PhabricatorMacroTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'PhabricatorMacroTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
diff --git a/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php b/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
index 8911181a77..4c50322daa 100644
--- a/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php
@@ -8,7 +8,7 @@ final class PhabricatorImageMacroRemarkupRule extends PhutilRemarkupRule {
 
   public function apply($text) {
     return preg_replace_callback(
-      '@^\s*([a-zA-Z0-9:_\-]+)$@m',
+      '@^\s*([a-zA-Z0-9:_\x7f-\xff-]+)$@m',
       array($this, 'markupImageMacro'),
       $text);
   }
diff --git a/src/applications/macro/xaction/PhabricatorMacroNameTransaction.php b/src/applications/macro/xaction/PhabricatorMacroNameTransaction.php
index 68710605aa..f55de443bf 100644
--- a/src/applications/macro/xaction/PhabricatorMacroNameTransaction.php
+++ b/src/applications/macro/xaction/PhabricatorMacroNameTransaction.php
@@ -52,12 +52,16 @@ public function validateTransactions($object, array $xactions) {
           new PhutilNumber($max_length)));
       }
 
-      if (!preg_match('/^[a-z0-9:_-]{3,}\z/', $new_value)) {
-      $errors[] = $this->newInvalidError(
-        pht('Macro name "%s" be at least three characters long and contain '.
-            'only lowercase letters, digits, hyphens, colons and '.
-            'underscores.',
-            $new_value));
+      if (!self::isValidMacroName($new_value)) {
+        // This says "emoji", but the actual rule we implement is "all other
+        // unicode characters are also fine".
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Macro name "%s" be: at least three characters long; and contain '.
+            'only lowercase letters, digits, hyphens, colons, underscores, '.
+            'and emoji; and not be composed entirely of latin symbols.',
+            $new_value),
+          $xaction);
       }
 
       // Check name is unique when updating / creating
@@ -78,4 +82,35 @@ public function validateTransactions($object, array $xactions) {
     return $errors;
   }
 
+  public static function isValidMacroName($name) {
+    if (preg_match('/^[:_-]+\z/', $name)) {
+      return false;
+    }
+
+    // Accept trivial macro names.
+    if (preg_match('/^[a-z0-9:_-]{3,}\z/', $name)) {
+      return true;
+    }
+
+    // Reject names with fewer than 3 glyphs.
+    $length = phutil_utf8v_combined($name);
+    if (count($length) < 3) {
+      return false;
+    }
+
+    // Check character-by-character for any symbols that we don't want.
+    $characters = phutil_utf8v($name);
+    foreach ($characters as $character) {
+      if (ord($character[0]) > 0x7F) {
+        continue;
+      }
+
+      if (preg_match('/^[^a-z0-9:_-]/', $character)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
 }
diff --git a/src/applications/macro/xaction/__tests__/PhabricatorMacroTestCase.php b/src/applications/macro/xaction/__tests__/PhabricatorMacroTestCase.php
new file mode 100644
index 0000000000..aa13ec0ac1
--- /dev/null
+++ b/src/applications/macro/xaction/__tests__/PhabricatorMacroTestCase.php
@@ -0,0 +1,46 @@
+<?php
+
+final class PhabricatorMacroTestCase
+  extends PhabricatorTestCase {
+
+  public function testMacroNames() {
+    $lit = "\xF0\x9F\x94\xA5";
+    $combining_diaeresis = "\xCC\x88";
+
+    $cases = array(
+      // Only 2 glyphs long.
+      "u{$combining_diaeresis}n" => false,
+      "{$lit}{$lit}" => false,
+
+      // Too short.
+      'a' => false,
+      '' => false,
+
+      // Bad characters.
+      'yes!' => false,
+      "{$lit} {$lit} {$lit}" => false,
+      "aaa\nbbb" => false,
+      'aaa~' => false,
+      'aaa`' => false,
+
+      // Special rejections for only latin symbols.
+      '---' => false,
+      '___' => false,
+      '-_-' => false,
+      ':::' => false,
+      '-_:' => false,
+
+      "{$lit}{$lit}{$lit}" => true,
+      'bwahahaha' => true,
+      "u{$combining_diaeresis}nt" => true,
+      'a-a-a-a' => true,
+    );
+
+    foreach ($cases as $input => $expect) {
+      $this->assertEqual(
+        $expect,
+        PhabricatorMacroNameTransaction::isValidMacroName($input),
+        pht('Validity of macro "%s"', $input));
+    }
+  }
+}

From 9c8484de320858f2b86c2aa9daee012065a90e0e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 14:41:45 -0800
Subject: [PATCH 537/865] Document the STMP port option

Summary: Ref T12677. This slipped thorugh in the upgrade.

Test Plan: Read documentation.

Maniphest Tasks: T12677

Differential Revision: https://secure.phabricator.com/D19052
---
 src/docs/user/configuration/configuring_outbound_email.diviner | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/docs/user/configuration/configuring_outbound_email.diviner b/src/docs/user/configuration/configuring_outbound_email.diviner
index 37a344c275..5de8429c13 100644
--- a/src/docs/user/configuration/configuring_outbound_email.diviner
+++ b/src/docs/user/configuration/configuring_outbound_email.diviner
@@ -240,6 +240,7 @@ You can use this adapter to send mail via an external SMTP server, like Gmail.
 To use this mailer, set `type` to `smtp`, then configure these `options`:
 
   - `host`: Required string. The hostname of your SMTP server.
+  - `port`: Optional int. The port to connect to on your SMTP server.
   - `user`: Optional string. Username used for authentication.
   - `password`: Optional string. Password for authentication.
   - `protocol`: Optional string. Set to `tls` or `ssl` if necessary. Use

From 9b7d5b74d4a1371583ff48560b40721404d65009 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 14:47:34 -0800
Subject: [PATCH 538/865] Purge `ssh-auth` key cache after trust/untrust

Summary: See PHI358. The `bin/almanac [un]trust-key` workflows don't properly purge the SSH key cache, but should.

Test Plan:
  - Added key `ssh-rsa xyz` to a device.
  - Used `bin/ssh-auth | grep xyz` to test for the presence of the key.
  - Before patch: Saw it not present, trusted it, saw it still not present.
  - After patch: Saw it not present, trusted it, saw it now present. Untrusted it, saw it no longer present.

Differential Revision: https://secure.phabricator.com/D19053
---
 .../almanac/management/AlmanacManagementTrustKeyWorkflow.php    | 2 ++
 .../almanac/management/AlmanacManagementUntrustKeyWorkflow.php  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php b/src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php
index c0bbc59ff0..631cef8c96 100644
--- a/src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php
+++ b/src/applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php
@@ -81,6 +81,8 @@ public function execute(PhutilArgumentParser $args) {
     $key->setIsTrusted(1);
     $key->save();
 
+    PhabricatorAuthSSHKeyQuery::deleteSSHKeyCache();
+
     $console->writeOut(
       "**<bg:green> %s </bg>** %s\n",
       pht('TRUSTED'),
diff --git a/src/applications/almanac/management/AlmanacManagementUntrustKeyWorkflow.php b/src/applications/almanac/management/AlmanacManagementUntrustKeyWorkflow.php
index 6ad427eeae..6dc7a21aa3 100644
--- a/src/applications/almanac/management/AlmanacManagementUntrustKeyWorkflow.php
+++ b/src/applications/almanac/management/AlmanacManagementUntrustKeyWorkflow.php
@@ -43,6 +43,8 @@ public function execute(PhutilArgumentParser $args) {
     $key->setIsTrusted(0);
     $key->save();
 
+    PhabricatorAuthSSHKeyQuery::deleteSSHKeyCache();
+
     $console->writeOut(
       "**<bg:green> %s </bg>** %s\n",
       pht('TRUST REVOKED'),

From c64aae052ff65e4160c07a185ac472599c78100f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Feb 2018 17:09:00 -0800
Subject: [PATCH 539/865] Make sure auditors are attached to commits on new
 pathways

Companion change to D19022 for commits. Mentioning and subscribing to commits
can load them without audit data.
---
 .../audit/editor/PhabricatorAuditEditor.php   | 24 +++++++++++++++++++
 .../storage/PhabricatorRepositoryCommit.php   |  4 ++++
 2 files changed, 28 insertions(+)

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
index d142bd60cd..984e2c1472 100644
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -490,6 +490,8 @@ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
+    $this->requireAuditors($object);
+
     $phids = array();
 
     if ($object->getAuthorPHID()) {
@@ -514,6 +516,8 @@ protected function getMailTo(PhabricatorLiskDAO $object) {
   }
 
   protected function newMailUnexpandablePHIDs(PhabricatorLiskDAO $object) {
+    $this->requireAuditors($object);
+
     $phids = array();
 
     foreach ($object->getAudits() as $auditor) {
@@ -856,4 +860,24 @@ protected function willPublish(PhabricatorLiskDAO $object, array $xactions) {
       ->executeOne();
   }
 
+  private function requireAuditors(PhabricatorRepositoryCommit $commit) {
+    if ($commit->hasAttachedAudits()) {
+      return;
+    }
+
+    $with_auditors = id(new DiffusionCommitQuery())
+      ->setViewer($this->getActor())
+      ->needAuditRequests(true)
+      ->withPHIDs(array($commit->getPHID()))
+      ->executeOne();
+    if (!$with_auditors) {
+      throw new Exception(
+        pht(
+          'Failed to reload commit ("%s").',
+          $commit->getPHID()));
+    }
+
+    $commit->attachAudits($with_auditors->getAudits());
+  }
+
 }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 1c5998d583..b3b344312c 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -183,6 +183,10 @@ public function getAudits() {
     return $this->assertAttached($this->audits);
   }
 
+  public function hasAttachedAudits() {
+    return ($this->audits !== self::ATTACHABLE);
+  }
+
   public function loadAndAttachAuditAuthority(
     PhabricatorUser $viewer,
     $actor_phid = null) {

From ffc5c95c2f3dca03a62db25130e89408b707538c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 10 Feb 2018 06:09:22 -0800
Subject: [PATCH 540/865] Correct flipped transaction constants in "Closed
 Date" migration

Summary: These transaction constants are flipped, which can produce the wrong result in some cases.

Test Plan: `./bin/storage upgrade -f --apply phabricator:20180208.maniphest.02.populate.php`

Differential Revision: https://secure.phabricator.com/D19054
---
 resources/sql/autopatches/20180208.maniphest.02.populate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/sql/autopatches/20180208.maniphest.02.populate.php b/resources/sql/autopatches/20180208.maniphest.02.populate.php
index 16aa2bf57b..e11267496c 100644
--- a/resources/sql/autopatches/20180208.maniphest.02.populate.php
+++ b/resources/sql/autopatches/20180208.maniphest.02.populate.php
@@ -20,8 +20,8 @@
   // where the task was closed. A merge also counts as a close, even though
   // it doesn't currently produce a separate transaction.
 
-  $type_merge = ManiphestTaskStatusTransaction::TRANSACTIONTYPE;
-  $type_status = ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE;
+  $type_status = ManiphestTaskStatusTransaction::TRANSACTIONTYPE;
+  $type_merge = ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE;
 
   $xactions = id(new ManiphestTransactionQuery())
     ->setViewer($viewer)

From 215b8b4727aa96dc5cbd2a53120f97d5f4d4ce3b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 10 Feb 2018 06:09:22 -0800
Subject: [PATCH 541/865] (stable) Correct flipped transaction constants in
 "Closed Date" migration

Summary: These transaction constants are flipped, which can produce the wrong result in some cases.

Test Plan: `./bin/storage upgrade -f --apply phabricator:20180208.maniphest.02.populate.php`

Differential Revision: https://secure.phabricator.com/D19054
---
 resources/sql/autopatches/20180208.maniphest.02.populate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/sql/autopatches/20180208.maniphest.02.populate.php b/resources/sql/autopatches/20180208.maniphest.02.populate.php
index 16aa2bf57b..e11267496c 100644
--- a/resources/sql/autopatches/20180208.maniphest.02.populate.php
+++ b/resources/sql/autopatches/20180208.maniphest.02.populate.php
@@ -20,8 +20,8 @@
   // where the task was closed. A merge also counts as a close, even though
   // it doesn't currently produce a separate transaction.
 
-  $type_merge = ManiphestTaskStatusTransaction::TRANSACTIONTYPE;
-  $type_status = ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE;
+  $type_status = ManiphestTaskStatusTransaction::TRANSACTIONTYPE;
+  $type_merge = ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE;
 
   $xactions = id(new ManiphestTransactionQuery())
     ->setViewer($viewer)

From d47c5de9d0ae54b527c72726098f0400e42962d8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 10 Feb 2018 16:02:34 -0800
Subject: [PATCH 542/865] Fix PHPMailer/SMTP configuration typo for legacy SMTP
 configurations

Summary: See <https://discourse.phabricator-community.org/t/phpmailer-cannot-read-configuration-value-because-of-typo/1094>.

Test Plan: Browsed a dictionary. (This doesn't get hit when configured via `cluster.mailers`, which is how I previously re-tested SMTP configuration.)

Differential Revision: https://secure.phabricator.com/D19058
---
 .../adapter/PhabricatorMailImplementationPHPMailerAdapter.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
index 3ca6366730..ae134a29b8 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
@@ -38,7 +38,7 @@ public function newLegacyOptions() {
       'host' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-host'),
       'port' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-port'),
       'user' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-user'),
-      'password' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-passsword'),
+      'password' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-password'),
       'protocol' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-protocol'),
       'encoding' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding'),
       'mailer' => PhabricatorEnv::getEnvConfig('phpmailer.mailer'),

From c56bdc92a2cf5602c4c9182fd6c87bed87ee05e6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 10 Feb 2018 16:02:34 -0800
Subject: [PATCH 543/865] (stable) Fix PHPMailer/SMTP configuration typo for
 legacy SMTP configurations

Summary: See <https://discourse.phabricator-community.org/t/phpmailer-cannot-read-configuration-value-because-of-typo/1094>.

Test Plan: Browsed a dictionary. (This doesn't get hit when configured via `cluster.mailers`, which is how I previously re-tested SMTP configuration.)

Differential Revision: https://secure.phabricator.com/D19058
---
 .../adapter/PhabricatorMailImplementationPHPMailerAdapter.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
index 3ca6366730..ae134a29b8 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php
@@ -38,7 +38,7 @@ public function newLegacyOptions() {
       'host' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-host'),
       'port' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-port'),
       'user' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-user'),
-      'password' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-passsword'),
+      'password' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-password'),
       'protocol' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-protocol'),
       'encoding' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding'),
       'mailer' => PhabricatorEnv::getEnvConfig('phpmailer.mailer'),

From a2d02aed2211c03d69b166f1d00d1bd2c06ed327 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 10 Feb 2018 11:34:18 -0800
Subject: [PATCH 544/865] When a build is aborted, fail the buildable

Summary:
Ref T13054. Fixes T10746. Fixes T11154. This is really a one-line fix (include `ABORTED` in `BuildEngine->updateBuildable()`) but try to structure the code a little more clearly too and reduce (at least slightly) the number of random lists of status attributes spread throughout the codebase.

Also add a header tag for buildable status.

Test Plan: Aborted a build, saw buildable fail properly.

Subscribers: yelirekim, PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13054, T11154, T10746

Differential Revision: https://secure.phabricator.com/D19055
---
 .../constants/HarbormasterBuildStatus.php     | 115 ++++++++++++------
 .../HarbormasterBuildableViewController.php   |   4 +
 .../engine/HarbormasterBuildEngine.php        |   8 +-
 .../storage/HarbormasterBuildable.php         |  12 ++
 .../storage/build/HarbormasterBuild.php       |  19 +--
 5 files changed, 105 insertions(+), 53 deletions(-)

diff --git a/src/applications/harbormaster/constants/HarbormasterBuildStatus.php b/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
index b0e3105d78..dc63b5fd95 100644
--- a/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
+++ b/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
@@ -2,51 +2,56 @@
 
 final class HarbormasterBuildStatus extends Phobject {
 
-  /**
-   * Not currently being built.
-   */
   const STATUS_INACTIVE = 'inactive';
-
-  /**
-   * Pending pick up by the Harbormaster daemon.
-   */
   const STATUS_PENDING = 'pending';
-
-  /**
-   * Current building the buildable.
-   */
   const STATUS_BUILDING = 'building';
-
-  /**
-   * The build has passed.
-   */
   const STATUS_PASSED = 'passed';
-
-  /**
-   * The build has failed.
-   */
   const STATUS_FAILED = 'failed';
-
-  /**
-   * The build has aborted.
-   */
   const STATUS_ABORTED = 'aborted';
-
-  /**
-   * The build encountered an unexpected error.
-   */
   const STATUS_ERROR = 'error';
-
-  /**
-   * The build has been paused.
-   */
   const STATUS_PAUSED = 'paused';
-
-  /**
-   * The build has been deadlocked.
-   */
   const STATUS_DEADLOCKED = 'deadlocked';
 
+  private $key;
+  private $properties;
+
+  public function __construct($key, array $properties) {
+    $this->key = $key;
+    $this->properties = $properties;
+  }
+
+  public static function newBuildStatusObject($status) {
+    $spec = self::getBuildStatusSpec($status);
+    return new self($status, $spec);
+  }
+
+  private function getProperty($key) {
+    if (!array_key_exists($key, $this->properties)) {
+      throw new Exception(
+        pht(
+          'Attempting to access unknown build status property ("%s").',
+          $key));
+    }
+
+    return $this->properties[$key];
+  }
+
+  public function isBuilding() {
+    return $this->getProperty('isBuilding');
+  }
+
+  public function isPaused() {
+    return ($this->key === self::STATUS_PAUSED);
+  }
+
+  public function isComplete() {
+    return $this->getProperty('isComplete');
+  }
+
+  public function isPassed() {
+    return ($this->key === self::STATUS_PASSED);
+  }
+
 
   /**
    * Get a human readable name for a build status constant.
@@ -56,7 +61,7 @@ final class HarbormasterBuildStatus extends Phobject {
    */
   public static function getBuildStatusName($status) {
     $spec = self::getBuildStatusSpec($status);
-    return idx($spec, 'name', pht('Unknown ("%s")', $status));
+    return $spec['name'];
   }
 
   public static function getBuildStatusMap() {
@@ -66,17 +71,17 @@ public static function getBuildStatusMap() {
 
   public static function getBuildStatusIcon($status) {
     $spec = self::getBuildStatusSpec($status);
-    return idx($spec, 'icon', 'fa-question-circle');
+    return $spec['icon'];
   }
 
   public static function getBuildStatusColor($status) {
     $spec = self::getBuildStatusSpec($status);
-    return idx($spec, 'color', 'bluegrey');
+    return $spec['color'];
   }
 
   public static function getBuildStatusANSIColor($status) {
     $spec = self::getBuildStatusSpec($status);
-    return idx($spec, 'color.ansi', 'magenta');
+    return $spec['color.ansi'];
   }
 
   public static function getWaitingStatusConstants() {
@@ -110,60 +115,90 @@ private static function getBuildStatusSpecMap() {
         'icon' => 'fa-circle-o',
         'color' => 'dark',
         'color.ansi' => 'yellow',
+        'isBuilding' => false,
+        'isComplete' => false,
       ),
       self::STATUS_PENDING => array(
         'name' => pht('Pending'),
         'icon' => 'fa-circle-o',
         'color' => 'blue',
         'color.ansi' => 'yellow',
+        'isBuilding' => true,
+        'isComplete' => false,
       ),
       self::STATUS_BUILDING => array(
         'name' => pht('Building'),
         'icon' => 'fa-chevron-circle-right',
         'color' => 'blue',
         'color.ansi' => 'yellow',
+        'isBuilding' => true,
+        'isComplete' => false,
       ),
       self::STATUS_PASSED => array(
         'name' => pht('Passed'),
         'icon' => 'fa-check-circle',
         'color' => 'green',
         'color.ansi' => 'green',
+        'isBuilding' => false,
+        'isComplete' => true,
       ),
       self::STATUS_FAILED => array(
         'name' => pht('Failed'),
         'icon' => 'fa-times-circle',
         'color' => 'red',
         'color.ansi' => 'red',
+        'isBuilding' => false,
+        'isComplete' => true,
       ),
       self::STATUS_ABORTED => array(
         'name' => pht('Aborted'),
         'icon' => 'fa-minus-circle',
         'color' => 'red',
         'color.ansi' => 'red',
+        'isBuilding' => false,
+        'isComplete' => true,
       ),
       self::STATUS_ERROR => array(
         'name' => pht('Unexpected Error'),
         'icon' => 'fa-minus-circle',
         'color' => 'red',
         'color.ansi' => 'red',
+        'isBuilding' => false,
+        'isComplete' => true,
       ),
       self::STATUS_PAUSED => array(
         'name' => pht('Paused'),
         'icon' => 'fa-minus-circle',
         'color' => 'dark',
         'color.ansi' => 'yellow',
+        'isBuilding' => false,
+        'isComplete' => false,
       ),
       self::STATUS_DEADLOCKED => array(
         'name' => pht('Deadlocked'),
         'icon' => 'fa-exclamation-circle',
         'color' => 'red',
         'color.ansi' => 'red',
+        'isBuilding' => false,
+        'isComplete' => true,
       ),
     );
   }
 
   private static function getBuildStatusSpec($status) {
-    return idx(self::getBuildStatusSpecMap(), $status, array());
+    $map = self::getBuildStatusSpecMap();
+    if (isset($map[$status])) {
+      return $map[$status];
+    }
+
+    return array(
+      'name' => pht('Unknown ("%s")', $status),
+      'icon' => 'fa-question-circle',
+      'color' => 'bluegrey',
+      'color.ansi' => 'magenta',
+      'isBuilding' => false,
+      'isComplete' => false,
+    );
   }
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
index 6a47dae429..58e5cf8c49 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -36,6 +36,10 @@ public function handleRequest(AphrontRequest $request) {
       ->setHeader($title)
       ->setUser($viewer)
       ->setPolicyObject($buildable)
+      ->setStatus(
+        $buildable->getStatusIcon(),
+        $buildable->getStatusColor(),
+        $buildable->getStatusDisplayName())
       ->setHeaderIcon('fa-recycle');
 
     $timeline = $this->buildTransactionTimeline(
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
index 0616e77b4e..9c4112e810 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -443,15 +443,11 @@ private function updateBuildable(HarbormasterBuildable $buildable) {
     $all_pass = true;
     $any_fail = false;
     foreach ($buildable->getBuilds() as $build) {
-      if ($build->getBuildStatus() != HarbormasterBuildStatus::STATUS_PASSED) {
+      if (!$build->isPassed()) {
         $all_pass = false;
       }
-      if (in_array($build->getBuildStatus(), array(
-          HarbormasterBuildStatus::STATUS_FAILED,
-          HarbormasterBuildStatus::STATUS_ERROR,
-          HarbormasterBuildStatus::STATUS_DEADLOCKED,
-        ))) {
 
+      if ($build->isComplete() && !$build->isPassed()) {
         $any_fail = true;
       }
     }
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
index 9761fb287f..89c13b8b41 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -58,6 +58,18 @@ public static function getBuildableStatusColor($status) {
     }
   }
 
+  public function getStatusIcon() {
+    return self::getBuildableStatusIcon($this->getBuildableStatus());
+  }
+
+  public function getStatusDisplayName() {
+    return self::getBuildableStatusName($this->getBuildableStatus());
+  }
+
+  public function getStatusColor() {
+    return self::getBuildableStatusColor($this->getBuildableStatus());
+  }
+
   public static function initializeNewBuildable(PhabricatorUser $actor) {
     return id(new HarbormasterBuildable())
       ->setIsManualBuildable(0)
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
index 92d4293913..d43b19d71f 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
@@ -108,9 +108,7 @@ public function attachBuildTargets(array $targets) {
   }
 
   public function isBuilding() {
-    return
-      $this->getBuildStatus() === HarbormasterBuildStatus::STATUS_PENDING ||
-      $this->getBuildStatus() === HarbormasterBuildStatus::STATUS_BUILDING;
+    return $this->getBuildStatusObject()->isBuilding();
   }
 
   public function isAutobuild() {
@@ -173,13 +171,15 @@ public static function getAvailableBuildVariables() {
   }
 
   public function isComplete() {
-    return in_array(
-      $this->getBuildStatus(),
-      HarbormasterBuildStatus::getCompletedStatusConstants());
+    return $this->getBuildStatusObject()->isComplete();
   }
 
   public function isPaused() {
-    return ($this->getBuildStatus() == HarbormasterBuildStatus::STATUS_PAUSED);
+    return $this->getBuildStatusObject()->isPaused();
+  }
+
+  public function isPassed() {
+    return $this->getBuildStatusObject()->isPassed();
   }
 
   public function getURI() {
@@ -187,6 +187,11 @@ public function getURI() {
     return "/harbormaster/build/{$id}/";
   }
 
+  protected function getBuildStatusObject() {
+    $status_key = $this->getBuildStatus();
+    return HarbormasterBuildStatus::newBuildStatusObject($status_key);
+  }
+
 
 /* -(  Build Commands  )----------------------------------------------------- */
 

From b0d1d46a73f9240d9b9b131c604aea511df68669 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 10 Feb 2018 11:52:33 -0800
Subject: [PATCH 545/865] Drop the legacy hunk table

Summary: Ref T13054. Ref T8475. This table has had no readers or writers for more than a year after it was migrated to the modern table.

Test Plan: Ran migration, verified that all the data was still around.

Maniphest Tasks: T13054, T8475

Differential Revision: https://secure.phabricator.com/D19056
---
 .../20180210.hunk.01.droplegacy.sql           |  1 +
 src/__phutil_library_map__.php                |  2 -
 .../storage/DifferentialLegacyHunk.php        | 37 -------------------
 3 files changed, 1 insertion(+), 39 deletions(-)
 create mode 100644 resources/sql/autopatches/20180210.hunk.01.droplegacy.sql
 delete mode 100644 src/applications/differential/storage/DifferentialLegacyHunk.php

diff --git a/resources/sql/autopatches/20180210.hunk.01.droplegacy.sql b/resources/sql/autopatches/20180210.hunk.01.droplegacy.sql
new file mode 100644
index 0000000000..129d3927d8
--- /dev/null
+++ b/resources/sql/autopatches/20180210.hunk.01.droplegacy.sql
@@ -0,0 +1 @@
+DROP TABLE {$NAMESPACE}_differential.differential_hunk;
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 13dd7374d2..eebfd512d0 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -481,7 +481,6 @@
     'DifferentialInlineCommentQuery' => 'applications/differential/query/DifferentialInlineCommentQuery.php',
     'DifferentialJIRAIssuesCommitMessageField' => 'applications/differential/field/DifferentialJIRAIssuesCommitMessageField.php',
     'DifferentialJIRAIssuesField' => 'applications/differential/customfield/DifferentialJIRAIssuesField.php',
-    'DifferentialLegacyHunk' => 'applications/differential/storage/DifferentialLegacyHunk.php',
     'DifferentialLegacyQuery' => 'applications/differential/constants/DifferentialLegacyQuery.php',
     'DifferentialLineAdjustmentMap' => 'applications/differential/parser/DifferentialLineAdjustmentMap.php',
     'DifferentialLintField' => 'applications/differential/customfield/DifferentialLintField.php',
@@ -5644,7 +5643,6 @@
     'DifferentialInlineCommentQuery' => 'PhabricatorOffsetPagedQuery',
     'DifferentialJIRAIssuesCommitMessageField' => 'DifferentialCommitMessageCustomField',
     'DifferentialJIRAIssuesField' => 'DifferentialStoredCustomField',
-    'DifferentialLegacyHunk' => 'DifferentialHunk',
     'DifferentialLegacyQuery' => 'Phobject',
     'DifferentialLineAdjustmentMap' => 'Phobject',
     'DifferentialLintField' => 'DifferentialHarbormasterField',
diff --git a/src/applications/differential/storage/DifferentialLegacyHunk.php b/src/applications/differential/storage/DifferentialLegacyHunk.php
deleted file mode 100644
index ae4673e46c..0000000000
--- a/src/applications/differential/storage/DifferentialLegacyHunk.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-final class DifferentialLegacyHunk extends DifferentialHunk {
-
-  protected $changes;
-
-  protected function getConfiguration() {
-    return array(
-      self::CONFIG_COLUMN_SCHEMA => array(
-        'changes' => 'text?',
-        'oldOffset' => 'uint32',
-        'oldLen' => 'uint32',
-        'newOffset' => 'uint32',
-        'newLen' => 'uint32',
-      ),
-      self::CONFIG_KEY_SCHEMA => array(
-        'changesetID' => array(
-          'columns' => array('changesetID'),
-        ),
-      ),
-    ) + parent::getConfiguration();
-  }
-
-  public function getTableName() {
-    return 'differential_hunk';
-  }
-
-  public function getDataEncoding() {
-    return 'utf8';
-  }
-
-  public function forceEncoding($encoding) {
-    // Not supported, these are always utf8.
-    return $this;
-  }
-
-}

From f43d08c2bbe6ed6d7f9b35a09f1d9e0564c13f9b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 10 Feb 2018 12:04:42 -0800
Subject: [PATCH 546/865] Completely remove the legacy hunk table

Summary: Depends on D19056. Fixes T8475. Ref T13054. Merges "ModernHunk" back into "Hunk".

Test Plan: Grepped for `modernhunk`. Reviewed revisions. Created a new revision. Used `bin/differential migrate-hunk` to migrate hunks between storage formats and back.

Maniphest Tasks: T13054, T8475

Differential Revision: https://secure.phabricator.com/D19057
---
 .../autopatches/20161213.diff.01.hunks.php    |   4 +-
 .../20180210.hunk.02.renamemodern.sql         |   2 +
 src/__phutil_library_map__.php                |   2 -
 .../DifferentialDiffExtractionEngine.php      |   4 +-
 ...ricatorDifferentialMigrateHunkWorkflow.php |  10 +-
 .../DifferentialChangesetParserTestCase.php   |   4 +-
 .../DifferentialHunkParserTestCase.php        |   2 +-
 .../query/DifferentialHunkQuery.php           |  33 +--
 .../storage/DifferentialChangeset.php         |   8 +-
 .../differential/storage/DifferentialDiff.php |   2 +-
 .../differential/storage/DifferentialHunk.php | 239 ++++++++++++++++-
 .../storage/DifferentialModernHunk.php        | 249 ------------------
 .../__tests__/DifferentialHunkTestCase.php    |   4 +-
 13 files changed, 267 insertions(+), 296 deletions(-)
 create mode 100644 resources/sql/autopatches/20180210.hunk.02.renamemodern.sql
 delete mode 100644 src/applications/differential/storage/DifferentialModernHunk.php

diff --git a/resources/sql/autopatches/20161213.diff.01.hunks.php b/resources/sql/autopatches/20161213.diff.01.hunks.php
index 574adb3b4f..a3863275f1 100644
--- a/resources/sql/autopatches/20161213.diff.01.hunks.php
+++ b/resources/sql/autopatches/20161213.diff.01.hunks.php
@@ -25,9 +25,9 @@
     $row['oldLen'],
     $row['newOffset'],
     $row['newLen'],
-    DifferentialModernHunk::DATATYPE_TEXT,
+    DifferentialHunk::DATATYPE_TEXT,
     'utf8',
-    DifferentialModernHunk::DATAFORMAT_RAW,
+    DifferentialHunk::DATAFORMAT_RAW,
     // In rare cases, this could be NULL. See T12090.
     (string)$row['changes'],
     $row['dateCreated'],
diff --git a/resources/sql/autopatches/20180210.hunk.02.renamemodern.sql b/resources/sql/autopatches/20180210.hunk.02.renamemodern.sql
new file mode 100644
index 0000000000..d341fbedf2
--- /dev/null
+++ b/resources/sql/autopatches/20180210.hunk.02.renamemodern.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_differential.differential_hunk_modern
+  TO {$NAMESPACE}_differential.differential_hunk;
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index eebfd512d0..7b4f48d1f0 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -489,7 +489,6 @@
     'DifferentialMailEngineExtension' => 'applications/differential/engineextension/DifferentialMailEngineExtension.php',
     'DifferentialMailView' => 'applications/differential/mail/DifferentialMailView.php',
     'DifferentialManiphestTasksField' => 'applications/differential/customfield/DifferentialManiphestTasksField.php',
-    'DifferentialModernHunk' => 'applications/differential/storage/DifferentialModernHunk.php',
     'DifferentialParseCacheGarbageCollector' => 'applications/differential/garbagecollector/DifferentialParseCacheGarbageCollector.php',
     'DifferentialParseCommitMessageConduitAPIMethod' => 'applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php',
     'DifferentialParseRenderTestCase' => 'applications/differential/__tests__/DifferentialParseRenderTestCase.php',
@@ -5651,7 +5650,6 @@
     'DifferentialMailEngineExtension' => 'PhabricatorMailEngineExtension',
     'DifferentialMailView' => 'Phobject',
     'DifferentialManiphestTasksField' => 'DifferentialCoreCustomField',
-    'DifferentialModernHunk' => 'DifferentialHunk',
     'DifferentialParseCacheGarbageCollector' => 'PhabricatorGarbageCollector',
     'DifferentialParseCommitMessageConduitAPIMethod' => 'DifferentialConduitAPIMethod',
     'DifferentialParseRenderTestCase' => 'PhabricatorTestCase',
diff --git a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
index c426c411e7..6fb5e70de5 100644
--- a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
+++ b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
@@ -217,8 +217,8 @@ public function isDiffChangedBeforeCommit(
         //   -echo "test";
         //   -(empty line)
 
-        $hunk = id(new DifferentialModernHunk())->setChanges($context);
-        $vs_hunk = id(new DifferentialModernHunk())->setChanges($vs_context);
+        $hunk = id(new DifferentialHunk())->setChanges($context);
+        $vs_hunk = id(new DifferentialHunk())->setChanges($vs_context);
         if ($hunk->makeOldFile() != $vs_hunk->makeOldFile() ||
             $hunk->makeNewFile() != $vs_hunk->makeNewFile()) {
           return true;
diff --git a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
index 9c0e0071e4..99125645e7 100644
--- a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
+++ b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
@@ -32,8 +32,8 @@ public function execute(PhutilArgumentParser $args) {
 
     $storage = $args->getArg('to');
     switch ($storage) {
-      case DifferentialModernHunk::DATATYPE_TEXT:
-      case DifferentialModernHunk::DATATYPE_FILE:
+      case DifferentialHunk::DATATYPE_TEXT:
+      case DifferentialHunk::DATATYPE_FILE:
         break;
       default:
         throw new PhutilArgumentUsageException(
@@ -44,13 +44,13 @@ public function execute(PhutilArgumentParser $args) {
     $old_data = $hunk->getChanges();
 
     switch ($storage) {
-      case DifferentialModernHunk::DATATYPE_TEXT:
+      case DifferentialHunk::DATATYPE_TEXT:
         $hunk->saveAsText();
         $this->logOkay(
           pht('TEXT'),
           pht('Convereted hunk to text storage.'));
         break;
-      case DifferentialModernHunk::DATATYPE_FILE:
+      case DifferentialHunk::DATATYPE_FILE:
         $hunk->saveAsFile();
         $this->logOkay(
           pht('FILE'),
@@ -71,7 +71,7 @@ public function execute(PhutilArgumentParser $args) {
   }
 
   private function loadHunk($id) {
-    $hunk = id(new DifferentialModernHunk())->load($id);
+    $hunk = id(new DifferentialHunk())->load($id);
     if (!$hunk) {
       throw new PhutilArgumentUsageException(
         pht(
diff --git a/src/applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php b/src/applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php
index 9ca88db8ce..d8d10169b5 100644
--- a/src/applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php
+++ b/src/applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php
@@ -3,7 +3,7 @@
 final class DifferentialChangesetParserTestCase extends PhabricatorTestCase {
 
   public function testDiffChangesets() {
-    $hunk = new DifferentialModernHunk();
+    $hunk = new DifferentialHunk();
     $hunk->setChanges("+a\n b\n-c");
     $hunk->setNewOffset(1);
     $hunk->setNewLen(2);
@@ -20,7 +20,7 @@ public function testDiffChangesets() {
     );
 
     foreach ($tests as $changes => $expected) {
-      $hunk = new DifferentialModernHunk();
+      $hunk = new DifferentialHunk();
       $hunk->setChanges($changes);
       $hunk->setNewOffset(11);
       $hunk->setNewLen(3);
diff --git a/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php b/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
index d1d2501b94..644e7c0b88 100644
--- a/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
+++ b/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php
@@ -14,7 +14,7 @@ private function createHunk(
     $new_len,
     $changes) {
 
-    $hunk = id(new DifferentialModernHunk())
+    $hunk = id(new DifferentialHunk())
       ->setOldOffset($old_offset)
       ->setOldLen($old_len)
       ->setNewOffset($new_offset)
diff --git a/src/applications/differential/query/DifferentialHunkQuery.php b/src/applications/differential/query/DifferentialHunkQuery.php
index c8e35cb607..981c2b4782 100644
--- a/src/applications/differential/query/DifferentialHunkQuery.php
+++ b/src/applications/differential/query/DifferentialHunkQuery.php
@@ -30,25 +30,12 @@ protected function willExecute() {
     }
   }
 
+  public function newResultObject() {
+    return new DifferentialHunk();
+  }
+
   protected function loadPage() {
-    $all_results = array();
-
-    // Load modern hunks.
-    $table = new DifferentialModernHunk();
-    $conn_r = $table->establishConnection('r');
-
-    $modern_data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-    $modern_results = $table->loadAllFromArray($modern_data);
-
-    // Strip all the IDs off since they're not unique and nothing should be
-    // using them.
-    return array_values($modern_results);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $hunks) {
@@ -76,8 +63,8 @@ protected function didFilterPage(array $hunks) {
     return $hunks;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
     if (!$this->changesets) {
       throw new Exception(
@@ -87,13 +74,11 @@ protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     }
 
     $where[] = qsprintf(
-      $conn_r,
+      $conn,
       'changesetID IN (%Ld)',
       mpull($this->changesets, 'getID'));
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {
diff --git a/src/applications/differential/storage/DifferentialChangeset.php b/src/applications/differential/storage/DifferentialChangeset.php
index dbb06fe72b..4832f452e6 100644
--- a/src/applications/differential/storage/DifferentialChangeset.php
+++ b/src/applications/differential/storage/DifferentialChangeset.php
@@ -118,11 +118,11 @@ public function save() {
   public function delete() {
     $this->openTransaction();
 
-      $modern_hunks = id(new DifferentialModernHunk())->loadAllWhere(
+      $hunks = id(new DifferentialHunk())->loadAllWhere(
         'changesetID = %d',
         $this->getID());
-      foreach ($modern_hunks as $modern_hunk) {
-        $modern_hunk->delete();
+      foreach ($hunks as $hunk) {
+        $hunk->delete();
       }
 
       $this->unsavedHunks = array();
@@ -292,7 +292,7 @@ public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
     $this->openTransaction();
 
-      $hunks = id(new DifferentialModernHunk())->loadAllWhere(
+      $hunks = id(new DifferentialHunk())->loadAllWhere(
         'changesetID = %d',
         $this->getID());
       foreach ($hunks as $hunk) {
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
index d70cdbbdf5..85ffccc4a3 100644
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -189,7 +189,7 @@ private static function buildChangesetsFromRawChanges(
       $hunks = $change->getHunks();
       if ($hunks) {
         foreach ($hunks as $hunk) {
-          $dhunk = new DifferentialModernHunk();
+          $dhunk = new DifferentialHunk();
           $dhunk->setOldOffset($hunk->getOldOffset());
           $dhunk->setOldLen($hunk->getOldLength());
           $dhunk->setNewOffset($hunk->getNewOffset());
diff --git a/src/applications/differential/storage/DifferentialHunk.php b/src/applications/differential/storage/DifferentialHunk.php
index a57d0035eb..3defb3566b 100644
--- a/src/applications/differential/storage/DifferentialHunk.php
+++ b/src/applications/differential/storage/DifferentialHunk.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class DifferentialHunk
+final class DifferentialHunk
   extends DifferentialDAO
   implements
     PhabricatorPolicyInterface,
@@ -11,16 +11,55 @@ abstract class DifferentialHunk
   protected $oldLen;
   protected $newOffset;
   protected $newLen;
+  protected $dataType;
+  protected $dataEncoding;
+  protected $dataFormat;
+  protected $data;
 
   private $changeset;
   private $splitLines;
   private $structuredLines;
   private $structuredFiles = array();
 
+  private $rawData;
+  private $forcedEncoding;
+  private $fileData;
+
   const FLAG_LINES_ADDED     = 1;
   const FLAG_LINES_REMOVED   = 2;
   const FLAG_LINES_STABLE    = 4;
 
+  const DATATYPE_TEXT       = 'text';
+  const DATATYPE_FILE       = 'file';
+
+  const DATAFORMAT_RAW      = 'byte';
+  const DATAFORMAT_DEFLATED = 'gzde';
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_BINARY => array(
+        'data' => true,
+      ),
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'dataType' => 'bytes4',
+        'dataEncoding' => 'text16?',
+        'dataFormat' => 'bytes4',
+        'oldOffset' => 'uint32',
+        'oldLen' => 'uint32',
+        'newOffset' => 'uint32',
+        'newLen' => 'uint32',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_changeset' => array(
+          'columns' => array('changesetID'),
+        ),
+        'key_created' => array(
+          'columns' => array('dateCreated'),
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
   public function getAddedLines() {
     return $this->makeContent($include = '+');
   }
@@ -214,6 +253,197 @@ public function attachChangeset(DifferentialChangeset $changeset) {
   }
 
 
+/* -(  Storage  )------------------------------------------------------------ */
+
+
+  public function setChanges($text) {
+    $this->rawData = $text;
+
+    $this->dataEncoding = $this->detectEncodingForStorage($text);
+    $this->dataType = self::DATATYPE_TEXT;
+
+    list($format, $data) = $this->formatDataForStorage($text);
+
+    $this->dataFormat = $format;
+    $this->data = $data;
+
+    return $this;
+  }
+
+  public function getChanges() {
+    return $this->getUTF8StringFromStorage(
+      $this->getRawData(),
+      nonempty($this->forcedEncoding, $this->getDataEncoding()));
+  }
+
+  public function forceEncoding($encoding) {
+    $this->forcedEncoding = $encoding;
+    return $this;
+  }
+
+  private function formatDataForStorage($data) {
+    $deflated = PhabricatorCaches::maybeDeflateData($data);
+    if ($deflated !== null) {
+      return array(self::DATAFORMAT_DEFLATED, $deflated);
+    }
+
+    return array(self::DATAFORMAT_RAW, $data);
+  }
+
+  public function saveAsText() {
+    $old_type = $this->getDataType();
+    $old_data = $this->getData();
+
+    if ($old_type == self::DATATYPE_TEXT) {
+      return $this;
+    }
+
+    $raw_data = $this->getRawData();
+
+    $this->setDataType(self::DATATYPE_TEXT);
+
+    list($format, $data) = $this->formatDataForStorage($raw_data);
+    $this->setDataFormat($format);
+    $this->setData($data);
+
+    $result = $this->save();
+
+    $this->destroyData($old_type, $old_data);
+
+    return $result;
+  }
+
+  public function saveAsFile() {
+    $old_type = $this->getDataType();
+    $old_data = $this->getData();
+
+    if ($old_type == self::DATATYPE_FILE) {
+      return $this;
+    }
+
+    $raw_data = $this->getRawData();
+
+    list($format, $data) = $this->formatDataForStorage($raw_data);
+    $this->setDataFormat($format);
+
+    $file = PhabricatorFile::newFromFileData(
+      $data,
+      array(
+        'name' => 'differential-hunk',
+        'mime-type' => 'application/octet-stream',
+        'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
+      ));
+
+    $this->setDataType(self::DATATYPE_FILE);
+    $this->setData($file->getPHID());
+
+    // NOTE: Because hunks don't have a PHID and we just load hunk data with
+    // the omnipotent viewer, we do not need to attach the file to anything.
+
+    $result = $this->save();
+
+    $this->destroyData($old_type, $old_data);
+
+    return $result;
+  }
+
+  private function getRawData() {
+    if ($this->rawData === null) {
+      $type = $this->getDataType();
+      $data = $this->getData();
+
+      switch ($type) {
+        case self::DATATYPE_TEXT:
+          // In this storage type, the changes are stored on the object.
+          $data = $data;
+          break;
+        case self::DATATYPE_FILE:
+          $data = $this->loadFileData();
+          break;
+        default:
+          throw new Exception(
+            pht('Hunk has unsupported data type "%s"!', $type));
+      }
+
+      $format = $this->getDataFormat();
+      switch ($format) {
+        case self::DATAFORMAT_RAW:
+          // In this format, the changes are stored as-is.
+          $data = $data;
+          break;
+        case self::DATAFORMAT_DEFLATED:
+          $data = PhabricatorCaches::inflateData($data);
+          break;
+        default:
+          throw new Exception(
+            pht('Hunk has unsupported data encoding "%s"!', $type));
+      }
+
+      $this->rawData = $data;
+    }
+
+    return $this->rawData;
+  }
+
+  private function loadFileData() {
+    if ($this->fileData === null) {
+      $type = $this->getDataType();
+      if ($type !== self::DATATYPE_FILE) {
+        throw new Exception(
+          pht(
+            'Unable to load file data for hunk with wrong data type ("%s").',
+            $type));
+      }
+
+      $file_phid = $this->getData();
+
+      $file = $this->loadRawFile($file_phid);
+      $data = $file->loadFileData();
+
+      $this->fileData = $data;
+    }
+
+    return $this->fileData;
+  }
+
+  private function loadRawFile($file_phid) {
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+
+    $files = id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($file_phid))
+      ->execute();
+    if (!$files) {
+      throw new Exception(
+        pht(
+          'Failed to load file ("%s") with hunk data.',
+          $file_phid));
+    }
+
+    $file = head($files);
+
+    return $file;
+  }
+
+  private function destroyData(
+    $type,
+    $data,
+    PhabricatorDestructionEngine $engine = null) {
+
+    if (!$engine) {
+      $engine = new PhabricatorDestructionEngine();
+    }
+
+    switch ($type) {
+      case self::DATATYPE_FILE:
+        $file = $this->loadRawFile($data);
+        $engine->destroyObject($file);
+        break;
+    }
+  }
+
+
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
@@ -237,8 +467,13 @@ public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
+
+    $type = $this->getDataType();
+    $data = $this->getData();
+
+    $this->destroyData($type, $data, $engine);
+
     $this->delete();
   }
 
-
 }
diff --git a/src/applications/differential/storage/DifferentialModernHunk.php b/src/applications/differential/storage/DifferentialModernHunk.php
deleted file mode 100644
index c3675c8adf..0000000000
--- a/src/applications/differential/storage/DifferentialModernHunk.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-
-final class DifferentialModernHunk extends DifferentialHunk {
-
-  const DATATYPE_TEXT       = 'text';
-  const DATATYPE_FILE       = 'file';
-
-  const DATAFORMAT_RAW      = 'byte';
-  const DATAFORMAT_DEFLATED = 'gzde';
-
-  protected $dataType;
-  protected $dataEncoding;
-  protected $dataFormat;
-  protected $data;
-
-  private $rawData;
-  private $forcedEncoding;
-  private $fileData;
-
-  public function getTableName() {
-    return 'differential_hunk_modern';
-  }
-
-  protected function getConfiguration() {
-    return array(
-      self::CONFIG_BINARY => array(
-        'data' => true,
-      ),
-      self::CONFIG_COLUMN_SCHEMA => array(
-        'dataType' => 'bytes4',
-        'dataEncoding' => 'text16?',
-        'dataFormat' => 'bytes4',
-        'oldOffset' => 'uint32',
-        'oldLen' => 'uint32',
-        'newOffset' => 'uint32',
-        'newLen' => 'uint32',
-      ),
-      self::CONFIG_KEY_SCHEMA => array(
-        'key_changeset' => array(
-          'columns' => array('changesetID'),
-        ),
-        'key_created' => array(
-          'columns' => array('dateCreated'),
-        ),
-      ),
-    ) + parent::getConfiguration();
-  }
-
-  public function setChanges($text) {
-    $this->rawData = $text;
-
-    $this->dataEncoding = $this->detectEncodingForStorage($text);
-    $this->dataType = self::DATATYPE_TEXT;
-
-    list($format, $data) = $this->formatDataForStorage($text);
-
-    $this->dataFormat = $format;
-    $this->data = $data;
-
-    return $this;
-  }
-
-  public function getChanges() {
-    return $this->getUTF8StringFromStorage(
-      $this->getRawData(),
-      nonempty($this->forcedEncoding, $this->getDataEncoding()));
-  }
-
-  public function forceEncoding($encoding) {
-    $this->forcedEncoding = $encoding;
-    return $this;
-  }
-
-  private function formatDataForStorage($data) {
-    $deflated = PhabricatorCaches::maybeDeflateData($data);
-    if ($deflated !== null) {
-      return array(self::DATAFORMAT_DEFLATED, $deflated);
-    }
-
-    return array(self::DATAFORMAT_RAW, $data);
-  }
-
-  public function saveAsText() {
-    $old_type = $this->getDataType();
-    $old_data = $this->getData();
-
-    if ($old_type == self::DATATYPE_TEXT) {
-      return $this;
-    }
-
-    $raw_data = $this->getRawData();
-
-    $this->setDataType(self::DATATYPE_TEXT);
-
-    list($format, $data) = $this->formatDataForStorage($raw_data);
-    $this->setDataFormat($format);
-    $this->setData($data);
-
-    $result = $this->save();
-
-    $this->destroyData($old_type, $old_data);
-
-    return $result;
-  }
-
-  public function saveAsFile() {
-    $old_type = $this->getDataType();
-    $old_data = $this->getData();
-
-    if ($old_type == self::DATATYPE_FILE) {
-      return $this;
-    }
-
-    $raw_data = $this->getRawData();
-
-    list($format, $data) = $this->formatDataForStorage($raw_data);
-    $this->setDataFormat($format);
-
-    $file = PhabricatorFile::newFromFileData(
-      $data,
-      array(
-        'name' => 'differential-hunk',
-        'mime-type' => 'application/octet-stream',
-        'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
-      ));
-
-    $this->setDataType(self::DATATYPE_FILE);
-    $this->setData($file->getPHID());
-
-    // NOTE: Because hunks don't have a PHID and we just load hunk data with
-    // the omnipotent viewer, we do not need to attach the file to anything.
-
-    $result = $this->save();
-
-    $this->destroyData($old_type, $old_data);
-
-    return $result;
-  }
-
-  private function getRawData() {
-    if ($this->rawData === null) {
-      $type = $this->getDataType();
-      $data = $this->getData();
-
-      switch ($type) {
-        case self::DATATYPE_TEXT:
-          // In this storage type, the changes are stored on the object.
-          $data = $data;
-          break;
-        case self::DATATYPE_FILE:
-          $data = $this->loadFileData();
-          break;
-        default:
-          throw new Exception(
-            pht('Hunk has unsupported data type "%s"!', $type));
-      }
-
-      $format = $this->getDataFormat();
-      switch ($format) {
-        case self::DATAFORMAT_RAW:
-          // In this format, the changes are stored as-is.
-          $data = $data;
-          break;
-        case self::DATAFORMAT_DEFLATED:
-          $data = PhabricatorCaches::inflateData($data);
-          break;
-        default:
-          throw new Exception(
-            pht('Hunk has unsupported data encoding "%s"!', $type));
-      }
-
-      $this->rawData = $data;
-    }
-
-    return $this->rawData;
-  }
-
-  private function loadFileData() {
-    if ($this->fileData === null) {
-      $type = $this->getDataType();
-      if ($type !== self::DATATYPE_FILE) {
-        throw new Exception(
-          pht(
-            'Unable to load file data for hunk with wrong data type ("%s").',
-            $type));
-      }
-
-      $file_phid = $this->getData();
-
-      $file = $this->loadRawFile($file_phid);
-      $data = $file->loadFileData();
-
-      $this->fileData = $data;
-    }
-
-    return $this->fileData;
-  }
-
-  private function loadRawFile($file_phid) {
-    $viewer = PhabricatorUser::getOmnipotentUser();
-
-
-    $files = id(new PhabricatorFileQuery())
-      ->setViewer($viewer)
-      ->withPHIDs(array($file_phid))
-      ->execute();
-    if (!$files) {
-      throw new Exception(
-        pht(
-          'Failed to load file ("%s") with hunk data.',
-          $file_phid));
-    }
-
-    $file = head($files);
-
-    return $file;
-  }
-
-
-  public function destroyObjectPermanently(
-    PhabricatorDestructionEngine $engine) {
-
-    $type = $this->getDataType();
-    $data = $this->getData();
-
-    $this->destroyData($type, $data, $engine);
-
-    return parent::destroyObjectPermanently($engine);
-  }
-
-
-  private function destroyData(
-    $type,
-    $data,
-    PhabricatorDestructionEngine $engine = null) {
-
-    if (!$engine) {
-      $engine = new PhabricatorDestructionEngine();
-    }
-
-    switch ($type) {
-      case self::DATATYPE_FILE:
-        $file = $this->loadRawFile($data);
-        $engine->destroyObject($file);
-        break;
-    }
-  }
-
-}
diff --git a/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php b/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
index 49866ac038..e334891e6b 100644
--- a/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
+++ b/src/applications/differential/storage/__tests__/DifferentialHunkTestCase.php
@@ -5,7 +5,7 @@ final class DifferentialHunkTestCase extends PhutilTestCase {
   public function testMakeChanges() {
     $root = dirname(__FILE__).'/hunk/';
 
-    $hunk = new DifferentialModernHunk();
+    $hunk = new DifferentialHunk();
     $hunk->setChanges(Filesystem::readFile($root.'basic.diff'));
     $hunk->setOldOffset(1);
     $hunk->setNewOffset(11);
@@ -23,7 +23,7 @@ public function testMakeChanges() {
     );
     $this->assertEqual($added, $hunk->getAddedLines());
 
-    $hunk = new DifferentialModernHunk();
+    $hunk = new DifferentialHunk();
     $hunk->setChanges(Filesystem::readFile($root.'newline.diff'));
     $hunk->setOldOffset(1);
     $hunk->setNewOffset(11);

From 653bc0fa019f5c14e92f4a04d708d9018a8ae1b1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 10 Feb 2018 17:42:02 -0800
Subject: [PATCH 547/865] Read lock all transaction edits

Summary: Ref T13054. Fixes T12714. Applies read locks to all transactions instead of only a very select subset (chat messages in Conpherence).

Test Plan: See <T13054#235650> for discussion and testing.

Maniphest Tasks: T13054, T12714

Differential Revision: https://secure.phabricator.com/D19059
---
 .../engine/PhabricatorAuthPasswordEngine.php  |   4 +
 .../conpherence/editor/ConpherenceEditor.php  |  18 --
 ...habricatorApplicationTransactionEditor.php | 162 +++++++-----------
 3 files changed, 62 insertions(+), 122 deletions(-)

diff --git a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
index c09aa88308..067cea30e7 100644
--- a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
@@ -300,6 +300,10 @@ private function upgradeHashers(
       $password->upgradePasswordHasher($envelope, $this->getObject());
       $new_hasher = $password->getHasher();
 
+      // NOTE: We must save the change before applying transactions because
+      // the editor will reload the object to obtain a read lock.
+      $password->save();
+
       $xactions = array();
 
       $xactions[] = $password->getApplicationTransactionTemplate()
diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
index 7896055f64..3d451e78d3 100644
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -99,24 +99,6 @@ public function getCreateObjectTitle($author, $object) {
     return pht('%s created this room.', $author);
   }
 
-  /**
-   * We really only need a read lock if we have a comment. In that case, we
-   * must update the messagesCount field on the conpherence and
-   * seenMessagesCount(s) for the participant(s).
-   */
-  protected function shouldReadLock(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    $lock = false;
-    switch ($xaction->getTransactionType()) {
-      case PhabricatorTransactions::TYPE_COMMENT:
-        $lock =  true;
-        break;
-    }
-
-    return $lock;
-  }
 
   protected function applyBuiltinInternalTransaction(
     PhabricatorLiskDAO $object,
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index d1413b49a6..7bc1f693c7 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -924,23 +924,13 @@ final public function applyTransactions(
       if ($object->getID()) {
         $this->buildOldRecipientLists($object, $xactions);
 
-        foreach ($xactions as $xaction) {
+        $object->openTransaction();
+        $transaction_open = true;
 
-          // If any of the transactions require a read lock, hold one and
-          // reload the object. We need to do this fairly early so that the
-          // call to `adjustTransactionValues()` (which populates old values)
-          // is based on the synchronized state of the object, which may differ
-          // from the state when it was originally loaded.
-
-          if ($this->shouldReadLock($object, $xaction)) {
-            $object->openTransaction();
-            $object->beginReadLocking();
-            $transaction_open = true;
-            $read_locking = true;
-            $object->reload();
-            break;
-          }
-        }
+        $object->beginReadLocking();
+        $read_locking = true;
+
+        $object->reload();
       }
 
       if ($this->shouldApplyInitialEffects($object, $xactions)) {
@@ -951,66 +941,57 @@ final public function applyTransactions(
       }
     }
 
-    if ($this->shouldApplyInitialEffects($object, $xactions)) {
-      $this->applyInitialEffects($object, $xactions);
-    }
+    try {
+      if ($this->shouldApplyInitialEffects($object, $xactions)) {
+        $this->applyInitialEffects($object, $xactions);
+      }
 
-    foreach ($xactions as $xaction) {
-      $this->adjustTransactionValues($object, $xaction);
-    }
+      foreach ($xactions as $xaction) {
+        $this->adjustTransactionValues($object, $xaction);
+      }
 
-    try {
       $xactions = $this->filterTransactions($object, $xactions);
-    } catch (Exception $ex) {
-      if ($read_locking) {
-        $object->endReadLocking();
-      }
-      if ($transaction_open) {
-        $object->killTransaction();
+
+      // TODO: Once everything is on EditEngine, just use getIsNewObject() to
+      // figure this out instead.
+      $mark_as_create = false;
+      $create_type = PhabricatorTransactions::TYPE_CREATE;
+      foreach ($xactions as $xaction) {
+        if ($xaction->getTransactionType() == $create_type) {
+          $mark_as_create = true;
+        }
       }
-      throw $ex;
-    }
 
-    // TODO: Once everything is on EditEngine, just use getIsNewObject() to
-    // figure this out instead.
-    $mark_as_create = false;
-    $create_type = PhabricatorTransactions::TYPE_CREATE;
-    foreach ($xactions as $xaction) {
-      if ($xaction->getTransactionType() == $create_type) {
-        $mark_as_create = true;
+      if ($mark_as_create) {
+        foreach ($xactions as $xaction) {
+          $xaction->setIsCreateTransaction(true);
+        }
       }
-    }
 
-    if ($mark_as_create) {
+      // Now that we've merged, filtered, and combined transactions, check for
+      // required capabilities.
       foreach ($xactions as $xaction) {
-        $xaction->setIsCreateTransaction(true);
+        $this->requireCapabilities($object, $xaction);
       }
-    }
 
-    // Now that we've merged, filtered, and combined transactions, check for
-    // required capabilities.
-    foreach ($xactions as $xaction) {
-      $this->requireCapabilities($object, $xaction);
-    }
+      $xactions = $this->sortTransactions($xactions);
+      $file_phids = $this->extractFilePHIDs($object, $xactions);
 
-    $xactions = $this->sortTransactions($xactions);
-    $file_phids = $this->extractFilePHIDs($object, $xactions);
-
-    if ($is_preview) {
-      $this->loadHandles($xactions);
-      return $xactions;
-    }
+      if ($is_preview) {
+        $this->loadHandles($xactions);
+        return $xactions;
+      }
 
-    $comment_editor = id(new PhabricatorApplicationTransactionCommentEditor())
-      ->setActor($actor)
-      ->setActingAsPHID($this->getActingAsPHID())
-      ->setContentSource($this->getContentSource());
+      $comment_editor = id(new PhabricatorApplicationTransactionCommentEditor())
+        ->setActor($actor)
+        ->setActingAsPHID($this->getActingAsPHID())
+        ->setContentSource($this->getContentSource());
 
-    if (!$transaction_open) {
-      $object->openTransaction();
-    }
+      if (!$transaction_open) {
+        $object->openTransaction();
+        $transaction_open = true;
+      }
 
-    try {
       foreach ($xactions as $xaction) {
         $this->applyInternalEffects($object, $xaction);
       }
@@ -1070,14 +1051,27 @@ final public function applyTransactions(
       }
 
       $xactions = $this->applyFinalEffects($object, $xactions);
+
       if ($read_locking) {
         $object->endReadLocking();
         $read_locking = false;
       }
 
-      $object->saveTransaction();
+      if ($transaction_open) {
+        $object->saveTransaction();
+        $transaction_open = false;
+      }
     } catch (Exception $ex) {
-      $object->killTransaction();
+      if ($read_locking) {
+        $object->endReadLocking();
+        $read_locking = false;
+      }
+
+      if ($transaction_open) {
+        $object->killTransaction();
+        $transaction_open = false;
+      }
+
       throw $ex;
     }
 
@@ -1319,46 +1313,6 @@ protected function didApplyTransactions($object, array $xactions) {
     return $xactions;
   }
 
-
-  /**
-   * Determine if the editor should hold a read lock on the object while
-   * applying a transaction.
-   *
-   * If the editor does not hold a lock, two editors may read an object at the
-   * same time, then apply their changes without any synchronization. For most
-   * transactions, this does not matter much. However, it is important for some
-   * transactions. For example, if an object has a transaction count on it, both
-   * editors may read the object with `count = 23`, then independently update it
-   * and save the object with `count = 24` twice. This will produce the wrong
-   * state: the object really has 25 transactions, but the count is only 24.
-   *
-   * Generally, transactions fall into one of four buckets:
-   *
-   *   - Append operations: Actions like adding a comment to an object purely
-   *     add information to its state, and do not depend on the current object
-   *     state in any way. These transactions never need to hold locks.
-   *   - Overwrite operations: Actions like changing the title or description
-   *     of an object replace the current value with a new value, so the end
-   *     state is consistent without a lock. We currently do not lock these
-   *     transactions, although we may in the future.
-   *   - Edge operations: Edge and subscription operations have internal
-   *     synchronization which limits the damage race conditions can cause.
-   *     We do not currently lock these transactions, although we may in the
-   *     future.
-   *   - Update operations: Actions like incrementing a count on an object.
-   *     These operations generally should use locks, unless it is not
-   *     important that the state remain consistent in the presence of races.
-   *
-   * @param   PhabricatorLiskDAO  Object being updated.
-   * @param   PhabricatorApplicationTransaction Transaction being applied.
-   * @return  bool                True to synchronize the edit with a lock.
-   */
-  protected function shouldReadLock(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-    return false;
-  }
-
   private function loadHandles(array $xactions) {
     $phids = array();
     foreach ($xactions as $key => $xaction) {

From 5e6e9fcc56529b155c7f1e1f057eed8a4aaaf406 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 11 Feb 2018 05:47:50 -0800
Subject: [PATCH 548/865] When purging drafts after a transaction edit, purge
 all drafts

Summary: Fixes T13071. See that task for discusison. I think this `<= version` constraint is needless in normal cases (it should match everything in the table anyway), and slightly harmful in bizarre cases where a draft somehow gets a much larger ID than it should have.

Test Plan:
  - Gave a draft an unreasonably large ID.
  - Pre-patch, observed: submitting comments on the draft's object does not clear the draft.
  - Post-patch: submitting comments on the draft's object now clears the draft correctly.
  - Also added comments/actions, reloaded pages, saw drafts stick properly.

Maniphest Tasks: T13071

Differential Revision: https://secure.phabricator.com/D19060
---
 .../draft/storage/PhabricatorVersionedDraft.php          | 9 +++------
 .../transactions/editengine/PhabricatorEditEngine.php    | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/applications/draft/storage/PhabricatorVersionedDraft.php b/src/applications/draft/storage/PhabricatorVersionedDraft.php
index 0daf13e8c5..58cdb67599 100644
--- a/src/applications/draft/storage/PhabricatorVersionedDraft.php
+++ b/src/applications/draft/storage/PhabricatorVersionedDraft.php
@@ -80,20 +80,17 @@ public static function loadOrCreateDraft(
 
   public static function purgeDrafts(
     $object_phid,
-    $viewer_phid,
-    $version) {
+    $viewer_phid) {
 
     $draft = new PhabricatorVersionedDraft();
     $conn_w = $draft->establishConnection('w');
 
     queryfx(
       $conn_w,
-      'DELETE FROM %T WHERE objectPHID = %s AND authorPHID = %s
-        AND version <= %d',
+      'DELETE FROM %T WHERE objectPHID = %s AND authorPHID = %s',
       $draft->getTableName(),
       $object_phid,
-      $viewer_phid,
-      $version);
+      $viewer_phid);
   }
 
 }
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index ea3b987568..ea171a421c 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1985,8 +1985,7 @@ private function buildCommentResponse($object) {
     if (!$is_preview) {
       PhabricatorVersionedDraft::purgeDrafts(
         $object->getPHID(),
-        $viewer->getPHID(),
-        $this->loadDraftVersion($object));
+        $viewer->getPHID());
 
       $draft_engine = $this->newDraftEngine($object);
       if ($draft_engine) {

From 4fa99374be1ca54077705fbc50796fa17f3e5b3f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 11 Feb 2018 05:55:02 -0800
Subject: [PATCH 549/865] Prevent "Call webhooks" Herald action from appearing
 in UI for adapters which can't fire it

Summary:
See <https://discourse.phabricator-community.org/t/herald-webhook-is-not-called-but-herald-transcript-tells-me-the-opposite/1098>.

The "Commit Hook" events don't operate on objects and don't use TransactionEditors. They can't call webhooks in a normal way and currently don't call webhooks at all. Stop offering these actions in the UI.

The  "Outbound Mail" event also fires oddly and likely doesn't make much sense to hook anyway.

Test Plan: Verified that these events no longer offer "Call webhooks", while normal events still do.

Differential Revision: https://secure.phabricator.com/D19061
---
 src/applications/diffusion/herald/HeraldPreCommitAdapter.php | 4 ++++
 src/applications/herald/action/HeraldCallWebhookAction.php   | 4 ++++
 src/applications/herald/adapter/HeraldAdapter.php            | 5 +++++
 .../herald/PhabricatorMailOutboundMailHeraldAdapter.php      | 4 ++++
 4 files changed, 17 insertions(+)

diff --git a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
index 3f1bc6bfd0..f63f647da6 100644
--- a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
@@ -87,4 +87,8 @@ public function getTriggerObjectPHIDs() {
       $this->hookEngine->getRepository()->getProjectPHIDs());
   }
 
+  public function supportsWebhooks() {
+    return false;
+  }
+
 }
diff --git a/src/applications/herald/action/HeraldCallWebhookAction.php b/src/applications/herald/action/HeraldCallWebhookAction.php
index a2003f4f33..953958e5c6 100644
--- a/src/applications/herald/action/HeraldCallWebhookAction.php
+++ b/src/applications/herald/action/HeraldCallWebhookAction.php
@@ -14,6 +14,10 @@ public function getActionGroupKey() {
   }
 
   public function supportsObject($object) {
+    if (!$this->getAdapter()->supportsWebhooks()) {
+      return false;
+    }
+
     return true;
   }
 
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index 7764332f11..08a0ca7a52 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -1211,6 +1211,11 @@ final public function getMustEncryptReasons() {
 /* -(  Webhooks  )----------------------------------------------------------- */
 
 
+  public function supportsWebhooks() {
+    return true;
+  }
+
+
   final public function queueWebhook($webhook_phid, $rule_phid) {
     $this->webhookMap[$webhook_phid][] = $rule_phid;
     return $this;
diff --git a/src/applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php b/src/applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php
index f96a6f86bd..94c13c9e0a 100644
--- a/src/applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php
+++ b/src/applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php
@@ -64,4 +64,8 @@ public function getHeraldName() {
     return pht('Mail %d', $this->getObject()->getID());
   }
 
+  public function supportsWebhooks() {
+    return false;
+  }
+
 }

From ed0ba41cd2d03b7267b24579a38c39512f63ff6c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Feb 2018 10:16:23 -0800
Subject: [PATCH 550/865] Allow a HarbormasterBuildMessage to be sent to any
 object

Summary:
See T13054. This prepares for Buildables to be sent messages ("attach", "done scheduling builds") to fix races between Harbormaster and Differential.

The `buildTargetPHID` is replaced with a `recipientPHID` in the API. An additional change will fix the storage.

In the future, this table could probably also replace `HarbormasterBuildCommand` now, which is approximately the same bus, but for Builds.

Test Plan: Viewed builds with messages. Sent messages with `harbormaster.sendmessage`. Processed messages with `bin/phd debug task`.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D19062
---
 ...arbormasterSendMessageConduitAPIMethod.php |  2 +-
 .../HarbormasterBuildViewController.php       |  4 +-
 .../engine/HarbormasterBuildEngine.php        |  4 +-
 .../query/HarbormasterBuildMessageQuery.php   | 64 +++++++++----------
 .../storage/HarbormasterBuildMessage.php      | 26 ++++++--
 5 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php b/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
index dbf1f18cfa..fc83b7ab42 100644
--- a/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
+++ b/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
@@ -245,7 +245,7 @@ protected function execute(ConduitAPIRequest $request) {
     }
 
     $save[] = HarbormasterBuildMessage::initializeNewMessage($viewer)
-      ->setBuildTargetPHID($build_target->getPHID())
+      ->setReceiverPHID($build_target->getPHID())
       ->setType($message_type);
 
     $build_target->openTransaction();
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
index 5b7171a200..4507139d47 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -65,9 +65,9 @@ public function handleRequest(AphrontRequest $request) {
     if ($build_targets) {
       $messages = id(new HarbormasterBuildMessageQuery())
         ->setViewer($viewer)
-        ->withBuildTargetPHIDs(mpull($build_targets, 'getPHID'))
+        ->withReceiverPHIDs(mpull($build_targets, 'getPHID'))
         ->execute();
-      $messages = mgroup($messages, 'getBuildTargetPHID');
+      $messages = mgroup($messages, 'getReceiverPHID');
     } else {
       $messages = array();
     }
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
index 9c4112e810..4079620f2a 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -382,12 +382,12 @@ private function updateWaitingTargets(array $targets) {
 
     $messages = id(new HarbormasterBuildMessageQuery())
       ->setViewer($this->getViewer())
-      ->withBuildTargetPHIDs(array_keys($waiting_targets))
+      ->withReceiverPHIDs(array_keys($waiting_targets))
       ->withConsumed(false)
       ->execute();
 
     foreach ($messages as $message) {
-      $target = $waiting_targets[$message->getBuildTargetPHID()];
+      $target = $waiting_targets[$message->getReceiverPHID()];
 
       switch ($message->getType()) {
         case HarbormasterMessageType::MESSAGE_PASS:
diff --git a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
index 749fdd76d4..1b55f2e781 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
@@ -4,7 +4,7 @@ final class HarbormasterBuildMessageQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
-  private $buildTargetPHIDs;
+  private $receiverPHIDs;
   private $consumed;
 
   public function withIDs(array $ids) {
@@ -12,8 +12,8 @@ public function withIDs(array $ids) {
     return $this;
   }
 
-  public function withBuildTargetPHIDs(array $phids) {
-    $this->buildTargetPHIDs = $phids;
+  public function withReceiverPHIDs(array $phids) {
+    $this->receiverPHIDs = $phids;
     return $this;
   }
 
@@ -22,73 +22,67 @@ public function withConsumed($consumed) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new HarbormasterBuildMessage();
+  }
+
   protected function loadPage() {
-    $table = new HarbormasterBuildMessage();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($data);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $page) {
-    $build_target_phids = array_filter(mpull($page, 'getBuildTargetPHID'));
-    if ($build_target_phids) {
-      $build_targets = id(new PhabricatorObjectQuery())
+    $receiver_phids = array_filter(mpull($page, 'getReceiverPHID'));
+    if ($receiver_phids) {
+      $receivers = id(new PhabricatorObjectQuery())
         ->setViewer($this->getViewer())
-        ->withPHIDs($build_target_phids)
+        ->withPHIDs($receiver_phids)
         ->setParentQuery($this)
         ->execute();
-      $build_targets = mpull($build_targets, null, 'getPHID');
+      $receivers = mpull($receivers, null, 'getPHID');
     } else {
-      $build_targets = array();
+      $receivers = array();
     }
 
     foreach ($page as $key => $message) {
-      $build_target_phid = $message->getBuildTargetPHID();
-      if (empty($build_targets[$build_target_phid])) {
+      $receiver_phid = $message->getReceiverPHID();
+
+      if (empty($receivers[$receiver_phid])) {
         unset($page[$key]);
+        $this->didRejectResult($message);
         continue;
       }
-      $message->attachBuildTarget($build_targets[$build_target_phid]);
+
+      $message->attachReceiver($receivers[$receiver_phid]);
     }
 
     return $page;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
-    if ($this->ids) {
+    if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'id IN (%Ld)',
         $this->ids);
     }
 
-    if ($this->buildTargetPHIDs) {
+    if ($this->receiverPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'buildTargetPHID IN (%Ls)',
-        $this->buildTargetPHIDs);
+        $this->receiverPHIDs);
     }
 
     if ($this->consumed !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'isConsumed = %d',
         (int)$this->consumed);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildMessage.php b/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
index 20d138ad02..5c9c92b2fc 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
@@ -14,7 +14,7 @@ final class HarbormasterBuildMessage extends HarbormasterDAO
   protected $type;
   protected $isConsumed;
 
-  private $buildTarget = self::ATTACHABLE;
+  private $receiver = self::ATTACHABLE;
 
   public static function initializeNewMessage(PhabricatorUser $actor) {
     $actor_phid = $actor->getPHID();
@@ -41,12 +41,24 @@ protected function getConfiguration() {
     ) + parent::getConfiguration();
   }
 
+  public function getReceiverPHID() {
+    return $this->getBuildTargetPHID();
+  }
+
+  public function setReceiverPHID($phid) {
+    return $this->setBuildTargetPHID($phid);
+  }
+
+  public function getReceiver() {
+    return $this->assertAttached($this->receiver);
+  }
+
   public function getBuildTarget() {
-    return $this->assertAttached($this->buildTarget);
+    return $this->getReceiver();
   }
 
-  public function attachBuildTarget(HarbormasterBuildTarget $target) {
-    $this->buildTarget = $target;
+  public function attachReceiver($receiver) {
+    $this->receiver = $receiver;
     return $this;
   }
 
@@ -61,17 +73,17 @@ public function getCapabilities() {
   }
 
   public function getPolicy($capability) {
-    return $this->getBuildTarget()->getPolicy($capability);
+    return $this->getReceiver()->getPolicy($capability);
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
-    return $this->getBuildTarget()->hasAutomaticCapability(
+    return $this->getReceiver()->hasAutomaticCapability(
       $capability,
       $viewer);
   }
 
   public function describeAutomaticCapability($capability) {
-    return pht('Build messages have the same policies as their targets.');
+    return pht('Build messages have the same policies as their receivers.');
   }
 
 }

From c42bbd6f5cff758610aec7fe2df27895dec78ed3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Feb 2018 10:31:08 -0800
Subject: [PATCH 551/865] Rename HarbormasterBuildMessage "buildTargetPHID" to
 "receiverPHID"

Summary: Ref T13054. Companion storage change for D19062.

Test Plan: Applied migration and adjustments. Viewed messages in Harbormaster; created them with `harbormaster.sendmessage`; processed them with `bin/phd debug task`.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13054

Differential Revision: https://secure.phabricator.com/D19063
---
 .../20180212.harbor.01.receiver.sql            |  2 ++
 .../query/HarbormasterBuildMessageQuery.php    |  2 +-
 .../storage/HarbormasterBuildMessage.php       | 18 +++---------------
 3 files changed, 6 insertions(+), 16 deletions(-)
 create mode 100644 resources/sql/autopatches/20180212.harbor.01.receiver.sql

diff --git a/resources/sql/autopatches/20180212.harbor.01.receiver.sql b/resources/sql/autopatches/20180212.harbor.01.receiver.sql
new file mode 100644
index 0000000000..84e9611db2
--- /dev/null
+++ b/resources/sql/autopatches/20180212.harbor.01.receiver.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildmessage
+  CHANGE buildTargetPHID receiverPHID VARBINARY(64) NOT NULL;
diff --git a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
index 1b55f2e781..134c68ce04 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
@@ -71,7 +71,7 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->receiverPHIDs !== null) {
       $where[] = qsprintf(
         $conn,
-        'buildTargetPHID IN (%Ls)',
+        'receiverPHID IN (%Ls)',
         $this->receiverPHIDs);
     }
 
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildMessage.php b/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
index 5c9c92b2fc..1066a93610 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
@@ -10,7 +10,7 @@ final class HarbormasterBuildMessage extends HarbormasterDAO
   implements PhabricatorPolicyInterface {
 
   protected $authorPHID;
-  protected $buildTargetPHID;
+  protected $receiverPHID;
   protected $type;
   protected $isConsumed;
 
@@ -34,29 +34,17 @@ protected function getConfiguration() {
         'isConsumed' => 'bool',
       ),
       self::CONFIG_KEY_SCHEMA => array(
-        'key_buildtarget' => array(
-          'columns' => array('buildTargetPHID'),
+        'key_receiver' => array(
+          'columns' => array('receiverPHID'),
         ),
       ),
     ) + parent::getConfiguration();
   }
 
-  public function getReceiverPHID() {
-    return $this->getBuildTargetPHID();
-  }
-
-  public function setReceiverPHID($phid) {
-    return $this->setBuildTargetPHID($phid);
-  }
-
   public function getReceiver() {
     return $this->assertAttached($this->receiver);
   }
 
-  public function getBuildTarget() {
-    return $this->getReceiver();
-  }
-
   public function attachReceiver($receiver) {
     $this->receiver = $receiver;
     return $this;

From f939a2b12ea3c2361bf536e63d24ee4e4f12c690 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Feb 2018 10:55:19 -0800
Subject: [PATCH 552/865] Make Harbormaster buildable status more of a nice
 flexible map and less of a bunch of switch statements

Summary: Depends on D19063. Ref T13054. Prepare for the addition of a new `PREPARING` status by getting rid of the "scattered mess of switch statements" pattern of status management.

Test Plan: Searched/browsed buildables. Viewed buildables. Viewed revisions. Grepped for all affected symbols.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13054

Differential Revision: https://secure.phabricator.com/D19064
---
 src/__phutil_library_map__.php                |  2 +
 .../customfield/DifferentialUnitField.php     |  4 +-
 .../diffusion/view/DiffusionView.php          |  7 +-
 ...rmasterQueryBuildablesConduitAPIMethod.php |  2 +-
 .../constants/HarbormasterBuildableStatus.php | 82 +++++++++++++++++++
 .../engine/HarbormasterBuildEngine.php        | 13 +--
 .../event/HarbormasterUIEventListener.php     | 10 +--
 .../HarbormasterBuildableSearchEngine.php     | 10 +--
 .../storage/HarbormasterBuildable.php         | 78 +++++-------------
 .../PhabricatorApplicationTransaction.php     | 14 ++--
 10 files changed, 133 insertions(+), 89 deletions(-)
 create mode 100644 src/applications/harbormaster/constants/HarbormasterBuildableStatus.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7b4f48d1f0..59b375eb55 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1272,6 +1272,7 @@
     'HarbormasterBuildablePHIDType' => 'applications/harbormaster/phid/HarbormasterBuildablePHIDType.php',
     'HarbormasterBuildableQuery' => 'applications/harbormaster/query/HarbormasterBuildableQuery.php',
     'HarbormasterBuildableSearchEngine' => 'applications/harbormaster/query/HarbormasterBuildableSearchEngine.php',
+    'HarbormasterBuildableStatus' => 'applications/harbormaster/constants/HarbormasterBuildableStatus.php',
     'HarbormasterBuildableTransaction' => 'applications/harbormaster/storage/HarbormasterBuildableTransaction.php',
     'HarbormasterBuildableTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildableTransactionEditor.php',
     'HarbormasterBuildableTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php',
@@ -6549,6 +6550,7 @@
     'HarbormasterBuildablePHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'HarbormasterBuildableSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'HarbormasterBuildableStatus' => 'Phobject',
     'HarbormasterBuildableTransaction' => 'PhabricatorApplicationTransaction',
     'HarbormasterBuildableTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
     'HarbormasterBuildableTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
diff --git a/src/applications/differential/customfield/DifferentialUnitField.php b/src/applications/differential/customfield/DifferentialUnitField.php
index 7b3d491cbd..4c1eb72cc8 100644
--- a/src/applications/differential/customfield/DifferentialUnitField.php
+++ b/src/applications/differential/customfield/DifferentialUnitField.php
@@ -44,12 +44,12 @@ public function getWarningsForDetailView() {
       ->executeOne();
     if ($buildable) {
       switch ($buildable->getBuildableStatus()) {
-        case HarbormasterBuildable::STATUS_BUILDING:
+        case HarbormasterBuildableStatus::STATUS_BUILDING:
           $warnings[] = pht(
             'These changes have not finished building yet and may have build '.
             'failures.');
           break;
-        case HarbormasterBuildable::STATUS_FAILED:
+        case HarbormasterBuildableStatus::STATUS_FAILED:
           $warnings[] = pht(
             'These changes have failed to build.');
           break;
diff --git a/src/applications/diffusion/view/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php
index eb43e49f3c..eb7f3eb72f 100644
--- a/src/applications/diffusion/view/DiffusionView.php
+++ b/src/applications/diffusion/view/DiffusionView.php
@@ -205,12 +205,11 @@ final public static function renderName($name) {
   final protected function renderBuildable(
     HarbormasterBuildable $buildable,
     $type = null) {
-    $status = $buildable->getBuildableStatus();
     Javelin::initBehavior('phabricator-tooltips');
 
-    $icon = HarbormasterBuildable::getBuildableStatusIcon($status);
-    $color = HarbormasterBuildable::getBuildableStatusColor($status);
-    $name = HarbormasterBuildable::getBuildableStatusName($status);
+    $icon = $buildable->getStatusIcon();
+    $color = $buildable->getStatusColor();
+    $name = $buildable->getStatusDisplayName();
 
     if ($type == 'button') {
       return id(new PHUIButtonView())
diff --git a/src/applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php b/src/applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php
index 818b983538..cae06d47c7 100644
--- a/src/applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php
+++ b/src/applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php
@@ -65,7 +65,7 @@ protected function execute(ConduitAPIRequest $request) {
       $monogram = $buildable->getMonogram();
 
       $status = $buildable->getBuildableStatus();
-      $status_name = HarbormasterBuildable::getBuildableStatusName($status);
+      $status_name = $buildable->getStatusDisplayName();
 
       $data[] = array(
         'id' => $buildable->getID(),
diff --git a/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php b/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
new file mode 100644
index 0000000000..9cd3dd0b6f
--- /dev/null
+++ b/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
@@ -0,0 +1,82 @@
+<?php
+
+final class HarbormasterBuildableStatus extends Phobject {
+
+  const STATUS_BUILDING = 'building';
+  const STATUS_PASSED = 'passed';
+  const STATUS_FAILED = 'failed';
+
+  private $key;
+  private $properties;
+
+  public function __construct($key, array $properties) {
+    $this->key = $key;
+    $this->properties = $properties;
+  }
+
+  public static function newBuildableStatusObject($status) {
+    $spec = self::getSpecification($status);
+    return new self($status, $spec);
+  }
+
+  private function getProperty($key) {
+    if (!array_key_exists($key, $this->properties)) {
+      throw new Exception(
+        pht(
+          'Attempting to access unknown buildable status property ("%s").',
+          $key));
+    }
+
+    return $this->properties[$key];
+  }
+
+  public function getIcon() {
+    return $this->getProperty('icon');
+  }
+
+  public function getDisplayName() {
+    return $this->getProperty('name');
+  }
+
+  public function getColor() {
+    return $this->getProperty('color');
+  }
+
+  public static function getOptionMap() {
+    return ipull(self::getSpecifications(), 'name');
+  }
+
+  private static function getSpecifications() {
+    return array(
+      self::STATUS_BUILDING => array(
+        'name' => pht('Building'),
+        'color' => 'blue',
+        'icon' => 'fa-chevron-circle-right',
+      ),
+      self::STATUS_PASSED => array(
+        'name' => pht('Passed'),
+        'color' => 'green',
+        'icon' => 'fa-check-circle',
+      ),
+      self::STATUS_FAILED => array(
+        'name' => pht('Failed'),
+        'color' => 'red',
+        'icon' => 'fa-times-circle',
+      ),
+    );
+  }
+
+  private static function getSpecification($status) {
+    $map = self::getSpecifications();
+    if (isset($map[$status])) {
+      return $map[$status];
+    }
+
+    return array(
+      'name' => pht('Unknown ("%s")', $status),
+      'icon' => 'fa-question-circle',
+      'color' => 'bluegrey',
+    );
+  }
+
+}
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
index 4079620f2a..3749178418 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -453,11 +453,11 @@ private function updateBuildable(HarbormasterBuildable $buildable) {
     }
 
     if ($any_fail) {
-      $new_status = HarbormasterBuildable::STATUS_FAILED;
+      $new_status = HarbormasterBuildableStatus::STATUS_FAILED;
     } else if ($all_pass) {
-      $new_status = HarbormasterBuildable::STATUS_PASSED;
+      $new_status = HarbormasterBuildableStatus::STATUS_PASSED;
     } else {
-      $new_status = HarbormasterBuildable::STATUS_BUILDING;
+      $new_status = HarbormasterBuildableStatus::STATUS_BUILDING;
     }
 
     $old_status = $buildable->getBuildableStatus();
@@ -477,9 +477,10 @@ private function updateBuildable(HarbormasterBuildable $buildable) {
     // can look at the results themselves, and other users generally don't
     // care about the outcome.
 
-    $should_publish = $did_update &&
-                      $new_status != HarbormasterBuildable::STATUS_BUILDING &&
-                      !$buildable->getIsManualBuildable();
+    $should_publish =
+      ($did_update) &&
+      ($new_status != HarbormasterBuildableStatus::STATUS_BUILDING) &&
+      (!$buildable->getIsManualBuildable());
 
     if (!$should_publish) {
       return;
diff --git a/src/applications/harbormaster/event/HarbormasterUIEventListener.php b/src/applications/harbormaster/event/HarbormasterUIEventListener.php
index 219f556b3a..1227fbbe31 100644
--- a/src/applications/harbormaster/event/HarbormasterUIEventListener.php
+++ b/src/applications/harbormaster/event/HarbormasterUIEventListener.php
@@ -87,13 +87,9 @@ private function handlePropertyEvent($ui_event) {
 
     $status_view = new PHUIStatusListView();
 
-    $buildable_status = $buildable->getBuildableStatus();
-    $buildable_icon = HarbormasterBuildable::getBuildableStatusIcon(
-      $buildable_status);
-    $buildable_color = HarbormasterBuildable::getBuildableStatusColor(
-      $buildable_status);
-    $buildable_name = HarbormasterBuildable::getBuildableStatusName(
-      $buildable_status);
+    $buildable_icon = $buildable->getStatusIcon();
+    $buildable_color = $buildable->getStatusColor();
+    $buildable_name = $buildable->getStatusDisplayName();
 
     $target = phutil_tag(
       'a',
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
index cfff27b1aa..36f5dc89c2 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
@@ -33,7 +33,7 @@ protected function buildCustomSearchFields() {
       id(new PhabricatorSearchCheckboxesField())
         ->setKey('statuses')
         ->setLabel(pht('Statuses'))
-        ->setOptions(HarbormasterBuildable::getBuildStatusMap())
+        ->setOptions(HarbormasterBuildableStatus::getOptionMap())
         ->setDescription(pht('Search for builds by buildable status.')),
       id(new PhabricatorSearchThreeStateField())
         ->setLabel(pht('Manual'))
@@ -169,11 +169,9 @@ protected function renderResultList(
         $item->addIcon('fa-wrench grey', pht('Manual'));
       }
 
-      $status = $buildable->getBuildableStatus();
-
-      $status_icon = HarbormasterBuildable::getBuildableStatusIcon($status);
-      $status_color = HarbormasterBuildable::getBuildableStatusColor($status);
-      $status_label = HarbormasterBuildable::getBuildableStatusName($status);
+      $status_icon = $buildable->getStatusIcon();
+      $status_color = $buildable->getStatusColor();
+      $status_label = $buildable->getStatusDisplayName();
 
       $item->setStatusIcon("{$status_icon} {$status_color}", $status_label);
 
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
index 89c13b8b41..fc15aca063 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -15,65 +15,10 @@ final class HarbormasterBuildable extends HarbormasterDAO
   private $containerObject = self::ATTACHABLE;
   private $builds = self::ATTACHABLE;
 
-  const STATUS_BUILDING = 'building';
-  const STATUS_PASSED = 'passed';
-  const STATUS_FAILED = 'failed';
-
-  public static function getBuildableStatusName($status) {
-    $map = self::getBuildStatusMap();
-    return idx($map, $status, pht('Unknown ("%s")', $status));
-  }
-
-  public static function getBuildStatusMap() {
-    return array(
-      self::STATUS_BUILDING => pht('Building'),
-      self::STATUS_PASSED => pht('Passed'),
-      self::STATUS_FAILED => pht('Failed'),
-    );
-  }
-
-  public static function getBuildableStatusIcon($status) {
-    switch ($status) {
-      case self::STATUS_BUILDING:
-        return PHUIStatusItemView::ICON_RIGHT;
-      case self::STATUS_PASSED:
-        return PHUIStatusItemView::ICON_ACCEPT;
-      case self::STATUS_FAILED:
-        return PHUIStatusItemView::ICON_REJECT;
-      default:
-        return PHUIStatusItemView::ICON_QUESTION;
-    }
-  }
-
-  public static function getBuildableStatusColor($status) {
-    switch ($status) {
-      case self::STATUS_BUILDING:
-        return 'blue';
-      case self::STATUS_PASSED:
-        return 'green';
-      case self::STATUS_FAILED:
-        return 'red';
-      default:
-        return 'bluegrey';
-    }
-  }
-
-  public function getStatusIcon() {
-    return self::getBuildableStatusIcon($this->getBuildableStatus());
-  }
-
-  public function getStatusDisplayName() {
-    return self::getBuildableStatusName($this->getBuildableStatus());
-  }
-
-  public function getStatusColor() {
-    return self::getBuildableStatusColor($this->getBuildableStatus());
-  }
-
   public static function initializeNewBuildable(PhabricatorUser $actor) {
     return id(new HarbormasterBuildable())
       ->setIsManualBuildable(0)
-      ->setBuildableStatus(self::STATUS_BUILDING);
+      ->setBuildableStatus(HarbormasterBuildableStatus::STATUS_BUILDING);
   }
 
   public function getMonogram() {
@@ -262,6 +207,27 @@ public function getBuilds() {
   }
 
 
+/* -(  Status  )------------------------------------------------------------- */
+
+
+  public function getBuildableStatusObject() {
+    $status = $this->getBuildableStatus();
+    return HarbormasterBuildableStatus::newBuildableStatusObject($status);
+  }
+
+  public function getStatusIcon() {
+    return $this->getBuildableStatusObject()->getIcon();
+  }
+
+  public function getStatusDisplayName() {
+    return $this->getBuildableStatusObject()->getDisplayName();
+  }
+
+  public function getStatusColor() {
+    return $this->getBuildableStatusObject()->getColor();
+  }
+
+
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index d27370cd44..7682ab5ebb 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -512,9 +512,9 @@ public function getColor() {
         break;
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
-          case HarbormasterBuildable::STATUS_PASSED:
+          case HarbormasterBuildableStatus::STATUS_PASSED:
             return 'green';
-          case HarbormasterBuildable::STATUS_FAILED:
+          case HarbormasterBuildableStatus::STATUS_FAILED:
             return 'red';
         }
         break;
@@ -676,7 +676,7 @@ public function shouldHideForMail(array $xactions) {
         return true;
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
-          case HarbormasterBuildable::STATUS_FAILED:
+          case HarbormasterBuildableStatus::STATUS_FAILED:
             // For now, only ever send mail when builds fail. We might let
             // you customize this later, but in most cases this is probably
             // completely uninteresting.
@@ -739,7 +739,7 @@ public function shouldHideForFeed() {
         return true;
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
-          case HarbormasterBuildable::STATUS_FAILED:
+          case HarbormasterBuildableStatus::STATUS_FAILED:
             // For now, don't notify on build passes either. These are pretty
             // high volume and annoying, with very little present value. We
             // might want to turn them back on in the specific case of
@@ -1024,19 +1024,19 @@ public function getTitle() {
 
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
-          case HarbormasterBuildable::STATUS_BUILDING:
+          case HarbormasterBuildableStatus::STATUS_BUILDING:
             return pht(
               '%s started building %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')));
-          case HarbormasterBuildable::STATUS_PASSED:
+          case HarbormasterBuildableStatus::STATUS_PASSED:
             return pht(
               '%s completed building %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')));
-          case HarbormasterBuildable::STATUS_FAILED:
+          case HarbormasterBuildableStatus::STATUS_FAILED:
             return pht(
               '%s failed to build %s!',
               $this->renderHandleLink($author_phid),

From 66f20595e4d276c292996821677b518df649d082 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Feb 2018 11:28:13 -0800
Subject: [PATCH 553/865] Start buildables in "PREPARING", move them to
 "BUILDING" after builds queue

Summary:
Depends on D19064. Ref T13054. See that task for additional discussion.

When buildables are created by `arc` and have lint/unit messages, they can currently pass or fail before Herald triggers actual builds. This puts them in a pre-build state where they can't complete until Herald says it's okay.

On its own, this change intentionally strands `arc diff --only` diffs in the "PREPARING" stage forever.

Test Plan:
  - Ran a build with `bin/harbormaster`, saw it build normally.
  - Ran a build with web UI, saw it build normally.
  - Ran a build with `arc diff`, saw it build normally.
  - Ran a build with `arc diff --only`, saw it hang in "PREPARING" forever.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13054

Differential Revision: https://secure.phabricator.com/D19065
---
 .../constants/HarbormasterBuildableStatus.php | 10 +++
 .../HarbormasterPlanRunController.php         |  6 ++
 .../engine/HarbormasterBuildEngine.php        | 84 ++++++++++++++-----
 .../engine/HarbormasterMessageType.php        |  2 +
 .../HarbormasterManagementBuildWorkflow.php   |  5 ++
 .../storage/HarbormasterBuildable.php         | 34 +++++++-
 .../worker/HarbormasterBuildWorker.php        | 36 ++++++--
 ...habricatorApplicationTransactionEditor.php | 24 +++++-
 8 files changed, 174 insertions(+), 27 deletions(-)

diff --git a/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php b/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
index 9cd3dd0b6f..7ba2379f30 100644
--- a/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
+++ b/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
@@ -2,6 +2,7 @@
 
 final class HarbormasterBuildableStatus extends Phobject {
 
+  const STATUS_PREPARING = 'preparing';
   const STATUS_BUILDING = 'building';
   const STATUS_PASSED = 'passed';
   const STATUS_FAILED = 'failed';
@@ -42,12 +43,21 @@ public function getColor() {
     return $this->getProperty('color');
   }
 
+  public function isPreparing() {
+    return ($this->key === self::STATUS_PREPARING);
+  }
+
   public static function getOptionMap() {
     return ipull(self::getSpecifications(), 'name');
   }
 
   private static function getSpecifications() {
     return array(
+      self::STATUS_PREPARING => array(
+        'name' => pht('Preparing'),
+        'color' => 'blue',
+        'icon' => 'fa-hourglass-o',
+      ),
       self::STATUS_BUILDING => array(
         'name' => pht('Building'),
         'color' => 'blue',
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanRunController.php b/src/applications/harbormaster/controller/HarbormasterPlanRunController.php
index 85bdbd8b49..fd227ee554 100644
--- a/src/applications/harbormaster/controller/HarbormasterPlanRunController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanRunController.php
@@ -59,6 +59,12 @@ public function handleRequest(AphrontRequest $request) {
 
       if (!$errors) {
         $buildable->save();
+
+        $buildable->sendMessage(
+          $viewer,
+          HarbormasterMessageType::BUILDABLE_BUILD,
+          false);
+
         $buildable->applyPlan($plan, array(), $viewer->getPHID());
 
         $buildable_uri = '/B'.$buildable->getID();
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
index 3749178418..ea20c64538 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -428,7 +428,7 @@ private function updateWaitingTargets(array $targets) {
    * @param   HarbormasterBuild The buildable to update.
    * @return  void
    */
-  private function updateBuildable(HarbormasterBuildable $buildable) {
+   public function updateBuildable(HarbormasterBuildable $buildable) {
     $viewer = $this->getViewer();
 
     $lock_key = 'harbormaster.buildable:'.$buildable->getID();
@@ -440,35 +440,79 @@ private function updateBuildable(HarbormasterBuildable $buildable) {
       ->needBuilds(true)
       ->executeOne();
 
-    $all_pass = true;
-    $any_fail = false;
-    foreach ($buildable->getBuilds() as $build) {
-      if (!$build->isPassed()) {
-        $all_pass = false;
-      }
+    $messages = id(new HarbormasterBuildMessageQuery())
+      ->setViewer($viewer)
+      ->withReceiverPHIDs(array($buildable->getPHID()))
+      ->withConsumed(false)
+      ->execute();
 
-      if ($build->isComplete() && !$build->isPassed()) {
-        $any_fail = true;
+    $done_preparing = false;
+    foreach ($messages as $message) {
+      switch ($message->getType()) {
+        case HarbormasterMessageType::BUILDABLE_BUILD:
+          $done_preparing = true;
+          break;
+        default:
+          break;
       }
+
+      $message
+        ->setIsConsumed(true)
+        ->save();
     }
 
-    if ($any_fail) {
-      $new_status = HarbormasterBuildableStatus::STATUS_FAILED;
-    } else if ($all_pass) {
-      $new_status = HarbormasterBuildableStatus::STATUS_PASSED;
-    } else {
-      $new_status = HarbormasterBuildableStatus::STATUS_BUILDING;
+    // If we received a "build" command, all builds are scheduled and we can
+    // move out of "preparing" into "building".
+
+    if ($done_preparing) {
+      if ($buildable->isPreparing()) {
+        $buildable
+          ->setBuildableStatus(HarbormasterBuildableStatus::STATUS_BUILDING)
+          ->save();
+      }
     }
 
-    $old_status = $buildable->getBuildableStatus();
-    $did_update = ($old_status != $new_status);
-    if ($did_update) {
-      $buildable->setBuildableStatus($new_status);
-      $buildable->save();
+    // Don't update the buildable status if we're still preparing builds: more
+    // builds may still be scheduled shortly, so even if every build we know
+    // about so far has passed, that doesn't mean the buildable has actually
+    // passed everything it needs to.
+
+    if (!$buildable->isPreparing()) {
+      $all_pass = true;
+      $any_fail = false;
+      foreach ($buildable->getBuilds() as $build) {
+        if (!$build->isPassed()) {
+          $all_pass = false;
+        }
+
+        if ($build->isComplete() && !$build->isPassed()) {
+          $any_fail = true;
+        }
+      }
+
+      if ($any_fail) {
+        $new_status = HarbormasterBuildableStatus::STATUS_FAILED;
+      } else if ($all_pass) {
+        $new_status = HarbormasterBuildableStatus::STATUS_PASSED;
+      } else {
+        $new_status = HarbormasterBuildableStatus::STATUS_BUILDING;
+      }
+
+      $old_status = $buildable->getBuildableStatus();
+      $did_update = ($old_status != $new_status);
+      if ($did_update) {
+        $buildable->setBuildableStatus($new_status);
+        $buildable->save();
+      }
     }
 
     $lock->unlock();
 
+    // Don't publish anything if we're still preparing builds.
+    if ($buildable->isPreparing()) {
+      return;
+    }
+
     // If we changed the buildable status, try to post a transaction to the
     // object about it. We can safely do this outside of the locked region.
 
diff --git a/src/applications/harbormaster/engine/HarbormasterMessageType.php b/src/applications/harbormaster/engine/HarbormasterMessageType.php
index 5900817c69..8b3ebe2e6f 100644
--- a/src/applications/harbormaster/engine/HarbormasterMessageType.php
+++ b/src/applications/harbormaster/engine/HarbormasterMessageType.php
@@ -6,6 +6,8 @@ final class HarbormasterMessageType extends Phobject {
   const MESSAGE_FAIL = 'fail';
   const MESSAGE_WORK = 'work';
 
+  const BUILDABLE_BUILD = 'build';
+
   public static function getAllMessages() {
     return array_keys(self::getMessageSpecifications());
   }
diff --git a/src/applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php
index 6fd3cf2ffd..2efd443a91 100644
--- a/src/applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php
+++ b/src/applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php
@@ -83,6 +83,11 @@ public function execute(PhutilArgumentParser $args) {
       ->setContainerPHID($buildable->getHarbormasterContainerPHID())
       ->save();
 
+    $buildable->sendMessage(
+      $viewer,
+      HarbormasterMessageType::BUILDABLE_BUILD,
+      false);
+
     $console->writeOut(
       "%s\n",
       pht(
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
index fc15aca063..5de2159e8d 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -18,7 +18,7 @@ final class HarbormasterBuildable extends HarbormasterDAO
   public static function initializeNewBuildable(PhabricatorUser $actor) {
     return id(new HarbormasterBuildable())
       ->setIsManualBuildable(0)
-      ->setBuildableStatus(HarbormasterBuildableStatus::STATUS_BUILDING);
+      ->setBuildableStatus(HarbormasterBuildableStatus::STATUS_PREPARING);
   }
 
   public function getMonogram() {
@@ -227,6 +227,38 @@ public function getStatusColor() {
     return $this->getBuildableStatusObject()->getColor();
   }
 
+  public function isPreparing() {
+    return $this->getBuildableStatusObject()->isPreparing();
+  }
+
+
+/* -(  Messages  )----------------------------------------------------------- */
+
+
+  public function sendMessage(
+    PhabricatorUser $viewer,
+    $message_type,
+    $queue_update) {
+
+    $message = HarbormasterBuildMessage::initializeNewMessage($viewer)
+      ->setReceiverPHID($this->getPHID())
+      ->setType($message_type)
+      ->save();
+
+    if ($queue_update) {
+      PhabricatorWorker::scheduleTask(
+        'HarbormasterBuildWorker',
+        array(
+          'buildablePHID' => $this->getPHID(),
+        ),
+        array(
+          'objectPHID' => $this->getPHID(),
+        ));
+    }
+
+    return $message;
+  }
+
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
diff --git a/src/applications/harbormaster/worker/HarbormasterBuildWorker.php b/src/applications/harbormaster/worker/HarbormasterBuildWorker.php
index 67eb6b3e78..9ce9d50f13 100644
--- a/src/applications/harbormaster/worker/HarbormasterBuildWorker.php
+++ b/src/applications/harbormaster/worker/HarbormasterBuildWorker.php
@@ -17,12 +17,21 @@ public function renderForDisplay(PhabricatorUser $viewer) {
 
   protected function doWork() {
     $viewer = $this->getViewer();
-    $build = $this->loadBuild();
 
-    id(new HarbormasterBuildEngine())
-      ->setViewer($viewer)
-      ->setBuild($build)
-      ->continueBuild();
+    $engine = id(new HarbormasterBuildEngine())
+      ->setViewer($viewer);
+
+    $data = $this->getTaskData();
+    $build_id = idx($data, 'buildID');
+
+    if ($build_id) {
+      $build = $this->loadBuild();
+      $engine->setBuild($build);
+      $engine->continueBuild();
+    } else {
+      $buildable = $this->loadBuildable();
+      $engine->updateBuildable($buildable);
+    }
   }
 
   private function loadBuild() {
@@ -42,4 +51,21 @@ private function loadBuild() {
     return $build;
   }
 
+  private function loadBuildable() {
+    $data = $this->getTaskData();
+    $phid = idx($data, 'buildablePHID');
+
+    $viewer = $this->getViewer();
+    $buildable = id(new HarbormasterBuildableQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($phid))
+      ->executeOne();
+    if (!$buildable) {
+      throw new PhabricatorWorkerPermanentFailureException(
+        pht('Invalid buildable PHID "%s".', $phid));
+    }
+
+    return $buildable;
+  }
+
 }
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 7bc1f693c7..7cb1300feb 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -3262,10 +3262,32 @@ private function applyHeraldRules(
     $this->setHeraldTranscript($xscript);
 
     if ($adapter instanceof HarbormasterBuildableAdapterInterface) {
+      $buildable_phid = $adapter->getHarbormasterBuildablePHID();
+
       HarbormasterBuildable::applyBuildPlans(
-        $adapter->getHarbormasterBuildablePHID(),
+        $buildable_phid,
         $adapter->getHarbormasterContainerPHID(),
         $adapter->getQueuedHarbormasterBuildRequests());
+
+      // Whether we queued any builds or not, any automatic buildable for this
+      // object is now done preparing builds and can transition into a
+      // completed status.
+      $buildables = id(new HarbormasterBuildableQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withManualBuildables(false)
+        ->withBuildablePHIDs(array($buildable_phid))
+        ->execute();
+      foreach ($buildables as $buildable) {
+        // If this buildable has already moved beyond preparation, we don't
+        // need to nudge it again.
+        if (!$buildable->isPreparing()) {
+          continue;
+        }
+        $buildable->sendMessage(
+          $this->getActor(),
+          HarbormasterMessageType::BUILDABLE_BUILD,
+          true);
+      }
     }
 
     $this->mustEncrypt = $adapter->getMustEncryptReasons();

From 6f508a22586991319a92f25300ea2085843d8ee2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Feb 2018 12:03:56 -0800
Subject: [PATCH 554/865] Update buildable containerPHIDs in a proper way via
 BuildWorker rather than via sneaky uncoordinated write

Summary:
Depends on D19065. Ref T13054. Instead of just updating `containerPHID` and hoping for the best, queue a proper BuildWorker to process a "your container has changed, update it" message.

We also need to remove a (superfluous) `withContainerPHIDs()` when loading active diffs for a revision.

Test Plan:
  - Without daemons, created a revision and saw builds stick in "preparing" with no container PHID, but also stay in draft mode.
  - With daemons, saw builds actually build and get the right container PHID.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13054

Differential Revision: https://secure.phabricator.com/D19066
---
 .../editor/DifferentialTransactionEditor.php  | 31 ++++++++++---------
 .../storage/DifferentialRevision.php          |  3 +-
 .../engine/HarbormasterBuildEngine.php        | 19 +++++++++++-
 .../engine/HarbormasterMessageType.php        |  1 +
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 063df6c602..a092bf2693 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -365,21 +365,22 @@ protected function applyCustomExternalTransaction(
         $diff->setRevisionID($object->getID());
         $diff->save();
 
-        // Update Harbormaster to set the containerPHID correctly for any
-        // existing buildables. We may otherwise have buildables stuck with
-        // the old (`null`) container.
-
-        // TODO: This is a bit iffy, maybe we can find a cleaner approach?
-        // In particular, this could (rarely) be overwritten by Harbormaster
-        // workers.
-        $table = new HarbormasterBuildable();
-        $conn_w = $table->establishConnection('w');
-        queryfx(
-          $conn_w,
-          'UPDATE %T SET containerPHID = %s WHERE buildablePHID = %s',
-          $table->getTableName(),
-          $object->getPHID(),
-          $diff->getPHID());
+        // If there are any outstanding buildables for this diff, tell
+        // Harbormaster that their containers need to be updated. This is
+        // common, because `arc` creates buildables so it can upload lint
+        // and unit results.
+
+        $buildables = id(new HarbormasterBuildableQuery())
+          ->setViewer(PhabricatorUser::getOmnipotentUser())
+          ->withManualBuildables(false)
+          ->withBuildablePHIDs(array($diff->getPHID()))
+          ->execute();
+        foreach ($buildables as $buildable) {
+          $buildable->sendMessage(
+            $this->getActor(),
+            HarbormasterMessageType::BUILDABLE_CONTAINER,
+            true);
+        }
 
         return;
     }
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index e8fdf7e514..6813c124d7 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -743,9 +743,10 @@ public function getRemovedLineCount() {
   public function loadActiveBuilds(PhabricatorUser $viewer) {
     $diff = $this->getActiveDiff();
 
+    // NOTE: We can't use `withContainerPHIDs()` here because the container
+    // update in Harbormaster is not synchronous.
     $buildables = id(new HarbormasterBuildableQuery())
       ->setViewer($viewer)
-      ->withContainerPHIDs(array($this->getPHID()))
       ->withBuildablePHIDs(array($diff->getPHID()))
       ->withManualBuildables(false)
       ->execute();
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
index ea20c64538..454fec7f37 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -447,11 +447,15 @@ public function updateBuildable(HarbormasterBuildable $buildable) {
       ->execute();
 
     $done_preparing = false;
+    $update_container = false;
     foreach ($messages as $message) {
       switch ($message->getType()) {
         case HarbormasterMessageType::BUILDABLE_BUILD:
           $done_preparing = true;
           break;
+        case HarbormasterMessageType::BUILDABLE_CONTAINER:
+          $update_container = true;
+          break;
         default:
           break;
       }
@@ -463,7 +467,6 @@ public function updateBuildable(HarbormasterBuildable $buildable) {
 
     // If we received a "build" command, all builds are scheduled and we can
     // move out of "preparing" into "building".
-
     if ($done_preparing) {
       if ($buildable->isPreparing()) {
         $buildable
@@ -472,6 +475,20 @@ public function updateBuildable(HarbormasterBuildable $buildable) {
       }
     }
 
+    // If we've been informed that the container for the buildable has
+    // changed, update it.
+    if ($update_container) {
+      $object = id(new PhabricatorObjectQuery())
+        ->setViewer($viewer)
+        ->withPHIDs(array($buildable->getBuildablePHID()))
+        ->executeOne();
+      if ($object) {
+        $buildable
+          ->setContainerPHID($object->getHarbormasterContainerPHID())
+          ->save();
+      }
+    }
+
     // Don't update the buildable status if we're still preparing builds: more
     // builds may still be scheduled shortly, so even if every build we know
     // about so far has passed, that doesn't mean the buildable has actually
diff --git a/src/applications/harbormaster/engine/HarbormasterMessageType.php b/src/applications/harbormaster/engine/HarbormasterMessageType.php
index 8b3ebe2e6f..135fb23ffc 100644
--- a/src/applications/harbormaster/engine/HarbormasterMessageType.php
+++ b/src/applications/harbormaster/engine/HarbormasterMessageType.php
@@ -7,6 +7,7 @@ final class HarbormasterMessageType extends Phobject {
   const MESSAGE_WORK = 'work';
 
   const BUILDABLE_BUILD = 'build';
+  const BUILDABLE_CONTAINER = 'container';
 
   public static function getAllMessages() {
     return array_keys(self::getMessageSpecifications());

From 11c9994134935ea6358f7714e5d4d4297a617b9c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Feb 2018 13:01:02 -0800
Subject: [PATCH 555/865] Allow "arc diff --plan-changes" to work with drafts
 enabled

Summary:
See PHI346. Ref T13054. If you have prototypes enabled on the server but use `master` / `stable` on the client and run `arc diff --plan-changes`, the transition is rejected because "Draft -> Changes Planned" isn't currently a legal transition.

Allow this transition if not coming from the web UI (to keep it out of the dropdown).

Test Plan:
  - Ran `arc diff --plan-changes` on `master`, got a "Changes Planned" revision instead of a validation error.
  - Ran `arc diff` without `--plan-changes`, got a draft, verified that "Plan Changes" still doesn't appear in the action dropdown.

Maniphest Tasks: T13054

Differential Revision: https://secure.phabricator.com/D19067
---
 ...DifferentialRevisionPlanChangesTransaction.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
index 231adc5bf8..e53426c8ba 100644
--- a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
@@ -57,8 +57,19 @@ public function applyInternalEffects($object, $value) {
 
   protected function validateAction($object, PhabricatorUser $viewer) {
     if ($object->isDraft()) {
-      throw new Exception(
-        pht('You can not plan changes to a draft revision.'));
+
+      // See PHI346. Until the "Draft" state fully unprototypes, allow drafts
+      // to be moved to "changes planned" via the API. This preserves the
+      // behavior of "arc diff --plan-changes". We still prevent this
+      // transition from the web UI.
+      // TODO: Remove this once drafts leave prototype.
+
+      $editor = $this->getEditor();
+      $type_web = PhabricatorWebContentSource::SOURCECONST;
+      if ($editor->getContentSource()->getSource() == $type_web) {
+        throw new Exception(
+          pht('You can not plan changes to a draft revision.'));
+      }
     }
 
     if ($object->isChangePlanned()) {

From 894e9dd852fa0fe896c7c7932af49916d3fbacfd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Feb 2018 15:31:16 -0800
Subject: [PATCH 556/865] Update a handful of missed
 HarbormasterBuildableStatus constants

Summary: See <https://discourse.phabricator-community.org/t/exception-undefined-class-status-building/1103>.

Test Plan: Used `grep` more carefully.

Differential Revision: https://secure.phabricator.com/D19068
---
 .../storage/PhabricatorApplicationTransaction.php      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index 7682ab5ebb..015e601b02 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -1236,21 +1236,21 @@ public function getTitleForFeed() {
         }
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
-          case HarbormasterBuildable::STATUS_BUILDING:
+          case HarbormasterBuildableStatus::STATUS_BUILDING:
             return pht(
               '%s started building %s for %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')),
               $this->renderHandleLink($object_phid));
-          case HarbormasterBuildable::STATUS_PASSED:
+          case HarbormasterBuildableStatus::STATUS_PASSED:
             return pht(
               '%s completed building %s for %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink(
                 $this->getMetadataValue('harbormaster:buildablePHID')),
               $this->renderHandleLink($object_phid));
-          case HarbormasterBuildable::STATUS_FAILED:
+          case HarbormasterBuildableStatus::STATUS_FAILED:
             return pht(
               '%s failed to build %s for %s.',
               $this->renderHandleLink($author_phid),
@@ -1418,9 +1418,9 @@ public function getActionName() {
         return pht('Changed Subscribers');
       case PhabricatorTransactions::TYPE_BUILDABLE:
         switch ($this->getNewValue()) {
-          case HarbormasterBuildable::STATUS_PASSED:
+          case HarbormasterBuildableStatus::STATUS_PASSED:
             return pht('Build Passed');
-          case HarbormasterBuildable::STATUS_FAILED:
+          case HarbormasterBuildableStatus::STATUS_FAILED:
             return pht('Build Failed');
           default:
             return pht('Build Status');

From 6a4d5ce3c93e79d26ccd349bd5131f4cc61749d4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Feb 2018 15:34:09 -0800
Subject: [PATCH 557/865] Don't allow Herald Diff rules to "Call Webhooks"

Summary: Like "Commit Hook" rules, these also fire oddly and don't have an object PHID or a list of transactions.

Test Plan: Verified that "Call Webhooks" was no longer available from Diff rules, but still available from other rule types.

Differential Revision: https://secure.phabricator.com/D19069
---
 .../differential/herald/HeraldDifferentialDiffAdapter.php     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/applications/differential/herald/HeraldDifferentialDiffAdapter.php b/src/applications/differential/herald/HeraldDifferentialDiffAdapter.php
index a6b2e7c36e..966b306580 100644
--- a/src/applications/differential/herald/HeraldDifferentialDiffAdapter.php
+++ b/src/applications/differential/herald/HeraldDifferentialDiffAdapter.php
@@ -57,4 +57,8 @@ public function getHeraldName() {
     return pht('New Diff');
   }
 
+  public function supportsWebhooks() {
+    return false;
+  }
+
 }

From 4dd32dca3e8f48197438fda1f5a7e8c77fd13216 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 03:08:58 -0800
Subject: [PATCH 558/865] When a Drydock Blueprint promises us a resource but
 can't deliver, continue believing in it

Summary:
Ref T13073. When a Blueprint says it will be able to allocate a resource but then throws an exception while attempting that allocation, we currently fail the lease permanently.

This is excessively harsh. This blueprint may have the best of intentions and have encountered a legitimately unforseeable failure (like a `vm.new` call to build a VM failed) and be able to succeed in the future.

Even if this blueprint is a dirty liar, other blueprints (or existing resources) may be able to satisfy the lease in the future.

Even if every blueprint is implemented incorrectly, leaving the lease alive lets it converge to success after the blueprints are fixed.

Instead of failing, log the issue and yield.

(In the future, it might make sense to distinguish more narrowly between "actually, all the resources are used up" and all other failure types, since the former is likely more routine and less concerning.)

Test Plan:
  - Wrote a broken `Hoax` blueprint which always claims it can allocate but never actually allocates (just `throw` in `allocateResource()`).
  - Used `bin/phd drydock lease` to acquire a Hoax lease.
  - Before patch: lease abruptly failed permanently.
  - After patch: lease yields after allocation fails.

{F5427747}

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19070
---
 src/__phutil_library_map__.php                |  4 ++
 .../DrydockLeaseAllocationFailureLogType.php  | 26 +++++++++++++
 ...rydockResourceAllocationFailureLogType.php | 26 +++++++++++++
 .../worker/DrydockLeaseUpdateWorker.php       | 38 ++++++++++++++++++-
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php
 create mode 100644 src/applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 59b375eb55..1656d1f398 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1055,6 +1055,7 @@
     'DrydockLeaseActivatedLogType' => 'applications/drydock/logtype/DrydockLeaseActivatedLogType.php',
     'DrydockLeaseActivationFailureLogType' => 'applications/drydock/logtype/DrydockLeaseActivationFailureLogType.php',
     'DrydockLeaseActivationYieldLogType' => 'applications/drydock/logtype/DrydockLeaseActivationYieldLogType.php',
+    'DrydockLeaseAllocationFailureLogType' => 'applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php',
     'DrydockLeaseController' => 'applications/drydock/controller/DrydockLeaseController.php',
     'DrydockLeaseDatasource' => 'applications/drydock/typeahead/DrydockLeaseDatasource.php',
     'DrydockLeaseDestroyedLogType' => 'applications/drydock/logtype/DrydockLeaseDestroyedLogType.php',
@@ -1106,6 +1107,7 @@
     'DrydockResource' => 'applications/drydock/storage/DrydockResource.php',
     'DrydockResourceActivationFailureLogType' => 'applications/drydock/logtype/DrydockResourceActivationFailureLogType.php',
     'DrydockResourceActivationYieldLogType' => 'applications/drydock/logtype/DrydockResourceActivationYieldLogType.php',
+    'DrydockResourceAllocationFailureLogType' => 'applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php',
     'DrydockResourceController' => 'applications/drydock/controller/DrydockResourceController.php',
     'DrydockResourceDatasource' => 'applications/drydock/typeahead/DrydockResourceDatasource.php',
     'DrydockResourceListController' => 'applications/drydock/controller/DrydockResourceListController.php',
@@ -6273,6 +6275,7 @@
     'DrydockLeaseActivatedLogType' => 'DrydockLogType',
     'DrydockLeaseActivationFailureLogType' => 'DrydockLogType',
     'DrydockLeaseActivationYieldLogType' => 'DrydockLogType',
+    'DrydockLeaseAllocationFailureLogType' => 'DrydockLogType',
     'DrydockLeaseController' => 'DrydockController',
     'DrydockLeaseDatasource' => 'PhabricatorTypeaheadDatasource',
     'DrydockLeaseDestroyedLogType' => 'DrydockLogType',
@@ -6333,6 +6336,7 @@
     ),
     'DrydockResourceActivationFailureLogType' => 'DrydockLogType',
     'DrydockResourceActivationYieldLogType' => 'DrydockLogType',
+    'DrydockResourceAllocationFailureLogType' => 'DrydockLogType',
     'DrydockResourceController' => 'DrydockController',
     'DrydockResourceDatasource' => 'PhabricatorTypeaheadDatasource',
     'DrydockResourceListController' => 'DrydockResourceController',
diff --git a/src/applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php b/src/applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php
new file mode 100644
index 0000000000..33ad881f4f
--- /dev/null
+++ b/src/applications/drydock/logtype/DrydockLeaseAllocationFailureLogType.php
@@ -0,0 +1,26 @@
+<?php
+
+final class DrydockLeaseAllocationFailureLogType extends DrydockLogType {
+
+  const LOGCONST = 'core.lease.allocation-failure';
+
+  public function getLogTypeName() {
+    return pht('Allocation Failed');
+  }
+
+  public function getLogTypeIcon(array $data) {
+    return 'fa-times red';
+  }
+
+  public function renderLog(array $data) {
+    $class = idx($data, 'class');
+    $message = idx($data, 'message');
+
+    return pht(
+      'One or more blueprints promised a new resource, but failed when '.
+      'allocating: [%s] %s',
+      $class,
+      $message);
+  }
+
+}
diff --git a/src/applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php b/src/applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php
new file mode 100644
index 0000000000..f1e4cf4632
--- /dev/null
+++ b/src/applications/drydock/logtype/DrydockResourceAllocationFailureLogType.php
@@ -0,0 +1,26 @@
+<?php
+
+final class DrydockResourceAllocationFailureLogType extends DrydockLogType {
+
+  const LOGCONST = 'core.resource.allocation-failure';
+
+  public function getLogTypeName() {
+    return pht('Allocation Failed');
+  }
+
+  public function getLogTypeIcon(array $data) {
+    return 'fa-times red';
+  }
+
+  public function renderLog(array $data) {
+    $class = idx($data, 'class');
+    $message = idx($data, 'message');
+
+    return pht(
+      'Blueprint failed to allocate a resource after claiming it would '.
+      'be able to: [%s] %s',
+      $class,
+      $message);
+  }
+
+}
diff --git a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
index d73506f286..08c69291b7 100644
--- a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
@@ -216,17 +216,51 @@ private function executeAllocator(DrydockLease $lease) {
           // this.
           break;
         } catch (Exception $ex) {
+          // This failure is not normally expected, so log it. It can be
+          // caused by something mundane and recoverable, however (see below
+          // for discussion).
+
+          // We log to the blueprint separately from the log to the lease:
+          // the lease is not attached to a blueprint yet so the lease log
+          // will not show up on the blueprint; more than one blueprint may
+          // fail; and the lease is not really impacted (and won't log) if at
+          // least one blueprint actually works.
+
+          $blueprint->logEvent(
+            DrydockResourceAllocationFailureLogType::LOGCONST,
+            array(
+              'class' => get_class($ex),
+              'message' => $ex->getMessage(),
+            ));
+
           $exceptions[] = $ex;
         }
       }
 
       if (!$resources) {
-        throw new PhutilAggregateException(
+        // If one or more blueprints claimed that they would be able to
+        // allocate resources but none are actually able to allocate resources,
+        // log the failure and yield so we try again soon.
+
+        // This can happen if some unexpected issue occurs during allocation
+        // (for example, a call to build a VM fails for some reason) or if we
+        // raced another allocator and the blueprint is now full.
+
+        $ex = new PhutilAggregateException(
           pht(
             'All blueprints failed to allocate a suitable new resource when '.
-            'trying to allocate lease "%s".',
+            'trying to allocate lease ("%s").',
             $lease->getPHID()),
           $exceptions);
+
+        $lease->logEvent(
+          DrydockLeaseAllocationFailureLogType::LOGCONST,
+          array(
+            'class' => get_class($ex),
+            'message' => $ex->getMessage(),
+          ));
+
+        throw new PhabricatorWorkerYieldException(15);
       }
 
       $resources = $this->removeUnacquirableResources($resources, $lease);

From 3ec80a36dbeea5631c84fb1054b7d438f16df71f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 03:34:51 -0800
Subject: [PATCH 559/865] In Drydock log views, respect newlines

Summary: Depends on D19070. Ref T13073. Some messages contain an interesting story or a clever anecdote. Respect newlines during rendering to preserve authorial intent.

Test Plan:
Viewed a message with linebreaks and could still read it.

{F5427754}

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19071
---
 src/applications/drydock/view/DrydockLogListView.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/drydock/view/DrydockLogListView.php b/src/applications/drydock/view/DrydockLogListView.php
index 845457f9bc..cb66813507 100644
--- a/src/applications/drydock/view/DrydockLogListView.php
+++ b/src/applications/drydock/view/DrydockLogListView.php
@@ -53,6 +53,7 @@ public function render() {
           $type = $type_object->getLogTypeName();
           $icon = $type_object->getLogTypeIcon($log_data);
           $data = $type_object->renderLog($log_data);
+          $data = phutil_escape_html_newlines($data);
         } else {
           $type = pht('<Unknown: %s>', $type_key);
           $data = null;

From b833e324bd4a4a5a9d0190fa3db06fdf6a5642f5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 03:47:45 -0800
Subject: [PATCH 560/865] While waiting for a "bin/drydock" lease to activate,
 entertain the user with log output

Summary: Depends on D19071. Ref T13073. While the daemons are supposedly doing things, show the user any logs they generate. There's often something relevant but unearthing it can be involved.

Test Plan: {F5427773}

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19072
---
 .../DrydockManagementLeaseWorkflow.php        | 78 ++++++++++++++++++-
 .../drydock/storage/DrydockLease.php          | 32 --------
 2 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
index 4992833c50..069f82339b 100644
--- a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
@@ -90,7 +90,7 @@ public function execute(PhutilArgumentParser $args) {
       "%s\n",
       pht('Waiting for daemons to activate lease...'));
 
-    $lease->waitUntilActive();
+    $this->waitUntilActive($lease);
 
     echo tsprintf(
       "%s\n",
@@ -99,4 +99,80 @@ public function execute(PhutilArgumentParser $args) {
     return 0;
   }
 
+
+  private function waitUntilActive(DrydockLease $lease) {
+    $viewer = $this->getViewer();
+
+    $log_cursor = 0;
+    $log_types = DrydockLogType::getAllLogTypes();
+
+    $is_active = false;
+    while (!$is_active) {
+      $lease->reload();
+
+      // While we're waiting, show the user any logs which the daemons have
+      // generated to give them some clue about what's going on.
+      $logs = id(new DrydockLogQuery())
+        ->setViewer($viewer)
+        ->withLeasePHIDs(array($lease->getPHID()))
+        ->setBeforeID($log_cursor)
+        ->execute();
+      if ($logs) {
+        $logs = mpull($logs, null, 'getID');
+        ksort($logs);
+        $log_cursor = last_key($logs);
+      }
+
+      foreach ($logs as $log) {
+        $type_key = $log->getType();
+        if (isset($log_types[$type_key])) {
+          $type_object = id(clone $log_types[$type_key])
+            ->setLog($log)
+            ->setViewer($viewer);
+
+          $log_data = $log->getData();
+
+          $type = $type_object->getLogTypeName();
+          $data = $type_object->renderLog($log_data);
+        } else {
+          $type = pht('Unknown ("%s")', $type_key);
+          $data = null;
+        }
+
+        echo tsprintf(
+          "<%s> %B\n",
+          $type,
+          $data);
+      }
+
+      $status = $lease->getStatus();
+
+      switch ($status) {
+        case DrydockLeaseStatus::STATUS_ACTIVE:
+          $is_active = true;
+          break;
+        case DrydockLeaseStatus::STATUS_RELEASED:
+          throw new Exception(pht('Lease has already been released!'));
+        case DrydockLeaseStatus::STATUS_DESTROYED:
+          throw new Exception(pht('Lease has already been destroyed!'));
+        case DrydockLeaseStatus::STATUS_BROKEN:
+          throw new Exception(pht('Lease has been broken!'));
+        case DrydockLeaseStatus::STATUS_PENDING:
+        case DrydockLeaseStatus::STATUS_ACQUIRED:
+          break;
+        default:
+          throw new Exception(
+            pht(
+              'Lease has unknown status "%s".',
+              $status));
+      }
+
+      if ($is_active) {
+        break;
+      } else {
+        sleep(1);
+      }
+    }
+  }
+
 }
diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
index e60529afe4..e8cdc5b802 100644
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -194,38 +194,6 @@ public function isActive() {
     return false;
   }
 
-  public function waitUntilActive() {
-    while (true) {
-      $lease = $this->reload();
-      if (!$lease) {
-        throw new Exception(pht('Failed to reload lease.'));
-      }
-
-      $status = $lease->getStatus();
-
-      switch ($status) {
-        case DrydockLeaseStatus::STATUS_ACTIVE:
-          return;
-        case DrydockLeaseStatus::STATUS_RELEASED:
-          throw new Exception(pht('Lease has already been released!'));
-        case DrydockLeaseStatus::STATUS_DESTROYED:
-          throw new Exception(pht('Lease has already been destroyed!'));
-        case DrydockLeaseStatus::STATUS_BROKEN:
-          throw new Exception(pht('Lease has been broken!'));
-        case DrydockLeaseStatus::STATUS_PENDING:
-        case DrydockLeaseStatus::STATUS_ACQUIRED:
-          break;
-        default:
-          throw new Exception(
-            pht(
-              'Lease has unknown status "%s".',
-              $status));
-      }
-
-      sleep(1);
-    }
-  }
-
   public function setActivateWhenAcquired($activate) {
     $this->activateWhenAcquired = true;
     return $this;

From 07028cfc30cf717e4e7c4f1deb50713e4bac37e6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 04:14:48 -0800
Subject: [PATCH 561/865] When `bin/drydock lease` is interrupted, release
 leases

Summary:
Depends on D19072. Ref T13073. Currently, you can leave leases stranded by using `^C` to interrupt the script. Handle signals and release leases on destruction if they haven't activated yet.

Also, print out more useful information before and after activation.

Test Plan: Mashed ^C while runnning `bin/drydock lease ... --trace`, saw the lease release.

Subscribers: yelirekim, PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19073
---
 scripts/drydock/drydock_control.php           |  2 +-
 scripts/init/init-script-with-signals.php     | 11 ++++++
 ...dockWorkingCopyBlueprintImplementation.php |  2 +-
 .../DrydockManagementLeaseWorkflow.php        | 36 +++++++++++++++++--
 .../drydock/storage/DrydockLease.php          |  9 +++--
 ...DrydockRepositoryOperationUpdateWorker.php |  2 +-
 6 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 scripts/init/init-script-with-signals.php

diff --git a/scripts/drydock/drydock_control.php b/scripts/drydock/drydock_control.php
index 21ff9f8ee8..f22032b286 100755
--- a/scripts/drydock/drydock_control.php
+++ b/scripts/drydock/drydock_control.php
@@ -2,7 +2,7 @@
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once $root.'/scripts/init/init-script-with-signals.php';
 
 $args = new PhutilArgumentParser($argv);
 $args->setTagline(pht('manage drydock software resources'));
diff --git a/scripts/init/init-script-with-signals.php b/scripts/init/init-script-with-signals.php
new file mode 100644
index 0000000000..a479c4b758
--- /dev/null
+++ b/scripts/init/init-script-with-signals.php
@@ -0,0 +1,11 @@
+<?php
+
+// Initialize a script that will handle signals.
+
+if (function_exists('pcntl_async_signals')) {
+  pcntl_async_signals(true);
+} else {
+  declare(ticks = 1);
+}
+
+require_once dirname(__FILE__).'/init-script.php';
diff --git a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
index a5d61ec067..f45c4f2adb 100644
--- a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
@@ -206,7 +206,7 @@ public function destroyResource(
     }
 
     // Destroy the lease on the host.
-    $lease->releaseOnDestruction();
+    $lease->setReleaseOnDestruction(true);
 
     if ($lease->isActive()) {
       // Destroy the working copy on disk.
diff --git a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
index 069f82339b..3a27fe9045 100644
--- a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
@@ -84,21 +84,51 @@ public function execute(PhutilArgumentParser $args) {
       $lease->setUntil($until);
     }
 
+    // If something fatals or the user interrupts the process (for example,
+    // with "^C"), release the lease. We'll cancel this below, if the lease
+    // actually activates.
+    $lease->setReleaseOnDestruction(true);
+
+    // TODO: This would probably be better handled with PhutilSignalRouter,
+    // but it currently doesn't route SIGINT. We're initializing it to setup
+    // SIGTERM handling and make eventual migration easier.
+    $router = PhutilSignalRouter::getRouter();
+    pcntl_signal(SIGINT, array($this, 'didReceiveInterrupt'));
+
+    $t_start = microtime(true);
     $lease->queueForActivation();
 
     echo tsprintf(
-      "%s\n",
+      "%s\n\n        __%s__\n\n%s\n",
+      pht('Queued lease for activation:'),
+      PhabricatorEnv::getProductionURI($lease->getURI()),
       pht('Waiting for daemons to activate lease...'));
 
     $this->waitUntilActive($lease);
 
+    // Now that we've survived activation and the lease is good, make it
+    // durable.
+    $lease->setReleaseOnDestruction(false);
+    $t_end = microtime(true);
+
     echo tsprintf(
-      "%s\n",
-      pht('Activated lease "%s".', $lease->getID()));
+      "%s\n\n        %s\n\n%s\n",
+      pht(
+        'Activation complete. This lease is permanent until manually '.
+        'released with:'),
+      pht('$ ./bin/drydock release-lease --id %d', $lease->getID()),
+      pht(
+        'Lease activated in %sms.',
+        new PhutilNumber((int)(($t_end - $t_start) * 1000))));
 
     return 0;
   }
 
+  public function didReceiveInterrupt($signo) {
+    // Doing this makes us run destructors, particularly the "release on
+    // destruction" trigger on the lease.
+    exit(128 + $signo);
+  }
 
   private function waitUntilActive(DrydockLease $lease) {
     $viewer = $this->getViewer();
diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
index e8cdc5b802..e217223aa8 100644
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -36,8 +36,8 @@ public static function initializeNewLease() {
    * a lease, as you don't need to explicitly handle exceptions to properly
    * release the lease.
    */
-  public function releaseOnDestruction() {
-    $this->releaseOnDestruction = true;
+  public function setReleaseOnDestruction($release) {
+    $this->releaseOnDestruction = $release;
     return $this;
   }
 
@@ -436,6 +436,11 @@ public function awakenTasks() {
     return $this;
   }
 
+  public function getURI() {
+    $id = $this->getID();
+    return "/drydock/lease/{$id}/";
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php b/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
index 9038b3b6d7..dfd603fd12 100644
--- a/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
@@ -62,7 +62,7 @@ private function handleUpdate(DrydockRepositoryOperation $operation) {
         DrydockCommandInterface::INTERFACE_TYPE);
 
       // No matter what happens here, destroy the lease away once we're done.
-      $lease->releaseOnDestruction(true);
+      $lease->setReleaseOnDestruction(true);
 
       $operation->applyOperation($interface);
 

From 27c3793d4087a51e1da30e9d5fa28ebb8faf5e8a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 04:55:23 -0800
Subject: [PATCH 562/865] Give Drydock Leases more modern status treatment

Summary:
Depends on D19073. Ref T13073. Give leases a normal header tag and try to wrangle their status constants a bit.

Also, try to capture the "status class" pattern a bit. Since we target PHP 5.2.3 we can't use `static::` so the actual subclass is kind of a mess. Not exactly sure if I want to stick with this or not. We could consider targeting PHP 5.3.0 instead to get `static::` / late static binding.

Test Plan: Viewed leases and lease lists, saw better and more conventional status information.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19074
---
 src/__phutil_library_map__.php                |   4 +-
 .../drydock/constants/DrydockLeaseStatus.php  | 106 ++++++++++++++++--
 .../controller/DrydockLeaseViewController.php |  17 ++-
 .../drydock/storage/DrydockLease.php          |  83 +++++++-------
 .../drydock/view/DrydockLeaseListView.php     |  20 ++--
 .../status/PhabricatorObjectStatus.php        |  84 ++++++++++++++
 6 files changed, 242 insertions(+), 72 deletions(-)
 create mode 100644 src/infrastructure/status/PhabricatorObjectStatus.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1656d1f398..9a77727720 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3416,6 +3416,7 @@
     'PhabricatorObjectRelationshipSource' => 'applications/search/relationship/PhabricatorObjectRelationshipSource.php',
     'PhabricatorObjectRemarkupRule' => 'infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php',
     'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php',
+    'PhabricatorObjectStatus' => 'infrastructure/status/PhabricatorObjectStatus.php',
     'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php',
     'PhabricatorOldWorldContentSource' => 'infrastructure/contentsource/PhabricatorOldWorldContentSource.php',
     'PhabricatorOlderInlinesSetting' => 'applications/settings/setting/PhabricatorOlderInlinesSetting.php',
@@ -6290,7 +6291,7 @@
     'DrydockLeaseReleaseController' => 'DrydockLeaseController',
     'DrydockLeaseReleasedLogType' => 'DrydockLogType',
     'DrydockLeaseSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'DrydockLeaseStatus' => 'DrydockConstants',
+    'DrydockLeaseStatus' => 'PhabricatorObjectStatus',
     'DrydockLeaseUpdateWorker' => 'DrydockWorker',
     'DrydockLeaseViewController' => 'DrydockLeaseController',
     'DrydockLeaseWaitingForResourcesLogType' => 'DrydockLogType',
@@ -8994,6 +8995,7 @@
     'PhabricatorObjectRelationshipSource' => 'Phobject',
     'PhabricatorObjectRemarkupRule' => 'PhutilRemarkupRule',
     'PhabricatorObjectSelectorDialog' => 'Phobject',
+    'PhabricatorObjectStatus' => 'Phobject',
     'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery',
     'PhabricatorOldWorldContentSource' => 'PhabricatorContentSource',
     'PhabricatorOlderInlinesSetting' => 'PhabricatorSelectSetting',
diff --git a/src/applications/drydock/constants/DrydockLeaseStatus.php b/src/applications/drydock/constants/DrydockLeaseStatus.php
index f37e4ab9be..e5721e9d7a 100644
--- a/src/applications/drydock/constants/DrydockLeaseStatus.php
+++ b/src/applications/drydock/constants/DrydockLeaseStatus.php
@@ -1,6 +1,7 @@
 <?php
 
-final class DrydockLeaseStatus extends DrydockConstants {
+final class DrydockLeaseStatus
+  extends PhabricatorObjectStatus {
 
   const STATUS_PENDING = 'pending';
   const STATUS_ACQUIRED = 'acquired';
@@ -9,24 +10,105 @@ final class DrydockLeaseStatus extends DrydockConstants {
   const STATUS_BROKEN = 'broken';
   const STATUS_DESTROYED = 'destroyed';
 
+  public static function newStatusObject($key) {
+    return new self($key, id(new self())->getStatusSpecification($key));
+  }
+
   public static function getStatusMap() {
-    return array(
-      self::STATUS_PENDING => pht('Pending'),
-      self::STATUS_ACQUIRED => pht('Acquired'),
-      self::STATUS_ACTIVE => pht('Active'),
-      self::STATUS_RELEASED => pht('Released'),
-      self::STATUS_BROKEN => pht('Broken'),
-      self::STATUS_DESTROYED => pht('Destroyed'),
-    );
+    $map = id(new self())->getStatusSpecifications();
+    return ipull($map, 'name', 'key');
   }
 
   public static function getNameForStatus($status) {
-    $map = self::getStatusMap();
-    return idx($map, $status, pht('Unknown'));
+    $map = id(new self())->getStatusSpecification($status);
+    return $map['name'];
   }
 
   public static function getAllStatuses() {
-    return array_keys(self::getStatusMap());
+    return array_keys(id(new self())->getStatusSpecifications());
+  }
+
+  public function isActivating() {
+    return $this->getStatusProperty('isActivating');
+  }
+
+  public function isActive() {
+    return ($this->getKey() === self::STATUS_ACTIVE);
+  }
+
+  public function canRelease() {
+    return $this->getStatusProperty('isReleasable');
+  }
+
+  public function canReceiveCommands() {
+    return $this->getStatusProperty('isCommandable');
+  }
+
+  protected function newStatusSpecifications() {
+    return array(
+      array(
+        'key' => self::STATUS_PENDING,
+        'name' => pht('Pending'),
+        'icon' => 'fa-clock-o',
+        'color' => 'blue',
+        'isReleasable' => true,
+        'isCommandable' => true,
+        'isActivating' => true,
+      ),
+      array(
+        'key' => self::STATUS_ACQUIRED,
+        'name' => pht('Acquired'),
+        'icon' => 'fa-refresh',
+        'color' => 'blue',
+        'isReleasable' => true,
+        'isCommandable' => true,
+        'isActivating' => true,
+      ),
+      array(
+        'key' => self::STATUS_ACTIVE,
+        'name' => pht('Active'),
+        'icon' => 'fa-check',
+        'color' => 'green',
+        'isReleasable' => true,
+        'isCommandable' => true,
+        'isActivating' => false,
+      ),
+      array(
+        'key' => self::STATUS_RELEASED,
+        'name' => pht('Released'),
+        'icon' => 'fa-circle-o',
+        'color' => 'blue',
+        'isReleasable' => false,
+        'isCommandable' => false,
+        'isActivating' => false,
+      ),
+      array(
+        'key' => self::STATUS_BROKEN,
+        'name' => pht('Broken'),
+        'icon' => 'fa-times',
+        'color' => 'indigo',
+        'isReleasable' => true,
+        'isCommandable' => true,
+        'isActivating' => false,
+      ),
+      array(
+        'key' => self::STATUS_DESTROYED,
+        'name' => pht('Destroyed'),
+        'icon' => 'fa-times',
+        'color' => 'red',
+        'isReleasable' => false,
+        'isCommandable' => false,
+        'isActivating' => false,
+      ),
+    );
+  }
+
+  protected function newUnknownStatusSpecification($status) {
+    return array(
+      'isReleasable' => false,
+      'isCommandable' => false,
+      'isActivating' => false,
+    );
   }
 
 }
diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php
index 1583d28df2..91a911277f 100644
--- a/src/applications/drydock/controller/DrydockLeaseViewController.php
+++ b/src/applications/drydock/controller/DrydockLeaseViewController.php
@@ -22,10 +22,19 @@ public function handleRequest(AphrontRequest $request) {
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
-      ->setHeaderIcon('fa-link');
+      ->setHeaderIcon('fa-link')
+      ->setStatus(
+        $lease->getStatusIcon(),
+        $lease->getStatusColor(),
+        $lease->getStatusDisplayName());
 
     if ($lease->isReleasing()) {
-      $header->setStatus('fa-exclamation-triangle', 'red', pht('Releasing'));
+      $header->addTag(
+        id(new PHUITagView())
+          ->setType(PHUITagView::TYPE_SHADE)
+          ->setIcon('fa-exclamation-triangle')
+          ->setColor('red')
+          ->setName('Releasing'));
     }
 
     $curtain = $this->buildCurtain($lease);
@@ -118,10 +127,6 @@ private function buildPropertyListView(
 
     $view = new PHUIPropertyListView();
 
-    $view->addProperty(
-      pht('Status'),
-      DrydockLeaseStatus::getNameForStatus($lease->getStatus()));
-
     $view->addProperty(
       pht('Resource Type'),
       $lease->getResourceType());
diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
index e217223aa8..84c6a702af 100644
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -175,25 +175,6 @@ public function queueForActivation() {
     return $this;
   }
 
-  public function isActivating() {
-    switch ($this->getStatus()) {
-      case DrydockLeaseStatus::STATUS_PENDING:
-      case DrydockLeaseStatus::STATUS_ACQUIRED:
-        return true;
-    }
-
-    return false;
-  }
-
-  public function isActive() {
-    switch ($this->getStatus()) {
-      case DrydockLeaseStatus::STATUS_ACTIVE:
-        return true;
-    }
-
-    return false;
-  }
-
   public function setActivateWhenAcquired($activate) {
     $this->activateWhenAcquired = true;
     return $this;
@@ -325,30 +306,6 @@ public function isActivatedLease() {
     return $this->isActivated;
   }
 
-  public function canRelease() {
-    if (!$this->getID()) {
-      return false;
-    }
-
-    switch ($this->getStatus()) {
-      case DrydockLeaseStatus::STATUS_RELEASED:
-      case DrydockLeaseStatus::STATUS_DESTROYED:
-        return false;
-      default:
-        return true;
-    }
-  }
-
-  public function canReceiveCommands() {
-    switch ($this->getStatus()) {
-      case DrydockLeaseStatus::STATUS_RELEASED:
-      case DrydockLeaseStatus::STATUS_DESTROYED:
-        return false;
-      default:
-        return true;
-    }
-  }
-
   public function scheduleUpdate($epoch = null) {
     PhabricatorWorker::scheduleTask(
       'DrydockLeaseUpdateWorker',
@@ -442,6 +399,46 @@ public function getURI() {
   }
 
 
+/* -(  Status  )------------------------------------------------------------- */
+
+
+  public function getStatusObject() {
+    return DrydockLeaseStatus::newStatusObject($this->getStatus());
+  }
+
+  public function getStatusIcon() {
+    return $this->getStatusObject()->getIcon();
+  }
+
+  public function getStatusColor() {
+    return $this->getStatusObject()->getColor();
+  }
+
+  public function getStatusDisplayName() {
+    return $this->getStatusObject()->getDisplayName();
+  }
+
+  public function isActivating() {
+    return $this->getStatusObject()->isActivating();
+  }
+
+  public function isActive() {
+    return $this->getStatusObject()->isActive();
+  }
+
+  public function canRelease() {
+    if (!$this->getID()) {
+      return false;
+    }
+
+    return $this->getStatusObject()->canRelease();
+  }
+
+  public function canReceiveCommands() {
+    return $this->getStatusObject()->canReceiveCommands();
+  }
+
+
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
diff --git a/src/applications/drydock/view/DrydockLeaseListView.php b/src/applications/drydock/view/DrydockLeaseListView.php
index 8c161b00ce..fb11457e86 100644
--- a/src/applications/drydock/view/DrydockLeaseListView.php
+++ b/src/applications/drydock/view/DrydockLeaseListView.php
@@ -26,20 +26,20 @@ public function render() {
       if ($resource_phid) {
         $item->addAttribute(
           $viewer->renderHandle($resource_phid));
+      } else {
+        $item->addAttribute(
+          pht(
+            'Resource: %s',
+            $lease->getResourceType()));
       }
 
-      $status = DrydockLeaseStatus::getNameForStatus($lease->getStatus());
-      $item->addAttribute($status);
       $item->setEpoch($lease->getDateCreated());
 
-      // TODO: Tailor this for clarity.
-      if ($lease->isActivating()) {
-        $item->setStatusIcon('fa-dot-circle-o yellow');
-      } else if ($lease->isActive()) {
-        $item->setStatusIcon('fa-dot-circle-o green');
-      } else {
-        $item->setStatusIcon('fa-dot-circle-o red');
-      }
+      $icon = $lease->getStatusIcon();
+      $color = $lease->getStatusColor();
+      $label = $lease->getStatusDisplayName();
+
+      $item->setStatusIcon("{$icon} {$color}", $label);
 
       $view->addItem($item);
     }
diff --git a/src/infrastructure/status/PhabricatorObjectStatus.php b/src/infrastructure/status/PhabricatorObjectStatus.php
new file mode 100644
index 0000000000..27dec48dc9
--- /dev/null
+++ b/src/infrastructure/status/PhabricatorObjectStatus.php
@@ -0,0 +1,84 @@
+<?php
+
+abstract class PhabricatorObjectStatus
+  extends Phobject {
+
+  private $key;
+  private $properties;
+
+  protected function __construct($key = null, array $properties = array()) {
+    $this->key = $key;
+    $this->properties = $properties;
+  }
+
+  protected function getStatusProperty($key) {
+    if (!array_key_exists($key, $this->properties)) {
+      throw new Exception(
+        pht(
+          'Attempting to access unknown status property ("%s").',
+          $key));
+    }
+
+    return $this->properties[$key];
+  }
+
+  public function getKey() {
+    return $this->key;
+  }
+
+  public function getIcon() {
+    return $this->getStatusProperty('icon');
+  }
+
+  public function getDisplayName() {
+    return $this->getStatusProperty('name');
+  }
+
+  public function getColor() {
+    return $this->getStatusProperty('color');
+  }
+
+  protected function getStatusSpecification($status) {
+    $map = self::getStatusSpecifications();
+    if (isset($map[$status])) {
+      return $map[$status];
+    }
+
+    return array(
+      'key' => $status,
+      'name' => pht('Unknown ("%s")', $status),
+      'icon' => 'fa-question-circle',
+      'color' => 'indigo',
+    ) + $this->newUnknownStatusSpecification($status);
+  }
+
+  protected function getStatusSpecifications() {
+    $map = $this->newStatusSpecifications();
+
+    $result = array();
+    foreach ($map as $item) {
+      if (!array_key_exists('key', $item)) {
+        throw new Exception(pht('Status specification has no "key".'));
+      }
+
+      $key = $item['key'];
+      if (isset($result[$key])) {
+        throw new Exception(
+          pht(
+            'Multiple status definitions share the same key ("%s").',
+            $key));
+      }
+
+      $result[$key] = $item;
+    }
+
+    return $result;
+  }
+
+  abstract protected function newStatusSpecifications();
+
+  protected function newUnknownStatusSpecification($status) {
+    return array();
+  }
+
+}

From 06bbf237fe56e8ee6ee64cbba7dd31fd658f1147 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 05:31:29 -0800
Subject: [PATCH 563/865] Give Drydock Resources more modern status treatment

Summary: Ref T13073. Depends on D19074. Update icons and UI for resource status.

Test Plan: Viewed resources in detail view and list view, saw better status icons.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19075
---
 src/__phutil_library_map__.php                |  4 +-
 .../drydock/constants/DrydockConstants.php    |  3 -
 .../drydock/constants/DrydockLeaseStatus.php  |  2 +-
 .../constants/DrydockResourceStatus.php       | 86 ++++++++++++++++---
 .../DrydockResourceViewController.php         | 19 ++--
 .../drydock/storage/DrydockResource.php       | 62 ++++++-------
 .../drydock/view/DrydockResourceListView.php  | 22 ++---
 7 files changed, 125 insertions(+), 73 deletions(-)
 delete mode 100644 src/applications/drydock/constants/DrydockConstants.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 9a77727720..116aa31629 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1041,7 +1041,6 @@
     'DrydockCommandInterface' => 'applications/drydock/interface/command/DrydockCommandInterface.php',
     'DrydockCommandQuery' => 'applications/drydock/query/DrydockCommandQuery.php',
     'DrydockConsoleController' => 'applications/drydock/controller/DrydockConsoleController.php',
-    'DrydockConstants' => 'applications/drydock/constants/DrydockConstants.php',
     'DrydockController' => 'applications/drydock/controller/DrydockController.php',
     'DrydockCreateBlueprintsCapability' => 'applications/drydock/capability/DrydockCreateBlueprintsCapability.php',
     'DrydockDAO' => 'applications/drydock/storage/DrydockDAO.php',
@@ -6259,7 +6258,6 @@
     'DrydockCommandInterface' => 'DrydockInterface',
     'DrydockCommandQuery' => 'DrydockQuery',
     'DrydockConsoleController' => 'DrydockController',
-    'DrydockConstants' => 'Phobject',
     'DrydockController' => 'PhabricatorController',
     'DrydockCreateBlueprintsCapability' => 'PhabricatorPolicyCapability',
     'DrydockDAO' => 'PhabricatorLiskDAO',
@@ -6347,7 +6345,7 @@
     'DrydockResourceReclaimLogType' => 'DrydockLogType',
     'DrydockResourceReleaseController' => 'DrydockResourceController',
     'DrydockResourceSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'DrydockResourceStatus' => 'DrydockConstants',
+    'DrydockResourceStatus' => 'PhabricatorObjectStatus',
     'DrydockResourceUpdateWorker' => 'DrydockWorker',
     'DrydockResourceViewController' => 'DrydockResourceController',
     'DrydockSFTPFilesystemInterface' => 'DrydockFilesystemInterface',
diff --git a/src/applications/drydock/constants/DrydockConstants.php b/src/applications/drydock/constants/DrydockConstants.php
deleted file mode 100644
index 48d06329bf..0000000000
--- a/src/applications/drydock/constants/DrydockConstants.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-abstract class DrydockConstants extends Phobject {}
diff --git a/src/applications/drydock/constants/DrydockLeaseStatus.php b/src/applications/drydock/constants/DrydockLeaseStatus.php
index e5721e9d7a..360b0b0f96 100644
--- a/src/applications/drydock/constants/DrydockLeaseStatus.php
+++ b/src/applications/drydock/constants/DrydockLeaseStatus.php
@@ -95,7 +95,7 @@ protected function newStatusSpecifications() {
         'key' => self::STATUS_DESTROYED,
         'name' => pht('Destroyed'),
         'icon' => 'fa-times',
-        'color' => 'red',
+        'color' => 'grey',
         'isReleasable' => false,
         'isCommandable' => false,
         'isActivating' => false,
diff --git a/src/applications/drydock/constants/DrydockResourceStatus.php b/src/applications/drydock/constants/DrydockResourceStatus.php
index d8a860d6a0..197a220630 100644
--- a/src/applications/drydock/constants/DrydockResourceStatus.php
+++ b/src/applications/drydock/constants/DrydockResourceStatus.php
@@ -1,6 +1,7 @@
 <?php
 
-final class DrydockResourceStatus extends DrydockConstants {
+final class DrydockResourceStatus
+  extends PhabricatorObjectStatus {
 
   const STATUS_PENDING = 'pending';
   const STATUS_ACTIVE = 'active';
@@ -8,23 +9,86 @@ final class DrydockResourceStatus extends DrydockConstants {
   const STATUS_BROKEN = 'broken';
   const STATUS_DESTROYED = 'destroyed';
 
+  public static function newStatusObject($key) {
+    return new self($key, id(new self())->getStatusSpecification($key));
+  }
+
   public static function getStatusMap() {
-    return array(
-      self::STATUS_PENDING => pht('Pending'),
-      self::STATUS_ACTIVE => pht('Active'),
-      self::STATUS_RELEASED => pht('Released'),
-      self::STATUS_BROKEN => pht('Broken'),
-      self::STATUS_DESTROYED => pht('Destroyed'),
-    );
+    $map = id(new self())->getStatusSpecifications();
+    return ipull($map, 'name', 'key');
   }
 
   public static function getNameForStatus($status) {
-    $map = self::getStatusMap();
-    return idx($map, $status, pht('Unknown'));
+    $map = id(new self())->getStatusSpecification($status);
+    return $map['name'];
   }
 
   public static function getAllStatuses() {
-    return array_keys(self::getStatusMap());
+    return array_keys(id(new self())->getStatusSpecifications());
+  }
+
+  public function isActive() {
+    return ($this->getKey() === self::STATUS_ACTIVE);
+  }
+
+  public function canRelease() {
+    return $this->getStatusProperty('isReleasable');
+  }
+
+  public function canReceiveCommands() {
+    return $this->getStatusProperty('isCommandable');
+  }
+
+  protected function newStatusSpecifications() {
+    return array(
+      array(
+        'key' => self::STATUS_PENDING,
+        'name' => pht('Pending'),
+        'icon' => 'fa-clock-o',
+        'color' => 'blue',
+        'isReleasable' => true,
+        'isCommandable' => true,
+      ),
+      array(
+        'key' => self::STATUS_ACTIVE,
+        'name' => pht('Active'),
+        'icon' => 'fa-check',
+        'color' => 'green',
+        'isReleasable' => true,
+        'isCommandable' => true,
+      ),
+      array(
+        'key' => self::STATUS_RELEASED,
+        'name' => pht('Released'),
+        'icon' => 'fa-circle-o',
+        'color' => 'blue',
+        'isReleasable' => false,
+        'isCommandable' => false,
+      ),
+      array(
+        'key' => self::STATUS_BROKEN,
+        'name' => pht('Broken'),
+        'icon' => 'fa-times',
+        'color' => 'indigo',
+        'isReleasable' => true,
+        'isCommandable' => false,
+      ),
+      array(
+        'key' => self::STATUS_DESTROYED,
+        'name' => pht('Destroyed'),
+        'icon' => 'fa-times',
+        'color' => 'grey',
+        'isReleasable' => false,
+        'isCommandable' => false,
+      ),
+    );
+  }
+
+  protected function newUnknownStatusSpecification($status) {
+    return array(
+      'isReleasable' => false,
+      'isCommandable' => false,
+    );
   }
 
 }
diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php
index c6771007ba..8718caa9e2 100644
--- a/src/applications/drydock/controller/DrydockResourceViewController.php
+++ b/src/applications/drydock/controller/DrydockResourceViewController.php
@@ -24,10 +24,19 @@ public function handleRequest(AphrontRequest $request) {
       ->setUser($viewer)
       ->setPolicyObject($resource)
       ->setHeader($title)
-      ->setHeaderIcon('fa-map');
+      ->setHeaderIcon('fa-map')
+      ->setStatus(
+        $resource->getStatusIcon(),
+        $resource->getStatusColor(),
+        $resource->getStatusDisplayName());
 
     if ($resource->isReleasing()) {
-      $header->setStatus('fa-exclamation-triangle', 'red', pht('Releasing'));
+      $header->addTag(
+        id(new PHUITagView())
+          ->setType(PHUITagView::TYPE_SHADE)
+          ->setIcon('fa-exclamation-triangle')
+          ->setColor('red')
+          ->setName('Releasing'));
     }
 
     $curtain = $this->buildCurtain($resource);
@@ -127,12 +136,6 @@ private function buildPropertyListView(
     $viewer = $this->getViewer();
 
     $view = new PHUIPropertyListView();
-    $status = $resource->getStatus();
-    $status = DrydockResourceStatus::getNameForStatus($status);
-
-    $view->addProperty(
-      pht('Status'),
-      $status);
 
     $until = $resource->getUntil();
     if ($until) {
diff --git a/src/applications/drydock/storage/DrydockResource.php b/src/applications/drydock/storage/DrydockResource.php
index 3eceec8b77..8ec63cb097 100644
--- a/src/applications/drydock/storage/DrydockResource.php
+++ b/src/applications/drydock/storage/DrydockResource.php
@@ -235,16 +235,6 @@ public function isActivatedResource() {
     return $this->isActivated;
   }
 
-  public function canRelease() {
-    switch ($this->getStatus()) {
-      case DrydockResourceStatus::STATUS_RELEASED:
-      case DrydockResourceStatus::STATUS_DESTROYED:
-        return false;
-      default:
-        return true;
-    }
-  }
-
   public function scheduleUpdate($epoch = null) {
     PhabricatorWorker::scheduleTask(
       'DrydockResourceUpdateWorker',
@@ -282,26 +272,6 @@ private function didActivate() {
     }
   }
 
-  public function canReceiveCommands() {
-    switch ($this->getStatus()) {
-      case DrydockResourceStatus::STATUS_RELEASED:
-      case DrydockResourceStatus::STATUS_BROKEN:
-      case DrydockResourceStatus::STATUS_DESTROYED:
-        return false;
-      default:
-        return true;
-    }
-  }
-
-  public function isActive() {
-    switch ($this->getStatus()) {
-      case DrydockResourceStatus::STATUS_ACTIVE:
-        return true;
-    }
-
-    return false;
-  }
-
   public function logEvent($type, array $data = array()) {
     $log = id(new DrydockLog())
       ->setEpoch(PhabricatorTime::getNow())
@@ -315,6 +285,38 @@ public function logEvent($type, array $data = array()) {
   }
 
 
+/* -(  Status  )------------------------------------------------------------- */
+
+
+  public function getStatusObject() {
+    return DrydockResourceStatus::newStatusObject($this->getStatus());
+  }
+
+  public function getStatusIcon() {
+    return $this->getStatusObject()->getIcon();
+  }
+
+  public function getStatusColor() {
+    return $this->getStatusObject()->getColor();
+  }
+
+  public function getStatusDisplayName() {
+    return $this->getStatusObject()->getDisplayName();
+  }
+
+  public function canRelease() {
+    return $this->getStatusObject()->canRelease();
+  }
+
+  public function canReceiveCommands() {
+    return $this->getStatusObject()->canReceiveCommands();
+  }
+
+  public function isActive() {
+    return $this->getStatusObject()->isActive();
+  }
+
+
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
diff --git a/src/applications/drydock/view/DrydockResourceListView.php b/src/applications/drydock/view/DrydockResourceListView.php
index 739b464bdb..f2d105ecc8 100644
--- a/src/applications/drydock/view/DrydockResourceListView.php
+++ b/src/applications/drydock/view/DrydockResourceListView.php
@@ -23,23 +23,11 @@ public function render() {
         ->setObjectName(pht('Resource %d', $id))
         ->setHeader($resource->getResourceName());
 
-      $status = DrydockResourceStatus::getNameForStatus($resource->getStatus());
-      $item->addAttribute($status);
-
-      switch ($resource->getStatus()) {
-        case DrydockResourceStatus::STATUS_PENDING:
-          $item->setStatusIcon('fa-dot-circle-o yellow');
-          break;
-        case DrydockResourceStatus::STATUS_ACTIVE:
-          $item->setStatusIcon('fa-dot-circle-o green');
-          break;
-        case DrydockResourceStatus::STATUS_DESTROYED:
-          $item->setStatusIcon('fa-times-circle-o black');
-          break;
-        default:
-          $item->setStatusIcon('fa-dot-circle-o red');
-          break;
-      }
+      $icon = $resource->getStatusIcon();
+      $color = $resource->getStatusColor();
+      $label = $resource->getStatusDisplayName();
+
+      $item->setStatusIcon("{$icon} {$color}", $label);
 
       $view->addItem($item);
     }

From 30a0b103e6f26c289f13caed7f365250b82f41fb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 06:12:32 -0800
Subject: [PATCH 564/865] When a lease acquires a resource but the resource
 fails to activate, throw the lease back in the pool

Summary:
Depends on D19075. Ref T13073. If a lease acquires a resource but finds that the resource builds directly into a dead state (which can happen for any number of reasonable reasons), reset the lease and throw it back in the pool.

This isn't the lease's fault and it hasn't caused any side effects or done anything we can't undo, so we can safely reset it and throw it back in the pool.

Test Plan:
  - Created a blueprint which throws from `allocateResource()` so that resources never activate.
  - Tried to lease it with `bin/drydock lease ...`.
  - Before patch: lease was broken and destroyed after a failed activation.
  - After patch: lease was returned to the pool after a failed activation.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19076
---
 src/__phutil_library_map__.php                |  4 +++
 ...DrydockAcquiredBrokenResourceException.php |  4 +++
 .../logtype/DrydockLeaseReacquireLogType.php  | 26 ++++++++++++++++++
 .../worker/DrydockLeaseUpdateWorker.php       | 27 +++++++++++++++++--
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/drydock/exception/DrydockAcquiredBrokenResourceException.php
 create mode 100644 src/applications/drydock/logtype/DrydockLeaseReacquireLogType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 116aa31629..e26d68f72b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1000,6 +1000,7 @@
     'DoorkeeperSchemaSpec' => 'applications/doorkeeper/storage/DoorkeeperSchemaSpec.php',
     'DoorkeeperTagView' => 'applications/doorkeeper/view/DoorkeeperTagView.php',
     'DoorkeeperTagsController' => 'applications/doorkeeper/controller/DoorkeeperTagsController.php',
+    'DrydockAcquiredBrokenResourceException' => 'applications/drydock/exception/DrydockAcquiredBrokenResourceException.php',
     'DrydockAlmanacServiceHostBlueprintImplementation' => 'applications/drydock/blueprint/DrydockAlmanacServiceHostBlueprintImplementation.php',
     'DrydockApacheWebrootInterface' => 'applications/drydock/interface/webroot/DrydockApacheWebrootInterface.php',
     'DrydockAuthorization' => 'applications/drydock/storage/DrydockAuthorization.php',
@@ -1065,6 +1066,7 @@
     'DrydockLeasePHIDType' => 'applications/drydock/phid/DrydockLeasePHIDType.php',
     'DrydockLeaseQuery' => 'applications/drydock/query/DrydockLeaseQuery.php',
     'DrydockLeaseQueuedLogType' => 'applications/drydock/logtype/DrydockLeaseQueuedLogType.php',
+    'DrydockLeaseReacquireLogType' => 'applications/drydock/logtype/DrydockLeaseReacquireLogType.php',
     'DrydockLeaseReclaimLogType' => 'applications/drydock/logtype/DrydockLeaseReclaimLogType.php',
     'DrydockLeaseReleaseController' => 'applications/drydock/controller/DrydockLeaseReleaseController.php',
     'DrydockLeaseReleasedLogType' => 'applications/drydock/logtype/DrydockLeaseReleasedLogType.php',
@@ -6199,6 +6201,7 @@
     'DoorkeeperSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'DoorkeeperTagView' => 'AphrontView',
     'DoorkeeperTagsController' => 'PhabricatorController',
+    'DrydockAcquiredBrokenResourceException' => 'Exception',
     'DrydockAlmanacServiceHostBlueprintImplementation' => 'DrydockBlueprintImplementation',
     'DrydockApacheWebrootInterface' => 'DrydockWebrootInterface',
     'DrydockAuthorization' => array(
@@ -6285,6 +6288,7 @@
     'DrydockLeasePHIDType' => 'PhabricatorPHIDType',
     'DrydockLeaseQuery' => 'DrydockQuery',
     'DrydockLeaseQueuedLogType' => 'DrydockLogType',
+    'DrydockLeaseReacquireLogType' => 'DrydockLogType',
     'DrydockLeaseReclaimLogType' => 'DrydockLogType',
     'DrydockLeaseReleaseController' => 'DrydockLeaseController',
     'DrydockLeaseReleasedLogType' => 'DrydockLogType',
diff --git a/src/applications/drydock/exception/DrydockAcquiredBrokenResourceException.php b/src/applications/drydock/exception/DrydockAcquiredBrokenResourceException.php
new file mode 100644
index 0000000000..12b839d466
--- /dev/null
+++ b/src/applications/drydock/exception/DrydockAcquiredBrokenResourceException.php
@@ -0,0 +1,4 @@
+<?php
+
+final class DrydockAcquiredBrokenResourceException
+  extends Exception {}
diff --git a/src/applications/drydock/logtype/DrydockLeaseReacquireLogType.php b/src/applications/drydock/logtype/DrydockLeaseReacquireLogType.php
new file mode 100644
index 0000000000..13e759690c
--- /dev/null
+++ b/src/applications/drydock/logtype/DrydockLeaseReacquireLogType.php
@@ -0,0 +1,26 @@
+<?php
+
+final class DrydockLeaseReacquireLogType extends DrydockLogType {
+
+  const LOGCONST = 'core.lease.reacquire';
+
+  public function getLogTypeName() {
+    return pht('Reacquiring Resource');
+  }
+
+  public function getLogTypeIcon(array $data) {
+    return 'fa-refresh yellow';
+  }
+
+  public function renderLog(array $data) {
+    $class = idx($data, 'class');
+    $message = idx($data, 'message');
+
+    return pht(
+      'Lease acquired a resource but failed to activate; acquisition '.
+      'will be retried: [%s] %s',
+      $class,
+      $message);
+  }
+
+}
diff --git a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
index 08c69291b7..55d9136cef 100644
--- a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
@@ -43,6 +43,26 @@ protected function doWork() {
   private function handleUpdate(DrydockLease $lease) {
     try {
       $this->updateLease($lease);
+    } catch (DrydockAcquiredBrokenResourceException $ex) {
+      // If this lease acquired a resource but failed to activate, we don't
+      // need to break the lease. We can throw it back in the pool and let
+      // it take another shot at acquiring a new resource.
+
+      // Before we throw it back, release any locks the lease is holding.
+      DrydockSlotLock::releaseLocks($lease->getPHID());
+
+      $lease
+        ->setStatus(DrydockLeaseStatus::STATUS_PENDING)
+        ->save();
+
+      $lease->logEvent(
+        DrydockLeaseReacquireLogType::LOGCONST,
+        array(
+          'class' => get_class($ex),
+          'message' => $ex->getMessage(),
+        ));
+
+      $this->yieldLease($lease, $ex);
     } catch (Exception $ex) {
       if ($this->isTemporaryException($ex)) {
         $this->yieldLease($lease, $ex);
@@ -749,9 +769,12 @@ private function activateLease(DrydockLease $lease) {
     }
 
     if ($resource_status != DrydockResourceStatus::STATUS_ACTIVE) {
-      throw new Exception(
+      throw new DrydockAcquiredBrokenResourceException(
         pht(
-          'Trying to activate lease on a dead resource (in status "%s").',
+          'Trying to activate lease ("%s") on a resource ("%s") in '.
+          'the wrong status ("%s").',
+          $lease->getPHID(),
+          $resource->getPHID(),
           $resource_status));
     }
 

From 2994753d23334f08b9a3daa5b14baaebaaba220e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 09:32:30 -0800
Subject: [PATCH 565/865] Don't let `bin/drydock lease --attributes` overwrite
 blueprints

Summary:
Depends on D19076. Ref T13073. Blueprints are stored as an attribute and `setAttributes()` overwrites all attributes.

This is sorta junk but make it less obviously broken, at least.

Test Plan: Ran `bin/drydock lease --type working-copy --attributes x=y` without instantly getting a fatal about "no blueprint PHIDs".

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19077
---
 .../drydock/management/DrydockManagementLeaseWorkflow.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
index 3a27fe9045..8c3f682042 100644
--- a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
@@ -62,6 +62,10 @@ public function execute(PhutilArgumentParser $args) {
     $drydock_phid = id(new PhabricatorDrydockApplication())->getPHID();
     $lease->setAuthorizingPHID($drydock_phid);
 
+    if ($attributes) {
+      $lease->setAttributes($attributes);
+    }
+
     // TODO: This is not hugely scalable, although this is a debugging workflow
     // so maybe it's fine. Do we even need `bin/drydock lease` in the long run?
     $all_blueprints = id(new DrydockBlueprintQuery())
@@ -76,10 +80,6 @@ public function execute(PhutilArgumentParser $args) {
     }
     $lease->setAllowedBlueprintPHIDs($allowed_phids);
 
-    if ($attributes) {
-      $lease->setAttributes($attributes);
-    }
-
     if ($until) {
       $lease->setUntil($until);
     }

From 619943bea01c5e6ee31232bccd8da237eabdbd29 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 09:49:11 -0800
Subject: [PATCH 566/865] Reduce collision rate for concurrency-limiting slot
 locks

Summary:
Depends on D19077. Ref T13073. When we're using slot locks to enforce a limit (e.g., maximum of 5 simultaneous things) we currently load locks owned by the blueprint to identify which slots are likely to be free.

However, this isn't right: the blueprint doesn't own these locks. The resources do.

We still get the right behavior eventually, but we incorrectly identify that every slot lock is always free, so as the slots fill up we'll tend to guess wrong more and more often.

Instead, load the slot locks by name explicitly.

Test Plan: Implemented lock-based limiting on `HoaxBlueprint`, `var_dump()`'d the candidate locks, saw correct test state for locks. Acquired leases without releasing, got all of the slots filled without any slot lock collisions (previously, the last slot or two tended to collide a lot).

Subscribers: yelirekim, PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19078
---
 .../DrydockBlueprintImplementation.php        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
index a050a859e3..5acf63bf6b 100644
--- a/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockBlueprintImplementation.php
@@ -396,16 +396,20 @@ protected function getConcurrentResourceLimitSlotLock(
     }
 
     // For reasonable limits, actually check for an available slot.
-    $locks = DrydockSlotLock::loadLocks($blueprint_phid);
-    $locks = mpull($locks, null, 'getLockKey');
-
     $slots = range(0, $limit - 1);
     shuffle($slots);
 
+    $lock_names = array();
     foreach ($slots as $slot) {
-      $slot_lock = "allocator({$blueprint_phid}).limit({$slot})";
-      if (empty($locks[$slot_lock])) {
-        return $slot_lock;
+      $lock_names[] = "allocator({$blueprint_phid}).limit({$slot})";
+    }
+
+    $locks = DrydockSlotLock::loadHeldLocks($lock_names);
+    $locks = mpull($locks, null, 'getLockKey');
+
+    foreach ($lock_names as $lock_name) {
+      if (empty($locks[$lock_name])) {
+        return $lock_name;
       }
     }
 
@@ -414,7 +418,8 @@ protected function getConcurrentResourceLimitSlotLock(
     // lock will be free by the time we try to take it, but usually we'll just
     // fail to grab the lock, throw an appropriate lock exception, and get back
     // on the right path to retry later.
-    return $slot_lock;
+
+    return $lock_name;
   }
 
 

From a1baedbd9a08ca2d41b81eefeaf4b3a4d214ab8e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 10:46:14 -0800
Subject: [PATCH 567/865] Lock resources briefly while acquiring leases on them
 to prevent acquiring near-death resources

Summary:
Depends on D19078. Ref T13073. Currently, there is a narrow window where we can acquire a resource after a reclaim has started against it.

To prevent this, briefly lock resources before acquiring them and make sure they're still good. If a resource isn't good, throw the lease back in the pool.

Test Plan:
This is tricky. You need:

  - Hoax blueprint with limits and a rule where leases of a given "flavor" can only be satisfied by resources of the same flavor.
  - Reduce the 3-minute "wait before resources can be released" to 3 seconds.
  - Limit Hoaxes to 1.
  - Allocate one "cherry" flavored Hoax and release the lease.
  - Add a `sleep(15)` to `releaseResource()` in `DrydockResourceUpdateWorker`, after the `canReclaimResource()` check, with a `print`.

Now:

  - Run `bin/phd debug task` in two windows.
  - Run `bin/drydock lease --type host --attributes flavor=banana` in a third window.
  - This will start to reclaim the existing "cherry" resource. Once one of the `phd` windows prints the "RECLAIMING" message run `bin/drydock lease --type host --attributes flavor=cherry` in a fourth window.
  - Before patch: the "cherry" lease acquired immediately, then was released and destroyed moments later.
  - After patch: the "cherry" lease yields.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19080
---
 src/__phutil_library_map__.php                |  2 +
 .../DrydockResourceLockException.php          |  4 +
 .../drydock/storage/DrydockLease.php          | 79 +++++++++++++++----
 .../worker/DrydockLeaseUpdateWorker.php       | 26 ++++--
 4 files changed, 89 insertions(+), 22 deletions(-)
 create mode 100644 src/applications/drydock/exception/DrydockResourceLockException.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e26d68f72b..80c70fd98e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1113,6 +1113,7 @@
     'DrydockResourceDatasource' => 'applications/drydock/typeahead/DrydockResourceDatasource.php',
     'DrydockResourceListController' => 'applications/drydock/controller/DrydockResourceListController.php',
     'DrydockResourceListView' => 'applications/drydock/view/DrydockResourceListView.php',
+    'DrydockResourceLockException' => 'applications/drydock/exception/DrydockResourceLockException.php',
     'DrydockResourcePHIDType' => 'applications/drydock/phid/DrydockResourcePHIDType.php',
     'DrydockResourceQuery' => 'applications/drydock/query/DrydockResourceQuery.php',
     'DrydockResourceReclaimLogType' => 'applications/drydock/logtype/DrydockResourceReclaimLogType.php',
@@ -6344,6 +6345,7 @@
     'DrydockResourceDatasource' => 'PhabricatorTypeaheadDatasource',
     'DrydockResourceListController' => 'DrydockResourceController',
     'DrydockResourceListView' => 'AphrontView',
+    'DrydockResourceLockException' => 'Exception',
     'DrydockResourcePHIDType' => 'PhabricatorPHIDType',
     'DrydockResourceQuery' => 'DrydockQuery',
     'DrydockResourceReclaimLogType' => 'DrydockLogType',
diff --git a/src/applications/drydock/exception/DrydockResourceLockException.php b/src/applications/drydock/exception/DrydockResourceLockException.php
new file mode 100644
index 0000000000..2b54538e08
--- /dev/null
+++ b/src/applications/drydock/exception/DrydockResourceLockException.php
@@ -0,0 +1,4 @@
+<?php
+
+final class DrydockResourceLockException
+  extends Exception {}
diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
index 84c6a702af..4cee7a5f17 100644
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -213,30 +213,75 @@ public function acquireOnResource(DrydockResource $resource) {
       }
     }
 
-    $this->openTransaction();
+    // Before we associate the lease with the resource, we lock the resource
+    // and reload it to make sure it is still pending or active. If we don't
+    // do this, the resource may have just been reclaimed. (Once we acquire
+    // the resource that stops it from being released, so we're nearly safe.)
+
+    $resource_phid = $resource->getPHID();
+    $hash = PhabricatorHash::digestForIndex($resource_phid);
+    $lock_key = 'drydock.resource:'.$hash;
+    $lock = PhabricatorGlobalLock::newLock($lock_key);
 
     try {
-      DrydockSlotLock::acquireLocks($this->getPHID(), $this->slotLocks);
-      $this->slotLocks = array();
-    } catch (DrydockSlotLockException $ex) {
-      $this->killTransaction();
+      $lock->lock(15);
+    } catch (Exception $ex) {
+      throw new DrydockResourceLockException(
+        pht(
+          'Failed to acquire lock for resource ("%s") while trying to '.
+          'acquire lease ("%s").',
+          $resource->getPHID(),
+          $this->getPHID()));
+    }
 
-      $this->logEvent(
-        DrydockSlotLockFailureLogType::LOGCONST,
-        array(
-          'locks' => $ex->getLockMap(),
-        ));
+    $resource->reload();
 
-      throw $ex;
+    if (($resource->getStatus() !== DrydockResourceStatus::STATUS_ACTIVE) &&
+        ($resource->getStatus() !== DrydockResourceStatus::STATUS_PENDING)) {
+      throw new DrydockAcquiredBrokenResourceException(
+        pht(
+          'Trying to acquire lease ("%s") on a resource ("%s") in the '.
+          'wrong status ("%s").',
+          $this->getPHID(),
+          $resource->getPHID(),
+          $resource->getStatus()));
     }
 
-    $this
-      ->setResourcePHID($resource->getPHID())
-      ->attachResource($resource)
-      ->setStatus($new_status)
-      ->save();
+    $caught = null;
+    try {
+      $this->openTransaction();
 
-    $this->saveTransaction();
+      try {
+        DrydockSlotLock::acquireLocks($this->getPHID(), $this->slotLocks);
+        $this->slotLocks = array();
+      } catch (DrydockSlotLockException $ex) {
+        $this->killTransaction();
+
+        $this->logEvent(
+          DrydockSlotLockFailureLogType::LOGCONST,
+          array(
+            'locks' => $ex->getLockMap(),
+          ));
+
+        throw $ex;
+      }
+
+      $this
+        ->setResourcePHID($resource->getPHID())
+        ->attachResource($resource)
+        ->setStatus($new_status)
+        ->save();
+
+      $this->saveTransaction();
+    } catch (Exception $ex) {
+      $caught = $ex;
+    }
+
+    $lock->unlock();
+
+    if ($caught) {
+      throw $caught;
+    }
 
     $this->isAcquired = true;
 
diff --git a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
index 55d9136cef..4a0cba8de2 100644
--- a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
@@ -53,6 +53,7 @@ private function handleUpdate(DrydockLease $lease) {
 
       $lease
         ->setStatus(DrydockLeaseStatus::STATUS_PENDING)
+        ->setResourcePHID(null)
         ->save();
 
       $lease->logEvent(
@@ -301,23 +302,38 @@ private function executeAllocator(DrydockLease $lease) {
     $resources = $this->rankResources($resources, $lease);
 
     $exceptions = array();
+    $yields = array();
     $allocated = false;
     foreach ($resources as $resource) {
       try {
         $this->acquireLease($resource, $lease);
         $allocated = true;
         break;
+      } catch (DrydockResourceLockException $ex) {
+        // We need to lock the resource to actually acquire it. If we aren't
+        // able to acquire the lock quickly enough, we can yield and try again
+        // later.
+        $yields[] = $ex;
+      } catch (DrydockAcquiredBrokenResourceException $ex) {
+        // If a resource was reclaimed or destroyed by the time we actually
+        // got around to acquiring it, we just got unlucky. We can yield and
+        // try again later.
+        $yields[] = $ex;
       } catch (Exception $ex) {
         $exceptions[] = $ex;
       }
     }
 
     if (!$allocated) {
-      throw new PhutilAggregateException(
-        pht(
-          'Unable to acquire lease "%s" on any resource.',
-          $lease->getPHID()),
-        $exceptions);
+      if ($yields) {
+        throw new PhabricatorWorkerYieldException(15);
+      } else {
+        throw new PhutilAggregateException(
+          pht(
+            'Unable to acquire lease "%s" on any resource.',
+            $lease->getPHID()),
+          $exceptions);
+      }
     }
   }
 

From 743f0d65eaec434689dc509e08a6cc254e7e214e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 17:53:36 -0800
Subject: [PATCH 568/865] Fix a mail stamp issue with blocking reviewers

Summary: Revisions with blocking reviewers had this stamp built incorrectly, which cascaded into trying to use `array()` as a PHID. Recover so these tasks succeed.

Test Plan: Will deploy production.

Differential Revision: https://secure.phabricator.com/D19082
---
 .../engineextension/DifferentialMailEngineExtension.php  | 2 +-
 .../metamta/stamp/PhabricatorPHIDMailStamp.php           | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/engineextension/DifferentialMailEngineExtension.php b/src/applications/differential/engineextension/DifferentialMailEngineExtension.php
index 24aa9fb329..29019b9e73 100644
--- a/src/applications/differential/engineextension/DifferentialMailEngineExtension.php
+++ b/src/applications/differential/engineextension/DifferentialMailEngineExtension.php
@@ -53,7 +53,7 @@ public function newMailStamps($object, array $xactions) {
       } else {
         $reviewers[] = $reviewer_phid;
         if ($reviewer->isBlocking()) {
-          $reviewers[] = $blocking;
+          $blocking[] = $reviewer_phid;
         }
       }
     }
diff --git a/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php b/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
index 575ad16f6a..ea7233fe5b 100644
--- a/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
+++ b/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
@@ -15,6 +15,15 @@ public function renderStamps($value) {
       return null;
     }
 
+    // TODO: This recovers from a bug where blocking reviewers were serialized
+    // incorrectly into the flat mail stamp list in the worker queue as arrays.
+    // It can be removed some time after February 2018.
+    foreach ($value as $key => $v) {
+      if (is_array($v)) {
+        unset($value[$key]);
+      }
+    }
+
     $viewer = $this->getViewer();
     $handles = $viewer->loadHandles($value);
 

From 708acce9275ac95a579868ca61dd2a66766019c3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Feb 2018 17:53:36 -0800
Subject: [PATCH 569/865] (stable) Fix a mail stamp issue with blocking
 reviewers

Summary: Revisions with blocking reviewers had this stamp built incorrectly, which cascaded into trying to use `array()` as a PHID. Recover so these tasks succeed.

Test Plan: Will deploy production.

Differential Revision: https://secure.phabricator.com/D19082
---
 .../engineextension/DifferentialMailEngineExtension.php  | 2 +-
 .../metamta/stamp/PhabricatorPHIDMailStamp.php           | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/engineextension/DifferentialMailEngineExtension.php b/src/applications/differential/engineextension/DifferentialMailEngineExtension.php
index 24aa9fb329..29019b9e73 100644
--- a/src/applications/differential/engineextension/DifferentialMailEngineExtension.php
+++ b/src/applications/differential/engineextension/DifferentialMailEngineExtension.php
@@ -53,7 +53,7 @@ public function newMailStamps($object, array $xactions) {
       } else {
         $reviewers[] = $reviewer_phid;
         if ($reviewer->isBlocking()) {
-          $reviewers[] = $blocking;
+          $blocking[] = $reviewer_phid;
         }
       }
     }
diff --git a/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php b/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
index 575ad16f6a..ea7233fe5b 100644
--- a/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
+++ b/src/applications/metamta/stamp/PhabricatorPHIDMailStamp.php
@@ -15,6 +15,15 @@ public function renderStamps($value) {
       return null;
     }
 
+    // TODO: This recovers from a bug where blocking reviewers were serialized
+    // incorrectly into the flat mail stamp list in the worker queue as arrays.
+    // It can be removed some time after February 2018.
+    foreach ($value as $key => $v) {
+      if (is_array($v)) {
+        unset($value[$key]);
+      }
+    }
+
     $viewer = $this->getViewer();
     $handles = $viewer->loadHandles($value);
 

From 6bfd0ff275c16a402196f40d0ab58da6a6b1d6a2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 10:49:27 -0800
Subject: [PATCH 570/865] Support "encoding", which is required by
 PHPMailerLite, in SES adapter

Summary: See <https://discourse.phabricator-community.org/t/amazon-ses-adapator-broken-after-upgrade/1121>. The adapter class tree is a mess and this property is read by the parent class.

Test Plan: Configured an SES mailer, used `bin/mail send-test` to reproduce the issue before the patch and observe it working after the patch.

Differential Revision: https://secure.phabricator.com/D19083
---
 .../adapter/PhabricatorMailImplementationAmazonSESAdapter.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
index 22cc102262..a26b074df9 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
@@ -26,6 +26,7 @@ protected function validateOptions(array $options) {
         'access-key' => 'string',
         'secret-key' => 'string',
         'endpoint' => 'string',
+        'encoding' => 'string',
       ));
   }
 
@@ -34,6 +35,7 @@ public function newDefaultOptions() {
       'access-key' => null,
       'secret-key' => null,
       'endpoint' => null,
+      'encoding' => 'base64',
     );
   }
 
@@ -42,6 +44,7 @@ public function newLegacyOptions() {
       'access-key' => PhabricatorEnv::getEnvConfig('amazon-ses.access-key'),
       'secret-key' => PhabricatorEnv::getEnvConfig('amazon-ses.secret-key'),
       'endpoint' => PhabricatorEnv::getEnvConfig('amazon-ses.endpoint'),
+      'encoding' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding'),
     );
   }
 

From 6dd4d870cac2a468b41b22951725b58e227fc23b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 10:49:27 -0800
Subject: [PATCH 571/865] (stable) Support "encoding", which is required by
 PHPMailerLite, in SES adapter

Summary: See <https://discourse.phabricator-community.org/t/amazon-ses-adapator-broken-after-upgrade/1121>. The adapter class tree is a mess and this property is read by the parent class.

Test Plan: Configured an SES mailer, used `bin/mail send-test` to reproduce the issue before the patch and observe it working after the patch.

Differential Revision: https://secure.phabricator.com/D19083
---
 .../adapter/PhabricatorMailImplementationAmazonSESAdapter.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
index 22cc102262..a26b074df9 100644
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
@@ -26,6 +26,7 @@ protected function validateOptions(array $options) {
         'access-key' => 'string',
         'secret-key' => 'string',
         'endpoint' => 'string',
+        'encoding' => 'string',
       ));
   }
 
@@ -34,6 +35,7 @@ public function newDefaultOptions() {
       'access-key' => null,
       'secret-key' => null,
       'endpoint' => null,
+      'encoding' => 'base64',
     );
   }
 
@@ -42,6 +44,7 @@ public function newLegacyOptions() {
       'access-key' => PhabricatorEnv::getEnvConfig('amazon-ses.access-key'),
       'secret-key' => PhabricatorEnv::getEnvConfig('amazon-ses.secret-key'),
       'endpoint' => PhabricatorEnv::getEnvConfig('amazon-ses.endpoint'),
+      'encoding' => PhabricatorEnv::getEnvConfig('phpmailer.smtp-encoding'),
     );
   }
 

From a2453706abf1f3b60a679f427fbff612c84aeeaf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 11:09:57 -0800
Subject: [PATCH 572/865] When "phabricator.silent" is enabled, don't call
 webhooks

Summary: Ref T13078. The `phabricator.silent` configuration flag should disable webhook calls, since this is consistent with the documented and desired behavior.

Test Plan: Enabled `phabricator.silent`, made test hook calls, saw them fail with a "silent" failure reason.

Maniphest Tasks: T13078

Differential Revision: https://secure.phabricator.com/D19084
---
 src/applications/herald/worker/HeraldWebhookWorker.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/applications/herald/worker/HeraldWebhookWorker.php b/src/applications/herald/worker/HeraldWebhookWorker.php
index 837ec0bb23..150f98fd50 100644
--- a/src/applications/herald/worker/HeraldWebhookWorker.php
+++ b/src/applications/herald/worker/HeraldWebhookWorker.php
@@ -32,6 +32,13 @@ protected function doWork() {
           $status));
     }
 
+    // If we're in silent mode, permanently fail the webhook request and then
+    // return to complete this task.
+    if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
+      $this->failRequest($request, 'hook', 'silent');
+      return;
+    }
+
     $hook = $request->getWebhook();
 
     if ($hook->isDisabled()) {

From f74e6bbf8d70e957cebb2a47f30f9e3c9c301338 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 11:30:25 -0800
Subject: [PATCH 573/865] Make "phabricator.silent" disable build steps which
 rely on external services

Summary:
Depends on D19084. Fixes T13078. When `phabricator.silent` is enabled, immediately fail the "HTTP Request", "CircleCI" and "Buildkite" build steps.

This doesn't feel quite as clean as most of the other behavior of `phabricator.silent`, since these calls are not exactly notifications in the same way that email is, and failing to make these calls means that builds run differently (whereas failing to deliver email doesn't really do anything).

However, I suspect that this behavior is almost always reasonable/correct, and that we can probably get away with it until this grey area between "notifications" and "external service calls" is more clearly defined.

Test Plan:
  - Created a build with HTTP, CircleCI, and Buildkite steps.
  - Put install in `phabricator.silent` mode: all three steps failed with "declining, because silent" messages.
  - Put install back in normal mode: all three steps made HTTP requests.
  - Read updated documentation.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13078

Differential Revision: https://secure.phabricator.com/D19085
---
 .../option/PhabricatorCoreConfigOptions.php   | 34 +++++++++++--------
 .../HarbormasterBuildStepImplementation.php   | 12 +++++++
 ...masterBuildkiteBuildStepImplementation.php |  5 +++
 ...rmasterCircleCIBuildStepImplementation.php |  5 +++
 ...sterHTTPRequestBuildStepImplementation.php |  6 ++++
 5 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
index 6efd27d9a3..0c9e69ebf2 100644
--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -37,6 +37,24 @@ public function getOptions() {
     $proto_doc_name = pht('User Guide: Prototype Applications');
     $applications_app_href = '/applications/';
 
+    $silent_description = $this->deformat(pht(<<<EOREMARKUP
+This option allows you to stop Phabricator from sending data to most external
+services: it will disable email, SMS, repository mirroring, remote builds,
+Doorkeeper writes, and webhooks.
+
+This option is intended to allow a Phabricator instance to be exported, copied,
+imported, and run in a test environment without impacting users. For example,
+if you are migrating to new hardware, you could perform a test migration first
+with this flag set, make sure things work, and then do a production cutover
+later with higher confidence and less disruption.
+
+Without making use of this flag to silence the temporary test environment,
+users would receive duplicate email during the time the test instance and old
+production instance were both in operation.
+EOREMARKUP
+      ));
+
+
     return array(
       $this->newOption('phabricator.base-uri', 'string', null)
         ->setLocked(true)
@@ -232,21 +250,7 @@ public function getOptions() {
             pht('Run Normally'),
           ))
         ->setSummary(pht('Stop Phabricator from sending any email, etc.'))
-        ->setDescription(
-          pht(
-            'This option allows you to stop Phabricator from sending '.
-            'any data to external services. Among other things, it will '.
-            'disable email, SMS, repository mirroring, and HTTP hooks.'.
-            "\n\n".
-            'This option is intended to allow a Phabricator instance to '.
-            'be exported, copied, imported, and run in a test environment '.
-            'without impacting users. For example, if you are migrating '.
-            'to new hardware, you could perform a test migration first, '.
-            'make sure things work, and then do a production cutover '.
-            'later with higher confidence and less disruption. Without '.
-            'this flag, users would receive duplicate email during the '.
-            'time the test instance and old production instance were '.
-            'both in operation.')),
+        ->setDescription($silent_description),
       );
 
   }
diff --git a/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
index ca6f30bd36..47af992630 100644
--- a/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
@@ -295,6 +295,18 @@ protected function logHTTPResponse(
       ->append($body);
   }
 
+  protected function logSilencedCall(
+    HarbormasterBuild $build,
+    HarbormasterBuildTarget $build_target,
+    $label) {
+
+    $build_target
+      ->newLog($label, 'silenced')
+      ->append(
+        pht(
+          'Declining to make service call because `phabricator.silent` is '.
+          'enabled in configuration.'));
+  }
 
 
 /* -(  Automatic Targets  )-------------------------------------------------- */
diff --git a/src/applications/harbormaster/step/HarbormasterBuildkiteBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterBuildkiteBuildStepImplementation.php
index 3ecd6553da..89d4002eef 100644
--- a/src/applications/harbormaster/step/HarbormasterBuildkiteBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterBuildkiteBuildStepImplementation.php
@@ -72,6 +72,11 @@ public function execute(
     HarbormasterBuildTarget $build_target) {
     $viewer = PhabricatorUser::getOmnipotentUser();
 
+    if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
+      $this->logSilencedCall($build, $build_target, pht('Buildkite'));
+      throw new HarbormasterBuildFailureException();
+    }
+
     $buildable = $build->getBuildable();
 
     $object = $buildable->getBuildableObject();
diff --git a/src/applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php
index e74e25a395..f0104779ff 100644
--- a/src/applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterCircleCIBuildStepImplementation.php
@@ -84,6 +84,11 @@ public function execute(
     HarbormasterBuildTarget $build_target) {
     $viewer = PhabricatorUser::getOmnipotentUser();
 
+    if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
+      $this->logSilencedCall($build, $build_target, pht('CircleCI'));
+      throw new HarbormasterBuildFailureException();
+    }
+
     $buildable = $build->getBuildable();
 
     $object = $buildable->getBuildableObject();
diff --git a/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
index 016f29642e..59866d3b73 100644
--- a/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php
@@ -43,6 +43,12 @@ public function execute(
     HarbormasterBuildTarget $build_target) {
 
     $viewer = PhabricatorUser::getOmnipotentUser();
+
+    if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
+      $this->logSilencedCall($build, $build_target, pht('HTTP Request'));
+      throw new HarbormasterBuildFailureException();
+    }
+
     $settings = $this->getSettings();
     $variables = $build_target->getVariables();
 

From a4053bb5808edda949d134f7fdca637f35510f7a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 15:18:10 -0800
Subject: [PATCH 574/865] When a ChangesetList sleeps after a Quicksand
 navigation, also hide any visible banner

Summary: Fixes T13080. The banner wasn't properly included in the sleep/wake logic.

Test Plan:
Mentioned `Dxxx` on a task. Enabled persistent chat to activate Quicksand. Reloaded page. Clicked `Dxxx`. Scrolled down until a changeset header appeared. Pressed back button.

  - Before patch: ended up on task, with header still around.
  - After patch: ended up on task, with header properly vanquished.

Pressed "forward", ended up back on the revision with the header again.

Maniphest Tasks: T13080

Differential Revision: https://secure.phabricator.com/D19086
---
 resources/celerity/map.php                       | 14 +++++++-------
 .../js/application/diff/DiffChangesetList.js     | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f3ead4de53..a08f04658e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
     'core.pkg.js' => '3ac6e174',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
-    'differential.pkg.js' => '5d53d5ce',
+    'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'favicon.ico' => '30672e08',
@@ -396,7 +396,7 @@
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
     'rsrc/js/application/diff/DiffChangeset.js' => 'b49b59d6',
-    'rsrc/js/application/diff/DiffChangesetList.js' => '1f2e5265',
+    'rsrc/js/application/diff/DiffChangesetList.js' => 'e74b7517',
     'rsrc/js/application/diff/DiffInline.js' => 'e83d28f3',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
@@ -776,7 +776,7 @@
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'b49b59d6',
-    'phabricator-diff-changeset-list' => '1f2e5265',
+    'phabricator-diff-changeset-list' => 'e74b7517',
     'phabricator-diff-inline' => 'e83d28f3',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
@@ -1044,10 +1044,6 @@
       'javelin-uri',
       'javelin-routable',
     ),
-    '1f2e5265' => array(
-      'javelin-install',
-      'phuix-button-view',
-    ),
     '1f6794f6' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2093,6 +2089,10 @@
       'javelin-workflow',
       'javelin-magical-init',
     ),
+    'e74b7517' => array(
+      'javelin-install',
+      'phuix-button-view',
+    ),
     'e83d28f3' => array(
       'javelin-dom',
     ),
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index e62d2f51dd..5eba051d93 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -128,6 +128,9 @@ JX.install('DiffChangesetList', {
       this._redrawFocus();
       this._redrawSelection();
       this.resetHover();
+
+      this._bannerChangeset = null;
+      this._redrawBanner();
     },
 
     wake: function() {
@@ -136,6 +139,9 @@ JX.install('DiffChangesetList', {
       this._redrawFocus();
       this._redrawSelection();
 
+      this._bannerChangeset = null;
+      this._redrawBanner();
+
       if (this._initialized) {
         return;
       }
@@ -1374,6 +1380,11 @@ JX.install('DiffChangesetList', {
       var node = this._getBannerNode();
       var changeset = this._getVisibleChangeset();
 
+      if (!changeset) {
+        JX.DOM.remove(node);
+        return;
+      }
+
       // Don't do anything if nothing has changed. This seems to avoid some
       // flickering issues in Safari, at least.
       if (this._bannerChangeset === changeset) {
@@ -1381,11 +1392,6 @@ JX.install('DiffChangesetList', {
       }
       this._bannerChangeset = changeset;
 
-      if (!changeset) {
-        JX.DOM.remove(node);
-        return;
-      }
-
       var inlines = this._getInlinesByType();
 
       var unsaved = inlines.unsaved;

From abe5fd57b0de311519572a52a79546117835f4a5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 15:33:19 -0800
Subject: [PATCH 575/865] Rename "QuickSearch" Engine/EngineExtension to
 "Datasource"

Summary: Ref T13079. This recently-introduced Engine/EngineExtension are a good fit for adding more datasource functions in general, but we didn't think quite big enough in naming them.

Test Plan: Used quick search typeahead, hit applications/users/monograms/symbols/etc.

Maniphest Tasks: T13079

Differential Revision: https://secure.phabricator.com/D19087
---
 src/__phutil_library_map__.php                | 28 ++++++++++---------
 ...=> DiffusionDatasourceEngineExtension.php} |  4 +--
 ...rDatasourceApplicationEngineExtension.php} |  4 +--
 ...icatorPeopleDatasourceEngineExtension.php} |  4 +--
 ...p => ProjectDatasourceEngineExtension.php} |  4 +--
 .../engine/PhabricatorDatasourceEngine.php    |  8 ++++++
 .../engine/PhabricatorQuickSearchEngine.php   |  8 ------
 .../PhabricatorDatasourceEngineExtension.php  | 19 +++++++++++++
 .../PhabricatorQuickSearchEngineExtension.php | 20 +++----------
 .../typeahead/PhabricatorSearchDatasource.php |  4 +--
 ...atorMonogramDatasourceEngineExtension.php} |  4 +--
 11 files changed, 58 insertions(+), 49 deletions(-)
 rename src/applications/diffusion/engineextension/{DiffusionQuickSearchEngineExtension.php => DiffusionDatasourceEngineExtension.php} (63%)
 rename src/applications/meta/engineextension/{PhabricatorQuickSearchApplicationEngineExtension.php => PhabricatorDatasourceApplicationEngineExtension.php} (54%)
 rename src/applications/people/engineextension/{PhabricatorPeopleQuickSearchEngineExtension.php => PhabricatorPeopleDatasourceEngineExtension.php} (54%)
 rename src/applications/project/engineextension/{ProjectQuickSearchEngineExtension.php => ProjectDatasourceEngineExtension.php} (57%)
 create mode 100644 src/applications/search/engine/PhabricatorDatasourceEngine.php
 delete mode 100644 src/applications/search/engine/PhabricatorQuickSearchEngine.php
 create mode 100644 src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
 rename src/applications/typeahead/engineextension/{PhabricatorMonogramQuickSearchEngineExtension.php => PhabricatorMonogramDatasourceEngineExtension.php} (56%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 80c70fd98e..771658e32e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -716,6 +716,7 @@
     'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php',
     'DiffusionCreateRepositoriesCapability' => 'applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php',
     'DiffusionDaemonLockException' => 'applications/diffusion/exception/DiffusionDaemonLockException.php',
+    'DiffusionDatasourceEngineExtension' => 'applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php',
     'DiffusionDefaultEditCapability' => 'applications/diffusion/capability/DiffusionDefaultEditCapability.php',
     'DiffusionDefaultPushCapability' => 'applications/diffusion/capability/DiffusionDefaultPushCapability.php',
     'DiffusionDefaultViewCapability' => 'applications/diffusion/capability/DiffusionDefaultViewCapability.php',
@@ -844,7 +845,6 @@
     'DiffusionQueryCommitsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php',
     'DiffusionQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php',
     'DiffusionQueryPathsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php',
-    'DiffusionQuickSearchEngineExtension' => 'applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php',
     'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php',
     'DiffusionRawDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRawDiffQueryConduitAPIMethod.php',
     'DiffusionReadmeView' => 'applications/diffusion/view/DiffusionReadmeView.php',
@@ -2745,8 +2745,11 @@
     'PhabricatorDatabaseRef' => 'infrastructure/cluster/PhabricatorDatabaseRef.php',
     'PhabricatorDatabaseRefParser' => 'infrastructure/cluster/PhabricatorDatabaseRefParser.php',
     'PhabricatorDatabaseSetupCheck' => 'applications/config/check/PhabricatorDatabaseSetupCheck.php',
+    'PhabricatorDatasourceApplicationEngineExtension' => 'applications/meta/engineextension/PhabricatorDatasourceApplicationEngineExtension.php',
     'PhabricatorDatasourceEditField' => 'applications/transactions/editfield/PhabricatorDatasourceEditField.php',
     'PhabricatorDatasourceEditType' => 'applications/transactions/edittype/PhabricatorDatasourceEditType.php',
+    'PhabricatorDatasourceEngine' => 'applications/search/engine/PhabricatorDatasourceEngine.php',
+    'PhabricatorDatasourceEngineExtension' => 'applications/search/engineextension/PhabricatorDatasourceEngineExtension.php',
     'PhabricatorDateFormatSetting' => 'applications/settings/setting/PhabricatorDateFormatSetting.php',
     'PhabricatorDateTimeSettingsPanel' => 'applications/settings/panel/PhabricatorDateTimeSettingsPanel.php',
     'PhabricatorDebugController' => 'applications/system/controller/PhabricatorDebugController.php',
@@ -3316,7 +3319,7 @@
     'PhabricatorMetronomicTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorMetronomicTriggerClock.php',
     'PhabricatorModularTransaction' => 'applications/transactions/storage/PhabricatorModularTransaction.php',
     'PhabricatorModularTransactionType' => 'applications/transactions/storage/PhabricatorModularTransactionType.php',
-    'PhabricatorMonogramQuickSearchEngineExtension' => 'applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php',
+    'PhabricatorMonogramDatasourceEngineExtension' => 'applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php',
     'PhabricatorMonospacedFontSetting' => 'applications/settings/setting/PhabricatorMonospacedFontSetting.php',
     'PhabricatorMonospacedTextareasSetting' => 'applications/settings/setting/PhabricatorMonospacedTextareasSetting.php',
     'PhabricatorMotivatorProfileMenuItem' => 'applications/search/menuitem/PhabricatorMotivatorProfileMenuItem.php',
@@ -3615,6 +3618,7 @@
     'PhabricatorPeopleCreateController' => 'applications/people/controller/PhabricatorPeopleCreateController.php',
     'PhabricatorPeopleCreateGuidanceContext' => 'applications/people/guidance/PhabricatorPeopleCreateGuidanceContext.php',
     'PhabricatorPeopleDatasource' => 'applications/people/typeahead/PhabricatorPeopleDatasource.php',
+    'PhabricatorPeopleDatasourceEngineExtension' => 'applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php',
     'PhabricatorPeopleDeleteController' => 'applications/people/controller/PhabricatorPeopleDeleteController.php',
     'PhabricatorPeopleDetailsProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleDetailsProfileMenuItem.php',
     'PhabricatorPeopleDisableController' => 'applications/people/controller/PhabricatorPeopleDisableController.php',
@@ -3647,7 +3651,6 @@
     'PhabricatorPeopleProfileTasksController' => 'applications/people/controller/PhabricatorPeopleProfileTasksController.php',
     'PhabricatorPeopleProfileViewController' => 'applications/people/controller/PhabricatorPeopleProfileViewController.php',
     'PhabricatorPeopleQuery' => 'applications/people/query/PhabricatorPeopleQuery.php',
-    'PhabricatorPeopleQuickSearchEngineExtension' => 'applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php',
     'PhabricatorPeopleRenameController' => 'applications/people/controller/PhabricatorPeopleRenameController.php',
     'PhabricatorPeopleRevisionsProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php',
     'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php',
@@ -3910,8 +3913,6 @@
     'PhabricatorQueryOrderItem' => 'infrastructure/query/order/PhabricatorQueryOrderItem.php',
     'PhabricatorQueryOrderTestCase' => 'infrastructure/query/order/__tests__/PhabricatorQueryOrderTestCase.php',
     'PhabricatorQueryOrderVector' => 'infrastructure/query/order/PhabricatorQueryOrderVector.php',
-    'PhabricatorQuickSearchApplicationEngineExtension' => 'applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php',
-    'PhabricatorQuickSearchEngine' => 'applications/search/engine/PhabricatorQuickSearchEngine.php',
     'PhabricatorQuickSearchEngineExtension' => 'applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php',
     'PhabricatorRateLimitRequestExceptionHandler' => 'aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php',
     'PhabricatorRecaptchaConfigOptions' => 'applications/config/option/PhabricatorRecaptchaConfigOptions.php',
@@ -4950,12 +4951,12 @@
     'ProjectConduitAPIMethod' => 'applications/project/conduit/ProjectConduitAPIMethod.php',
     'ProjectCreateConduitAPIMethod' => 'applications/project/conduit/ProjectCreateConduitAPIMethod.php',
     'ProjectCreateProjectsCapability' => 'applications/project/capability/ProjectCreateProjectsCapability.php',
+    'ProjectDatasourceEngineExtension' => 'applications/project/engineextension/ProjectDatasourceEngineExtension.php',
     'ProjectDefaultEditCapability' => 'applications/project/capability/ProjectDefaultEditCapability.php',
     'ProjectDefaultJoinCapability' => 'applications/project/capability/ProjectDefaultJoinCapability.php',
     'ProjectDefaultViewCapability' => 'applications/project/capability/ProjectDefaultViewCapability.php',
     'ProjectEditConduitAPIMethod' => 'applications/project/conduit/ProjectEditConduitAPIMethod.php',
     'ProjectQueryConduitAPIMethod' => 'applications/project/conduit/ProjectQueryConduitAPIMethod.php',
-    'ProjectQuickSearchEngineExtension' => 'applications/project/engineextension/ProjectQuickSearchEngineExtension.php',
     'ProjectRemarkupRule' => 'applications/project/remarkup/ProjectRemarkupRule.php',
     'ProjectRemarkupRuleTestCase' => 'applications/project/remarkup/__tests__/ProjectRemarkupRuleTestCase.php',
     'ProjectReplyHandler' => 'applications/project/mail/ProjectReplyHandler.php',
@@ -5901,6 +5902,7 @@
     'DiffusionController' => 'PhabricatorController',
     'DiffusionCreateRepositoriesCapability' => 'PhabricatorPolicyCapability',
     'DiffusionDaemonLockException' => 'Exception',
+    'DiffusionDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'DiffusionDefaultEditCapability' => 'PhabricatorPolicyCapability',
     'DiffusionDefaultPushCapability' => 'PhabricatorPolicyCapability',
     'DiffusionDefaultViewCapability' => 'PhabricatorPolicyCapability',
@@ -6032,7 +6034,6 @@
     'DiffusionQueryCommitsConduitAPIMethod' => 'DiffusionConduitAPIMethod',
     'DiffusionQueryConduitAPIMethod' => 'DiffusionConduitAPIMethod',
     'DiffusionQueryPathsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
-    'DiffusionQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
     'DiffusionRawDiffQuery' => 'DiffusionFileFutureQuery',
     'DiffusionRawDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
     'DiffusionReadmeView' => 'DiffusionView',
@@ -8254,8 +8255,11 @@
     'PhabricatorDatabaseRef' => 'Phobject',
     'PhabricatorDatabaseRefParser' => 'Phobject',
     'PhabricatorDatabaseSetupCheck' => 'PhabricatorSetupCheck',
+    'PhabricatorDatasourceApplicationEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'PhabricatorDatasourceEditField' => 'PhabricatorTokenizerEditField',
     'PhabricatorDatasourceEditType' => 'PhabricatorPHIDListEditType',
+    'PhabricatorDatasourceEngine' => 'Phobject',
+    'PhabricatorDatasourceEngineExtension' => 'Phobject',
     'PhabricatorDateFormatSetting' => 'PhabricatorSelectSetting',
     'PhabricatorDateTimeSettingsPanel' => 'PhabricatorEditEngineSettingsPanel',
     'PhabricatorDebugController' => 'PhabricatorController',
@@ -8880,7 +8884,7 @@
     'PhabricatorMetronomicTriggerClock' => 'PhabricatorTriggerClock',
     'PhabricatorModularTransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorModularTransactionType' => 'Phobject',
-    'PhabricatorMonogramQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
+    'PhabricatorMonogramDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'PhabricatorMonospacedFontSetting' => 'PhabricatorStringSetting',
     'PhabricatorMonospacedTextareasSetting' => 'PhabricatorSelectSetting',
     'PhabricatorMotivatorProfileMenuItem' => 'PhabricatorProfileMenuItem',
@@ -9248,6 +9252,7 @@
     'PhabricatorPeopleCreateController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleCreateGuidanceContext' => 'PhabricatorGuidanceContext',
     'PhabricatorPeopleDatasource' => 'PhabricatorTypeaheadDatasource',
+    'PhabricatorPeopleDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'PhabricatorPeopleDeleteController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleDetailsProfileMenuItem' => 'PhabricatorProfileMenuItem',
     'PhabricatorPeopleDisableController' => 'PhabricatorPeopleController',
@@ -9280,7 +9285,6 @@
     'PhabricatorPeopleProfileTasksController' => 'PhabricatorPeopleProfileController',
     'PhabricatorPeopleProfileViewController' => 'PhabricatorPeopleProfileController',
     'PhabricatorPeopleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhabricatorPeopleQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
     'PhabricatorPeopleRenameController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleRevisionsProfileMenuItem' => 'PhabricatorProfileMenuItem',
     'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
@@ -9598,9 +9602,7 @@
       'Phobject',
       'Iterator',
     ),
-    'PhabricatorQuickSearchApplicationEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
-    'PhabricatorQuickSearchEngine' => 'Phobject',
-    'PhabricatorQuickSearchEngineExtension' => 'Phobject',
+    'PhabricatorQuickSearchEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'PhabricatorRateLimitRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
     'PhabricatorRecaptchaConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorRedirectController' => 'PhabricatorController',
@@ -10893,12 +10895,12 @@
     'ProjectConduitAPIMethod' => 'ConduitAPIMethod',
     'ProjectCreateConduitAPIMethod' => 'ProjectConduitAPIMethod',
     'ProjectCreateProjectsCapability' => 'PhabricatorPolicyCapability',
+    'ProjectDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'ProjectDefaultEditCapability' => 'PhabricatorPolicyCapability',
     'ProjectDefaultJoinCapability' => 'PhabricatorPolicyCapability',
     'ProjectDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'ProjectEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'ProjectQueryConduitAPIMethod' => 'ProjectConduitAPIMethod',
-    'ProjectQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension',
     'ProjectRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'ProjectRemarkupRuleTestCase' => 'PhabricatorTestCase',
     'ProjectReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
diff --git a/src/applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php b/src/applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php
similarity index 63%
rename from src/applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php
rename to src/applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php
index 80c705b4f8..fdfe2d02e1 100644
--- a/src/applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php
+++ b/src/applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php
@@ -1,7 +1,7 @@
 <?php
 
-final class DiffusionQuickSearchEngineExtension
-  extends PhabricatorQuickSearchEngineExtension {
+final class DiffusionDatasourceEngineExtension
+  extends PhabricatorDatasourceEngineExtension {
 
   public function newQuickSearchDatasources() {
     return array(
diff --git a/src/applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php b/src/applications/meta/engineextension/PhabricatorDatasourceApplicationEngineExtension.php
similarity index 54%
rename from src/applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php
rename to src/applications/meta/engineextension/PhabricatorDatasourceApplicationEngineExtension.php
index 8161c863ba..f5b0082446 100644
--- a/src/applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php
+++ b/src/applications/meta/engineextension/PhabricatorDatasourceApplicationEngineExtension.php
@@ -1,7 +1,7 @@
 <?php
 
-final class PhabricatorQuickSearchApplicationEngineExtension
-  extends PhabricatorQuickSearchEngineExtension {
+final class PhabricatorDatasourceApplicationEngineExtension
+  extends PhabricatorDatasourceEngineExtension {
 
   public function newQuickSearchDatasources() {
     return array(
diff --git a/src/applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php b/src/applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php
similarity index 54%
rename from src/applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php
rename to src/applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php
index 565838de72..b9de70b99d 100644
--- a/src/applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php
+++ b/src/applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php
@@ -1,7 +1,7 @@
 <?php
 
-final class PhabricatorPeopleQuickSearchEngineExtension
-  extends PhabricatorQuickSearchEngineExtension {
+final class PhabricatorPeopleDatasourceEngineExtension
+  extends PhabricatorDatasourceEngineExtension {
 
   public function newQuickSearchDatasources() {
     return array(
diff --git a/src/applications/project/engineextension/ProjectQuickSearchEngineExtension.php b/src/applications/project/engineextension/ProjectDatasourceEngineExtension.php
similarity index 57%
rename from src/applications/project/engineextension/ProjectQuickSearchEngineExtension.php
rename to src/applications/project/engineextension/ProjectDatasourceEngineExtension.php
index 6bb50e021e..6500db9b62 100644
--- a/src/applications/project/engineextension/ProjectQuickSearchEngineExtension.php
+++ b/src/applications/project/engineextension/ProjectDatasourceEngineExtension.php
@@ -1,7 +1,7 @@
 <?php
 
-final class ProjectQuickSearchEngineExtension
-  extends PhabricatorQuickSearchEngineExtension {
+final class ProjectDatasourceEngineExtension
+  extends PhabricatorDatasourceEngineExtension {
 
   public function newQuickSearchDatasources() {
     return array(
diff --git a/src/applications/search/engine/PhabricatorDatasourceEngine.php b/src/applications/search/engine/PhabricatorDatasourceEngine.php
new file mode 100644
index 0000000000..2f8103ce12
--- /dev/null
+++ b/src/applications/search/engine/PhabricatorDatasourceEngine.php
@@ -0,0 +1,8 @@
+<?php
+
+final class PhabricatorDatasourceEngine extends Phobject {
+
+  public function getAllQuickSearchDatasources() {
+    return PhabricatorDatasourceEngineExtension::getAllQuickSearchDatasources();
+  }
+}
diff --git a/src/applications/search/engine/PhabricatorQuickSearchEngine.php b/src/applications/search/engine/PhabricatorQuickSearchEngine.php
deleted file mode 100644
index 4b67dca659..0000000000
--- a/src/applications/search/engine/PhabricatorQuickSearchEngine.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-final class PhabricatorQuickSearchEngine extends Phobject {
-
-  public function getAllDatasources() {
-    return PhabricatorQuickSearchEngineExtension::getAllDatasources();
-  }
-}
diff --git a/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php b/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
new file mode 100644
index 0000000000..50758bc49d
--- /dev/null
+++ b/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
@@ -0,0 +1,19 @@
+<?php
+
+abstract class PhabricatorDatasourceEngineExtension extends Phobject {
+
+  abstract public function newQuickSearchDatasources();
+
+  final public static function getAllQuickSearchDatasources() {
+    $extensions = id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->execute();
+
+    $datasources = array();
+    foreach ($extensions as $extension) {
+      $datasources[] = $extension->newQuickSearchDatasources();
+    }
+
+    return array_mergev($datasources);
+  }
+}
diff --git a/src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php b/src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php
index 43f0b4c3ca..082eb77e70 100644
--- a/src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php
@@ -1,18 +1,6 @@
 <?php
 
-abstract class PhabricatorQuickSearchEngineExtension extends Phobject {
-
-  abstract public function newQuickSearchDatasources();
-
-  final public static function getAllDatasources() {
-    $extensions = id(new PhutilClassMapQuery())
-      ->setAncestorClass(__CLASS__)
-      ->execute();
-
-    $datasources = array();
-    foreach ($extensions as $extension) {
-      $datasources[] = $extension->newQuickSearchDatasources();
-    }
-    return array_mergev($datasources);
-  }
-}
+// TODO: This is an older name "PhabricatorDatasourceEngineExtension" purely
+// to preserve compatibility that should be removed soon.
+abstract class PhabricatorQuickSearchEngineExtension
+  extends PhabricatorDatasourceEngineExtension {}
diff --git a/src/applications/search/typeahead/PhabricatorSearchDatasource.php b/src/applications/search/typeahead/PhabricatorSearchDatasource.php
index ed17a31185..2d8182a2a2 100644
--- a/src/applications/search/typeahead/PhabricatorSearchDatasource.php
+++ b/src/applications/search/typeahead/PhabricatorSearchDatasource.php
@@ -16,8 +16,8 @@ public function getDatasourceApplicationClass() {
   }
 
   public function getComponentDatasources() {
-    $sources = id(new PhabricatorQuickSearchEngine())
-      ->getAllDatasources();
+    $sources = id(new PhabricatorDatasourceEngine())
+      ->getAllQuickSearchDatasources();
 
     // These results are always rendered in the full browse display mode, so
     // set the browse flag on all component sources.
diff --git a/src/applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php b/src/applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php
similarity index 56%
rename from src/applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php
rename to src/applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php
index 078cb44685..694236cae4 100644
--- a/src/applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php
+++ b/src/applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php
@@ -1,7 +1,7 @@
 <?php
 
-final class PhabricatorMonogramQuickSearchEngineExtension
-  extends PhabricatorQuickSearchEngineExtension {
+final class PhabricatorMonogramDatasourceEngineExtension
+  extends PhabricatorDatasourceEngineExtension {
 
   public function newQuickSearchDatasources() {
     return array(

From 4bccb1547d6bfe9c4eaa1f5dea93994d488dd26c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 15:49:00 -0800
Subject: [PATCH 576/865] Modularize the "jump nav" behaviors in global search

Summary: Depends on D19087. Ref T13079. This still doesn't feel like the most clean, general system in the world, but is a step forward from hard-coded `switch()` stuff.

Test Plan:
- Jumped to `r`.
- Jumped to `a`.
- Jumped to `r poe` (multiple results).
- Jumped to `r poetry` (one result).
- Jumped to `r syzygy` (no results).
- Jumped to `p`.
- Jumped to `p robot` (multiple results); `p assessment` (one result).
  - The behavior for `p <string>` has changed slightly but should be more powerful now (it's consistent with `r <string>`).
- Jumped to `s <symbol>` and `s <context>-><symbol>`.
- Jumped to `d`.
- Jumped to `f`.
- Jumped to `t`.
- Jumped to `T123`, `D123`, `@dog`, `PHID-DREV-abcd`, etc.

Maniphest Tasks: T13079

Differential Revision: https://secure.phabricator.com/D19088
---
 src/__phutil_library_map__.php                |   2 -
 .../DiffusionDatasourceEngineExtension.php    |  70 +++++++++
 ...ricatorPeopleDatasourceEngineExtension.php |  25 ++++
 .../ProjectDatasourceEngineExtension.php      |  46 ++++++
 .../PhabricatorSearchController.php           |  18 +--
 .../engine/PhabricatorDatasourceEngine.php    |  29 ++++
 .../engine/PhabricatorJumpNavHandler.php      | 135 ------------------
 .../PhabricatorDatasourceEngineExtension.php  |  27 +++-
 ...catorMonogramDatasourceEngineExtension.php |  42 ++++++
 9 files changed, 246 insertions(+), 148 deletions(-)
 delete mode 100644 src/applications/search/engine/PhabricatorJumpNavHandler.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 771658e32e..22437bc182 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3154,7 +3154,6 @@
     'PhabricatorJSONExportFormat' => 'infrastructure/export/format/PhabricatorJSONExportFormat.php',
     'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorJiraIssueHasObjectEdgeType.php',
-    'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php',
     'PhabricatorKeyValueDatabaseCache' => 'applications/cache/PhabricatorKeyValueDatabaseCache.php',
     'PhabricatorKeyValueSerializingCacheProxy' => 'applications/cache/PhabricatorKeyValueSerializingCacheProxy.php',
     'PhabricatorKeyboardRemarkupRule' => 'infrastructure/markup/rule/PhabricatorKeyboardRemarkupRule.php',
@@ -8708,7 +8707,6 @@
     'PhabricatorJSONExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorJavelinLinter' => 'ArcanistLinter',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'PhabricatorEdgeType',
-    'PhabricatorJumpNavHandler' => 'Phobject',
     'PhabricatorKeyValueDatabaseCache' => 'PhutilKeyValueCache',
     'PhabricatorKeyValueSerializingCacheProxy' => 'PhutilKeyValueCacheProxy',
     'PhabricatorKeyboardRemarkupRule' => 'PhutilRemarkupRule',
diff --git a/src/applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php b/src/applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php
index fdfe2d02e1..9678b627b1 100644
--- a/src/applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php
+++ b/src/applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php
@@ -9,4 +9,74 @@ public function newQuickSearchDatasources() {
       new DiffusionSymbolDatasource(),
     );
   }
+
+  public function newJumpURI($query) {
+    $viewer = $this->getViewer();
+
+    // Send "r" to Diffusion.
+    if (preg_match('/^r\z/i', $query)) {
+      return '/diffusion/';
+    }
+
+    // Send "a" to the commit list ("Audit").
+    if (preg_match('/^a\z/i', $query)) {
+      return '/diffusion/commit/';
+    }
+
+    // Send "r <string>" to a search for a matching repository.
+    $matches = null;
+    if (preg_match('/^r\s+(.+)\z/i', $query, $matches)) {
+      $raw_query = $matches[1];
+
+      $engine = id(new PhabricatorRepository())
+        ->newFerretEngine();
+
+      $compiler = id(new PhutilSearchQueryCompiler())
+        ->setEnableFunctions(true);
+
+      $raw_tokens = $compiler->newTokens($raw_query);
+
+      $fulltext_tokens = array();
+      foreach ($raw_tokens as $raw_token) {
+        $fulltext_token = id(new PhabricatorFulltextToken())
+          ->setToken($raw_token);
+        $fulltext_tokens[] = $fulltext_token;
+      }
+
+      $repositories = id(new PhabricatorRepositoryQuery())
+        ->setViewer($viewer)
+        ->withFerretConstraint($engine, $fulltext_tokens)
+        ->execute();
+      if (count($repositories) == 1) {
+        // Just one match, jump to repository.
+        return head($repositories)->getURI();
+      } else {
+        // More than one match, jump to search.
+        return urisprintf(
+          '/diffusion/?order=relevance&query=%s#R',
+          $raw_query);
+      }
+    }
+
+    // Send "s <string>" to a symbol search.
+    $matches = null;
+    if (preg_match('/^s\s+(.+)\z/i', $query, $matches)) {
+      $symbol = $matches[1];
+
+      $parts = null;
+      if (preg_match('/(.*)(?:\\.|::|->)(.*)/', $symbol, $parts)) {
+        return urisprintf(
+          '/diffusion/symbol/%s/?jump=true&context=%s',
+          $parts[2],
+          $parts[1]);
+      } else {
+        return urisprintf(
+          '/diffusion/symbol/%s/?jump=true',
+          $symbol);
+      }
+    }
+
+    return null;
+  }
+
 }
diff --git a/src/applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php b/src/applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php
index b9de70b99d..dc8599554e 100644
--- a/src/applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php
+++ b/src/applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php
@@ -8,4 +8,29 @@ public function newQuickSearchDatasources() {
       new PhabricatorPeopleDatasource(),
     );
   }
+
+  public function newJumpURI($query) {
+    $viewer = $this->getViewer();
+
+    // Send "u" to the user directory.
+    if (preg_match('/^u\z/i', $query)) {
+      return '/people/';
+    }
+
+    // Send "u <string>" to the user's profile page.
+    $matches = null;
+    if (preg_match('/^u\s+(.+)\z/i', $query, $matches)) {
+      $raw_query = $matches[1];
+
+      // TODO: We could test that this is a valid username and jump to
+      // a search in the user directory if it isn't.
+
+      return urisprintf(
+        '/p/%s/',
+        $raw_query);
+    }
+
+    return null;
+  }
+
 }
diff --git a/src/applications/project/engineextension/ProjectDatasourceEngineExtension.php b/src/applications/project/engineextension/ProjectDatasourceEngineExtension.php
index 6500db9b62..b566d58f93 100644
--- a/src/applications/project/engineextension/ProjectDatasourceEngineExtension.php
+++ b/src/applications/project/engineextension/ProjectDatasourceEngineExtension.php
@@ -8,4 +8,50 @@ public function newQuickSearchDatasources() {
       new PhabricatorProjectDatasource(),
     );
   }
+
+  public function newJumpURI($query) {
+    $viewer = $this->getViewer();
+
+    // Send "p" to Projects.
+    if (preg_match('/^p\z/i', $query)) {
+      return '/diffusion/';
+    }
+
+    // Send "p <string>" to a search for similar projects.
+    $matches = null;
+    if (preg_match('/^p\s+(.+)\z/i', $query, $matches)) {
+      $raw_query = $matches[1];
+
+      $engine = id(new PhabricatorProject())
+        ->newFerretEngine();
+
+      $compiler = id(new PhutilSearchQueryCompiler())
+        ->setEnableFunctions(true);
+
+      $raw_tokens = $compiler->newTokens($raw_query);
+
+      $fulltext_tokens = array();
+      foreach ($raw_tokens as $raw_token) {
+        $fulltext_token = id(new PhabricatorFulltextToken())
+          ->setToken($raw_token);
+        $fulltext_tokens[] = $fulltext_token;
+      }
+
+      $projects = id(new PhabricatorProjectQuery())
+        ->setViewer($viewer)
+        ->withFerretConstraint($engine, $fulltext_tokens)
+        ->execute();
+      if (count($projects) == 1) {
+        // Just one match, jump to project.
+        return head($projects)->getURI();
+      } else {
+        // More than one match, jump to search.
+        return urisprintf(
+          '/project/?order=relevance&query=%s#R',
+          $raw_query);
+      }
+    }
+
+    return null;
+  }
 }
diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php
index a1f6fd68b5..b3d3ab18fa 100644
--- a/src/applications/search/controller/PhabricatorSearchController.php
+++ b/src/applications/search/controller/PhabricatorSearchController.php
@@ -11,13 +11,15 @@ public function shouldAllowPublic() {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
+    $query = $request->getStr('query');
 
-    if ($request->getStr('jump') != 'no') {
-      $response = PhabricatorJumpNavHandler::getJumpResponse(
-        $viewer,
-        $request->getStr('query'));
-      if ($response) {
-        return $response;
+    if ($request->getStr('jump') != 'no' && strlen($query)) {
+      $jump_uri = id(new PhabricatorDatasourceEngine())
+        ->setViewer($viewer)
+        ->newJumpURI($query);
+
+      if ($jump_uri !== null) {
+        return id(new AphrontRedirectResponse())->setURI($jump_uri);
       }
     }
 
@@ -29,7 +31,7 @@ public function handleRequest(AphrontRequest $request) {
     if ($request->getBool('search:primary')) {
 
       // If there's no query, just take the user to advanced search.
-      if (!strlen($request->getStr('query'))) {
+      if (!strlen($query)) {
         $advanced_uri = '/search/query/advanced/';
         return id(new AphrontRedirectResponse())->setURI($advanced_uri);
       }
@@ -71,7 +73,7 @@ public function handleRequest(AphrontRequest $request) {
 
       // Add the user's query, then save this as a new saved query and send
       // the user to the results page.
-      $saved->setParameter('query', $request->getStr('query'));
+      $saved->setParameter('query', $query);
 
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
         try {
diff --git a/src/applications/search/engine/PhabricatorDatasourceEngine.php b/src/applications/search/engine/PhabricatorDatasourceEngine.php
index 2f8103ce12..62304d26aa 100644
--- a/src/applications/search/engine/PhabricatorDatasourceEngine.php
+++ b/src/applications/search/engine/PhabricatorDatasourceEngine.php
@@ -2,7 +2,36 @@
 
 final class PhabricatorDatasourceEngine extends Phobject {
 
+  private $viewer;
+
+  public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  public function getViewer() {
+    return $this->viewer;
+  }
+
   public function getAllQuickSearchDatasources() {
     return PhabricatorDatasourceEngineExtension::getAllQuickSearchDatasources();
   }
+
+  public function newJumpURI($query) {
+    $viewer = $this->getViewer();
+    $extensions = PhabricatorDatasourceEngineExtension::getAllExtensions();
+
+    foreach ($extensions as $extension) {
+      $jump_uri = id(clone $extension)
+        ->setViewer($viewer)
+        ->newJumpURI($query);
+
+      if ($jump_uri !== null) {
+        return $jump_uri;
+      }
+    }
+
+    return null;
+  }
+
 }
diff --git a/src/applications/search/engine/PhabricatorJumpNavHandler.php b/src/applications/search/engine/PhabricatorJumpNavHandler.php
deleted file mode 100644
index ddade36d84..0000000000
--- a/src/applications/search/engine/PhabricatorJumpNavHandler.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-final class PhabricatorJumpNavHandler extends Phobject {
-
-  public static function getJumpResponse(PhabricatorUser $viewer, $jump) {
-    $jump = trim($jump);
-
-    $patterns = array(
-      '/^a$/i' => 'uri:/diffusion/commit/',
-      '/^f$/i' => 'uri:/feed/',
-      '/^d$/i' => 'uri:/differential/',
-      '/^r$/i' => 'uri:/diffusion/',
-      '/^t$/i' => 'uri:/maniphest/',
-      '/^p$/i' => 'uri:/project/',
-      '/^u$/i' => 'uri:/people/',
-      '/^p\s+(.+)$/i' => 'project',
-      '/^u\s+(\S+)$/i' => 'user',
-      '/^(?:s)\s+(\S+)/i' => 'find-symbol',
-      '/^r\s+(.+)$/i' => 'find-repository',
-    );
-
-    foreach ($patterns as $pattern => $effect) {
-      $matches = null;
-      if (preg_match($pattern, $jump, $matches)) {
-        if (!strncmp($effect, 'uri:', 4)) {
-          return id(new AphrontRedirectResponse())
-            ->setURI(substr($effect, 4));
-        } else {
-          switch ($effect) {
-            case 'user':
-              return id(new AphrontRedirectResponse())
-                ->setURI('/p/'.$matches[1].'/');
-            case 'project':
-              $project = self::findCloselyNamedProject($matches[1]);
-              if ($project) {
-                return id(new AphrontRedirectResponse())
-                  ->setURI('/project/view/'.$project->getID().'/');
-              } else {
-                  $jump = $matches[1];
-              }
-              break;
-            case 'find-symbol':
-              $context = '';
-              $symbol = $matches[1];
-              $parts = array();
-              if (preg_match('/(.*)(?:\\.|::|->)(.*)/', $symbol, $parts)) {
-                $context = '&context='.phutil_escape_uri($parts[1]);
-                $symbol = $parts[2];
-              }
-              return id(new AphrontRedirectResponse())
-                ->setURI("/diffusion/symbol/$symbol/?jump=true$context");
-            case 'find-repository':
-              $raw_query = $matches[1];
-
-              $engine = id(new PhabricatorRepository())
-                ->newFerretEngine();
-
-              $compiler = id(new PhutilSearchQueryCompiler())
-                ->setEnableFunctions(true);
-
-              $raw_tokens = $compiler->newTokens($raw_query);
-
-              $fulltext_tokens = array();
-              foreach ($raw_tokens as $raw_token) {
-                $fulltext_token = id(new PhabricatorFulltextToken())
-                  ->setToken($raw_token);
-                $fulltext_tokens[] = $fulltext_token;
-              }
-
-              $repositories = id(new PhabricatorRepositoryQuery())
-                ->setViewer($viewer)
-                ->withFerretConstraint($engine, $fulltext_tokens)
-                ->execute();
-              if (count($repositories) == 1) {
-                // Just one match, jump to repository.
-                $uri = head($repositories)->getURI();
-              } else {
-                // More than one match, jump to search.
-                $uri = urisprintf(
-                  '/diffusion/?order=name&query=%s',
-                  $raw_query);
-              }
-              return id(new AphrontRedirectResponse())->setURI($uri);
-            default:
-              throw new Exception(pht("Unknown jump effect '%s'!", $effect));
-          }
-        }
-      }
-    }
-
-    // If none of the patterns matched, look for an object by name.
-    $objects = id(new PhabricatorObjectQuery())
-      ->setViewer($viewer)
-      ->withNames(array($jump))
-      ->execute();
-
-    if (count($objects) == 1) {
-      $handle = id(new PhabricatorHandleQuery())
-        ->setViewer($viewer)
-        ->withPHIDs(mpull($objects, 'getPHID'))
-        ->executeOne();
-
-      return id(new AphrontRedirectResponse())->setURI($handle->getURI());
-    }
-
-    return null;
-  }
-
-  private static function findCloselyNamedProject($name) {
-    $project = id(new PhabricatorProject())->loadOneWhere(
-      'name = %s',
-      $name);
-    if ($project) {
-      return $project;
-    } else { // no exact match, try a fuzzy match
-      $projects = id(new PhabricatorProject())->loadAllWhere(
-        'name LIKE %~',
-        $name);
-      if ($projects) {
-        $min_name_length = PHP_INT_MAX;
-        $best_project = null;
-        foreach ($projects as $project) {
-          $name_length = strlen($project->getName());
-          if ($name_length <= $min_name_length) {
-            $min_name_length = $name_length;
-            $best_project = $project;
-          }
-        }
-        return $best_project;
-      } else {
-        return null;
-      }
-    }
-  }
-}
diff --git a/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php b/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
index 50758bc49d..be015526da 100644
--- a/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
@@ -2,12 +2,33 @@
 
 abstract class PhabricatorDatasourceEngineExtension extends Phobject {
 
-  abstract public function newQuickSearchDatasources();
+  private $viewer;
 
-  final public static function getAllQuickSearchDatasources() {
-    $extensions = id(new PhutilClassMapQuery())
+  final public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  public function newQuickSearchDatasources() {
+    return array();
+  }
+
+  public function newJumpURI($query) {
+    return null;
+  }
+
+  final public static function getAllExtensions() {
+    return id(new PhutilClassMapQuery())
       ->setAncestorClass(__CLASS__)
       ->execute();
+  }
+
+  final public static function getAllQuickSearchDatasources() {
+    $extensions = self::getAllExtensions();
 
     $datasources = array();
     foreach ($extensions as $extension) {
diff --git a/src/applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php b/src/applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php
index 694236cae4..ec34538dd9 100644
--- a/src/applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php
+++ b/src/applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php
@@ -8,4 +8,46 @@ public function newQuickSearchDatasources() {
       new PhabricatorTypeaheadMonogramDatasource(),
     );
   }
+
+  public function newJumpURI($query) {
+    $viewer = $this->getViewer();
+
+    // These first few rules are sort of random but don't fit anywhere else
+    // today and don't feel worth adding separate extensions for.
+
+    // Send "f" to Feed.
+    if (preg_match('/^f\z/i', $query)) {
+      return '/feed/';
+    }
+
+    // Send "d" to Differential.
+    if (preg_match('/^d\z/i', $query)) {
+      return '/differential/';
+    }
+
+    // Send "t" to Maniphest.
+    if (preg_match('/^t\z/i', $query)) {
+      return '/maniphest/';
+    }
+
+    // Otherwise, if the user entered an object name, jump to that object.
+    $objects = id(new PhabricatorObjectQuery())
+      ->setViewer($viewer)
+      ->withNames(array($query))
+      ->execute();
+    if (count($objects) == 1) {
+      $object = head($objects);
+      $object_phid = $object->getPHID();
+
+      $handles = $viewer->loadHandles(array($object_phid));
+      $handle = $handles[$object_phid];
+
+      if ($handle->isComplete()) {
+        return $handle->getURI();
+      }
+    }
+
+    return null;
+  }
+
 }

From d6edc3f4cc1d7962cde6476a589c9352454eeec4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 16:53:21 -0800
Subject: [PATCH 577/865] Support evaluation of complex tokenizer functions

Summary:
Depends on D19088. Ref T13079.

> Any sufficiently complicated C or Fortran program contains an ad hoc, informally-specified, bug-ridden, slow implementation of half of Common Lisp.
> - Greenspun's Tenth Rule

Move us a step closer to this noble goal.

This doesn't implement any `viewer(project())` stuff but it looks like the API doesn't need to change to do that in the future.

Test Plan: Grimmaced in pain.

Maniphest Tasks: T13079

Differential Revision: https://secure.phabricator.com/D19089
---
 src/__phutil_library_map__.php                |  2 +
 .../PhabricatorTypeaheadDatasource.php        | 51 ++++++++++++--
 ...PhabricatorTypeaheadDatasourceTestCase.php | 42 ++++++++++++
 ...bricatorTypeaheadTestNumbersDatasource.php | 67 +++++++++++++++++++
 4 files changed, 157 insertions(+), 5 deletions(-)
 create mode 100644 src/applications/typeahead/datasource/__tests__/PhabricatorTypeaheadTestNumbersDatasource.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 22437bc182..b23d3cb90c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4381,6 +4381,7 @@
     'PhabricatorTypeaheadMonogramDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadMonogramDatasource.php',
     'PhabricatorTypeaheadResult' => 'applications/typeahead/storage/PhabricatorTypeaheadResult.php',
     'PhabricatorTypeaheadRuntimeCompositeDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadRuntimeCompositeDatasource.php',
+    'PhabricatorTypeaheadTestNumbersDatasource' => 'applications/typeahead/datasource/__tests__/PhabricatorTypeaheadTestNumbersDatasource.php',
     'PhabricatorTypeaheadTokenView' => 'applications/typeahead/view/PhabricatorTypeaheadTokenView.php',
     'PhabricatorUIConfigOptions' => 'applications/config/option/PhabricatorUIConfigOptions.php',
     'PhabricatorUIExample' => 'applications/uiexample/examples/PhabricatorUIExample.php',
@@ -10159,6 +10160,7 @@
     'PhabricatorTypeaheadMonogramDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorTypeaheadResult' => 'Phobject',
     'PhabricatorTypeaheadRuntimeCompositeDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
+    'PhabricatorTypeaheadTestNumbersDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorTypeaheadTokenView' => 'AphrontTagView',
     'PhabricatorUIConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorUIExample' => 'Phobject',
diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
index 8b747281b3..2e369a3f67 100644
--- a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
@@ -406,7 +406,7 @@ public function evaluateTokens(array $tokens) {
     $results = $this->evaluateValues($results);
 
     foreach ($evaluate as $result_key => $function) {
-      $function = self::parseFunction($function);
+      $function = $this->parseFunction($function);
       if (!$function) {
         throw new PhabricatorTypeaheadInvalidTokenException();
       }
@@ -459,28 +459,69 @@ public static function isFunctionToken($token) {
   /**
    * @task functions
    */
-  public function parseFunction($token, $allow_partial = false) {
+  protected function parseFunction($token, $allow_partial = false) {
     $matches = null;
 
     if ($allow_partial) {
-      $ok = preg_match('/^([^(]+)\((.*?)\)?$/', $token, $matches);
+      $ok = preg_match('/^([^(]+)\((.*?)\)?\z/', $token, $matches);
     } else {
-      $ok = preg_match('/^([^(]+)\((.*)\)$/', $token, $matches);
+      $ok = preg_match('/^([^(]+)\((.*)\)\z/', $token, $matches);
     }
 
     if (!$ok) {
+      if (!$allow_partial) {
+        throw new PhabricatorTypeaheadInvalidTokenException(
+          pht(
+            'Unable to parse function and arguments for token "%s".',
+            $token));
+      }
       return null;
     }
 
     $function = trim($matches[1]);
 
     if (!$this->canEvaluateFunction($function)) {
+      if (!$allow_partial) {
+        throw new PhabricatorTypeaheadInvalidTokenException(
+          pht(
+            'This datasource ("%s") can not evaluate the function "%s(...)".',
+            get_class($this),
+            $function));
+      }
+
       return null;
     }
 
+    // TODO: There is currently no way to quote characters in arguments, so
+    // some characters can't be argument characters. Replace this with a real
+    // parser once we get use cases.
+
+    $argv = $matches[2];
+    $argv = trim($argv);
+    if (!strlen($argv)) {
+      $argv = array();
+    } else {
+      $argv = preg_split('/,/', $matches[2]);
+      foreach ($argv as $key => $arg) {
+        $argv[$key] = trim($arg);
+      }
+    }
+
+    foreach ($argv as $key => $arg) {
+      if (self::isFunctionToken($arg)) {
+        $subfunction = $this->parseFunction($arg);
+
+        $results = $this->evaluateFunction(
+          $subfunction['name'],
+          array($subfunction['argv']));
+
+        $argv[$key] = head($results);
+      }
+    }
+
     return array(
       'name' => $function,
-      'argv' => array(trim($matches[2])),
+      'argv' => $argv,
     );
   }
 
diff --git a/src/applications/typeahead/datasource/__tests__/PhabricatorTypeaheadDatasourceTestCase.php b/src/applications/typeahead/datasource/__tests__/PhabricatorTypeaheadDatasourceTestCase.php
index 150275a332..c58596f025 100644
--- a/src/applications/typeahead/datasource/__tests__/PhabricatorTypeaheadDatasourceTestCase.php
+++ b/src/applications/typeahead/datasource/__tests__/PhabricatorTypeaheadDatasourceTestCase.php
@@ -48,4 +48,46 @@ private function assertTokenization($input, $expect) {
       pht('Tokenization of "%s"', $input));
   }
 
+  public function testFunctionEvaluation() {
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+    $datasource = id(new PhabricatorTypeaheadTestNumbersDatasource())
+      ->setViewer($viewer);
+
+    $constraints = $datasource->evaluateTokens(
+      array(
+        9,
+        'seven()',
+        12,
+        3,
+      ));
+
+    $this->assertEqual(
+      array(9, 7, 12, 3),
+      $constraints);
+
+    $map = array(
+      'inc(3)' => 4,
+      'sum(3, 4)' => 7,
+      'inc(seven())' => 8,
+      'inc(inc(3))' => 5,
+      'inc(inc(seven()))' => 9,
+      'sum(seven(), seven())' => 14,
+      'sum(inc(seven()), inc(inc(9)))' => 19,
+    );
+
+    foreach ($map as $input => $expect) {
+      $constraints = $datasource->evaluateTokens(
+        array(
+          $input,
+        ));
+
+      $this->assertEqual(
+        array($expect),
+        $constraints,
+        pht('Constraints for input "%s".', $input));
+    }
+  }
+
+
 }
diff --git a/src/applications/typeahead/datasource/__tests__/PhabricatorTypeaheadTestNumbersDatasource.php b/src/applications/typeahead/datasource/__tests__/PhabricatorTypeaheadTestNumbersDatasource.php
new file mode 100644
index 0000000000..f16a64bb9b
--- /dev/null
+++ b/src/applications/typeahead/datasource/__tests__/PhabricatorTypeaheadTestNumbersDatasource.php
@@ -0,0 +1,67 @@
+<?php
+
+final class PhabricatorTypeaheadTestNumbersDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  public function getBrowseTitle() {
+    return pht('Browse Numbers');
+  }
+
+  public function getPlaceholderText() {
+    return null;
+  }
+
+  public function getDatasourceApplicationClass() {
+    return 'PhabricatorPeopleApplication';
+  }
+
+  public function getDatasourceFunctions() {
+    return array(
+      'seven' => array(),
+      'inc' => array(),
+      'sum' => array(),
+    );
+  }
+
+  public function loadResults() {
+    return array();
+  }
+
+  public function renderFunctionTokens($function, array $argv_list) {
+    return array();
+  }
+
+  protected function evaluateFunction($function, array $argv_list) {
+    $results = array();
+
+    foreach ($argv_list as $argv) {
+      foreach ($argv as $k => $arg) {
+        if (!is_scalar($arg) || !preg_match('/^\d+\z/', $arg)) {
+          throw new PhabricatorTypeaheadInvalidTokenException(
+            pht(
+              'All arguments to "%s(...)" must be integers, found '.
+              '"%s" in position %d.',
+              $function,
+              (is_scalar($arg) ? $arg : gettype($arg)),
+              $k + 1));
+        }
+        $argv[$k] = (int)$arg;
+      }
+
+      switch ($function) {
+        case 'seven':
+          $results[] = 7;
+          break;
+        case 'inc':
+          $results[] = $argv[0] + 1;
+          break;
+        case 'sum':
+          $results[] = array_sum($argv);
+          break;
+      }
+    }
+
+    return $results;
+  }
+
+}

From fe294d4034d7482eaf65a5b37804e667a860ce45 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 17:41:43 -0800
Subject: [PATCH 578/865] Allow third-party code to extend upstream datasources
 via EngineExtension

Summary: Depends on D19089. Fixes T13079. This is likely not the final form of this, but creates a defensible extension point.

Test Plan: See T13079 for discussion.

Maniphest Tasks: T13079

Differential Revision: https://secure.phabricator.com/D19090
---
 .../engine/PhabricatorDatasourceEngine.php     | 18 ++++++++++++++++++
 .../PhabricatorDatasourceEngineExtension.php   |  5 +++++
 ...PhabricatorTypeaheadCompositeDatasource.php | 11 ++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/applications/search/engine/PhabricatorDatasourceEngine.php b/src/applications/search/engine/PhabricatorDatasourceEngine.php
index 62304d26aa..a9cb766242 100644
--- a/src/applications/search/engine/PhabricatorDatasourceEngine.php
+++ b/src/applications/search/engine/PhabricatorDatasourceEngine.php
@@ -34,4 +34,22 @@ public function newJumpURI($query) {
     return null;
   }
 
+  public function newDatasourcesForCompositeDatasource(
+    PhabricatorTypeaheadCompositeDatasource $datasource) {
+    $viewer = $this->getViewer();
+    $extensions = PhabricatorDatasourceEngineExtension::getAllExtensions();
+
+    $sources = array();
+    foreach ($extensions as $extension) {
+      $extension_sources = id(clone $extension)
+        ->setViewer($viewer)
+        ->newDatasourcesForCompositeDatasource($datasource);
+      foreach ($extension_sources as $extension_source) {
+        $sources[] = $extension_source;
+      }
+    }
+
+    return $sources;
+  }
+
 }
diff --git a/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php b/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
index be015526da..c568e9e14d 100644
--- a/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
@@ -21,6 +21,11 @@ public function newJumpURI($query) {
     return null;
   }
 
+  public function newDatasourcesForCompositeDatasource(
+    PhabricatorTypeaheadCompositeDatasource $datasource) {
+    return array();
+  }
+
   final public static function getAllExtensions() {
     return id(new PhutilClassMapQuery())
       ->setAncestorClass(__CLASS__)
diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php
index 33f06e4ae5..5594044c42 100644
--- a/src/applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php
+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php
@@ -223,8 +223,17 @@ protected function sliceResults(array $results) {
 
   private function getUsableDatasources() {
     if ($this->usable === null) {
+      $viewer = $this->getViewer();
+
       $sources = $this->getComponentDatasources();
 
+      $extension_sources = id(new PhabricatorDatasourceEngine())
+        ->setViewer($viewer)
+        ->newDatasourcesForCompositeDatasource($this);
+      foreach ($extension_sources as $extension_source) {
+        $sources[] = $extension_source;
+      }
+
       $usable = array();
       foreach ($sources as $source) {
         $application_class = $source->getDatasourceApplicationClass();
@@ -239,7 +248,7 @@ private function getUsableDatasources() {
           }
         }
 
-        $source->setViewer($this->getViewer());
+        $source->setViewer($viewer);
         $usable[] = $source;
       }
       $this->usable = $usable;

From 2b0f98900bcbffba081d6e97f77bcee44b8a3a59 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Feb 2018 19:04:46 -0800
Subject: [PATCH 579/865] Fail outstanding buildables with aborted builds

Summary:
Ref T13072. See PHI361. The bug in T10746 where aborting builds didn't propagate properly to the buildable was fixed, but existing builds are still stuck "Building".

Since it doesn't look like anything will moot this before these changes promote to `stable`, just migrate these builds into "failed".

Test Plan: Ran migration, saw it affect only relevant builds and correctly fail them.

Maniphest Tasks: T13072

Differential Revision: https://secure.phabricator.com/D19091
---
 .../20180214.harbor.01.aborted.php            | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 resources/sql/autopatches/20180214.harbor.01.aborted.php

diff --git a/resources/sql/autopatches/20180214.harbor.01.aborted.php b/resources/sql/autopatches/20180214.harbor.01.aborted.php
new file mode 100644
index 0000000000..689d5625f5
--- /dev/null
+++ b/resources/sql/autopatches/20180214.harbor.01.aborted.php
@@ -0,0 +1,27 @@
+<?php
+
+$table = new HarbormasterBuildable();
+$conn = $table->establishConnection('w');
+
+foreach (new LiskMigrationIterator($table) as $buildable) {
+  if ($buildable->getBuildableStatus() !== 'building') {
+    continue;
+  }
+
+  $aborted = queryfx_one(
+    $conn,
+    'SELECT * FROM %T WHERE buildablePHID = %s AND buildStatus = %s',
+    id(new HarbormasterBuild())->getTableName(),
+    $buildable->getPHID(),
+    'aborted');
+  if (!$aborted) {
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET buildableStatus = %s WHERE id = %d',
+    $table->getTableName(),
+    'failed',
+    $buildable->getID());
+}

From 463dda98edd3ec0c4604c1bb4a70a7b61c4a178d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 15:35:20 -0800
Subject: [PATCH 580/865] Render Drydock logs in text from "bin/drydock lease";
 in HTML in web views

Summary: Ref T13073. The new log output from `bin/drydock lease` currently uses HTML handle rendering, but should render to text.

Test Plan: Ran `bin/drydock lease` and saw normal text in log output. Viewed the same logs from the web UI and saw HTML.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13073

Differential Revision: https://secure.phabricator.com/D19101
---
 .../DrydockLeaseNoAuthorizationsLogType.php   |  3 +-
 .../logtype/DrydockLeaseReclaimLogType.php    |  4 +-
 ...DrydockLeaseWaitingForResourcesLogType.php |  4 +-
 .../drydock/logtype/DrydockLogType.php        | 37 ++++++++++++++++++-
 .../logtype/DrydockResourceReclaimLogType.php |  3 +-
 .../DrydockManagementLeaseWorkflow.php        |  2 +-
 .../drydock/view/DrydockLogListView.php       |  2 +-
 7 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/applications/drydock/logtype/DrydockLeaseNoAuthorizationsLogType.php b/src/applications/drydock/logtype/DrydockLeaseNoAuthorizationsLogType.php
index b5a7ca1b13..cce98956a1 100644
--- a/src/applications/drydock/logtype/DrydockLeaseNoAuthorizationsLogType.php
+++ b/src/applications/drydock/logtype/DrydockLeaseNoAuthorizationsLogType.php
@@ -13,14 +13,13 @@ public function getLogTypeIcon(array $data) {
   }
 
   public function renderLog(array $data) {
-    $viewer = $this->getViewer();
     $authorizing_phid = idx($data, 'authorizingPHID');
 
     return pht(
       'The object which authorized this lease (%s) is not authorized to use '.
       'any of the blueprints the lease lists. Approve the authorizations '.
       'before using the lease.',
-      $viewer->renderHandle($authorizing_phid)->render());
+      $this->renderHandle($authorizing_phid));
   }
 
 }
diff --git a/src/applications/drydock/logtype/DrydockLeaseReclaimLogType.php b/src/applications/drydock/logtype/DrydockLeaseReclaimLogType.php
index 8dbc13d9d4..6e145a24ae 100644
--- a/src/applications/drydock/logtype/DrydockLeaseReclaimLogType.php
+++ b/src/applications/drydock/logtype/DrydockLeaseReclaimLogType.php
@@ -13,13 +13,11 @@ public function getLogTypeIcon(array $data) {
   }
 
   public function renderLog(array $data) {
-    $viewer = $this->getViewer();
-
     $resource_phids = idx($data, 'resourcePHIDs', array());
 
     return pht(
       'Reclaimed resource %s.',
-      $viewer->renderHandleList($resource_phids)->render());
+      $this->renderHandleList($resource_phids));
   }
 
 }
diff --git a/src/applications/drydock/logtype/DrydockLeaseWaitingForResourcesLogType.php b/src/applications/drydock/logtype/DrydockLeaseWaitingForResourcesLogType.php
index 46ab965b36..bb91acb030 100644
--- a/src/applications/drydock/logtype/DrydockLeaseWaitingForResourcesLogType.php
+++ b/src/applications/drydock/logtype/DrydockLeaseWaitingForResourcesLogType.php
@@ -13,13 +13,11 @@ public function getLogTypeIcon(array $data) {
   }
 
   public function renderLog(array $data) {
-    $viewer = $this->getViewer();
-
     $blueprint_phids = idx($data, 'blueprintPHIDs', array());
 
     return pht(
       'Waiting for available resources from: %s.',
-      $viewer->renderHandleList($blueprint_phids)->render());
+      $this->renderHandleList($blueprint_phids));
   }
 
 }
diff --git a/src/applications/drydock/logtype/DrydockLogType.php b/src/applications/drydock/logtype/DrydockLogType.php
index 7faab42dfe..690ffc5670 100644
--- a/src/applications/drydock/logtype/DrydockLogType.php
+++ b/src/applications/drydock/logtype/DrydockLogType.php
@@ -4,17 +4,18 @@ abstract class DrydockLogType extends Phobject {
 
   private $viewer;
   private $log;
+  private $renderingMode = 'text';
 
   abstract public function getLogTypeName();
   abstract public function getLogTypeIcon(array $data);
   abstract public function renderLog(array $data);
 
-  public function setViewer(PhabricatorUser $viewer) {
+  final public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
     return $this;
   }
 
-  public function getViewer() {
+  final public function getViewer() {
     return $this->viewer;
   }
 
@@ -38,4 +39,36 @@ final public static function getAllLogTypes() {
       ->execute();
   }
 
+  final public function renderLogForText($data) {
+    $this->renderingMode = 'text';
+    return $this->renderLog($data);
+  }
+
+  final public function renderLogForHTML($data) {
+    $this->renderingMode = 'html';
+    return $this->renderLog($data);
+  }
+
+  final protected function renderHandle($phid) {
+    $viewer = $this->getViewer();
+    $handle = $viewer->renderHandle($phid);
+
+    if ($this->renderingMode == 'html') {
+      return $handle->render();
+    } else {
+      return $handle->setAsText(true)->render();
+    }
+  }
+
+  final protected function renderHandleList(array $phids) {
+    $viewer = $this->getViewer();
+    $handle_list = $viewer->renderHandleList($phids);
+
+    if ($this->renderingMode == 'html') {
+      return $handle_list->render();
+    } else {
+      return $handle_list->setAsText(true)->render();
+    }
+  }
+
 }
diff --git a/src/applications/drydock/logtype/DrydockResourceReclaimLogType.php b/src/applications/drydock/logtype/DrydockResourceReclaimLogType.php
index 9e9d5fdef3..aa989e97df 100644
--- a/src/applications/drydock/logtype/DrydockResourceReclaimLogType.php
+++ b/src/applications/drydock/logtype/DrydockResourceReclaimLogType.php
@@ -13,12 +13,11 @@ public function getLogTypeIcon(array $data) {
   }
 
   public function renderLog(array $data) {
-    $viewer = $this->getViewer();
     $reclaimer_phid = idx($data, 'reclaimerPHID');
 
     return pht(
       'Resource reclaimed by %s.',
-      $viewer->renderHandle($reclaimer_phid)->render());
+      $this->renderHandle($reclaimer_phid));
   }
 
 }
diff --git a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
index 8c3f682042..75636dab09 100644
--- a/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementLeaseWorkflow.php
@@ -163,7 +163,7 @@ private function waitUntilActive(DrydockLease $lease) {
           $log_data = $log->getData();
 
           $type = $type_object->getLogTypeName();
-          $data = $type_object->renderLog($log_data);
+          $data = $type_object->renderLogForText($log_data);
         } else {
           $type = pht('Unknown ("%s")', $type_key);
           $data = null;
diff --git a/src/applications/drydock/view/DrydockLogListView.php b/src/applications/drydock/view/DrydockLogListView.php
index cb66813507..61fde7cee7 100644
--- a/src/applications/drydock/view/DrydockLogListView.php
+++ b/src/applications/drydock/view/DrydockLogListView.php
@@ -52,7 +52,7 @@ public function render() {
 
           $type = $type_object->getLogTypeName();
           $icon = $type_object->getLogTypeIcon($log_data);
-          $data = $type_object->renderLog($log_data);
+          $data = $type_object->renderLogForHTML($log_data);
           $data = phutil_escape_html_newlines($data);
         } else {
           $type = pht('<Unknown: %s>', $type_key);

From e492c717c657092bb80203f6379f0a34fb048458 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 04:07:32 -0800
Subject: [PATCH 581/865] Give PhrictionContent objects (older versions of wiki
 pages) legitimate PHIDs

Summary: Ref T13077. Prepares for modern API access to document history using standard "v3" APIs.

Test Plan: Ran migration, verified PHIDs appeared in the database. Created/edited a document, got even more PHIDs in the database.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19092
---
 .../20180215.phriction.01.phidcol.sql         |  2 +
 .../20180215.phriction.02.phidvalues.php      | 17 +++++++
 src/__phutil_library_map__.php                |  4 ++
 .../phid/PhrictionContentPHIDType.php         | 38 ++++++++++++++
 .../phriction/query/PhrictionContentQuery.php | 51 +++++++++++++++++++
 .../phriction/storage/PhrictionContent.php    |  8 ++-
 6 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20180215.phriction.01.phidcol.sql
 create mode 100644 resources/sql/autopatches/20180215.phriction.02.phidvalues.php
 create mode 100644 src/applications/phriction/phid/PhrictionContentPHIDType.php
 create mode 100644 src/applications/phriction/query/PhrictionContentQuery.php

diff --git a/resources/sql/autopatches/20180215.phriction.01.phidcol.sql b/resources/sql/autopatches/20180215.phriction.01.phidcol.sql
new file mode 100644
index 0000000000..658b05d9e1
--- /dev/null
+++ b/resources/sql/autopatches/20180215.phriction.01.phidcol.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_content
+  ADD phid VARBINARY(64) NOT NULL;
diff --git a/resources/sql/autopatches/20180215.phriction.02.phidvalues.php b/resources/sql/autopatches/20180215.phriction.02.phidvalues.php
new file mode 100644
index 0000000000..c0a55cac85
--- /dev/null
+++ b/resources/sql/autopatches/20180215.phriction.02.phidvalues.php
@@ -0,0 +1,17 @@
+<?php
+
+$table = new PhrictionContent();
+$conn = $table->establishConnection('w');
+
+foreach (new LiskMigrationIterator($table) as $row) {
+  if (strlen($row->getPHID())) {
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET phid = %s WHERE id = %d',
+    $table->getTableName(),
+    $table->generatePHID(),
+    $row->getID());
+}
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b23d3cb90c..e69170e99f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4845,6 +4845,8 @@
     'PhrictionConduitAPIMethod' => 'applications/phriction/conduit/PhrictionConduitAPIMethod.php',
     'PhrictionConstants' => 'applications/phriction/constants/PhrictionConstants.php',
     'PhrictionContent' => 'applications/phriction/storage/PhrictionContent.php',
+    'PhrictionContentPHIDType' => 'applications/phriction/phid/PhrictionContentPHIDType.php',
+    'PhrictionContentQuery' => 'applications/phriction/query/PhrictionContentQuery.php',
     'PhrictionController' => 'applications/phriction/controller/PhrictionController.php',
     'PhrictionCreateConduitAPIMethod' => 'applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php',
     'PhrictionDAO' => 'applications/phriction/storage/PhrictionDAO.php',
@@ -10757,6 +10759,8 @@
       'PhrictionDAO',
       'PhabricatorMarkupInterface',
     ),
+    'PhrictionContentPHIDType' => 'PhabricatorPHIDType',
+    'PhrictionContentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhrictionController' => 'PhabricatorController',
     'PhrictionCreateConduitAPIMethod' => 'PhrictionConduitAPIMethod',
     'PhrictionDAO' => 'PhabricatorLiskDAO',
diff --git a/src/applications/phriction/phid/PhrictionContentPHIDType.php b/src/applications/phriction/phid/PhrictionContentPHIDType.php
new file mode 100644
index 0000000000..b8f39c0ef4
--- /dev/null
+++ b/src/applications/phriction/phid/PhrictionContentPHIDType.php
@@ -0,0 +1,38 @@
+<?php
+
+final class PhrictionContentPHIDType
+  extends PhabricatorPHIDType {
+
+  const TYPECONST = 'WRDS';
+
+  public function getTypeName() {
+    return pht('Phriction Content');
+  }
+
+  public function newObject() {
+    return new PhrictionContent();
+  }
+
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhrictionApplication';
+  }
+
+  protected function buildQueryForObjects(
+    PhabricatorObjectQuery $query,
+    array $phids) {
+
+    return id(new PhrictionContentQuery())
+      ->withPHIDs($phids);
+  }
+
+  public function loadHandles(
+    PhabricatorHandleQuery $query,
+    array $handles,
+    array $objects) {
+
+    foreach ($handles as $phid => $handle) {
+      $content = $objects[$phid];
+    }
+  }
+
+}
diff --git a/src/applications/phriction/query/PhrictionContentQuery.php b/src/applications/phriction/query/PhrictionContentQuery.php
new file mode 100644
index 0000000000..4f76186a77
--- /dev/null
+++ b/src/applications/phriction/query/PhrictionContentQuery.php
@@ -0,0 +1,51 @@
+<?php
+
+final class PhrictionContentQuery
+  extends PhabricatorCursorPagedPolicyAwareQuery {
+
+  private $ids;
+  private $phids;
+
+  public function withIDs(array $ids) {
+    $this->ids = $ids;
+    return $this;
+  }
+
+  public function withPHIDs(array $phids) {
+    $this->phids = $phids;
+    return $this;
+  }
+
+  public function newResultObject() {
+    return new PhrictionContent();
+  }
+
+  protected function loadPage() {
+    return $this->loadStandardPage($this->newResultObject());
+  }
+
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
+
+    if ($this->ids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'id IN (%Ld)',
+        $this->ids);
+    }
+
+    if ($this->phids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'phid IN (%Ls)',
+        $this->phids);
+    }
+
+    return $where;
+  }
+
+  public function getQueryApplicationClass() {
+    return 'PhabricatorPhrictionApplication';
+  }
+
+}
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index 0492534797..30c1589a17 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -3,7 +3,8 @@
 /**
  * @task markup Markup Interface
  */
-final class PhrictionContent extends PhrictionDAO
+final class PhrictionContent
+  extends PhrictionDAO
   implements PhabricatorMarkupInterface {
 
   const MARKUP_FIELD_BODY = 'markup:body';
@@ -33,6 +34,7 @@ public function renderContent(PhabricatorUser $viewer) {
 
   protected function getConfiguration() {
     return array(
+      self::CONFIG_AUX_PHID => true,
       self::CONFIG_COLUMN_SCHEMA => array(
         'version' => 'uint32',
         'title' => 'sort',
@@ -60,6 +62,10 @@ protected function getConfiguration() {
     ) + parent::getConfiguration();
   }
 
+  public function getPHIDType() {
+    return PhrictionContentPHIDType::TYPECONST;
+  }
+
 
 /* -(  Markup Interface  )--------------------------------------------------- */
 

From b2c829f2743b607de5dbd74a33f624002dd5575f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 04:41:05 -0800
Subject: [PATCH 582/865] Move PhrictionContent from RemarkupInterface
 (deprecated) to PHUIRemarkupView

Summary:
Depends on D19092. Ref T13077. This modernizes markup rendering for PhrictionContent.

This is a little messy because table of contents generation isn't straightforward.

Test Plan: Viewed Phriction documents with and without 3+ headers, saw ToC vs no ToC. Edited/previewed documents. Grepped for affected symbols. Checked DarkConsole for sensible cache behavior.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19093
---
 src/__phutil_library_map__.php                |  5 +-
 .../PhrictionDocumentController.php           | 13 ++-
 .../phriction/storage/PhrictionContent.php    | 84 ++-----------------
 .../markup/PhabricatorMarkupOneOff.php        | 37 ++++++++
 .../markup/view/PHUIRemarkupView.php          | 52 ++++++++++--
 5 files changed, 99 insertions(+), 92 deletions(-)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e69170e99f..b6e29fc5ed 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -10755,10 +10755,7 @@
     'PhrictionChangeType' => 'PhrictionConstants',
     'PhrictionConduitAPIMethod' => 'ConduitAPIMethod',
     'PhrictionConstants' => 'Phobject',
-    'PhrictionContent' => array(
-      'PhrictionDAO',
-      'PhabricatorMarkupInterface',
-    ),
+    'PhrictionContent' => 'PhrictionDAO',
     'PhrictionContentPHIDType' => 'PhabricatorPHIDType',
     'PhrictionContentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhrictionController' => 'PhabricatorController',
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index e455bd86d1..a5189cc72c 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -97,8 +97,12 @@ public function handleRequest(AphrontRequest $request) {
       if ($current_status == PhrictionChangeType::CHANGE_EDIT ||
         $current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {
 
-        $core_content = $content->renderContent($viewer);
-        $toc = $this->getToc($content);
+        $remarkup_view = $content->newRemarkupView($viewer);
+
+        $core_content = $remarkup_view->render();
+
+        $toc = $remarkup_view->getTableOfContents();
+        $toc = $this->getToc($toc);
 
       } else if ($current_status == PhrictionChangeType::CHANGE_DELETE) {
         $notice = new PHUIInfoView();
@@ -474,8 +478,8 @@ protected function getDocumentSlug() {
     return $this->slug;
   }
 
-  protected function getToc(PhrictionContent $content) {
-    $toc = $content->getRenderedTableOfContents();
+  protected function getToc($toc) {
+
     if ($toc) {
       $toc = phutil_tag_div('phui-document-toc-content', array(
         phutil_tag_div(
@@ -484,6 +488,7 @@ protected function getToc(PhrictionContent $content) {
         $toc,
       ));
     }
+
     return $toc;
   }
 
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index 30c1589a17..44c8184eb7 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -1,13 +1,7 @@
 <?php
 
-/**
- * @task markup Markup Interface
- */
 final class PhrictionContent
-  extends PhrictionDAO
-  implements PhabricatorMarkupInterface {
-
-  const MARKUP_FIELD_BODY = 'markup:body';
+  extends PhrictionDAO {
 
   protected $id;
   protected $documentID;
@@ -22,16 +16,6 @@ final class PhrictionContent
   protected $changeType;
   protected $changeRef;
 
-  private $renderedTableOfContents;
-
-  public function renderContent(PhabricatorUser $viewer) {
-    return PhabricatorMarkupEngine::renderOneObject(
-      $this,
-      self::MARKUP_FIELD_BODY,
-      $viewer,
-      $this);
-  }
-
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
@@ -66,68 +50,10 @@ public function getPHIDType() {
     return PhrictionContentPHIDType::TYPECONST;
   }
 
-
-/* -(  Markup Interface  )--------------------------------------------------- */
-
-
-  /**
-   * @task markup
-   */
-  public function getMarkupFieldKey($field) {
-    $content = $this->getMarkupText($field);
-    return PhabricatorMarkupEngine::digestRemarkupContent($this, $content);
-  }
-
-
-  /**
-   * @task markup
-   */
-  public function getMarkupText($field) {
-    return $this->getContent();
-  }
-
-
-  /**
-   * @task markup
-   */
-  public function newMarkupEngine($field) {
-    return PhabricatorMarkupEngine::newPhrictionMarkupEngine();
+  public function newRemarkupView(PhabricatorUser $viewer) {
+    return id(new PHUIRemarkupView($viewer, $this->getContent()))
+      ->setRemarkupOption(PHUIRemarkupView::OPTION_GENERATE_TOC, true)
+      ->setGenerateTableOfContents(true);
   }
 
-
-  /**
-   * @task markup
-   */
-  public function didMarkupText(
-    $field,
-    $output,
-    PhutilMarkupEngine $engine) {
-
-    $this->renderedTableOfContents =
-      PhutilRemarkupHeaderBlockRule::renderTableOfContents($engine);
-
-    return phutil_tag(
-      'div',
-      array(
-        'class' => 'phabricator-remarkup',
-      ),
-      $output);
-  }
-
-  /**
-   * @task markup
-   */
-  public function getRenderedTableOfContents() {
-    return $this->renderedTableOfContents;
-  }
-
-
-  /**
-   * @task markup
-   */
-  public function shouldUseMarkupCache($field) {
-    return (bool)$this->getID();
-  }
-
-
 }
diff --git a/src/infrastructure/markup/PhabricatorMarkupOneOff.php b/src/infrastructure/markup/PhabricatorMarkupOneOff.php
index 6bffcf7e2b..cc57adc647 100644
--- a/src/infrastructure/markup/PhabricatorMarkupOneOff.php
+++ b/src/infrastructure/markup/PhabricatorMarkupOneOff.php
@@ -12,6 +12,10 @@ final class PhabricatorMarkupOneOff
   private $engineRuleset;
   private $engine;
   private $disableCache;
+  private $contentCacheFragment;
+
+  private $generateTableOfContents;
+  private $tableOfContents;
 
   public function setEngineRuleset($engine_ruleset) {
     $this->engineRuleset = $engine_ruleset;
@@ -54,7 +58,34 @@ public function getDisableCache() {
     return $this->disableCache;
   }
 
+  public function setGenerateTableOfContents($generate) {
+    $this->generateTableOfContents = $generate;
+    return $this;
+  }
+
+  public function getGenerateTableOfContents() {
+    return $this->generateTableOfContents;
+  }
+
+  public function getTableOfContents() {
+    return $this->tableOfContents;
+  }
+
+  public function setContentCacheFragment($fragment) {
+    $this->contentCacheFragment = $fragment;
+    return $this;
+  }
+
+  public function getContentCacheFragment() {
+    return $this->contentCacheFragment;
+  }
+
   public function getMarkupFieldKey($field) {
+    $fragment = $this->getContentCacheFragment();
+    if ($fragment !== null) {
+      return $fragment;
+    }
+
     return PhabricatorHash::digestForIndex($this->getContent()).':oneoff';
   }
 
@@ -81,7 +112,13 @@ public function didMarkupText(
     $output,
     PhutilMarkupEngine $engine) {
 
+    if ($this->getGenerateTableOfContents()) {
+      $toc = PhutilRemarkupHeaderBlockRule::renderTableOfContents($engine);
+      $this->tableOfContents = $toc;
+    }
+
     require_celerity_resource('phabricator-remarkup-css');
+
     return phutil_tag(
       'div',
       array(
diff --git a/src/infrastructure/markup/view/PHUIRemarkupView.php b/src/infrastructure/markup/view/PHUIRemarkupView.php
index e5772e9d84..d60d28b5d3 100644
--- a/src/infrastructure/markup/view/PHUIRemarkupView.php
+++ b/src/infrastructure/markup/view/PHUIRemarkupView.php
@@ -14,11 +14,14 @@ final class PHUIRemarkupView extends AphrontView {
   private $corpus;
   private $contextObject;
   private $options;
+  private $oneoff;
+  private $generateTableOfContents;
 
   // TODO: In the long run, rules themselves should define available options.
   // For now, just define constants here so we can more easily replace things
   // later once this is cleaned up.
   const OPTION_PRESERVE_LINEBREAKS = 'preserve-linebreaks';
+  const OPTION_GENERATE_TOC = 'header.generate-toc';
 
   public function __construct(PhabricatorUser $viewer, $corpus) {
     $this->setUser($viewer);
@@ -46,6 +49,19 @@ public function setRemarkupOptions(array $options) {
     return $this;
   }
 
+  public function setGenerateTableOfContents($generate) {
+    $this->generateTableOfContents = $generate;
+    return $this;
+  }
+
+  public function getGenerateTableOfContents() {
+    return $this->generateTableOfContents;
+  }
+
+  public function getTableOfContents() {
+    return $this->oneoff->getTableOfContents();
+  }
+
   public function render() {
     $viewer = $this->getViewer();
     $corpus = $this->corpus;
@@ -54,7 +70,8 @@ public function render() {
     $options = $this->options;
 
     $oneoff = id(new PhabricatorMarkupOneOff())
-      ->setContent($corpus);
+      ->setContent($corpus)
+      ->setContentCacheFragment($this->getContentCacheFragment());
 
     if ($options) {
       $oneoff->setEngine($this->getEngine());
@@ -62,6 +79,10 @@ public function render() {
       $oneoff->setPreserveLinebreaks(true);
     }
 
+    $generate_toc = $this->getGenerateTableOfContents();
+    $oneoff->setGenerateTableOfContents($generate_toc);
+    $this->oneoff = $oneoff;
+
     $content = PhabricatorMarkupEngine::renderOneObject(
       $oneoff,
       'default',
@@ -76,10 +97,7 @@ private function getEngine() {
     $viewer = $this->getViewer();
 
     $viewer_key = $viewer->getCacheFragment();
-
-    ksort($options);
-    $engine_key = serialize($options);
-    $engine_key = PhabricatorHash::digestForIndex($engine_key);
+    $engine_key = $this->getEngineCacheFragment();
 
     $cache = PhabricatorCaches::getRequestCache();
     $cache_key = "remarkup.engine({$viewer_key}, {$engine_key})";
@@ -93,4 +111,28 @@ private function getEngine() {
     return $engine;
   }
 
+  private function getEngineCacheFragment() {
+    $options = $this->options;
+
+    ksort($options);
+
+    $engine_key = serialize($options);
+    $engine_key = PhabricatorHash::digestForIndex($engine_key);
+
+    return $engine_key;
+  }
+
+  private function getContentCacheFragment() {
+    $corpus = $this->corpus;
+
+    $content_fragment = PhabricatorHash::digestForIndex($corpus);
+    $options_fragment = array(
+      'toc' => $this->getGenerateTableOfContents(),
+    );
+    $options_fragment = serialize($options_fragment);
+    $options_fragment = PhabricatorHash::digestForIndex($options_fragment);
+
+    return "remarkup({$content_fragment}, {$options_fragment})";
+  }
+
 }

From 9404e2b3d425079aa3ca09c0e682ac18143bfd29 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 04:52:09 -0800
Subject: [PATCH 583/865] Implement PolicyInterface, ExtendedPolicyInterface,
 and DestructibleInterface on PhrictionContent

Summary:
Depends on D19093. Ref T13077. Although content objects normally don't have any edges today, they may in the future.

Also implement Policy stuff properly.

Test Plan: Used `bin/remove destroy` to destroy a document, verified it also loaded and destroyed the correspoding Content correctly by looking at `--trace` and the database rows.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19094
---
 src/__phutil_library_map__.php                |  6 +-
 .../phriction/query/PhrictionContentQuery.php | 68 ++++++++++++++++++-
 .../phriction/storage/PhrictionContent.php    | 54 ++++++++++++++-
 .../phriction/storage/PhrictionDocument.php   | 13 ++--
 4 files changed, 130 insertions(+), 11 deletions(-)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b6e29fc5ed..2eb9a1893b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -10755,7 +10755,11 @@
     'PhrictionChangeType' => 'PhrictionConstants',
     'PhrictionConduitAPIMethod' => 'ConduitAPIMethod',
     'PhrictionConstants' => 'Phobject',
-    'PhrictionContent' => 'PhrictionDAO',
+    'PhrictionContent' => array(
+      'PhrictionDAO',
+      'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
+    ),
     'PhrictionContentPHIDType' => 'PhabricatorPHIDType',
     'PhrictionContentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhrictionController' => 'PhabricatorController',
diff --git a/src/applications/phriction/query/PhrictionContentQuery.php b/src/applications/phriction/query/PhrictionContentQuery.php
index 4f76186a77..0ab132abdd 100644
--- a/src/applications/phriction/query/PhrictionContentQuery.php
+++ b/src/applications/phriction/query/PhrictionContentQuery.php
@@ -5,6 +5,7 @@ final class PhrictionContentQuery
 
   private $ids;
   private $phids;
+  private $documentPHIDs;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -16,6 +17,11 @@ public function withPHIDs(array $phids) {
     return $this;
   }
 
+  public function withDocumentPHIDs(array $phids) {
+    $this->documentPHIDs = $phids;
+    return $this;
+  }
+
   public function newResultObject() {
     return new PhrictionContent();
   }
@@ -30,20 +36,78 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->ids !== null) {
       $where[] = qsprintf(
         $conn,
-        'id IN (%Ld)',
+        'c.id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids !== null) {
       $where[] = qsprintf(
         $conn,
-        'phid IN (%Ls)',
+        'c.phid IN (%Ls)',
         $this->phids);
     }
 
+    if ($this->documentPHIDs !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'd.phid IN (%Ls)',
+        $this->documentPHIDs);
+    }
+
     return $where;
   }
 
+  protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
+    $joins = parent::buildJoinClauseParts($conn);
+
+    if ($this->shouldJoinDocumentTable()) {
+      $joins[] = qsprintf(
+        $conn,
+        'JOIN %T d ON d.id = c.documentID',
+        id(new PhrictionDocument())->getTableName());
+    }
+
+    return $joins;
+  }
+
+  protected function willFilterPage(array $contents) {
+    $document_ids = mpull($contents, 'getDocumentID');
+
+    $documents = id(new PhrictionDocumentQuery())
+      ->setViewer($this->getViewer())
+      ->setParentQuery($this)
+      ->withIDs($document_ids)
+      ->execute();
+    $documents = mpull($documents, null, 'getID');
+
+    foreach ($contents as $key => $content) {
+      $document_id = $content->getDocumentID();
+
+      $document = idx($documents, $document_id);
+      if (!$document) {
+        unset($contents[$key]);
+        $this->didRejectResult($content);
+        continue;
+      }
+
+      $content->attachDocument($document);
+    }
+
+    return $contents;
+  }
+
+  private function shouldJoinDocumentTable() {
+    if ($this->documentPHIDs !== null) {
+      return true;
+    }
+
+    return false;
+  }
+
+  protected function getPrimaryTableAlias() {
+    return 'c';
+  }
+
   public function getQueryApplicationClass() {
     return 'PhabricatorPhrictionApplication';
   }
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index 44c8184eb7..a6aee7226f 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -1,9 +1,11 @@
 <?php
 
 final class PhrictionContent
-  extends PhrictionDAO {
+  extends PhrictionDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface {
 
-  protected $id;
   protected $documentID;
   protected $version;
   protected $authorPHID;
@@ -16,6 +18,8 @@ final class PhrictionContent
   protected $changeType;
   protected $changeRef;
 
+  private $document = self::ATTACHABLE;
+
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
@@ -56,4 +60,50 @@ public function newRemarkupView(PhabricatorUser $viewer) {
       ->setGenerateTableOfContents(true);
   }
 
+  public function attachDocument(PhrictionDocument $document) {
+    $this->document = $document;
+    return $this;
+  }
+
+  public function getDocument() {
+    return $this->assertAttached($this->document);
+  }
+
+
+/* -(  PhabricatorPolicyInterface  )----------------------------------------- */
+
+
+  public function getCapabilities() {
+    return array(
+      PhabricatorPolicyCapability::CAN_VIEW,
+    );
+  }
+
+  public function getPolicy($capability) {
+    return PhabricatorPolicies::getMostOpenPolicy();
+  }
+
+  public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
+    return false;
+  }
+
+
+/* -(  PhabricatorExtendedPolicyInterface  )--------------------------------- */
+
+
+  public function getExtendedPolicy($capability, PhabricatorUser $viewer) {
+    return array(
+      array($this->getDocument(), PhabricatorPolicyCapability::CAN_VIEW),
+    );
+  }
+
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $this->delete();
+  }
+
 }
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 7a3e178882..01e85d4954 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -236,15 +236,16 @@ public function destroyObjectPermanently(
 
     $this->openTransaction();
 
-      $this->delete();
-
-      $contents = id(new PhrictionContent())->loadAllWhere(
-        'documentID = %d',
-        $this->getID());
+      $contents = id(new PhrictionContentQuery())
+        ->setViewer($engine->getViewer())
+        ->withDocumentPHIDs(array($this->getPHID()))
+        ->execute();
       foreach ($contents as $content) {
-        $content->delete();
+        $engine->destroyObject($content);
       }
 
+      $this->delete();
+
     $this->saveTransaction();
   }
 

From f742d00c28949ba009474b20042675dd31490e16 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 05:22:16 -0800
Subject: [PATCH 584/865] Mostly use PhrictionContentQuery to load
 PhrictionContent objects

Summary: Depends on D19094. Ref T13077. Use modern infrastructure to perform these loads. I left a couple of calls in the older API methods unconverted.

Test Plan: Viewed documents. Viewed older versions. Viewed diffs. Did revert edits to older versions.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19095
---
 .../controller/PhrictionDiffController.php    |  9 ++---
 .../PhrictionDocumentController.php           | 35 ++++++++++---------
 .../controller/PhrictionEditController.php    |  9 ++---
 .../phriction/query/PhrictionContentQuery.php | 13 +++++++
 .../query/PhrictionDocumentQuery.php          |  9 +++--
 .../phriction/storage/PhrictionDocument.php   |  2 +-
 6 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
index b66a3b3094..f443ad657b 100644
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -29,10 +29,11 @@ public function handleRequest(AphrontRequest $request) {
       list($l, $r) = explode(',', $ref);
     }
 
-    $content = id(new PhrictionContent())->loadAllWhere(
-      'documentID = %d AND version IN (%Ld)',
-      $document->getID(),
-      array($l, $r));
+    $content = id(new PhrictionContentQuery())
+      ->setViewer($viewer)
+      ->withDocumentPHIDs(array($document->getPHID()))
+      ->withVersions(array($l, $r))
+      ->execute();
     $content = mpull($content, null, 'getVersion');
 
     $content_l = idx($content, $l, null);
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index a5189cc72c..8377cf7d29 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -22,11 +22,6 @@ public function handleRequest(AphrontRequest $request) {
 
     require_celerity_resource('phriction-document-css');
 
-    $document = id(new PhrictionDocumentQuery())
-      ->setViewer($viewer)
-      ->withSlugs(array($slug))
-      ->executeOne();
-
     $version_note = null;
     $core_content = '';
     $move_notice = '';
@@ -34,6 +29,11 @@ public function handleRequest(AphrontRequest $request) {
     $content = null;
     $toc = null;
 
+    $document = id(new PhrictionDocumentQuery())
+      ->setViewer($viewer)
+      ->withSlugs(array($slug))
+      ->needContent(true)
+      ->executeOne();
     if (!$document) {
 
       $document = PhrictionDocument::initializeNewDocument($viewer, $slug);
@@ -69,25 +69,28 @@ public function handleRequest(AphrontRequest $request) {
       $version = $request->getInt('v');
 
       if ($version) {
-        $content = id(new PhrictionContent())->loadOneWhere(
-          'documentID = %d AND version = %d',
-          $document->getID(),
-          $version);
+        $content = id(new PhrictionContentQuery())
+          ->setViewer($viewer)
+          ->withDocumentPHIDs(array($document->getPHID()))
+          ->withVersions(array($version))
+          ->executeOne();
         if (!$content) {
           return new Aphront404Response();
         }
 
         if ($content->getID() != $document->getContentID()) {
-          $vdate = phabricator_datetime($content->getDateCreated(), $viewer);
-          $version_note = new PHUIInfoView();
-          $version_note->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
-          $version_note->appendChild(
-            pht('You are viewing an older version of this document, as it '.
-            'appeared on %s.', $vdate));
+          $version_note = id(new PHUIInfoView())
+            ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
+            ->appendChild(
+              pht(
+                'You are viewing an older version of this document, as it '.
+                'appeared on %s.',
+                phabricator_datetime($content->getDateCreated(), $viewer)));
         }
       } else {
-        $content = id(new PhrictionContent())->load($document->getContentID());
+        $content = $document->getContent();
       }
+
       $page_title = $content->getTitle();
       $properties = $this
         ->buildPropertyListView($document, $content, $slug);
diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
index 0ac3fc35bb..e7e2b40d87 100644
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -28,10 +28,11 @@ public function handleRequest(AphrontRequest $request) {
 
       $revert = $request->getInt('revert');
       if ($revert) {
-        $content = id(new PhrictionContent())->loadOneWhere(
-          'documentID = %d AND version = %d',
-          $document->getID(),
-          $revert);
+        $content = id(new PhrictionContentQuery())
+          ->setViewer($viewer)
+          ->withDocumentPHIDs(array($document->getPHID()))
+          ->withVersions(array($revert))
+          ->executeOne();
         if (!$content) {
           return new Aphront404Response();
         }
diff --git a/src/applications/phriction/query/PhrictionContentQuery.php b/src/applications/phriction/query/PhrictionContentQuery.php
index 0ab132abdd..053f40cf9c 100644
--- a/src/applications/phriction/query/PhrictionContentQuery.php
+++ b/src/applications/phriction/query/PhrictionContentQuery.php
@@ -6,6 +6,7 @@ final class PhrictionContentQuery
   private $ids;
   private $phids;
   private $documentPHIDs;
+  private $versions;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -22,6 +23,11 @@ public function withDocumentPHIDs(array $phids) {
     return $this;
   }
 
+  public function withVersions(array $versions) {
+    $this->versions = $versions;
+    return $this;
+  }
+
   public function newResultObject() {
     return new PhrictionContent();
   }
@@ -47,6 +53,13 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->phids);
     }
 
+    if ($this->versions !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'version IN (%Ld)',
+        $this->versions);
+    }
+
     if ($this->documentPHIDs !== null) {
       $where[] = qsprintf(
         $conn,
diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php
index 2736d825b5..b5118146d3 100644
--- a/src/applications/phriction/query/PhrictionDocumentQuery.php
+++ b/src/applications/phriction/query/PhrictionDocumentQuery.php
@@ -145,9 +145,12 @@ protected function willFilterPage(array $documents) {
     }
 
     if ($this->needContent) {
-      $contents = id(new PhrictionContent())->loadAllWhere(
-        'id IN (%Ld)',
-        mpull($documents, 'getContentID'));
+      $contents = id(new PhrictionContentQuery())
+        ->setViewer($this->getViewer())
+        ->setParentQuery($this)
+        ->withIDs(mpull($documents, 'getContentID'))
+        ->execute();
+      $contents = mpull($contents, null, 'getID');
 
       foreach ($documents as $key => $document) {
         $content_id = $document->getContentID();
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 01e85d4954..0a9f09afdd 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -61,7 +61,7 @@ public static function initializeNewDocument(PhabricatorUser $actor, $slug) {
     $document = new PhrictionDocument();
     $document->setSlug($slug);
 
-    $content  = new PhrictionContent();
+    $content = new PhrictionContent();
     $content->setSlug($slug);
 
     $default_title = PhabricatorSlug::getDefaultTitle($slug);

From a965d8d6ae5ac54744b0bbc07107b53e84493e51 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 05:42:01 -0800
Subject: [PATCH 585/865] Make PhrictionContent "description" non-nullable

Summary:
Depends on D19095. Ref T6203. Ref T13077. This column is nullable in an inconsistent way. Make it non-nullable.

Also clean up one more content query on the history view.

Test Plan: Ran migration, then created and edited documents without providing a descriptino or hitting `NULL` exceptions.

Maniphest Tasks: T13077, T6203

Differential Revision: https://secure.phabricator.com/D19096
---
 .../20180215.phriction.03.descempty.sql         |  2 ++
 .../20180215.phriction.04.descnull.sql          |  2 ++
 .../conduit/PhrictionCreateConduitAPIMethod.php |  2 +-
 .../conduit/PhrictionEditConduitAPIMethod.php   |  2 +-
 .../controller/PhrictionHistoryController.php   | 17 +++++++----------
 .../editor/PhrictionTransactionEditor.php       |  5 ++++-
 .../phriction/storage/PhrictionContent.php      |  5 +----
 7 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 resources/sql/autopatches/20180215.phriction.03.descempty.sql
 create mode 100644 resources/sql/autopatches/20180215.phriction.04.descnull.sql

diff --git a/resources/sql/autopatches/20180215.phriction.03.descempty.sql b/resources/sql/autopatches/20180215.phriction.03.descempty.sql
new file mode 100644
index 0000000000..c41df5285a
--- /dev/null
+++ b/resources/sql/autopatches/20180215.phriction.03.descempty.sql
@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_phriction.phriction_content
+  SET description = '' WHERE description IS NULL;
diff --git a/resources/sql/autopatches/20180215.phriction.04.descnull.sql b/resources/sql/autopatches/20180215.phriction.04.descnull.sql
new file mode 100644
index 0000000000..3ff017cd64
--- /dev/null
+++ b/resources/sql/autopatches/20180215.phriction.04.descnull.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_content
+  CHANGE description description LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/src/applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php b/src/applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php
index fc28b53b66..300dbbfa80 100644
--- a/src/applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php
+++ b/src/applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php
@@ -57,7 +57,7 @@ protected function execute(ConduitAPIRequest $request) {
       ->setActor($request->getUser())
       ->setContentSource($request->newContentSource())
       ->setContinueOnNoEffect(true)
-      ->setDescription($request->getValue('description'));
+      ->setDescription((string)$request->getValue('description'));
 
     try {
       $editor->applyTransactions($doc, $xactions);
diff --git a/src/applications/phriction/conduit/PhrictionEditConduitAPIMethod.php b/src/applications/phriction/conduit/PhrictionEditConduitAPIMethod.php
index 70c02d376a..9d97ed7f8c 100644
--- a/src/applications/phriction/conduit/PhrictionEditConduitAPIMethod.php
+++ b/src/applications/phriction/conduit/PhrictionEditConduitAPIMethod.php
@@ -52,7 +52,7 @@ protected function execute(ConduitAPIRequest $request) {
       ->setActor($request->getUser())
       ->setContentSource($request->newContentSource())
       ->setContinueOnNoEffect(true)
-      ->setDescription($request->getValue('description'));
+      ->setDescription((string)$request->getValue('description'));
 
     try {
       $editor->applyTransactions($doc, $xactions);
diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
index 9b0d3188a2..432b1dfdef 100644
--- a/src/applications/phriction/controller/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
@@ -22,16 +22,13 @@ public function handleRequest(AphrontRequest $request) {
 
     $current = $document->getContent();
 
-    $pager = new PHUIPagerView();
-    $pager->setOffset($request->getInt('page'));
-    $pager->setURI($request->getRequestURI(), 'page');
-
-    $history = id(new PhrictionContent())->loadAllWhere(
-      'documentID = %d ORDER BY version DESC LIMIT %d, %d',
-      $document->getID(),
-      $pager->getOffset(),
-      $pager->getPageSize() + 1);
-    $history = $pager->sliceResults($history);
+    $pager = id(new AphrontCursorPagerView())
+      ->readFromRequest($request);
+
+    $history = id(new PhrictionContentQuery())
+      ->setViewer($viewer)
+      ->withDocumentPHIDs(array($document->getPHID()))
+      ->executeWithCursorPager($pager);
 
     $author_phids = mpull($history, 'getAuthorPHID');
     $handles = $this->loadViewerHandles($author_phids);
diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index 73aee3fd4c..793c609517 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -596,10 +596,13 @@ private function buildNewContentTemplate(
       ->setAuthorPHID($this->getActor()->getPHID())
       ->setChangeType(PhrictionChangeType::CHANGE_EDIT)
       ->setTitle($this->getOldContent()->getTitle())
-      ->setContent($this->getOldContent()->getContent());
+      ->setContent($this->getOldContent()->getContent())
+      ->setDescription('');
+
     if (strlen($this->getDescription())) {
       $new_content->setDescription($this->getDescription());
     }
+
     $new_content->setVersion($this->getOldContent()->getVersion() + 1);
 
     return $new_content;
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index a6aee7226f..390da64682 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -30,10 +30,7 @@ protected function getConfiguration() {
         'content' => 'text',
         'changeType' => 'uint32',
         'changeRef' => 'uint32?',
-
-        // T6203/NULLABILITY
-        // This should just be empty if not provided?
-        'description' => 'text?',
+        'description' => 'text',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'documentID' => array(

From 8101bf74e9ce8935808a615f4581f0821c8aa876 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 06:08:52 -0800
Subject: [PATCH 586/865] Introduce a "phriction.content.search" API method to
 replace "phriction.history"

Summary: Depends on D19096. Ref T13077. Adds a new "v3" API method for Phriction document content, to replace the existing "phriction.history" call.

Test Plan: Made various calls via web API console.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19097
---
 src/__phutil_library_map__.php                |  5 ++
 ...PhrictionContentSearchConduitAPIMethod.php | 18 +++++
 .../query/PhrictionContentSearchEngine.php    | 76 +++++++++++++++++++
 .../phriction/storage/PhrictionContent.php    | 36 ++++++++-
 4 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/phriction/conduit/PhrictionContentSearchConduitAPIMethod.php
 create mode 100644 src/applications/phriction/query/PhrictionContentSearchEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2eb9a1893b..3f42c58c66 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4847,6 +4847,8 @@
     'PhrictionContent' => 'applications/phriction/storage/PhrictionContent.php',
     'PhrictionContentPHIDType' => 'applications/phriction/phid/PhrictionContentPHIDType.php',
     'PhrictionContentQuery' => 'applications/phriction/query/PhrictionContentQuery.php',
+    'PhrictionContentSearchConduitAPIMethod' => 'applications/phriction/conduit/PhrictionContentSearchConduitAPIMethod.php',
+    'PhrictionContentSearchEngine' => 'applications/phriction/query/PhrictionContentSearchEngine.php',
     'PhrictionController' => 'applications/phriction/controller/PhrictionController.php',
     'PhrictionCreateConduitAPIMethod' => 'applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php',
     'PhrictionDAO' => 'applications/phriction/storage/PhrictionDAO.php',
@@ -10759,9 +10761,12 @@
       'PhrictionDAO',
       'PhabricatorPolicyInterface',
       'PhabricatorDestructibleInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'PhrictionContentPHIDType' => 'PhabricatorPHIDType',
     'PhrictionContentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhrictionContentSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
+    'PhrictionContentSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhrictionController' => 'PhabricatorController',
     'PhrictionCreateConduitAPIMethod' => 'PhrictionConduitAPIMethod',
     'PhrictionDAO' => 'PhabricatorLiskDAO',
diff --git a/src/applications/phriction/conduit/PhrictionContentSearchConduitAPIMethod.php b/src/applications/phriction/conduit/PhrictionContentSearchConduitAPIMethod.php
new file mode 100644
index 0000000000..2f40130782
--- /dev/null
+++ b/src/applications/phriction/conduit/PhrictionContentSearchConduitAPIMethod.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhrictionContentSearchConduitAPIMethod
+  extends PhabricatorSearchEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'phriction.content.search';
+  }
+
+  public function newSearchEngine() {
+    return new PhrictionContentSearchEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht('Read information about Phriction document history.');
+  }
+
+}
diff --git a/src/applications/phriction/query/PhrictionContentSearchEngine.php b/src/applications/phriction/query/PhrictionContentSearchEngine.php
new file mode 100644
index 0000000000..f7cd9be2b6
--- /dev/null
+++ b/src/applications/phriction/query/PhrictionContentSearchEngine.php
@@ -0,0 +1,76 @@
+<?php
+
+final class PhrictionContentSearchEngine
+  extends PhabricatorApplicationSearchEngine {
+
+  public function getResultTypeDescription() {
+    return pht('Phriction Document Content');
+  }
+
+  public function getApplicationClassName() {
+    return 'PhabricatorPhrictionApplication';
+  }
+
+  public function newQuery() {
+    return new PhrictionContentQuery();
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+
+    if ($map['documentPHIDs']) {
+      $query->withDocumentPHIDs($map['documentPHIDs']);
+    }
+
+    if ($map['versions']) {
+      $query->withVersions($map['versions']);
+    }
+
+    return $query;
+  }
+
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorPHIDsSearchField())
+        ->setKey('documentPHIDs')
+        ->setAliases(array('document', 'documents', 'documentPHID'))
+        ->setLabel(pht('Documents')),
+      id(new PhabricatorIDsSearchField())
+        ->setKey('versions')
+        ->setAliases(array('version')),
+    );
+  }
+
+  protected function getURI($path) {
+    // There's currently no web UI for this search interface, it exists purely
+    // to power the Conduit API.
+    throw new PhutilMethodNotImplementedException();
+  }
+
+  protected function getBuiltinQueryNames() {
+    return array(
+      'all' => pht('All Content'),
+    );
+  }
+
+  public function buildSavedQueryFromBuiltin($query_key) {
+    $query = $this->newSavedQuery();
+    $query->setQueryKey($query_key);
+
+    switch ($query_key) {
+      case 'all':
+        return $query;
+    }
+
+    return parent::buildSavedQueryFromBuiltin($query_key);
+  }
+
+  protected function renderResultList(
+    array $contents,
+    PhabricatorSavedQuery $query,
+    array $handles) {
+    assert_instances_of($contents, 'PhrictionContent');
+    throw new PhutilMethodNotImplementedException();
+  }
+
+}
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index 390da64682..dc6bf19faa 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -4,7 +4,8 @@ final class PhrictionContent
   extends PhrictionDAO
   implements
     PhabricatorPolicyInterface,
-    PhabricatorDestructibleInterface {
+    PhabricatorDestructibleInterface,
+    PhabricatorConduitResultInterface {
 
   protected $documentID;
   protected $version;
@@ -103,4 +104,37 @@ public function destroyObjectPermanently(
     $this->delete();
   }
 
+
+/* -(  PhabricatorConduitResultInterface  )---------------------------------- */
+
+
+  public function getFieldSpecificationsForConduit() {
+    return array(
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('documentPHID')
+        ->setType('phid')
+        ->setDescription(pht('Document this content is for.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('version')
+        ->setType('int')
+        ->setDescription(pht('Content version.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('authorPHID')
+        ->setType('phid')
+        ->setDescription(pht('Author of this version of the content.')),
+    );
+  }
+
+  public function getFieldValuesForConduit() {
+    return array(
+      'documentPHID' => $this->getDocument()->getPHID(),
+      'version' => (int)$this->getVersion(),
+      'authorPHID' => $this->getAuthorPHID(),
+    );
+  }
+
+  public function getConduitSearchAttachments() {
+    return array();
+  }
+
 }

From 48eb82f229be44917e9d99a3cb0848e3841565bf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 08:28:19 -0800
Subject: [PATCH 587/865] Freeze "phriction.history" in favor of
 "phriction.content.search"

Summary: Depends on D19097. Ref T13077. Freeze the older method now that the newer one is available.

Test Plan: Viewed the older method's page and saw it frozen; called it to make sure I didn't break it by accident.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19098
---
 .../conduit/PhrictionHistoryConduitAPIMethod.php       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php b/src/applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php
index 454af2934a..f030420594 100644
--- a/src/applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php
+++ b/src/applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php
@@ -10,6 +10,16 @@ public function getMethodDescription() {
     return pht('Retrieve history about a Phriction document.');
   }
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_FROZEN;
+  }
+
+  public function getMethodStatusDescription() {
+    return pht(
+      'This method is frozen and will eventually be deprecated. New code '.
+      'should use "phriction.content.search" instead.');
+  }
+
   protected function defineParamTypes() {
     return array(
       'slug' => 'required string',

From c1056f6dab5352ac8d13ab74f4c2be8b88a13ce4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 08:35:35 -0800
Subject: [PATCH 588/865] Partially clean up Phriction document status
 constants; introduce "phriction.document.search"

Summary:
Depends on D19098. Ref T13077.

Phriction status constants currently use the "bag of statuses" approach typical of older code, and store integers in the database.

This fixes the "bag of statuses" stuff; a future change will fix the integers.

Also adds a skeleton for `phriction.document.search`, but doesn't implement the Conduit interface yet.

Test Plan: Searched for documents with various status constraints. Grepped for removed status constants. Viewed document list.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19099
---
 src/__phutil_library_map__.php                |  8 ++--
 ...hrictionDocumentSearchConduitAPIMethod.php | 18 ++++++++
 .../constants/PhrictionDocumentStatus.php     | 44 ++++++++++++++++++-
 .../controller/PhrictionController.php        |  2 +-
 .../controller/PhrictionListController.php    |  2 +-
 .../query/PhrictionDocumentQuery.php          | 42 ++----------------
 ....php => PhrictionDocumentSearchEngine.php} | 44 ++++++++-----------
 .../search/PhrictionDocumentFerretEngine.php  |  2 +-
 .../phriction/storage/PhrictionDocument.php   | 23 ++++++++++
 9 files changed, 114 insertions(+), 71 deletions(-)
 create mode 100644 src/applications/phriction/conduit/PhrictionDocumentSearchConduitAPIMethod.php
 rename src/applications/phriction/query/{PhrictionSearchEngine.php => PhrictionDocumentSearchEngine.php} (72%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3f42c58c66..4c9d40d9bc 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4870,6 +4870,8 @@
     'PhrictionDocumentPHIDType' => 'applications/phriction/phid/PhrictionDocumentPHIDType.php',
     'PhrictionDocumentPathHeraldField' => 'applications/phriction/herald/PhrictionDocumentPathHeraldField.php',
     'PhrictionDocumentQuery' => 'applications/phriction/query/PhrictionDocumentQuery.php',
+    'PhrictionDocumentSearchConduitAPIMethod' => 'applications/phriction/conduit/PhrictionDocumentSearchConduitAPIMethod.php',
+    'PhrictionDocumentSearchEngine' => 'applications/phriction/query/PhrictionDocumentSearchEngine.php',
     'PhrictionDocumentStatus' => 'applications/phriction/constants/PhrictionDocumentStatus.php',
     'PhrictionDocumentTitleHeraldField' => 'applications/phriction/herald/PhrictionDocumentTitleHeraldField.php',
     'PhrictionDocumentTitleTransaction' => 'applications/phriction/xaction/PhrictionDocumentTitleTransaction.php',
@@ -4886,7 +4888,6 @@
     'PhrictionRemarkupRule' => 'applications/phriction/markup/PhrictionRemarkupRule.php',
     'PhrictionReplyHandler' => 'applications/phriction/mail/PhrictionReplyHandler.php',
     'PhrictionSchemaSpec' => 'applications/phriction/storage/PhrictionSchemaSpec.php',
-    'PhrictionSearchEngine' => 'applications/phriction/query/PhrictionSearchEngine.php',
     'PhrictionTransaction' => 'applications/phriction/storage/PhrictionTransaction.php',
     'PhrictionTransactionComment' => 'applications/phriction/storage/PhrictionTransactionComment.php',
     'PhrictionTransactionEditor' => 'applications/phriction/editor/PhrictionTransactionEditor.php',
@@ -10799,7 +10800,9 @@
     'PhrictionDocumentPHIDType' => 'PhabricatorPHIDType',
     'PhrictionDocumentPathHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhrictionDocumentStatus' => 'PhrictionConstants',
+    'PhrictionDocumentSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
+    'PhrictionDocumentSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'PhrictionDocumentStatus' => 'PhabricatorObjectStatus',
     'PhrictionDocumentTitleHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentTitleTransaction' => 'PhrictionDocumentTransactionType',
     'PhrictionDocumentTransactionType' => 'PhabricatorModularTransactionType',
@@ -10815,7 +10818,6 @@
     'PhrictionRemarkupRule' => 'PhutilRemarkupRule',
     'PhrictionReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
     'PhrictionSchemaSpec' => 'PhabricatorConfigSchemaSpec',
-    'PhrictionSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhrictionTransaction' => 'PhabricatorModularTransaction',
     'PhrictionTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'PhrictionTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
diff --git a/src/applications/phriction/conduit/PhrictionDocumentSearchConduitAPIMethod.php b/src/applications/phriction/conduit/PhrictionDocumentSearchConduitAPIMethod.php
new file mode 100644
index 0000000000..f51faede5f
--- /dev/null
+++ b/src/applications/phriction/conduit/PhrictionDocumentSearchConduitAPIMethod.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhrictionDocumentSearchConduitAPIMethod
+  extends PhabricatorSearchEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'phriction.document.search';
+  }
+
+  public function newSearchEngine() {
+    return new PhrictionDocumentSearchEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht('Read information about Phriction documents.');
+  }
+
+}
diff --git a/src/applications/phriction/constants/PhrictionDocumentStatus.php b/src/applications/phriction/constants/PhrictionDocumentStatus.php
index 11e75ec8a3..b042cd78d3 100644
--- a/src/applications/phriction/constants/PhrictionDocumentStatus.php
+++ b/src/applications/phriction/constants/PhrictionDocumentStatus.php
@@ -1,6 +1,7 @@
 <?php
 
-final class PhrictionDocumentStatus extends PhrictionConstants {
+final class PhrictionDocumentStatus
+  extends PhabricatorObjectStatus {
 
   const STATUS_EXISTS     = 0;
   const STATUS_DELETED    = 1;
@@ -18,4 +19,45 @@ public static function getConduitConstant($const) {
     return idx($map, $const, 'unknown');
   }
 
+  public static function newStatusObject($key) {
+    return new self($key, id(new self())->getStatusSpecification($key));
+  }
+
+  public static function getStatusMap() {
+    $map = id(new self())->getStatusSpecifications();
+    return ipull($map, 'name', 'key');
+  }
+
+  public function isActive() {
+    return ($this->getKey() == self::STATUS_EXISTS);
+  }
+
+  protected function newStatusSpecifications() {
+    return array(
+      array(
+        'key' => self::STATUS_EXISTS,
+        'name' => pht('Active'),
+        'icon' => 'fa-file-text-o',
+        'color' => 'bluegrey',
+      ),
+      array(
+        'key' => self::STATUS_DELETED,
+        'name' => pht('Deleted'),
+        'icon' => 'fa-file-text-o',
+        'color' => 'grey',
+      ),
+      array(
+        'key' => self::STATUS_MOVED,
+        'name' => pht('Moved'),
+        'icon' => 'fa-arrow-right',
+        'color' => 'grey',
+      ),
+      array(
+        'key' => self::STATUS_STUB,
+        'name' => pht('Stub'),
+        'icon' => 'fa-file-text-o',
+        'color' => 'grey',
+      ),
+    );
+  }
 }
diff --git a/src/applications/phriction/controller/PhrictionController.php b/src/applications/phriction/controller/PhrictionController.php
index 277692334f..51ffbcab1f 100644
--- a/src/applications/phriction/controller/PhrictionController.php
+++ b/src/applications/phriction/controller/PhrictionController.php
@@ -13,7 +13,7 @@ public function buildSideNavView($for_app = false) {
       $nav->addFilter('/phriction/', pht('Index'));
     }
 
-    id(new PhrictionSearchEngine())
+    id(new PhrictionDocumentSearchEngine())
       ->setViewer($user)
       ->addNavigationItems($nav->getMenu());
 
diff --git a/src/applications/phriction/controller/PhrictionListController.php b/src/applications/phriction/controller/PhrictionListController.php
index 44ef95f178..7da29b297d 100644
--- a/src/applications/phriction/controller/PhrictionListController.php
+++ b/src/applications/phriction/controller/PhrictionListController.php
@@ -12,7 +12,7 @@ public function handleRequest(AphrontRequest $request) {
 
     $controller = id(new PhabricatorApplicationSearchController())
       ->setQueryKey($querykey)
-      ->setSearchEngine(new PhrictionSearchEngine())
+      ->setSearchEngine(new PhrictionDocumentSearchEngine())
       ->setNavigation($this->buildSideNavView());
 
     return $this->delegateToController($controller);
diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php
index b5118146d3..f6073b2907 100644
--- a/src/applications/phriction/query/PhrictionDocumentQuery.php
+++ b/src/applications/phriction/query/PhrictionDocumentQuery.php
@@ -12,12 +12,7 @@ final class PhrictionDocumentQuery
 
   private $needContent;
 
-  private $status       = 'status-any';
-  const STATUS_ANY      = 'status-any';
-  const STATUS_OPEN     = 'status-open';
-  const STATUS_NONSTUB  = 'status-nonstub';
-
-  const ORDER_HIERARCHY = 'order-hierarchy';
+  const ORDER_HIERARCHY = 'hierarchy';
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -49,11 +44,6 @@ public function withStatuses(array $statuses) {
     return $this;
   }
 
-  public function withStatus($status) {
-    $this->status = $status;
-    return $this;
-  }
-
   public function needContent($need_content) {
     $this->needContent = $need_content;
     return $this;
@@ -224,42 +214,16 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->depths);
     }
 
-    switch ($this->status) {
-      case self::STATUS_OPEN:
-        $where[] = qsprintf(
-          $conn,
-          'd.status NOT IN (%Ld)',
-          array(
-            PhrictionDocumentStatus::STATUS_DELETED,
-            PhrictionDocumentStatus::STATUS_MOVED,
-            PhrictionDocumentStatus::STATUS_STUB,
-          ));
-        break;
-      case self::STATUS_NONSTUB:
-        $where[] = qsprintf(
-          $conn,
-          'd.status NOT IN (%Ld)',
-          array(
-            PhrictionDocumentStatus::STATUS_MOVED,
-            PhrictionDocumentStatus::STATUS_STUB,
-          ));
-        break;
-      case self::STATUS_ANY:
-        break;
-      default:
-        throw new Exception(pht("Unknown status '%s'!", $this->status));
-    }
-
     return $where;
   }
 
   public function getBuiltinOrders() {
-    return array(
+    return parent::getBuiltinOrders() + array(
       self::ORDER_HIERARCHY => array(
         'vector' => array('depth', 'title', 'updated'),
         'name' => pht('Hierarchy'),
       ),
-    ) + parent::getBuiltinOrders();
+    );
   }
 
   public function getOrderableColumns() {
diff --git a/src/applications/phriction/query/PhrictionSearchEngine.php b/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
similarity index 72%
rename from src/applications/phriction/query/PhrictionSearchEngine.php
rename to src/applications/phriction/query/PhrictionDocumentSearchEngine.php
index 245500e0ff..e578b48346 100644
--- a/src/applications/phriction/query/PhrictionSearchEngine.php
+++ b/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhrictionSearchEngine
+final class PhrictionDocumentSearchEngine
   extends PhabricatorApplicationSearchEngine {
 
   public function getResultTypeDescription() {
@@ -13,15 +13,14 @@ public function getApplicationClassName() {
 
   public function newQuery() {
     return id(new PhrictionDocumentQuery())
-      ->needContent(true)
-      ->withStatus(PhrictionDocumentQuery::STATUS_NONSTUB);
+      ->needContent(true);
   }
 
   protected function buildQueryFromParameters(array $map) {
     $query = $this->newQuery();
 
-    if ($map['status']) {
-      $query->withStatus($map['status']);
+    if ($map['statuses']) {
+      $query->withStatuses($map['statuses']);
     }
 
     return $query;
@@ -29,10 +28,10 @@ protected function buildQueryFromParameters(array $map) {
 
   protected function buildCustomSearchFields() {
     return array(
-      id(new PhabricatorSearchSelectField())
-        ->setKey('status')
+      id(new PhabricatorSearchCheckboxesField())
+        ->setKey('statuses')
         ->setLabel(pht('Status'))
-        ->setOptions($this->getStatusOptions()),
+        ->setOptions(PhrictionDocumentStatus::getStatusMap()),
     );
   }
 
@@ -59,19 +58,15 @@ public function buildSavedQueryFromBuiltin($query_key) {
         return $query;
       case 'active':
         return $query->setParameter(
-          'status', PhrictionDocumentQuery::STATUS_OPEN);
+          'statuses',
+          array(
+            PhrictionDocumentStatus::STATUS_EXISTS,
+          ));
     }
 
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
-  private function getStatusOptions() {
-    return array(
-      PhrictionDocumentQuery::STATUS_OPEN => pht('Show Active Documents'),
-      PhrictionDocumentQuery::STATUS_NONSTUB => pht('Show All Documents'),
-    );
-  }
-
   protected function getRequiredHandlePHIDsForResultList(
     array $documents,
     PhabricatorSavedQuery $query) {
@@ -118,15 +113,14 @@ protected function renderResultList(
 
       $item->addAttribute($slug_uri);
 
-      switch ($document->getStatus()) {
-        case PhrictionDocumentStatus::STATUS_DELETED:
-          $item->setDisabled(true);
-          $item->addIcon('delete', pht('Deleted'));
-          break;
-        case PhrictionDocumentStatus::STATUS_MOVED:
-          $item->setDisabled(true);
-          $item->addIcon('arrow-right', pht('Moved Away'));
-          break;
+      $icon = $document->getStatusIcon();
+      $color = $document->getStatusColor();
+      $label = $document->getStatusDisplayName();
+
+      $item->setStatusIcon("{$icon} {$color}", $label);
+
+      if (!$document->isActive()) {
+        $item->setDisabled(true);
       }
 
       $list->addItem($item);
diff --git a/src/applications/phriction/search/PhrictionDocumentFerretEngine.php b/src/applications/phriction/search/PhrictionDocumentFerretEngine.php
index 76802391e7..498b9274f0 100644
--- a/src/applications/phriction/search/PhrictionDocumentFerretEngine.php
+++ b/src/applications/phriction/search/PhrictionDocumentFerretEngine.php
@@ -12,7 +12,7 @@ public function getScopeName() {
   }
 
   public function newSearchEngine() {
-    return new PhrictionSearchEngine();
+    return new PhrictionDocumentSearchEngine();
   }
 
 }
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 0a9f09afdd..730b8e09bf 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -148,6 +148,29 @@ public function attachAncestor($slug, $ancestor) {
     return $this;
   }
 
+/* -(  Status  )------------------------------------------------------------- */
+
+
+  public function getStatusObject() {
+    return PhrictionDocumentStatus::newStatusObject($this->getStatus());
+  }
+
+  public function getStatusIcon() {
+    return $this->getStatusObject()->getIcon();
+  }
+
+  public function getStatusColor() {
+    return $this->getStatusObject()->getColor();
+  }
+
+  public function getStatusDisplayName() {
+    return $this->getStatusObject()->getDisplayName();
+  }
+
+  public function isActive() {
+    return $this->getStatusObject()->isActive();
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 

From 143350fdba487388e31cba1fccaa1f3707596795 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 12:34:56 -0800
Subject: [PATCH 589/865] Give Phriction documents modern string status
 constants instead of numeric constants

Summary:
Depends on D19099. Ref T13077. Updates Phriction documents to string constants to make API interactions cleaner and statuses more practical to extend.

This does not seem to require any transaction migrations because none of the Phriction transactions actually store status values: status is always a side effect of other edits.

Test Plan: Created, edited, deleted, moved documents. Saw appropriate UI cues. Browsed and filtered documents by status in the index.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19100
---
 .../autopatches/20180215.phriction.05.statustext.sql  |  2 ++
 .../autopatches/20180215.phriction.06.statusvalue.sql | 11 +++++++++++
 .../phriction/constants/PhrictionDocumentStatus.php   |  8 ++++----
 .../phriction/query/PhrictionDocumentQuery.php        |  2 +-
 .../phriction/storage/PhrictionDocument.php           |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 resources/sql/autopatches/20180215.phriction.05.statustext.sql
 create mode 100644 resources/sql/autopatches/20180215.phriction.06.statusvalue.sql

diff --git a/resources/sql/autopatches/20180215.phriction.05.statustext.sql b/resources/sql/autopatches/20180215.phriction.05.statustext.sql
new file mode 100644
index 0000000000..756f7ac968
--- /dev/null
+++ b/resources/sql/autopatches/20180215.phriction.05.statustext.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_document
+  CHANGE status status VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180215.phriction.06.statusvalue.sql b/resources/sql/autopatches/20180215.phriction.06.statusvalue.sql
new file mode 100644
index 0000000000..381de77643
--- /dev/null
+++ b/resources/sql/autopatches/20180215.phriction.06.statusvalue.sql
@@ -0,0 +1,11 @@
+UPDATE {$NAMESPACE}_phriction.phriction_document
+  SET status = 'active' WHERE status = '0';
+
+UPDATE {$NAMESPACE}_phriction.phriction_document
+  SET status = 'deleted' WHERE status = '1';
+
+UPDATE {$NAMESPACE}_phriction.phriction_document
+  SET status = 'moved' WHERE status = '2';
+
+UPDATE {$NAMESPACE}_phriction.phriction_document
+  SET status = 'stub' WHERE status = '3';
diff --git a/src/applications/phriction/constants/PhrictionDocumentStatus.php b/src/applications/phriction/constants/PhrictionDocumentStatus.php
index b042cd78d3..1830f3ec95 100644
--- a/src/applications/phriction/constants/PhrictionDocumentStatus.php
+++ b/src/applications/phriction/constants/PhrictionDocumentStatus.php
@@ -3,10 +3,10 @@
 final class PhrictionDocumentStatus
   extends PhabricatorObjectStatus {
 
-  const STATUS_EXISTS     = 0;
-  const STATUS_DELETED    = 1;
-  const STATUS_MOVED      = 2;
-  const STATUS_STUB       = 3;
+  const STATUS_EXISTS = 'active';
+  const STATUS_DELETED = 'deleted';
+  const STATUS_MOVED = 'moved';
+  const STATUS_STUB = 'stub';
 
   public static function getConduitConstant($const) {
     static $map = array(
diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php
index f6073b2907..de3064fd42 100644
--- a/src/applications/phriction/query/PhrictionDocumentQuery.php
+++ b/src/applications/phriction/query/PhrictionDocumentQuery.php
@@ -196,7 +196,7 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->statuses !== null) {
       $where[] = qsprintf(
         $conn,
-        'd.status IN (%Ld)',
+        'd.status IN (%Ls)',
         $this->statuses);
     }
 
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 730b8e09bf..1942f16efe 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -31,7 +31,7 @@ protected function getConfiguration() {
         'slug' => 'sort128',
         'depth' => 'uint32',
         'contentID' => 'id?',
-        'status' => 'uint32',
+        'status' => 'text32',
         'mailKey' => 'bytes20',
       ),
       self::CONFIG_KEY_SCHEMA => array(

From 45403b162aa52fad1eb739bcb409e58a432207ad Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Feb 2018 17:02:23 -0800
Subject: [PATCH 590/865] Flesh out "phriction.document.search" slightly and
 provide page text for content/documents

Summary: Depends on D19100. Ref T13077. Adds a "content" attachment to get the actual page text. This works on both "phriction.document.search" and "phriction.content.search".

Test Plan: Called both API methods with the attachment, saw proper text content returned.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19103
---
 src/__phutil_library_map__.php                |  3 ++
 ...PhrictionContentSearchEngineAttachment.php | 31 +++++++++++++++
 .../phriction/storage/PhrictionContent.php    | 10 ++---
 .../phriction/storage/PhrictionDocument.php   | 38 ++++++++++++++++++-
 4 files changed, 75 insertions(+), 7 deletions(-)
 create mode 100644 src/applications/phriction/engineextension/PhrictionContentSearchEngineAttachment.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4c9d40d9bc..f04f930863 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4849,6 +4849,7 @@
     'PhrictionContentQuery' => 'applications/phriction/query/PhrictionContentQuery.php',
     'PhrictionContentSearchConduitAPIMethod' => 'applications/phriction/conduit/PhrictionContentSearchConduitAPIMethod.php',
     'PhrictionContentSearchEngine' => 'applications/phriction/query/PhrictionContentSearchEngine.php',
+    'PhrictionContentSearchEngineAttachment' => 'applications/phriction/engineextension/PhrictionContentSearchEngineAttachment.php',
     'PhrictionController' => 'applications/phriction/controller/PhrictionController.php',
     'PhrictionCreateConduitAPIMethod' => 'applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php',
     'PhrictionDAO' => 'applications/phriction/storage/PhrictionDAO.php',
@@ -10768,6 +10769,7 @@
     'PhrictionContentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhrictionContentSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'PhrictionContentSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'PhrictionContentSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'PhrictionController' => 'PhabricatorController',
     'PhrictionCreateConduitAPIMethod' => 'PhrictionConduitAPIMethod',
     'PhrictionDAO' => 'PhabricatorLiskDAO',
@@ -10784,6 +10786,7 @@
       'PhabricatorFerretInterface',
       'PhabricatorProjectInterface',
       'PhabricatorApplicationTransactionInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'PhrictionDocumentAuthorHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentContentHeraldField' => 'PhrictionDocumentHeraldField',
diff --git a/src/applications/phriction/engineextension/PhrictionContentSearchEngineAttachment.php b/src/applications/phriction/engineextension/PhrictionContentSearchEngineAttachment.php
new file mode 100644
index 0000000000..3321f23eb0
--- /dev/null
+++ b/src/applications/phriction/engineextension/PhrictionContentSearchEngineAttachment.php
@@ -0,0 +1,31 @@
+<?php
+
+final class PhrictionContentSearchEngineAttachment
+  extends PhabricatorSearchEngineAttachment {
+
+  public function getAttachmentName() {
+    return pht('Document Content');
+  }
+
+  public function getAttachmentDescription() {
+    return pht('Get the content of documents or document histories.');
+  }
+
+  public function getAttachmentForObject($object, $data, $spec) {
+    if ($object instanceof PhrictionDocument) {
+      $content = $object->getContent();
+    } else {
+      $content = $object;
+    }
+
+    return array(
+      'title' => $content->getTitle(),
+      'path' => $content->getSlug(),
+      'authorPHID' => $content->getAuthorPHID(),
+      'content' => array(
+        'raw' => $content->getContent(),
+      ),
+    );
+  }
+
+}
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index dc6bf19faa..80fabcaddc 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -118,10 +118,6 @@ public function getFieldSpecificationsForConduit() {
         ->setKey('version')
         ->setType('int')
         ->setDescription(pht('Content version.')),
-      id(new PhabricatorConduitSearchFieldSpecification())
-        ->setKey('authorPHID')
-        ->setType('phid')
-        ->setDescription(pht('Author of this version of the content.')),
     );
   }
 
@@ -129,12 +125,14 @@ public function getFieldValuesForConduit() {
     return array(
       'documentPHID' => $this->getDocument()->getPHID(),
       'version' => (int)$this->getVersion(),
-      'authorPHID' => $this->getAuthorPHID(),
     );
   }
 
   public function getConduitSearchAttachments() {
-    return array();
+    return array(
+      id(new PhrictionContentSearchEngineAttachment())
+        ->setAttachmentKey('content'),
+    );
   }
 
 }
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 1942f16efe..58d7cbee4a 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -10,7 +10,8 @@ final class PhrictionDocument extends PhrictionDAO
     PhabricatorFulltextInterface,
     PhabricatorFerretInterface,
     PhabricatorProjectInterface,
-    PhabricatorApplicationTransactionInterface {
+    PhabricatorApplicationTransactionInterface,
+    PhabricatorConduitResultInterface {
 
   protected $slug;
   protected $depth;
@@ -288,4 +289,39 @@ public function newFerretEngine() {
     return new PhrictionDocumentFerretEngine();
   }
 
+
+/* -(  PhabricatorConduitResultInterface  )---------------------------------- */
+
+
+  public function getFieldSpecificationsForConduit() {
+    return array(
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('path')
+        ->setType('string')
+        ->setDescription(pht('The path to the document.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('status')
+        ->setType('map<string, wild>')
+        ->setDescription(pht('Status information about the document.')),
+    );
+  }
+
+  public function getFieldValuesForConduit() {
+    $status = array(
+      'value' => $this->getStatus(),
+      'name' => $this->getStatusDisplayName(),
+    );
+
+    return array(
+      'path' => $this->getSlug(),
+      'status' => $status,
+    );
+  }
+
+  public function getConduitSearchAttachments() {
+    return array(
+      id(new PhrictionContentSearchEngineAttachment())
+        ->setAttachmentKey('content'),
+    );
+  }
 }

From f713e1dfc160009a7ee0d1b2b73e0f9aff29e7d3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 04:30:48 -0800
Subject: [PATCH 591/865] Add Owners Package support for "Commit Hook: Content"
 Herald rules

Summary:
See PHI370. Support the "Affected packages" and "Affected package owners" Herald fields in pre-commit hooks.

I believe there's no technical reason these fields aren't supported and this was just overlooked.

Test Plan: Wrote a rule which makes use of the new fields, pushed commits through it. Checked transcripts and saw sensible-looking values.

Differential Revision: https://secure.phabricator.com/D19104
---
 src/__phutil_library_map__.php                |  4 +++
 ...sionPreCommitContentPackageHeraldField.php | 29 ++++++++++++++++
 ...reCommitContentPackageOwnerHeraldField.php | 34 +++++++++++++++++++
 .../herald/HeraldPreCommitContentAdapter.php  | 14 ++++++++
 .../PhabricatorEmailFormatSettingsPanel.php   |  5 ++-
 5 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/diffusion/herald/DiffusionPreCommitContentPackageHeraldField.php
 create mode 100644 src/applications/diffusion/herald/DiffusionPreCommitContentPackageOwnerHeraldField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f04f930863..c2ee4966c1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -812,6 +812,8 @@
     'DiffusionPreCommitContentHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentHeraldField.php',
     'DiffusionPreCommitContentMergeHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentMergeHeraldField.php',
     'DiffusionPreCommitContentMessageHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentMessageHeraldField.php',
+    'DiffusionPreCommitContentPackageHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentPackageHeraldField.php',
+    'DiffusionPreCommitContentPackageOwnerHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentPackageOwnerHeraldField.php',
     'DiffusionPreCommitContentPusherHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentPusherHeraldField.php',
     'DiffusionPreCommitContentPusherIsCommitterHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentPusherIsCommitterHeraldField.php',
     'DiffusionPreCommitContentPusherProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php',
@@ -6007,6 +6009,8 @@
     'DiffusionPreCommitContentHeraldField' => 'HeraldField',
     'DiffusionPreCommitContentMergeHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentMessageHeraldField' => 'DiffusionPreCommitContentHeraldField',
+    'DiffusionPreCommitContentPackageHeraldField' => 'DiffusionPreCommitContentHeraldField',
+    'DiffusionPreCommitContentPackageOwnerHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentPusherHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentPusherIsCommitterHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentPusherProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentPackageHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentPackageHeraldField.php
new file mode 100644
index 0000000000..084d3b2d00
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentPackageHeraldField.php
@@ -0,0 +1,29 @@
+<?php
+
+final class DiffusionPreCommitContentPackageHeraldField
+  extends DiffusionPreCommitContentHeraldField {
+
+  const FIELDCONST = 'diffusion.pre.content.package';
+
+  public function getHeraldFieldName() {
+    return pht('Affected packages');
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldRelatedFieldGroup::FIELDGROUPKEY;
+  }
+
+  public function getHeraldFieldValue($object) {
+    $packages = $this->getAdapter()->loadAffectedPackages();
+    return mpull($packages, 'getPHID');
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new PhabricatorOwnersPackageDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentPackageOwnerHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentPackageOwnerHeraldField.php
new file mode 100644
index 0000000000..564ef36827
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentPackageOwnerHeraldField.php
@@ -0,0 +1,34 @@
+<?php
+
+final class DiffusionPreCommitContentPackageOwnerHeraldField
+  extends DiffusionPreCommitContentHeraldField {
+
+  const FIELDCONST = 'diffusion.pre.content.package.owners';
+
+  public function getHeraldFieldName() {
+    return pht('Affected package owners');
+  }
+
+  public function getFieldGroupKey() {
+    return HeraldRelatedFieldGroup::FIELDGROUPKEY;
+  }
+
+  public function getHeraldFieldValue($object) {
+    $packages = $this->getAdapter()->loadAffectedPackages();
+    if (!$packages) {
+      return array();
+    }
+
+    $owners = PhabricatorOwnersOwner::loadAllForPackages($packages);
+    return mpull($owners, 'getUserPHID');
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new PhabricatorProjectOrUserDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
index c93ba32345..cee5f97419 100644
--- a/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
+++ b/src/applications/diffusion/herald/HeraldPreCommitContentAdapter.php
@@ -7,6 +7,8 @@ final class HeraldPreCommitContentAdapter extends HeraldPreCommitAdapter {
   private $fields;
   private $revision = false;
 
+  private $affectedPackages;
+
   public function getAdapterContentName() {
     return pht('Commit Hook: Commit Content');
   }
@@ -223,4 +225,16 @@ public function getBranches() {
       $this->getObject()->getRefNew());
   }
 
+  public function loadAffectedPackages() {
+    if ($this->affectedPackages === null) {
+      $packages = PhabricatorOwnersPackage::loadAffectedPackages(
+        $this->getHookEngine()->getRepository(),
+        $this->getDiffContent('name'));
+      $this->affectedPackages = $packages;
+    }
+
+    return $this->affectedPackages;
+  }
+
+
 }
diff --git a/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
index bdc3c994b3..51ff40ed9d 100644
--- a/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php
@@ -18,7 +18,9 @@ public function isUserPanel() {
   }
 
   public function isManagementPanel() {
-    if (!$this->isUserPanel()) {
+    return false;
+/*
+        if (!$this->isUserPanel()) {
       return false;
     }
 
@@ -27,6 +29,7 @@ public function isManagementPanel() {
     }
 
     return false;
+*/
   }
 
   public function isTemplatePanel() {

From bfdc9411f705cc47ad15e128e15b2c7f959715cb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 04:58:46 -0800
Subject: [PATCH 592/865] Provide context objects for remarkup mail rendering,
 fixing Phriction relative URIs in initial email

Summary:
Fixes T10969. Ref T13077. When you create a Phriction document with a relative link (`[[ ./path/to/page ]]`) the initial email currently points to the wrong place.

This is because the context object (the page) isn't passed to the markup engine. Without this context, the relative link is rendered as though it appeared somewhere else (like a task or revision) where relative links don't make sense.

Test Plan: Created a new Phriction document with a relative link to `[[ ./porcupine_facts/starmap ]]`, saw a usable link in the resulting email.

Maniphest Tasks: T13077, T10969

Differential Revision: https://secure.phabricator.com/D19105
---
 .../view/PhabricatorMetaMTAMailBody.php       | 41 +++++++++++++++----
 .../markup/PhrictionRemarkupRule.php          | 38 ++++++++++++-----
 ...habricatorApplicationTransactionEditor.php |  6 ++-
 3 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
index 8a21a75cfb..6aaf4fb052 100644
--- a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
+++ b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php
@@ -13,6 +13,7 @@ final class PhabricatorMetaMTAMailBody extends Phobject {
   private $attachments = array();
 
   private $viewer;
+  private $contextObject;
 
   public function getViewer() {
     return $this->viewer;
@@ -23,6 +24,16 @@ public function setViewer($viewer) {
     return $this;
   }
 
+  public function setContextObject($context_object) {
+    $this->contextObject = $context_object;
+    return $this;
+  }
+
+  public function getContextObject() {
+    return $this->contextObject;
+  }
+
+
 /* -(  Composition  )-------------------------------------------------------- */
 
 
@@ -45,9 +56,9 @@ public function addRawSection($text) {
 
   public function addRemarkupSection($header, $text) {
     try {
-      $engine = PhabricatorMarkupEngine::newMarkupEngine(array());
-      $engine->setConfig('viewer', $this->getViewer());
-      $engine->setMode(PhutilRemarkupEngine::MODE_TEXT);
+      $engine = $this->newMarkupEngine()
+        ->setMode(PhutilRemarkupEngine::MODE_TEXT);
+
       $styled_text = $engine->markupText($text);
       $this->addPlaintextSection($header, $styled_text);
     } catch (Exception $ex) {
@@ -56,12 +67,9 @@ public function addRemarkupSection($header, $text) {
     }
 
     try {
-      $mail_engine = PhabricatorMarkupEngine::newMarkupEngine(array());
-      $mail_engine->setConfig('viewer', $this->getViewer());
-      $mail_engine->setMode(PhutilRemarkupEngine::MODE_HTML_MAIL);
-      $mail_engine->setConfig(
-        'uri.base',
-        PhabricatorEnv::getProductionURI('/'));
+      $mail_engine = $this->newMarkupEngine()
+        ->setMode(PhutilRemarkupEngine::MODE_HTML_MAIL);
+
       $html = $mail_engine->markupText($text);
       $this->addHTMLSection($header, $html);
     } catch (Exception $ex) {
@@ -215,4 +223,19 @@ public function getAttachments() {
   private function indent($text) {
     return rtrim("  ".str_replace("\n", "\n  ", $text));
   }
+
+
+  private function newMarkupEngine() {
+    $engine = PhabricatorMarkupEngine::newMarkupEngine(array())
+      ->setConfig('viewer', $this->getViewer())
+      ->setConfig('uri.base', PhabricatorEnv::getProductionURI('/'));
+
+    $context = $this->getContextObject();
+    if ($context) {
+      $engine->setConfig('contextObject', $context);
+    }
+
+    return $engine;
+  }
+
 }
diff --git a/src/applications/phriction/markup/PhrictionRemarkupRule.php b/src/applications/phriction/markup/PhrictionRemarkupRule.php
index 9c5649bbbe..c4bc1f7249 100644
--- a/src/applications/phriction/markup/PhrictionRemarkupRule.php
+++ b/src/applications/phriction/markup/PhrictionRemarkupRule.php
@@ -28,17 +28,7 @@ public function markupDocumentLink(array $matches) {
 
     // Handle relative links.
     if ((substr($link, 0, 2) === './') || (substr($link, 0, 3) === '../')) {
-      $base = null;
-      $context = $this->getEngine()->getConfig('contextObject');
-      if ($context !== null && $context instanceof PhrictionContent) {
-        // Handle content when it's being rendered in document view.
-        $base = $context->getSlug();
-      }
-      if ($context !== null && is_array($context) &&
-          idx($context, 'phriction.isPreview')) {
-        // Handle content when it's a preview for the Phriction editor.
-        $base = idx($context, 'phriction.slug');
-      }
+      $base = $this->getRelativeBaseURI();
       if ($base !== null) {
         $base_parts = explode('/', rtrim($base, '/'));
         $rel_parts = explode('/', rtrim($link, '/'));
@@ -195,4 +185,30 @@ public function didMarkupText() {
     }
   }
 
+  private function getRelativeBaseURI() {
+    $context = $this->getEngine()->getConfig('contextObject');
+
+    if (!$context) {
+      return null;
+    }
+
+    // Handle content when it's a preview for the Phriction editor.
+    if (is_array($context)) {
+      if (idx($context, 'phriction.isPreview')) {
+        return idx($context, 'phriction.slug');
+      }
+    }
+
+    if ($context instanceof PhrictionContent) {
+      return $context->getSlug();
+    }
+
+    if ($context instanceof PhrictionDocument) {
+      return $context->getSlug();
+    }
+
+    return null;
+  }
+
+
 }
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 7cb1300feb..1d02d0fdb0 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -2880,11 +2880,13 @@ protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
-    $body = new PhabricatorMetaMTAMailBody();
-    $body->setViewer($this->requireActor());
+    $body = id(new PhabricatorMetaMTAMailBody())
+      ->setViewer($this->requireActor())
+      ->setContextObject($object);
 
     $this->addHeadersAndCommentsToMailBody($body, $xactions);
     $this->addCustomFieldsToMailBody($body, $object, $xactions);
+
     return $body;
   }
 

From b8bb4d3ad590a2b01c135302df145d50bc048765 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 06:26:02 -0800
Subject: [PATCH 593/865] Accept either "[[ %24doge ]]" or "[[ $doge ]]" as
 references to the "/w/$doge/" Phriction document

Summary:
Depends on D19105. Ref T13077. Fixes T12344.

The `[[ ... ]]` syntax accepts and handles characters which would require URL encoding if they appeared in URIs. For example, `[[ 100% Natural Cheese Dust ]]` is a legitimate, supported piece of remarkup syntax, and does not need to be written as `... 100%25 Natural ...`.

Likewise, `[[ BUY $DOGE ]]` is legitimate and does not need to be written as `[[ BUY %24DOGE ]]`. This piece of syntax creates a link to `/w/buy_$doge/`. This may or may not appear in your browser's URL bar as `/w/buy_%24doge/`, but internally "$" is a valid slug character and you'll see `buy_$doge` over Conduit, etc.

However, since users may reasonably copy paths from their browser URL bar, they may have unnecessary URL encoding. The syntax `[[ buy_$doge ]]` is legitimate, but a user copy/pasting may write `[[ buy_%24doge ]]` instead.

Currently, this extra URL encoding causes links to break, since `[[ buy_%24doge ]]` is a treated as link to `/w/buy_24doge/`, just like `[[ Fresh 100%AB Blood ]]` is a link to `/w/fresh_100_ab_blood/`.

To fix this:

  - When the target for a link can be URL decoded, try to do lookups on both the un-decoded and decoded variations.
  - If the un-decoded variation works, great: use it. This preserves behavior for all existing, working links.
  - If the un-decoded variation fails but the decoded variation works, okay: we'll assume you copy-pasted a URL-encoded version and strip URL encoding.
  - If both fail, same behavior as before.

Also, use a different spelling for "existent".

See T13084 for some "attacks" based on this behavior. I think the usability affordance this behavior provides greatly outweighs the very mild threat those attacks represent.

Test Plan:
  - Created links to existing, nonexisting, and existing-but-not-visible documents, all of which worked normally.
  - Created links to `[[ $doge ]]` and `[[ %24doge ]]`, saw them both go to the right place.
  - Performed the "attacks" in T13084.

Maniphest Tasks: T13077, T12344

Differential Revision: https://secure.phabricator.com/D19106
---
 .../markup/PhrictionRemarkupRule.php          | 105 +++++++++++++++---
 1 file changed, 88 insertions(+), 17 deletions(-)

diff --git a/src/applications/phriction/markup/PhrictionRemarkupRule.php b/src/applications/phriction/markup/PhrictionRemarkupRule.php
index c4bc1f7249..a6362d1624 100644
--- a/src/applications/phriction/markup/PhrictionRemarkupRule.php
+++ b/src/applications/phriction/markup/PhrictionRemarkupRule.php
@@ -83,28 +83,97 @@ public function didMarkupText() {
       return;
     }
 
+    $viewer = $engine->getConfig('viewer');
+
     $slugs = ipull($metadata, 'link');
-    foreach ($slugs as $key => $slug) {
-      $slugs[$key] = PhabricatorSlug::normalize($slug);
+
+    $load_map = array();
+    foreach ($slugs as $key => $raw_slug) {
+      $lookup = PhabricatorSlug::normalize($raw_slug);
+      $load_map[$lookup][] = $key;
+
+      // Also try to lookup the slug with URL decoding applied. The right
+      // way to link to a page titled "$cash" is to write "[[ $cash ]]" (and
+      // not the URL encoded form "[[ %24cash ]]"), but users may reasonably
+      // have copied URL encoded variations out of their browser location
+      // bar or be skeptical that "[[ $cash ]]" will actually work.
+
+      $lookup = phutil_unescape_uri_path_component($raw_slug);
+      $lookup = phutil_utf8ize($lookup);
+      $lookup = PhabricatorSlug::normalize($lookup);
+      $load_map[$lookup][] = $key;
     }
 
-    // We have to make two queries here to distinguish between
-    // documents the user can't see, and documents that don't
-    // exist.
     $visible_documents = id(new PhrictionDocumentQuery())
-      ->setViewer($engine->getConfig('viewer'))
-      ->withSlugs($slugs)
+      ->setViewer($viewer)
+      ->withSlugs(array_keys($load_map))
       ->needContent(true)
       ->execute();
-    $existant_documents = id(new PhrictionDocumentQuery())
-      ->setViewer(PhabricatorUser::getOmnipotentUser())
-      ->withSlugs($slugs)
-      ->execute();
-
     $visible_documents = mpull($visible_documents, null, 'getSlug');
-    $existant_documents = mpull($existant_documents, null, 'getSlug');
+    $document_map = array();
+    foreach ($load_map as $lookup => $keys) {
+      $visible = idx($visible_documents, $lookup);
+      if (!$visible) {
+        continue;
+      }
+
+      foreach ($keys as $key) {
+        $document_map[$key] = array(
+          'visible' => true,
+          'document' => $visible,
+        );
+      }
 
-    foreach ($metadata as $spec) {
+      unset($load_map[$lookup]);
+    }
+
+    // For each document we found, remove all remaining requests for it from
+    // the load map. If we remove all requests for a slug, remove the slug.
+    // This stops us from doing unnecessary lookups on alternate names for
+    // documents we already found.
+    foreach ($load_map as $lookup => $keys) {
+      foreach ($keys as $lookup_key => $key) {
+        if (isset($document_map[$key])) {
+          unset($keys[$lookup_key]);
+        }
+      }
+
+      if (!$keys) {
+        unset($load_map[$lookup]);
+        continue;
+      }
+
+      $load_map[$lookup] = $keys;
+    }
+
+
+    // If we still have links we haven't found a document for, do another
+    // query with the omnipotent viewer so we can distinguish between pages
+    // which do not exist and pages which exist but which the viewer does not
+    // have permission to see.
+    if ($load_map) {
+      $existent_documents = id(new PhrictionDocumentQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withSlugs(array_keys($load_map))
+        ->execute();
+      $existent_documents = mpull($existent_documents, null, 'getSlug');
+
+      foreach ($load_map as $lookup => $keys) {
+        $existent = idx($existent_documents, $lookup);
+        if (!$existent) {
+          continue;
+        }
+
+        foreach ($keys as $key) {
+          $document_map[$key] = array(
+            'visible' => false,
+            'document' => null,
+          );
+        }
+      }
+    }
+
+    foreach ($metadata as $key => $spec) {
       $link = $spec['link'];
       $slug = PhabricatorSlug::normalize($link);
       $name = $spec['explicitName'];
@@ -114,14 +183,16 @@ public function didMarkupText() {
       // in text as: "Title" <link>. Otherwise, we'll just render: <link>.
       $is_interesting_name = (bool)strlen($name);
 
-      if (idx($existant_documents, $slug) === null) {
+      $target = idx($document_map, $key, null);
+
+      if ($target === null) {
         // The target document doesn't exist.
         if ($name === null) {
           $name = explode('/', trim($link, '/'));
           $name = end($name);
         }
         $class = 'phriction-link-missing';
-      } else if (idx($visible_documents, $slug) === null) {
+      } else if (!$target['visible']) {
         // The document exists, but the user can't see it.
         if ($name === null) {
           $name = explode('/', trim($link, '/'));
@@ -131,7 +202,7 @@ public function didMarkupText() {
       } else {
         if ($name === null) {
           // Use the title of the document if no name is set.
-          $name = $visible_documents[$slug]
+          $name = $target['document']
             ->getContent()
             ->getTitle();
 

From f82206a4d1af78ce0de9046cae03aadf86355562 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 07:09:17 -0800
Subject: [PATCH 594/865] Add a rough Quick Search datasource for Phriction
 documents

Summary:
Depends on D19106. Fixes T5941. Ref T13077. Allows you to find Phriction documents as suggestions from global quick search.

Also supports `w` to jump to Phriction and `w query` to query Phriction.

The actual query logic for the datasource may need some tweaking after it collides with reality, but seems to produce fairly reasonable results in local testing against synthetic data.

Test Plan: Searched for "Porcupine Facts", "Travel Companions", and other useful local pages. Searched for `w`. Searched for `w zebra facts`.

Maniphest Tasks: T13077, T5941

Differential Revision: https://secure.phabricator.com/D19107
---
 resources/celerity/map.php                    | 28 +++---
 src/__phutil_library_map__.php                |  4 +
 .../PhrictionDatasourceEngineExtension.php    | 56 ++++++++++++
 .../phriction/storage/PhrictionDocument.php   |  4 +
 .../typeahead/PhrictionDocumentDatasource.php | 88 +++++++++++++++++++
 .../rsrc/js/core/behavior-search-typeahead.js |  1 +
 6 files changed, 167 insertions(+), 14 deletions(-)
 create mode 100644 src/applications/phriction/engineextension/PhrictionDatasourceEngineExtension.php
 create mode 100644 src/applications/phriction/typeahead/PhrictionDocumentDatasource.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index a08f04658e..fc3961604b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => 'e4f098a5',
-    'core.pkg.js' => '3ac6e174',
+    'core.pkg.js' => 'bd19de1c',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -506,7 +506,7 @@
     'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
     'rsrc/js/core/behavior-reveal-content.js' => '60821bc7',
     'rsrc/js/core/behavior-scrollbar.js' => '834a1173',
-    'rsrc/js/core/behavior-search-typeahead.js' => 'd0a99ab4',
+    'rsrc/js/core/behavior-search-typeahead.js' => 'c3e917d9',
     'rsrc/js/core/behavior-select-content.js' => 'bf5374ef',
     'rsrc/js/core/behavior-select-on-click.js' => '4e3e79a6',
     'rsrc/js/core/behavior-setup-check-https.js' => '491416b3',
@@ -663,7 +663,7 @@
     'javelin-behavior-phabricator-oncopy' => '2926fff2',
     'javelin-behavior-phabricator-remarkup-assist' => 'acd29eee',
     'javelin-behavior-phabricator-reveal-content' => '60821bc7',
-    'javelin-behavior-phabricator-search-typeahead' => 'd0a99ab4',
+    'javelin-behavior-phabricator-search-typeahead' => 'c3e917d9',
     'javelin-behavior-phabricator-show-older-transactions' => '8f29b364',
     'javelin-behavior-phabricator-tooltips' => 'c420b0b9',
     'javelin-behavior-phabricator-transaction-comment-form' => 'b23b49e6',
@@ -1918,6 +1918,17 @@
       'javelin-dom',
       'javelin-vector',
     ),
+    'c3e917d9' => array(
+      'javelin-behavior',
+      'javelin-typeahead-ondemand-source',
+      'javelin-typeahead',
+      'javelin-dom',
+      'javelin-uri',
+      'javelin-util',
+      'javelin-stratcom',
+      'phabricator-prefab',
+      'phuix-icon-view',
+    ),
     'c420b0b9' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1969,17 +1980,6 @@
       'phabricator-notification',
       'conpherence-thread-manager',
     ),
-    'd0a99ab4' => array(
-      'javelin-behavior',
-      'javelin-typeahead-ondemand-source',
-      'javelin-typeahead',
-      'javelin-dom',
-      'javelin-uri',
-      'javelin-util',
-      'javelin-stratcom',
-      'phabricator-prefab',
-      'phuix-icon-view',
-    ),
     'd0c516d5' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c2ee4966c1..29a957ae6e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4855,6 +4855,7 @@
     'PhrictionController' => 'applications/phriction/controller/PhrictionController.php',
     'PhrictionCreateConduitAPIMethod' => 'applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php',
     'PhrictionDAO' => 'applications/phriction/storage/PhrictionDAO.php',
+    'PhrictionDatasourceEngineExtension' => 'applications/phriction/engineextension/PhrictionDatasourceEngineExtension.php',
     'PhrictionDeleteController' => 'applications/phriction/controller/PhrictionDeleteController.php',
     'PhrictionDiffController' => 'applications/phriction/controller/PhrictionDiffController.php',
     'PhrictionDocument' => 'applications/phriction/storage/PhrictionDocument.php',
@@ -4862,6 +4863,7 @@
     'PhrictionDocumentContentHeraldField' => 'applications/phriction/herald/PhrictionDocumentContentHeraldField.php',
     'PhrictionDocumentContentTransaction' => 'applications/phriction/xaction/PhrictionDocumentContentTransaction.php',
     'PhrictionDocumentController' => 'applications/phriction/controller/PhrictionDocumentController.php',
+    'PhrictionDocumentDatasource' => 'applications/phriction/typeahead/PhrictionDocumentDatasource.php',
     'PhrictionDocumentDeleteTransaction' => 'applications/phriction/xaction/PhrictionDocumentDeleteTransaction.php',
     'PhrictionDocumentFerretEngine' => 'applications/phriction/search/PhrictionDocumentFerretEngine.php',
     'PhrictionDocumentFulltextEngine' => 'applications/phriction/search/PhrictionDocumentFulltextEngine.php',
@@ -10777,6 +10779,7 @@
     'PhrictionController' => 'PhabricatorController',
     'PhrictionCreateConduitAPIMethod' => 'PhrictionConduitAPIMethod',
     'PhrictionDAO' => 'PhabricatorLiskDAO',
+    'PhrictionDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension',
     'PhrictionDeleteController' => 'PhrictionController',
     'PhrictionDiffController' => 'PhrictionController',
     'PhrictionDocument' => array(
@@ -10796,6 +10799,7 @@
     'PhrictionDocumentContentHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentContentTransaction' => 'PhrictionDocumentTransactionType',
     'PhrictionDocumentController' => 'PhrictionController',
+    'PhrictionDocumentDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhrictionDocumentDeleteTransaction' => 'PhrictionDocumentTransactionType',
     'PhrictionDocumentFerretEngine' => 'PhabricatorFerretEngine',
     'PhrictionDocumentFulltextEngine' => 'PhabricatorFulltextEngine',
diff --git a/src/applications/phriction/engineextension/PhrictionDatasourceEngineExtension.php b/src/applications/phriction/engineextension/PhrictionDatasourceEngineExtension.php
new file mode 100644
index 0000000000..af262d541d
--- /dev/null
+++ b/src/applications/phriction/engineextension/PhrictionDatasourceEngineExtension.php
@@ -0,0 +1,56 @@
+<?php
+
+final class PhrictionDatasourceEngineExtension
+  extends PhabricatorDatasourceEngineExtension {
+
+  public function newQuickSearchDatasources() {
+    return array(
+      new PhrictionDocumentDatasource(),
+    );
+  }
+
+  public function newJumpURI($query) {
+    $viewer = $this->getViewer();
+
+    // Send "w" to Phriction.
+    if (preg_match('/^w\z/i', $query)) {
+      return '/w/';
+    }
+
+    // Send "w <string>" to a search for similar wiki documents.
+    $matches = null;
+    if (preg_match('/^w\s+(.+)\z/i', $query, $matches)) {
+      $raw_query = $matches[1];
+
+      $engine = id(new PhrictionDocument())
+        ->newFerretEngine();
+
+      $compiler = id(new PhutilSearchQueryCompiler())
+        ->setEnableFunctions(true);
+
+      $raw_tokens = $compiler->newTokens($raw_query);
+
+      $fulltext_tokens = array();
+      foreach ($raw_tokens as $raw_token) {
+        $fulltext_token = id(new PhabricatorFulltextToken())
+          ->setToken($raw_token);
+        $fulltext_tokens[] = $fulltext_token;
+      }
+
+      $documents = id(new PhrictionDocumentQuery())
+        ->setViewer($viewer)
+        ->withFerretConstraint($engine, $fulltext_tokens)
+        ->execute();
+      if (count($documents) == 1) {
+        return head($documents)->getURI();
+      } else {
+        // More than one match, jump to search.
+        return urisprintf(
+          '/phriction/?order=relevance&query=%s#R',
+          $raw_query);
+      }
+    }
+
+    return null;
+  }
+}
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 58d7cbee4a..729d3e4ca5 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -149,6 +149,10 @@ public function attachAncestor($slug, $ancestor) {
     return $this;
   }
 
+  public function getURI() {
+    return self::getSlugURI($this->getSlug());
+  }
+
 /* -(  Status  )------------------------------------------------------------- */
 
 
diff --git a/src/applications/phriction/typeahead/PhrictionDocumentDatasource.php b/src/applications/phriction/typeahead/PhrictionDocumentDatasource.php
new file mode 100644
index 0000000000..dc6af6de7a
--- /dev/null
+++ b/src/applications/phriction/typeahead/PhrictionDocumentDatasource.php
@@ -0,0 +1,88 @@
+<?php
+
+final class PhrictionDocumentDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  public function getBrowseTitle() {
+    return pht('Browse Documents');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type a document name...');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return 'PhabricatorPhrictionApplication';
+  }
+
+  public function loadResults() {
+    $viewer = $this->getViewer();
+
+    $raw_query = $this->getRawQuery();
+
+    $engine = id(new PhrictionDocument())
+      ->newFerretEngine();
+
+    $compiler = id(new PhutilSearchQueryCompiler())
+      ->setEnableFunctions(true);
+
+    $raw_tokens = $compiler->newTokens($raw_query);
+
+    $fulltext_tokens = array();
+    foreach ($raw_tokens as $raw_token) {
+
+      // This is a little hacky and could maybe be cleaner. We're treating
+      // every search term as though the user had entered "title:dog" insead
+      // of "dog".
+
+      $alternate_token = PhutilSearchQueryToken::newFromDictionary(
+        array(
+          'quoted' => $raw_token->isQuoted(),
+          'value' => $raw_token->getValue(),
+          'operator' => PhutilSearchQueryCompiler::OPERATOR_SUBSTRING,
+          'function' => 'title',
+        ));
+
+      $fulltext_token = id(new PhabricatorFulltextToken())
+        ->setToken($alternate_token);
+      $fulltext_tokens[] = $fulltext_token;
+    }
+
+    $documents = id(new PhrictionDocumentQuery())
+      ->setViewer($viewer)
+      ->withFerretConstraint($engine, $fulltext_tokens)
+      ->needContent(true)
+      ->execute();
+
+    $results = array();
+    foreach ($documents as $document) {
+      $content = $document->getContent();
+
+      if (!$document->isActive()) {
+        $closed = $document->getStatusDisplayName();
+      } else {
+        $closed = null;
+      }
+
+      $slug = $document->getSlug();
+      $title = $content->getTitle();
+
+      $sprite = 'phabricator-search-icon phui-font-fa phui-icon-view fa-book';
+
+      $result = id(new PhabricatorTypeaheadResult())
+        ->setName($title)
+        ->setDisplayName($title)
+        ->setURI($document->getURI())
+        ->setPHID($document->getPHID())
+        ->setDisplayType($slug)
+        ->setPriorityType('wiki')
+        ->setImageSprite($sprite)
+        ->setClosed($closed);
+
+      $results[] = $result;
+    }
+
+    return $results;
+  }
+
+}
diff --git a/webroot/rsrc/js/core/behavior-search-typeahead.js b/webroot/rsrc/js/core/behavior-search-typeahead.js
index ddcc2e6aaa..0f5b4d1639 100644
--- a/webroot/rsrc/js/core/behavior-search-typeahead.js
+++ b/webroot/rsrc/js/core/behavior-search-typeahead.js
@@ -70,6 +70,7 @@ JX.behavior('phabricator-search-typeahead', function(config) {
       'proj',
       'user',
       'repo',
+      'wiki',
       'symb',
       'misc'
     ];

From 8771b7d5c40cc9bbaf417919c778835d13113878 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 09:19:32 -0800
Subject: [PATCH 595/865] Add autocomplete for Phriction documents on "[[ ..."
 in Remarkup

Summary: Depends on D19107. Ref T13077. The underlying datasource may need some adjustment but this appears to work properly locally.

Test Plan: Typed `[[ por` locally, was suggested "Porcupine Facts". Typed `[[ / ]]`, saw it render as a reference to the wiki root instead of the install root.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19108
---
 resources/celerity/map.php                    | 16 ++++++-------
 .../typeahead/PhrictionDocumentDatasource.php |  2 ++
 .../control/PhabricatorRemarkupControl.php    | 14 +++++++++++
 webroot/rsrc/js/phuix/PHUIXAutocomplete.js    | 24 ++++++++++++++++---
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index fc3961604b..1bb3bfbeae 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -528,7 +528,7 @@
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => '442efd08',
-    'rsrc/js/phuix/PHUIXAutocomplete.js' => 'e0731603',
+    'rsrc/js/phuix/PHUIXAutocomplete.js' => 'bb19ed2c',
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
@@ -881,7 +881,7 @@
     'phui-workpanel-view-css' => 'a3a63478',
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '442efd08',
-    'phuix-autocomplete' => 'e0731603',
+    'phuix-autocomplete' => 'bb19ed2c',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
     'phuix-form-control-view' => '16ad6224',
@@ -1868,6 +1868,12 @@
       'javelin-uri',
       'phabricator-notification',
     ),
+    'bb19ed2c' => array(
+      'javelin-install',
+      'javelin-dom',
+      'phuix-icon-view',
+      'phabricator-prefab',
+    ),
     'bcaccd64' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -2033,12 +2039,6 @@
       'javelin-typeahead-ondemand-source',
       'javelin-dom',
     ),
-    'e0731603' => array(
-      'javelin-install',
-      'javelin-dom',
-      'phuix-icon-view',
-      'phabricator-prefab',
-    ),
     'e1d25dfb' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/applications/phriction/typeahead/PhrictionDocumentDatasource.php b/src/applications/phriction/typeahead/PhrictionDocumentDatasource.php
index dc6af6de7a..bb9608edb8 100644
--- a/src/applications/phriction/typeahead/PhrictionDocumentDatasource.php
+++ b/src/applications/phriction/typeahead/PhrictionDocumentDatasource.php
@@ -68,6 +68,7 @@ public function loadResults() {
       $title = $content->getTitle();
 
       $sprite = 'phabricator-search-icon phui-font-fa phui-icon-view fa-book';
+      $autocomplete = '[[ '.$slug.' ]]';
 
       $result = id(new PhabricatorTypeaheadResult())
         ->setName($title)
@@ -77,6 +78,7 @@ public function loadResults() {
         ->setDisplayType($slug)
         ->setPriorityType('wiki')
         ->setImageSprite($sprite)
+        ->setAutocomplete($autocomplete)
         ->setClosed($closed);
 
       $results[] = $result;
diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php
index 5d0cc079e7..219702b2c7 100644
--- a/src/view/form/control/PhabricatorRemarkupControl.php
+++ b/src/view/form/control/PhabricatorRemarkupControl.php
@@ -72,6 +72,8 @@ protected function renderInput() {
           'autocomplete' => 1,
         ));
 
+    $phriction_datasource = new PhrictionDocumentDatasource();
+
     Javelin::initBehavior(
       'phabricator-remarkup-assist',
       array(
@@ -118,6 +120,18 @@ protected function renderInput() {
               '/',
             ),
           ),
+          91 => array( // "["
+            'datasourceURI' => $phriction_datasource->getDatasourceURI(),
+            'headerIcon' => 'fa-book',
+            'headerText' => pht('Find Document:'),
+            'hintText' => $phriction_datasource->getPlaceholderText(),
+            'cancel' => array(
+              ':', // Cancel on "http:" and similar.
+              '|',
+              ']',
+            ),
+            'prefix' => '^\\[*',
+          ),
         ),
       ));
     Javelin::initBehavior('phabricator-tooltips', array());
diff --git a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
index a7f719dab4..e5928b0297 100644
--- a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
+++ b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
@@ -335,7 +335,9 @@ JX.install('PHUIXAutocomplete', {
     _getCancelCharacters: function() {
       // The "." character does not cancel because of projects named
       // "node.js" or "blog.mycompany.com".
-      return ['#', '@', ',', '!', '?', '{', '}'];
+      var defaults = ['#', '@', ',', '!', '?', '{', '}'];
+
+      return this._map[this._active].cancel || defaults;
     },
 
     _getTerminators: function() {
@@ -498,8 +500,6 @@ JX.install('PHUIXAutocomplete', {
         this._cursorHead,
         this._cursorTail);
 
-      this._value = text;
-
       var pixels = JX.TextAreaUtils.getPixelDimensions(
         area,
         range.start,
@@ -517,6 +517,24 @@ JX.install('PHUIXAutocomplete', {
 
       var trim = this._trim(text);
 
+      // If this rule has a prefix pattern, like the "[[ document ]]" rule,
+      // require it match and throw it away before we begin suggesting
+      // results. The autocomplete remains active, it's just dormant until
+      // the user gives us more to work with.
+      var prefix = this._map[this._active].prefix;
+      if (prefix) {
+        var pattern = new RegExp(prefix);
+        if (!trim.match(pattern)) {
+          return;
+        }
+        trim = trim.replace(pattern, '');
+        trim = trim.trim();
+      }
+
+      // Store the current value now that we've finished mutating the text.
+      // This needs to match what we pass to the typeahead datasource.
+      this._value = trim;
+
       // Deactivate immediately if a user types a character that we are
       // reasonably sure means they don't want to use the autocomplete. For
       // example, "##" is almost certainly a header or monospaced text, not

From 0202c36b62d7a8179893946be86f1d6da8a7ce1f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 09:37:13 -0800
Subject: [PATCH 596/865] Suggest Phurl URLs on "((..." in Remarkup text areas

Summary: Depends on D19108. Ref T12241. Ref T13077. See D19108. This extends the `[[ ...` autocompleter to `((...` for Phurl URLs.

Test Plan: Typed `((th`, got `((thing))` suggested.

Reviewers: avivey

Reviewed By: avivey

Maniphest Tasks: T13077, T12241

Differential Revision: https://secure.phabricator.com/D19109
---
 resources/celerity/map.php                       | 16 ++++++++--------
 .../typeahead/PhabricatorPhurlURLDatasource.php  |  1 +
 .../form/control/PhabricatorRemarkupControl.php  | 13 ++++++++++++-
 webroot/rsrc/js/phuix/PHUIXAutocomplete.js       |  6 ++++++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 1bb3bfbeae..527cd6a39e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -528,7 +528,7 @@
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => '442efd08',
-    'rsrc/js/phuix/PHUIXAutocomplete.js' => 'bb19ed2c',
+    'rsrc/js/phuix/PHUIXAutocomplete.js' => '623a766b',
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
@@ -881,7 +881,7 @@
     'phui-workpanel-view-css' => 'a3a63478',
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '442efd08',
-    'phuix-autocomplete' => 'bb19ed2c',
+    'phuix-autocomplete' => '623a766b',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
     'phuix-form-control-view' => '16ad6224',
@@ -1407,6 +1407,12 @@
       'javelin-magical-init',
       'javelin-util',
     ),
+    '623a766b' => array(
+      'javelin-install',
+      'javelin-dom',
+      'phuix-icon-view',
+      'phabricator-prefab',
+    ),
     '628f59de' => array(
       'phui-oi-list-view-css',
     ),
@@ -1868,12 +1874,6 @@
       'javelin-uri',
       'phabricator-notification',
     ),
-    'bb19ed2c' => array(
-      'javelin-install',
-      'javelin-dom',
-      'phuix-icon-view',
-      'phabricator-prefab',
-    ),
     'bcaccd64' => array(
       'javelin-behavior',
       'javelin-behavior-device',
diff --git a/src/applications/phurl/typeahead/PhabricatorPhurlURLDatasource.php b/src/applications/phurl/typeahead/PhabricatorPhurlURLDatasource.php
index cd01c265c8..f8d3cda0cd 100644
--- a/src/applications/phurl/typeahead/PhabricatorPhurlURLDatasource.php
+++ b/src/applications/phurl/typeahead/PhabricatorPhurlURLDatasource.php
@@ -24,6 +24,7 @@ public function loadResults() {
         ->setDisplayName($url->getName())
         ->setName($url->getName()." ".$url->getAlias())
         ->setPHID($url->getPHID())
+        ->setAutocomplete('(('.$url->getAlias().'))')
         ->addAttribute($url->getLongURL());
 
       $results[] = $result;
diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php
index 219702b2c7..dba0ef0546 100644
--- a/src/view/form/control/PhabricatorRemarkupControl.php
+++ b/src/view/form/control/PhabricatorRemarkupControl.php
@@ -73,6 +73,7 @@ protected function renderInput() {
         ));
 
     $phriction_datasource = new PhrictionDocumentDatasource();
+    $phurl_datasource = new PhabricatorPhurlURLDatasource();
 
     Javelin::initBehavior(
       'phabricator-remarkup-assist',
@@ -130,7 +131,17 @@ protected function renderInput() {
               '|',
               ']',
             ),
-            'prefix' => '^\\[*',
+            'prefix' => '^\\[',
+          ),
+          40 => array( // "("
+            'datasourceURI' => $phurl_datasource->getDatasourceURI(),
+            'headerIcon' => 'fa-compress',
+            'headerText' => pht('Find Phurl:'),
+            'hintText' => $phurl_datasource->getPlaceholderText(),
+            'cancel' => array(
+              ')',
+            ),
+            'prefix' => '^\\(',
           ),
         ),
       ));
diff --git a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
index e5928b0297..b534af83f0 100644
--- a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
+++ b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
@@ -107,6 +107,12 @@ JX.install('PHUIXAutocomplete', {
         prior = '<start>';
       }
 
+      // If this is a repeating sequence and the previous character is the
+      // same as the one the user just typed, like "((", don't reactivate.
+      if (prior === String.fromCharCode(code)) {
+        return;
+      }
+
       switch (prior) {
         case '<start>':
         case ' ':

From 8796a6036ed1f2ee13415339e4567acf7ef3f7b1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 11:00:03 -0800
Subject: [PATCH 597/865] Let users escape more easily from the autosuggester
 after typing "[" or "("

Summary:
Ref T13077. The autosuggester is a little too eager right now, and will eat carriage returns after typing `[` if you never activate the tokenizer.

To fix this, try just canceling sooner. If that doesn't work, we might need to cancel more eagerly by testing to see if the tokenizer is actually open.

Test Plan: Typed `[x]<return>`, got my return instead of getting trapped by the autosuggester.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19110
---
 resources/celerity/map.php                 | 16 +++++++--------
 webroot/rsrc/js/phuix/PHUIXAutocomplete.js | 24 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 527cd6a39e..32ccb9e5f9 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -528,7 +528,7 @@
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => '442efd08',
-    'rsrc/js/phuix/PHUIXAutocomplete.js' => '623a766b',
+    'rsrc/js/phuix/PHUIXAutocomplete.js' => '7fa5c915',
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
@@ -881,7 +881,7 @@
     'phui-workpanel-view-css' => 'a3a63478',
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '442efd08',
-    'phuix-autocomplete' => '623a766b',
+    'phuix-autocomplete' => '7fa5c915',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
     'phuix-form-control-view' => '16ad6224',
@@ -1407,12 +1407,6 @@
       'javelin-magical-init',
       'javelin-util',
     ),
-    '623a766b' => array(
-      'javelin-install',
-      'javelin-dom',
-      'phuix-icon-view',
-      'phabricator-prefab',
-    ),
     '628f59de' => array(
       'phui-oi-list-view-css',
     ),
@@ -1563,6 +1557,12 @@
     '7f243deb' => array(
       'javelin-install',
     ),
+    '7fa5c915' => array(
+      'javelin-install',
+      'javelin-dom',
+      'phuix-icon-view',
+      'phabricator-prefab',
+    ),
     '81144dfa' => array(
       'javelin-behavior',
       'javelin-behavior-device',
diff --git a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
index b534af83f0..8f062d900e 100644
--- a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
+++ b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
@@ -521,6 +521,18 @@ JX.install('PHUIXAutocomplete', {
         return;
       }
 
+      // Deactivate immediately if a user types a character that we are
+      // reasonably sure means they don't want to use the autocomplete. For
+      // example, "##" is almost certainly a header or monospaced text, not
+      // a project autocompletion.
+      var cancels = this._getCancelCharacters();
+      for (var ii = 0; ii < cancels.length; ii++) {
+        if (text.indexOf(cancels[ii]) !== -1) {
+          this._deactivate();
+          return;
+        }
+      }
+
       var trim = this._trim(text);
 
       // If this rule has a prefix pattern, like the "[[ document ]]" rule,
@@ -541,18 +553,6 @@ JX.install('PHUIXAutocomplete', {
       // This needs to match what we pass to the typeahead datasource.
       this._value = trim;
 
-      // Deactivate immediately if a user types a character that we are
-      // reasonably sure means they don't want to use the autocomplete. For
-      // example, "##" is almost certainly a header or monospaced text, not
-      // a project autocompletion.
-      var cancels = this._getCancelCharacters();
-      for (var ii = 0; ii < cancels.length; ii++) {
-        if (trim.indexOf(cancels[ii]) !== -1) {
-          this._deactivate();
-          return;
-        }
-      }
-
       // Deactivate immediately if the user types an ignored token like ":)",
       // the smiley face emoticon. Note that we test against "text", not
       // "trim", because the ignore list and suffix list can otherwise

From 6d3177a3bf295fd705a5332d057bd553581746ef Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 11:36:03 -0800
Subject: [PATCH 598/865] Allow "phriction.document.search" to query by path

Summary: Ref T13077. Adds a "paths" constraint to the API query.

Test Plan: Used paths constraint to fetch documents.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19112
---
 .../phriction/query/PhrictionDocumentSearchEngine.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/applications/phriction/query/PhrictionDocumentSearchEngine.php b/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
index e578b48346..e0781ec81f 100644
--- a/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
+++ b/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
@@ -23,6 +23,10 @@ protected function buildQueryFromParameters(array $map) {
       $query->withStatuses($map['statuses']);
     }
 
+    if ($map['paths']) {
+      $query->withSlugs($map['paths']);
+    }
+
     return $query;
   }
 
@@ -32,6 +36,10 @@ protected function buildCustomSearchFields() {
         ->setKey('statuses')
         ->setLabel(pht('Status'))
         ->setOptions(PhrictionDocumentStatus::getStatusMap()),
+      id(new PhabricatorSearchStringListField())
+        ->setKey('paths')
+        ->setIsHidden(true)
+        ->setLabel(pht('Paths')),
     );
   }
 

From db3ef4021a5d4110d5bc5838a1a9b1b04ff133d2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 11:42:59 -0800
Subject: [PATCH 599/865] Freeze the "phriction.info" Conduit API method

Summary: Ref T13077. Freeze "phriction.info" in favor of the more modern "phriction.document.search".

Test Plan: Reviewed older method in web UI, saw frozen markers.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19113
---
 .../conduit/PhrictionInfoConduitAPIMethod.php          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php b/src/applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php
index 360b3e7b93..d6da3d6aee 100644
--- a/src/applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php
+++ b/src/applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php
@@ -10,6 +10,16 @@ public function getMethodDescription() {
     return pht('Retrieve information about a Phriction document.');
   }
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_FROZEN;
+  }
+
+  public function getMethodStatusDescription() {
+    return pht(
+      'This method is frozen and will eventually be deprecated. New code '.
+      'should use "phriction.document.search" instead.');
+  }
+
   protected function defineParamTypes() {
     return array(
       'slug' => 'required string',

From 66a7ca49b20cb55008a45fec904f4ee90333889f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 12:30:33 -0800
Subject: [PATCH 600/865] Fix incorrect context extraction for relative
 Phriction links on Phriction pages

Summary: Ref T13077. This content extraction rule wasn't right and caused rendering on Phriction pages to extract context improperly.

Test Plan: Viewed pages in Phriction with relative links to other documents.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19114
---
 src/applications/phriction/markup/PhrictionRemarkupRule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/phriction/markup/PhrictionRemarkupRule.php b/src/applications/phriction/markup/PhrictionRemarkupRule.php
index a6362d1624..d17de331e5 100644
--- a/src/applications/phriction/markup/PhrictionRemarkupRule.php
+++ b/src/applications/phriction/markup/PhrictionRemarkupRule.php
@@ -275,7 +275,7 @@ private function getRelativeBaseURI() {
     }
 
     if ($context instanceof PhrictionDocument) {
-      return $context->getSlug();
+      return $context->getContent()->getSlug();
     }
 
     return null;

From cb2f7106069b1d40a7a753671fc7704cd364c32c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Feb 2018 12:39:54 -0800
Subject: [PATCH 601/865] Provide the document content as a context object when
 rendering Phriction documents

Summary: Ref T13077. The context object wasn't being passed into the engine properly here, affecting relative link rendering in Phriction.

Test Plan: Viewed rendered Phriction documents with relative links, got clean renders.

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19115
---
 src/applications/phriction/storage/PhrictionContent.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index 80fabcaddc..515fc6b7d5 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -54,6 +54,7 @@ public function getPHIDType() {
 
   public function newRemarkupView(PhabricatorUser $viewer) {
     return id(new PHUIRemarkupView($viewer, $this->getContent()))
+      ->setContextObject($this)
       ->setRemarkupOption(PHUIRemarkupView::OPTION_GENERATE_TOC, true)
       ->setGenerateTableOfContents(true);
   }

From eb3fd2b7f513577d394e9fcf9f5a8749fd0d57c6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 17 Feb 2018 04:31:16 -0800
Subject: [PATCH 602/865] Fix an issue with marking aborted buildables failed
 when more than one build is aborted

Summary: See <https://discourse.phabricator-community.org/t/upgrade-issue-2018-week-7-mid-february/1139>.

Test Plan: Used `bin/storage upgrade -f --apply ...` to re-apply the migration.

Differential Revision: https://secure.phabricator.com/D19116
---
 resources/sql/autopatches/20180214.harbor.01.aborted.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/sql/autopatches/20180214.harbor.01.aborted.php b/resources/sql/autopatches/20180214.harbor.01.aborted.php
index 689d5625f5..365f375dc6 100644
--- a/resources/sql/autopatches/20180214.harbor.01.aborted.php
+++ b/resources/sql/autopatches/20180214.harbor.01.aborted.php
@@ -10,7 +10,8 @@
 
   $aborted = queryfx_one(
     $conn,
-    'SELECT * FROM %T WHERE buildablePHID = %s AND buildStatus = %s',
+    'SELECT * FROM %T WHERE buildablePHID = %s AND buildStatus = %s
+      LIMIT 1',
     id(new HarbormasterBuild())->getTableName(),
     $buildable->getPHID(),
     'aborted');

From 362ccedf8afbd7ede1f98a2492feeb56cbcfb708 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 17 Feb 2018 04:31:16 -0800
Subject: [PATCH 603/865] (stable) Fix an issue with marking aborted buildables
 failed when more than one build is aborted

Summary: See <https://discourse.phabricator-community.org/t/upgrade-issue-2018-week-7-mid-february/1139>.

Test Plan: Used `bin/storage upgrade -f --apply ...` to re-apply the migration.

Differential Revision: https://secure.phabricator.com/D19116
---
 resources/sql/autopatches/20180214.harbor.01.aborted.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/sql/autopatches/20180214.harbor.01.aborted.php b/resources/sql/autopatches/20180214.harbor.01.aborted.php
index 689d5625f5..365f375dc6 100644
--- a/resources/sql/autopatches/20180214.harbor.01.aborted.php
+++ b/resources/sql/autopatches/20180214.harbor.01.aborted.php
@@ -10,7 +10,8 @@
 
   $aborted = queryfx_one(
     $conn,
-    'SELECT * FROM %T WHERE buildablePHID = %s AND buildStatus = %s',
+    'SELECT * FROM %T WHERE buildablePHID = %s AND buildStatus = %s
+      LIMIT 1',
     id(new HarbormasterBuild())->getTableName(),
     $buildable->getPHID(),
     'aborted');

From 05a4c55c52be313c750b1552b89ad33bcf64a0dd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 17 Feb 2018 17:37:38 -0800
Subject: [PATCH 604/865] Explicitly add rel="noreferrer" to all external links

Summary: See D19117. Instead of automatically figuring this out inside `phutil_tag()`, explicitly add rel="noreferrer" at the application level to all external links.

Test Plan:
  - Grepped for `_blank`, `isValidRemoteURIForLink`, checked all callsites for user-controlled data.
  - Created a link menu item, verified noreferrer in markup.
  - Created a link custom field, verified no referrer in markup.
  - Verified noreferrer for `{nav href=...}`.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D19118
---
 .../auth/view/PhabricatorAuthAccountView.php  |  1 +
 .../PhabricatorCalendarICSURIImportEngine.php |  1 +
 .../markup/PhabricatorImageRemarkupRule.php   |  8 +-----
 .../artifact/HarbormasterURIArtifact.php      |  1 +
 .../nuance/item/NuanceGitHubEventItemType.php |  2 ++
 .../PhabricatorPhurlLinkRemarkupRule.php      |  1 +
 .../PhabricatorLinkProfileMenuItem.php        |  3 ++-
 .../PhabricatorStandardCustomFieldLink.php    |  6 ++++-
 src/view/layout/PhabricatorActionView.php     |  3 +++
 src/view/phui/PHUIListItemView.php            | 13 +++++++++-
 src/view/phui/PHUITagView.php                 | 25 +++++++++++--------
 11 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/applications/auth/view/PhabricatorAuthAccountView.php b/src/applications/auth/view/PhabricatorAuthAccountView.php
index 8eb73144aa..3f04281c8f 100644
--- a/src/applications/auth/view/PhabricatorAuthAccountView.php
+++ b/src/applications/auth/view/PhabricatorAuthAccountView.php
@@ -77,6 +77,7 @@ public function render() {
           array(
             'href' => $account_uri,
             'target' => '_blank',
+            'rel' => 'noreferrer',
           ),
           $account_uri);
       }
diff --git a/src/applications/calendar/import/PhabricatorCalendarICSURIImportEngine.php b/src/applications/calendar/import/PhabricatorCalendarICSURIImportEngine.php
index 6174603c84..bd52ec5bc2 100644
--- a/src/applications/calendar/import/PhabricatorCalendarICSURIImportEngine.php
+++ b/src/applications/calendar/import/PhabricatorCalendarICSURIImportEngine.php
@@ -45,6 +45,7 @@ public function appendImportProperties(
         array(
           'href' => $uri,
           'target' => '_blank',
+          'rel' => 'noreferrer',
         ),
         $uri);
     }
diff --git a/src/applications/files/markup/PhabricatorImageRemarkupRule.php b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
index 9e91bdc096..36089dc57e 100644
--- a/src/applications/files/markup/PhabricatorImageRemarkupRule.php
+++ b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
@@ -20,7 +20,6 @@ public function markupImage(array $matches) {
     $defaults = array(
       'uri' => null,
       'alt' => null,
-      'href' => null,
       'width' => null,
       'height' => null,
     );
@@ -45,10 +44,6 @@ public function markupImage(array $matches) {
 
     $args += $defaults;
 
-    if ($args['href'] && !PhabricatorEnv::isValidURIForLink($args['href'])) {
-      $args['href'] = null;
-    }
-
     if ($args['uri']) {
       $src_uri = id(new PhutilURI('/file/imageproxy/'))
         ->setQueryParam('uri', (string)$args['uri']);
@@ -57,10 +52,9 @@ public function markupImage(array $matches) {
         array(
           'src' => $src_uri,
           'alt' => $args['alt'],
-          'href' => $args['href'],
           'width' => $args['width'],
           'height' => $args['height'],
-          ));
+        ));
       return $this->getEngine()->storeText($img);
     } else {
       return $matches[0];
diff --git a/src/applications/harbormaster/artifact/HarbormasterURIArtifact.php b/src/applications/harbormaster/artifact/HarbormasterURIArtifact.php
index 345621f0f5..93f7564033 100644
--- a/src/applications/harbormaster/artifact/HarbormasterURIArtifact.php
+++ b/src/applications/harbormaster/artifact/HarbormasterURIArtifact.php
@@ -81,6 +81,7 @@ public function renderLink() {
       array(
         'href' => $uri,
         'target' => '_blank',
+        'rel' => 'noreferrer',
       ),
       $name);
   }
diff --git a/src/applications/nuance/item/NuanceGitHubEventItemType.php b/src/applications/nuance/item/NuanceGitHubEventItemType.php
index b8bfb3ccab..1f6249f222 100644
--- a/src/applications/nuance/item/NuanceGitHubEventItemType.php
+++ b/src/applications/nuance/item/NuanceGitHubEventItemType.php
@@ -309,6 +309,8 @@ private function newGitHubEventItemPropertyBox($item) {
         'a',
         array(
           'href' => $event_uri,
+          'target' => '_blank',
+          'rel' => 'noreferrer',
         ),
         $event_uri);
     }
diff --git a/src/applications/phurl/remarkup/PhabricatorPhurlLinkRemarkupRule.php b/src/applications/phurl/remarkup/PhabricatorPhurlLinkRemarkupRule.php
index 4ef59b300c..c4ffc366da 100644
--- a/src/applications/phurl/remarkup/PhabricatorPhurlLinkRemarkupRule.php
+++ b/src/applications/phurl/remarkup/PhabricatorPhurlLinkRemarkupRule.php
@@ -64,6 +64,7 @@ public function markupLink(array $matches) {
         array(
           'href' => $uri,
           'target' => '_blank',
+          'rel' => 'noreferrer',
         ),
         $name);
     }
diff --git a/src/applications/search/menuitem/PhabricatorLinkProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorLinkProfileMenuItem.php
index f790816c8b..0b6a2f330e 100644
--- a/src/applications/search/menuitem/PhabricatorLinkProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorLinkProfileMenuItem.php
@@ -99,7 +99,8 @@ protected function newNavigationMenuItems(
       ->setHref($href)
       ->setName($name)
       ->setIcon($icon_class)
-      ->setTooltip($tooltip);
+      ->setTooltip($tooltip)
+      ->setRel('noreferrer');
 
     return array(
       $item,
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php
index c2b9d6543c..146f34ab07 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php
@@ -31,7 +31,11 @@ public function renderPropertyViewValue(array $handles) {
 
     return phutil_tag(
       'a',
-      array('href' => $value, 'target' => '_blank'),
+      array(
+        'href' => $value,
+        'target' => '_blank',
+        'rel' => 'noreferrer',
+      ),
       $value);
   }
 
diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php
index f6de8eca5b..a1d8fe2664 100644
--- a/src/view/layout/PhabricatorActionView.php
+++ b/src/view/layout/PhabricatorActionView.php
@@ -255,8 +255,10 @@ public function render() {
       } else {
         if ($this->getOpenInNewWindow()) {
           $target = '_blank';
+          $rel = 'noreferrer';
         } else {
           $target = null;
+          $rel = null;
         }
 
         if ($this->submenu) {
@@ -277,6 +279,7 @@ public function render() {
             'href'  => $this->getHref(),
             'class' => 'phabricator-action-view-item',
             'target' => $target,
+            'rel' => $rel,
             'sigil' => $sigils,
             'meta' => $this->metadata,
           ),
diff --git a/src/view/phui/PHUIListItemView.php b/src/view/phui/PHUIListItemView.php
index e8a1940737..8e53024826 100644
--- a/src/view/phui/PHUIListItemView.php
+++ b/src/view/phui/PHUIListItemView.php
@@ -34,6 +34,7 @@ final class PHUIListItemView extends AphrontTagView {
   private $actionIcon;
   private $actionIconHref;
   private $count;
+  private $rel;
 
   public function setOpenInNewWindow($open_in_new_window) {
     $this->openInNewWindow = $open_in_new_window;
@@ -44,7 +45,16 @@ public function getOpenInNewWindow() {
     return $this->openInNewWindow;
   }
 
-    public function setHideInApplicationMenu($hide) {
+  public function setRel($rel) {
+    $this->rel = $rel;
+    return $this;
+  }
+
+  public function getRel() {
+    return $this->rel;
+  }
+
+  public function setHideInApplicationMenu($hide) {
     $this->hideInApplicationMenu = $hide;
     return $this;
   }
@@ -363,6 +373,7 @@ protected function getTagContent() {
         'meta' => $meta,
         'sigil' => $sigil,
         'target' => $this->getOpenInNewWindow() ? '_blank' : null,
+        'rel' => $this->rel,
       ),
       array(
         $aural,
diff --git a/src/view/phui/PHUITagView.php b/src/view/phui/PHUITagView.php
index 292246c4a7..482b3f4400 100644
--- a/src/view/phui/PHUITagView.php
+++ b/src/view/phui/PHUITagView.php
@@ -154,25 +154,30 @@ protected function getTagAttributes() {
       $classes[] = 'phui-tag-'.$this->border;
     }
 
+    $attributes = array(
+      'href' => $this->href,
+      'class' => $classes,
+    );
+
+    if ($this->external) {
+      $attributes += array(
+        'target' => '_blank',
+        'rel' => 'noreferrer',
+      );
+    }
+
     if ($this->phid) {
       Javelin::initBehavior('phui-hovercards');
 
-      $attributes = array(
-        'href'  => $this->href,
+      $attributes += array(
         'sigil' => 'hovercard',
-        'meta'  => array(
+        'meta' => array(
           'hoverPHID' => $this->phid,
         ),
-        'target' => $this->external ? '_blank' : null,
-      );
-    } else {
-      $attributes = array(
-        'href'  => $this->href,
-        'target' => $this->external ? '_blank' : null,
       );
     }
 
-    return $attributes + array('class' => $classes);
+    return $attributes;
   }
 
   protected function getTagContent() {

From 0dee34b3fafd2d7fd5011ea23fae08f9bb8eabf5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 18 Feb 2018 06:31:28 -0800
Subject: [PATCH 605/865] Make Facts more modern, DRY, and dimensional

Summary:
Ref T13083. Facts has a fair amount of weird hardcoding and duplication of responsibilities. Reduce this somewhat: no more hard-coded fact aggregates, no more database-driven list of available facts, etc. Generally, derive all objective truth from FactEngines. This is more similar to how most other modern applications work.

For clarity, hopefully: rename "FactSpec" to "Fact". Rename "RawFact" to "Datapoint".

Split the fairly optimistic "RawFact" table into an "IntDatapoint" table with less stuff in it, then dimension tables for the object PHIDs and key names. This is primarily aimed at reducing the row size of each datapoint. At the time I originally wrote this code we hadn't experimented much with storing similar data in multiple tables, but this is now more common and has worked well elsewhere (CustomFields, Edges, Ferret) so I don't anticipate this causing issues. If we need more complex or multidimension/multivalue tables later we can accommodate them. The queries a single table supports (like "all facts of all kinds in some time window") don't make any sense as far as I can tell and could likely be UNION ALL'd anyway.

Remove all the aggregation stuff for now, it's not really clear to me what this should look like.

Test Plan: Ran `bin/fact analyze` and viewed web UI. Nothing exploded too violently.

Subscribers: yelirekim

Maniphest Tasks: T13083

Differential Revision: https://secure.phabricator.com/D19119
---
 .../autopatches/20180218.fact.01.dim.key.sql  |   5 +
 .../autopatches/20180218.fact.02.dim.obj.sql  |   5 +
 .../autopatches/20180218.fact.03.data.int.sql |   8 ++
 src/__phutil_library_map__.php                |  24 ++--
 .../PhabricatorDifferentialApplication.php    |   6 -
 .../PhabricatorDiffusionApplication.php       |   6 -
 .../PhabricatorFactChartController.php        |  29 ++--
 .../PhabricatorFactHomeController.php         |  79 +----------
 .../fact/daemon/PhabricatorFactDaemon.php     | 134 ++++++++----------
 .../engine/PhabricatorFactCountEngine.php     |  86 -----------
 .../fact/engine/PhabricatorFactEngine.php     |  35 +++--
 .../PhabricatorFactLastUpdatedEngine.php      |  34 -----
 .../PhabricatorFactManiphestTaskEngine.php    |  34 +++++
 .../fact/fact/PhabricatorFact.php             |  40 ++++++
 .../fact/fact/PhabricatorPointsFact.php       |   9 ++
 ...abricatorFactManagementAnalyzeWorkflow.php |   4 -
 ...abricatorFactManagementDestroyWorkflow.php |   9 +-
 ...habricatorFactManagementStatusWorkflow.php |  47 ------
 .../fact/spec/PhabricatorFactSimpleSpec.php   |  38 -----
 .../fact/spec/PhabricatorFactSpec.php         |  53 -------
 .../fact/storage/PhabricatorFactDimension.php |  85 +++++++++++
 .../storage/PhabricatorFactIntDatapoint.php   |  61 ++++++++
 .../storage/PhabricatorFactKeyDimension.php   |  27 ++++
 .../PhabricatorFactObjectDimension.php        |  25 ++++
 .../PhabricatorPonderApplication.php          |   6 -
 25 files changed, 422 insertions(+), 467 deletions(-)
 create mode 100644 resources/sql/autopatches/20180218.fact.01.dim.key.sql
 create mode 100644 resources/sql/autopatches/20180218.fact.02.dim.obj.sql
 create mode 100644 resources/sql/autopatches/20180218.fact.03.data.int.sql
 delete mode 100644 src/applications/fact/engine/PhabricatorFactCountEngine.php
 delete mode 100644 src/applications/fact/engine/PhabricatorFactLastUpdatedEngine.php
 create mode 100644 src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php
 create mode 100644 src/applications/fact/fact/PhabricatorFact.php
 create mode 100644 src/applications/fact/fact/PhabricatorPointsFact.php
 delete mode 100644 src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php
 delete mode 100644 src/applications/fact/spec/PhabricatorFactSimpleSpec.php
 delete mode 100644 src/applications/fact/spec/PhabricatorFactSpec.php
 create mode 100644 src/applications/fact/storage/PhabricatorFactDimension.php
 create mode 100644 src/applications/fact/storage/PhabricatorFactIntDatapoint.php
 create mode 100644 src/applications/fact/storage/PhabricatorFactKeyDimension.php
 create mode 100644 src/applications/fact/storage/PhabricatorFactObjectDimension.php

diff --git a/resources/sql/autopatches/20180218.fact.01.dim.key.sql b/resources/sql/autopatches/20180218.fact.01.dim.key.sql
new file mode 100644
index 0000000000..3a81915026
--- /dev/null
+++ b/resources/sql/autopatches/20180218.fact.01.dim.key.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_fact.fact_keydimension (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  factKey VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT},
+  UNIQUE KEY `key_factkey` (factKey)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180218.fact.02.dim.obj.sql b/resources/sql/autopatches/20180218.fact.02.dim.obj.sql
new file mode 100644
index 0000000000..6b38062b29
--- /dev/null
+++ b/resources/sql/autopatches/20180218.fact.02.dim.obj.sql
@@ -0,0 +1,5 @@
+CREATE TABLE {$NAMESPACE}_fact.fact_objectdimension (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  UNIQUE KEY `key_object` (objectPHID)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180218.fact.03.data.int.sql b/resources/sql/autopatches/20180218.fact.03.data.int.sql
new file mode 100644
index 0000000000..d93d546733
--- /dev/null
+++ b/resources/sql/autopatches/20180218.fact.03.data.int.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_fact.fact_intdatapoint (
+  id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  keyID INT UNSIGNED NOT NULL,
+  objectID INT UNSIGNED NOT NULL,
+  dimensionID INT UNSIGNED,
+  value BIGINT SIGNED NOT NULL,
+  epoch INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 29a957ae6e..3fe0cba001 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2907,27 +2907,28 @@
     'PhabricatorExternalAccountsSettingsPanel' => 'applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php',
     'PhabricatorExtraConfigSetupCheck' => 'applications/config/check/PhabricatorExtraConfigSetupCheck.php',
     'PhabricatorFacebookAuthProvider' => 'applications/auth/provider/PhabricatorFacebookAuthProvider.php',
+    'PhabricatorFact' => 'applications/fact/fact/PhabricatorFact.php',
     'PhabricatorFactAggregate' => 'applications/fact/storage/PhabricatorFactAggregate.php',
     'PhabricatorFactApplication' => 'applications/fact/application/PhabricatorFactApplication.php',
     'PhabricatorFactChartController' => 'applications/fact/controller/PhabricatorFactChartController.php',
     'PhabricatorFactController' => 'applications/fact/controller/PhabricatorFactController.php',
-    'PhabricatorFactCountEngine' => 'applications/fact/engine/PhabricatorFactCountEngine.php',
     'PhabricatorFactCursor' => 'applications/fact/storage/PhabricatorFactCursor.php',
     'PhabricatorFactDAO' => 'applications/fact/storage/PhabricatorFactDAO.php',
     'PhabricatorFactDaemon' => 'applications/fact/daemon/PhabricatorFactDaemon.php',
+    'PhabricatorFactDimension' => 'applications/fact/storage/PhabricatorFactDimension.php',
     'PhabricatorFactEngine' => 'applications/fact/engine/PhabricatorFactEngine.php',
     'PhabricatorFactEngineTestCase' => 'applications/fact/engine/__tests__/PhabricatorFactEngineTestCase.php',
     'PhabricatorFactHomeController' => 'applications/fact/controller/PhabricatorFactHomeController.php',
-    'PhabricatorFactLastUpdatedEngine' => 'applications/fact/engine/PhabricatorFactLastUpdatedEngine.php',
+    'PhabricatorFactIntDatapoint' => 'applications/fact/storage/PhabricatorFactIntDatapoint.php',
+    'PhabricatorFactKeyDimension' => 'applications/fact/storage/PhabricatorFactKeyDimension.php',
     'PhabricatorFactManagementAnalyzeWorkflow' => 'applications/fact/management/PhabricatorFactManagementAnalyzeWorkflow.php',
     'PhabricatorFactManagementCursorsWorkflow' => 'applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php',
     'PhabricatorFactManagementDestroyWorkflow' => 'applications/fact/management/PhabricatorFactManagementDestroyWorkflow.php',
     'PhabricatorFactManagementListWorkflow' => 'applications/fact/management/PhabricatorFactManagementListWorkflow.php',
-    'PhabricatorFactManagementStatusWorkflow' => 'applications/fact/management/PhabricatorFactManagementStatusWorkflow.php',
     'PhabricatorFactManagementWorkflow' => 'applications/fact/management/PhabricatorFactManagementWorkflow.php',
+    'PhabricatorFactManiphestTaskEngine' => 'applications/fact/engine/PhabricatorFactManiphestTaskEngine.php',
+    'PhabricatorFactObjectDimension' => 'applications/fact/storage/PhabricatorFactObjectDimension.php',
     'PhabricatorFactRaw' => 'applications/fact/storage/PhabricatorFactRaw.php',
-    'PhabricatorFactSimpleSpec' => 'applications/fact/spec/PhabricatorFactSimpleSpec.php',
-    'PhabricatorFactSpec' => 'applications/fact/spec/PhabricatorFactSpec.php',
     'PhabricatorFactUpdateIterator' => 'applications/fact/extract/PhabricatorFactUpdateIterator.php',
     'PhabricatorFavoritesApplication' => 'applications/favorites/application/PhabricatorFavoritesApplication.php',
     'PhabricatorFavoritesController' => 'applications/favorites/controller/PhabricatorFavoritesController.php',
@@ -3716,6 +3717,7 @@
     'PhabricatorPirateEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorPirateEnglishTranslation.php',
     'PhabricatorPlatformSite' => 'aphront/site/PhabricatorPlatformSite.php',
     'PhabricatorPointsEditField' => 'applications/transactions/editfield/PhabricatorPointsEditField.php',
+    'PhabricatorPointsFact' => 'applications/fact/fact/PhabricatorPointsFact.php',
     'PhabricatorPolicies' => 'applications/policy/constants/PhabricatorPolicies.php',
     'PhabricatorPolicy' => 'applications/policy/storage/PhabricatorPolicy.php',
     'PhabricatorPolicyApplication' => 'applications/policy/application/PhabricatorPolicyApplication.php',
@@ -8433,27 +8435,28 @@
     'PhabricatorExternalAccountsSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorExtraConfigSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorFacebookAuthProvider' => 'PhabricatorOAuth2AuthProvider',
+    'PhabricatorFact' => 'Phobject',
     'PhabricatorFactAggregate' => 'PhabricatorFactDAO',
     'PhabricatorFactApplication' => 'PhabricatorApplication',
     'PhabricatorFactChartController' => 'PhabricatorFactController',
     'PhabricatorFactController' => 'PhabricatorController',
-    'PhabricatorFactCountEngine' => 'PhabricatorFactEngine',
     'PhabricatorFactCursor' => 'PhabricatorFactDAO',
     'PhabricatorFactDAO' => 'PhabricatorLiskDAO',
     'PhabricatorFactDaemon' => 'PhabricatorDaemon',
+    'PhabricatorFactDimension' => 'PhabricatorFactDAO',
     'PhabricatorFactEngine' => 'Phobject',
     'PhabricatorFactEngineTestCase' => 'PhabricatorTestCase',
     'PhabricatorFactHomeController' => 'PhabricatorFactController',
-    'PhabricatorFactLastUpdatedEngine' => 'PhabricatorFactEngine',
+    'PhabricatorFactIntDatapoint' => 'PhabricatorFactDAO',
+    'PhabricatorFactKeyDimension' => 'PhabricatorFactDimension',
     'PhabricatorFactManagementAnalyzeWorkflow' => 'PhabricatorFactManagementWorkflow',
     'PhabricatorFactManagementCursorsWorkflow' => 'PhabricatorFactManagementWorkflow',
     'PhabricatorFactManagementDestroyWorkflow' => 'PhabricatorFactManagementWorkflow',
     'PhabricatorFactManagementListWorkflow' => 'PhabricatorFactManagementWorkflow',
-    'PhabricatorFactManagementStatusWorkflow' => 'PhabricatorFactManagementWorkflow',
     'PhabricatorFactManagementWorkflow' => 'PhabricatorManagementWorkflow',
+    'PhabricatorFactManiphestTaskEngine' => 'PhabricatorFactEngine',
+    'PhabricatorFactObjectDimension' => 'PhabricatorFactDimension',
     'PhabricatorFactRaw' => 'PhabricatorFactDAO',
-    'PhabricatorFactSimpleSpec' => 'PhabricatorFactSpec',
-    'PhabricatorFactSpec' => 'Phobject',
     'PhabricatorFactUpdateIterator' => 'PhutilBufferedIterator',
     'PhabricatorFavoritesApplication' => 'PhabricatorApplication',
     'PhabricatorFavoritesController' => 'PhabricatorController',
@@ -9373,6 +9376,7 @@
     'PhabricatorPirateEnglishTranslation' => 'PhutilTranslation',
     'PhabricatorPlatformSite' => 'PhabricatorSite',
     'PhabricatorPointsEditField' => 'PhabricatorEditField',
+    'PhabricatorPointsFact' => 'PhabricatorFact',
     'PhabricatorPolicies' => 'PhabricatorPolicyConstants',
     'PhabricatorPolicy' => array(
       'PhabricatorPolicyDAO',
diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
index 1c8926f585..4141cf8539 100644
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -35,12 +35,6 @@ public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
     );
   }
 
-  public function getFactObjectsForAnalysis() {
-    return array(
-      new DifferentialRevision(),
-    );
-  }
-
   public function getTitleGlyph() {
     return "\xE2\x9A\x99";
   }
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index e619ecb1ad..d42e58b747 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -39,12 +39,6 @@ public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
     );
   }
 
-  public function getFactObjectsForAnalysis() {
-    return array(
-      new PhabricatorRepositoryCommit(),
-    );
-  }
-
   public function getRemarkupRules() {
     return array(
       new DiffusionCommitRemarkupRule(),
diff --git a/src/applications/fact/controller/PhabricatorFactChartController.php b/src/applications/fact/controller/PhabricatorFactChartController.php
index 16df8fca69..b6ae64b4b5 100644
--- a/src/applications/fact/controller/PhabricatorFactChartController.php
+++ b/src/applications/fact/controller/PhabricatorFactChartController.php
@@ -5,27 +5,32 @@ final class PhabricatorFactChartController extends PhabricatorFactController {
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
 
-    $table = new PhabricatorFactRaw();
-    $conn_r = $table->establishConnection('r');
-    $table_name = $table->getTableName();
-
     $series = $request->getStr('y1');
 
-    $specs = PhabricatorFactSpec::newSpecsForFactTypes(
-      PhabricatorFactEngine::loadAllEngines(),
-      array($series));
-    $spec = idx($specs, $series);
+    $facts = PhabricatorFact::getAllFacts();
+    $fact = idx($facts, $series);
+
+    if (!$fact) {
+      return new Aphront404Response();
+    }
+
+    $key_id = id(new PhabricatorFactKeyDimension())
+      ->newDimensionID($fact->getKey());
+
+    $table = $fact->newDatapoint();
+    $conn_r = $table->establishConnection('r');
+    $table_name = $table->getTableName();
 
     $data = queryfx_all(
       $conn_r,
-      'SELECT valueX, epoch FROM %T WHERE factType = %s ORDER BY epoch ASC',
+      'SELECT value, epoch FROM %T WHERE keyID = %d ORDER BY epoch ASC',
       $table_name,
-      $series);
+      $key_id);
 
     $points = array();
     $sum = 0;
     foreach ($data as $key => $row) {
-      $sum += (int)$row['valueX'];
+      $sum += (int)$row['value'];
       $points[(int)$row['epoch']] = $sum;
     }
 
@@ -71,7 +76,7 @@ public function handleRequest(AphrontRequest $request) {
     ));
 
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Count of %s', $spec->getName()))
+      ->setHeaderText(pht('Count of %s', $fact->getName()))
       ->appendChild($chart);
 
     $crumbs = $this->buildApplicationCrumbs();
diff --git a/src/applications/fact/controller/PhabricatorFactHomeController.php b/src/applications/fact/controller/PhabricatorFactHomeController.php
index f4eeca0387..82f6a0905b 100644
--- a/src/applications/fact/controller/PhabricatorFactHomeController.php
+++ b/src/applications/fact/controller/PhabricatorFactHomeController.php
@@ -15,45 +15,6 @@ public function handleRequest(AphrontRequest $request) {
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
-    $types = array(
-      '+N:*',
-      '+N:DREV',
-      'updated',
-    );
-
-    $engines = PhabricatorFactEngine::loadAllEngines();
-    $specs = PhabricatorFactSpec::newSpecsForFactTypes($engines, $types);
-
-    $facts = id(new PhabricatorFactAggregate())->loadAllWhere(
-      'factType IN (%Ls)',
-      $types);
-
-    $rows = array();
-    foreach ($facts as $fact) {
-      $spec = $specs[$fact->getFactType()];
-
-      $name = $spec->getName();
-      $value = $spec->formatValueForDisplay($viewer, $fact->getValueX());
-
-      $rows[] = array($name, $value);
-    }
-
-    $table = new AphrontTableView($rows);
-    $table->setHeaders(
-      array(
-        pht('Fact'),
-        pht('Value'),
-      ));
-    $table->setColumnClasses(
-      array(
-        'wide',
-        'n',
-      ));
-
-    $panel = new PHUIObjectBoxView();
-    $panel->setHeaderText(pht('Facts'));
-    $panel->setTable($table);
-
     $chart_form = $this->buildChartForm();
 
     $crumbs = $this->buildApplicationCrumbs();
@@ -64,46 +25,18 @@ public function handleRequest(AphrontRequest $request) {
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
-      ->appendChild(array(
-        $chart_form,
-        $panel,
-      ));
-
+      ->appendChild(
+        array(
+          $chart_form,
+        ));
   }
 
   private function buildChartForm() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
-    $table = new PhabricatorFactRaw();
-    $conn_r = $table->establishConnection('r');
-    $table_name = $table->getTableName();
-
-    $facts = queryfx_all(
-      $conn_r,
-      'SELECT DISTINCT factType from %T',
-      $table_name);
-
-    $specs = PhabricatorFactSpec::newSpecsForFactTypes(
-      PhabricatorFactEngine::loadAllEngines(),
-      ipull($facts, 'factType'));
-
-    $options = array();
-    foreach ($specs as $spec) {
-      if ($spec->getUnit() == PhabricatorFactSpec::UNIT_COUNT) {
-        $options[$spec->getType()] = $spec->getName();
-      }
-    }
-
-    if (!$options) {
-      return id(new PHUIInfoView())
-        ->setSeverity(PHUIInfoView::SEVERITY_NODATA)
-        ->setTitle(pht('No Chartable Facts'))
-        ->appendChild(phutil_tag(
-          'p',
-          array(),
-          pht('There are no facts that can be plotted yet.')));
-    }
+    $specs = PhabricatorFact::getAllFacts();
+    $options = mpull($specs, 'getName', 'getKey');
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
diff --git a/src/applications/fact/daemon/PhabricatorFactDaemon.php b/src/applications/fact/daemon/PhabricatorFactDaemon.php
index 384bb56df4..8a9214c40b 100644
--- a/src/applications/fact/daemon/PhabricatorFactDaemon.php
+++ b/src/applications/fact/daemon/PhabricatorFactDaemon.php
@@ -4,8 +4,6 @@ final class PhabricatorFactDaemon extends PhabricatorDaemon {
 
   private $engines;
 
-  const RAW_FACT_BUFFER_LIMIT = 128;
-
   protected function run() {
     $this->setEngines(PhabricatorFactEngine::loadAllEngines());
     while (!$this->shouldExit()) {
@@ -15,7 +13,6 @@ protected function run() {
       foreach ($iterators as $iterator_name => $iterator) {
         $this->processIteratorWithCursor($iterator_name, $iterator);
       }
-      $this->processAggregates();
 
       $this->log(pht('Zzz...'));
       $this->sleep(60 * 5);
@@ -72,59 +69,41 @@ public function setEngines(array $engines) {
   public function processIterator($iterator) {
     $result = null;
 
-    $raw_facts = array();
+    $datapoints = array();
     foreach ($iterator as $key => $object) {
       $phid = $object->getPHID();
       $this->log(pht('Processing %s...', $phid));
-      $raw_facts[$phid] = $this->computeRawFacts($object);
-      if (count($raw_facts) > self::RAW_FACT_BUFFER_LIMIT) {
-        $this->updateRawFacts($raw_facts);
-        $raw_facts = array();
+      $datapoints[$phid] = $this->newDatapoints($object);
+      if (count($datapoints) > 1024) {
+        $this->updateDatapoints($datapoints);
+        $datapoints = array();
       }
       $result = $key;
     }
 
-    if ($raw_facts) {
-      $this->updateRawFacts($raw_facts);
-      $raw_facts = array();
+    if ($datapoints) {
+      $this->updateDatapoints($datapoints);
+      $datapoints = array();
     }
 
     return $result;
   }
 
-  public function processAggregates() {
-    $this->log(pht('Processing aggregates.'));
-
-    $facts = $this->computeAggregateFacts();
-    $this->updateAggregateFacts($facts);
-  }
-
-  private function computeAggregateFacts() {
+  private function newDatapoints(PhabricatorLiskDAO $object) {
     $facts = array();
     foreach ($this->engines as $engine) {
-      if (!$engine->shouldComputeAggregateFacts()) {
+      if (!$engine->supportsDatapointsForObject($object)) {
         continue;
       }
-      $facts[] = $engine->computeAggregateFacts();
-    }
-    return array_mergev($facts);
-  }
-
-  private function computeRawFacts(PhabricatorLiskDAO $object) {
-    $facts = array();
-    foreach ($this->engines as $engine) {
-      if (!$engine->shouldComputeRawFactsForObject($object)) {
-        continue;
-      }
-      $facts[] = $engine->computeRawFactsForObject($object);
+      $facts[] = $engine->newDatapointsForObject($object);
     }
 
     return array_mergev($facts);
   }
 
-  private function updateRawFacts(array $map) {
+  private function updateDatapoints(array $map) {
     foreach ($map as $phid => $facts) {
-      assert_instances_of($facts, 'PhabricatorFactRaw');
+      assert_instances_of($facts, 'PhabricatorFactIntDatapoint');
     }
 
     $phids = array_keys($map);
@@ -132,76 +111,79 @@ private function updateRawFacts(array $map) {
       return;
     }
 
-    $table = new PhabricatorFactRaw();
+
+    $fact_keys = array();
+    $objects = array();
+    foreach ($map as $phid => $facts) {
+      foreach ($facts as $fact) {
+        $fact_keys[$fact->getKey()] = true;
+
+        $object_phid = $fact->getObjectPHID();
+        $objects[$object_phid] = $object_phid;
+
+        $dimension_phid = $fact->getDimensionPHID();
+        if ($dimension_phid !== null) {
+          $objects[$dimension_phid] = $dimension_phid;
+        }
+      }
+    }
+
+    $key_map = id(new PhabricatorFactKeyDimension())
+      ->newDimensionMap(array_keys($fact_keys));
+    $object_map = id(new PhabricatorFactObjectDimension())
+      ->newDimensionMap(array_keys($objects));
+
+    $table = new PhabricatorFactIntDatapoint();
     $conn = $table->establishConnection('w');
     $table_name = $table->getTableName();
 
     $sql = array();
     foreach ($map as $phid => $facts) {
       foreach ($facts as $fact) {
+        $key_id = $key_map[$fact->getKey()];
+        $object_id = $object_map[$fact->getObjectPHID()];
+
+        $dimension_phid = $fact->getDimensionPHID();
+        if ($dimension_phid !== null) {
+          $dimension_id = $object_map[$dimension_phid];
+        } else {
+          $dimension_id = null;
+        }
+
         $sql[] = qsprintf(
           $conn,
-          '(%s, %s, %s, %d, %d, %d)',
-          $fact->getFactType(),
-          $fact->getObjectPHID(),
-          $fact->getObjectA(),
-          $fact->getValueX(),
-          $fact->getValueY(),
+          '(%d, %d, %nd, %d, %d)',
+          $key_id,
+          $object_id,
+          $dimension_id,
+          $fact->getValue(),
           $fact->getEpoch());
       }
     }
 
+    $rebuilt_ids = array_select_keys($object_map, $phids);
+
     $table->openTransaction();
 
       queryfx(
         $conn,
-        'DELETE FROM %T WHERE objectPHID IN (%Ls)',
+        'DELETE FROM %T WHERE objectID IN (%Ld)',
         $table_name,
-        $phids);
+        $rebuilt_ids);
 
       if ($sql) {
-        foreach (array_chunk($sql, 256) as $chunk) {
+        foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
           queryfx(
             $conn,
             'INSERT INTO %T
-              (factType, objectPHID, objectA, valueX, valueY, epoch)
+              (keyID, objectID, dimensionID, value, epoch)
               VALUES %Q',
             $table_name,
-            implode(', ', $chunk));
+            $chunk);
         }
       }
 
     $table->saveTransaction();
   }
 
-  private function updateAggregateFacts(array $facts) {
-    if (!$facts) {
-      return;
-    }
-
-    $table = new PhabricatorFactAggregate();
-    $conn = $table->establishConnection('w');
-    $table_name = $table->getTableName();
-
-    $sql = array();
-    foreach ($facts as $fact) {
-      $sql[] = qsprintf(
-        $conn,
-        '(%s, %s, %d)',
-        $fact->getFactType(),
-        $fact->getObjectPHID(),
-        $fact->getValueX());
-    }
-
-    foreach (array_chunk($sql, 256) as $chunk) {
-      queryfx(
-        $conn,
-        'INSERT INTO %T (factType, objectPHID, valueX) VALUES %Q
-          ON DUPLICATE KEY UPDATE valueX = VALUES(valueX)',
-        $table_name,
-        implode(', ', $chunk));
-    }
-
-  }
-
 }
diff --git a/src/applications/fact/engine/PhabricatorFactCountEngine.php b/src/applications/fact/engine/PhabricatorFactCountEngine.php
deleted file mode 100644
index f24068646d..0000000000
--- a/src/applications/fact/engine/PhabricatorFactCountEngine.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Simple fact engine which counts objects.
- */
-final class PhabricatorFactCountEngine extends PhabricatorFactEngine {
-
-  public function getFactSpecs(array $fact_types) {
-    $results = array();
-    foreach ($fact_types as $type) {
-      if (!strncmp($type, '+N:', 3)) {
-        if ($type == '+N:*') {
-          $name = pht('Total Objects');
-        } else {
-          $name = pht('Total Objects of type %s', substr($type, 3));
-        }
-
-        $results[] = id(new PhabricatorFactSimpleSpec($type))
-          ->setName($name)
-          ->setUnit(PhabricatorFactSimpleSpec::UNIT_COUNT);
-      }
-
-      if (!strncmp($type, 'N:', 2)) {
-        if ($type == 'N:*') {
-          $name = pht('Objects');
-        } else {
-          $name = pht('Objects of type %s', substr($type, 2));
-        }
-        $results[] = id(new PhabricatorFactSimpleSpec($type))
-          ->setName($name)
-          ->setUnit(PhabricatorFactSimpleSpec::UNIT_COUNT);
-      }
-
-    }
-    return $results;
-  }
-
-  public function shouldComputeRawFactsForObject(PhabricatorLiskDAO $object) {
-    return true;
-  }
-
-  public function computeRawFactsForObject(PhabricatorLiskDAO $object) {
-    $facts = array();
-
-    $phid = $object->getPHID();
-    $type = phid_get_type($phid);
-
-    foreach (array('N:*', 'N:'.$type) as $fact_type) {
-      $facts[] = id(new PhabricatorFactRaw())
-        ->setFactType($fact_type)
-        ->setObjectPHID($phid)
-        ->setValueX(1)
-        ->setEpoch($object->getDateCreated());
-    }
-
-    return $facts;
-  }
-
-  public function shouldComputeAggregateFacts() {
-    return true;
-  }
-
-  public function computeAggregateFacts() {
-    $table = new PhabricatorFactRaw();
-    $table_name = $table->getTableName();
-    $conn = $table->establishConnection('r');
-
-    $counts = queryfx_all(
-      $conn,
-      'SELECT factType, SUM(valueX) N FROM %T WHERE factType LIKE %>
-        GROUP BY factType',
-      $table_name,
-      'N:');
-
-    $facts = array();
-    foreach ($counts as $count) {
-      $facts[] = id(new PhabricatorFactAggregate())
-        ->setFactType('+'.$count['factType'])
-        ->setValueX($count['N']);
-    }
-
-    return $facts;
-  }
-
-
-}
diff --git a/src/applications/fact/engine/PhabricatorFactEngine.php b/src/applications/fact/engine/PhabricatorFactEngine.php
index a87cabf56d..b8389f7b23 100644
--- a/src/applications/fact/engine/PhabricatorFactEngine.php
+++ b/src/applications/fact/engine/PhabricatorFactEngine.php
@@ -2,30 +2,37 @@
 
 abstract class PhabricatorFactEngine extends Phobject {
 
+  private $factMap;
+
   final public static function loadAllEngines() {
     return id(new PhutilClassMapQuery())
       ->setAncestorClass(__CLASS__)
       ->execute();
   }
 
-  public function getFactSpecs(array $fact_types) {
-    return array();
-  }
+  abstract public function newFacts();
 
-  public function shouldComputeRawFactsForObject(PhabricatorLiskDAO $object) {
-    return false;
-  }
+  abstract public function supportsDatapointsForObject(
+    PhabricatorLiskDAO $object);
 
-  public function computeRawFactsForObject(PhabricatorLiskDAO $object) {
-    return array();
-  }
+  abstract public function newDatapointsForObject(PhabricatorLiskDAO $object);
 
-  public function shouldComputeAggregateFacts() {
-    return false;
-  }
+  final protected function getFact($key) {
+    if ($this->factMap === null) {
+      $facts = $this->newFacts();
+      $facts = mpull($facts, null, 'getKey');
+      $this->factMap = $facts;
+    }
+
+    if (!isset($this->factMap[$key])) {
+      throw new Exception(
+        pht(
+          'Unknown fact ("%s") for engine "%s".',
+          $key,
+          get_class($this)));
+    }
 
-  public function computeAggregateFacts() {
-    return array();
+    return $this->factMap[$key];
   }
 
 }
diff --git a/src/applications/fact/engine/PhabricatorFactLastUpdatedEngine.php b/src/applications/fact/engine/PhabricatorFactLastUpdatedEngine.php
deleted file mode 100644
index 5ea99e6232..0000000000
--- a/src/applications/fact/engine/PhabricatorFactLastUpdatedEngine.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Engine that records the time facts were last updated.
- */
-final class PhabricatorFactLastUpdatedEngine extends PhabricatorFactEngine {
-
-  public function getFactSpecs(array $fact_types) {
-    $results = array();
-    foreach ($fact_types as $type) {
-      if ($type == 'updated') {
-        $results[] = id(new PhabricatorFactSimpleSpec($type))
-          ->setName(pht('Facts Last Updated'))
-          ->setUnit(PhabricatorFactSimpleSpec::UNIT_EPOCH);
-      }
-    }
-    return $results;
-  }
-
-  public function shouldComputeAggregateFacts() {
-    return true;
-  }
-
-  public function computeAggregateFacts() {
-    $facts = array();
-
-    $facts[] = id(new PhabricatorFactAggregate())
-      ->setFactType('updated')
-      ->setValueX(time());
-
-    return $facts;
-  }
-
-}
diff --git a/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php b/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php
new file mode 100644
index 0000000000..c2ed81d72b
--- /dev/null
+++ b/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php
@@ -0,0 +1,34 @@
+<?php
+
+final class PhabricatorFactManiphestTaskEngine
+  extends PhabricatorFactEngine {
+
+  public function newFacts() {
+    return array(
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.count.open'),
+    );
+  }
+
+  public function supportsDatapointsForObject(PhabricatorLiskDAO $object) {
+    return ($object instanceof ManiphestTask);
+  }
+
+  public function newDatapointsForObject(PhabricatorLiskDAO $object) {
+    $datapoints = array();
+
+    $phid = $object->getPHID();
+    $type = phid_get_type($phid);
+
+    $datapoint = $this->getFact('tasks.count.open')
+      ->newDatapoint();
+
+    $datapoints[] = $datapoint
+      ->setObjectPHID($phid)
+      ->setValue(1)
+      ->setEpoch($object->getDateCreated());
+
+    return $datapoints;
+  }
+
+}
diff --git a/src/applications/fact/fact/PhabricatorFact.php b/src/applications/fact/fact/PhabricatorFact.php
new file mode 100644
index 0000000000..2e33a029f3
--- /dev/null
+++ b/src/applications/fact/fact/PhabricatorFact.php
@@ -0,0 +1,40 @@
+<?php
+
+abstract class PhabricatorFact extends Phobject {
+
+  private $key;
+
+  public static function getAllFacts() {
+    $engines = PhabricatorFactEngine::loadAllEngines();
+
+    $map = array();
+    foreach ($engines as $engine) {
+      $facts = $engine->newFacts();
+      $facts = mpull($facts, null, 'getKey');
+      $map += $facts;
+    }
+
+    return $map;
+  }
+
+  final public function setKey($key) {
+    $this->key = $key;
+    return $this;
+  }
+
+  final public function getKey() {
+    return $this->key;
+  }
+
+  final public function getName() {
+    return pht('Fact "%s"', $this->getKey());
+  }
+
+  final public function newDatapoint() {
+    return $this->newTemplateDatapoint()
+      ->setKey($this->getKey());
+  }
+
+  abstract protected function newTemplateDatapoint();
+
+}
diff --git a/src/applications/fact/fact/PhabricatorPointsFact.php b/src/applications/fact/fact/PhabricatorPointsFact.php
new file mode 100644
index 0000000000..a80f45d132
--- /dev/null
+++ b/src/applications/fact/fact/PhabricatorPointsFact.php
@@ -0,0 +1,9 @@
+<?php
+
+final class PhabricatorPointsFact extends PhabricatorFact {
+
+  protected function newTemplateDatapoint() {
+    return new PhabricatorFactIntDatapoint();
+  }
+
+}
diff --git a/src/applications/fact/management/PhabricatorFactManagementAnalyzeWorkflow.php b/src/applications/fact/management/PhabricatorFactManagementAnalyzeWorkflow.php
index 6b316f8c75..2d2a0bba6b 100644
--- a/src/applications/fact/management/PhabricatorFactManagementAnalyzeWorkflow.php
+++ b/src/applications/fact/management/PhabricatorFactManagementAnalyzeWorkflow.php
@@ -58,10 +58,6 @@ public function execute(PhutilArgumentParser $args) {
       }
     }
 
-    if (!$args->getArg('skip-aggregates')) {
-      $daemon->processAggregates();
-    }
-
     return 0;
   }
 
diff --git a/src/applications/fact/management/PhabricatorFactManagementDestroyWorkflow.php b/src/applications/fact/management/PhabricatorFactManagementDestroyWorkflow.php
index 8a2e5f1ed8..7a4997ab35 100644
--- a/src/applications/fact/management/PhabricatorFactManagementDestroyWorkflow.php
+++ b/src/applications/fact/management/PhabricatorFactManagementDestroyWorkflow.php
@@ -23,8 +23,13 @@ public function execute(PhutilArgumentParser $args) {
     }
 
     $tables = array();
-    $tables[] = new PhabricatorFactRaw();
-    $tables[] = new PhabricatorFactAggregate();
+    $tables[] = new PhabricatorFactCursor();
+
+    $tables[] = new PhabricatorFactIntDatapoint();
+
+    $tables[] = new PhabricatorFactObjectDimension();
+    $tables[] = new PhabricatorFactKeyDimension();
+
     foreach ($tables as $table) {
       $conn = $table->establishConnection('w');
       $name = $table->getTableName();
diff --git a/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php b/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php
deleted file mode 100644
index 604a40b6ee..0000000000
--- a/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-final class PhabricatorFactManagementStatusWorkflow
-  extends PhabricatorFactManagementWorkflow {
-
-  protected function didConstruct() {
-    $this
-      ->setName('status')
-      ->setSynopsis(pht('Show status of fact data.'))
-      ->setArguments(array());
-  }
-
-  public function execute(PhutilArgumentParser $args) {
-    $console = PhutilConsole::getConsole();
-
-    $map = array(
-      'raw' => new PhabricatorFactRaw(),
-      'agg' => new PhabricatorFactAggregate(),
-    );
-
-    foreach ($map as $type => $table) {
-      $conn = $table->establishConnection('r');
-      $name = $table->getTableName();
-
-      $row = queryfx_one(
-        $conn,
-        'SELECT COUNT(*) N FROM %T',
-        $name);
-
-      $n = $row['N'];
-
-      switch ($type) {
-        case 'raw':
-          $desc = pht('There are %d raw fact(s) in storage.', $n);
-          break;
-        case 'agg':
-          $desc = pht('There are %d aggregate fact(s) in storage.', $n);
-          break;
-      }
-
-      $console->writeOut("%s\n", $desc);
-    }
-
-    return 0;
-  }
-
-}
diff --git a/src/applications/fact/spec/PhabricatorFactSimpleSpec.php b/src/applications/fact/spec/PhabricatorFactSimpleSpec.php
deleted file mode 100644
index 350b6367f1..0000000000
--- a/src/applications/fact/spec/PhabricatorFactSimpleSpec.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-final class PhabricatorFactSimpleSpec extends PhabricatorFactSpec {
-
-  private $type;
-  private $name;
-  private $unit;
-
-  public function __construct($type) {
-    $this->type = $type;
-  }
-
-  public function getType() {
-    return $this->type;
-  }
-
-  public function setUnit($unit) {
-    $this->unit = $unit;
-    return $this;
-  }
-
-  public function getUnit() {
-    return $this->unit;
-  }
-
-  public function setName($name) {
-    $this->name = $name;
-    return $this;
-  }
-
-  public function getName() {
-    if ($this->name !== null) {
-      return $this->name;
-    }
-    return parent::getName();
-  }
-
-}
diff --git a/src/applications/fact/spec/PhabricatorFactSpec.php b/src/applications/fact/spec/PhabricatorFactSpec.php
deleted file mode 100644
index 47fcc01d8b..0000000000
--- a/src/applications/fact/spec/PhabricatorFactSpec.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-abstract class PhabricatorFactSpec extends Phobject {
-
-  const UNIT_COUNT = 'unit-count';
-  const UNIT_EPOCH = 'unit-epoch';
-
-  public static function newSpecsForFactTypes(
-    array $engines,
-    array $fact_types) {
-    assert_instances_of($engines, 'PhabricatorFactEngine');
-
-    $map = array();
-    foreach ($engines as $engine) {
-      $specs = $engine->getFactSpecs($fact_types);
-      $specs = mpull($specs, null, 'getType');
-      $map += $specs;
-    }
-
-    foreach ($fact_types as $type) {
-      if (empty($map[$type])) {
-        $map[$type] = new PhabricatorFactSimpleSpec($type);
-      }
-    }
-
-    return $map;
-  }
-
-  abstract public function getType();
-
-  public function getUnit() {
-    return null;
-  }
-
-  public function getName() {
-    return pht(
-      'Fact (%s)',
-      $this->getType());
-  }
-
-  public function formatValueForDisplay(PhabricatorUser $user, $value) {
-    $unit = $this->getUnit();
-    switch ($unit) {
-      case self::UNIT_COUNT:
-        return number_format($value);
-      case self::UNIT_EPOCH:
-        return phabricator_datetime($value, $user);
-      default:
-        return $value;
-    }
-  }
-
-}
diff --git a/src/applications/fact/storage/PhabricatorFactDimension.php b/src/applications/fact/storage/PhabricatorFactDimension.php
new file mode 100644
index 0000000000..d2bf2420dc
--- /dev/null
+++ b/src/applications/fact/storage/PhabricatorFactDimension.php
@@ -0,0 +1,85 @@
+<?php
+
+abstract class PhabricatorFactDimension extends PhabricatorFactDAO {
+
+  abstract protected function getDimensionColumnName();
+
+  final public function newDimensionID($key) {
+    $map = $this->newDimensionMap(array($key));
+    return $map[$key];
+  }
+
+  final public function newDimensionMap(array $keys) {
+    if (!$keys) {
+      return array();
+    }
+
+    $conn = $this->establishConnection('r');
+    $column = $this->getDimensionColumnName();
+
+    $rows = queryfx_all(
+      $conn,
+      'SELECT id, %C FROM %T WHERE %C IN (%Ls)',
+      $column,
+      $this->getTableName(),
+      $column,
+      $keys);
+    $rows = ipull($rows, 'id', $column);
+
+    $map = array();
+    $need = array();
+    foreach ($keys as $key) {
+      if (isset($rows[$key])) {
+        $map[$key] = (int)$rows[$key];
+      } else {
+        $need[] = $key;
+      }
+    }
+
+    if (!$need) {
+      return $map;
+    }
+
+    $sql = array();
+    foreach ($need as $key) {
+      $sql[] = qsprintf(
+        $conn,
+        '(%s)',
+        $key);
+    }
+
+    foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
+      queryfx(
+        $conn,
+        'INSERT IGNORE INTO %T (%C) VALUES %Q',
+        $this->getTableName(),
+        $column,
+        $chunk);
+    }
+
+    $rows = queryfx_all(
+      $conn,
+      'SELECT id, %C FROM %T WHERE %C IN (%Ls)',
+      $column,
+      $this->getTableName(),
+      $column,
+      $need);
+    $rows = ipull($rows, 'id', $column);
+
+    foreach ($keys as $key) {
+      if (isset($rows[$key])) {
+        $map[$key] = (int)$rows[$key];
+      } else {
+        throw new Exception(
+          pht(
+            'Failed to load or generate dimension ID ("%s") for dimension '.
+            'key "%s".',
+            get_class($this),
+            $key));
+      }
+    }
+
+    return $map;
+  }
+
+}
diff --git a/src/applications/fact/storage/PhabricatorFactIntDatapoint.php b/src/applications/fact/storage/PhabricatorFactIntDatapoint.php
new file mode 100644
index 0000000000..7895052d5d
--- /dev/null
+++ b/src/applications/fact/storage/PhabricatorFactIntDatapoint.php
@@ -0,0 +1,61 @@
+<?php
+
+final class PhabricatorFactIntDatapoint extends PhabricatorFactDAO {
+
+  protected $keyID;
+  protected $objectID;
+  protected $dimensionID;
+  protected $value;
+  protected $epoch;
+
+  private $key;
+  private $objectPHID;
+  private $dimensionPHID;
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_TIMESTAMPS => false,
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'id' => 'auto64',
+        'dimensionID' => 'id?',
+        'value' => 'sint64',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_dimension' => array(
+          'columns' => array('keyID', 'dimensionID'),
+        ),
+        'key_object' => array(
+          'columns' => array('objectID'),
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  public function setKey($key) {
+    $this->key = $key;
+    return $this;
+  }
+
+  public function getKey() {
+    return $this->key;
+  }
+
+  public function setObjectPHID($object_phid) {
+    $this->objectPHID = $object_phid;
+    return $this;
+  }
+
+  public function getObjectPHID() {
+    return $this->objectPHID;
+  }
+
+  public function setDimensionPHID($dimension_phid) {
+    $this->dimensionPHID = $dimension_phid;
+    return $this;
+  }
+
+  public function getDimensionPHID() {
+    return $this->dimensionPHID;
+  }
+
+}
diff --git a/src/applications/fact/storage/PhabricatorFactKeyDimension.php b/src/applications/fact/storage/PhabricatorFactKeyDimension.php
new file mode 100644
index 0000000000..b58ba94400
--- /dev/null
+++ b/src/applications/fact/storage/PhabricatorFactKeyDimension.php
@@ -0,0 +1,27 @@
+<?php
+
+final class PhabricatorFactKeyDimension
+  extends PhabricatorFactDimension {
+
+  protected $factKey;
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_TIMESTAMPS => false,
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'factKey' => 'text64',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_factkey' => array(
+          'columns' => array('factKey'),
+          'unique' => true,
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  protected function getDimensionColumnName() {
+    return 'factKey';
+  }
+
+}
diff --git a/src/applications/fact/storage/PhabricatorFactObjectDimension.php b/src/applications/fact/storage/PhabricatorFactObjectDimension.php
new file mode 100644
index 0000000000..e7319724a4
--- /dev/null
+++ b/src/applications/fact/storage/PhabricatorFactObjectDimension.php
@@ -0,0 +1,25 @@
+<?php
+
+final class PhabricatorFactObjectDimension
+  extends PhabricatorFactDimension {
+
+  protected $objectPHID;
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_TIMESTAMPS => false,
+      self::CONFIG_COLUMN_SCHEMA => array(),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_object' => array(
+          'columns' => array('objectPHID'),
+          'unique' => true,
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  protected function getDimensionColumnName() {
+    return 'objectPHID';
+  }
+
+}
diff --git a/src/applications/ponder/application/PhabricatorPonderApplication.php b/src/applications/ponder/application/PhabricatorPonderApplication.php
index ed37c7ef6e..56973447f9 100644
--- a/src/applications/ponder/application/PhabricatorPonderApplication.php
+++ b/src/applications/ponder/application/PhabricatorPonderApplication.php
@@ -18,12 +18,6 @@ public function getIcon() {
     return 'fa-university';
   }
 
-  public function getFactObjectsForAnalysis() {
-    return array(
-      new PonderQuestion(),
-    );
-  }
-
   public function getTitleGlyph() {
     return "\xE2\x97\xB3";
   }

From e3a1a32444d06ed7b42d616413695bccddd3468e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 18 Feb 2018 09:18:50 -0800
Subject: [PATCH 606/865] Extract count/point data from tasks in Fact engines

Summary:
Depends on D19119. Ref T13083. This is probably still very buggy, but I'm planning to build support tools to make debugging facts easier shortly.

This generates a large number of datapoints, at least, and can render some charts which aren't all completely broken in an obvious way.

Test Plan: Ran `bin/fact analyze --all`, got some charts with lines that went up and down in the web UI.

Subscribers: yelirekim

Maniphest Tasks: T13083

Differential Revision: https://secure.phabricator.com/D19120
---
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorFactChartController.php        |   3 +
 .../fact/daemon/PhabricatorFactDaemon.php     |  19 +-
 .../fact/engine/PhabricatorFactEngine.php     |   4 +
 .../PhabricatorFactManiphestTaskEngine.php    | 388 +++++++++++++++++-
 .../fact/fact/PhabricatorCountFact.php        |   9 +
 .../fact/storage/PhabricatorFactDimension.php |  10 +-
 .../PhabricatorApplicationTransaction.php     |   5 +
 8 files changed, 422 insertions(+), 18 deletions(-)
 create mode 100644 src/applications/fact/fact/PhabricatorCountFact.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3fe0cba001..e3f7f64ada 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2588,6 +2588,7 @@
     'PhabricatorCoreCreateTransaction' => 'applications/transactions/xaction/PhabricatorCoreCreateTransaction.php',
     'PhabricatorCoreTransactionType' => 'applications/transactions/xaction/PhabricatorCoreTransactionType.php',
     'PhabricatorCoreVoidTransaction' => 'applications/transactions/xaction/PhabricatorCoreVoidTransaction.php',
+    'PhabricatorCountFact' => 'applications/fact/fact/PhabricatorCountFact.php',
     'PhabricatorCountdown' => 'applications/countdown/storage/PhabricatorCountdown.php',
     'PhabricatorCountdownApplication' => 'applications/countdown/application/PhabricatorCountdownApplication.php',
     'PhabricatorCountdownController' => 'applications/countdown/controller/PhabricatorCountdownController.php',
@@ -8078,6 +8079,7 @@
     'PhabricatorCoreCreateTransaction' => 'PhabricatorCoreTransactionType',
     'PhabricatorCoreTransactionType' => 'PhabricatorModularTransactionType',
     'PhabricatorCoreVoidTransaction' => 'PhabricatorModularTransactionType',
+    'PhabricatorCountFact' => 'PhabricatorFact',
     'PhabricatorCountdown' => array(
       'PhabricatorCountdownDAO',
       'PhabricatorPolicyInterface',
diff --git a/src/applications/fact/controller/PhabricatorFactChartController.php b/src/applications/fact/controller/PhabricatorFactChartController.php
index b6ae64b4b5..7612cf1568 100644
--- a/src/applications/fact/controller/PhabricatorFactChartController.php
+++ b/src/applications/fact/controller/PhabricatorFactChartController.php
@@ -16,6 +16,9 @@ public function handleRequest(AphrontRequest $request) {
 
     $key_id = id(new PhabricatorFactKeyDimension())
       ->newDimensionID($fact->getKey());
+    if (!$key_id) {
+      return new Aphront404Response();
+    }
 
     $table = $fact->newDatapoint();
     $conn_r = $table->establishConnection('r');
diff --git a/src/applications/fact/daemon/PhabricatorFactDaemon.php b/src/applications/fact/daemon/PhabricatorFactDaemon.php
index 8a9214c40b..baf0203471 100644
--- a/src/applications/fact/daemon/PhabricatorFactDaemon.php
+++ b/src/applications/fact/daemon/PhabricatorFactDaemon.php
@@ -70,20 +70,28 @@ public function processIterator($iterator) {
     $result = null;
 
     $datapoints = array();
+    $count = 0;
     foreach ($iterator as $key => $object) {
       $phid = $object->getPHID();
       $this->log(pht('Processing %s...', $phid));
-      $datapoints[$phid] = $this->newDatapoints($object);
-      if (count($datapoints) > 1024) {
+      $object_datapoints = $this->newDatapoints($object);
+      $count += count($object_datapoints);
+
+      $datapoints[$phid] = $object_datapoints;
+
+      if ($count > 1024) {
         $this->updateDatapoints($datapoints);
         $datapoints = array();
+        $count = 0;
       }
+
       $result = $key;
     }
 
-    if ($datapoints) {
+    if ($count) {
       $this->updateDatapoints($datapoints);
       $datapoints = array();
+      $count = 0;
     }
 
     return $result;
@@ -111,7 +119,6 @@ private function updateDatapoints(array $map) {
       return;
     }
 
-
     $fact_keys = array();
     $objects = array();
     foreach ($map as $phid => $facts) {
@@ -129,9 +136,9 @@ private function updateDatapoints(array $map) {
     }
 
     $key_map = id(new PhabricatorFactKeyDimension())
-      ->newDimensionMap(array_keys($fact_keys));
+      ->newDimensionMap(array_keys($fact_keys), true);
     $object_map = id(new PhabricatorFactObjectDimension())
-      ->newDimensionMap(array_keys($objects));
+      ->newDimensionMap(array_keys($objects), true);
 
     $table = new PhabricatorFactIntDatapoint();
     $conn = $table->establishConnection('w');
diff --git a/src/applications/fact/engine/PhabricatorFactEngine.php b/src/applications/fact/engine/PhabricatorFactEngine.php
index b8389f7b23..722a97efbc 100644
--- a/src/applications/fact/engine/PhabricatorFactEngine.php
+++ b/src/applications/fact/engine/PhabricatorFactEngine.php
@@ -35,4 +35,8 @@ final protected function getFact($key) {
     return $this->factMap[$key];
   }
 
+  final protected function getViewer() {
+    return PhabricatorUser::getOmnipotentUser();
+  }
+
 }
diff --git a/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php b/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php
index c2ed81d72b..76eb2d1681 100644
--- a/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php
+++ b/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php
@@ -5,8 +5,77 @@ final class PhabricatorFactManiphestTaskEngine
 
   public function newFacts() {
     return array(
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.count.create'),
+
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.open-count.create'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.open-count.status'),
+
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.count.create.project'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.count.assign.project'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.open-count.create.project'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.open-count.status.project'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.open-count.assign.project'),
+
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.count.create.owner'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.count.assign.owner'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.open-count.create.owner'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.open-count.status.owner'),
+      id(new PhabricatorCountFact())
+        ->setKey('tasks.open-count.assign.owner'),
+
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.points.create'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.points.score'),
+
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.create'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.status'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.score'),
+
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.points.create.project'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.points.assign.project'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.points.score.project'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.create.project'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.status.project'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.score.project'),
       id(new PhabricatorPointsFact())
-        ->setKey('tasks.count.open'),
+        ->setKey('tasks.open-points.assign.project'),
+
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.points.create.owner'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.points.assign.owner'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.points.score.owner'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.create.owner'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.status.owner'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.score.project'),
+      id(new PhabricatorPointsFact())
+        ->setKey('tasks.open-points.assign.owner'),
     );
   }
 
@@ -15,18 +84,319 @@ public function supportsDatapointsForObject(PhabricatorLiskDAO $object) {
   }
 
   public function newDatapointsForObject(PhabricatorLiskDAO $object) {
+    $viewer = $this->getViewer();
+
+    $xaction_query = PhabricatorApplicationTransactionQuery::newQueryForObject(
+      $object);
+    $xactions = $xaction_query
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object->getPHID()))
+      ->execute();
+
+    $xactions = msortv($xactions, 'newChronologicalSortVector');
+
+    $old_open = false;
+    $old_points = 0;
+    $old_owner = null;
+    $project_map = array();
+    $object_phid = $object->getPHID();
+    $is_create = true;
+
+    $specs = array();
     $datapoints = array();
+    foreach ($xactions as $xaction_group) {
+      $add_projects = array();
+      $rem_projects = array();
+
+      $new_open = $old_open;
+      $new_points = $old_points;
+      $new_owner = $old_owner;
+
+      // TODO: Actually group concurrent transactions.
+      $xaction_group = array($xaction_group);
+
+      $group_epoch = last($xaction_group)->getDateCreated();
+      foreach ($xaction_group as $xaction) {
+        $old_value = $xaction->getOldValue();
+        $new_value = $xaction->getNewValue();
+        switch ($xaction->getTransactionType()) {
+          case ManiphestTaskStatusTransaction::TRANSACTIONTYPE:
+            $new_open = !ManiphestTaskStatus::isClosedStatus($new_value);
+            break;
+          case ManiphestTaskMergedIntoTransaction::TRANSACTIONTYPE:
+            // When a task is merged into another task, it is changed to a
+            // closed status without generating a separate status transaction.
+            $new_open = false;
+            break;
+          case ManiphestTaskPointsTransaction::TRANSACTIONTYPE:
+            $new_points = (int)$xaction->getNewValue();
+            break;
+          case ManiphestTaskOwnerTransaction::TRANSACTIONTYPE:
+            $new_owner = $xaction->getNewValue();
+            break;
+          case PhabricatorTransactions::TYPE_EDGE:
+            $edge_type = $xaction->getMetadataValue('edge:type');
+            switch ($edge_type) {
+              case PhabricatorProjectObjectHasProjectEdgeType::EDGECONST:
+                $record = PhabricatorEdgeChangeRecord::newFromTransaction(
+                  $xaction);
+                $add_projects += array_fuse($record->getAddedPHIDs());
+                $rem_projects += array_fuse($record->getRemovedPHIDs());
+                break;
+            }
+            break;
+        }
+      }
+
+      // If a project was both added and removed, moot it.
+      $mix_projects = array_intersect_key($add_projects, $rem_projects);
+      $add_projects = array_diff_key($add_projects, $mix_projects);
+      $rem_projects = array_diff_key($rem_projects, $mix_projects);
+
+      $project_sets = array(
+        array(
+          'phids' => $rem_projects,
+          'scale' => -1,
+        ),
+        array(
+          'phids' => $add_projects,
+          'scale' => 1,
+        ),
+      );
+
+      if ($is_create) {
+        $action = 'create';
+        $action_points = $new_points;
+      } else {
+        $action = 'assign';
+        $action_points = $old_points;
+      }
+
+      foreach ($project_sets as $project_set) {
+        $scale = $project_set['scale'];
+        foreach ($project_set['phids'] as $project_phid) {
+          if ($old_open) {
+            $specs[] = array(
+              "tasks.open-count.{$action}.project",
+              1 * $scale,
+              $project_phid,
+            );
+
+            $specs[] = array(
+              "tasks.open-points.{$action}.project",
+              $action_points * $scale,
+              $project_phid,
+            );
+          }
+
+          $specs[] = array(
+            "tasks.count.{$action}.project",
+            1 * $scale,
+            $project_phid,
+          );
+
+          $specs[] = array(
+            "tasks.points.{$action}.project",
+            $action_points * $scale,
+            $project_phid,
+          );
+
+          if ($scale < 0) {
+            unset($project_map[$project_phid]);
+          } else {
+            $project_map[$project_phid] = $project_phid;
+          }
+        }
+      }
+
+      if ($new_owner !== $old_owner) {
+        $owner_sets = array(
+          array(
+            'phid' => $old_owner,
+            'scale' => -1,
+          ),
+          array(
+            'phid' => $new_owner,
+            'scale' => 1,
+          ),
+        );
+
+        foreach ($owner_sets as $owner_set) {
+          $owner_phid = $owner_set['phid'];
+          if ($owner_phid === null) {
+            continue;
+          }
+
+          if ($old_open) {
+            $specs[] = array(
+              "tasks.open-count.{$action}.owner",
+              1 * $scale,
+              $owner_phid,
+            );
+
+            $specs[] = array(
+              "tasks.open-points.{$action}.owner",
+              $action_points * $scale,
+              $owner_phid,
+            );
+          }
+
+          $specs[] = array(
+            "tasks.count.{$action}.owner",
+            1 * $scale,
+            $owner_phid,
+          );
+
+          $specs[] = array(
+            "tasks.points.{$action}.owner",
+            $action_points * $scale,
+            $owner_phid,
+          );
+        }
+
+        $old_owner = $new_owner;
+      }
+
+      if ($is_create) {
+        $specs[] = array(
+          'tasks.count.create',
+          1,
+        );
+        $specs[] = array(
+          'tasks.points.create',
+          $new_points,
+        );
+
+        if ($new_open) {
+          $specs[] = array(
+            'tasks.open-count.create',
+            1,
+          );
+          $specs[] = array(
+            'tasks.open-points.create',
+            $new_points,
+          );
+        }
+      } else if ($new_open !== $old_open) {
+        if ($new_open) {
+          $scale = 1;
+        } else {
+          $scale = -1;
+        }
+
+        $specs[] = array(
+          'tasks.open-count.status',
+          1 * $scale,
+        );
+
+        $specs[] = array(
+          'tasks.open-points.status',
+          $action_points * $scale,
+        );
+
+        if ($new_owner !== null) {
+          $specs[] = array(
+            'tasks.open-count.status.owner',
+            1 * $scale,
+            $new_owner,
+          );
+          $specs[] = array(
+            'tasks.open-points.status.owner',
+            $action_points * $scale,
+            $new_owner,
+          );
+        }
+
+        foreach ($project_map as $project_phid) {
+          $specs[] = array(
+            'tasks.open-count.status.project',
+            1 * $scale,
+            $project_phid,
+          );
+          $specs[] = array(
+            'tasks.open-points.status.project',
+            $action_points * $scale,
+            $new_owner,
+          );
+        }
+
+        $old_open = $new_open;
+      }
+
+      // The "score" facts only apply to rescoring tasks which already
+      // exist, so we skip them if the task is being created.
+      if (($new_points !== $old_points) && !$is_create) {
+        $delta = ($new_points - $old_points);
+
+        $specs[] = array(
+          'tasks.points.score',
+          $delta,
+        );
+
+        foreach ($project_map as $project_phid) {
+          $specs[] = array(
+            'tasks.points.score.project',
+            $delta,
+            $project_phid,
+          );
+
+          if ($old_open && $new_open) {
+            $specs[] = array(
+              'tasks.open-points.score.project',
+              $delta,
+              $project_phid,
+            );
+          }
+        }
+
+        if ($new_owner !== null) {
+          $specs[] = array(
+            'tasks.points.score.owner',
+            $delta,
+            $new_owner,
+          );
+
+          if ($old_open && $new_open) {
+            $specs[] = array(
+              'tasks.open-points.score.owner',
+              $delta,
+              $new_owner,
+            );
+          }
+        }
+
+        if ($old_open && $new_open) {
+          $specs[] = array(
+            'tasks.open-points.score',
+            $delta,
+          );
+        }
+
+        $old_points = $new_points;
+      }
+
+      foreach ($specs as $spec) {
+        $spec_key = $spec[0];
+        $spec_value = $spec[1];
+
+        $datapoint = $this->getFact($spec_key)
+          ->newDatapoint();
+
+        $datapoint
+          ->setObjectPHID($object_phid)
+          ->setValue($spec_value)
+          ->setEpoch($group_epoch);
 
-    $phid = $object->getPHID();
-    $type = phid_get_type($phid);
+        if (isset($spec[2])) {
+          $datapoint->setDimensionPHID($spec[2]);
+        }
 
-    $datapoint = $this->getFact('tasks.count.open')
-      ->newDatapoint();
+        $datapoints[] = $datapoint;
+      }
 
-    $datapoints[] = $datapoint
-      ->setObjectPHID($phid)
-      ->setValue(1)
-      ->setEpoch($object->getDateCreated());
+      $specs = array();
+      $is_create = false;
+    }
 
     return $datapoints;
   }
diff --git a/src/applications/fact/fact/PhabricatorCountFact.php b/src/applications/fact/fact/PhabricatorCountFact.php
new file mode 100644
index 0000000000..41e6fd4de3
--- /dev/null
+++ b/src/applications/fact/fact/PhabricatorCountFact.php
@@ -0,0 +1,9 @@
+<?php
+
+final class PhabricatorCountFact extends PhabricatorFact {
+
+  protected function newTemplateDatapoint() {
+    return new PhabricatorFactIntDatapoint();
+  }
+
+}
diff --git a/src/applications/fact/storage/PhabricatorFactDimension.php b/src/applications/fact/storage/PhabricatorFactDimension.php
index d2bf2420dc..9616d2513c 100644
--- a/src/applications/fact/storage/PhabricatorFactDimension.php
+++ b/src/applications/fact/storage/PhabricatorFactDimension.php
@@ -6,10 +6,10 @@ abstract protected function getDimensionColumnName();
 
   final public function newDimensionID($key) {
     $map = $this->newDimensionMap(array($key));
-    return $map[$key];
+    return idx($map, $key);
   }
 
-  final public function newDimensionMap(array $keys) {
+  final public function newDimensionMap(array $keys, $create = false) {
     if (!$keys) {
       return array();
     }
@@ -40,6 +40,10 @@ final public function newDimensionMap(array $keys) {
       return $map;
     }
 
+    if (!$create) {
+      return $map;
+    }
+
     $sql = array();
     foreach ($need as $key) {
       $sql[] = qsprintf(
@@ -66,7 +70,7 @@ final public function newDimensionMap(array $keys) {
       $need);
     $rows = ipull($rows, 'id', $column);
 
-    foreach ($keys as $key) {
+    foreach ($need as $key) {
       if (isset($rows[$key])) {
         $map[$key] = (int)$rows[$key];
       } else {
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index 015e601b02..3a7eead5cf 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -260,6 +260,11 @@ public function hasOldValue() {
     return $this->oldValueHasBeenSet;
   }
 
+  public function newChronologicalSortVector() {
+    return id(new PhutilSortVector())
+      ->addInt((int)$this->getDateCreated())
+      ->addInt((int)$this->getID());
+  }
 
 /* -(  Rendering  )---------------------------------------------------------- */
 

From 46ce4c7aef604426b730e976c4e226b2be3fe25b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 19 Feb 2018 09:35:17 -0800
Subject: [PATCH 607/865] Provide a page for examining the facts an object
 generates

Summary:
Depends on D19120. Ref T13083. When you write a fact engine, it's currently somewhat difficult to figure out exactly what it's doing. It would also be difficult to diagnose bugs or report them to the upstream.

To ease this, add a page which shows all the facts an object generates. This allows you to iterate on an engine quickly without needing to reanalyze facts, take a screenshot, easily compare the timeline to the fact view, etc.

Test Plan: Viewed the object fact page for several objects.

Subscribers: yelirekim

Maniphest Tasks: T13083

Differential Revision: https://secure.phabricator.com/D19121
---
 src/__phutil_library_map__.php                |   4 +
 .../PhabricatorFactApplication.php            |   1 +
 .../PhabricatorFactObjectController.php       | 267 ++++++++++++++++++
 .../query/PhabricatorFactDatapointQuery.php   | 181 ++++++++++++
 .../fact/storage/PhabricatorFactDimension.php |  41 ++-
 .../storage/PhabricatorFactIntDatapoint.php   |  26 ++
 6 files changed, 510 insertions(+), 10 deletions(-)
 create mode 100644 src/applications/fact/controller/PhabricatorFactObjectController.php
 create mode 100644 src/applications/fact/query/PhabricatorFactDatapointQuery.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e3f7f64ada..92b9d9b5de 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2916,6 +2916,7 @@
     'PhabricatorFactCursor' => 'applications/fact/storage/PhabricatorFactCursor.php',
     'PhabricatorFactDAO' => 'applications/fact/storage/PhabricatorFactDAO.php',
     'PhabricatorFactDaemon' => 'applications/fact/daemon/PhabricatorFactDaemon.php',
+    'PhabricatorFactDatapointQuery' => 'applications/fact/query/PhabricatorFactDatapointQuery.php',
     'PhabricatorFactDimension' => 'applications/fact/storage/PhabricatorFactDimension.php',
     'PhabricatorFactEngine' => 'applications/fact/engine/PhabricatorFactEngine.php',
     'PhabricatorFactEngineTestCase' => 'applications/fact/engine/__tests__/PhabricatorFactEngineTestCase.php',
@@ -2928,6 +2929,7 @@
     'PhabricatorFactManagementListWorkflow' => 'applications/fact/management/PhabricatorFactManagementListWorkflow.php',
     'PhabricatorFactManagementWorkflow' => 'applications/fact/management/PhabricatorFactManagementWorkflow.php',
     'PhabricatorFactManiphestTaskEngine' => 'applications/fact/engine/PhabricatorFactManiphestTaskEngine.php',
+    'PhabricatorFactObjectController' => 'applications/fact/controller/PhabricatorFactObjectController.php',
     'PhabricatorFactObjectDimension' => 'applications/fact/storage/PhabricatorFactObjectDimension.php',
     'PhabricatorFactRaw' => 'applications/fact/storage/PhabricatorFactRaw.php',
     'PhabricatorFactUpdateIterator' => 'applications/fact/extract/PhabricatorFactUpdateIterator.php',
@@ -8445,6 +8447,7 @@
     'PhabricatorFactCursor' => 'PhabricatorFactDAO',
     'PhabricatorFactDAO' => 'PhabricatorLiskDAO',
     'PhabricatorFactDaemon' => 'PhabricatorDaemon',
+    'PhabricatorFactDatapointQuery' => 'Phobject',
     'PhabricatorFactDimension' => 'PhabricatorFactDAO',
     'PhabricatorFactEngine' => 'Phobject',
     'PhabricatorFactEngineTestCase' => 'PhabricatorTestCase',
@@ -8457,6 +8460,7 @@
     'PhabricatorFactManagementListWorkflow' => 'PhabricatorFactManagementWorkflow',
     'PhabricatorFactManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorFactManiphestTaskEngine' => 'PhabricatorFactEngine',
+    'PhabricatorFactObjectController' => 'PhabricatorFactController',
     'PhabricatorFactObjectDimension' => 'PhabricatorFactDimension',
     'PhabricatorFactRaw' => 'PhabricatorFactDAO',
     'PhabricatorFactUpdateIterator' => 'PhutilBufferedIterator',
diff --git a/src/applications/fact/application/PhabricatorFactApplication.php b/src/applications/fact/application/PhabricatorFactApplication.php
index 305ed3abc9..6444fe700a 100644
--- a/src/applications/fact/application/PhabricatorFactApplication.php
+++ b/src/applications/fact/application/PhabricatorFactApplication.php
@@ -31,6 +31,7 @@ public function getRoutes() {
       '/fact/' => array(
         '' => 'PhabricatorFactHomeController',
         'chart/' => 'PhabricatorFactChartController',
+        'object/(?<phid>[^/]+)/' => 'PhabricatorFactObjectController',
       ),
     );
   }
diff --git a/src/applications/fact/controller/PhabricatorFactObjectController.php b/src/applications/fact/controller/PhabricatorFactObjectController.php
new file mode 100644
index 0000000000..2905477f9f
--- /dev/null
+++ b/src/applications/fact/controller/PhabricatorFactObjectController.php
@@ -0,0 +1,267 @@
+<?php
+
+final class PhabricatorFactObjectController
+  extends PhabricatorFactController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+
+    $phid = $request->getURIData('phid');
+    $object = id(new PhabricatorObjectQuery())
+      ->setViewer($viewer)
+      ->withNames(array($phid))
+      ->executeOne();
+    if (!$object) {
+      return new Aphront404Response();
+    }
+
+    $engines = PhabricatorFactEngine::loadAllEngines();
+    foreach ($engines as $key => $engine) {
+      if (!$engine->supportsDatapointsForObject($object)) {
+        unset($engines[$key]);
+      }
+    }
+
+    if (!$engines) {
+      return $this->newDialog()
+        ->setTitle(pht('No Engines'))
+        ->appendParagraph(
+          pht(
+            'No fact engines support generating facts for this object.'))
+        ->addCancelButton($this->getApplicationURI());
+    }
+
+    $key_dimension = new PhabricatorFactKeyDimension();
+    $object_phid = $object->getPHID();
+
+    $facts = array();
+    $generated_datapoints = array();
+    $timings = array();
+    foreach ($engines as $key => $engine) {
+      $engine_facts = $engine->newFacts();
+      $engine_facts = mpull($engine_facts, null, 'getKey');
+      $facts[$key] = $engine_facts;
+
+      $t_start = microtime(true);
+      $generated_datapoints[$key] = $engine->newDatapointsForObject($object);
+      $t_end = microtime(true);
+
+      $timings[$key] = ($t_end - $t_start);
+    }
+
+    $object_id = id(new PhabricatorFactObjectDimension())
+      ->newDimensionID($object_phid, true);
+
+    $stored_datapoints = id(new PhabricatorFactDatapointQuery())
+      ->withFacts(array_mergev($facts))
+      ->withObjectPHIDs(array($object_phid))
+      ->needVectors(true)
+      ->execute();
+
+    $stored_groups = array();
+    foreach ($stored_datapoints as $stored_datapoint) {
+      $stored_groups[$stored_datapoint['key']][] = $stored_datapoint;
+    }
+
+    $stored_map = array();
+    foreach ($engines as $key => $engine) {
+      $stored_map[$key] = array();
+      foreach ($facts[$key] as $fact) {
+        $fact_datapoints = idx($stored_groups, $fact->getKey(), array());
+        $fact_datapoints = igroup($fact_datapoints, 'vector');
+        $stored_map[$key] += $fact_datapoints;
+      }
+    }
+
+    $handle_phids = array();
+    $handle_phids[] = $object->getPHID();
+    foreach ($generated_datapoints as $key => $datapoint_set) {
+      foreach ($datapoint_set as $datapoint) {
+        $dimension_phid = $datapoint->getDimensionPHID();
+        if ($dimension_phid !== null) {
+          $handle_phids[$dimension_phid] = $dimension_phid;
+        }
+      }
+    }
+
+    foreach ($stored_map as $key => $stored_datapoints) {
+      foreach ($stored_datapoints as $vector_key => $datapoints) {
+        foreach ($datapoints as $datapoint) {
+          $dimension_phid = $datapoint['dimensionPHID'];
+          if ($dimension_phid !== null) {
+            $handle_phids[$dimension_phid] = $dimension_phid;
+          }
+        }
+      }
+    }
+
+    $handles = $viewer->loadHandles($handle_phids);
+
+    $dimension_map = id(new PhabricatorFactObjectDimension())
+      ->newDimensionMap($handle_phids, true);
+
+    $content = array();
+
+    $object_list = id(new PHUIPropertyListView())
+      ->setViewer($viewer)
+      ->addProperty(
+        pht('Object'),
+        $handles[$object->getPHID()]->renderLink());
+
+    $total_cost = array_sum($timings);
+    $total_cost = pht('%sms', new PhutilNumber((int)(1000 * $total_cost)));
+    $object_list->addProperty(pht('Total Cost'), $total_cost);
+
+    $object_box = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Fact Extraction Report'))
+      ->addPropertyList($object_list);
+
+    $content[] = $object_box;
+
+    $icon_fact = id(new PHUIIconView())
+      ->setIcon('fa-line-chart green')
+      ->setTooltip(pht('Consistent Fact'));
+
+    $icon_nodata = id(new PHUIIconView())
+      ->setIcon('fa-question-circle-o violet')
+      ->setTooltip(pht('No Stored Datapoints'));
+
+    $icon_new = id(new PHUIIconView())
+      ->setIcon('fa-plus red')
+      ->setTooltip(pht('Not Stored'));
+
+    $icon_surplus = id(new PHUIIconView())
+      ->setIcon('fa-minus red')
+      ->setTooltip(pht('Not Generated'));
+
+    foreach ($engines as $key => $engine) {
+      $rows = array();
+      foreach ($generated_datapoints[$key] as $datapoint) {
+        $dimension_phid = $datapoint->getDimensionPHID();
+        if ($dimension_phid !== null) {
+          $dimension = $handles[$datapoint->getDimensionPHID()]->renderLink();
+        } else {
+          $dimension = null;
+        }
+
+        $fact_key = $datapoint->getKey();
+
+        $fact = idx($facts[$key], $fact_key, null);
+        if ($fact) {
+          $fact_label = $fact->getName();
+        } else {
+          $fact_label = $fact_key;
+        }
+
+        $vector_key = $datapoint->newDatapointVector();
+        if (isset($stored_map[$key][$vector_key])) {
+          unset($stored_map[$key][$vector_key]);
+          $icon = $icon_fact;
+        } else {
+          $icon = $icon_new;
+        }
+
+        $rows[] = array(
+          $icon,
+          $fact_label,
+          $dimension,
+          $datapoint->getValue(),
+          phabricator_datetime($datapoint->getEpoch(), $viewer),
+        );
+      }
+
+      foreach ($stored_map[$key] as $vector_key => $datapoints) {
+        foreach ($datapoints as $datapoint) {
+          $dimension_phid = $datapoint['dimensionPHID'];
+          if ($dimension_phid !== null) {
+            $dimension = $handles[$dimension_phid]->renderLink();
+          } else {
+            $dimension = null;
+          }
+
+          $fact_key = $datapoint['key'];
+          $fact = idx($facts[$key], $fact_key, null);
+          if ($fact) {
+            $fact_label = $fact->getName();
+          } else {
+            $fact_label = $fact_key;
+          }
+
+          $rows[] = array(
+            $icon_surplus,
+            $fact_label,
+            $dimension,
+            $datapoint['value'],
+            phabricator_datetime($datapoint['epoch'], $viewer),
+          );
+        }
+      }
+
+      foreach ($facts[$key] as $fact) {
+        $has_any = id(new PhabricatorFactDatapointQuery())
+          ->withFacts(array($fact))
+          ->setLimit(1)
+          ->execute();
+        if ($has_any) {
+          continue;
+        }
+
+        if (!$has_any) {
+          $rows[] = array(
+            $icon_nodata,
+            $fact->getName(),
+            null,
+            null,
+            null,
+          );
+        }
+      }
+
+      $table = id(new AphrontTableView($rows))
+        ->setHeaders(
+          array(
+            null,
+            pht('Fact'),
+            pht('Dimension'),
+            pht('Value'),
+            pht('Date'),
+          ))
+        ->setColumnClasses(
+          array(
+            '',
+            '',
+            '',
+            'n wide right',
+            'right',
+          ));
+
+      $extraction_cost = $timings[$key];
+      $extraction_cost = pht(
+        '%sms',
+        new PhutilNumber((int)(1000 * $extraction_cost)));
+
+      $header = pht(
+        '%s (%s)',
+        get_class($engine),
+        $extraction_cost);
+
+      $box = id(new PHUIObjectBoxView())
+        ->setHeaderText($header)
+        ->setTable($table);
+
+      $content[] = $box;
+    }
+
+    $crumbs = $this->buildApplicationCrumbs()
+      ->addTextCrumb(pht('Chart'));
+
+    $title = pht('Chart');
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($content);
+
+  }
+
+}
diff --git a/src/applications/fact/query/PhabricatorFactDatapointQuery.php b/src/applications/fact/query/PhabricatorFactDatapointQuery.php
new file mode 100644
index 0000000000..fee7c86d12
--- /dev/null
+++ b/src/applications/fact/query/PhabricatorFactDatapointQuery.php
@@ -0,0 +1,181 @@
+<?php
+
+final class PhabricatorFactDatapointQuery extends Phobject {
+
+  private $facts;
+  private $objectPHIDs;
+  private $limit;
+
+  private $needVectors;
+
+  private $keyMap = array();
+  private $dimensionMap = array();
+
+  public function withFacts(array $facts) {
+    $this->facts = $facts;
+    return $this;
+  }
+
+  public function withObjectPHIDs(array $object_phids) {
+    $this->objectPHIDs = $object_phids;
+    return $this;
+  }
+
+  public function setLimit($limit) {
+    $this->limit = $limit;
+    return $this;
+  }
+
+  public function needVectors($need) {
+    $this->needVectors = $need;
+    return $this;
+  }
+
+  public function execute() {
+    $facts = mpull($this->facts, null, 'getKey');
+    if (!$facts) {
+      throw new Exception(pht('Executing a fact query requires facts.'));
+    }
+
+    $table_map = array();
+    foreach ($facts as $fact) {
+      $datapoint = $fact->newDatapoint();
+      $table = $datapoint->getTableName();
+
+      if (!isset($table_map[$table])) {
+        $table_map[$table] = array(
+          'table' => $datapoint,
+          'facts' => array(),
+        );
+      }
+
+      $table_map[$table]['facts'][] = $fact;
+    }
+
+    $rows = array();
+    foreach ($table_map as $spec) {
+      $rows[] = $this->executeWithTable($spec);
+    }
+    $rows = array_mergev($rows);
+
+    $key_unmap = array_flip($this->keyMap);
+    $dimension_unmap = array_flip($this->dimensionMap);
+
+    $groups = array();
+    $need_phids = array();
+    foreach ($rows as $row) {
+      $groups[$row['keyID']][] = $row;
+
+      $object_id = $row['objectID'];
+      if (!isset($dimension_unmap[$object_id])) {
+        $need_phids[$object_id] = $object_id;
+      }
+
+      $dimension_id = $row['dimensionID'];
+      if ($dimension_id && !isset($dimension_unmap[$dimension_id])) {
+        $need_phids[$dimension_id] = $dimension_id;
+      }
+    }
+
+    $dimension_unmap += id(new PhabricatorFactObjectDimension())
+      ->newDimensionUnmap($need_phids);
+
+    $results = array();
+    foreach ($groups as $key_id => $rows) {
+      $key = $key_unmap[$key_id];
+      $fact = $facts[$key];
+      $datapoint = $fact->newDatapoint();
+      foreach ($rows as $row) {
+        $dimension_id = $row['dimensionID'];
+        if ($dimension_id) {
+          if (!isset($dimension_unmap[$dimension_id])) {
+            continue;
+          } else {
+            $dimension_phid = $dimension_unmap[$dimension_id];
+          }
+        } else {
+          $dimension_phid = null;
+        }
+
+        $object_id = $row['objectID'];
+        if (!isset($dimension_unmap[$object_id])) {
+          continue;
+        } else {
+          $object_phid = $dimension_unmap[$object_id];
+        }
+
+        $result = array(
+          'key' => $key,
+          'objectPHID' => $object_phid,
+          'dimensionPHID' => $dimension_phid,
+          'value' => (int)$row['value'],
+          'epoch' => $row['epoch'],
+        );
+
+        if ($this->needVectors) {
+          $result['vector'] = $datapoint->newRawVector($result);
+        }
+
+        $results[] = $result;
+      }
+    }
+
+    return $results;
+  }
+
+  private function executeWithTable(array $spec) {
+    $table = $spec['table'];
+    $facts = $spec['facts'];
+    $conn = $table->establishConnection('r');
+
+    $fact_keys = mpull($facts, 'getKey');
+    $this->keyMap = id(new PhabricatorFactKeyDimension())
+      ->newDimensionMap($fact_keys);
+
+    if (!$this->keyMap) {
+      return array();
+    }
+
+    $where = array();
+
+    $where[] = qsprintf(
+      $conn,
+      'keyID IN (%Ld)',
+      $this->keyMap);
+
+    if ($this->objectPHIDs) {
+      $object_map = id(new PhabricatorFactObjectDimension())
+        ->newDimensionMap($this->objectPHIDs);
+      if (!$object_map) {
+        return array();
+      }
+
+      $this->dimensionMap = $object_map;
+
+      $where[] = qsprintf(
+        $conn,
+        'objectID IN (%Ld)',
+        $this->dimensionMap);
+    }
+
+    $where = '('.implode(') AND (', $where).')';
+
+    if ($this->limit) {
+      $limit = qsprintf(
+        $conn,
+        'LIMIT %d',
+        $this->limit);
+    } else {
+      $limit = '';
+    }
+
+    return queryfx_all(
+      $conn,
+      'SELECT keyID, objectID, dimensionID, value, epoch
+        FROM %T WHERE %Q %Q',
+      $table->getTableName(),
+      $where,
+      $limit);
+  }
+
+}
diff --git a/src/applications/fact/storage/PhabricatorFactDimension.php b/src/applications/fact/storage/PhabricatorFactDimension.php
index 9616d2513c..9c05121c9c 100644
--- a/src/applications/fact/storage/PhabricatorFactDimension.php
+++ b/src/applications/fact/storage/PhabricatorFactDimension.php
@@ -4,11 +4,30 @@ abstract class PhabricatorFactDimension extends PhabricatorFactDAO {
 
   abstract protected function getDimensionColumnName();
 
-  final public function newDimensionID($key) {
-    $map = $this->newDimensionMap(array($key));
+  final public function newDimensionID($key, $create = false) {
+    $map = $this->newDimensionMap(array($key), $create);
     return idx($map, $key);
   }
 
+  final public function newDimensionUnmap(array $ids) {
+    if (!$ids) {
+      return array();
+    }
+
+    $conn = $this->establishConnection('r');
+    $column = $this->getDimensionColumnName();
+
+    $rows = queryfx_all(
+      $conn,
+      'SELECT id, %C FROM %T WHERE id IN (%Ld)',
+      $column,
+      $this->getTableName(),
+      $ids);
+    $rows = ipull($rows, $column, 'id');
+
+    return $rows;
+  }
+
   final public function newDimensionMap(array $keys, $create = false) {
     if (!$keys) {
       return array();
@@ -52,14 +71,16 @@ final public function newDimensionMap(array $keys, $create = false) {
         $key);
     }
 
-    foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
-      queryfx(
-        $conn,
-        'INSERT IGNORE INTO %T (%C) VALUES %Q',
-        $this->getTableName(),
-        $column,
-        $chunk);
-    }
+    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+      foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
+        queryfx(
+          $conn,
+          'INSERT IGNORE INTO %T (%C) VALUES %Q',
+          $this->getTableName(),
+          $column,
+          $chunk);
+      }
+    unset($unguarded);
 
     $rows = queryfx_all(
       $conn,
diff --git a/src/applications/fact/storage/PhabricatorFactIntDatapoint.php b/src/applications/fact/storage/PhabricatorFactIntDatapoint.php
index 7895052d5d..87a7c68adf 100644
--- a/src/applications/fact/storage/PhabricatorFactIntDatapoint.php
+++ b/src/applications/fact/storage/PhabricatorFactIntDatapoint.php
@@ -58,4 +58,30 @@ public function getDimensionPHID() {
     return $this->dimensionPHID;
   }
 
+  public function newDatapointVector() {
+    return $this->formatVector(
+      array(
+        $this->key,
+        $this->objectPHID,
+        $this->dimensionPHID,
+        $this->value,
+        $this->epoch,
+      ));
+  }
+
+  public function newRawVector(array $spec) {
+    return $this->formatVector(
+      array(
+        $spec['key'],
+        $spec['objectPHID'],
+        $spec['dimensionPHID'],
+        $spec['value'],
+        $spec['epoch'],
+      ));
+  }
+
+  private function formatVector(array $vector) {
+    return implode(':', $vector);
+  }
+
 }

From 2fb266de7c1a9ffb8fd393af03408b3c75bc2ae4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 19 Feb 2018 11:28:52 -0800
Subject: [PATCH 608/865] Fix some of the most obvious bugs in fact generation
 from Maniphest tasks

Summary:
Depends on D19121. Ref T13083. Group transactions and show groups in the debugging view.

Fix some of the most obvious issues with fact generation:

  - No more 0-point facts.
  - Engine can now generate at least one of every type of fact.

Test Plan: Generated facts, viewed them in the debugging view, fact generation largely appeared to align with reality. No more "no facts in storage" facts.

Subscribers: yelirekim

Maniphest Tasks: T13083

Differential Revision: https://secure.phabricator.com/D19122
---
 src/__phutil_library_map__.php                |  6 +-
 .../PhabricatorFactObjectController.php       | 56 +++++++++++++
 .../fact/daemon/PhabricatorFactDaemon.php     |  5 ++
 .../fact/engine/PhabricatorFactEngine.php     | 14 +++-
 ...=> PhabricatorManiphestTaskFactEngine.php} | 67 ++++++++-------
 .../PhabricatorTransactionFactEngine.php      | 84 +++++++++++++++++++
 6 files changed, 198 insertions(+), 34 deletions(-)
 rename src/applications/fact/engine/{PhabricatorFactManiphestTaskEngine.php => PhabricatorManiphestTaskFactEngine.php} (90%)
 create mode 100644 src/applications/fact/engine/PhabricatorTransactionFactEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 92b9d9b5de..f7cda9d8fa 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2928,7 +2928,6 @@
     'PhabricatorFactManagementDestroyWorkflow' => 'applications/fact/management/PhabricatorFactManagementDestroyWorkflow.php',
     'PhabricatorFactManagementListWorkflow' => 'applications/fact/management/PhabricatorFactManagementListWorkflow.php',
     'PhabricatorFactManagementWorkflow' => 'applications/fact/management/PhabricatorFactManagementWorkflow.php',
-    'PhabricatorFactManiphestTaskEngine' => 'applications/fact/engine/PhabricatorFactManiphestTaskEngine.php',
     'PhabricatorFactObjectController' => 'applications/fact/controller/PhabricatorFactObjectController.php',
     'PhabricatorFactObjectDimension' => 'applications/fact/storage/PhabricatorFactObjectDimension.php',
     'PhabricatorFactRaw' => 'applications/fact/storage/PhabricatorFactRaw.php',
@@ -3264,6 +3263,7 @@
     'PhabricatorManagementWorkflow' => 'infrastructure/management/PhabricatorManagementWorkflow.php',
     'PhabricatorManiphestApplication' => 'applications/maniphest/application/PhabricatorManiphestApplication.php',
     'PhabricatorManiphestConfigOptions' => 'applications/maniphest/config/PhabricatorManiphestConfigOptions.php',
+    'PhabricatorManiphestTaskFactEngine' => 'applications/fact/engine/PhabricatorManiphestTaskFactEngine.php',
     'PhabricatorManiphestTaskTestDataGenerator' => 'applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php',
     'PhabricatorManualActivitySetupCheck' => 'applications/config/check/PhabricatorManualActivitySetupCheck.php',
     'PhabricatorMarkupCache' => 'applications/cache/storage/PhabricatorMarkupCache.php',
@@ -4362,6 +4362,7 @@
     'PhabricatorTokensSettingsPanel' => 'applications/settings/panel/PhabricatorTokensSettingsPanel.php',
     'PhabricatorTokensToken' => 'applications/tokens/storage/PhabricatorTokensToken.php',
     'PhabricatorTransactionChange' => 'applications/transactions/data/PhabricatorTransactionChange.php',
+    'PhabricatorTransactionFactEngine' => 'applications/fact/engine/PhabricatorTransactionFactEngine.php',
     'PhabricatorTransactionRemarkupChange' => 'applications/transactions/data/PhabricatorTransactionRemarkupChange.php',
     'PhabricatorTransactions' => 'applications/transactions/constants/PhabricatorTransactions.php',
     'PhabricatorTransactionsApplication' => 'applications/transactions/application/PhabricatorTransactionsApplication.php',
@@ -8459,7 +8460,6 @@
     'PhabricatorFactManagementDestroyWorkflow' => 'PhabricatorFactManagementWorkflow',
     'PhabricatorFactManagementListWorkflow' => 'PhabricatorFactManagementWorkflow',
     'PhabricatorFactManagementWorkflow' => 'PhabricatorManagementWorkflow',
-    'PhabricatorFactManiphestTaskEngine' => 'PhabricatorFactEngine',
     'PhabricatorFactObjectController' => 'PhabricatorFactController',
     'PhabricatorFactObjectDimension' => 'PhabricatorFactDimension',
     'PhabricatorFactRaw' => 'PhabricatorFactDAO',
@@ -8833,6 +8833,7 @@
     'PhabricatorManagementWorkflow' => 'PhutilArgumentWorkflow',
     'PhabricatorManiphestApplication' => 'PhabricatorApplication',
     'PhabricatorManiphestConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorManiphestTaskFactEngine' => 'PhabricatorTransactionFactEngine',
     'PhabricatorManiphestTaskTestDataGenerator' => 'PhabricatorTestDataGenerator',
     'PhabricatorManualActivitySetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorMarkupCache' => 'PhabricatorCacheDAO',
@@ -10156,6 +10157,7 @@
       'PhabricatorConduitResultInterface',
     ),
     'PhabricatorTransactionChange' => 'Phobject',
+    'PhabricatorTransactionFactEngine' => 'PhabricatorFactEngine',
     'PhabricatorTransactionRemarkupChange' => 'PhabricatorTransactionChange',
     'PhabricatorTransactions' => 'Phobject',
     'PhabricatorTransactionsApplication' => 'PhabricatorApplication',
diff --git a/src/applications/fact/controller/PhabricatorFactObjectController.php b/src/applications/fact/controller/PhabricatorFactObjectController.php
index 2905477f9f..bffc1ef157 100644
--- a/src/applications/fact/controller/PhabricatorFactObjectController.php
+++ b/src/applications/fact/controller/PhabricatorFactObjectController.php
@@ -17,6 +17,10 @@ public function handleRequest(AphrontRequest $request) {
 
     $engines = PhabricatorFactEngine::loadAllEngines();
     foreach ($engines as $key => $engine) {
+      $engine = id(clone $engine)
+        ->setViewer($viewer);
+      $engines[$key] = $engine;
+
       if (!$engine->supportsDatapointsForObject($object)) {
         unset($engines[$key]);
       }
@@ -250,6 +254,58 @@ public function handleRequest(AphrontRequest $request) {
         ->setTable($table);
 
       $content[] = $box;
+
+      if ($engine instanceof PhabricatorTransactionFactEngine) {
+        $groups = $engine->newTransactionGroupsForObject($object);
+        $groups = array_values($groups);
+
+        $xaction_phids = array();
+        foreach ($groups as $group_key => $xactions) {
+          foreach ($xactions as $xaction) {
+            $xaction_phids[] = $xaction->getAuthorPHID();
+          }
+        }
+        $xaction_handles = $viewer->loadHandles($xaction_phids);
+
+        $rows = array();
+        foreach ($groups as $group_key => $xactions) {
+          foreach ($xactions as $xaction) {
+            $rows[] = array(
+              $group_key,
+              $xaction->getTransactionType(),
+              $xaction_handles[$xaction->getAuthorPHID()]->renderLink(),
+              phabricator_datetime($xaction->getDateCreated(), $viewer),
+            );
+          }
+        }
+
+        $table = id(new AphrontTableView($rows))
+          ->setHeaders(
+            array(
+              pht('Group'),
+              pht('Type'),
+              pht('Author'),
+              pht('Date'),
+            ))
+          ->setColumnClasses(
+            array(
+              null,
+              'pri',
+              'wide',
+              'right',
+            ));
+
+        $header = pht(
+          '%s (Transactions)',
+          get_class($engine));
+
+        $xaction_box = id(new PHUIObjectBoxView())
+          ->setHeaderText($header)
+          ->setTable($table);
+
+        $content[] = $xaction_box;
+      }
+
     }
 
     $crumbs = $this->buildApplicationCrumbs()
diff --git a/src/applications/fact/daemon/PhabricatorFactDaemon.php b/src/applications/fact/daemon/PhabricatorFactDaemon.php
index baf0203471..3fa6c6f0ff 100644
--- a/src/applications/fact/daemon/PhabricatorFactDaemon.php
+++ b/src/applications/fact/daemon/PhabricatorFactDaemon.php
@@ -62,6 +62,11 @@ public function processIteratorWithCursor($iterator_name, $iterator) {
   public function setEngines(array $engines) {
     assert_instances_of($engines, 'PhabricatorFactEngine');
 
+    $viewer = PhabricatorUser::getOmnipotentUser();
+    foreach ($engines as $engine) {
+      $engine->setViewer($viewer);
+    }
+
     $this->engines = $engines;
     return $this;
   }
diff --git a/src/applications/fact/engine/PhabricatorFactEngine.php b/src/applications/fact/engine/PhabricatorFactEngine.php
index 722a97efbc..ba2cf966e5 100644
--- a/src/applications/fact/engine/PhabricatorFactEngine.php
+++ b/src/applications/fact/engine/PhabricatorFactEngine.php
@@ -3,6 +3,7 @@
 abstract class PhabricatorFactEngine extends Phobject {
 
   private $factMap;
+  private $viewer;
 
   final public static function loadAllEngines() {
     return id(new PhutilClassMapQuery())
@@ -35,8 +36,17 @@ final protected function getFact($key) {
     return $this->factMap[$key];
   }
 
-  final protected function getViewer() {
-    return PhabricatorUser::getOmnipotentUser();
+  public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  public function getViewer() {
+    if (!$this->viewer) {
+      throw new PhutilInvalidStateException('setViewer');
+    }
+
+    return $this->viewer;
   }
 
 }
diff --git a/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php b/src/applications/fact/engine/PhabricatorManiphestTaskFactEngine.php
similarity index 90%
rename from src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php
rename to src/applications/fact/engine/PhabricatorManiphestTaskFactEngine.php
index 76eb2d1681..dffceedb77 100644
--- a/src/applications/fact/engine/PhabricatorFactManiphestTaskEngine.php
+++ b/src/applications/fact/engine/PhabricatorManiphestTaskFactEngine.php
@@ -1,7 +1,7 @@
 <?php
 
-final class PhabricatorFactManiphestTaskEngine
-  extends PhabricatorFactEngine {
+final class PhabricatorManiphestTaskFactEngine
+  extends PhabricatorTransactionFactEngine {
 
   public function newFacts() {
     return array(
@@ -73,7 +73,7 @@ public function newFacts() {
       id(new PhabricatorPointsFact())
         ->setKey('tasks.open-points.status.owner'),
       id(new PhabricatorPointsFact())
-        ->setKey('tasks.open-points.score.project'),
+        ->setKey('tasks.open-points.score.owner'),
       id(new PhabricatorPointsFact())
         ->setKey('tasks.open-points.assign.owner'),
     );
@@ -84,16 +84,7 @@ public function supportsDatapointsForObject(PhabricatorLiskDAO $object) {
   }
 
   public function newDatapointsForObject(PhabricatorLiskDAO $object) {
-    $viewer = $this->getViewer();
-
-    $xaction_query = PhabricatorApplicationTransactionQuery::newQueryForObject(
-      $object);
-    $xactions = $xaction_query
-      ->setViewer($viewer)
-      ->withObjectPHIDs(array($object->getPHID()))
-      ->execute();
-
-    $xactions = msortv($xactions, 'newChronologicalSortVector');
+    $xaction_groups = $this->newTransactionGroupsForObject($object);
 
     $old_open = false;
     $old_points = 0;
@@ -104,7 +95,7 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
 
     $specs = array();
     $datapoints = array();
-    foreach ($xactions as $xaction_group) {
+    foreach ($xaction_groups as $xaction_group) {
       $add_projects = array();
       $rem_projects = array();
 
@@ -112,8 +103,11 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
       $new_points = $old_points;
       $new_owner = $old_owner;
 
-      // TODO: Actually group concurrent transactions.
-      $xaction_group = array($xaction_group);
+      if ($is_create) {
+        // Assume tasks start open.
+        // TODO: This might be a questionable assumption?
+        $new_open = true;
+      }
 
       $group_epoch = last($xaction_group)->getDateCreated();
       foreach ($xaction_group as $xaction) {
@@ -167,15 +161,17 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
       if ($is_create) {
         $action = 'create';
         $action_points = $new_points;
+        $include_open = $new_open;
       } else {
         $action = 'assign';
         $action_points = $old_points;
+        $include_open = $old_open;
       }
 
       foreach ($project_sets as $project_set) {
         $scale = $project_set['scale'];
         foreach ($project_set['phids'] as $project_phid) {
-          if ($old_open) {
+          if ($include_open) {
             $specs[] = array(
               "tasks.open-count.{$action}.project",
               1 * $scale,
@@ -227,7 +223,9 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
             continue;
           }
 
-          if ($old_open) {
+          $scale = $owner_set['scale'];
+
+          if ($old_open != $new_open) {
             $specs[] = array(
               "tasks.open-count.{$action}.owner",
               1 * $scale,
@@ -247,14 +245,14 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
             $owner_phid,
           );
 
-          $specs[] = array(
-            "tasks.points.{$action}.owner",
-            $action_points * $scale,
-            $owner_phid,
-          );
+          if ($action_points) {
+            $specs[] = array(
+              "tasks.points.{$action}.owner",
+              $action_points * $scale,
+              $owner_phid,
+            );
+          }
         }
-
-        $old_owner = $new_owner;
       }
 
       if ($is_create) {
@@ -262,6 +260,7 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
           'tasks.count.create',
           1,
         );
+
         $specs[] = array(
           'tasks.points.create',
           $new_points,
@@ -316,11 +315,9 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
           $specs[] = array(
             'tasks.open-points.status.project',
             $action_points * $scale,
-            $new_owner,
+            $project_phid,
           );
         }
-
-        $old_open = $new_open;
       }
 
       // The "score" facts only apply to rescoring tasks which already
@@ -371,14 +368,23 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
             $delta,
           );
         }
-
-        $old_points = $new_points;
       }
 
+      $old_points = $new_points;
+      $old_open = $new_open;
+      $old_owner = $new_owner;
+
       foreach ($specs as $spec) {
         $spec_key = $spec[0];
         $spec_value = $spec[1];
 
+        // Don't write any facts with a value of 0. The "count" facts never
+        // have a value of 0, and the "points" facts aren't meaningful if
+        // they have a value of 0.
+        if ($spec_value == 0) {
+          continue;
+        }
+
         $datapoint = $this->getFact($spec_key)
           ->newDatapoint();
 
@@ -401,4 +407,5 @@ public function newDatapointsForObject(PhabricatorLiskDAO $object) {
     return $datapoints;
   }
 
+
 }
diff --git a/src/applications/fact/engine/PhabricatorTransactionFactEngine.php b/src/applications/fact/engine/PhabricatorTransactionFactEngine.php
new file mode 100644
index 0000000000..20fb7a6f66
--- /dev/null
+++ b/src/applications/fact/engine/PhabricatorTransactionFactEngine.php
@@ -0,0 +1,84 @@
+<?php
+
+abstract class PhabricatorTransactionFactEngine
+  extends PhabricatorFactEngine {
+
+  public function newTransactionGroupsForObject(PhabricatorLiskDAO $object) {
+    $viewer = $this->getViewer();
+
+    $xaction_query = PhabricatorApplicationTransactionQuery::newQueryForObject(
+      $object);
+    $xactions = $xaction_query
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object->getPHID()))
+      ->execute();
+
+    $xactions = msortv($xactions, 'newChronologicalSortVector');
+
+    return $this->groupTransactions($xactions);
+  }
+
+  protected function groupTransactions(array $xactions) {
+    // These grouping rules are generally much looser than the display grouping
+    // rules. As long as the same user is editing the task and they don't leave
+    // it alone for a particularly long time, we'll group things together.
+
+    $breaks = array();
+
+    $touch_window = phutil_units('15 minutes in seconds');
+    $user_type = PhabricatorPeopleUserPHIDType::TYPECONST;
+
+    $last_actor = null;
+    $last_epoch = null;
+
+    foreach ($xactions as $key => $xaction) {
+      $this_actor = $xaction->getAuthorPHID();
+      if (phid_get_type($this_actor) != $user_type) {
+        $this_actor = null;
+      }
+
+      if ($this_actor && $last_actor && ($this_actor != $last_actor)) {
+        $breaks[$key] = true;
+      }
+
+      // If too much time passed between changes, group them separately.
+      $this_epoch = $xaction->getDateCreated();
+      if ($last_epoch) {
+        if (($this_epoch - $last_epoch) > $touch_window) {
+          $breaks[$key] = true;
+        }
+      }
+
+      // The clock gets reset every time the same real user touches the
+      // task, but does not reset if an automated actor touches things.
+      if (!$last_actor || ($this_actor == $last_actor)) {
+        $last_epoch = $this_epoch;
+      }
+
+      if ($this_actor && ($last_actor != $this_actor)) {
+        $last_actor = $this_actor;
+        $last_epoch = $this_epoch;
+      }
+    }
+
+    $groups = array();
+    $group = array();
+    foreach ($xactions as $key => $xaction) {
+      if (isset($breaks[$key])) {
+        if ($group) {
+          $groups[] = $group;
+          $group = array();
+        }
+      }
+
+      $group[] = $xaction;
+    }
+
+    if ($group) {
+      $groups[] = $group;
+    }
+
+    return $groups;
+  }
+
+}

From 2085716da6d1dfa83448ad2339e2efd7fa54edfb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 20 Feb 2018 17:06:09 -0800
Subject: [PATCH 609/865] Make dashboard arrange actions (move, add, remove)
 work again after read locking from "chaos reduction"

Summary:
See PHI385. Ref T13054. Ref T13083. The dashboard "arrange" operations (add, remove, move) rely on doing `$dashboard->setThing(...)` and then applying transactions.

This no longer works after the read locking change from T13054. To make this function again, just add an explicit `save()` after layout adjustment. This should be more nuanced eventually, but all arrange operations are nonfunctional in a corrupting way at HEAD of `master`/`stable`, so stop the bleeding first.

Test Plan:
  - Created new empty and template dashboards.
  - Moved panels.
  - Added new and existing panels.
  - Removed panels.

Maniphest Tasks: T13083, T13054

Differential Revision: https://secure.phabricator.com/D19123
---
 .../dashboard/storage/PhabricatorDashboard.php            | 8 ++++++++
 .../typeahead/PhabricatorDashboardPanelDatasource.php     | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/applications/dashboard/storage/PhabricatorDashboard.php b/src/applications/dashboard/storage/PhabricatorDashboard.php
index b79fded93f..2e673de19c 100644
--- a/src/applications/dashboard/storage/PhabricatorDashboard.php
+++ b/src/applications/dashboard/storage/PhabricatorDashboard.php
@@ -74,7 +74,15 @@ public function getLayoutConfigObject() {
 
   public function setLayoutConfigFromObject(
     PhabricatorDashboardLayoutConfig $object) {
+
     $this->setLayoutConfig($object->toDictionary());
+
+    // See PHI385. Dashboard panel mutations rely on changes to the Dashboard
+    // object persisting when transactions are applied, but this assumption is
+    // no longer valid after T13054. For now, just save the dashboard
+    // explicitly.
+    $this->save();
+
     return $this;
   }
 
diff --git a/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php b/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
index d534d32adc..8bbdb1a5e5 100644
--- a/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
+++ b/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
@@ -34,8 +34,10 @@ public function buildResults() {
       $impl = $panel->getImplementation();
       if ($impl) {
         $type_text = $impl->getPanelTypeName();
+        $icon = $impl->getIcon();
       } else {
         $type_text = nonempty($panel->getPanelType(), pht('Unknown Type'));
+        $icon = 'fa-question';
       }
       $id = $panel->getID();
       $monogram = $panel->getMonogram();
@@ -44,7 +46,7 @@ public function buildResults() {
       $result = id(new PhabricatorTypeaheadResult())
         ->setName($monogram.' '.$panel->getName())
         ->setPHID($id)
-        ->setIcon($impl->getIcon())
+        ->setIcon($icon)
         ->addAttribute($type_text);
 
       if (!empty($properties['class'])) {

From 33b77e4abf9ea9abf1ad8f62880f0f140a015008 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 20 Feb 2018 17:06:09 -0800
Subject: [PATCH 610/865] (stable) Make dashboard arrange actions (move, add,
 remove) work again after read locking from "chaos reduction"

Summary:
See PHI385. Ref T13054. Ref T13083. The dashboard "arrange" operations (add, remove, move) rely on doing `$dashboard->setThing(...)` and then applying transactions.

This no longer works after the read locking change from T13054. To make this function again, just add an explicit `save()` after layout adjustment. This should be more nuanced eventually, but all arrange operations are nonfunctional in a corrupting way at HEAD of `master`/`stable`, so stop the bleeding first.

Test Plan:
  - Created new empty and template dashboards.
  - Moved panels.
  - Added new and existing panels.
  - Removed panels.

Maniphest Tasks: T13083, T13054

Differential Revision: https://secure.phabricator.com/D19123
---
 .../dashboard/storage/PhabricatorDashboard.php            | 8 ++++++++
 .../typeahead/PhabricatorDashboardPanelDatasource.php     | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/applications/dashboard/storage/PhabricatorDashboard.php b/src/applications/dashboard/storage/PhabricatorDashboard.php
index b79fded93f..2e673de19c 100644
--- a/src/applications/dashboard/storage/PhabricatorDashboard.php
+++ b/src/applications/dashboard/storage/PhabricatorDashboard.php
@@ -74,7 +74,15 @@ public function getLayoutConfigObject() {
 
   public function setLayoutConfigFromObject(
     PhabricatorDashboardLayoutConfig $object) {
+
     $this->setLayoutConfig($object->toDictionary());
+
+    // See PHI385. Dashboard panel mutations rely on changes to the Dashboard
+    // object persisting when transactions are applied, but this assumption is
+    // no longer valid after T13054. For now, just save the dashboard
+    // explicitly.
+    $this->save();
+
     return $this;
   }
 
diff --git a/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php b/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
index d534d32adc..8bbdb1a5e5 100644
--- a/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
+++ b/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
@@ -34,8 +34,10 @@ public function buildResults() {
       $impl = $panel->getImplementation();
       if ($impl) {
         $type_text = $impl->getPanelTypeName();
+        $icon = $impl->getIcon();
       } else {
         $type_text = nonempty($panel->getPanelType(), pht('Unknown Type'));
+        $icon = 'fa-question';
       }
       $id = $panel->getID();
       $monogram = $panel->getMonogram();
@@ -44,7 +46,7 @@ public function buildResults() {
       $result = id(new PhabricatorTypeaheadResult())
         ->setName($monogram.' '.$panel->getName())
         ->setPHID($id)
-        ->setIcon($impl->getIcon())
+        ->setIcon($icon)
         ->addAttribute($type_text);
 
       if (!empty($properties['class'])) {

From ffcfc0465226a3cdb78c247f89d7590b7b4987fa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 10:09:49 -0800
Subject: [PATCH 611/865] Add some delivery diagnostic headers to outbound mail

Summary:
Fixes T13087. Ref T13090. An install ran into a situation where mail was being double-delivered, and it wasn't immediately clear where in the pipeline the issue lay.

This change adds some headers which should rule out (or, at least, render very unlikely) some possible causes if we encounter similar issues in the future.

The `X-Phabricator-Mail-ID` header stores the ID of the `MetaMTAMail` storage object so we can distinguish between two messages sent to two different targets and one message which may have been split or re-sent. It also makes it easier to know what to `bin/mail show-outbound --id <id>` and where to find the message in the web UI for additional information.

The `X-Phabricator-Send-Attempt` is a unique value per attempt. If two mail messages are delivered with the same attempt value, the split is probably downstream from Phabricator. If they have different attempt values, the split is probably in Phabricator.

(In this case, the split was somewhere downstream from us, since sending mail with `/usr/bin/mail` also resulted in duplicates.)

Test Plan: Send some mail, inspected it with `bin/mail show-outbound --id <id>`, saw new headers with sensible/expected values.

Maniphest Tasks: T13090, T13087

Differential Revision: https://secure.phabricator.com/D19124
---
 .../metamta/storage/PhabricatorMetaMTAMail.php             | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index 9dfd6a3eb6..5326e10639 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -1302,6 +1302,11 @@ public function generateHeaders() {
       $headers[] = array('Thread-Topic', $related_phid);
     }
 
+    $headers[] = array('X-Phabricator-Mail-ID', $this->getID());
+
+    $unique = Filesystem::readRandomCharacters(16);
+    $headers[] = array('X-Phabricator-Send-Attempt', $unique);
+
     return $headers;
   }
 
@@ -1356,6 +1361,8 @@ private function filterHeaders(array $headers, $must_encrypt) {
 
       'X-Phabricator-Sent-This-Message',
       'X-Phabricator-Must-Encrypt',
+      'X-Phabricator-Mail-ID',
+      'X-Phabricator-Send-Attempt',
     );
 
     // NOTE: The major header we want to drop is "X-Phabricator-Mail-Tags".

From 4cb62ca0d6aeb8a61d6f8a33654d9033a5ffd5d6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 10:51:27 -0800
Subject: [PATCH 612/865] Support "phriction.document.search" queries by
 "parentPaths" or "ancestorPaths"

Summary: Ref T13090. Ref T13077. This adds `parentPaths` and `ancestorPaths` constraints to `phriction.document.query`. These should be a little more usable than the internal `slugPrefix` / `depth` stuff -- that's technically more powerful, but requires callers to know more slug normalization rules. We could perhaps expose `minDepth` / `maxDepth` in the future.

Test Plan: Ran valid and invalid `parentPaths` and `ancestorPaths` queries for `/`, `aaa/`, `AAA/`, etc. Got sensible-seeming results.

Maniphest Tasks: T13090, T13077

Differential Revision: https://secure.phabricator.com/D19125
---
 .../query/PhrictionDocumentQuery.php          | 103 +++++++++++++++++-
 .../query/PhrictionDocumentSearchEngine.php   |  16 +++
 2 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php
index de3064fd42..0c6a2c23bc 100644
--- a/src/applications/phriction/query/PhrictionDocumentQuery.php
+++ b/src/applications/phriction/query/PhrictionDocumentQuery.php
@@ -10,6 +10,9 @@ final class PhrictionDocumentQuery
   private $slugPrefix;
   private $statuses;
 
+  private $parentPaths;
+  private $ancestorPaths;
+
   private $needContent;
 
   const ORDER_HIERARCHY = 'hierarchy';
@@ -34,7 +37,7 @@ public function withDepths(array $depths) {
     return $this;
   }
 
-  public function  withSlugPrefix($slug_prefix) {
+  public function withSlugPrefix($slug_prefix) {
     $this->slugPrefix = $slug_prefix;
     return $this;
   }
@@ -44,6 +47,16 @@ public function withStatuses(array $statuses) {
     return $this;
   }
 
+  public function withParentPaths(array $paths) {
+    $this->parentPaths = $paths;
+    return $this;
+  }
+
+  public function withAncestorPaths(array $paths) {
+    $this->ancestorPaths = $paths;
+    return $this;
+  }
+
   public function needContent($need_content) {
     $this->needContent = $need_content;
     return $this;
@@ -214,6 +227,94 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->depths);
     }
 
+    if ($this->parentPaths !== null || $this->ancestorPaths !== null) {
+      $sets = array(
+        array(
+          'paths' => $this->parentPaths,
+          'parents' => true,
+        ),
+        array(
+          'paths' => $this->ancestorPaths,
+          'parents' => false,
+        ),
+      );
+
+      $paths = array();
+      foreach ($sets as $set) {
+        $set_paths = $set['paths'];
+        if ($set_paths === null) {
+          continue;
+        }
+
+        if (!$set_paths) {
+          throw new PhabricatorEmptyQueryException(
+            pht('No parent/ancestor paths specified.'));
+        }
+
+        $is_parents = $set['parents'];
+        foreach ($set_paths as $path) {
+          $path_normal = PhabricatorSlug::normalize($path);
+          if ($path !== $path_normal) {
+            throw new Exception(
+              pht(
+                'Document path "%s" is not a valid path. The normalized '.
+                'form of this path is "%s".',
+                $path,
+                $path_normal));
+          }
+
+          $depth = PhabricatorSlug::getDepth($path_normal);
+          if ($is_parents) {
+            $min_depth = $depth + 1;
+            $max_depth = $depth + 1;
+          } else {
+            $min_depth = $depth + 1;
+            $max_depth = null;
+          }
+
+          $paths[] = array(
+            $path_normal,
+            $min_depth,
+            $max_depth,
+          );
+        }
+      }
+
+      $path_clauses = array();
+      foreach ($paths as $path) {
+        $parts = array();
+        list($prefix, $min, $max) = $path;
+
+        // If we're getting children or ancestors of the root document, they
+        // aren't actually stored with the leading "/" in the database, so
+        // just skip this part of the clause.
+        if ($prefix !== '/') {
+          $parts[] = qsprintf(
+            $conn,
+            'd.slug LIKE %>',
+            $prefix);
+        }
+
+        if ($min !== null) {
+          $parts[] = qsprintf(
+            $conn,
+            'd.depth >= %d',
+            $min);
+        }
+
+        if ($max !== null) {
+          $parts[] = qsprintf(
+            $conn,
+            'd.depth <= %d',
+            $max);
+        }
+
+        $path_clauses[] = '('.implode(') AND (', $parts).')';
+      }
+
+      $where[] = '('.implode(') OR (', $path_clauses).')';
+    }
+
     return $where;
   }
 
diff --git a/src/applications/phriction/query/PhrictionDocumentSearchEngine.php b/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
index e0781ec81f..e3d962146a 100644
--- a/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
+++ b/src/applications/phriction/query/PhrictionDocumentSearchEngine.php
@@ -27,6 +27,14 @@ protected function buildQueryFromParameters(array $map) {
       $query->withSlugs($map['paths']);
     }
 
+    if ($map['parentPaths']) {
+      $query->withParentPaths($map['parentPaths']);
+    }
+
+    if ($map['ancestorPaths']) {
+      $query->withAncestorPaths($map['ancestorPaths']);
+    }
+
     return $query;
   }
 
@@ -40,6 +48,14 @@ protected function buildCustomSearchFields() {
         ->setKey('paths')
         ->setIsHidden(true)
         ->setLabel(pht('Paths')),
+      id(new PhabricatorSearchStringListField())
+        ->setKey('parentPaths')
+        ->setIsHidden(true)
+        ->setLabel(pht('Parent Paths')),
+      id(new PhabricatorSearchStringListField())
+        ->setKey('ancestorPaths')
+        ->setIsHidden(true)
+        ->setLabel(pht('Ancestor Paths')),
     );
   }
 

From d0591f3680b28523c40d4d8f6e224aab5ab24d37 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 12:16:11 -0800
Subject: [PATCH 613/865] Support some QueryConstraint operations against
 generic ApplicationSearch query logic

Summary: Ref T13090. Currently, it isn't possible to query custom fields for complex constraints. Lay the groundwork to implement some of the easy ones (none(), any()) for Datasource/PHID fields.

Test Plan: Hard-coded some constraints and queried with them; see next change for more substantial testing.

Maniphest Tasks: T13090

Differential Revision: https://secure.phabricator.com/D19126
---
 .../constraint/PhabricatorQueryConstraint.php |   1 +
 ...PhabricatorCursorPagedPolicyAwareQuery.php | 157 ++++++++++++++----
 2 files changed, 126 insertions(+), 32 deletions(-)

diff --git a/src/infrastructure/query/constraint/PhabricatorQueryConstraint.php b/src/infrastructure/query/constraint/PhabricatorQueryConstraint.php
index 54cd7ae51f..874d8756e8 100644
--- a/src/infrastructure/query/constraint/PhabricatorQueryConstraint.php
+++ b/src/infrastructure/query/constraint/PhabricatorQueryConstraint.php
@@ -9,6 +9,7 @@ final class PhabricatorQueryConstraint extends Phobject {
   const OPERATOR_ANCESTOR = 'ancestor';
   const OPERATOR_EMPTY = 'empty';
   const OPERATOR_ONLY = 'only';
+  const OPERATOR_ANY = 'any';
 
   private $operator;
   private $value;
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 63daa6df79..5193b14975 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -342,6 +342,7 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where[] = $this->buildSpacesWhereClause($conn);
     $where[] = $this->buildNgramsWhereClause($conn);
     $where[] = $this->buildFerretWhereClause($conn);
+    $where[] = $this->buildApplicationSearchWhereClause($conn);
     return $where;
   }
 
@@ -1158,12 +1159,29 @@ public function withApplicationSearchContainsConstraint(
     PhabricatorCustomFieldIndexStorage $index,
     $value) {
 
+    $values = (array)$value;
+
+    $data_values = array();
+    $constraint_values = array();
+    foreach ($values as $value) {
+      if ($value instanceof PhabricatorQueryConstraint) {
+        $constraint_values[] = $value;
+      } else {
+        $data_values[] = $value;
+      }
+    }
+
+    $alias = 'appsearch_'.count($this->applicationSearchConstraints);
+
     $this->applicationSearchConstraints[] = array(
       'type'  => $index->getIndexValueType(),
       'cond'  => '=',
       'table' => $index->getTableName(),
       'index' => $index->getIndexKey(),
-      'value' => $value,
+      'alias' => $alias,
+      'value' => $values,
+      'data' => $data_values,
+      'constraints' => $constraint_values,
     );
 
     return $this;
@@ -1203,11 +1221,14 @@ public function withApplicationSearchRangeConstraint(
           'int'));
     }
 
+    $alias = 'appsearch_'.count($this->applicationSearchConstraints);
+
     $this->applicationSearchConstraints[] = array(
       'type' => $index->getIndexValueType(),
       'cond' => 'range',
       'table' => $index->getTableName(),
       'index' => $index->getIndexKey(),
+      'alias' => $alias,
       'value' => array($min, $max),
     );
 
@@ -1256,7 +1277,7 @@ protected function getApplicationSearchMayJoinMultipleRows() {
           switch ($type) {
             case 'string':
             case 'int':
-              if (count((array)$value) > 1) {
+              if (count($value) > 1) {
                 return true;
               }
               break;
@@ -1309,49 +1330,39 @@ protected function buildApplicationSearchGroupClause(
    * @task appsearch
    */
   protected function buildApplicationSearchJoinClause(
-    AphrontDatabaseConnection $conn_r) {
+    AphrontDatabaseConnection $conn) {
 
     $joins = array();
     foreach ($this->applicationSearchConstraints as $key => $constraint) {
       $table = $constraint['table'];
-      $alias = 'appsearch_'.$key;
+      $alias = $constraint['alias'];
       $index = $constraint['index'];
       $cond = $constraint['cond'];
       $phid_column = $this->getApplicationSearchObjectPHIDColumn();
       switch ($cond) {
         case '=':
-          $type = $constraint['type'];
-          switch ($type) {
-            case 'string':
-              $constraint_clause = qsprintf(
-                $conn_r,
-                '%T.indexValue IN (%Ls)',
-                $alias,
-                (array)$constraint['value']);
-              break;
-            case 'int':
-              $constraint_clause = qsprintf(
-                $conn_r,
-                '%T.indexValue IN (%Ld)',
-                $alias,
-                (array)$constraint['value']);
+          // Figure out whether we need to do a LEFT JOIN or not. We need to
+          // LEFT JOIN if we're going to select "IS NULL" rows.
+          $join_type = 'JOIN';
+          foreach ($constraint['constraints'] as $query_constraint) {
+            $op = $query_constraint->getOperator();
+            if ($op === PhabricatorQueryConstraint::OPERATOR_NULL) {
+              $join_type = 'LEFT JOIN';
               break;
-            default:
-              throw new Exception(pht('Unknown index type "%s"!', $type));
+            }
           }
 
           $joins[] = qsprintf(
-            $conn_r,
-            'JOIN %T %T ON %T.objectPHID = %Q
-              AND %T.indexKey = %s
-              AND (%Q)',
+            $conn,
+            '%Q %T %T ON %T.objectPHID = %Q
+              AND %T.indexKey = %s',
+            $join_type,
             $table,
             $alias,
             $alias,
             $phid_column,
             $alias,
-            $index,
-            $constraint_clause);
+            $index);
           break;
         case 'range':
           list($min, $max) = $constraint['value'];
@@ -1362,19 +1373,19 @@ protected function buildApplicationSearchJoinClause(
 
           if ($min === null) {
             $constraint_clause = qsprintf(
-              $conn_r,
+              $conn,
               '%T.indexValue <= %d',
               $alias,
               $max);
           } else if ($max === null) {
             $constraint_clause = qsprintf(
-              $conn_r,
+              $conn,
               '%T.indexValue >= %d',
               $alias,
               $min);
           } else {
             $constraint_clause = qsprintf(
-              $conn_r,
+              $conn,
               '%T.indexValue BETWEEN %d AND %d',
               $alias,
               $min,
@@ -1382,7 +1393,7 @@ protected function buildApplicationSearchJoinClause(
           }
 
           $joins[] = qsprintf(
-            $conn_r,
+            $conn,
             'JOIN %T %T ON %T.objectPHID = %Q
               AND %T.indexKey = %s
               AND (%Q)',
@@ -1414,7 +1425,7 @@ protected function buildApplicationSearchJoinClause(
       $key = $spec['customfield.index.key'];
 
       $joins[] = qsprintf(
-        $conn_r,
+        $conn,
         'LEFT JOIN %T %T ON %T.objectPHID = %Q
           AND %T.indexKey = %s',
         $table,
@@ -1428,6 +1439,88 @@ protected function buildApplicationSearchJoinClause(
     return implode(' ', $joins);
   }
 
+  /**
+   * Construct a WHERE clause appropriate for applying ApplicationSearch
+   * constraints.
+   *
+   * @param AphrontDatabaseConnection Connection executing the query.
+   * @return list<string> Where clause parts.
+   * @task appsearch
+   */
+  protected function buildApplicationSearchWhereClause(
+    AphrontDatabaseConnection $conn) {
+
+    $where = array();
+
+    foreach ($this->applicationSearchConstraints as $key => $constraint) {
+      $alias = $constraint['alias'];
+      $cond = $constraint['cond'];
+      $type = $constraint['type'];
+
+      $data_values = $constraint['data'];
+      $constraint_values = $constraint['constraints'];
+
+      $constraint_parts = array();
+      switch ($cond) {
+        case '=':
+          if ($data_values) {
+            switch ($type) {
+              case 'string':
+                $constraint_parts[] = qsprintf(
+                  $conn,
+                  '%T.indexValue IN (%Ls)',
+                  $alias,
+                  $data_values);
+                break;
+              case 'int':
+                $constraint_parts[] = qsprintf(
+                  $conn,
+                  '%T.indexValue IN (%Ld)',
+                  $alias,
+                  $data_values);
+                break;
+              default:
+                throw new Exception(pht('Unknown index type "%s"!', $type));
+            }
+          }
+
+          if ($constraint_values) {
+            foreach ($constraint_values as $value) {
+              $op = $value->getOperator();
+              switch ($op) {
+                case PhabricatorQueryConstraint::OPERATOR_NULL:
+                  $constraint_parts[] = qsprintf(
+                    $conn,
+                    '%T.indexValue IS NULL',
+                    $alias);
+                  break;
+                case PhabricatorQueryConstraint::OPERATOR_ANY:
+                  $constraint_parts[] = qsprintf(
+                    $conn,
+                    '%T.indexValue IS NOT NULL',
+                    $alias);
+                  break;
+                default:
+                  throw new Exception(
+                    pht(
+                      'No support for applying operator "%s" against '.
+                      'index of type "%s".',
+                      $op,
+                      $type));
+              }
+            }
+          }
+
+          if ($constraint_parts) {
+            $where[] = '('.implode(') OR (', $constraint_parts).')';
+          }
+          break;
+      }
+    }
+
+    return $where;
+  }
+
 
 /* -(  Integration with CustomField  )--------------------------------------- */
 

From 3203fd9eea7d711418037b1a45b7d49de0ea57d8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 12:23:41 -0800
Subject: [PATCH 614/865] Support "Any Value" and "No Value" search constraints
 for datasource Custom Fields

Summary: Depends on D19126. Ref T13090. For datasource custom fields, this proxies the datasource and provides "none()" and "any()" functions to allow you to search for objects with no values or any values.

Test Plan:
  - Created a custom "Owning Group" field in Maniphest using a Projects datasource.
  - For a task with no owner assigned, searched for "none()" (hit) and "any()" (miss).
  - Assigned the task to an owning project.
  - Searched for "none()" (miss), "any()" (hit), the project it is now a member of (hit) and some random other project (miss).

Maniphest Tasks: T13090

Differential Revision: https://secure.phabricator.com/D19127
---
 src/__phutil_library_map__.php                |  8 +++
 .../PhabricatorTypeaheadProxyDatasource.php   | 58 +++++++++++++++
 ...ApplicationSearchAnyFunctionDatasource.php | 70 ++++++++++++++++++
 ...CustomFieldApplicationSearchDatasource.php | 17 +++++
 ...pplicationSearchNoneFunctionDatasource.php | 72 +++++++++++++++++++
 ...habricatorStandardCustomFieldTokenizer.php | 25 ++++++-
 6 files changed, 249 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/typeahead/datasource/PhabricatorTypeaheadProxyDatasource.php
 create mode 100644 src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php
 create mode 100644 src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchDatasource.php
 create mode 100644 src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f7cda9d8fa..6fd36a1e38 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2617,6 +2617,9 @@
     'PhabricatorCountdownViewController' => 'applications/countdown/controller/PhabricatorCountdownViewController.php',
     'PhabricatorCursorPagedPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php',
     'PhabricatorCustomField' => 'infrastructure/customfield/field/PhabricatorCustomField.php',
+    'PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource' => 'infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php',
+    'PhabricatorCustomFieldApplicationSearchDatasource' => 'infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchDatasource.php',
+    'PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource' => 'infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php',
     'PhabricatorCustomFieldAttachment' => 'infrastructure/customfield/field/PhabricatorCustomFieldAttachment.php',
     'PhabricatorCustomFieldConfigOptionType' => 'infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php',
     'PhabricatorCustomFieldDataNotAvailableException' => 'infrastructure/customfield/exception/PhabricatorCustomFieldDataNotAvailableException.php',
@@ -4387,6 +4390,7 @@
     'PhabricatorTypeaheadInvalidTokenException' => 'applications/typeahead/exception/PhabricatorTypeaheadInvalidTokenException.php',
     'PhabricatorTypeaheadModularDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php',
     'PhabricatorTypeaheadMonogramDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadMonogramDatasource.php',
+    'PhabricatorTypeaheadProxyDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadProxyDatasource.php',
     'PhabricatorTypeaheadResult' => 'applications/typeahead/storage/PhabricatorTypeaheadResult.php',
     'PhabricatorTypeaheadRuntimeCompositeDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadRuntimeCompositeDatasource.php',
     'PhabricatorTypeaheadTestNumbersDatasource' => 'applications/typeahead/datasource/__tests__/PhabricatorTypeaheadTestNumbersDatasource.php',
@@ -8122,6 +8126,9 @@
     'PhabricatorCountdownViewController' => 'PhabricatorCountdownController',
     'PhabricatorCursorPagedPolicyAwareQuery' => 'PhabricatorPolicyAwareQuery',
     'PhabricatorCustomField' => 'Phobject',
+    'PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource' => 'PhabricatorTypeaheadDatasource',
+    'PhabricatorCustomFieldApplicationSearchDatasource' => 'PhabricatorTypeaheadProxyDatasource',
+    'PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorCustomFieldAttachment' => 'Phobject',
     'PhabricatorCustomFieldConfigOptionType' => 'PhabricatorConfigOptionType',
     'PhabricatorCustomFieldDataNotAvailableException' => 'Exception',
@@ -10182,6 +10189,7 @@
     'PhabricatorTypeaheadInvalidTokenException' => 'Exception',
     'PhabricatorTypeaheadModularDatasourceController' => 'PhabricatorTypeaheadDatasourceController',
     'PhabricatorTypeaheadMonogramDatasource' => 'PhabricatorTypeaheadDatasource',
+    'PhabricatorTypeaheadProxyDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorTypeaheadResult' => 'Phobject',
     'PhabricatorTypeaheadRuntimeCompositeDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorTypeaheadTestNumbersDatasource' => 'PhabricatorTypeaheadDatasource',
diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadProxyDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadProxyDatasource.php
new file mode 100644
index 0000000000..3feb2d054d
--- /dev/null
+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadProxyDatasource.php
@@ -0,0 +1,58 @@
+<?php
+
+abstract class PhabricatorTypeaheadProxyDatasource
+  extends PhabricatorTypeaheadCompositeDatasource {
+
+  private $datasource;
+
+  public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
+    $this->datasource = $datasource;
+    $this->setParameters(
+      array(
+        'class' => get_class($datasource),
+        'parameters' => $datasource->getParameters(),
+      ));
+    return $this;
+  }
+
+  public function getDatasource() {
+    if (!$this->datasource) {
+      $class = $this->getParameter('class');
+
+      $parent = 'PhabricatorTypeaheadDatasource';
+      if (!is_subclass_of($class, $parent)) {
+        throw new Exception(
+          pht(
+            'Configured datasource class "%s" must be a valid subclass of '.
+            '"%s".',
+            $class,
+            $parent));
+      }
+
+      $datasource = newv($class, array());
+      $datasource->setParameters($this->getParameter('parameters', array()));
+      $this->datasource = $datasource;
+    }
+
+    return $this->datasource;
+  }
+
+  public function getComponentDatasources() {
+    return array(
+      $this->getDatasource(),
+    );
+  }
+
+  public function getDatasourceApplicationClass() {
+    return $this->getDatasource()->getDatasourceApplicationClass();
+  }
+
+  public function getBrowseTitle() {
+    return $this->getDatasource()->getBrowseTitle();
+  }
+
+  public function getPlaceholderText() {
+    return $this->getDatasource()->getPlaceholderText();
+  }
+
+}
diff --git a/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php
new file mode 100644
index 0000000000..9560620db4
--- /dev/null
+++ b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php
@@ -0,0 +1,70 @@
+<?php
+
+final class PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  public function getBrowseTitle() {
+    return pht('Browse Any');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type "any()"...');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return null;
+  }
+
+  public function getDatasourceFunctions() {
+    return array(
+      'any' => array(
+        'name' => pht('Any Value'),
+        'summary' => pht('Find results with any value.'),
+        'description' => pht(
+          "This function includes results which have any value. Use a query ".
+          "like this to find results with any value:\n\n%s".
+          '> any()'),
+      ),
+    );
+  }
+
+  public function loadResults() {
+    $results = array(
+      $this->newAnyFunction(),
+    );
+    return $this->filterResultsAgainstTokens($results);
+  }
+
+  protected function evaluateFunction($function, array $argv_list) {
+    $results = array();
+
+    foreach ($argv_list as $argv) {
+      $results[] = new PhabricatorQueryConstraint(
+        PhabricatorQueryConstraint::OPERATOR_ANY,
+        null);
+    }
+
+    return $results;
+  }
+
+  public function renderFunctionTokens($function, array $argv_list) {
+    $results = array();
+    foreach ($argv_list as $argv) {
+      $results[] = PhabricatorTypeaheadTokenView::newFromTypeaheadResult(
+        $this->newAnyFunction());
+    }
+    return $results;
+  }
+
+  private function newAnyFunction() {
+    $name = pht('Any Value');
+    return $this->newFunctionResult()
+      ->setName($name.' any')
+      ->setDisplayName($name)
+      ->setIcon('fa-circle-o')
+      ->setPHID('any()')
+      ->setUnique(true)
+      ->addAttribute(pht('Select results with any value.'));
+  }
+
+}
diff --git a/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchDatasource.php b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchDatasource.php
new file mode 100644
index 0000000000..7ba10e84ff
--- /dev/null
+++ b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchDatasource.php
@@ -0,0 +1,17 @@
+<?php
+
+final class PhabricatorCustomFieldApplicationSearchDatasource
+  extends PhabricatorTypeaheadProxyDatasource {
+
+  public function getComponentDatasources() {
+    $datasources = parent::getComponentDatasources();
+
+    $datasources[] =
+      new PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource();
+    $datasources[] =
+      new PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource();
+
+    return $datasources;
+  }
+
+}
diff --git a/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php
new file mode 100644
index 0000000000..591e4fda01
--- /dev/null
+++ b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php
@@ -0,0 +1,72 @@
+<?php
+
+final class PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  public function getBrowseTitle() {
+    return pht('Browse No Value');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type "none()"...');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return null;
+  }
+
+  public function getDatasourceFunctions() {
+    return array(
+      'none' => array(
+        'name' => pht('No Value'),
+        'summary' => pht('Find results with no value.'),
+        'description' => pht(
+          "This function includes results which have no value. Use a query ".
+          "like this to find results with no value:\n\n%s\n\n",
+          'If you combine this function with other constraints, results '.
+          'which have no value or the specified values will be returned.',
+          '> any()'),
+      ),
+    );
+  }
+
+  public function loadResults() {
+    $results = array(
+      $this->newNoneFunction(),
+    );
+    return $this->filterResultsAgainstTokens($results);
+  }
+
+  protected function evaluateFunction($function, array $argv_list) {
+    $results = array();
+
+    foreach ($argv_list as $argv) {
+      $results[] = new PhabricatorQueryConstraint(
+        PhabricatorQueryConstraint::OPERATOR_NULL,
+        null);
+    }
+
+    return $results;
+  }
+
+  public function renderFunctionTokens($function, array $argv_list) {
+    $results = array();
+    foreach ($argv_list as $argv) {
+      $results[] = PhabricatorTypeaheadTokenView::newFromTypeaheadResult(
+        $this->newNoneFunction());
+    }
+    return $results;
+  }
+
+  private function newNoneFunction() {
+    $name = pht('No Value');
+    return $this->newFunctionResult()
+      ->setName($name.' none')
+      ->setDisplayName($name)
+      ->setIcon('fa-ban')
+      ->setPHID('none()')
+      ->setUnique(true)
+      ->addAttribute(pht('Select results with no value.'));
+  }
+
+}
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
index cdb54fb7e9..9bf59d41f6 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
@@ -33,12 +33,28 @@ public function appendToApplicationSearchForm(
     $control = id(new AphrontFormTokenizerControl())
       ->setLabel($this->getFieldName())
       ->setName($this->getFieldKey())
-      ->setDatasource($this->getDatasource())
+      ->setDatasource($this->newApplicationSearchDatasource())
       ->setValue(nonempty($value, array()));
 
     $form->appendControl($control);
   }
 
+  public function applyApplicationSearchConstraintToQuery(
+    PhabricatorApplicationSearchEngine $engine,
+    PhabricatorCursorPagedPolicyAwareQuery $query,
+    $value) {
+    if ($value) {
+
+      $datasource = $this->newApplicationSearchDatasource()
+        ->setViewer($this->getViewer());
+      $value = $datasource->evaluateTokens($value);
+
+      $query->withApplicationSearchContainsConstraint(
+        $this->newStringIndex(null),
+        $value);
+    }
+  }
+
   public function getHeraldFieldValueType($condition) {
     return id(new HeraldTokenizerFieldValue())
       ->setKey('custom.'.$this->getFieldKey())
@@ -120,4 +136,11 @@ private function renderHeraldHandleList($value) {
     }
   }
 
+  protected function newApplicationSearchDatasource() {
+    $datasource = $this->getDatasource();
+
+    return id(new PhabricatorCustomFieldApplicationSearchDatasource())
+      ->setDatasource($datasource);
+  }
+
 }

From 8ae01fdc6bf620c44ebf0853627fb059881d0b15 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 12:51:23 -0800
Subject: [PATCH 615/865] Fix documentation behaviors for the new proxy
 functions for custom datasource fields

Summary: Ref T13090. The doc string in "any()" wasn't specified correctly and the help page wasn't getting enough supporting data to build properly.

Test Plan: Viewed "Reference: Advanced Functions" for a custom datasource field and got more helpful help.

Maniphest Tasks: T13090

Differential Revision: https://secure.phabricator.com/D19128
---
 ...ricatorTypeaheadFunctionHelpController.php | 20 +++++++++++++++++--
 ...orTypeaheadModularDatasourceController.php |  6 ++++++
 ...ApplicationSearchAnyFunctionDatasource.php |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php
index 3084b2d434..27b30a6278 100644
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php
@@ -19,9 +19,25 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
-    $source = $sources[$class];
+    $raw_parameters = $request->getStr('parameters');
+    if ($raw_parameters) {
+      $parameters = phutil_json_decode($raw_parameters);
+    } else {
+      $parameters = array();
+    }
+
+    $source = id(clone $sources[$class])
+      ->setParameters($parameters);
+
+    // This can fail for some types of datasources (like the custom field proxy
+    // datasources) if the "parameters" are wrong. Just fail cleanly instead
+    // of fataling.
+    try {
+      $application_class = $source->getDatasourceApplicationClass();
+    } catch (Exception $ex) {
+      return new Aphront404Response();
+    }
 
-    $application_class = $source->getDatasourceApplicationClass();
     if ($application_class) {
       $result = id(new PhabricatorApplicationQuery())
         ->setViewer($this->getViewer())
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
index 2f55c26384..e0ba9a763b 100644
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
@@ -226,6 +226,12 @@ public function handleRequest(AphrontRequest $request) {
         if ($source->getAllDatasourceFunctions()) {
           $reference_uri = '/typeahead/help/'.get_class($source).'/';
 
+          $parameters = $source->getParameters();
+          if ($parameters) {
+            $reference_uri = (string)id(new PhutilURI($reference_uri))
+              ->setQueryParam('parameters', phutil_json_encode($parameters));
+          }
+
           $reference_link = phutil_tag(
             'a',
             array(
diff --git a/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php
index 9560620db4..31f189988c 100644
--- a/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php
+++ b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchAnyFunctionDatasource.php
@@ -22,7 +22,7 @@ public function getDatasourceFunctions() {
         'summary' => pht('Find results with any value.'),
         'description' => pht(
           "This function includes results which have any value. Use a query ".
-          "like this to find results with any value:\n\n%s".
+          "like this to find results with any value:\n\n%s",
           '> any()'),
       ),
     );

From 4c7370a1a3b0b59f4ce6fc731a59b637f75c0ed2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 13:31:20 -0800
Subject: [PATCH 616/865] Make the filetree view width sticky across show/hide
 and reload

Summary:
Ref T13090. The default width changed recently to become much wider, but the behavior on this control isn't great. Instead:

  - Pick a default width somewhere between the two.
  - Make the width sticky across show/hide (pressing "f" twice remembers your width instead of resetting it).
  - Make the width sticky across reloads (dragging the bar, then reloading the page keeps the bar in the same place).

Test Plan:
  - Without settings, loaded page: got medium-width bar.
  - Dragged bar wide/narrow, toggled on/off with "f", got persistent width.
  - Dragged bar wide/narrow, reloaded page, got persistent width.
  - Dragged bar wide/narrow, toggled it off, reloaded page, toggled it on, got persistent width.

Maniphest Tasks: T13090

Differential Revision: https://secure.phabricator.com/D19129
---
 resources/celerity/map.php                    | 22 ++++----
 src/__phutil_library_map__.php                |  2 +
 .../DifferentialRevisionViewController.php    |  4 ++
 ...rentialChangesetFileTreeSideNavBuilder.php | 15 +++--
 .../controller/DiffusionCommitController.php  | 12 ++--
 .../PhabricatorFiletreeWidthSetting.php       | 12 ++++
 src/view/layout/AphrontSideNavFilterView.php  | 55 ++++++++++++++-----
 .../rsrc/css/aphront/phabricator-nav-view.css |  6 +-
 .../rsrc/js/core/behavior-phabricator-nav.js  | 35 +++++++++++-
 9 files changed, 124 insertions(+), 39 deletions(-)
 create mode 100644 src/applications/settings/setting/PhabricatorFiletreeWidthSetting.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 32ccb9e5f9..01dd75c901 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,8 +9,8 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'e4f098a5',
-    'core.pkg.js' => 'bd19de1c',
+    'core.pkg.css' => '2fa91e14',
+    'core.pkg.js' => 'dc13d4b7',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -31,7 +31,7 @@
     'rsrc/css/aphront/multi-column.css' => '84cc6640',
     'rsrc/css/aphront/notification.css' => '457861ec',
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
-    'rsrc/css/aphront/phabricator-nav-view.css' => '028126f6',
+    'rsrc/css/aphront/phabricator-nav-view.css' => 'a9e3e6d5',
     'rsrc/css/aphront/table-view.css' => '8c9bbafe',
     'rsrc/css/aphront/tokenizer.css' => '15d5ff71',
     'rsrc/css/aphront/tooltip.css' => '173b9431',
@@ -498,7 +498,7 @@
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
-    'rsrc/js/core/behavior-phabricator-nav.js' => '81144dfa',
+    'rsrc/js/core/behavior-phabricator-nav.js' => '836f966d',
     'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'acd29eee',
     'rsrc/js/core/behavior-read-only-warning.js' => 'ba158207',
     'rsrc/js/core/behavior-refresh-csrf.js' => 'ab2f381b',
@@ -657,7 +657,7 @@
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
     'javelin-behavior-phabricator-line-linker' => '1499a8cb',
-    'javelin-behavior-phabricator-nav' => '81144dfa',
+    'javelin-behavior-phabricator-nav' => '836f966d',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
     'javelin-behavior-phabricator-oncopy' => '2926fff2',
@@ -789,7 +789,7 @@
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => 'c19dd9b9',
     'phabricator-main-menu-view' => '1802a242',
-    'phabricator-nav-view-css' => '028126f6',
+    'phabricator-nav-view-css' => 'a9e3e6d5',
     'phabricator-notification' => '008faf9c',
     'phabricator-notification-css' => '457861ec',
     'phabricator-notification-menu-css' => '10685bd4',
@@ -1563,7 +1563,11 @@
       'phuix-icon-view',
       'phabricator-prefab',
     ),
-    '81144dfa' => array(
+    '834a1173' => array(
+      'javelin-behavior',
+      'javelin-scrollbar',
+    ),
+    '836f966d' => array(
       'javelin-behavior',
       'javelin-behavior-device',
       'javelin-stratcom',
@@ -1573,10 +1577,6 @@
       'javelin-request',
       'javelin-util',
     ),
-    '834a1173' => array(
-      'javelin-behavior',
-      'javelin-scrollbar',
-    ),
     '8499b6ab' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 6fd36a1e38..4455ad139a 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3046,6 +3046,7 @@
     'PhabricatorFilesOnDiskBuiltinFile' => 'applications/files/builtin/PhabricatorFilesOnDiskBuiltinFile.php',
     'PhabricatorFilesOutboundRequestAction' => 'applications/files/action/PhabricatorFilesOutboundRequestAction.php',
     'PhabricatorFiletreeVisibleSetting' => 'applications/settings/setting/PhabricatorFiletreeVisibleSetting.php',
+    'PhabricatorFiletreeWidthSetting' => 'applications/settings/setting/PhabricatorFiletreeWidthSetting.php',
     'PhabricatorFlag' => 'applications/flag/storage/PhabricatorFlag.php',
     'PhabricatorFlagAddFlagHeraldAction' => 'applications/flag/herald/PhabricatorFlagAddFlagHeraldAction.php',
     'PhabricatorFlagColor' => 'applications/flag/constants/PhabricatorFlagColor.php',
@@ -8613,6 +8614,7 @@
     'PhabricatorFilesOnDiskBuiltinFile' => 'PhabricatorFilesBuiltinFile',
     'PhabricatorFilesOutboundRequestAction' => 'PhabricatorSystemAction',
     'PhabricatorFiletreeVisibleSetting' => 'PhabricatorInternalSetting',
+    'PhabricatorFiletreeWidthSetting' => 'PhabricatorInternalSetting',
     'PhabricatorFlag' => array(
       'PhabricatorFlagDAO',
       'PhabricatorPolicyInterface',
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index e1da5ed32e..d7280cb0b6 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -473,10 +473,14 @@ public function handleRequest(AphrontRequest $request) {
       $collapsed_key = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
       $collapsed_value = $viewer->getUserSetting($collapsed_key);
 
+      $width_key = PhabricatorFiletreeWidthSetting::SETTINGKEY;
+      $width_value = $viewer->getUserSetting($width_key);
+
       $nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
         ->setTitle($monogram)
         ->setBaseURI(new PhutilURI($revision->getURI()))
         ->setCollapsed((bool)$collapsed_value)
+        ->setWidth((int)$width_value)
         ->build($changesets);
     }
 
diff --git a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
index 1f699be8eb..e8852a5c52 100644
--- a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
+++ b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
@@ -6,6 +6,7 @@ final class DifferentialChangesetFileTreeSideNavBuilder extends Phobject {
   private $baseURI;
   private $anchorName;
   private $collapsed = false;
+  private $width;
 
   public function setAnchorName($anchor_name) {
     $this->anchorName = $anchor_name;
@@ -36,13 +37,19 @@ public function setCollapsed($collapsed) {
     return $this;
   }
 
+  public function setWidth($width) {
+    $this->width = $width;
+    return $this;
+  }
+
   public function build(array $changesets) {
     assert_instances_of($changesets, 'DifferentialChangeset');
 
-    $nav = new AphrontSideNavFilterView();
-    $nav->setBaseURI($this->getBaseURI());
-    $nav->setFlexible(true);
-    $nav->setCollapsed($this->collapsed);
+    $nav = id(new AphrontSideNavFilterView())
+      ->setBaseURI($this->getBaseURI())
+      ->setFlexible(true)
+      ->setCollapsed($this->collapsed)
+      ->setWidth($this->width);
 
     $anchor = $this->getAnchorName();
 
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index b4d06989c2..67ffb73357 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -415,17 +415,21 @@ public function handleRequest(AphrontRequest $request) {
       PhabricatorShowFiletreeSetting::SETTINGKEY,
       PhabricatorShowFiletreeSetting::VALUE_ENABLE_FILETREE);
 
-    $pref_collapse = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
-    $collapsed = $viewer->getUserSetting($pref_collapse);
-
     $nav = null;
     if ($show_changesets && $filetree_on) {
+      $pref_collapse = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
+      $collapsed = $viewer->getUserSetting($pref_collapse);
+
+      $pref_width = PhabricatorFiletreeWidthSetting::SETTINGKEY;
+      $width = $viewer->getUserSetting($pref_width);
+
       $nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
         ->setTitle($commit->getDisplayName())
         ->setBaseURI(new PhutilURI($commit->getURI()))
         ->build($changesets)
         ->setCrumbs($crumbs)
-        ->setCollapsed((bool)$collapsed);
+        ->setCollapsed((bool)$collapsed)
+        ->setWidth((int)$width);
     }
 
     $view = id(new PHUITwoColumnView())
diff --git a/src/applications/settings/setting/PhabricatorFiletreeWidthSetting.php b/src/applications/settings/setting/PhabricatorFiletreeWidthSetting.php
new file mode 100644
index 0000000000..5cfc9f3fe7
--- /dev/null
+++ b/src/applications/settings/setting/PhabricatorFiletreeWidthSetting.php
@@ -0,0 +1,12 @@
+<?php
+
+final class PhabricatorFiletreeWidthSetting
+  extends PhabricatorInternalSetting {
+
+  const SETTINGKEY = 'filetree.width';
+
+  public function getSettingName() {
+    return pht('Filetree Width');
+  }
+
+}
diff --git a/src/view/layout/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
index 6564fab196..9abcea5a02 100644
--- a/src/view/layout/AphrontSideNavFilterView.php
+++ b/src/view/layout/AphrontSideNavFilterView.php
@@ -30,6 +30,7 @@ final class AphrontSideNavFilterView extends AphrontView {
   private $mainID;
   private $isProfileMenu;
   private $footer = array();
+  private $width;
 
   public function setMenuID($menu_id) {
     $this->menuID = $menu_id;
@@ -82,6 +83,11 @@ public function setCollapsed($collapsed) {
     return $this;
   }
 
+  public function setWidth($width) {
+    $this->width = $width;
+    return $this;
+  }
+
   public function getMenuView() {
     return $this->menu;
   }
@@ -216,6 +222,24 @@ private function renderFlexNav() {
     $local_menu = null;
     $main_id = $this->getMainID();
 
+    $width = $this->width;
+    if ($width) {
+      $width = min($width, 600);
+      $width = max($width, 150);
+    } else {
+      $width = null;
+    }
+
+    if ($width && !$this->collapsed) {
+      $width_drag_style = 'left: '.$width.'px';
+      $width_panel_style = 'width: '.$width.'px';
+      $width_margin_style = 'margin-left: '.($width + 7).'px';
+    } else {
+      $width_drag_style = null;
+      $width_panel_style = null;
+      $width_margin_style = null;
+    }
+
     if ($this->flexible) {
       $drag_id = celerity_generate_unique_node_id();
       $flex_bar = phutil_tag(
@@ -223,6 +247,7 @@ private function renderFlexNav() {
         array(
           'class' => 'phabricator-nav-drag',
           'id' => $drag_id,
+          'style' => $width_drag_style,
         ),
         '');
     } else {
@@ -238,14 +263,14 @@ private function renderFlexNav() {
         $nav_classes[] = 'has-local-nav';
       }
 
-      $local_menu =
-        phutil_tag(
-          'div',
-          array(
-            'class' => 'phabricator-nav-local phabricator-side-menu',
-            'id'    => $local_id,
-          ),
-          $this->menu->setID($this->getMenuID()));
+      $local_menu = phutil_tag(
+        'div',
+        array(
+          'class' => 'phabricator-nav-local phabricator-side-menu',
+          'id' => $local_id,
+          'style' => $width_panel_style,
+        ),
+        $this->menu->setID($this->getMenuID()));
     }
 
     $crumbs = null;
@@ -264,12 +289,13 @@ private function renderFlexNav() {
       Javelin::initBehavior(
         'phabricator-nav',
         array(
-          'mainID'        => $main_id,
-          'localID'       => $local_id,
-          'dragID'        => $drag_id,
-          'contentID'     => $content_id,
-          'backgroundID'  => $background_id,
-          'collapsed'     => $this->collapsed,
+          'mainID' => $main_id,
+          'localID' => $local_id,
+          'dragID' => $drag_id,
+          'contentID' => $content_id,
+          'backgroundID' => $background_id,
+          'collapsed' => $this->collapsed,
+          'width' => $width,
         ));
 
       if ($this->active) {
@@ -297,6 +323,7 @@ private function renderFlexNav() {
           array(
             'class' => 'phabricator-nav-content plb',
             'id' => $content_id,
+            'style' => $width_margin_style,
           ),
           array(
             $crumbs,
diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css
index f3320e3eae..6dbd0931a6 100644
--- a/webroot/rsrc/css/aphront/phabricator-nav-view.css
+++ b/webroot/rsrc/css/aphront/phabricator-nav-view.css
@@ -44,7 +44,7 @@
   position: fixed;
   top: 0;
   bottom: 0;
-  left: 410px;
+  left: 310px;
   width: 7px;
 
   cursor: col-resize;
@@ -66,7 +66,7 @@
 
 .device-desktop .phabricator-standard-page-body .has-drag-nav
   .phabricator-nav-content {
-  margin-left: 417px;
+  margin-left: 317px;
 }
 
 .device-desktop .phabricator-standard-page-body .has-drag-nav
@@ -81,7 +81,7 @@
 }
 
 .device-desktop .phui-navigation-shell .has-drag-nav .phabricator-nav-local {
-  width: 410px;
+  width: 310px;
   padding: 0;
   background: transparent;
 }
diff --git a/webroot/rsrc/js/core/behavior-phabricator-nav.js b/webroot/rsrc/js/core/behavior-phabricator-nav.js
index 74909e447d..50d8e1c820 100644
--- a/webroot/rsrc/js/core/behavior-phabricator-nav.js
+++ b/webroot/rsrc/js/core/behavior-phabricator-nav.js
@@ -18,7 +18,6 @@ JX.behavior('phabricator-nav', function(config) {
   var main = JX.$(config.mainID);
   var drag = JX.$(config.dragID);
 
-
 // - Flexible Navigation Column ------------------------------------------------
 
 
@@ -98,22 +97,52 @@ JX.behavior('phabricator-nav', function(config) {
     }
     JX.DOM.alterClass(document.body, 'jx-drag-col', false);
     dragging = false;
+
+    new JX.Request('/settings/adjust/', JX.bag)
+      .setData(
+        {
+          key: 'filetree.width',
+          value: JX.$V(drag).x
+        })
+      .send();
   });
 
 
-  function resetdrag() {
+  var saved_width = config.width;
+  function savedrag() {
+    saved_width = JX.$V(drag).x;
+
     local.style.width = '';
     drag.style.left = '';
     content.style.marginLeft = '';
   }
 
+  function restoredrag() {
+    if (!saved_width) {
+      return;
+    }
+
+    local.style.width = saved_width + 'px';
+    drag.style.left = saved_width + 'px';
+    content.style.marginLeft = (saved_width + JX.Vector.getDim(drag).x) + 'px';
+  }
+
   var collapsed = config.collapsed;
   JX.Stratcom.listen('differential-filetree-toggle', null, function() {
     collapsed = !collapsed;
+
+    if (collapsed) {
+      savedrag();
+    }
+
     JX.DOM.alterClass(main, 'has-local-nav', !collapsed);
     JX.DOM.alterClass(main, 'has-drag-nav', !collapsed);
     JX.DOM.alterClass(main, 'has-closed-nav', collapsed);
-    resetdrag();
+
+    if (!collapsed) {
+      restoredrag();
+    }
+
     new JX.Request('/settings/adjust/', JX.bag)
       .setData({ key : 'nav-collapsed', value : (collapsed ? 1 : 0) })
       .send();

From 7aab7e80af28f2faadb93cfc3b63a70cc8d59629 Mon Sep 17 00:00:00 2001
From: Mike Riley <mike@panopsis.co>
Date: Sun, 25 Feb 2018 20:12:30 +0000
Subject: [PATCH 617/865] Provide default values for table view properties
 which are `count`ed

Summary:
PHP 7.2 has changed the behavior of `count`, you must provide an array or `Countable` as a parameter, otherwise a warning is generated.  These two class members are counted during rendering, and are commonly left as null properties.

https://wiki.php.net/rfc/counting_non_countables

Test Plan: Browsed around my install and stopped seeing `count(): Parameter must be an array or an object that implements Countable at [AphrontTableView.php:153]` everywhere.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D19140
---
 src/view/control/AphrontTableView.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/view/control/AphrontTableView.php b/src/view/control/AphrontTableView.php
index 176d246718..3cca7f89e5 100644
--- a/src/view/control/AphrontTableView.php
+++ b/src/view/control/AphrontTableView.php
@@ -4,7 +4,7 @@ final class AphrontTableView extends AphrontView {
 
   protected $data;
   protected $headers;
-  protected $shortHeaders;
+  protected $shortHeaders = array();
   protected $rowClasses = array();
   protected $columnClasses = array();
   protected $cellClasses = array();
@@ -21,7 +21,7 @@ final class AphrontTableView extends AphrontView {
   protected $sortParam;
   protected $sortSelected;
   protected $sortReverse;
-  protected $sortValues;
+  protected $sortValues = array();
   private $deviceReadyTable;
 
   public function __construct(array $data) {

From cd4c4dc2ff9e6c096c011077bef61359657fa39f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 18:01:51 -0800
Subject: [PATCH 618/865] Add `bin/harbormaster write-log` to write some
 arbitrary content into a new Harbormaster log

Summary: Ref T13088. This is currently minimal but the modify-execute development loop on build logs is extremely long without it.

Test Plan: Ran `echo hi | ./bin/harbormaster write-log --target 12345`, saw the log show up in the web UI.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19130
---
 src/__phutil_library_map__.php                |  2 +
 ...HarbormasterManagementWriteLogWorkflow.php | 62 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4455ad139a..2d610818e5 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1311,6 +1311,7 @@
     'HarbormasterManagementRestartWorkflow' => 'applications/harbormaster/management/HarbormasterManagementRestartWorkflow.php',
     'HarbormasterManagementUpdateWorkflow' => 'applications/harbormaster/management/HarbormasterManagementUpdateWorkflow.php',
     'HarbormasterManagementWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWorkflow.php',
+    'HarbormasterManagementWriteLogWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php',
     'HarbormasterMessageType' => 'applications/harbormaster/engine/HarbormasterMessageType.php',
     'HarbormasterObject' => 'applications/harbormaster/storage/HarbormasterObject.php',
     'HarbormasterOtherBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterOtherBuildStepGroup.php',
@@ -6614,6 +6615,7 @@
     'HarbormasterManagementRestartWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementUpdateWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementWorkflow' => 'PhabricatorManagementWorkflow',
+    'HarbormasterManagementWriteLogWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterMessageType' => 'Phobject',
     'HarbormasterObject' => 'HarbormasterDAO',
     'HarbormasterOtherBuildStepGroup' => 'HarbormasterBuildStepGroup',
diff --git a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
new file mode 100644
index 0000000000..d84a9ed510
--- /dev/null
+++ b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
@@ -0,0 +1,62 @@
+<?php
+
+final class HarbormasterManagementWriteLogWorkflow
+  extends HarbormasterManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('write-log')
+      ->setExamples('**write-log** --target __id__ [__options__]')
+      ->setSynopsis(pht('Write a new Harbormaster build log.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'target',
+            'param' => 'id',
+            'help' => pht(
+              'Build Target ID to attach the log to.'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+
+    $target_id = $args->getArg('target');
+    if (!$target_id) {
+      throw new PhutilArgumentUsageException(
+        pht('Choose a build target to attach the log to with "--target".'));
+    }
+
+    $target = id(new HarbormasterBuildTargetQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($target_id))
+      ->executeOne();
+    if (!$target) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Unable to load build target "%s".',
+          $target_id));
+    }
+
+
+    $log = HarbormasterBuildLog::initializeNewBuildLog($target);
+    $log->openBuildLog();
+
+    echo tsprintf(
+      "%s\n",
+      pht('Reading log from stdin...'));
+
+    $content = file_get_contents('php://stdin');
+    $log->append($content);
+
+    $log->closeBuildLog();
+
+    echo tsprintf(
+      "%s\n",
+      pht('Done.'));
+
+    return 0;
+  }
+
+}

From 32c6b649dd211f3b2316750371c27dffe7342631 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 18:14:59 -0800
Subject: [PATCH 619/865] Move Harbormaster log compression to the worker task
 queue

Summary: Depends on D19130. Ref T13088. Currently, when a build log is closed we compress it in the same process. Separate this out into a dedicated worker since the plan is to do a lot more work during finalization, none of which needs to happen inline during builds (or, particuarly, inline during a Conduit call for API writes in the future).

Test Plan: Ran `bin/harbormaster write-log --trace`, saw compression run inline.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19131
---
 src/__phutil_library_map__.php                |  2 +
 ...HarbormasterManagementWriteLogWorkflow.php |  7 ++-
 .../storage/build/HarbormasterBuildLog.php    | 19 ++++---
 .../worker/HarbormasterLogWorker.php          | 50 +++++++++++++++++++
 4 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100644 src/applications/harbormaster/worker/HarbormasterLogWorker.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2d610818e5..d43f386009 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1306,6 +1306,7 @@
     'HarbormasterLeaseWorkingCopyBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php',
     'HarbormasterLintMessagesController' => 'applications/harbormaster/controller/HarbormasterLintMessagesController.php',
     'HarbormasterLintPropertyView' => 'applications/harbormaster/view/HarbormasterLintPropertyView.php',
+    'HarbormasterLogWorker' => 'applications/harbormaster/worker/HarbormasterLogWorker.php',
     'HarbormasterManagementArchiveLogsWorkflow' => 'applications/harbormaster/management/HarbormasterManagementArchiveLogsWorkflow.php',
     'HarbormasterManagementBuildWorkflow' => 'applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php',
     'HarbormasterManagementRestartWorkflow' => 'applications/harbormaster/management/HarbormasterManagementRestartWorkflow.php',
@@ -6610,6 +6611,7 @@
     'HarbormasterLeaseWorkingCopyBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterLintMessagesController' => 'HarbormasterController',
     'HarbormasterLintPropertyView' => 'AphrontView',
+    'HarbormasterLogWorker' => 'HarbormasterWorker',
     'HarbormasterManagementArchiveLogsWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementBuildWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementRestartWorkflow' => 'HarbormasterManagementWorkflow',
diff --git a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
index d84a9ed510..b20204670b 100644
--- a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
+++ b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
@@ -39,7 +39,6 @@ public function execute(PhutilArgumentParser $args) {
           $target_id));
     }
 
-
     $log = HarbormasterBuildLog::initializeNewBuildLog($target);
     $log->openBuildLog();
 
@@ -50,6 +49,12 @@ public function execute(PhutilArgumentParser $args) {
     $content = file_get_contents('php://stdin');
     $log->append($content);
 
+    echo tsprintf(
+      "%s\n",
+      pht('Write completed. Closing log...'));
+
+    PhabricatorWorker::setRunAllTasksInProcess(true);
+
     $log->closeBuildLog();
 
     echo tsprintf(
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 290b288c6c..2826f445de 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -52,17 +52,24 @@ public function closeBuildLog() {
       throw new Exception(pht('This build log is not open!'));
     }
 
-    if ($this->canCompressLog()) {
-      $this->compressLog();
-    }
-
     $start = $this->getDateCreated();
     $now = PhabricatorTime::getNow();
 
-    return $this
+    $this
       ->setDuration($now - $start)
       ->setLive(0)
       ->save();
+
+    PhabricatorWorker::scheduleTask(
+      'HarbormasterLogWorker',
+      array(
+        'logPHID' => $this->getPHID(),
+      ),
+      array(
+        'objectPHID' => $this->getPHID(),
+      ));
+
+    return $this;
   }
 
 
@@ -201,7 +208,7 @@ public function getLogText() {
     return implode('', $full_text);
   }
 
-  private function canCompressLog() {
+  public function canCompressLog() {
     return function_exists('gzdeflate');
   }
 
diff --git a/src/applications/harbormaster/worker/HarbormasterLogWorker.php b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
new file mode 100644
index 0000000000..a55420bc2f
--- /dev/null
+++ b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
@@ -0,0 +1,50 @@
+<?php
+
+final class HarbormasterLogWorker extends HarbormasterWorker {
+
+  protected function doWork() {
+    $viewer = $this->getViewer();
+
+    $data = $this->getTaskData();
+    $log_phid = idx($data, 'logPHID');
+
+    $log = id(new HarbormasterBuildLogQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($log_phid))
+      ->executeOne();
+    if (!$log) {
+      throw new PhabricatorWorkerPermanentFailureException(
+        pht('Invalid build log PHID "%s".', $log_phid));
+    }
+
+    $phid_key = PhabricatorHash::digestToLength($log_phid, 14);
+    $lock_key = "build.log({$phid_key})";
+    $lock = PhabricatorGlobalLock::newLock($lock_key);
+
+    try {
+      $lock->lock();
+    } catch (PhutilLockException $ex) {
+      throw new PhabricatorWorkerYieldException(15);
+    }
+
+    $caught = null;
+    try {
+      $this->finalizeBuildLog($log);
+    } catch (Exception $ex) {
+      $caught = $ex;
+    }
+
+    $lock->unlock();
+
+    if ($caught) {
+      throw $caught;
+    }
+  }
+
+  private function finalizeBuildLog(HarbormasterBuildLog $log) {
+    if ($log->canCompressLog()) {
+      $log->compressLog();
+    }
+  }
+
+}

From 8a2604cf06a8f3d2178c1311b8aa25917ad27a1d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 18:22:59 -0800
Subject: [PATCH 620/865] Add a "filePHID" to HarbormasterBuildLog and copy
 logs into Files during finalization

Summary: Depends on D19131. Ref T13088. During log finalization, stream the log into Files to support "Download Log", archive to Files, and API access.

Test Plan: Ran `write-log` and `rebuild-log`, saw Files objects generate with log content and appropriate permissions.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19132
---
 .../autopatches/20180222.log.01.filephid.sql  |  2 +
 src/__phutil_library_map__.php                |  2 +
 ...rbormasterManagementRebuildLogWorkflow.php | 54 ++++++++++++++
 ...HarbormasterManagementWriteLogWorkflow.php |  8 ++-
 .../phid/HarbormasterBuildLogPHIDType.php     |  2 +
 .../storage/build/HarbormasterBuildLog.php    | 16 +++--
 .../HarbormasterBuildLogChunkIterator.php     | 12 +++-
 .../worker/HarbormasterLogWorker.php          | 70 ++++++++++++++++---
 8 files changed, 148 insertions(+), 18 deletions(-)
 create mode 100644 resources/sql/autopatches/20180222.log.01.filephid.sql
 create mode 100644 src/applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php

diff --git a/resources/sql/autopatches/20180222.log.01.filephid.sql b/resources/sql/autopatches/20180222.log.01.filephid.sql
new file mode 100644
index 0000000000..a7ef2f2b3e
--- /dev/null
+++ b/resources/sql/autopatches/20180222.log.01.filephid.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildlog
+  ADD filePHID VARBINARY(64);
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index d43f386009..f22f7f6730 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1309,6 +1309,7 @@
     'HarbormasterLogWorker' => 'applications/harbormaster/worker/HarbormasterLogWorker.php',
     'HarbormasterManagementArchiveLogsWorkflow' => 'applications/harbormaster/management/HarbormasterManagementArchiveLogsWorkflow.php',
     'HarbormasterManagementBuildWorkflow' => 'applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php',
+    'HarbormasterManagementRebuildLogWorkflow' => 'applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php',
     'HarbormasterManagementRestartWorkflow' => 'applications/harbormaster/management/HarbormasterManagementRestartWorkflow.php',
     'HarbormasterManagementUpdateWorkflow' => 'applications/harbormaster/management/HarbormasterManagementUpdateWorkflow.php',
     'HarbormasterManagementWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWorkflow.php',
@@ -6614,6 +6615,7 @@
     'HarbormasterLogWorker' => 'HarbormasterWorker',
     'HarbormasterManagementArchiveLogsWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementBuildWorkflow' => 'HarbormasterManagementWorkflow',
+    'HarbormasterManagementRebuildLogWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementRestartWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementUpdateWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementWorkflow' => 'PhabricatorManagementWorkflow',
diff --git a/src/applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php
new file mode 100644
index 0000000000..8644bb4515
--- /dev/null
+++ b/src/applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php
@@ -0,0 +1,54 @@
+<?php
+
+final class HarbormasterManagementRebuildLogWorkflow
+  extends HarbormasterManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('rebuild-log')
+      ->setExamples('**rebuild-log** --id __id__ [__options__]')
+      ->setSynopsis(
+        pht(
+          'Rebuild the file and summary for a log. This is primarily '.
+          'intended to make it easier to develop new log summarizers.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'id',
+            'param' => 'id',
+            'help' => pht('Log to rebuild.'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+
+    $log_id = $args->getArg('id');
+    if (!$log_id) {
+      throw new PhutilArgumentUsageException(
+        pht('Choose a build log to rebuild with "--id".'));
+    }
+
+    $log = id(new HarbormasterBuildLogQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($log_id))
+      ->executeOne();
+    if (!$log) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Unable to load build log "%s".',
+          $log_id));
+    }
+
+    PhabricatorWorker::setRunAllTasksInProcess(true);
+    $log->scheduleRebuild(true);
+
+    echo tsprintf(
+      "%s\n",
+      pht('Done.'));
+
+    return 0;
+  }
+
+}
diff --git a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
index b20204670b..367fe4fc78 100644
--- a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
+++ b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
@@ -7,14 +7,16 @@ protected function didConstruct() {
     $this
       ->setName('write-log')
       ->setExamples('**write-log** --target __id__ [__options__]')
-      ->setSynopsis(pht('Write a new Harbormaster build log.'))
+      ->setSynopsis(
+        pht(
+          'Write a new Harbormaster build log. This is primarily intended '.
+          'to make development and testing easier.'))
       ->setArguments(
         array(
           array(
             'name' => 'target',
             'param' => 'id',
-            'help' => pht(
-              'Build Target ID to attach the log to.'),
+            'help' => pht('Build Target ID to attach the log to.'),
           ),
         ));
   }
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
index c0fba81c43..dd110556b1 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
@@ -31,6 +31,8 @@ public function loadHandles(
 
     foreach ($handles as $phid => $handle) {
       $build_log = $objects[$phid];
+
+      $handle->setName(pht('Build Log %d', $build_log->getID()));
     }
   }
 
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 2826f445de..ca8f0bb9d5 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -9,12 +9,13 @@ final class HarbormasterBuildLog
   protected $logType;
   protected $duration;
   protected $live;
+  protected $filePHID;
 
   private $buildTarget = self::ATTACHABLE;
   private $rope;
   private $isOpen;
 
-  const CHUNK_BYTE_LIMIT = 102400;
+  const CHUNK_BYTE_LIMIT = 1048576;
 
   public function __construct() {
     $this->rope = new PhutilRope();
@@ -60,19 +61,23 @@ public function closeBuildLog() {
       ->setLive(0)
       ->save();
 
+    $this->scheduleRebuild(false);
+
+    return $this;
+  }
+
+  public function scheduleRebuild($force) {
     PhabricatorWorker::scheduleTask(
       'HarbormasterLogWorker',
       array(
         'logPHID' => $this->getPHID(),
+        'force' => $force,
       ),
       array(
         'objectPHID' => $this->getPHID(),
       ));
-
-    return $this;
   }
 
-
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
@@ -85,6 +90,7 @@ protected function getConfiguration() {
         'duration' => 'uint32?',
 
         'live' => 'bool',
+        'filePHID' => 'phid?',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_buildtarget' => array(
@@ -180,7 +186,7 @@ private function flush() {
 
   public function newChunkIterator() {
     return id(new HarbormasterBuildLogChunkIterator($this))
-      ->setPageSize(32);
+      ->setPageSize(8);
   }
 
   private function loadLastChunkInfo() {
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLogChunkIterator.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLogChunkIterator.php
index 754248cc67..514ad7013c 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLogChunkIterator.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLogChunkIterator.php
@@ -5,6 +5,7 @@ final class HarbormasterBuildLogChunkIterator
 
   private $log;
   private $cursor;
+  private $asString;
 
   private $min = 0;
   private $max = PHP_INT_MAX;
@@ -27,6 +28,11 @@ public function setRange($min, $max) {
     return $this;
   }
 
+  public function setAsString($as_string) {
+    $this->asString = $as_string;
+    return $this;
+  }
+
   protected function loadPage() {
     if ($this->cursor > $this->max) {
       return array();
@@ -43,7 +49,11 @@ protected function loadPage() {
       $this->cursor = last($results)->getID() + 1;
     }
 
-    return $results;
+    if ($this->asString) {
+      return mpull($results, 'getChunkDisplayText');
+    } else {
+      return $results;
+    }
   }
 
 }
diff --git a/src/applications/harbormaster/worker/HarbormasterLogWorker.php b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
index a55420bc2f..8eef7a6b6e 100644
--- a/src/applications/harbormaster/worker/HarbormasterLogWorker.php
+++ b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
@@ -8,15 +8,6 @@ protected function doWork() {
     $data = $this->getTaskData();
     $log_phid = idx($data, 'logPHID');
 
-    $log = id(new HarbormasterBuildLogQuery())
-      ->setViewer($viewer)
-      ->withPHIDs(array($log_phid))
-      ->executeOne();
-    if (!$log) {
-      throw new PhabricatorWorkerPermanentFailureException(
-        pht('Invalid build log PHID "%s".', $log_phid));
-    }
-
     $phid_key = PhabricatorHash::digestToLength($log_phid, 14);
     $lock_key = "build.log({$phid_key})";
     $lock = PhabricatorGlobalLock::newLock($lock_key);
@@ -29,6 +20,25 @@ protected function doWork() {
 
     $caught = null;
     try {
+      $log = id(new HarbormasterBuildLogQuery())
+        ->setViewer($viewer)
+        ->withPHIDs(array($log_phid))
+        ->executeOne();
+      if (!$log) {
+        throw new PhabricatorWorkerPermanentFailureException(
+          pht(
+            'Invalid build log PHID "%s".',
+            $log_phid));
+      }
+
+      if ($log->getLive()) {
+        throw new PhabricatorWorkerPermanentFailureException(
+          pht(
+            'Log "%s" is still live. Logs can not be finalized until '.
+            'they have closed.',
+            $log_phid));
+      }
+
       $this->finalizeBuildLog($log);
     } catch (Exception $ex) {
       $caught = $ex;
@@ -42,9 +52,51 @@ protected function doWork() {
   }
 
   private function finalizeBuildLog(HarbormasterBuildLog $log) {
+    $viewer = $this->getViewer();
+
+    $data = $this->getTaskData();
+    $is_force = idx($data, 'force');
+
     if ($log->canCompressLog()) {
       $log->compressLog();
     }
+
+    if ($is_force) {
+      $file_phid = $log->getFilePHID();
+      if ($file_phid) {
+        $file = id(new PhabricatorFileQuery())
+          ->setViewer($viewer)
+          ->withPHIDs(array($file_phid))
+          ->executeOne();
+        if ($file) {
+          id(new PhabricatorDestructionEngine())
+            ->destroyObject($file);
+        }
+        $log
+          ->setFilePHID(null)
+          ->save();
+      }
+    }
+
+    if (!$log->getFilePHID()) {
+      $iterator = $log->newChunkIterator()
+        ->setAsString(true);
+
+      $source = id(new PhabricatorIteratorFileUploadSource())
+        ->setName('harbormaster-log-'.$log->getID().'.log')
+        ->setViewPolicy(PhabricatorPolicies::POLICY_NOONE)
+        ->setMIMEType('application/octet-stream')
+        ->setIterator($iterator);
+
+      $file = $source->uploadFile();
+
+      $file->attachToObject($log->getPHID());
+
+      $log
+        ->setFilePHID($file->getPHID())
+        ->save();
+    }
+
   }
 
 }

From 9b4295ed6051aff6bcef406db3ea75b9f41e32eb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 19:16:45 -0800
Subject: [PATCH 621/865] Add a very basic standalone view for build logs with
 a "Download Log" button

Summary: Depends on D19132. Ref T13088. This implements an extremely skeletal dedicated log page with a more-or-less functional "Download Log" button.

Test Plan: Downloaded a recent log. Tried to download an old (un-finalized) log, couldn't. Used `bin/harbormaster write-log` to get a convenient standalone link to a log.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19133
---
 src/__phutil_library_map__.php                |  6 ++
 .../PhabricatorHarbormasterApplication.php    |  4 ++
 ...HarbormasterBuildLogDownloadController.php | 62 +++++++++++++++++++
 .../HarbormasterBuildLogViewController.php    | 44 +++++++++++++
 ...HarbormasterManagementWriteLogWorkflow.php |  7 ++-
 .../phid/HarbormasterBuildLogPHIDType.php     |  4 +-
 .../storage/build/HarbormasterBuildLog.php    |  5 ++
 .../view/HarbormasterBuildLogView.php         | 45 ++++++++++++++
 8 files changed, 175 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php
 create mode 100644 src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
 create mode 100644 src/applications/harbormaster/view/HarbormasterBuildLogView.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f22f7f6730..451305d7fb 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1227,8 +1227,11 @@
     'HarbormasterBuildLog' => 'applications/harbormaster/storage/build/HarbormasterBuildLog.php',
     'HarbormasterBuildLogChunk' => 'applications/harbormaster/storage/build/HarbormasterBuildLogChunk.php',
     'HarbormasterBuildLogChunkIterator' => 'applications/harbormaster/storage/build/HarbormasterBuildLogChunkIterator.php',
+    'HarbormasterBuildLogDownloadController' => 'applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php',
     'HarbormasterBuildLogPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php',
     'HarbormasterBuildLogQuery' => 'applications/harbormaster/query/HarbormasterBuildLogQuery.php',
+    'HarbormasterBuildLogView' => 'applications/harbormaster/view/HarbormasterBuildLogView.php',
+    'HarbormasterBuildLogViewController' => 'applications/harbormaster/controller/HarbormasterBuildLogViewController.php',
     'HarbormasterBuildMessage' => 'applications/harbormaster/storage/HarbormasterBuildMessage.php',
     'HarbormasterBuildMessageQuery' => 'applications/harbormaster/query/HarbormasterBuildMessageQuery.php',
     'HarbormasterBuildPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildPHIDType.php',
@@ -6511,8 +6514,11 @@
     ),
     'HarbormasterBuildLogChunk' => 'HarbormasterDAO',
     'HarbormasterBuildLogChunkIterator' => 'PhutilBufferedIterator',
+    'HarbormasterBuildLogDownloadController' => 'HarbormasterController',
     'HarbormasterBuildLogPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'HarbormasterBuildLogView' => 'AphrontView',
+    'HarbormasterBuildLogViewController' => 'HarbormasterController',
     'HarbormasterBuildMessage' => array(
       'HarbormasterDAO',
       'PhabricatorPolicyInterface',
diff --git a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
index ed164b2d3b..b4f62d8e22 100644
--- a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
+++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
@@ -96,6 +96,10 @@ public function getRoutes() {
           'circleci/' => 'HarbormasterCircleCIHookController',
           'buildkite/' => 'HarbormasterBuildkiteHookController',
         ),
+        'log/' => array(
+          'view/(?P<id>\d+)/' => 'HarbormasterBuildLogViewController',
+          'download/(?P<id>\d+)/' => 'HarbormasterBuildLogDownloadController',
+        ),
       ),
     );
   }
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php
new file mode 100644
index 0000000000..6bdd04edc3
--- /dev/null
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php
@@ -0,0 +1,62 @@
+<?php
+
+final class HarbormasterBuildLogDownloadController
+  extends HarbormasterController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $request = $this->getRequest();
+    $viewer = $request->getUser();
+
+    $id = $request->getURIData('id');
+
+    $log = id(new HarbormasterBuildLogQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($id))
+      ->executeOne();
+    if (!$log) {
+      return new Aphront404Response();
+    }
+
+    $cancel_uri = $log->getURI();
+    $file_phid = $log->getFilePHID();
+
+    if (!$file_phid) {
+      return $this->newDialog()
+        ->setTitle(pht('Log Not Finalized'))
+        ->appendParagraph(
+          pht(
+            'Logs must be fully written and processed before they can be '.
+            'downloaded. This log is still being written or processed.'))
+        ->addCancelButton($cancel_uri, pht('Wait Patiently'));
+    }
+
+    $file = id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($file_phid))
+      ->executeOne();
+    if (!$file) {
+      return $this->newDialog()
+        ->setTitle(pht('Unable to Load File'))
+        ->appendParagraph(
+          pht(
+            'Unable to load the file for this log. The file may have been '.
+            'destroyed.'))
+        ->addCancelButton($cancel_uri);
+    }
+
+    $size = $file->getByteSize();
+
+    return $this->newDialog()
+      ->setTitle(pht('Download Build Log'))
+      ->appendParagraph(
+        pht(
+          'This log has a total size of %s. If you insist, you may '.
+          'download it.',
+          phutil_tag('strong', array(), phutil_format_bytes($size))))
+      ->setDisableWorkflowOnSubmit(true)
+      ->addSubmitButton(pht('Download Log'))
+      ->setSubmitURI($file->getDownloadURI())
+      ->addCancelButton($cancel_uri, pht('Done'));
+  }
+
+}
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
new file mode 100644
index 0000000000..084c48d1f1
--- /dev/null
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
@@ -0,0 +1,44 @@
+<?php
+
+final class HarbormasterBuildLogViewController
+  extends HarbormasterController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $request = $this->getRequest();
+    $viewer = $request->getUser();
+
+    $id = $request->getURIData('id');
+
+    $log = id(new HarbormasterBuildLogQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($id))
+      ->executeOne();
+    if (!$log) {
+      return new Aphront404Response();
+    }
+
+    $page_title = pht('Build Log %d', $log->getID());
+
+    $log_view = id(new HarbormasterBuildLogView())
+      ->setViewer($viewer)
+      ->setBuildLog($log);
+
+    $crumbs = $this->buildApplicationCrumbs()
+      ->addTextCrumb(pht('Build Logs'))
+      ->addTextCrumb($page_title)
+      ->setBorder(true);
+
+    $page_header = id(new PHUIHeaderView())
+      ->setHeader($page_title);
+
+    $page_view = id(new PHUITwoColumnView())
+      ->setHeader($page_header)
+      ->setFooter($log_view);
+
+    return $this->newPage()
+      ->setTitle($page_title)
+      ->setCrumbs($crumbs)
+      ->appendChild($page_view);
+  }
+
+}
diff --git a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
index 367fe4fc78..b680b382aa 100644
--- a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
+++ b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
@@ -44,9 +44,14 @@ public function execute(PhutilArgumentParser $args) {
     $log = HarbormasterBuildLog::initializeNewBuildLog($target);
     $log->openBuildLog();
 
+    echo tsprintf(
+      "%s\n\n        __%s__\n\n",
+      pht('Opened a new build log:'),
+      PhabricatorEnv::getURI($log->getURI()));
+
     echo tsprintf(
       "%s\n",
-      pht('Reading log from stdin...'));
+      pht('Reading log content from stdin...'));
 
     $content = file_get_contents('php://stdin');
     $log->append($content);
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
index dd110556b1..a2fa58fe79 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
@@ -32,7 +32,9 @@ public function loadHandles(
     foreach ($handles as $phid => $handle) {
       $build_log = $objects[$phid];
 
-      $handle->setName(pht('Build Log %d', $build_log->getID()));
+      $handle
+        ->setName(pht('Build Log %d', $build_log->getID()))
+        ->setURI($build_log->getURI());
     }
   }
 
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index ca8f0bb9d5..17249313eb 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -290,6 +290,11 @@ private function writeChunk($encoding, $raw_size, $data) {
       ->save();
   }
 
+  public function getURI() {
+    $id = $this->getID();
+    return "/harbormaster/log/view/{$id}/";
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/harbormaster/view/HarbormasterBuildLogView.php b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
new file mode 100644
index 0000000000..7543524285
--- /dev/null
+++ b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
@@ -0,0 +1,45 @@
+<?php
+
+final class HarbormasterBuildLogView extends AphrontView {
+
+  private $log;
+
+  public function setBuildLog(HarbormasterBuildLog $log) {
+    $this->log = $log;
+    return $this;
+  }
+
+  public function getBuildLog() {
+    return $this->log;
+  }
+
+  public function render() {
+    $viewer = $this->getViewer();
+    $log = $this->getBuildLog();
+    $id = $log->getID();
+
+    $header = id(new PHUIHeaderView())
+      ->setViewer($viewer)
+      ->setHeader(pht('Build Log %d', $id));
+
+    $download_uri = "/harbormaster/log/download/{$id}/";
+
+    $download_button = id(new PHUIButtonView())
+      ->setTag('a')
+      ->setHref($download_uri)
+      ->setIcon('fa-download')
+      ->setDisabled(!$log->getFilePHID())
+      ->setWorkflow(true)
+      ->setText(pht('Download Log'));
+
+    $header->addActionLink($download_button);
+
+    $box_view = id(new PHUIObjectBoxView())
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setHeader($header)
+      ->appendChild('...');
+
+    return $box_view;
+  }
+
+}

From e920e2b143a2d12b1bbafabcc7ec0a282e54e322 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Feb 2018 05:12:57 -0800
Subject: [PATCH 622/865] Implement DestructibleInterface on BuildLog

Summary: Depends on D19133. Ref T13088. Allows build logs to be formally destroyed, cleaning up their chunks and file data.

Test Plan:
  - Used `bin/remove destroy` to destroy a log, verified chunks and files were removed.
  - Used `bin/harbormaster rebuild-log` to force a log to rebuild, verified files were destroyed and regenerated.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19134
---
 src/__phutil_library_map__.php                |  1 +
 .../storage/build/HarbormasterBuildLog.php    | 54 ++++++++++++++++++-
 .../worker/HarbormasterLogWorker.php          | 15 +-----
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 451305d7fb..be9cb258cc 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -6511,6 +6511,7 @@
     'HarbormasterBuildLog' => array(
       'HarbormasterDAO',
       'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'HarbormasterBuildLogChunk' => 'HarbormasterDAO',
     'HarbormasterBuildLogChunkIterator' => 'PhutilBufferedIterator',
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 17249313eb..8b8fac48f2 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -2,7 +2,9 @@
 
 final class HarbormasterBuildLog
   extends HarbormasterDAO
-  implements PhabricatorPolicyInterface {
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface {
 
   protected $buildTargetPHID;
   protected $logSource;
@@ -317,7 +319,55 @@ public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
 
   public function describeAutomaticCapability($capability) {
     return pht(
-      "Users must be able to see a build target to view it's build log.");
+      'Users must be able to see a build target to view its build log.');
+  }
+
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $this->destroyFile($engine);
+    $this->destroyChunks();
+    $this->delete();
+  }
+
+  public function destroyFile(PhabricatorDestructionEngine $engine = null) {
+    if (!$engine) {
+      $engine = new PhabricatorDestructionEngine();
+    }
+
+    $file_phid = $this->getFilePHID();
+    if ($file_phid) {
+      $viewer = $engine->getViewer();
+      $file = id(new PhabricatorFileQuery())
+        ->setViewer($viewer)
+        ->withPHIDs(array($file_phid))
+        ->executeOne();
+      if ($file) {
+        $engine->destroyObject($file);
+      }
+    }
+
+    $this->setFilePHID(null);
+
+    return $this;
+  }
+
+  public function destroyChunks() {
+    $chunk = new HarbormasterBuildLogChunk();
+    $conn = $chunk->establishConnection('w');
+
+    // Just delete the chunks directly so we don't have to pull the data over
+    // the wire for large logs.
+    queryfx(
+      $conn,
+      'DELETE FROM %T WHERE logID = %d',
+      $chunk->getTableName(),
+      $this->getID());
+
+    return $this;
   }
 
 
diff --git a/src/applications/harbormaster/worker/HarbormasterLogWorker.php b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
index 8eef7a6b6e..615781da66 100644
--- a/src/applications/harbormaster/worker/HarbormasterLogWorker.php
+++ b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
@@ -62,20 +62,7 @@ private function finalizeBuildLog(HarbormasterBuildLog $log) {
     }
 
     if ($is_force) {
-      $file_phid = $log->getFilePHID();
-      if ($file_phid) {
-        $file = id(new PhabricatorFileQuery())
-          ->setViewer($viewer)
-          ->withPHIDs(array($file_phid))
-          ->executeOne();
-        if ($file) {
-          id(new PhabricatorDestructionEngine())
-            ->destroyObject($file);
-        }
-        $log
-          ->setFilePHID(null)
-          ->save();
-      }
+      $log->destroyFile();
     }
 
     if (!$log->getFilePHID()) {

From d152bd58360884f41105dc642225492730b536ac Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Feb 2018 05:32:51 -0800
Subject: [PATCH 623/865] Manage log locks on the Log object to prepare for
 multiple writers

Summary:
Depends on D19134. Ref T13088. Future changes will support API writers, so push the log lock into the Log object.

Allow open/close ("this process is writing to this log") to be separate from live/final ("this log is still generating more data").

Test Plan: Wrote logs with `bin/harbormater write-log` and updated logs with `bin/harbormaster rebuild-log`.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19135
---
 .../storage/build/HarbormasterBuildLog.php    | 261 +++++++++++-------
 .../worker/HarbormasterLogWorker.php          |  26 +-
 2 files changed, 174 insertions(+), 113 deletions(-)

diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 8b8fac48f2..0ae4446837 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -16,6 +16,7 @@ final class HarbormasterBuildLog
   private $buildTarget = self::ATTACHABLE;
   private $rope;
   private $isOpen;
+  private $lock;
 
   const CHUNK_BYTE_LIMIT = 1048576;
 
@@ -27,6 +28,12 @@ public function __destruct() {
     if ($this->isOpen) {
       $this->closeBuildLog();
     }
+
+    if ($this->lock) {
+      if ($this->lock->isLocked()) {
+        $this->lock->unlock();
+      }
+    }
   }
 
   public static function initializeNewBuildLog(
@@ -35,37 +42,7 @@ public static function initializeNewBuildLog(
     return id(new HarbormasterBuildLog())
       ->setBuildTargetPHID($build_target->getPHID())
       ->setDuration(null)
-      ->setLive(0);
-  }
-
-  public function openBuildLog() {
-    if ($this->isOpen) {
-      throw new Exception(pht('This build log is already open!'));
-    }
-
-    $this->isOpen = true;
-
-    return $this
-      ->setLive(1)
-      ->save();
-  }
-
-  public function closeBuildLog() {
-    if (!$this->isOpen) {
-      throw new Exception(pht('This build log is not open!'));
-    }
-
-    $start = $this->getDateCreated();
-    $now = PhabricatorTime::getNow();
-
-    $this
-      ->setDuration($now - $start)
-      ->setLive(0)
-      ->save();
-
-    $this->scheduleRebuild(false);
-
-    return $this;
+      ->setLive(1);
   }
 
   public function scheduleRebuild($force) {
@@ -120,72 +97,6 @@ public function getName() {
     return pht('Build Log');
   }
 
-  public function append($content) {
-    if (!$this->getLive()) {
-      throw new PhutilInvalidStateException('openBuildLog');
-    }
-
-    $content = (string)$content;
-
-    $this->rope->append($content);
-    $this->flush();
-
-    return $this;
-  }
-
-  private function flush() {
-
-    // TODO: Maybe don't flush more than a couple of times per second. If a
-    // caller writes a single character over and over again, we'll currently
-    // spend a lot of time flushing that.
-
-    $chunk_table = id(new HarbormasterBuildLogChunk())->getTableName();
-    $chunk_limit = self::CHUNK_BYTE_LIMIT;
-    $encoding_text = HarbormasterBuildLogChunk::CHUNK_ENCODING_TEXT;
-
-    $rope = $this->rope;
-
-    while (true) {
-      $length = $rope->getByteLength();
-      if (!$length) {
-        break;
-      }
-
-      $conn_w = $this->establishConnection('w');
-      $last = $this->loadLastChunkInfo();
-
-      $can_append =
-        ($last) &&
-        ($last['encoding'] == $encoding_text) &&
-        ($last['size'] < $chunk_limit);
-      if ($can_append) {
-        $append_id = $last['id'];
-        $prefix_size = $last['size'];
-      } else {
-        $append_id = null;
-        $prefix_size = 0;
-      }
-
-      $data_limit = ($chunk_limit - $prefix_size);
-      $append_data = $rope->getPrefixBytes($data_limit);
-      $data_size = strlen($append_data);
-
-      if ($append_id) {
-        queryfx(
-          $conn_w,
-          'UPDATE %T SET chunk = CONCAT(chunk, %B), size = %d WHERE id = %d',
-          $chunk_table,
-          $append_data,
-          $prefix_size + $data_size,
-          $append_id);
-      } else {
-        $this->writeChunk($encoding_text, $data_size, $append_data);
-      }
-
-      $rope->removeBytesFromHead($data_size);
-    }
-  }
-
   public function newChunkIterator() {
     return id(new HarbormasterBuildLogChunkIterator($this))
       ->setPageSize(8);
@@ -216,6 +127,16 @@ public function getLogText() {
     return implode('', $full_text);
   }
 
+
+  public function getURI() {
+    $id = $this->getID();
+    return "/harbormaster/log/view/{$id}/";
+  }
+
+
+/* -(  Chunks  )------------------------------------------------------------- */
+
+
   public function canCompressLog() {
     return function_exists('gzdeflate');
   }
@@ -229,6 +150,13 @@ public function decompressLog() {
   }
 
   private function processLog($mode) {
+    if (!$this->getLock()->isLocked()) {
+      throw new Exception(
+        pht(
+          'You can not process build log chunks unless the log lock is '.
+          'held.'));
+    }
+
     $chunks = $this->newChunkIterator();
 
     // NOTE: Because we're going to insert new chunks, we need to stop the
@@ -292,12 +220,145 @@ private function writeChunk($encoding, $raw_size, $data) {
       ->save();
   }
 
-  public function getURI() {
-    $id = $this->getID();
-    return "/harbormaster/log/view/{$id}/";
+
+/* -(  Writing  )------------------------------------------------------------ */
+
+
+  public function getLock() {
+    if (!$this->lock) {
+      $phid = $this->getPHID();
+      $phid_key = PhabricatorHash::digestToLength($phid, 14);
+      $lock_key = "build.log({$phid_key})";
+      $lock = PhabricatorGlobalLock::newLock($lock_key);
+      $this->lock = $lock;
+    }
+
+    return $this->lock;
+  }
+
+
+  public function openBuildLog() {
+    if ($this->isOpen) {
+      throw new Exception(pht('This build log is already open!'));
+    }
+
+    $is_new = !$this->getID();
+    if ($is_new) {
+      $this->save();
+    }
+
+    $this->getLock()->lock();
+    $this->isOpen = true;
+
+    $this->reload();
+
+    if (!$this->getLive()) {
+      $this->setLive(1)->save();
+    }
+
+    return $this;
+  }
+
+  public function closeBuildLog($forever = true) {
+    if (!$this->isOpen) {
+      throw new Exception(
+        pht(
+          'You must openBuildLog() before you can closeBuildLog().'));
+    }
+
+    $this->flush();
+
+    if ($forever) {
+      $start = $this->getDateCreated();
+      $now = PhabricatorTime::getNow();
+
+      $this
+        ->setDuration($now - $start)
+        ->setLive(0)
+        ->save();
+    }
+
+    $this->getLock()->unlock();
+    $this->isOpen = false;
+
+    if ($forever) {
+      $this->scheduleRebuild(false);
+    }
+
+    return $this;
+  }
+
+  public function append($content) {
+    if (!$this->isOpen) {
+      throw new Exception(
+        pht(
+          'You must openBuildLog() before you can append() content to '.
+          'the log.'));
+    }
+
+    $content = (string)$content;
+
+    $this->rope->append($content);
+    $this->flush();
+
+    return $this;
+  }
+
+  private function flush() {
+
+    // TODO: Maybe don't flush more than a couple of times per second. If a
+    // caller writes a single character over and over again, we'll currently
+    // spend a lot of time flushing that.
+
+    $chunk_table = id(new HarbormasterBuildLogChunk())->getTableName();
+    $chunk_limit = self::CHUNK_BYTE_LIMIT;
+    $encoding_text = HarbormasterBuildLogChunk::CHUNK_ENCODING_TEXT;
+
+    $rope = $this->rope;
+
+    while (true) {
+      $length = $rope->getByteLength();
+      if (!$length) {
+        break;
+      }
+
+      $conn_w = $this->establishConnection('w');
+      $last = $this->loadLastChunkInfo();
+
+      $can_append =
+        ($last) &&
+        ($last['encoding'] == $encoding_text) &&
+        ($last['size'] < $chunk_limit);
+      if ($can_append) {
+        $append_id = $last['id'];
+        $prefix_size = $last['size'];
+      } else {
+        $append_id = null;
+        $prefix_size = 0;
+      }
+
+      $data_limit = ($chunk_limit - $prefix_size);
+      $append_data = $rope->getPrefixBytes($data_limit);
+      $data_size = strlen($append_data);
+
+      if ($append_id) {
+        queryfx(
+          $conn_w,
+          'UPDATE %T SET chunk = CONCAT(chunk, %B), size = %d WHERE id = %d',
+          $chunk_table,
+          $append_data,
+          $prefix_size + $data_size,
+          $append_id);
+      } else {
+        $this->writeChunk($encoding_text, $data_size, $append_data);
+      }
+
+      $rope->removeBytesFromHead($data_size);
+    }
   }
 
 
+
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
diff --git a/src/applications/harbormaster/worker/HarbormasterLogWorker.php b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
index 615781da66..b0c84b52f3 100644
--- a/src/applications/harbormaster/worker/HarbormasterLogWorker.php
+++ b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
@@ -8,9 +8,18 @@ protected function doWork() {
     $data = $this->getTaskData();
     $log_phid = idx($data, 'logPHID');
 
-    $phid_key = PhabricatorHash::digestToLength($log_phid, 14);
-    $lock_key = "build.log({$phid_key})";
-    $lock = PhabricatorGlobalLock::newLock($lock_key);
+    $log = id(new HarbormasterBuildLogQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($log_phid))
+      ->executeOne();
+    if (!$log) {
+      throw new PhabricatorWorkerPermanentFailureException(
+        pht(
+          'Invalid build log PHID "%s".',
+          $log_phid));
+    }
+
+    $lock = $log->getLock();
 
     try {
       $lock->lock();
@@ -20,16 +29,7 @@ protected function doWork() {
 
     $caught = null;
     try {
-      $log = id(new HarbormasterBuildLogQuery())
-        ->setViewer($viewer)
-        ->withPHIDs(array($log_phid))
-        ->executeOne();
-      if (!$log) {
-        throw new PhabricatorWorkerPermanentFailureException(
-          pht(
-            'Invalid build log PHID "%s".',
-            $log_phid));
-      }
+      $log->reload();
 
       if ($log->getLive()) {
         throw new PhabricatorWorkerPermanentFailureException(

From 57e3d607f566ba1cddbca5b149738632359ae80e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Feb 2018 05:48:07 -0800
Subject: [PATCH 624/865] In Harbormaster, record byte length on the build logs

Summary: Depends on D19135. Ref T13088. Denormalize the total log size onto the log itself. This makes reasoning about the log at display time easier, and we don't need to fish around in the database as much to figure out what we're dealing with.

Test Plan: Ran `bin/harbormaster rebuild-log`, saw an existing log populate. Ran `bin/harbormaster write-log`, saw new log write with proper length information.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19136
---
 .../20180223.log.01.bytelength.sql            |  2 ++
 .../storage/build/HarbormasterBuildLog.php    | 33 +++++++++++--------
 .../worker/HarbormasterLogWorker.php          | 13 ++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 resources/sql/autopatches/20180223.log.01.bytelength.sql

diff --git a/resources/sql/autopatches/20180223.log.01.bytelength.sql b/resources/sql/autopatches/20180223.log.01.bytelength.sql
new file mode 100644
index 0000000000..a4c3505628
--- /dev/null
+++ b/resources/sql/autopatches/20180223.log.01.bytelength.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildlog
+  ADD byteLength BIGINT UNSIGNED NOT NULL;
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 0ae4446837..f43f028d5d 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -12,6 +12,7 @@ final class HarbormasterBuildLog
   protected $duration;
   protected $live;
   protected $filePHID;
+  protected $byteLength;
 
   private $buildTarget = self::ATTACHABLE;
   private $rope;
@@ -42,7 +43,8 @@ public static function initializeNewBuildLog(
     return id(new HarbormasterBuildLog())
       ->setBuildTargetPHID($build_target->getPHID())
       ->setDuration(null)
-      ->setLive(1);
+      ->setLive(1)
+      ->setByteLength(0);
   }
 
   public function scheduleRebuild($force) {
@@ -70,6 +72,7 @@ protected function getConfiguration() {
 
         'live' => 'bool',
         'filePHID' => 'phid?',
+        'byteLength' => 'uint64',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_buildtarget' => array(
@@ -341,24 +344,28 @@ private function flush() {
       $append_data = $rope->getPrefixBytes($data_limit);
       $data_size = strlen($append_data);
 
-      if ($append_id) {
-        queryfx(
-          $conn_w,
-          'UPDATE %T SET chunk = CONCAT(chunk, %B), size = %d WHERE id = %d',
-          $chunk_table,
-          $append_data,
-          $prefix_size + $data_size,
-          $append_id);
-      } else {
-        $this->writeChunk($encoding_text, $data_size, $append_data);
-      }
+      $this->openTransaction();
+        if ($append_id) {
+          queryfx(
+            $conn_w,
+            'UPDATE %T SET chunk = CONCAT(chunk, %B), size = %d WHERE id = %d',
+            $chunk_table,
+            $append_data,
+            $prefix_size + $data_size,
+            $append_id);
+        } else {
+          $this->writeChunk($encoding_text, $data_size, $append_data);
+        }
+
+        $this->byteLength += $data_size;
+        $this->save();
+      $this->saveTransaction();
 
       $rope->removeBytesFromHead($data_size);
     }
   }
 
 
-
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
diff --git a/src/applications/harbormaster/worker/HarbormasterLogWorker.php b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
index b0c84b52f3..d90c2391c0 100644
--- a/src/applications/harbormaster/worker/HarbormasterLogWorker.php
+++ b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
@@ -57,6 +57,19 @@ private function finalizeBuildLog(HarbormasterBuildLog $log) {
     $data = $this->getTaskData();
     $is_force = idx($data, 'force');
 
+    if (!$log->getByteLength() || $is_force) {
+      $iterator = $log->newChunkIterator()
+        ->setAsString(true);
+
+      $byte_length = 0;
+      foreach ($iterator as $block) {
+        $byte_length += strlen($block);
+      }
+      $log
+        ->setByteLength($byte_length)
+        ->save();
+    }
+
     if ($log->canCompressLog()) {
       $log->compressLog();
     }

From 46d735d312ca8e54f9b2604783b62c360bf7a1a9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Feb 2018 05:55:52 -0800
Subject: [PATCH 625/865] Add "--all" and an explicit "--force" flag to
 `bin/harbormaster rebuild-log`

Summary: Depends on D19136. Ref T13088. Since it's probably impractical to do all the migrations these changes imply during `bin/storage upgrade`, provide some support for performing them online.

Test Plan: Ran `bin/harbormaster rebuild-log` with `--all`, `--id`, and with and without `--force`.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19137
---
 ...rbormasterManagementRebuildLogWorkflow.php | 70 ++++++++++++++++---
 1 file changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php
index 8644bb4515..1dc91bcf0f 100644
--- a/src/applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php
+++ b/src/applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php
@@ -6,7 +6,10 @@ final class HarbormasterManagementRebuildLogWorkflow
   protected function didConstruct() {
     $this
       ->setName('rebuild-log')
-      ->setExamples('**rebuild-log** --id __id__ [__options__]')
+      ->setExamples(
+        pht(
+          "**rebuild-log** --id __id__ [__options__]\n".
+          "**rebuild-log** --all"))
       ->setSynopsis(
         pht(
           'Rebuild the file and summary for a log. This is primarily '.
@@ -18,31 +21,76 @@ protected function didConstruct() {
             'param' => 'id',
             'help' => pht('Log to rebuild.'),
           ),
+          array(
+            'name' => 'all',
+            'help' => pht('Rebuild all logs.'),
+          ),
+          array(
+            'name' => 'force',
+            'help' => pht(
+              'Force logs to rebuild even if they appear to be in good '.
+              'shape already.'),
+          ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $viewer = $this->getViewer();
 
+    $is_force = $args->getArg('force');
+
     $log_id = $args->getArg('id');
-    if (!$log_id) {
+    $is_all = $args->getArg('all');
+
+    if (!$is_all && !$log_id) {
       throw new PhutilArgumentUsageException(
-        pht('Choose a build log to rebuild with "--id".'));
+        pht(
+          'Choose a build log to rebuild with "--id", or rebuild all '.
+          'logs with "--all".'));
     }
 
-    $log = id(new HarbormasterBuildLogQuery())
-      ->setViewer($viewer)
-      ->withIDs(array($log_id))
-      ->executeOne();
-    if (!$log) {
+    if ($is_all && $log_id) {
       throw new PhutilArgumentUsageException(
         pht(
-          'Unable to load build log "%s".',
-          $log_id));
+          'You can not specify both "--id" and "--all". Choose one or '.
+          'the other.'));
+    }
+
+    if ($log_id) {
+      $log = id(new HarbormasterBuildLogQuery())
+        ->setViewer($viewer)
+        ->withIDs(array($log_id))
+        ->executeOne();
+      if (!$log) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Unable to load build log "%s".',
+            $log_id));
+      }
+      $logs = array($log);
+    } else {
+      $logs = new LiskMigrationIterator(new HarbormasterBuildLog());
     }
 
     PhabricatorWorker::setRunAllTasksInProcess(true);
-    $log->scheduleRebuild(true);
+
+    foreach ($logs as $log) {
+      echo tsprintf(
+        "%s\n",
+        pht(
+          'Rebuilding log "%s"...',
+          pht('Build Log %d', $log->getID())));
+
+      try {
+        $log->scheduleRebuild($is_force);
+      } catch (Exception $ex) {
+        if ($is_all) {
+          phlog($ex);
+        } else {
+          throw $ex;
+        }
+      }
+    }
 
     echo tsprintf(
       "%s\n",

From d6311044bba66828f8e5d8898662d9dfe40e3088 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Feb 2018 06:07:14 -0800
Subject: [PATCH 626/865] Store the Harbormaster log chunk format on the log
 record

Summary: Depends on D19137. Ref T13088. This allows `rebuild-log` to skip work if the chunks are already compressed. It also prepares for a future GC which is looking for "text" or "gzip" chunks to throw away in favor of archival into Files; such a GC can use this column to find collectable logs and then write "file" to it, meaning "chunks are gone, this data is only available in Files".

Test Plan: Ran migration, saw logs populate as "text". Ran `rebuild-log`, saw logs rebuild as "gzip".

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19138
---
 .../autopatches/20180223.log.02.chunkformat.sql    |  2 ++
 .../autopatches/20180223.log.03.chunkdefault.sql   |  2 ++
 .../storage/build/HarbormasterBuildLog.php         | 14 +++++++++++++-
 .../harbormaster/worker/HarbormasterLogWorker.php  | 14 ++++++++------
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 resources/sql/autopatches/20180223.log.02.chunkformat.sql
 create mode 100644 resources/sql/autopatches/20180223.log.03.chunkdefault.sql

diff --git a/resources/sql/autopatches/20180223.log.02.chunkformat.sql b/resources/sql/autopatches/20180223.log.02.chunkformat.sql
new file mode 100644
index 0000000000..a15676a952
--- /dev/null
+++ b/resources/sql/autopatches/20180223.log.02.chunkformat.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildlog
+  ADD chunkFormat VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180223.log.03.chunkdefault.sql b/resources/sql/autopatches/20180223.log.03.chunkdefault.sql
new file mode 100644
index 0000000000..2a1f2c812b
--- /dev/null
+++ b/resources/sql/autopatches/20180223.log.03.chunkdefault.sql
@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_harbormaster.harbormaster_buildlog
+  SET chunkFormat = 'text' WHERE chunkFormat = '';
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index f43f028d5d..6b0b15d8b1 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -13,6 +13,7 @@ final class HarbormasterBuildLog
   protected $live;
   protected $filePHID;
   protected $byteLength;
+  protected $chunkFormat;
 
   private $buildTarget = self::ATTACHABLE;
   private $rope;
@@ -44,7 +45,8 @@ public static function initializeNewBuildLog(
       ->setBuildTargetPHID($build_target->getPHID())
       ->setDuration(null)
       ->setLive(1)
-      ->setByteLength(0);
+      ->setByteLength(0)
+      ->setChunkFormat(HarbormasterBuildLogChunk::CHUNK_ENCODING_TEXT);
   }
 
   public function scheduleRebuild($force) {
@@ -73,6 +75,7 @@ protected function getConfiguration() {
         'live' => 'bool',
         'filePHID' => 'phid?',
         'byteLength' => 'uint64',
+        'chunkFormat' => 'text32',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_buildtarget' => array(
@@ -105,6 +108,11 @@ public function newChunkIterator() {
       ->setPageSize(8);
   }
 
+  public function newDataIterator() {
+    return $this->newChunkIterator()
+      ->setAsString(true);
+  }
+
   private function loadLastChunkInfo() {
     $chunk_table = new HarbormasterBuildLogChunk();
     $conn_w = $chunk_table->establishConnection('w');
@@ -188,6 +196,10 @@ private function processLog($mode) {
       $this->writeEncodedChunk($rope, $byte_limit, $mode);
     }
 
+    $this
+      ->setChunkFormat($mode)
+      ->save();
+
     $this->saveTransaction();
   }
 
diff --git a/src/applications/harbormaster/worker/HarbormasterLogWorker.php b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
index d90c2391c0..fc8762de0a 100644
--- a/src/applications/harbormaster/worker/HarbormasterLogWorker.php
+++ b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
@@ -58,20 +58,23 @@ private function finalizeBuildLog(HarbormasterBuildLog $log) {
     $is_force = idx($data, 'force');
 
     if (!$log->getByteLength() || $is_force) {
-      $iterator = $log->newChunkIterator()
-        ->setAsString(true);
+      $iterator = $log->newDataIterator();
 
       $byte_length = 0;
       foreach ($iterator as $block) {
         $byte_length += strlen($block);
       }
+
       $log
         ->setByteLength($byte_length)
         ->save();
     }
 
-    if ($log->canCompressLog()) {
-      $log->compressLog();
+    $format_text = HarbormasterBuildLogChunk::CHUNK_ENCODING_TEXT;
+    if (($log->getChunkFormat() === $format_text) || $is_force) {
+      if ($log->canCompressLog()) {
+        $log->compressLog();
+      }
     }
 
     if ($is_force) {
@@ -79,8 +82,7 @@ private function finalizeBuildLog(HarbormasterBuildLog $log) {
     }
 
     if (!$log->getFilePHID()) {
-      $iterator = $log->newChunkIterator()
-        ->setAsString(true);
+      $iterator = $log->newDataIterator();
 
       $source = id(new PhabricatorIteratorFileUploadSource())
         ->setName('harbormaster-log-'.$log->getID().'.log')

From 6dc341be87088984beb6ff4a267c4deff57a0bd5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Feb 2018 07:10:18 -0800
Subject: [PATCH 627/865] As Harbormaster logs are processed, build a sparse
 map of byte offsets to line numbers

Summary:
Depends on D19138. Ref T13088. When we want to read the last part of a logfile //and show accurate line numbers//, we need to be able to get from byte offsets to line numbers somehow.

Our fundamental unit must remain byte offsets, because a test can emit an arbitrarily long line, and we should accommodate it cleanly if a test emits 2GB of the letter "A".

To support going from byte offsets to line numbers, compute a map with periodic line markers throughout the offsets of the file. From here, we can figure out the line numbers for arbitrary positions in the file with only a constant amount of work.

Test Plan: Added unit tests; ran unit tests.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19139
---
 .../autopatches/20180223.log.04.linemap.sql   |   2 +
 .../20180223.log.05.linemapdefault.sql        |   2 +
 src/__phutil_library_map__.php                |   2 +
 .../HarbormasterBuildLogTestCase.php          | 117 ++++++++++++++++
 .../storage/build/HarbormasterBuildLog.php    | 131 +++++++++++++++++-
 .../worker/HarbormasterLogWorker.php          |  13 +-
 6 files changed, 260 insertions(+), 7 deletions(-)
 create mode 100644 resources/sql/autopatches/20180223.log.04.linemap.sql
 create mode 100644 resources/sql/autopatches/20180223.log.05.linemapdefault.sql
 create mode 100644 src/applications/harbormaster/__tests__/HarbormasterBuildLogTestCase.php

diff --git a/resources/sql/autopatches/20180223.log.04.linemap.sql b/resources/sql/autopatches/20180223.log.04.linemap.sql
new file mode 100644
index 0000000000..75ed27cf7c
--- /dev/null
+++ b/resources/sql/autopatches/20180223.log.04.linemap.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildlog
+  ADD lineMap LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180223.log.05.linemapdefault.sql b/resources/sql/autopatches/20180223.log.05.linemapdefault.sql
new file mode 100644
index 0000000000..59b4dc9a62
--- /dev/null
+++ b/resources/sql/autopatches/20180223.log.05.linemapdefault.sql
@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_harbormaster.harbormaster_buildlog
+  SET lineMap = '[]' WHERE lineMap = '';
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index be9cb258cc..01407ed67b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1230,6 +1230,7 @@
     'HarbormasterBuildLogDownloadController' => 'applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php',
     'HarbormasterBuildLogPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php',
     'HarbormasterBuildLogQuery' => 'applications/harbormaster/query/HarbormasterBuildLogQuery.php',
+    'HarbormasterBuildLogTestCase' => 'applications/harbormaster/__tests__/HarbormasterBuildLogTestCase.php',
     'HarbormasterBuildLogView' => 'applications/harbormaster/view/HarbormasterBuildLogView.php',
     'HarbormasterBuildLogViewController' => 'applications/harbormaster/controller/HarbormasterBuildLogViewController.php',
     'HarbormasterBuildMessage' => 'applications/harbormaster/storage/HarbormasterBuildMessage.php',
@@ -6518,6 +6519,7 @@
     'HarbormasterBuildLogDownloadController' => 'HarbormasterController',
     'HarbormasterBuildLogPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'HarbormasterBuildLogTestCase' => 'PhabricatorTestCase',
     'HarbormasterBuildLogView' => 'AphrontView',
     'HarbormasterBuildLogViewController' => 'HarbormasterController',
     'HarbormasterBuildMessage' => array(
diff --git a/src/applications/harbormaster/__tests__/HarbormasterBuildLogTestCase.php b/src/applications/harbormaster/__tests__/HarbormasterBuildLogTestCase.php
new file mode 100644
index 0000000000..6cbdd6b0db
--- /dev/null
+++ b/src/applications/harbormaster/__tests__/HarbormasterBuildLogTestCase.php
@@ -0,0 +1,117 @@
+<?php
+
+final class HarbormasterBuildLogTestCase
+  extends PhabricatorTestCase {
+
+  public function testBuildLogLineMaps() {
+    $snowman = "\xE2\x98\x83";
+
+    $inputs = array(
+      'no_newlines.log' => array(
+        64,
+        array(
+          str_repeat('AAAAAAAA', 32),
+        ),
+        array(
+          array(64, 0),
+          array(128, 0),
+          array(192, 0),
+          array(255, 0),
+        ),
+      ),
+      'no_newlines_updated.log' => array(
+        64,
+        array_fill(0, 32, 'AAAAAAAA'),
+        array(
+          array(64, 0),
+          array(128, 0),
+          array(192, 0),
+        ),
+      ),
+      'one_newline.log' => array(
+        64,
+        array(
+          str_repeat('AAAAAAAA', 16),
+          "\n",
+          str_repeat('AAAAAAAA', 16),
+        ),
+        array(
+          array(64, 0),
+          array(127, 0),
+          array(191, 1),
+          array(255, 1),
+        ),
+      ),
+      'several_newlines.log' => array(
+        64,
+        array_fill(0, 12, "AAAAAAAAAAAAAAAAAA\n"),
+        array(
+          array(56, 2),
+          array(113, 5),
+          array(170, 8),
+          array(227, 11),
+        ),
+      ),
+      'mixed_newlines.log' => array(
+        64,
+        array(
+          str_repeat('A', 63)."\r",
+          str_repeat('A', 63)."\r\n",
+          str_repeat('A', 63)."\n",
+          str_repeat('A', 63),
+        ),
+        array(
+          array(63, 0),
+          array(127, 1),
+          array(191, 2),
+          array(255, 3),
+        ),
+      ),
+      'more_mixed_newlines.log' => array(
+        64,
+        array(
+          str_repeat('A', 63)."\r",
+          str_repeat('A', 62)."\r\n",
+          str_repeat('A', 63)."\n",
+          str_repeat('A', 63),
+        ),
+        array(
+          array(63, 0),
+          array(128, 2),
+          array(191, 2),
+          array(254, 3),
+        ),
+      ),
+      'emoji.log' => array(
+        64,
+        array(
+          str_repeat($snowman, 64),
+        ),
+        array(
+          array(63, 0),
+          array(126, 0),
+          array(189, 0),
+        ),
+      ),
+    );
+
+    foreach ($inputs as $label => $input) {
+      list($distance, $parts, $expect) = $input;
+
+      $log = id(new HarbormasterBuildLog())
+        ->setByteLength(0);
+
+      foreach ($parts as $part) {
+        $log->updateLineMap($part, $distance);
+      }
+
+      list($actual) = $log->getLineMap();
+
+      $this->assertEqual(
+        $expect,
+        $actual,
+        pht('Line Map for "%s"', $label));
+    }
+  }
+
+}
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 6b0b15d8b1..9b983f0733 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -14,6 +14,7 @@ final class HarbormasterBuildLog
   protected $filePHID;
   protected $byteLength;
   protected $chunkFormat;
+  protected $lineMap = array();
 
   private $buildTarget = self::ATTACHABLE;
   private $rope;
@@ -64,6 +65,9 @@ public function scheduleRebuild($force) {
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
+      self::CONFIG_SERIALIZATION => array(
+        'lineMap' => self::SERIALIZATION_JSON,
+      ),
       self::CONFIG_COLUMN_SCHEMA => array(
         // T6203/NULLABILITY
         // It seems like these should be non-nullable? All logs should have a
@@ -369,7 +373,8 @@ private function flush() {
           $this->writeChunk($encoding_text, $data_size, $append_data);
         }
 
-        $this->byteLength += $data_size;
+        $this->updateLineMap($append_data);
+
         $this->save();
       $this->saveTransaction();
 
@@ -377,6 +382,130 @@ private function flush() {
     }
   }
 
+  public function updateLineMap($append_data, $marker_distance = null) {
+    $this->byteLength += strlen($append_data);
+
+    if (!$marker_distance) {
+      $marker_distance = (self::CHUNK_BYTE_LIMIT / 2);
+    }
+
+    if (!$this->lineMap) {
+      $this->lineMap = array(
+        array(),
+        0,
+        0,
+        null,
+      );
+    }
+
+    list($map, $map_bytes, $line_count, $prefix) = $this->lineMap;
+
+    $buffer = $append_data;
+
+    if ($prefix) {
+      $prefix = base64_decode($prefix);
+      $buffer = $prefix.$buffer;
+    }
+
+    if ($map) {
+      list($last_marker, $last_count) = last($map);
+    } else {
+      $last_marker = 0;
+      $last_count = 0;
+    }
+
+    $max_utf8_width = 8;
+    $next_marker = $last_marker + $marker_distance;
+
+    $pos = 0;
+    $len = strlen($buffer);
+    while (true) {
+      // If we only have a few bytes left in the buffer, leave it as a prefix
+      // for next time.
+      if (($len - $pos) <= ($max_utf8_width * 2)) {
+        $prefix = substr($buffer, $pos);
+        break;
+      }
+
+      // The next slice we're going to look at is the smaller of:
+      //
+      //   - the number of bytes we need to make it to the next marker; or
+      //   - all the bytes we have left, minus one.
+
+      $slice_length = min(
+        ($marker_distance - $map_bytes),
+        ($len - $pos) - 1);
+
+      // We don't slice all the way to the end for two reasons.
+
+      // First, we want to avoid slicing immediately after a "\r" if we don't
+      // know what the next character is, because we want to make sure to
+      // count "\r\n" as a single newline, rather than counting the "\r" as
+      // a newline and then later counting the "\n" as another newline.
+
+      // Second, we don't want to slice in the middle of a UTF8 character if
+      // we can help it. We may not be able to avoid this, since the whole
+      // buffer may just be binary data, but in most cases we can backtrack
+      // a little bit and try to make it out of emoji or other legitimate
+      // multibyte UTF8 characters which appear in the log.
+
+      $min_width = max(1, $slice_length - $max_utf8_width);
+      while ($slice_length >= $min_width) {
+        $here = $buffer[$pos + ($slice_length - 1)];
+        $next = $buffer[$pos + ($slice_length - 1) + 1];
+
+        // If this is "\r" and the next character is "\n", extend the slice
+        // to include the "\n". Otherwise, we're fine to slice here since we
+        // know we're not in the middle of a UTF8 character.
+        if ($here === "\r") {
+          if ($next === "\n") {
+            $slice_length++;
+          }
+          break;
+        }
+
+        // If the next character is 0x7F or lower, or between 0xC2 and 0xF4,
+        // we're not slicing in the middle of a UTF8 character.
+        $ord = ord($next);
+        if ($ord <= 0x7F || ($ord >= 0xC2 && $ord <= 0xF4)) {
+          break;
+        }
+
+        $slice_length--;
+      }
+
+      $slice = substr($buffer, $pos, $slice_length);
+      $pos += $slice_length;
+
+      $map_bytes += $slice_length;
+      $line_count += count(preg_split("/\r\n|\r|\n/", $slice)) - 1;
+
+      if ($map_bytes >= ($marker_distance - $max_utf8_width)) {
+        $map[] = array(
+          $last_marker + $map_bytes,
+          $last_count + $line_count,
+        );
+
+        $last_count = $last_count + $line_count;
+        $line_count = 0;
+
+        $last_marker = $last_marker + $map_bytes;
+        $map_bytes = 0;
+
+        $next_marker = $last_marker + $marker_distance;
+      }
+    }
+
+    $this->lineMap = array(
+      $map,
+      $map_bytes,
+      $line_count,
+      base64_encode($prefix),
+    );
+
+    return $this;
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/harbormaster/worker/HarbormasterLogWorker.php b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
index fc8762de0a..d9d7511c27 100644
--- a/src/applications/harbormaster/worker/HarbormasterLogWorker.php
+++ b/src/applications/harbormaster/worker/HarbormasterLogWorker.php
@@ -57,17 +57,18 @@ private function finalizeBuildLog(HarbormasterBuildLog $log) {
     $data = $this->getTaskData();
     $is_force = idx($data, 'force');
 
-    if (!$log->getByteLength() || $is_force) {
+    if (!$log->getByteLength() || !$log->getLineMap() || $is_force) {
       $iterator = $log->newDataIterator();
 
-      $byte_length = 0;
+      $log
+        ->setByteLength(0)
+        ->setLineMap(array());
+
       foreach ($iterator as $block) {
-        $byte_length += strlen($block);
+        $log->updateLineMap($block);
       }
 
-      $log
-        ->setByteLength($byte_length)
-        ->save();
+      $log->save();
     }
 
     $format_text = HarbormasterBuildLogChunk::CHUNK_ENCODING_TEXT;

From 11d1dc484b867d287a258813510c395407e9151c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Feb 2018 19:35:13 -0800
Subject: [PATCH 628/865] Sort of make Harbormaster build logs page properly

Summary: Depends on D19139. Ref T13088. This doesn't actually work, but is close enough that a skilled attacker might be able to briefly deceive a small child.

Test Plan:
  - Viewed some very small logs under very controlled conditions, saw content.
  - Larger logs vaguely do something resembling working correctly.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19141
---
 resources/celerity/map.php                    |   9 +-
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorHarbormasterApplication.php    |   5 +-
 .../HarbormasterBuildLogRenderController.php  | 562 ++++++++++++++++++
 .../HarbormasterBuildLogViewController.php    |   6 +-
 .../storage/build/HarbormasterBuildLog.php    |  33 +
 .../view/HarbormasterBuildLogView.php         |  30 +-
 .../application/harbormaster/harbormaster.css |  38 ++
 .../harbormaster/behavior-harbormaster-log.js |  43 ++
 9 files changed, 721 insertions(+), 7 deletions(-)
 create mode 100644 src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
 create mode 100644 webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 01dd75c901..1361bbd12c 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -78,7 +78,7 @@
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
-    'rsrc/css/application/harbormaster/harbormaster.css' => 'f491c9f4',
+    'rsrc/css/application/harbormaster/harbormaster.css' => 'fecac64f',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'cd8d0134',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
@@ -416,6 +416,7 @@
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
+    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '0844f3c1',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
@@ -578,7 +579,7 @@
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => 'b556a948',
-    'harbormaster-css' => 'f491c9f4',
+    'harbormaster-css' => 'fecac64f',
     'herald-css' => 'cd8d0134',
     'herald-rule-editor' => 'dca75c0e',
     'herald-test-css' => 'a52e323e',
@@ -635,6 +636,7 @@
     'javelin-behavior-event-all-day' => 'b41537c9',
     'javelin-behavior-fancy-datepicker' => 'ecf4e799',
     'javelin-behavior-global-drag-and-drop' => '960f6a39',
+    'javelin-behavior-harbormaster-log' => '0844f3c1',
     'javelin-behavior-herald-rule-editor' => '7ebaeed3',
     'javelin-behavior-high-security-warning' => 'a464fe03',
     'javelin-behavior-history-install' => '7ee2b591',
@@ -960,6 +962,9 @@
       'javelin-stratcom',
       'javelin-workflow',
     ),
+    '0844f3c1' => array(
+      'javelin-behavior',
+    ),
     '08f4ccc3' => array(
       'phui-oi-list-view-css',
     ),
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 01407ed67b..3a7ba1dbbc 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1230,6 +1230,7 @@
     'HarbormasterBuildLogDownloadController' => 'applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php',
     'HarbormasterBuildLogPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php',
     'HarbormasterBuildLogQuery' => 'applications/harbormaster/query/HarbormasterBuildLogQuery.php',
+    'HarbormasterBuildLogRenderController' => 'applications/harbormaster/controller/HarbormasterBuildLogRenderController.php',
     'HarbormasterBuildLogTestCase' => 'applications/harbormaster/__tests__/HarbormasterBuildLogTestCase.php',
     'HarbormasterBuildLogView' => 'applications/harbormaster/view/HarbormasterBuildLogView.php',
     'HarbormasterBuildLogViewController' => 'applications/harbormaster/controller/HarbormasterBuildLogViewController.php',
@@ -6519,6 +6520,7 @@
     'HarbormasterBuildLogDownloadController' => 'HarbormasterController',
     'HarbormasterBuildLogPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'HarbormasterBuildLogRenderController' => 'HarbormasterController',
     'HarbormasterBuildLogTestCase' => 'PhabricatorTestCase',
     'HarbormasterBuildLogView' => 'AphrontView',
     'HarbormasterBuildLogViewController' => 'HarbormasterController',
diff --git a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
index b4f62d8e22..103e6bce69 100644
--- a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
+++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
@@ -97,7 +97,10 @@ public function getRoutes() {
           'buildkite/' => 'HarbormasterBuildkiteHookController',
         ),
         'log/' => array(
-          'view/(?P<id>\d+)/' => 'HarbormasterBuildLogViewController',
+          'view/(?P<id>\d+)/(?:\$(?P<lines>\d+(?:-\d+)?))?'
+            => 'HarbormasterBuildLogViewController',
+          'render/(?P<id>\d+)/(?:\$(?P<lines>\d+(?:-\d+)?))?'
+            => 'HarbormasterBuildLogRenderController',
           'download/(?P<id>\d+)/' => 'HarbormasterBuildLogDownloadController',
         ),
       ),
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
new file mode 100644
index 0000000000..a2322dc51d
--- /dev/null
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -0,0 +1,562 @@
+<?php
+
+final class HarbormasterBuildLogRenderController
+  extends HarbormasterController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $this->getViewer();
+
+    $id = $request->getURIData('id');
+
+    $log = id(new HarbormasterBuildLogQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($id))
+      ->executeOne();
+    if (!$log) {
+      return new Aphront404Response();
+    }
+
+    $log_size = $this->getTotalByteLength($log);
+
+    $head_lines = $request->getInt('head');
+    if ($head_lines === null) {
+      $head_lines = 8;
+    }
+    $head_lines = min($head_lines, 100);
+    $head_lines = max($head_lines, 0);
+
+    $tail_lines = $request->getInt('tail');
+    if ($tail_lines === null) {
+      $tail_lines = 16;
+    }
+    $tail_lines = min($tail_lines, 100);
+    $tail_lines = max($tail_lines, 0);
+
+    $head_offset = $request->getInt('headOffset');
+    if ($head_offset === null) {
+      $head_offset = 0;
+    }
+
+    $tail_offset = $request->getInt('tailOffset');
+    if ($tail_offset === null) {
+      $tail_offset = $log_size;
+    }
+
+    // Figure out which ranges we're actually going to read. We'll read either
+    // one range (either just at the head, or just at the tail) or two ranges
+    // (one at the head and one at the tail).
+
+    // This gets a little bit tricky because: the ranges may overlap; we just
+    // want to do one big read if there is only a little bit of text left
+    // between the ranges; we may not know where the tail range ends; and we
+    // can only read forward from line map markers, not from any arbitrary
+    // position in the file.
+
+    $bytes_per_line = 140;
+    $body_lines = 8;
+
+    $views = array();
+    if ($head_lines > 0) {
+      $views[] = array(
+        'offset' => $head_offset,
+        'lines' => $head_lines,
+        'direction' => 1,
+      );
+    }
+
+    if ($tail_lines > 0) {
+      $views[] = array(
+        'offset' => $tail_offset,
+        'lines' => $tail_lines,
+        'direction' => -1,
+      );
+    }
+
+    $reads = $views;
+    foreach ($reads as $key => $read) {
+      $offset = $read['offset'];
+
+      $lines = $read['lines'];
+
+      $read_length = 0;
+      $read_length += ($lines * $bytes_per_line);
+      $read_length += ($body_lines * $bytes_per_line);
+
+      $direction = $read['direction'];
+      if ($direction < 0) {
+        $offset -= $read_length;
+        if ($offset < 0) {
+          $offset = 0;
+          $read_length = $log_size;
+        }
+      }
+
+      $position = $log->getReadPosition($offset);
+      list($position_offset, $position_line) = $position;
+      $read_length += ($offset - $position_offset);
+
+      $reads[$key]['fetchOffset'] = $position_offset;
+      $reads[$key]['fetchLength'] = $read_length;
+      $reads[$key]['fetchLine'] = $position_line;
+    }
+
+    $reads = $this->mergeOverlappingReads($reads);
+
+    foreach ($reads as $key => $read) {
+      $data = $log->loadData($read['fetchOffset'], $read['fetchLength']);
+
+      $offset = $read['fetchOffset'];
+      $line = $read['fetchLine'];
+      $lines = $this->getLines($data);
+      $line_data = array();
+      foreach ($lines as $line_text) {
+        $length = strlen($line_text);
+        $line_data[] = array(
+          'offset' => $offset,
+          'length' => $length,
+          'line' => $line,
+          'data' => $line_text,
+        );
+        $line += 1;
+        $offset += $length;
+      }
+
+      $reads[$key]['data'] = $data;
+      $reads[$key]['lines'] = $line_data;
+    }
+
+    foreach ($views as $view_key => $view) {
+      $anchor_byte = $view['offset'];
+
+      $data_key = null;
+      foreach ($reads as $read_key => $read) {
+        $s = $read['fetchOffset'];
+        $e = $s + $read['fetchLength'];
+
+        if (($s <= $anchor_byte) && ($e >= $anchor_byte)) {
+          $data_key = $read_key;
+          break;
+        }
+      }
+
+      if ($data_key === null) {
+        throw new Exception(
+          pht('Unable to find fetch!'));
+      }
+
+      $anchor_key = null;
+      foreach ($reads[$data_key]['lines'] as $line_key => $line) {
+        $s = $line['offset'];
+        $e = $s + $line['length'];
+        if (($s <= $anchor_byte) && ($e >= $anchor_byte)) {
+          $anchor_key = $line_key;
+          break;
+        }
+      }
+
+      if ($anchor_key === null) {
+        throw new Exception(
+          pht(
+            'Unable to find lines.'));
+      }
+
+      if ($direction > 0) {
+        $slice_offset = $line_key;
+      } else {
+        $slice_offset = max(0, $line_key - ($view['lines'] - 1));
+      }
+      $slice_length = $view['lines'];
+
+      $views[$view_key] += array(
+        'sliceKey' => $data_key,
+        'sliceOffset' => $slice_offset,
+        'sliceLength' => $slice_length,
+      );
+    }
+
+    foreach ($views as $view_key => $view) {
+      $slice_key = $view['sliceKey'];
+      $lines = array_slice(
+        $reads[$slice_key]['lines'],
+        $view['sliceOffset'],
+        $view['sliceLength']);
+
+      $data_offset = null;
+      $data_length = null;
+      foreach ($lines as $line) {
+        if ($data_offset === null) {
+          $data_offset = $line['offset'];
+        }
+        $data_length += $line['length'];
+      }
+
+      // If the view cursor starts in the middle of a line, we're going to
+      // strip part of the line.
+      $direction = $view['direction'];
+      if ($direction > 0) {
+        $view_offset = $view['offset'];
+        $view_length = $data_length;
+        if ($data_offset < $view_offset) {
+          $trim = ($view_offset - $data_offset);
+          $view_length -= $trim;
+        }
+      } else {
+        $view_offset = $data_offset;
+        $view_length = $data_length;
+        if ($data_offset + $data_length > $view['offset']) {
+          $view_length -= (($data_offset + $data_length) - $view['offset']);
+        }
+      }
+
+      $views[$view_key] += array(
+        'viewOffset' => $view_offset,
+        'viewLength' => $view_length,
+      );
+    }
+
+    $views = $this->mergeOverlappingViews($views);
+
+    foreach ($views as $view_key => $view) {
+      $slice_key = $view['sliceKey'];
+      $lines = array_slice(
+        $reads[$slice_key]['lines'],
+        $view['sliceOffset'],
+        $view['sliceLength']);
+
+      $view_offset = $view['viewOffset'];
+      foreach ($lines as $line_key => $line) {
+        $line_offset = $line['offset'];
+
+        if ($line_offset >= $view_offset) {
+          break;
+        }
+
+        $trim = ($view_offset - $line_offset);
+        $line_data = substr($line['data'], $trim);
+        if (!strlen($line_data)) {
+          unset($lines[$line_key]);
+          continue;
+        }
+
+        $lines[$line_key]['data'] = $line_data;
+        $lines[$line_key]['length'] = strlen($line_data);
+        $lines[$line_key]['offset'] += $trim;
+        break;
+      }
+
+      $view_end = $view['viewOffset'] + $view['viewLength'];
+      foreach ($lines as $line_key => $line) {
+        $line_end = $line['offset'] + $line['length'];
+        if ($line_end <= $view_end) {
+          break;
+        }
+
+        $trim = ($line_end - $view_end);
+        $line_data = substr($line['data'], -$trim);
+        if (!strlen($line_data)) {
+          unset($lines[$line_key]);
+          continue;
+        }
+
+        $lines[$line_key]['data'] = $line_data;
+        $lines[$line_key]['length'] = strlen($line_data);
+      }
+
+      $views[$view_key]['viewData'] = $lines;
+    }
+
+    $spacer = null;
+    $render = array();
+    foreach ($views as $view) {
+      if ($spacer) {
+        $spacer['tail'] = $view['viewOffset'];
+        $render[] = $spacer;
+      }
+
+      $render[] = $view;
+
+      $spacer = array(
+        'spacer' => true,
+        'head' => ($view['viewOffset'] + $view['viewLength']),
+      );
+    }
+
+    $uri = $log->getURI();
+    $highlight_range = $request->getURIData('lines');
+
+    $rows = array();
+    foreach ($render as $range) {
+      if (isset($range['spacer'])) {
+        $rows[] = phutil_tag(
+          'tr',
+          array(),
+          array(
+            phutil_tag(
+              'th',
+              array(),
+              null),
+            phutil_tag(
+              'td',
+              array(),
+              array(
+                javelin_tag(
+                  'a',
+                  array(
+                    'sigil' => 'harbormaster-log-expand',
+                    'meta' => array(
+                      'headOffset' => $range['head'],
+                      'tailOffset' => $range['tail'],
+                      'head' => 4,
+                    ),
+                  ),
+                  'Show Up ^^^^'),
+                '... '.($range['tail'] - $range['head']).' bytes ...',
+                javelin_tag(
+                  'a',
+                  array(
+                    'sigil' => 'harbormaster-log-expand',
+                    'meta' => array(
+                      'headOffset' => $range['head'],
+                      'tailOffset' => $range['tail'],
+                      'tail' => 4,
+                    ),
+                  ),
+                  'Show Down VVVV'),
+              )),
+          ));
+        continue;
+      }
+
+      $lines = $range['viewData'];
+      foreach ($lines as $line) {
+        $display_line = ($line['line'] + 1);
+        $display_text = ($line['data']);
+
+        $display_line = phutil_tag(
+          'a',
+          array(
+            'href' => $uri.'$'.$display_line,
+          ),
+          $display_line);
+
+        $line_cell = phutil_tag('th', array(), $display_line);
+        $text_cell = phutil_tag('td', array(), $display_text);
+
+        $rows[] = phutil_tag(
+          'tr',
+          array(),
+          array(
+            $line_cell,
+            $text_cell,
+          ));
+      }
+    }
+
+    $table = phutil_tag(
+      'table',
+      array(
+        'class' => 'harbormaster-log-table PhabricatorMonospaced',
+      ),
+      $rows);
+
+    // When this is a normal AJAX request, return the rendered log fragment
+    // in an AJAX payload.
+    if ($request->isAjax()) {
+      return id(new AphrontAjaxResponse())
+        ->setContent(
+          array(
+            'markup' => hsprintf('%s', $table),
+          ));
+    }
+
+    // If the page is being accessed as a standalone page, present a
+    // readable version of the fragment for debugging.
+
+    require_celerity_resource('harbormaster-css');
+
+    $header = pht('Standalone Log Fragment');
+
+    $render_view = id(new PHUIObjectBoxView())
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setHeaderText($header)
+      ->appendChild($table);
+
+    $page_view = id(new PHUITwoColumnView())
+      ->setFooter($render_view);
+
+    $crumbs = $this->buildApplicationCrumbs()
+      ->addTextCrumb(pht('Build Log %d', $log->getID()), $log->getURI())
+      ->addTextCrumb(pht('Fragment'))
+      ->setBorder(true);
+
+    return $this->newPage()
+      ->setTitle(
+        array(
+          pht('Build Log %d', $log->getID()),
+          pht('Standalone Fragment'),
+        ))
+      ->setCrumbs($crumbs)
+      ->appendChild($page_view);
+  }
+
+  private function getTotalByteLength(HarbormasterBuildLog $log) {
+    $total_bytes = $log->getByteLength();
+    if ($total_bytes) {
+      return (int)$total_bytes;
+    }
+
+    // TODO: Remove this after enough time has passed for installs to run
+    // log rebuilds or decide they don't care about older logs.
+
+    // Older logs don't have this data denormalized onto the log record unless
+    // an administrator has run `bin/harbormaster rebuild-log --all` or
+    // similar. Try to figure it out by summing up the size of each chunk.
+
+    // Note that the log may also be legitimately empty and have actual size
+    // zero.
+    $chunk = new HarbormasterBuildLogChunk();
+    $conn = $chunk->establishConnection('r');
+
+    $row = queryfx_one(
+      $conn,
+      'SELECT SUM(size) total FROM %T WHERE logID = %d',
+      $chunk->getTableName(),
+      $log->getID());
+
+    return (int)$row['total'];
+  }
+
+  private function getLines($data) {
+    $parts = preg_split("/(\r\n|\r|\n)/", $data, 0, PREG_SPLIT_DELIM_CAPTURE);
+
+    if (last($parts) === '') {
+      array_pop($parts);
+    }
+
+    $lines = array();
+    for ($ii = 0; $ii < count($parts); $ii += 2) {
+      $line = $parts[$ii];
+      if (isset($parts[$ii + 1])) {
+        $line .= $parts[$ii + 1];
+      }
+      $lines[] = $line;
+    }
+
+    return $lines;
+  }
+
+
+  private function mergeOverlappingReads(array $reads) {
+    // Find planned reads which will overlap and merge them into a single
+    // larger read.
+
+    $uk = array_keys($reads);
+    $vk = array_keys($reads);
+
+    foreach ($uk as $ukey) {
+      foreach ($vk as $vkey) {
+        // Don't merge a range into itself, even though they do technically
+        // overlap.
+        if ($ukey === $vkey) {
+          continue;
+        }
+
+        $uread = idx($reads, $ukey);
+        if ($uread === null) {
+          continue;
+        }
+
+        $vread = idx($reads, $vkey);
+        if ($vread === null) {
+          continue;
+        }
+
+        $us = $uread['fetchOffset'];
+        $ue = $us + $uread['fetchLength'];
+
+        $vs = $vread['fetchOffset'];
+        $ve = $vs + $vread['fetchLength'];
+
+        if (($vs > $ue) || ($ve < $us)) {
+          continue;
+        }
+
+        $min = min($us, $vs);
+        $max = max($ue, $ve);
+
+        $reads[$ukey]['fetchOffset'] = $min;
+        $reads[$ukey]['fetchLength'] = ($max - $min);
+        $reads[$ukey]['fetchLine'] = min(
+          $uread['fetchLine'],
+          $vread['fetchLine']);
+
+        unset($reads[$vkey]);
+      }
+    }
+
+    return $reads;
+  }
+
+  private function mergeOverlappingViews(array $views) {
+    $uk = array_keys($views);
+    $vk = array_keys($views);
+
+    $body_lines = 8;
+    $body_bytes = ($body_lines * 140);
+
+    foreach ($uk as $ukey) {
+      foreach ($vk as $vkey) {
+        if ($ukey === $vkey) {
+          continue;
+        }
+
+        $uview = idx($views, $ukey);
+        if ($uview === null) {
+          continue;
+        }
+
+        $vview = idx($views, $vkey);
+        if ($vview === null) {
+          continue;
+        }
+
+        // If these views don't use the same line data, don't try to
+        // merge them.
+        if ($uview['sliceKey'] != $vview['sliceKey']) {
+          continue;
+        }
+
+        // If these views are overlapping or separated by only a few bytes,
+        // merge them into a single view.
+        $us = $uview['viewOffset'];
+        $ue = $us + $uview['viewLength'];
+
+        $vs = $vview['viewOffset'];
+        $ve = $vs + $vview['viewLength'];
+
+        $uss = $uview['sliceOffset'];
+        $use = $uss + $uview['sliceLength'];
+
+        $vss = $vview['sliceOffset'];
+        $vse = $vss + $vview['sliceLength'];
+
+        if ($ue <= $vs) {
+          if (($ue + $body_bytes) >= $vs) {
+            if (($use + $body_lines) >= $vss) {
+              $views[$ukey] = array(
+                'sliceLength' => ($vse - $uss),
+                'viewLength' => ($ve - $us),
+              ) + $views[$ukey];
+
+              unset($views[$vkey]);
+              continue;
+            }
+          }
+        }
+      }
+    }
+
+    return $views;
+  }
+
+}
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
index 084c48d1f1..41f2aef8e5 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
@@ -4,8 +4,7 @@ final class HarbormasterBuildLogViewController
   extends HarbormasterController {
 
   public function handleRequest(AphrontRequest $request) {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
+    $viewer = $this->getViewer();
 
     $id = $request->getURIData('id');
 
@@ -21,7 +20,8 @@ public function handleRequest(AphrontRequest $request) {
 
     $log_view = id(new HarbormasterBuildLogView())
       ->setViewer($viewer)
-      ->setBuildLog($log);
+      ->setBuildLog($log)
+      ->setHighlightedLineRange($request->getURIData('lines'));
 
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb(pht('Build Logs'))
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 9b983f0733..64934bbea8 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -129,6 +129,30 @@ private function loadLastChunkInfo() {
       $this->getID());
   }
 
+  public function loadData($offset, $length) {
+    return substr($this->getLogText(), $offset, $length);
+  }
+
+  public function getReadPosition($read_offset) {
+    $position = array(0, 0);
+
+    $map = $this->getLineMap();
+    if (!$map) {
+      throw new Exception(pht('No line map.'));
+    }
+
+    list($map) = $map;
+    foreach ($map as $marker) {
+      list($offset, $count) = $marker;
+      if ($offset > $read_offset) {
+        break;
+      }
+      $position = $marker;
+    }
+
+    return $position;
+  }
+
   public function getLogText() {
     // TODO: Remove this method since it won't scale for big logs.
 
@@ -148,6 +172,15 @@ public function getURI() {
     return "/harbormaster/log/view/{$id}/";
   }
 
+  public function getRenderURI($lines) {
+    if (strlen($lines)) {
+      $lines = '$'.$lines;
+    }
+
+    $id = $this->getID();
+    return "/harbormaster/log/render/{$id}/{$lines}";
+  }
+
 
 /* -(  Chunks  )------------------------------------------------------------- */
 
diff --git a/src/applications/harbormaster/view/HarbormasterBuildLogView.php b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
index 7543524285..81705f3f49 100644
--- a/src/applications/harbormaster/view/HarbormasterBuildLogView.php
+++ b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
@@ -3,6 +3,7 @@
 final class HarbormasterBuildLogView extends AphrontView {
 
   private $log;
+  private $highlightedLineRange;
 
   public function setBuildLog(HarbormasterBuildLog $log) {
     $this->log = $log;
@@ -13,6 +14,15 @@ public function getBuildLog() {
     return $this->log;
   }
 
+  public function setHighlightedLineRange($range) {
+    $this->highlightedLineRange = $range;
+    return $this;
+  }
+
+  public function getHighlightedLineRange() {
+    return $this->highlightedLineRange;
+  }
+
   public function render() {
     $viewer = $this->getViewer();
     $log = $this->getBuildLog();
@@ -34,10 +44,28 @@ public function render() {
 
     $header->addActionLink($download_button);
 
+    $content_id = celerity_generate_unique_node_id();
+    $content_div = javelin_tag(
+      'div',
+      array(
+        'id' => $content_id,
+        'class' => 'harbormaster-log-view-loading',
+      ),
+      pht('Loading...'));
+
+    require_celerity_resource('harbormaster-css');
+
+    Javelin::initBehavior(
+      'harbormaster-log',
+      array(
+        'contentNodeID' => $content_id,
+        'renderURI' => $log->getRenderURI($this->getHighlightedLineRange()),
+      ));
+
     $box_view = id(new PHUIObjectBoxView())
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setHeader($header)
-      ->appendChild('...');
+      ->appendChild($content_div);
 
     return $box_view;
   }
diff --git a/webroot/rsrc/css/application/harbormaster/harbormaster.css b/webroot/rsrc/css/application/harbormaster/harbormaster.css
index 4bfd2d6cbe..f55139ade0 100644
--- a/webroot/rsrc/css/application/harbormaster/harbormaster.css
+++ b/webroot/rsrc/css/application/harbormaster/harbormaster.css
@@ -30,3 +30,41 @@
   text-overflow: ellipsis;
   color: {$lightgreytext};
 }
+
+.harbormaster-log-view-loading {
+  padding: 8px;
+  text-align: center;
+  color: {$lightgreytext};
+}
+
+.harbormaster-log-table th {
+  background-color: {$paste.highlight};
+  border-right: 1px solid {$paste.border};
+
+  -moz-user-select: -moz-none;
+  -khtml-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.harbormaster-log-table th a {
+  display: block;
+  color: {$darkbluetext};
+  text-align: right;
+  padding: 2px 6px 1px 12px;
+}
+
+.harbormaster-log-table th a:hover {
+  background: {$paste.border};
+}
+
+.harbormaster-log-table td {
+  white-space: pre-wrap;
+  padding: 2px 8px 1px;
+  width: 100%;
+}
+
+.harbormaster-log-table tr.harbormaster-log-highlighted td {
+  background: {$paste.highlight};
+}
diff --git a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
new file mode 100644
index 0000000000..d011233afd
--- /dev/null
+++ b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
@@ -0,0 +1,43 @@
+/**
+ * @provides javelin-behavior-harbormaster-log
+ * @requires javelin-behavior
+ */
+
+JX.behavior('harbormaster-log', function(config) {
+  var contentNode = JX.$(config.contentNodeID);
+
+  JX.DOM.listen(contentNode, 'click', 'harbormaster-log-expand', function(e) {
+    if (!e.isNormalClick()) {
+      return;
+    }
+
+    e.kill();
+
+    var row = e.getNode('tag:tr');
+    var data = e.getNodeData('harbormaster-log-expand');
+
+    var uri = new JX.URI(config.renderURI)
+      .addQueryParams(data);
+
+    var request = new JX.Request(uri, function(r) {
+      var result = JX.$H(r.markup).getNode();
+      var rows = JX.DOM.scry(result, 'tr');
+
+      JX.DOM.replace(row, rows);
+    });
+
+    request.send();
+  });
+
+  function onresponse(r) {
+    JX.DOM.alterClass(contentNode, 'harbormaster-log-view-loading', false);
+
+    JX.DOM.setContent(contentNode, JX.$H(r.markup));
+  }
+
+  var uri = new JX.URI(config.renderURI);
+
+  new JX.Request(uri, onresponse)
+    .send();
+
+});

From f450c6c55bfdc3680a1895842ac17765a60e3d15 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 26 Feb 2018 17:46:49 -0800
Subject: [PATCH 629/865] Fix some of the most egregious errors in Harbormaster
 log paging

Summary:
Depends on D19141. Ref T13088. Some of the fundamental log behaviors like "loading the correct rows" are now a bit better behaved.

The UI is a little less garbage, too.

Test Plan: Viewed some logs and loaded more context by clicking the buttons.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19142
---
 resources/celerity/map.php                    |  14 +-
 .../HarbormasterBuildLogRenderController.php  | 196 ++++++++++++++----
 .../application/harbormaster/harbormaster.css |  64 +++++-
 .../harbormaster/behavior-harbormaster-log.js |   4 +-
 4 files changed, 220 insertions(+), 58 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 1361bbd12c..7907d3e18f 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -78,7 +78,7 @@
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
-    'rsrc/css/application/harbormaster/harbormaster.css' => 'fecac64f',
+    'rsrc/css/application/harbormaster/harbormaster.css' => 'c7e29d9e',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'cd8d0134',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
@@ -416,7 +416,7 @@
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '0844f3c1',
+    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => 'be6974cc',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
@@ -579,7 +579,7 @@
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => 'b556a948',
-    'harbormaster-css' => 'fecac64f',
+    'harbormaster-css' => 'c7e29d9e',
     'herald-css' => 'cd8d0134',
     'herald-rule-editor' => 'dca75c0e',
     'herald-test-css' => 'a52e323e',
@@ -636,7 +636,7 @@
     'javelin-behavior-event-all-day' => 'b41537c9',
     'javelin-behavior-fancy-datepicker' => 'ecf4e799',
     'javelin-behavior-global-drag-and-drop' => '960f6a39',
-    'javelin-behavior-harbormaster-log' => '0844f3c1',
+    'javelin-behavior-harbormaster-log' => 'be6974cc',
     'javelin-behavior-herald-rule-editor' => '7ebaeed3',
     'javelin-behavior-high-security-warning' => 'a464fe03',
     'javelin-behavior-history-install' => '7ee2b591',
@@ -962,9 +962,6 @@
       'javelin-stratcom',
       'javelin-workflow',
     ),
-    '0844f3c1' => array(
-      'javelin-behavior',
-    ),
     '08f4ccc3' => array(
       'phui-oi-list-view-css',
     ),
@@ -1892,6 +1889,9 @@
       'javelin-util',
       'javelin-request',
     ),
+    'be6974cc' => array(
+      'javelin-behavior',
+    ),
     'bea6e7f4' => array(
       'javelin-install',
       'javelin-dom',
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
index a2322dc51d..c1c4275982 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -61,6 +61,7 @@ public function handleRequest(AphrontRequest $request) {
         'offset' => $head_offset,
         'lines' => $head_lines,
         'direction' => 1,
+        'limit' => $tail_offset,
       );
     }
 
@@ -69,6 +70,7 @@ public function handleRequest(AphrontRequest $request) {
         'offset' => $tail_offset,
         'lines' => $tail_lines,
         'direction' => -1,
+        'limit' => $head_offset,
       );
     }
 
@@ -128,6 +130,10 @@ public function handleRequest(AphrontRequest $request) {
     foreach ($views as $view_key => $view) {
       $anchor_byte = $view['offset'];
 
+      if ($view['direction'] < 0) {
+        $anchor_byte = $anchor_byte - 1;
+      }
+
       $data_key = null;
       foreach ($reads as $read_key => $read) {
         $s = $read['fetchOffset'];
@@ -148,7 +154,8 @@ public function handleRequest(AphrontRequest $request) {
       foreach ($reads[$data_key]['lines'] as $line_key => $line) {
         $s = $line['offset'];
         $e = $s + $line['length'];
-        if (($s <= $anchor_byte) && ($e >= $anchor_byte)) {
+
+        if (($s <= $anchor_byte) && ($e > $anchor_byte)) {
           $anchor_key = $line_key;
           break;
         }
@@ -161,9 +168,9 @@ public function handleRequest(AphrontRequest $request) {
       }
 
       if ($direction > 0) {
-        $slice_offset = $line_key;
+        $slice_offset = $anchor_key;
       } else {
-        $slice_offset = max(0, $line_key - ($view['lines'] - 1));
+        $slice_offset = max(0, $anchor_key - ($view['lines'] - 1));
       }
       $slice_length = $view['lines'];
 
@@ -200,12 +207,23 @@ public function handleRequest(AphrontRequest $request) {
           $trim = ($view_offset - $data_offset);
           $view_length -= $trim;
         }
+
+        $limit = $view['limit'];
+        if ($limit < ($view_offset + $view_length)) {
+          $view_length = ($limit - $view_offset);
+        }
       } else {
         $view_offset = $data_offset;
         $view_length = $data_length;
         if ($data_offset + $data_length > $view['offset']) {
           $view_length -= (($data_offset + $data_length) - $view['offset']);
         }
+
+        $limit = $view['limit'];
+        if ($limit > $view_offset) {
+          $view_length -= ($limit - $view_offset);
+          $view_offset = $limit;
+        }
       }
 
       $views[$view_key] += array(
@@ -232,12 +250,12 @@ public function handleRequest(AphrontRequest $request) {
         }
 
         $trim = ($view_offset - $line_offset);
-        $line_data = substr($line['data'], $trim);
-        if (!strlen($line_data)) {
+        if ($trim && ($trim >= strlen($line['data']))) {
           unset($lines[$line_key]);
           continue;
         }
 
+        $line_data = substr($line['data'], $trim);
         $lines[$line_key]['data'] = $line_data;
         $lines[$line_key]['length'] = strlen($line_data);
         $lines[$line_key]['offset'] += $trim;
@@ -248,16 +266,16 @@ public function handleRequest(AphrontRequest $request) {
       foreach ($lines as $line_key => $line) {
         $line_end = $line['offset'] + $line['length'];
         if ($line_end <= $view_end) {
-          break;
+          continue;
         }
 
         $trim = ($line_end - $view_end);
-        $line_data = substr($line['data'], -$trim);
-        if (!strlen($line_data)) {
+        if ($trim && ($trim >= strlen($line['data']))) {
           unset($lines[$line_key]);
           continue;
         }
 
+        $line_data = substr($line['data'], -$trim);
         $lines[$line_key]['data'] = $line_data;
         $lines[$line_key]['length'] = strlen($line_data);
       }
@@ -267,6 +285,17 @@ public function handleRequest(AphrontRequest $request) {
 
     $spacer = null;
     $render = array();
+
+    $head_view = head($views);
+    if ($head_view['viewOffset'] > $head_offset) {
+      $render[] = array(
+        'spacer' => true,
+        'head' => $head_offset,
+        'tail' => $head_view['viewOffset'],
+      );
+    }
+
+
     foreach ($views as $view) {
       if ($spacer) {
         $spacer['tail'] = $view['viewOffset'];
@@ -281,49 +310,22 @@ public function handleRequest(AphrontRequest $request) {
       );
     }
 
+    $tail_view = last($views);
+    if ($tail_view['viewOffset'] + $tail_view['viewLength'] < $tail_offset) {
+      $render[] = array(
+        'spacer' => true,
+        'head' => $tail_view['viewOffset'] + $tail_view['viewLength'],
+        'tail' => $tail_offset,
+      );
+    }
+
     $uri = $log->getURI();
     $highlight_range = $request->getURIData('lines');
 
     $rows = array();
     foreach ($render as $range) {
       if (isset($range['spacer'])) {
-        $rows[] = phutil_tag(
-          'tr',
-          array(),
-          array(
-            phutil_tag(
-              'th',
-              array(),
-              null),
-            phutil_tag(
-              'td',
-              array(),
-              array(
-                javelin_tag(
-                  'a',
-                  array(
-                    'sigil' => 'harbormaster-log-expand',
-                    'meta' => array(
-                      'headOffset' => $range['head'],
-                      'tailOffset' => $range['tail'],
-                      'head' => 4,
-                    ),
-                  ),
-                  'Show Up ^^^^'),
-                '... '.($range['tail'] - $range['head']).' bytes ...',
-                javelin_tag(
-                  'a',
-                  array(
-                    'sigil' => 'harbormaster-log-expand',
-                    'meta' => array(
-                      'headOffset' => $range['head'],
-                      'tailOffset' => $range['tail'],
-                      'tail' => 4,
-                    ),
-                  ),
-                  'Show Down VVVV'),
-              )),
-          ));
+        $rows[] = $this->renderExpandRow($range);
         continue;
       }
 
@@ -559,4 +561,108 @@ private function mergeOverlappingViews(array $views) {
     return $views;
   }
 
+  private function renderExpandRow($range) {
+
+    $icon_up = id(new PHUIIconView())
+      ->setIcon('fa-chevron-up');
+
+    $icon_down = id(new PHUIIconView())
+      ->setIcon('fa-chevron-down');
+
+    $up_text = array(
+      pht('Show More Above'),
+      ' ',
+      $icon_up,
+    );
+
+    $expand_up = javelin_tag(
+      'a',
+      array(
+        'sigil' => 'harbormaster-log-expand',
+        'meta' => array(
+          'headOffset' => $range['head'],
+          'tailOffset' => $range['tail'],
+          'head' => 4,
+          'tail' => 0,
+        ),
+      ),
+      $up_text);
+
+    $mid_text = pht(
+      'Show More (%s bytes Hidden)',
+      new PhutilNumber($range['tail'] - $range['head']));
+
+    $expand_mid = javelin_tag(
+      'a',
+      array(
+        'sigil' => 'harbormaster-log-expand',
+        'meta' => array(
+          'headOffset' => $range['head'],
+          'tailOffset' => $range['tail'],
+          'head' => 2,
+          'tail' => 2,
+        ),
+      ),
+      $mid_text);
+
+    $down_text = array(
+      $icon_down,
+      ' ',
+      pht('Show More Below'),
+    );
+
+    $expand_down = javelin_tag(
+      'a',
+      array(
+        'sigil' => 'harbormaster-log-expand',
+        'meta' => array(
+          'headOffset' => $range['head'],
+          'tailOffset' => $range['tail'],
+          'head' => 0,
+          'tail' => 4,
+        ),
+      ),
+      $down_text);
+
+    $expand_cells = array(
+      phutil_tag(
+        'td',
+        array(
+          'class' => 'harbormaster-log-expand-up',
+        ),
+        $expand_up),
+      phutil_tag(
+        'td',
+        array(
+          'class' => 'harbormaster-log-expand-mid',
+        ),
+        $expand_mid),
+      phutil_tag(
+        'td',
+        array(
+          'class' => 'harbormaster-log-expand-down',
+        ),
+        $expand_down),
+    );
+    $expand_row = phutil_tag('tr', array(), $expand_cells);
+    $expand_table = phutil_tag(
+      'table',
+      array(
+        'class' => 'harbormaster-log-expand-table',
+      ),
+      $expand_row);
+
+    $cells = array(
+      phutil_tag('th', array()),
+      phutil_tag(
+        'td',
+        array(
+          'class' => 'harbormaster-log-expand-cell',
+        ),
+        $expand_table),
+    );
+
+    return phutil_tag('tr', array(), $cells);
+  }
+
 }
diff --git a/webroot/rsrc/css/application/harbormaster/harbormaster.css b/webroot/rsrc/css/application/harbormaster/harbormaster.css
index f55139ade0..1c389a4383 100644
--- a/webroot/rsrc/css/application/harbormaster/harbormaster.css
+++ b/webroot/rsrc/css/application/harbormaster/harbormaster.css
@@ -37,7 +37,7 @@
   color: {$lightgreytext};
 }
 
-.harbormaster-log-table th {
+.harbormaster-log-table > tbody > tr > th {
   background-color: {$paste.highlight};
   border-right: 1px solid {$paste.border};
 
@@ -48,23 +48,77 @@
   user-select: none;
 }
 
-.harbormaster-log-table th a {
+.harbormaster-log-table > tbody > tr > th a {
   display: block;
   color: {$darkbluetext};
   text-align: right;
   padding: 2px 6px 1px 12px;
 }
 
-.harbormaster-log-table th a:hover {
+.harbormaster-log-table > tbody > tr > th a:hover {
   background: {$paste.border};
 }
 
-.harbormaster-log-table td {
+.harbormaster-log-table > tbody > tr > td {
   white-space: pre-wrap;
   padding: 2px 8px 1px;
   width: 100%;
 }
 
-.harbormaster-log-table tr.harbormaster-log-highlighted td {
+.harbormaster-log-table > tbody > tr > td.harbormaster-log-expand-cell {
+  padding: 4px 0;
+}
+
+.harbormaster-log-table tr.harbormaster-log-highlighted > td {
+  background: {$paste.highlight};
+}
+
+.harbormaster-log-expand-table {
+  width: 100%;
   background: {$paste.highlight};
+  border-top: 1px solid {$paste.border};
+  border-bottom: 1px solid {$paste.border};
+}
+
+.harbormaster-log-expand-table a {
+  display: block;
+  padding: 6px 16px;
+  color: {$darkbluetext};
+}
+
+.device-desktop .harbormaster-log-expand-table a:hover {
+  background: {$paste.border};
+  text-decoration: none;
+}
+
+.harbormaster-log-expand-table td {
+  vertical-align: middle;
+  font: 13px 'Segoe UI', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Lato',
+    'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+
+.harbormaster-log-expand-up {
+  text-align: right;
+  width: 50%;
+}
+
+.harbormaster-log-expand-up .phui-icon-view {
+  margin: 0 0 0px 4px;
+}
+
+.harbormaster-log-expand-mid {
+  text-align: center;
+  white-space: nowrap;
+  border-left: 1px solid {$paste.border};
+  border-right: 1px solid {$paste.border};
+}
+
+.harbormaster-log-expand-down {
+  text-align: left;
+  width: 50%;
+}
+
+.harbormaster-log-expand-down .phui-icon-view {
+  margin: 0 4px 0 0;
 }
diff --git a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
index d011233afd..38baca6199 100644
--- a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
+++ b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
@@ -14,6 +14,8 @@ JX.behavior('harbormaster-log', function(config) {
     e.kill();
 
     var row = e.getNode('tag:tr');
+    row = JX.DOM.findAbove(row, 'tr');
+
     var data = e.getNodeData('harbormaster-log-expand');
 
     var uri = new JX.URI(config.renderURI)
@@ -21,7 +23,7 @@ JX.behavior('harbormaster-log', function(config) {
 
     var request = new JX.Request(uri, function(r) {
       var result = JX.$H(r.markup).getNode();
-      var rows = JX.DOM.scry(result, 'tr');
+      var rows = [].slice.apply(result.firstChild.childNodes);
 
       JX.DOM.replace(row, rows);
     });

From dba4c4bdf6a850ab9f693ecebedbd0d90aad08d4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 27 Feb 2018 06:56:15 -0800
Subject: [PATCH 630/865] Emit a "Content-Security-Policy" HTTP header

Summary:
See PHI399. Ref T4340. This header provides an additional layer of protection against various attacks, including XSS attacks which embed inline `<script ...>` or `onhover="..."` content into the document.

**style-src**: The "unsafe-inline" directive affects both `style="..."` and `<style>`. We use a lot of `style="..."`, some very legitimately, so we can't realistically get away from this any time soon. We only use one `<style>` (for monospaced font preferences) but can't disable `<style>` without disabling `style="..."`.

**img-src**: We use "data:" URIs to inline small images into CSS, and there's a significant performance benefit from doing this. There doesn't seem to be a way to allow "data" URIs in CSS without allowing them in the document itself.

**script-src** and **frame-src**: For a small number of flows (Recaptcha, Stripe) we embed external javascript, some of which embeds child elements (or additional resources) into the document. We now whitelist these narrowly on the respective pages.

This won't work with Quicksand, so I've blacklisted it for now.

**connect-src**: We need to include `'self'` for AJAX to work, and any websocket URIs.

**Clickjacking**: We now have three layers of protection:

  - X-Frame-Options: works in older browsers.
  - `frame-ancestors 'none'`: does the same thing.
  - Explicit framebust in JX.Stratcom after initialization: works in ancient IE.

We could probably drop the explicit framebust but it wasn't difficult to retain.

**script tags**: We previously used an inline `<script>` tag to start Javelin. I've moved this to `<data data-javelin-init ...>` tags, which seems to work properly.

**`__DEV__`**: We previously used an inline `<script>` tag to set the `__DEV__` mode flag. I tried using the "initialization" tags for this, but they fire too late. I moved it to `<html data-developer-mode="1">`, which seems OK everywhere.

**CSP Scope**: Only the CSP header on the original request appears to matter -- you can't refine the scope by emitting headers on CSS/JS. To reduce confusion, I disabled the headers on those response types. More headers could be disabled, although we're likely already deep in the land of diminishing returns.

**Initialization**: The initialization sequence has changed slightly. Previously, we waited for the <script> in bottom of the document to evaluate. Now, we go fishing for tags when domcontentready fires.

Test Plan:
  - Browsed around in Firefox, Safari and Chrome looking for console warnings. Interacted with various Javascript behaviors. Enabled Quicksand.
  - Disabled all the framebusting, launched a clickjacking attack, verified that each layer of protection is individually effective.
  - Verified that the XHProf iframe in Darkconsole and the PHPAST frame layout work properly.
  - Enabled notifications, verified no complaints about connecting to Aphlict.
  - Hit `__DEV__` mode warnings based on the new data attribute.
  - Tried to do sketchy stuff with `data:` URIs and SVGs. This works but doesn't seem to be able to do anything dangerous.
  - Went through the Stripe and Recaptcha workflows.
  - Dumped and examined the CSP headers with `curl`, etc.
  - Added a raw <script> tag to a page (as though I'd found an XSS attack), verified it was no longer executed.

Maniphest Tasks: T4340

Differential Revision: https://secure.phabricator.com/D19143
---
 resources/celerity/map.php                    |  22 +--
 src/aphront/response/AphrontResponse.php      | 127 +++++++++++++++++-
 .../CelerityStaticResourceResponse.php        |  83 ++++++++----
 .../controller/CelerityResourceController.php |   5 +
 .../PhortuneStripePaymentProvider.php         |   8 +-
 .../control/AphrontFormRecaptchaControl.php   |  26 ++--
 src/view/page/AphrontPageView.php             |   9 +-
 src/view/page/PhabricatorBarePageView.php     |  10 +-
 src/view/page/PhabricatorStandardPageView.php |  28 +++-
 .../rsrc/externals/javelin/core/Stratcom.js   |  31 ++++-
 webroot/rsrc/externals/javelin/core/init.js   |  43 ++++--
 11 files changed, 322 insertions(+), 70 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 7907d3e18f..1f3884f8da 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '2fa91e14',
-    'core.pkg.js' => 'dc13d4b7',
+    'core.pkg.js' => '7aa5bd92',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -211,12 +211,12 @@
     'rsrc/externals/font/lato/lato-regular.woff' => '13d39fe2',
     'rsrc/externals/font/lato/lato-regular.woff2' => '57a9f742',
     'rsrc/externals/javelin/core/Event.js' => '2ee659ce',
-    'rsrc/externals/javelin/core/Stratcom.js' => '6ad39b6f',
+    'rsrc/externals/javelin/core/Stratcom.js' => '327f418a',
     'rsrc/externals/javelin/core/__tests__/event-stop-and-kill.js' => '717554e4',
     'rsrc/externals/javelin/core/__tests__/install.js' => 'c432ee85',
     'rsrc/externals/javelin/core/__tests__/stratcom.js' => '88bf7313',
     'rsrc/externals/javelin/core/__tests__/util.js' => 'e251703d',
-    'rsrc/externals/javelin/core/init.js' => '3010e992',
+    'rsrc/externals/javelin/core/init.js' => '638a4e2b',
     'rsrc/externals/javelin/core/init_node.js' => 'c234aded',
     'rsrc/externals/javelin/core/install.js' => '05270951',
     'rsrc/externals/javelin/core/util.js' => '93cc50d6',
@@ -722,7 +722,7 @@
     'javelin-install' => '05270951',
     'javelin-json' => '69adf288',
     'javelin-leader' => '7f243deb',
-    'javelin-magical-init' => '3010e992',
+    'javelin-magical-init' => '638a4e2b',
     'javelin-mask' => '8a41885b',
     'javelin-quicksand' => '6b8ef10b',
     'javelin-reactor' => '2b8de964',
@@ -735,7 +735,7 @@
     'javelin-router' => '29274e2b',
     'javelin-scrollbar' => '9065f639',
     'javelin-sound' => '949c0fe5',
-    'javelin-stratcom' => '6ad39b6f',
+    'javelin-stratcom' => '327f418a',
     'javelin-tokenizer' => '8d3bc1b2',
     'javelin-typeahead' => '70baed2f',
     'javelin-typeahead-composite-source' => '503e17fd',
@@ -1131,6 +1131,12 @@
       'javelin-dom',
       'javelin-workflow',
     ),
+    '327f418a' => array(
+      'javelin-install',
+      'javelin-event',
+      'javelin-util',
+      'javelin-magical-init',
+    ),
     '358b8c04' => array(
       'javelin-install',
       'javelin-util',
@@ -1446,12 +1452,6 @@
     '69adf288' => array(
       'javelin-install',
     ),
-    '6ad39b6f' => array(
-      'javelin-install',
-      'javelin-event',
-      'javelin-util',
-      'javelin-magical-init',
-    ),
     '6b8ef10b' => array(
       'javelin-install',
     ),
diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 6c52e417e3..47ec2e465b 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -7,9 +7,11 @@ abstract class AphrontResponse extends Phobject {
   private $canCDN;
   private $responseCode = 200;
   private $lastModified = null;
-
+  private $contentSecurityPolicyURIs;
+  private $disableContentSecurityPolicy;
   protected $frameable;
 
+
   public function setRequest($request) {
     $this->request = $request;
     return $this;
@@ -19,6 +21,32 @@ public function getRequest() {
     return $this->request;
   }
 
+  final public function addContentSecurityPolicyURI($kind, $uri) {
+    if ($this->contentSecurityPolicyURIs === null) {
+      $this->contentSecurityPolicyURIs = array(
+         'script' => array(),
+         'connect' => array(),
+         'frame' => array(),
+       );
+    }
+
+    if (!isset($this->contentSecurityPolicyURIs[$kind])) {
+      throw new Exception(
+        pht(
+          'Unknown Content-Security-Policy URI kind "%s".',
+          $kind));
+    }
+
+    $this->contentSecurityPolicyURIs[$kind][] = (string)$uri;
+
+    return $this;
+  }
+
+  final public function setDisableContentSecurityPolicy($disable) {
+    $this->disableContentSecurityPolicy = $disable;
+    return $this;
+  }
+
 
 /* -(  Content  )------------------------------------------------------------ */
 
@@ -59,9 +87,106 @@ public function getHeaders() {
       );
     }
 
+    $csp = $this->newContentSecurityPolicyHeader();
+    if ($csp !== null) {
+      $headers[] = array('Content-Security-Policy', $csp);
+    }
+
     return $headers;
   }
 
+  private function newContentSecurityPolicyHeader() {
+    if ($this->disableContentSecurityPolicy) {
+      return null;
+    }
+
+    $csp = array();
+
+    $cdn = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
+    if ($cdn) {
+      $default = $this->newContentSecurityPolicySource($cdn);
+    } else {
+      $default = "'self'";
+    }
+
+    $csp[] = "default-src {$default}";
+
+    // We use "data:" URIs to inline small images into CSS. This policy allows
+    // "data:" URIs to be used anywhere, but there doesn't appear to be a way
+    // to say that "data:" URIs are okay in CSS files but not in the document.
+    $csp[] = "img-src {$default} data:";
+
+    // We use inline style="..." attributes in various places, many of which
+    // are legitimate. We also currently use a <style> tag to implement the
+    // "Monospaced Font Preference" setting.
+    $csp[] = "style-src {$default} 'unsafe-inline'";
+
+    // On a small number of pages, including the Stripe workflow and the
+    // ReCAPTCHA challenge, we embed external Javascript directly.
+    $csp[] = $this->newContentSecurityPolicy('script', $default);
+
+    // We need to specify that we can connect to ourself in order for AJAX
+    // requests to work.
+    $csp[] = $this->newContentSecurityPolicy('connect', "'self'");
+
+    // DarkConsole and PHPAST both use frames to render some content.
+    $csp[] = $this->newContentSecurityPolicy('frame', "'self'");
+
+    // This is a more modern flavor of of "X-Frame-Options" and prevents
+    // clickjacking attacks where the page is included in a tiny iframe and
+    // the user is convinced to click a element on the page, which really
+    // clicks a dangerous button hidden under a picture of a cat.
+    if ($this->frameable) {
+      $csp[] = "frame-ancestors 'self'";
+    } else {
+      $csp[] = "frame-ancestors 'none'";
+    }
+
+    $csp = implode('; ', $csp);
+
+    return $csp;
+  }
+
+  private function newContentSecurityPolicy($type, $defaults) {
+    if ($defaults === null) {
+      $sources = array();
+    } else {
+      $sources = (array)$defaults;
+    }
+
+    $uris = $this->contentSecurityPolicyURIs;
+    if (isset($uris[$type])) {
+      foreach ($uris[$type] as $uri) {
+        $sources[] = $this->newContentSecurityPolicySource($uri);
+      }
+    }
+    $sources = array_unique($sources);
+
+    return "{$type}-src ".implode(' ', $sources);
+  }
+
+  private function newContentSecurityPolicySource($uri) {
+    // Some CSP URIs are ultimately user controlled (like notification server
+    // URIs and CDN URIs) so attempt to stop an attacker from injecting an
+    // unsafe source (like 'unsafe-eval') into the CSP header.
+
+    $uri = id(new PhutilURI($uri))
+      ->setPath(null)
+      ->setFragment(null)
+      ->setQueryParams(array());
+
+    $uri = (string)$uri;
+    if (preg_match('/[ ;\']/', $uri)) {
+      throw new Exception(
+        pht(
+          'Attempting to emit a response with an unsafe source ("%s") in the '.
+          'Content-Security-Policy header.',
+          $uri));
+    }
+
+    return $uri;
+  }
+
   public function setCacheDurationInSeconds($duration) {
     $this->cacheable = $duration;
     return $this;
diff --git a/src/applications/celerity/CelerityStaticResourceResponse.php b/src/applications/celerity/CelerityStaticResourceResponse.php
index 7db6c2741b..783dd96570 100644
--- a/src/applications/celerity/CelerityStaticResourceResponse.php
+++ b/src/applications/celerity/CelerityStaticResourceResponse.php
@@ -17,6 +17,7 @@ final class CelerityStaticResourceResponse extends Phobject {
   private $behaviors = array();
   private $hasRendered = array();
   private $postprocessorKey;
+  private $contentSecurityPolicyURIs = array();
 
   public function __construct() {
     if (isset($_REQUEST['__metablock__'])) {
@@ -37,6 +38,15 @@ public function addMetadata($metadata) {
     return $this->metadataBlock.'_'.$id;
   }
 
+  public function addContentSecurityPolicyURI($kind, $uri) {
+    $this->contentSecurityPolicyURIs[$kind][] = $uri;
+    return $this;
+  }
+
+  public function getContentSecurityPolicyURIMap() {
+    return $this->contentSecurityPolicyURIs;
+  }
+
   public function getMetadataBlock() {
     return $this->metadataBlock;
   }
@@ -196,23 +206,16 @@ private function renderResource(
         $type));
   }
 
-  public function renderHTMLFooter() {
+  public function renderHTMLFooter($is_frameable) {
     $this->metadataLocked = true;
 
-    $data = array();
-    if ($this->metadata) {
-      $json_metadata = AphrontResponse::encodeJSONForHTTPResponse(
-        $this->metadata);
-      $this->metadata = array();
-    } else {
-      $json_metadata = '{}';
-    }
-    // Even if there is no metadata on the page, Javelin uses the mergeData()
-    // call to start dispatching the event queue.
-    $data[] = 'JX.Stratcom.mergeData('.$this->metadataBlock.', '.
-                                       $json_metadata.');';
+    $merge_data = array(
+      'block' => $this->metadataBlock,
+      'data' => $this->metadata,
+    );
+    $this->metadata = array();
 
-    $onload = array();
+    $behavior_lists = array();
     if ($this->behaviors) {
       $behaviors = $this->behaviors;
       $this->behaviors = array();
@@ -241,24 +244,52 @@ public function renderHTMLFooter() {
         if (!$group) {
           continue;
         }
-        $group_json = AphrontResponse::encodeJSONForHTTPResponse(
-          $group);
-        $onload[] = 'JX.initBehaviors('.$group_json.')';
+        $behavior_lists[] = $group;
       }
     }
 
-    if ($onload) {
-      foreach ($onload as $func) {
-        $data[] = 'JX.onload(function(){'.$func.'});';
-      }
+    $initializers = array();
+
+    // Even if there is no metadata on the page, Javelin uses the mergeData()
+    // call to start dispatching the event queue, so we always want to include
+    // this initializer.
+    $initializers[] = array(
+      'kind' => 'merge',
+      'data' => $merge_data,
+    );
+
+    foreach ($behavior_lists as $behavior_list) {
+      $initializers[] = array(
+        'kind' => 'behaviors',
+        'data' => $behavior_list,
+      );
     }
 
-    if ($data) {
-      $data = implode("\n", $data);
-      return self::renderInlineScript($data);
-    } else {
-      return '';
+    if ($is_frameable) {
+      $initializers[] = array(
+        'data' => 'frameable',
+        'kind' => (bool)$is_frameable,
+      );
+    }
+
+    $tags = array();
+    foreach ($initializers as $initializer) {
+      $data = $initializer['data'];
+      if (is_array($data)) {
+        $json_data = AphrontResponse::encodeJSONForHTTPResponse($data);
+      } else {
+        $json_data = json_encode($data);
+      }
+
+      $tags[] = phutil_tag(
+        'data',
+        array(
+          'data-javelin-init-kind' => $initializer['kind'],
+          'data-javelin-init-data' => $json_data,
+        ));
     }
+
+    return $tags;
   }
 
   public static function renderInlineScript($data) {
diff --git a/src/applications/celerity/controller/CelerityResourceController.php b/src/applications/celerity/controller/CelerityResourceController.php
index 730e5ddc90..702fcefb2c 100644
--- a/src/applications/celerity/controller/CelerityResourceController.php
+++ b/src/applications/celerity/controller/CelerityResourceController.php
@@ -106,6 +106,11 @@ protected function serveResource(array $spec) {
     $response = id(new AphrontFileResponse())
       ->setMimeType($type_map[$type]);
 
+    // The "Content-Security-Policy" header has no effect on the actual
+    // resources, only on the main request. Disable it on the resource
+    // responses to limit confusion.
+    $response->setDisableContentSecurityPolicy(true);
+
     $range = AphrontRequest::getHTTPHeader('Range');
 
     if (strlen($range)) {
diff --git a/src/applications/phortune/provider/PhortuneStripePaymentProvider.php b/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
index 5adfc62e19..370f132a1f 100644
--- a/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
+++ b/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
@@ -275,12 +275,18 @@ public function renderCreatePaymentMethodForm(
     AphrontRequest $request,
     array $errors) {
 
+    $src = 'https://js.stripe.com/v2/';
+
     $ccform = id(new PhortuneCreditCardForm())
       ->setSecurityAssurance(
         pht('Payments are processed securely by Stripe.'))
       ->setUser($request->getUser())
       ->setErrors($errors)
-      ->addScript('https://js.stripe.com/v2/');
+      ->addScript($src);
+
+    CelerityAPI::getStaticResourceResponse()
+      ->addContentSecurityPolicyURI('script', $src)
+      ->addContentSecurityPolicyURI('frame', $src);
 
     Javelin::initBehavior(
       'stripe-payment-form',
diff --git a/src/view/form/control/AphrontFormRecaptchaControl.php b/src/view/form/control/AphrontFormRecaptchaControl.php
index 8c056b5bf6..b0559754e9 100644
--- a/src/view/form/control/AphrontFormRecaptchaControl.php
+++ b/src/view/form/control/AphrontFormRecaptchaControl.php
@@ -42,16 +42,24 @@ protected function renderInput() {
     $js = 'https://www.google.com/recaptcha/api.js';
     $pubkey = PhabricatorEnv::getEnvConfig('recaptcha.public-key');
 
+    CelerityAPI::getStaticResourceResponse()
+      ->addContentSecurityPolicyURI('script', $js)
+      ->addContentSecurityPolicyURI('script', 'https://www.gstatic.com/')
+      ->addContentSecurityPolicyURI('frame', 'https://www.google.com/');
+
     return array(
-      phutil_tag('div', array(
-        'class'        => 'g-recaptcha',
-        'data-sitekey' => $pubkey,
-      )),
-
-      phutil_tag('script', array(
-        'type' => 'text/javascript',
-        'src'  => $js,
-      )),
+      phutil_tag(
+        'div',
+        array(
+          'class' => 'g-recaptcha',
+          'data-sitekey' => $pubkey,
+        )),
+      phutil_tag(
+        'script',
+        array(
+          'type' => 'text/javascript',
+          'src'  => $js,
+        )),
     );
   }
 }
diff --git a/src/view/page/AphrontPageView.php b/src/view/page/AphrontPageView.php
index 8f3704dca2..d64c3b8e9b 100644
--- a/src/view/page/AphrontPageView.php
+++ b/src/view/page/AphrontPageView.php
@@ -59,9 +59,15 @@ public function render() {
       ),
       array($body, $tail));
 
+    if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
+      $data_fragment = phutil_safe_html(' data-developer-mode="1"');
+    } else {
+      $data_fragment = null;
+    }
+
     $response = hsprintf(
       '<!DOCTYPE html>'.
-      '<html>'.
+      '<html%s>'.
         '<head>'.
           '<meta charset="UTF-8" />'.
           '<title>%s</title>'.
@@ -69,6 +75,7 @@ public function render() {
         '</head>'.
         '%s'.
       '</html>',
+      $data_fragment,
       $title,
       $head,
       $body);
diff --git a/src/view/page/PhabricatorBarePageView.php b/src/view/page/PhabricatorBarePageView.php
index c9a3c5c5cd..12eabf11e4 100644
--- a/src/view/page/PhabricatorBarePageView.php
+++ b/src/view/page/PhabricatorBarePageView.php
@@ -59,11 +59,6 @@ protected function willRenderPage() {
   }
 
   protected function getHead() {
-    $framebust = null;
-    if (!$this->getFrameable()) {
-      $framebust = '(top == self) || top.location.replace(self.location.href);';
-    }
-
     $viewport_tag = null;
     if ($this->getDeviceReady()) {
       $viewport_tag = phutil_tag(
@@ -140,9 +135,8 @@ protected function getHead() {
       }
     }
 
-    $developer = PhabricatorEnv::getEnvConfig('phabricator.developer-mode');
     return hsprintf(
-      '%s%s%s%s%s%s%s%s%s',
+      '%s%s%s%s%s%s%s%s',
       $viewport_tag,
       $mask_icon,
       $icon_tag_76,
@@ -150,8 +144,6 @@ protected function getHead() {
       $icon_tag_152,
       $favicon_tag,
       $referrer_tag,
-      CelerityStaticResourceResponse::renderInlineScript(
-        $framebust.jsprintf('window.__DEV__=%d;', ($developer ? 1 : 0))),
       $response->renderResourcesOfType('css'));
   }
 
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 78ff716a44..266e6592ee 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -608,12 +608,15 @@ protected function getTail() {
         Javelin::initBehavior(
           'aphlict-listen',
           array(
-            'websocketURI'  => (string)$client_uri,
+            'websocketURI' => (string)$client_uri,
           ) + $this->buildAphlictListenConfigData());
+
+        CelerityAPI::getStaticResourceResponse()
+          ->addContentSecurityPolicyURI('connect', $client_uri);
       }
     }
 
-    $tail[] = $response->renderHTMLFooter();
+    $tail[] = $response->renderHTMLFooter($this->getFrameable());
 
     return $tail;
   }
@@ -860,6 +863,19 @@ private function getQuicksandURIPatternBlacklist() {
       $blacklist[] = $application->getQuicksandURIPatternBlacklist();
     }
 
+    // See T4340. Currently, Phortune and Auth both require pulling in external
+    // Javascript (for Stripe card management and Recaptcha, respectively).
+    // This can put us in a position where the user loads a page with a
+    // restrictive Content-Security-Policy, then uses Quicksand to navigate to
+    // a page which needs to load external scripts. For now, just blacklist
+    // these entire applications since we aren't giving up anything
+    // significant by doing so.
+
+    $blacklist[] = array(
+      '/phortune/.*',
+      '/auth/.*',
+    );
+
     return array_mergev($blacklist);
   }
 
@@ -903,9 +919,17 @@ public function produceAphrontResponse() {
         ->setContent($content);
     } else {
       $content = $this->render();
+
       $response = id(new AphrontWebpageResponse())
         ->setContent($content)
         ->setFrameable($this->getFrameable());
+
+      $static = CelerityAPI::getStaticResourceResponse();
+      foreach ($static->getContentSecurityPolicyURIMap() as $kind => $uris) {
+        foreach ($uris as $uri) {
+          $response->addContentSecurityPolicyURI($kind, $uri);
+        }
+      }
     }
 
     return $response;
diff --git a/webroot/rsrc/externals/javelin/core/Stratcom.js b/webroot/rsrc/externals/javelin/core/Stratcom.js
index 4bfb11d4fd..9ad2b8bbd0 100644
--- a/webroot/rsrc/externals/javelin/core/Stratcom.js
+++ b/webroot/rsrc/externals/javelin/core/Stratcom.js
@@ -517,6 +517,36 @@ JX.install('Stratcom', {
       return len ? this._execContext[len - 1].event : null;
     },
 
+    initialize: function(initializers) {
+      var frameable = false;
+
+      for (var ii = 0; ii < initializers.length; ii++) {
+        var kind = initializers[ii].kind;
+        var data = initializers[ii].data;
+        switch (kind) {
+          case 'behaviors':
+            JX.initBehaviors(data);
+            break;
+          case 'merge':
+            JX.Stratcom.mergeData(data.block, data.data);
+            JX.Stratcom.ready = true;
+            break;
+          case 'frameable':
+            frameable = !!data;
+            break;
+        }
+      }
+
+      // If the initializer tags did not explicitly allow framing, framebust.
+      // This protects us from clickjacking attacks on older versions of IE.
+      // The "X-Frame-Options" and "Content-Security-Policy" headers provide
+      // more modern variations of this protection.
+      if (!frameable) {
+        if (window.top != window.self) {
+          window.top.location.replace(window.self.location.href);
+        }
+      }
+    },
 
     /**
      * Merge metadata. You must call this (even if you have no metadata) to
@@ -542,7 +572,6 @@ JX.install('Stratcom', {
       } else {
         this._data[block] = data;
         if (block === 0) {
-          JX.Stratcom.ready = true;
           JX.flushHoldingQueue('install-init', function(fn) {
             fn();
           });
diff --git a/webroot/rsrc/externals/javelin/core/init.js b/webroot/rsrc/externals/javelin/core/init.js
index 88a9cf137d..fb10b0f4c3 100644
--- a/webroot/rsrc/externals/javelin/core/init.js
+++ b/webroot/rsrc/externals/javelin/core/init.js
@@ -46,25 +46,51 @@
   makeHoldingQueue('behavior');
   makeHoldingQueue('install-init');
 
-  window.__DEV__ = window.__DEV__ || 0;
-
   var loaded = false;
   var onload = [];
   var master_event_queue = [];
   var root = document.documentElement;
   var has_add_event_listener = !!root.addEventListener;
 
+  window.__DEV__ = !!root.getAttribute('data-developer-mode');
+
   JX.__rawEventQueue = function(what) {
     master_event_queue.push(what);
 
-    // Evade static analysis - JX.Stratcom
+    var ii;
     var Stratcom = JX['Stratcom'];
-    if (Stratcom && Stratcom.ready) {
-      //  Empty the queue now so that exceptions don't cause us to repeatedly
-      //  try to handle events.
+
+    if (!loaded && what.type == 'domready') {
+      var initializers = [];
+
+      var tags = JX.DOM.scry(document.body, 'data');
+      for (ii = 0; ii < tags.length; ii++) {
+
+        // Ignore tags which are not immediate children of the document
+        // body. If an attacker somehow injects arbitrary tags into the
+        // content of the document, that should not give them access to
+        // modify initialization behaviors.
+        if (tags[ii].parentNode !== document.body) {
+          continue;
+        }
+
+        var tag_kind = tags[ii].getAttribute('data-javelin-init-kind');
+        var tag_data = tags[ii].getAttribute('data-javelin-init-data');
+        tag_data = JX.JSON.parse(tag_data);
+
+        initializers.push({kind: tag_kind, data: tag_data});
+      }
+
+      Stratcom.initialize(initializers);
+      loaded = true;
+    }
+
+    if (loaded) {
+      // Empty the queue now so that exceptions don't cause us to repeatedly
+      // try to handle events.
       var local_queue = master_event_queue;
       master_event_queue = [];
-      for (var ii = 0; ii < local_queue.length; ++ii) {
+      for (ii = 0; ii < local_queue.length; ++ii) {
         var evt = local_queue[ii];
 
         // Sometimes IE gives us events which throw when ".type" is accessed;
@@ -72,11 +98,10 @@
         // figure out where these are coming from.
         try { var test = evt.type; } catch (x) { continue; }
 
-        if (!loaded && evt.type == 'domready') {
+        if (evt.type == 'domready') {
           // NOTE: Firefox interprets "document.body.id = null" as the string
           // literal "null".
           document.body && (document.body.id = '');
-          loaded = true;
           for (var jj = 0; jj < onload.length; jj++) {
             onload[jj]();
           }

From 9658249ac5a0ba6a44bb09d9ea53553df9aef120 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 27 Feb 2018 12:07:54 -0800
Subject: [PATCH 631/865] Add "Referrer-Policy: no-referrer" to standard HTTP
 headers

Summary:
Ref T4340. Some browsers respect this header and referrers are a plague upon the earth.

Also, upgrade "never" to the more modern value "no-referrer".

Test Plan:
In Safari, Firefox and Chrome, disabled `rel="noreferrer"` on links and generated a normal link to an external site. Then clicked it and checked if a referrer was sent.

  - Safari respects meta only, but "no-referrer" is fine.
  - Firefox respects both (either the header or meta tag are individually sufficient to stop referrers).
  - Chrome respects both (same as Firefox).

Maniphest Tasks: T4340

Differential Revision: https://secure.phabricator.com/D19144
---
 src/aphront/response/AphrontResponse.php  | 2 ++
 src/view/page/PhabricatorBarePageView.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 47ec2e465b..34cbd4081f 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -92,6 +92,8 @@ public function getHeaders() {
       $headers[] = array('Content-Security-Policy', $csp);
     }
 
+    $headers[] = array('Referrer-Policy', 'no-referrer');
+
     return $headers;
   }
 
diff --git a/src/view/page/PhabricatorBarePageView.php b/src/view/page/PhabricatorBarePageView.php
index 12eabf11e4..afdc482170 100644
--- a/src/view/page/PhabricatorBarePageView.php
+++ b/src/view/page/PhabricatorBarePageView.php
@@ -119,7 +119,7 @@ protected function getHead() {
       'meta',
       array(
         'name' => 'referrer',
-        'content' => 'never',
+        'content' => 'no-referrer',
       ));
 
     $response = CelerityAPI::getStaticResourceResponse();

From 80fe382e3d2782f56b6496899e0fe93aba2f5220 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 27 Feb 2018 13:44:53 -0800
Subject: [PATCH 632/865] Add "Committer's projects" and "Author's projects"
 fields to Herald commit rules

Summary:
Ref T13093. See PHI396. These are possibly somewhat niche, but reasonable to support and consistent with the existing "Pusher's projects".

Also relabel "Pusher's projects" and "Project tags" for consistency and, hopefully, clarity.

Test Plan:
  - Created new "commit" and "hook: commit content" Herald rules which run against "Author's projects" and "Committer's projects".
  - Test console'd the "Commit" rules.
  - Pushed through the "Hook" rule.
  - In all cases, saw fields populate appropriately.

Maniphest Tasks: T13093

Differential Revision: https://secure.phabricator.com/D19145
---
 src/__phutil_library_map__.php                |  8 ++++
 ...ffusionCommitAuthorProjectsHeraldField.php | 38 +++++++++++++++++++
 ...sionCommitCommitterProjectsHeraldField.php | 38 +++++++++++++++++++
 ...CommitContentAuthorProjectsHeraldField.php | 38 +++++++++++++++++++
 ...mitContentCommitterProjectsHeraldField.php | 38 +++++++++++++++++++
 ...CommitContentPusherProjectsHeraldField.php |  2 +-
 ...nPreCommitRefPusherProjectsHeraldField.php |  2 +-
 ...CommitRefRepositoryProjectsHeraldField.php |  2 +-
 .../project/herald/HeraldProjectsField.php    |  2 +-
 9 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
 create mode 100644 src/applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php
 create mode 100644 src/applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php
 create mode 100644 src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3a7ba1dbbc..b72577583d 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -652,10 +652,12 @@
     'DiffusionCommitAuditorsHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php',
     'DiffusionCommitAuditorsTransaction' => 'applications/diffusion/xaction/DiffusionCommitAuditorsTransaction.php',
     'DiffusionCommitAuthorHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuthorHeraldField.php',
+    'DiffusionCommitAuthorProjectsHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php',
     'DiffusionCommitAutocloseHeraldField' => 'applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php',
     'DiffusionCommitBranchesController' => 'applications/diffusion/controller/DiffusionCommitBranchesController.php',
     'DiffusionCommitBranchesHeraldField' => 'applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php',
     'DiffusionCommitCommitterHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php',
+    'DiffusionCommitCommitterProjectsHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php',
     'DiffusionCommitConcernTransaction' => 'applications/diffusion/xaction/DiffusionCommitConcernTransaction.php',
     'DiffusionCommitController' => 'applications/diffusion/controller/DiffusionCommitController.php',
     'DiffusionCommitDiffContentAddedHeraldField' => 'applications/diffusion/herald/DiffusionCommitDiffContentAddedHeraldField.php',
@@ -801,9 +803,11 @@
     'DiffusionPhpExternalSymbolsSource' => 'applications/diffusion/symbol/DiffusionPhpExternalSymbolsSource.php',
     'DiffusionPreCommitContentAffectedFilesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php',
     'DiffusionPreCommitContentAuthorHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php',
+    'DiffusionPreCommitContentAuthorProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php',
     'DiffusionPreCommitContentAuthorRawHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorRawHeraldField.php',
     'DiffusionPreCommitContentBranchesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentBranchesHeraldField.php',
     'DiffusionPreCommitContentCommitterHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterHeraldField.php',
+    'DiffusionPreCommitContentCommitterProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php',
     'DiffusionPreCommitContentCommitterRawHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterRawHeraldField.php',
     'DiffusionPreCommitContentDiffContentAddedHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentDiffContentAddedHeraldField.php',
     'DiffusionPreCommitContentDiffContentHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentDiffContentHeraldField.php',
@@ -5867,10 +5871,12 @@
     'DiffusionCommitAuditorsHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitAuditorsTransaction' => 'DiffusionCommitTransactionType',
     'DiffusionCommitAuthorHeraldField' => 'DiffusionCommitHeraldField',
+    'DiffusionCommitAuthorProjectsHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitAutocloseHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitBranchesController' => 'DiffusionController',
     'DiffusionCommitBranchesHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitCommitterHeraldField' => 'DiffusionCommitHeraldField',
+    'DiffusionCommitCommitterProjectsHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitConcernTransaction' => 'DiffusionCommitAuditTransaction',
     'DiffusionCommitController' => 'DiffusionController',
     'DiffusionCommitDiffContentAddedHeraldField' => 'DiffusionCommitHeraldField',
@@ -6019,9 +6025,11 @@
     'DiffusionPhpExternalSymbolsSource' => 'DiffusionExternalSymbolsSource',
     'DiffusionPreCommitContentAffectedFilesHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentAuthorHeraldField' => 'DiffusionPreCommitContentHeraldField',
+    'DiffusionPreCommitContentAuthorProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentAuthorRawHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentBranchesHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentCommitterHeraldField' => 'DiffusionPreCommitContentHeraldField',
+    'DiffusionPreCommitContentCommitterProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentCommitterRawHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentDiffContentAddedHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentDiffContentHeraldField' => 'DiffusionPreCommitContentHeraldField',
diff --git a/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
new file mode 100644
index 0000000000..a90480d50a
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
@@ -0,0 +1,38 @@
+<?php
+
+final class DiffusionCommitAuthorProjectsHeraldField
+  extends DiffusionCommitHeraldField {
+
+  const FIELDCONST = 'diffusion.commit.author.projects';
+
+  public function getHeraldFieldName() {
+    return pht("Author's projects");
+  }
+
+  public function getHeraldFieldValue($object) {
+    $adapter = $this->getAdapter();
+
+    $phid = $object->getCommitData()->getCommitDetail('authorPHID');
+    if (!$phid) {
+      return array();
+    }
+
+    $viewer = $adapter->getViewer();
+
+    $projects = id(new PhabricatorProjectQuery())
+      ->setViewer($viewer)
+      ->withMemberPHIDs(array($phid))
+      ->execute();
+
+    return mpull($projects, 'getPHID');
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new PhabricatorProjectDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php
new file mode 100644
index 0000000000..97e604a481
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php
@@ -0,0 +1,38 @@
+<?php
+
+final class DiffusionCommitCommitterProjectsHeraldField
+  extends DiffusionCommitHeraldField {
+
+  const FIELDCONST = 'diffusion.commit.committer.projects';
+
+  public function getHeraldFieldName() {
+    return pht("Committer's projects");
+  }
+
+  public function getHeraldFieldValue($object) {
+    $adapter = $this->getAdapter();
+
+    $phid = $object->getCommitData()->getCommitDetail('committerPHID');
+    if (!$phid) {
+      return array();
+    }
+
+    $viewer = $adapter->getViewer();
+
+    $projects = id(new PhabricatorProjectQuery())
+      ->setViewer($viewer)
+      ->withMemberPHIDs(array($phid))
+      ->execute();
+
+    return mpull($projects, 'getPHID');
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new PhabricatorProjectDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php
new file mode 100644
index 0000000000..ec138c9bde
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php
@@ -0,0 +1,38 @@
+<?php
+
+final class DiffusionPreCommitContentAuthorProjectsHeraldField
+  extends DiffusionPreCommitContentHeraldField {
+
+  const FIELDCONST = 'diffusion.pre.commit.author.projects';
+
+  public function getHeraldFieldName() {
+    return pht("Author's projects");
+  }
+
+  public function getHeraldFieldValue($object) {
+    $adapter = $this->getAdapter();
+
+    $phid = $adapter->getAuthorPHID();
+    if (!$phid) {
+      return array();
+    }
+
+    $viewer = $adapter->getViewer();
+
+    $projects = id(new PhabricatorProjectQuery())
+      ->setViewer($viewer)
+      ->withMemberPHIDs(array($phid))
+      ->execute();
+
+    return mpull($projects, 'getPHID');
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new PhabricatorProjectDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
new file mode 100644
index 0000000000..9b0f012f3c
--- /dev/null
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
@@ -0,0 +1,38 @@
+<?php
+
+final class DiffusionPreCommitContentCommitterProjectsHeraldField
+  extends DiffusionPreCommitContentHeraldField {
+
+  const FIELDCONST = 'diffusion.pre.commit.committer.projects';
+
+  public function getHeraldFieldName() {
+    return pht("Committer's projects");
+  }
+
+  public function getHeraldFieldValue($object) {
+    $adapter = $this->getAdapter();
+
+    $phid = $adapter->getCommitterPHID();
+    if (!$phid) {
+      return array();
+    }
+
+    $viewer = $adapter->getViewer();
+
+    $projects = id(new PhabricatorProjectQuery())
+      ->setViewer($viewer)
+      ->withMemberPHIDs(array($phid))
+      ->execute();
+
+    return mpull($projects, 'getPHID');
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID_LIST;
+  }
+
+  protected function getDatasource() {
+    return new PhabricatorProjectDatasource();
+  }
+
+}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php
index 6a8c79c108..eef82124cf 100644
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php
@@ -6,7 +6,7 @@ final class DiffusionPreCommitContentPusherProjectsHeraldField
   const FIELDCONST = 'diffusion.pre.content.pusher.projects';
 
   public function getHeraldFieldName() {
-    return pht('Pusher projects');
+    return pht("Pusher's projects");
   }
 
   public function getHeraldFieldValue($object) {
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php
index 6fff0a3570..937e758acf 100644
--- a/src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php
@@ -6,7 +6,7 @@ final class DiffusionPreCommitRefPusherProjectsHeraldField
   const FIELDCONST = 'diffusion.pre.ref.pusher.projects';
 
   public function getHeraldFieldName() {
-    return pht('Pusher projects');
+    return pht("Pusher's projects");
   }
 
   public function getHeraldFieldValue($object) {
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php
index df262524f2..17670a1c41 100644
--- a/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php
@@ -16,7 +16,7 @@ public function getHeraldFieldValue($object) {
   }
 
   protected function getHeraldFieldStandardType() {
-    return HeraldField::STANDARD_PHID_LIST;
+    return self::STANDARD_PHID_LIST;
   }
 
   protected function getDatasource() {
diff --git a/src/applications/project/herald/HeraldProjectsField.php b/src/applications/project/herald/HeraldProjectsField.php
index 1e25948689..7f66a00cf3 100644
--- a/src/applications/project/herald/HeraldProjectsField.php
+++ b/src/applications/project/herald/HeraldProjectsField.php
@@ -5,7 +5,7 @@ final class HeraldProjectsField extends HeraldField {
   const FIELDCONST = 'projects';
 
   public function getHeraldFieldName() {
-    return pht('Projects');
+    return pht('Project tags');
   }
 
   public function getFieldGroupKey() {

From 8cbfb386bb87a8d945a507a0ff16bd084878f442 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 27 Feb 2018 14:10:29 -0800
Subject: [PATCH 633/865] When evaluating the "Branches" Herald field from the
 test console, use the current viewer

Summary: Ref T13093. Depends on D19145. See PHI398. Previously, see D18933. This provides the current viewer to `ConduitCall` so that we don't try to use device credentials from unprivileged web hosts.

Test Plan: Evaluated the "Branches" field locally, saw an appropriate field value.

Maniphest Tasks: T13093

Differential Revision: https://secure.phabricator.com/D19146
---
 .../diffusion/herald/DiffusionCommitBranchesHeraldField.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php
index 03c4e3be62..064830ebc3 100644
--- a/src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php
@@ -10,6 +10,8 @@ public function getHeraldFieldName() {
   }
 
   public function getHeraldFieldValue($object) {
+    $viewer = $this->getAdapter()->getViewer();
+
     $commit = $object;
     $repository = $object->getRepository();
 
@@ -19,7 +21,7 @@ public function getHeraldFieldValue($object) {
     );
 
     $result = id(new ConduitCall('diffusion.branchquery', $params))
-      ->setUser(PhabricatorUser::getOmnipotentUser())
+      ->setUser($viewer)
       ->execute();
 
     $refs = DiffusionRepositoryRef::loadAllFromDictionaries($result);

From ada4f65565a0a923872206d27822e198f1a9bb00 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 27 Feb 2018 14:49:23 -0800
Subject: [PATCH 634/865] Stop sending Phriction edit mail to the
 previous/current content author

Summary:
See <https://discourse.phabricator-community.org/t/previous-author-of-phriction-page-always-receives-mail-when-new-author-edits-the-page/1155>.

After the "send users email when they are removed from the reviewer list" change which includes old To/Cc on the list, Phriction now emails the previous editor.

This is weird and unintended. The behavior isn't necessarily always bad, but if it's sometimes desirable we should make it explicit.

For now, just get rid of the weird side effect.

Test Plan: Edited a Phriction page.

Differential Revision: https://secure.phabricator.com/D19147
---
 src/applications/phriction/editor/PhrictionTransactionEditor.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index 793c609517..e6bf46c150 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -273,7 +273,6 @@ protected function getMailSubjectPrefix() {
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     return array(
-      $object->getContent()->getAuthorPHID(),
       $this->getActingAsPHID(),
     );
   }

From 985d499f50998011e047226cc89e4096a4311b4b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 05:42:55 -0800
Subject: [PATCH 635/865] Fix a Harbormaster build log issue where too few
 header lines were returned when expanding logs in the middle

Summary: Ref T13088. This variable bled through from an earlier loop and caused us to drop some of the lines in the middle.

Test Plan: Clicked "Show More", got an equal number of header and footer lines.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19148
---
 .../controller/HarbormasterBuildLogRenderController.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
index c1c4275982..50b17523ca 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -167,7 +167,7 @@ public function handleRequest(AphrontRequest $request) {
             'Unable to find lines.'));
       }
 
-      if ($direction > 0) {
+      if ($view['direction'] > 0) {
         $slice_offset = $anchor_key;
       } else {
         $slice_offset = max(0, $anchor_key - ($view['lines'] - 1));
@@ -589,7 +589,7 @@ private function renderExpandRow($range) {
       $up_text);
 
     $mid_text = pht(
-      'Show More (%s bytes Hidden)',
+      'Show More (%s Bytes)',
       new PhutilNumber($range['tail'] - $range['head']));
 
     $expand_mid = javelin_tag(

From 143033dc1f4b2f7689c1abd5b08126fdea2049d1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 06:17:03 -0800
Subject: [PATCH 636/865] When showing a small piece of a Harbormaster build
 log, load a small piece of data instead of the entire log

Summary: Depends on D19148. Ref T13088. The new rendering always executes range requests for data it needs, and we can satisfy these requests by loading the smallest number of chunks which span that range.

Test Plan: Piped 50,000 lines of Apache log into Harbormaster, viewed it in the new UI, got sensible rendering times and a reasonable amount of data actually going over the wire.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19149
---
 .../autopatches/20180228.log.01.offset.sql    |   5 +
 .../storage/build/HarbormasterBuildLog.php    | 117 ++++++++++++++++--
 .../build/HarbormasterBuildLogChunk.php       |   8 +-
 3 files changed, 120 insertions(+), 10 deletions(-)
 create mode 100644 resources/sql/autopatches/20180228.log.01.offset.sql

diff --git a/resources/sql/autopatches/20180228.log.01.offset.sql b/resources/sql/autopatches/20180228.log.01.offset.sql
new file mode 100644
index 0000000000..db20fc292e
--- /dev/null
+++ b/resources/sql/autopatches/20180228.log.01.offset.sql
@@ -0,0 +1,5 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildlogchunk
+  ADD headOffset BIGINT UNSIGNED NOT NULL;
+
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildlogchunk
+  ADD tailOffset BIGINT UNSIGNED NOT NULL;
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 64934bbea8..ccee7724c3 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -130,7 +130,85 @@ private function loadLastChunkInfo() {
   }
 
   public function loadData($offset, $length) {
-    return substr($this->getLogText(), $offset, $length);
+    $end = ($offset + $length);
+
+    $chunks = id(new HarbormasterBuildLogChunk())->loadAllWhere(
+      'logID = %d AND headOffset < %d AND tailOffset >= %d
+        ORDER BY headOffset ASC',
+      $this->getID(),
+      $end,
+      $offset);
+
+    // Make sure that whatever we read out of the database is a single
+    // contiguous range which contains all of the requested bytes.
+    $ranges = array();
+    foreach ($chunks as $chunk) {
+      $ranges[] = array(
+        'head' => $chunk->getHeadOffset(),
+        'tail' => $chunk->getTailOffset(),
+      );
+    }
+
+    $ranges = isort($ranges, 'head');
+    $ranges = array_values($ranges);
+    $count = count($ranges);
+    for ($ii = 0; $ii < ($count - 1); $ii++) {
+      if ($ranges[$ii + 1]['head'] === $ranges[$ii]['tail']) {
+        $ranges[$ii + 1]['head'] = $ranges[$ii]['head'];
+        unset($ranges[$ii]);
+      }
+    }
+
+    if (count($ranges) !== 1) {
+      $display_ranges = array();
+      foreach ($ranges as $range) {
+        $display_ranges[] = pht(
+          '(%d - %d)',
+          $range['head'],
+          $range['tail']);
+      }
+
+      if (!$display_ranges) {
+        $display_ranges[] = pht('<null>');
+      }
+
+      throw new Exception(
+        pht(
+          'Attempt to load log bytes (%d - %d) failed: failed to '.
+          'load a single contiguous range. Actual ranges: %s.',
+          implode('; ', $display_ranges)));
+    }
+
+    $range = head($ranges);
+    if ($range['head'] > $offset || $range['tail'] < $end) {
+      throw new Exception(
+        pht(
+          'Attempt to load log bytes (%d - %d) failed: the loaded range '.
+          '(%d - %d) does not span the requested range.',
+          $offset,
+          $end,
+          $range['head'],
+          $range['tail']));
+    }
+
+    $parts = array();
+    foreach ($chunks as $chunk) {
+      $parts[] = $chunk->getChunkDisplayText();
+    }
+    $parts = implode('', $parts);
+
+    $chop_head = ($offset - $range['head']);
+    $chop_tail = ($range['tail'] - $end);
+
+    if ($chop_head) {
+      $parts = substr($parts, $chop_head);
+    }
+
+    if ($chop_tail) {
+      $parts = substr($parts, 0, -$chop_tail);
+    }
+
+    return $parts;
   }
 
   public function getReadPosition($read_offset) {
@@ -220,17 +298,18 @@ private function processLog($mode) {
 
     $this->openTransaction();
 
+    $offset = 0;
     foreach ($chunks as $chunk) {
       $rope->append($chunk->getChunkDisplayText());
       $chunk->delete();
 
       while ($rope->getByteLength() > $byte_limit) {
-        $this->writeEncodedChunk($rope, $byte_limit, $mode);
+        $offset += $this->writeEncodedChunk($rope, $offset, $byte_limit, $mode);
       }
     }
 
     while ($rope->getByteLength()) {
-      $this->writeEncodedChunk($rope, $byte_limit, $mode);
+      $offset += $this->writeEncodedChunk($rope, $offset, $byte_limit, $mode);
     }
 
     $this
@@ -240,7 +319,12 @@ private function processLog($mode) {
     $this->saveTransaction();
   }
 
-  private function writeEncodedChunk(PhutilRope $rope, $length, $mode) {
+  private function writeEncodedChunk(
+    PhutilRope $rope,
+    $offset,
+    $length,
+    $mode) {
+
     $data = $rope->getPrefixBytes($length);
     $size = strlen($data);
 
@@ -258,15 +342,22 @@ private function writeEncodedChunk(PhutilRope $rope, $length, $mode) {
         throw new Exception(pht('Unknown chunk encoding "%s"!', $mode));
     }
 
-    $this->writeChunk($mode, $size, $data);
+    $this->writeChunk($mode, $offset, $size, $data);
 
     $rope->removeBytesFromHead($size);
+
+    return $size;
   }
 
-  private function writeChunk($encoding, $raw_size, $data) {
+  private function writeChunk($encoding, $offset, $raw_size, $data) {
+    $head_offset = $offset;
+    $tail_offset = $offset + $raw_size;
+
     return id(new HarbormasterBuildLogChunk())
       ->setLogID($this->getID())
       ->setEncoding($encoding)
+      ->setHeadOffset($head_offset)
+      ->setTailOffset($tail_offset)
       ->setSize($raw_size)
       ->setChunk($data)
       ->save();
@@ -397,13 +488,23 @@ private function flush() {
         if ($append_id) {
           queryfx(
             $conn_w,
-            'UPDATE %T SET chunk = CONCAT(chunk, %B), size = %d WHERE id = %d',
+            'UPDATE %T SET
+                chunk = CONCAT(chunk, %B),
+                size = %d,
+                tailOffset = headOffset + %d,
+              WHERE
+                id = %d',
             $chunk_table,
             $append_data,
             $prefix_size + $data_size,
+            $prefix_size + $data_size,
             $append_id);
         } else {
-          $this->writeChunk($encoding_text, $data_size, $append_data);
+          $this->writeChunk(
+            $encoding_text,
+            $this->getByteLength(),
+            $data_size,
+            $append_data);
         }
 
         $this->updateLineMap($append_data);
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLogChunk.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLogChunk.php
index e69bad4caf..ff3e817c58 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLogChunk.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLogChunk.php
@@ -5,6 +5,8 @@ final class HarbormasterBuildLogChunk
 
   protected $logID;
   protected $encoding;
+  protected $headOffset;
+  protected $tailOffset;
   protected $size;
   protected $chunk;
 
@@ -20,6 +22,8 @@ protected function getConfiguration() {
       self::CONFIG_COLUMN_SCHEMA => array(
         'logID' => 'id',
         'encoding' => 'text32',
+        'headOffset' => 'uint64',
+        'tailOffset' => 'uint64',
 
         // T6203/NULLABILITY
         // Both the type and nullability of this column are crazily wrong.
@@ -28,8 +32,8 @@ protected function getConfiguration() {
         'chunk' => 'bytes',
       ),
       self::CONFIG_KEY_SCHEMA => array(
-        'key_log' => array(
-          'columns' => array('logID'),
+        'key_offset' => array(
+          'columns' => array('logID', 'headOffset', 'tailOffset'),
         ),
       ),
     ) + parent::getConfiguration();

From dc6a66f7f42e0632bba055a1b0fde8e3f253b70f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 06:39:30 -0800
Subject: [PATCH 637/865] Add a "(prototype)" link to the standalone build log
 on build pages

Summary: Depends on D19149. Ref T13088. Since the new log requires a bunch of log reprocessing, the cutover is going to require at least some time for installs to run migrations. Add a link in the UI to ease the transition, smooth over some behaviors a little, and fix a fetch issue where we'd request past the end of the log (since this is now enforced).

Test Plan: Viewed a traditional Harbormaster build, saw links to the new standalone log pages.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19150
---
 .../HarbormasterBuildLogRenderController.php  |  8 ++-
 .../HarbormasterBuildLogViewController.php    |  6 ++
 .../HarbormasterBuildViewController.php       |  7 +++
 .../view/HarbormasterBuildLogView.php         | 55 ++++++++++++-------
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
index 50b17523ca..4b36ba83d9 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -105,7 +105,13 @@ public function handleRequest(AphrontRequest $request) {
     $reads = $this->mergeOverlappingReads($reads);
 
     foreach ($reads as $key => $read) {
-      $data = $log->loadData($read['fetchOffset'], $read['fetchLength']);
+      $fetch_offset = $read['fetchOffset'];
+      $fetch_length = $read['fetchLength'];
+      if ($fetch_offset + $fetch_length > $log_size) {
+        $fetch_length = $log_size - $fetch_offset;
+      }
+
+      $data = $log->loadData($fetch_offset, $fetch_length);
 
       $offset = $read['fetchOffset'];
       $line = $read['fetchLine'];
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
index 41f2aef8e5..40641795c5 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
@@ -16,6 +16,9 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
+    $target = $log->getBuildTarget();
+    $build = $target->getBuild();
+
     $page_title = pht('Build Log %d', $log->getID());
 
     $log_view = id(new HarbormasterBuildLogView())
@@ -25,6 +28,9 @@ public function handleRequest(AphrontRequest $request) {
 
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb(pht('Build Logs'))
+      ->addTextCrumb(
+        pht('Build %d', $build->getID()),
+        $build->getURI())
       ->addTextCrumb($page_title)
       ->setBorder(true);
 
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
index 4507139d47..0e09b4d658 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -363,12 +363,19 @@ private function buildLog(
       $log_view->setLines($lines);
       $log_view->setStart($start);
 
+      $prototype_view = id(new PHUIButtonView())
+        ->setTag('a')
+        ->setHref($log->getURI())
+        ->setIcon('fa-file-text-o')
+        ->setText(pht('New View (Prototype)'));
+
       $header = id(new PHUIHeaderView())
         ->setHeader(pht(
           'Build Log %d (%s - %s)',
           $log->getID(),
           $log->getLogSource(),
           $log->getLogType()))
+        ->addActionLink($prototype_view)
         ->setSubheader($this->createLogHeader($build, $log))
         ->setUser($viewer);
 
diff --git a/src/applications/harbormaster/view/HarbormasterBuildLogView.php b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
index 81705f3f49..e240aab510 100644
--- a/src/applications/harbormaster/view/HarbormasterBuildLogView.php
+++ b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
@@ -44,28 +44,43 @@ public function render() {
 
     $header->addActionLink($download_button);
 
-    $content_id = celerity_generate_unique_node_id();
-    $content_div = javelin_tag(
-      'div',
-      array(
-        'id' => $content_id,
-        'class' => 'harbormaster-log-view-loading',
-      ),
-      pht('Loading...'));
-
-    require_celerity_resource('harbormaster-css');
-
-    Javelin::initBehavior(
-      'harbormaster-log',
-      array(
-        'contentNodeID' => $content_id,
-        'renderURI' => $log->getRenderURI($this->getHighlightedLineRange()),
-      ));
-
     $box_view = id(new PHUIObjectBoxView())
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setHeader($header)
-      ->appendChild($content_div);
+      ->setHeader($header);
+
+    $has_linemap = $log->getLineMap();
+    if ($has_linemap) {
+      $content_id = celerity_generate_unique_node_id();
+      $content_div = javelin_tag(
+        'div',
+        array(
+          'id' => $content_id,
+          'class' => 'harbormaster-log-view-loading',
+        ),
+        pht('Loading...'));
+
+      require_celerity_resource('harbormaster-css');
+
+      Javelin::initBehavior(
+        'harbormaster-log',
+        array(
+          'contentNodeID' => $content_id,
+          'renderURI' => $log->getRenderURI($this->getHighlightedLineRange()),
+        ));
+
+      $box_view->appendChild($content_div);
+    } else {
+      $box_view->setFormErrors(
+        array(
+          pht(
+            'This older log is missing required rendering data. To rebuild '.
+            'rendering data, run: %s',
+            phutil_tag(
+              'tt',
+              array(),
+              '$ bin/harbormaster rebuild-log --force --id '.$log->getID())),
+        ));
+    }
 
     return $box_view;
   }

From 5a2213ef82c7bbe0da6c22ee326a8d0294321396 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 06:59:16 -0800
Subject: [PATCH 638/865] Provide API read access to Harbormaster build logs

Summary:
Depends on D19150. Ref T13088. Allow clients to retrieve information about build logs, including log data, over the API.

(To fetch log data, take the `filePHID` to `file.search`, then issue a normal GET against the URI. Use a `Content-Range` header to get part of the log.)

Test Plan: Ran `harbormaster.log.search`, got sensible-looking results.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19151
---
 src/__phutil_library_map__.php                |  5 ++
 ...ormasterBuildLogSearchConduitAPIMethod.php | 18 +++++
 .../query/HarbormasterBuildLogQuery.php       | 37 ++++-----
 .../HarbormasterBuildLogSearchEngine.php      | 79 +++++++++++++++++++
 .../storage/build/HarbormasterBuildLog.php    | 35 +++++++-
 src/view/control/AphrontTableView.php         |  2 +-
 6 files changed, 151 insertions(+), 25 deletions(-)
 create mode 100644 src/applications/harbormaster/conduit/HarbormasterBuildLogSearchConduitAPIMethod.php
 create mode 100644 src/applications/harbormaster/query/HarbormasterBuildLogSearchEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b72577583d..76bc79498e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1235,6 +1235,8 @@
     'HarbormasterBuildLogPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php',
     'HarbormasterBuildLogQuery' => 'applications/harbormaster/query/HarbormasterBuildLogQuery.php',
     'HarbormasterBuildLogRenderController' => 'applications/harbormaster/controller/HarbormasterBuildLogRenderController.php',
+    'HarbormasterBuildLogSearchConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterBuildLogSearchConduitAPIMethod.php',
+    'HarbormasterBuildLogSearchEngine' => 'applications/harbormaster/query/HarbormasterBuildLogSearchEngine.php',
     'HarbormasterBuildLogTestCase' => 'applications/harbormaster/__tests__/HarbormasterBuildLogTestCase.php',
     'HarbormasterBuildLogView' => 'applications/harbormaster/view/HarbormasterBuildLogView.php',
     'HarbormasterBuildLogViewController' => 'applications/harbormaster/controller/HarbormasterBuildLogViewController.php',
@@ -6522,6 +6524,7 @@
       'HarbormasterDAO',
       'PhabricatorPolicyInterface',
       'PhabricatorDestructibleInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'HarbormasterBuildLogChunk' => 'HarbormasterDAO',
     'HarbormasterBuildLogChunkIterator' => 'PhutilBufferedIterator',
@@ -6529,6 +6532,8 @@
     'HarbormasterBuildLogPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'HarbormasterBuildLogRenderController' => 'HarbormasterController',
+    'HarbormasterBuildLogSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
+    'HarbormasterBuildLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'HarbormasterBuildLogTestCase' => 'PhabricatorTestCase',
     'HarbormasterBuildLogView' => 'AphrontView',
     'HarbormasterBuildLogViewController' => 'HarbormasterController',
diff --git a/src/applications/harbormaster/conduit/HarbormasterBuildLogSearchConduitAPIMethod.php b/src/applications/harbormaster/conduit/HarbormasterBuildLogSearchConduitAPIMethod.php
new file mode 100644
index 0000000000..e24b53956f
--- /dev/null
+++ b/src/applications/harbormaster/conduit/HarbormasterBuildLogSearchConduitAPIMethod.php
@@ -0,0 +1,18 @@
+<?php
+
+final class HarbormasterBuildLogSearchConduitAPIMethod
+  extends PhabricatorSearchEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'harbormaster.log.search';
+  }
+
+  public function newSearchEngine() {
+    return new HarbormasterBuildLogSearchEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht('Find out information about build logs.');
+  }
+
+}
diff --git a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
index 3d45de686f..ad27d09582 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
@@ -23,19 +23,12 @@ public function withBuildTargetPHIDs(array $build_target_phids) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new HarbormasterBuildLog();
+  }
+
   protected function loadPage() {
-    $table = new HarbormasterBuildLog();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($data);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $page) {
@@ -63,33 +56,31 @@ protected function willFilterPage(array $page) {
     return $page;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
-    if ($this->ids) {
+    if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'id IN (%Ld)',
         $this->ids);
     }
 
-    if ($this->phids) {
+    if ($this->phids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'phid IN (%Ls)',
         $this->phids);
     }
 
-    if ($this->buildTargetPHIDs) {
+    if ($this->buildTargetPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'buildTargetPHID IN (%Ls)',
         $this->buildTargetPHIDs);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {
diff --git a/src/applications/harbormaster/query/HarbormasterBuildLogSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildLogSearchEngine.php
new file mode 100644
index 0000000000..3698238b12
--- /dev/null
+++ b/src/applications/harbormaster/query/HarbormasterBuildLogSearchEngine.php
@@ -0,0 +1,79 @@
+<?php
+
+final class HarbormasterBuildLogSearchEngine
+  extends PhabricatorApplicationSearchEngine {
+
+  public function getResultTypeDescription() {
+    return pht('Harbormaster Build Logs');
+  }
+
+  public function getApplicationClassName() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
+  public function newQuery() {
+    return new HarbormasterBuildLogQuery();
+  }
+
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorPHIDsSearchField())
+        ->setLabel(pht('Build Targets'))
+        ->setKey('buildTargetPHIDs')
+        ->setAliases(
+          array(
+            'buildTargetPHID',
+            'buildTargets',
+            'buildTarget',
+            'targetPHIDs',
+            'targetPHID',
+            'targets',
+            'target',
+          ))
+        ->setDescription(
+          pht('Search for logs that belong to a particular build target.')),
+    );
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+
+    if ($map['buildTargetPHIDs']) {
+      $query->withBuildTargetPHIDs($map['buildTargetPHIDs']);
+    }
+
+    return $query;
+  }
+
+  protected function getURI($path) {
+    return '/harbormaster/log/'.$path;
+  }
+
+  protected function getBuiltinQueryNames() {
+    return array(
+      'all' => pht('All Builds'),
+    );
+  }
+
+  public function buildSavedQueryFromBuiltin($query_key) {
+    $query = $this->newSavedQuery();
+    $query->setQueryKey($query_key);
+
+    switch ($query_key) {
+      case 'all':
+        return $query;
+    }
+
+    return parent::buildSavedQueryFromBuiltin($query_key);
+  }
+
+  protected function renderResultList(
+    array $builds,
+    PhabricatorSavedQuery $query,
+    array $handles) {
+
+    // For now, this SearchEngine is only for driving the API.
+    throw new PhutilMethodNotImplementedException();
+  }
+
+}
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index ccee7724c3..9d77abf4a8 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -4,7 +4,8 @@ final class HarbormasterBuildLog
   extends HarbormasterDAO
   implements
     PhabricatorPolicyInterface,
-    PhabricatorDestructibleInterface {
+    PhabricatorDestructibleInterface,
+    PhabricatorConduitResultInterface {
 
   protected $buildTargetPHID;
   protected $logSource;
@@ -714,4 +715,36 @@ public function destroyChunks() {
   }
 
 
+/* -(  PhabricatorConduitResultInterface  )---------------------------------- */
+
+
+  public function getFieldSpecificationsForConduit() {
+    return array(
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('buildTargetPHID')
+        ->setType('phid')
+        ->setDescription(pht('Build target this log is attached to.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('byteLength')
+        ->setType('int')
+        ->setDescription(pht('Length of the log in bytes.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('filePHID')
+        ->setType('phid?')
+        ->setDescription(pht('A file containing the log data.')),
+    );
+  }
+
+  public function getFieldValuesForConduit() {
+    return array(
+      'buildTargetPHID' => $this->getBuildTargetPHID(),
+      'byteLength' => (int)$this->getByteLength(),
+      'filePHID' => $this->getFilePHID(),
+    );
+  }
+
+  public function getConduitSearchAttachments() {
+    return array();
+  }
+
 }
diff --git a/src/view/control/AphrontTableView.php b/src/view/control/AphrontTableView.php
index 3cca7f89e5..cae9dabec2 100644
--- a/src/view/control/AphrontTableView.php
+++ b/src/view/control/AphrontTableView.php
@@ -248,7 +248,7 @@ public function render() {
 
     foreach ($col_classes as $key => $value) {
 
-      if (($sort_values[$key] !== null) &&
+      if (isset($sort_values[$key]) &&
           ($sort_values[$key] == $this->sortSelected)) {
         $value = trim($value.' sorted-column');
       }

From 21ddfe442e67bf1efebb142ec6d429b748c00c28 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 07:43:14 -0800
Subject: [PATCH 639/865] Add a "--rate" flag to `bin/harbormaster write-log`
 to support testing live log streaming

Summary: Depends on D19151. Ref T13088. While dramatically less exciting than using `lolcat` and less general than `pv`, this should do the job adequately.

Test Plan: Piped a sizable log into `bin/harbormaster write-log` with `--rate 2048`, saw a progress bar. Loaded the log in the web UI and saw it grow as the page reloaded.

Reviewers: yelirekim

Reviewed By: yelirekim

Subscribers: yelirekim, PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19152
---
 ...HarbormasterManagementWriteLogWorkflow.php | 39 ++++++++++++++++++-
 .../storage/build/HarbormasterBuildLog.php    |  2 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
index b680b382aa..3676b1415c 100644
--- a/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
+++ b/src/applications/harbormaster/management/HarbormasterManagementWriteLogWorkflow.php
@@ -18,6 +18,13 @@ protected function didConstruct() {
             'param' => 'id',
             'help' => pht('Build Target ID to attach the log to.'),
           ),
+          array(
+            'name' => 'rate',
+            'param' => 'bytes',
+            'help' => pht(
+              'Limit the rate at which the log is written, to test '.
+              'live log streaming.'),
+          ),
         ));
   }
 
@@ -54,7 +61,37 @@ public function execute(PhutilArgumentParser $args) {
       pht('Reading log content from stdin...'));
 
     $content = file_get_contents('php://stdin');
-    $log->append($content);
+
+    $rate = $args->getArg('rate');
+    if ($rate) {
+      if ($rate <= 0) {
+        throw new Exception(
+          pht(
+            'Write rate must be more than 0 bytes/sec.'));
+      }
+
+      echo tsprintf(
+        "%s\n",
+        pht('Writing log, slowly...'));
+
+      $offset = 0;
+      $total = strlen($content);
+      $pieces = str_split($content, $rate);
+
+      $bar = id(new PhutilConsoleProgressBar())
+        ->setTotal($total);
+
+      foreach ($pieces as $piece) {
+        $log->append($piece);
+        $bar->update(strlen($piece));
+        sleep(1);
+      }
+
+      $bar->done();
+
+    } else {
+      $log->append($content);
+    }
 
     echo tsprintf(
       "%s\n",
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index 9d77abf4a8..bf69457254 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -492,7 +492,7 @@ private function flush() {
             'UPDATE %T SET
                 chunk = CONCAT(chunk, %B),
                 size = %d,
-                tailOffset = headOffset + %d,
+                tailOffset = headOffset + %d
               WHERE
                 id = %d',
             $chunk_table,

From f114b2dd7d4bc6ad56f9edbfacfe4834a6ccb39a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 11:36:22 -0800
Subject: [PATCH 640/865] When viewing a live build log, trap users in a small
 personal hell where nothing but slavish devotion to the log exists

Summary: Depends on D19152. Ref T13088. This adds live log tailing. It is probably not the final version of this feature because it prevents escape once you begin tailing a log.

Test Plan: Used `bin/harbormaster write-log --rate ...` to write a log slowly. Viewed it in the web UI. Clicked "Follow Log". Followed the log until the write finished, a lifetime later.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19153
---
 resources/celerity/map.php                    | 14 ++--
 .../HarbormasterBuildLogRenderController.php  | 74 ++++++++++++++++---
 .../application/harbormaster/harbormaster.css |  9 ++-
 .../harbormaster/behavior-harbormaster-log.js | 48 +++++++++++-
 4 files changed, 125 insertions(+), 20 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 1f3884f8da..a59db7ed05 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -78,7 +78,7 @@
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
-    'rsrc/css/application/harbormaster/harbormaster.css' => 'c7e29d9e',
+    'rsrc/css/application/harbormaster/harbormaster.css' => '5dd4c2de',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'cd8d0134',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
@@ -416,7 +416,7 @@
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => 'be6974cc',
+    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '796a8803',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
@@ -579,7 +579,7 @@
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => 'b556a948',
-    'harbormaster-css' => 'c7e29d9e',
+    'harbormaster-css' => '5dd4c2de',
     'herald-css' => 'cd8d0134',
     'herald-rule-editor' => 'dca75c0e',
     'herald-test-css' => 'a52e323e',
@@ -636,7 +636,7 @@
     'javelin-behavior-event-all-day' => 'b41537c9',
     'javelin-behavior-fancy-datepicker' => 'ecf4e799',
     'javelin-behavior-global-drag-and-drop' => '960f6a39',
-    'javelin-behavior-harbormaster-log' => 'be6974cc',
+    'javelin-behavior-harbormaster-log' => '796a8803',
     'javelin-behavior-herald-rule-editor' => '7ebaeed3',
     'javelin-behavior-high-security-warning' => 'a464fe03',
     'javelin-behavior-history-install' => '7ee2b591',
@@ -1535,6 +1535,9 @@
       'javelin-behavior',
       'javelin-quicksand',
     ),
+    '796a8803' => array(
+      'javelin-behavior',
+    ),
     '7a68dda3' => array(
       'owners-path-editor',
       'javelin-behavior',
@@ -1889,9 +1892,6 @@
       'javelin-util',
       'javelin-request',
     ),
-    'be6974cc' => array(
-      'javelin-behavior',
-    ),
     'bea6e7f4' => array(
       'javelin-install',
       'javelin-dom',
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
index 4b36ba83d9..6d623f2bc5 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -22,14 +22,14 @@ public function handleRequest(AphrontRequest $request) {
     if ($head_lines === null) {
       $head_lines = 8;
     }
-    $head_lines = min($head_lines, 100);
+    $head_lines = min($head_lines, 1024);
     $head_lines = max($head_lines, 0);
 
     $tail_lines = $request->getInt('tail');
     if ($tail_lines === null) {
       $tail_lines = 16;
     }
-    $tail_lines = min($tail_lines, 100);
+    $tail_lines = min($tail_lines, 1024);
     $tail_lines = max($tail_lines, 0);
 
     $head_offset = $request->getInt('headOffset');
@@ -301,7 +301,6 @@ public function handleRequest(AphrontRequest $request) {
       );
     }
 
-
     foreach ($views as $view) {
       if ($spacer) {
         $spacer['tail'] = $view['viewOffset'];
@@ -360,6 +359,22 @@ public function handleRequest(AphrontRequest $request) {
       }
     }
 
+    if ($log->getLive()) {
+      $last_view = last($views);
+      $last_line = last($last_view['viewData']);
+      if ($last_line) {
+        $last_offset = $last_line['offset'];
+      } else {
+        $last_offset = 0;
+      }
+
+      $last_tail = $last_view['viewOffset'] + $last_view['viewLength'];
+      $show_live = ($last_tail === $log_size);
+      if ($show_live) {
+        $rows[] = $this->renderLiveRow($last_offset);
+      }
+    }
+
     $table = phutil_tag(
       'table',
       array(
@@ -650,25 +665,66 @@ private function renderExpandRow($range) {
         ),
         $expand_down),
     );
-    $expand_row = phutil_tag('tr', array(), $expand_cells);
-    $expand_table = phutil_tag(
+
+    return $this->renderActionTable($expand_cells);
+  }
+
+  private function renderLiveRow($log_size) {
+    $icon_down = id(new PHUIIconView())
+      ->setIcon('fa-chevron-down');
+
+    $follow = javelin_tag(
+      'a',
+      array(
+        'sigil' => 'harbormaster-log-expand harbormaster-log-live',
+        'meta' => array(
+          'headOffset' => $log_size,
+          'head' => 0,
+          'tail' => 1024,
+          'live' => true,
+        ),
+      ),
+      array(
+        $icon_down,
+        ' ',
+        pht('Follow Log'),
+        ' ',
+        $icon_down,
+      ));
+
+    $expand_cells = array(
+      phutil_tag(
+        'td',
+        array(
+          'class' => 'harbormaster-log-follow',
+        ),
+        $follow),
+    );
+
+    return $this->renderActionTable($expand_cells);
+  }
+
+  private function renderActionTable(array $action_cells) {
+    $action_row = phutil_tag('tr', array(), $action_cells);
+
+    $action_table = phutil_tag(
       'table',
       array(
         'class' => 'harbormaster-log-expand-table',
       ),
-      $expand_row);
+      $action_row);
 
-    $cells = array(
+    $format_cells = array(
       phutil_tag('th', array()),
       phutil_tag(
         'td',
         array(
           'class' => 'harbormaster-log-expand-cell',
         ),
-        $expand_table),
+        $action_table),
     );
 
-    return phutil_tag('tr', array(), $cells);
+    return phutil_tag('tr', array(), $format_cells);
   }
 
 }
diff --git a/webroot/rsrc/css/application/harbormaster/harbormaster.css b/webroot/rsrc/css/application/harbormaster/harbormaster.css
index 1c389a4383..b22658219a 100644
--- a/webroot/rsrc/css/application/harbormaster/harbormaster.css
+++ b/webroot/rsrc/css/application/harbormaster/harbormaster.css
@@ -97,7 +97,6 @@
     'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
-
 .harbormaster-log-expand-up {
   text-align: right;
   width: 50%;
@@ -107,6 +106,14 @@
   margin: 0 0 0px 4px;
 }
 
+.harbormaster-log-follow {
+  text-align: center;
+}
+
+.harbormaster-log-follow .phui-icon-view {
+  margin: 0 4px;
+}
+
 .harbormaster-log-expand-mid {
   text-align: center;
   white-space: nowrap;
diff --git a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
index 38baca6199..510631e1e0 100644
--- a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
+++ b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
@@ -5,6 +5,7 @@
 
 JX.behavior('harbormaster-log', function(config) {
   var contentNode = JX.$(config.contentNodeID);
+  var following = false;
 
   JX.DOM.listen(contentNode, 'click', 'harbormaster-log-expand', function(e) {
     if (!e.isNormalClick()) {
@@ -13,23 +14,64 @@ JX.behavior('harbormaster-log', function(config) {
 
     e.kill();
 
-    var row = e.getNode('tag:tr');
+    expand(e.getTarget());
+  });
+
+  function expand(node) {
+    var row = JX.DOM.findAbove(node, 'tr');
     row = JX.DOM.findAbove(row, 'tr');
 
-    var data = e.getNodeData('harbormaster-log-expand');
+    var data = JX.Stratcom.getData(node);
 
     var uri = new JX.URI(config.renderURI)
       .addQueryParams(data);
 
+    if (data.live) {
+      following = true;
+    }
+
     var request = new JX.Request(uri, function(r) {
       var result = JX.$H(r.markup).getNode();
       var rows = [].slice.apply(result.firstChild.childNodes);
 
+      // If we're following the bottom of the log, the result always includes
+      // the last line from the previous render. Throw it away, then add the
+      // new data.
+      if (data.live && row.previousSibling) {
+        JX.DOM.remove(row.previousSibling);
+      }
+
       JX.DOM.replace(row, rows);
+
+      if (data.live) {
+        // If this was a live follow, scroll the new data into view. This is
+        // probably intensely annoying in practice but seems cool for now.
+        var last_row = rows[rows.length - 1];
+        var tail_pos = JX.$V(last_row).y + JX.Vector.getDim(last_row).y;
+        var view_y = JX.Vector.getViewport().y;
+        JX.DOM.scrollToPosition(null, (tail_pos - view_y) + 32);
+
+        setTimeout(follow, 500);
+      }
     });
 
     request.send();
-  });
+  }
+
+  function follow() {
+    if (!following) {
+      return;
+    }
+
+    var live;
+    try {
+      live = JX.DOM.find(contentNode, 'a', 'harbormaster-log-live');
+    } catch (e) {
+      return;
+    }
+
+    expand(live);
+  }
 
   function onresponse(r) {
     JX.DOM.alterClass(contentNode, 'harbormaster-log-view-loading', false);

From a5efd7eedb3cd3245928e214b0b8123be13427c7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 14:15:02 -0800
Subject: [PATCH 641/865] Add "object-src 'none'" to the
 Content-Security-Policy

Summary: See PHI399. Ref T4340. We don't require Flash/Java anywhere and can safely block them unconditionally in the Content-Security-Policy header.

Test Plan: Added a `<object ... />` tag to a page, saw "Blocked Plug-In" and a CSP warning in the browser console.

Maniphest Tasks: T4340

Differential Revision: https://secure.phabricator.com/D19154
---
 src/aphront/response/AphrontResponse.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 34cbd4081f..56d074bd6f 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -144,6 +144,9 @@ private function newContentSecurityPolicyHeader() {
       $csp[] = "frame-ancestors 'none'";
     }
 
+    // Block relics of the old world: Flash, Java applets, and so on.
+    $csp[] = "object-src 'none'";
+
     $csp = implode('; ', $csp);
 
     return $csp;

From afc98f5d5d0808c8ad2109fb9dc0901e65eb3bda Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 15:19:46 -0800
Subject: [PATCH 642/865] Remove defunct "download" route in Files pointing to
 nonexistent controller

Summary:
Depends on D19154. Ref T13094. This controller was removed at some point and this route no longer works.

I plan to add a new `download/` route to let us tighten the `form-action` Content Security Policy.

Test Plan: Grepped for the route and controller, no hits.

Maniphest Tasks: T13094

Differential Revision: https://secure.phabricator.com/D19155
---
 .../files/application/PhabricatorFilesApplication.php            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
index 1010818c19..c3903ffdce 100644
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -86,7 +86,6 @@ public function getRoutes() {
           'PhabricatorFileTransformListController',
         'uploaddialog/(?P<single>single/)?'
           => 'PhabricatorFileUploadDialogController',
-        'download/(?P<phid>[^/]+)/' => 'PhabricatorFileDialogController',
         'iconset/(?P<key>[^/]+)/' => array(
           'select/' => 'PhabricatorFileIconSetSelectController',
         ),

From ab579f2511102775d27bda92c6f3d3c8fc302d3c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 15:22:10 -0800
Subject: [PATCH 643/865] Never generate file download forms which point to the
 CDN domain, tighten "form-action" CSP

Summary:
Depends on D19155. Ref T13094. Ref T4340.

We can't currently implement a strict `form-action 'self'` content security policy because some file downloads rely on a `<form />` which sometimes POSTs to the CDN domain.

Broadly, stop generating these forms. We just redirect instead, and show an interstitial confirm dialog if no CDN domain is configured. This makes the UX for installs with no CDN domain a little worse and the UX for everyone else better.

Then, implement the stricter Content-Security-Policy.

This also removes extra confirm dialogs for downloading Harbormaster build logs and data exports.

Test Plan:
  - Went through the plain data export, data export with bulk jobs, ssh key generation, calendar ICS download, Diffusion data, Paste data, Harbormaster log data, and normal file data download workflows with a CDN domain.
  - Went through all those workflows again without a CDN domain.
  - Grepped for affected symbols (`getCDNURI()`, `getDownloadURI()`).
  - Added an evil form to a page, tried to submit it, was rejected.
  - Went through the ReCaptcha and Stripe flows again to see if they're submitting any forms.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13094, T4340

Differential Revision: https://secure.phabricator.com/D19156
---
 resources/celerity/map.php                    | 28 ++++++-------
 .../response/AphrontRedirectResponse.php      | 10 +++++
 src/aphront/response/AphrontResponse.php      |  7 ++++
 ...habricatorAuthSSHKeyGenerateController.php | 30 +++++++++-----
 .../base/controller/PhabricatorController.php |  1 +
 .../controller/DiffusionServeController.php   |  2 +-
 .../PhabricatorFilesApplication.php           |  4 +-
 .../PhabricatorFileDataController.php         | 39 +++++++++----------
 .../PhabricatorFileInfoController.php         |  3 +-
 .../PhabricatorEmbedFileRemarkupRule.php      |  2 +-
 .../files/storage/PhabricatorFile.php         | 28 ++++++++++---
 ...HarbormasterBuildLogDownloadController.php | 14 +------
 .../view/HarbormasterBuildLogView.php         |  6 ++-
 ...PhabricatorApplicationSearchController.php | 18 ++++-----
 .../PhabricatorExportEngineBulkJobType.php    |  1 -
 .../rsrc/externals/javelin/lib/Workflow.js    |  7 ++++
 16 files changed, 118 insertions(+), 82 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index a59db7ed05..42a4c854ef 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '2fa91e14',
-    'core.pkg.js' => '7aa5bd92',
+    'core.pkg.js' => 'e7ce7bba',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -255,7 +255,7 @@
     'rsrc/externals/javelin/lib/URI.js' => 'c989ade3',
     'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
     'rsrc/externals/javelin/lib/WebSocket.js' => '3ffe32d6',
-    'rsrc/externals/javelin/lib/Workflow.js' => '1e911d0f',
+    'rsrc/externals/javelin/lib/Workflow.js' => '0eb1db0c',
     'rsrc/externals/javelin/lib/__tests__/Cookie.js' => '5ed109e8',
     'rsrc/externals/javelin/lib/__tests__/DOM.js' => 'c984504b',
     'rsrc/externals/javelin/lib/__tests__/JSON.js' => '837a7d68',
@@ -757,7 +757,7 @@
     'javelin-workboard-card' => 'c587b80f',
     'javelin-workboard-column' => '758b4758',
     'javelin-workboard-controller' => '26167537',
-    'javelin-workflow' => '1e911d0f',
+    'javelin-workflow' => '0eb1db0c',
     'maniphest-report-css' => '9b9580b7',
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
@@ -977,6 +977,17 @@
       'javelin-dom',
       'javelin-router',
     ),
+    '0eb1db0c' => array(
+      'javelin-stratcom',
+      'javelin-request',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-install',
+      'javelin-util',
+      'javelin-mask',
+      'javelin-uri',
+      'javelin-routable',
+    ),
     '0f764c35' => array(
       'javelin-install',
       'javelin-util',
@@ -1035,17 +1046,6 @@
       'javelin-request',
       'javelin-uri',
     ),
-    '1e911d0f' => array(
-      'javelin-stratcom',
-      'javelin-request',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-install',
-      'javelin-util',
-      'javelin-mask',
-      'javelin-uri',
-      'javelin-routable',
-    ),
     '1f6794f6' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/aphront/response/AphrontRedirectResponse.php b/src/aphront/response/AphrontRedirectResponse.php
index 5b4b009796..390ad193c9 100644
--- a/src/aphront/response/AphrontRedirectResponse.php
+++ b/src/aphront/response/AphrontRedirectResponse.php
@@ -8,6 +8,7 @@ class AphrontRedirectResponse extends AphrontResponse {
   private $uri;
   private $stackWhenCreated;
   private $isExternal;
+  private $closeDialogBeforeRedirect;
 
   public function setIsExternal($external) {
     $this->isExternal = $external;
@@ -37,6 +38,15 @@ public function shouldStopForDebugging() {
     return PhabricatorEnv::getEnvConfig('debug.stop-on-redirect');
   }
 
+  public function setCloseDialogBeforeRedirect($close) {
+    $this->closeDialogBeforeRedirect = $close;
+    return $this;
+  }
+
+  public function getCloseDialogBeforeRedirect() {
+    return $this->closeDialogBeforeRedirect;
+  }
+
   public function getHeaders() {
     $headers = array();
     if (!$this->shouldStopForDebugging()) {
diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 56d074bd6f..ed3d6d3435 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -147,6 +147,13 @@ private function newContentSecurityPolicyHeader() {
     // Block relics of the old world: Flash, Java applets, and so on.
     $csp[] = "object-src 'none'";
 
+    // Don't allow forms to submit offsite.
+
+    // This can result in some trickiness with file downloads if applications
+    // try to start downloads by submitting a dialog. Redirect to the file's
+    // download URI instead of submitting a form to it.
+    $csp[] = "form-action 'self'";
+
     $csp = implode('; ', $csp);
 
     return $csp;
diff --git a/src/applications/auth/controller/PhabricatorAuthSSHKeyGenerateController.php b/src/applications/auth/controller/PhabricatorAuthSSHKeyGenerateController.php
index f39707618d..206a2f1c4a 100644
--- a/src/applications/auth/controller/PhabricatorAuthSSHKeyGenerateController.php
+++ b/src/applications/auth/controller/PhabricatorAuthSSHKeyGenerateController.php
@@ -24,10 +24,12 @@ public function handleRequest(AphrontRequest $request) {
       $keys = PhabricatorSSHKeyGenerator::generateKeypair();
       list($public_key, $private_key) = $keys;
 
+      $key_name = $default_name.'.key';
+
       $file = PhabricatorFile::newFromFileData(
         $private_key,
         array(
-          'name' => $default_name.'.key',
+          'name' => $key_name,
           'ttl.relative' => phutil_units('10 minutes in seconds'),
           'viewPolicy' => $viewer->getPHID(),
         ));
@@ -62,25 +64,33 @@ public function handleRequest(AphrontRequest $request) {
         ->setContentSourceFromRequest($request)
         ->applyTransactions($key, $xactions);
 
-      // NOTE: We're disabling workflow on submit so the download works. We're
-      // disabling workflow on cancel so the page reloads, showing the new
-      // key.
+      $download_link = phutil_tag(
+        'a',
+        array(
+          'href' => $file->getDownloadURI(),
+        ),
+        array(
+          id(new PHUIIconView())->setIcon('fa-download'),
+          ' ',
+          pht('Download Private Key (%s)', $key_name),
+        ));
+      $download_link = phutil_tag('strong', array(), $download_link);
+
+      // NOTE: We're disabling workflow on cancel so the page reloads, showing
+      // the new key.
 
       return $this->newDialog()
         ->setTitle(pht('Download Private Key'))
-        ->setDisableWorkflowOnCancel(true)
-        ->setDisableWorkflowOnSubmit(true)
-        ->setSubmitURI($file->getDownloadURI())
         ->appendParagraph(
           pht(
             'A keypair has been generated, and the public key has been '.
-            'added as a recognized key. Use the button below to download '.
-            'the private key.'))
+            'added as a recognized key.'))
+        ->appendParagraph($download_link)
         ->appendParagraph(
           pht(
             'After you download the private key, it will be destroyed. '.
             'You will not be able to retrieve it if you lose your copy.'))
-        ->addSubmitButton(pht('Download Private Key'))
+        ->setDisableWorkflowOnCancel(true)
         ->addCancelButton($cancel_uri, pht('Done'));
     }
 
diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index 5952a806ed..df0c94c13d 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -298,6 +298,7 @@ public function willSendResponse(AphrontResponse $response) {
           ->setContent(
             array(
               'redirect' => $response->getURI(),
+              'close' => $response->getCloseDialogBeforeRedirect(),
             ));
       }
     }
diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index c0f72ae404..ac0b993b2f 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -1046,7 +1046,7 @@ private function serveGitLFSBatchRequest(
           // <https://github.com/github/git-lfs/issues/1088>
           $no_authorization = 'Basic '.base64_encode('none');
 
-          $get_uri = $file->getCDNURI();
+          $get_uri = $file->getCDNURI('data');
           $actions['download'] = array(
             'href' => $get_uri,
             'header' => array(
diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
index c3903ffdce..2d3a1b35c6 100644
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -101,7 +101,7 @@ public function getResourceRoutes() {
 
   private function getResourceSubroutes() {
     return array(
-      'data/'.
+      '(?P<kind>data|download)/'.
         '(?:@(?P<instance>[^/]+)/)?'.
         '(?P<key>[^/]+)/'.
         '(?P<phid>[^/]+)/'.
@@ -132,7 +132,7 @@ public function getMailCommandObjects() {
 
   public function getQuicksandURIPatternBlacklist() {
     return array(
-      '/file/data/.*',
+      '/file/(data|download)/.*',
     );
   }
 
diff --git a/src/applications/files/controller/PhabricatorFileDataController.php b/src/applications/files/controller/PhabricatorFileDataController.php
index 98f2cdbd51..91dfb4fa4f 100644
--- a/src/applications/files/controller/PhabricatorFileDataController.php
+++ b/src/applications/files/controller/PhabricatorFileDataController.php
@@ -26,6 +26,9 @@ public function handleRequest(AphrontRequest $request) {
     $req_domain = $request->getHost();
     $main_domain = id(new PhutilURI($base_uri))->getDomain();
 
+    $request_kind = $request->getURIData('kind');
+    $is_download = ($request_kind === 'download');
+
     if (!strlen($alt) || $main_domain == $alt_domain) {
       // No alternate domain.
       $should_redirect = false;
@@ -50,7 +53,7 @@ public function handleRequest(AphrontRequest $request) {
     if ($should_redirect) {
       return id(new AphrontRedirectResponse())
         ->setIsExternal(true)
-        ->setURI($file->getCDNURI());
+        ->setURI($file->getCDNURI($request_kind));
     }
 
     $response = new AphrontFileResponse();
@@ -71,34 +74,30 @@ public function handleRequest(AphrontRequest $request) {
     }
 
     $is_viewable = $file->isViewableInBrowser();
-    $force_download = $request->getExists('download');
-
     $request_type = $request->getHTTPHeader('X-Phabricator-Request-Type');
     $is_lfs = ($request_type == 'git-lfs');
 
-    if ($is_viewable && !$force_download) {
+    if ($is_viewable && !$is_download) {
       $response->setMimeType($file->getViewableMimeType());
     } else {
-      $is_public = !$viewer->isLoggedIn();
       $is_post = $request->isHTTPPost();
 
-      // NOTE: Require POST to download files from the primary domain if the
-      // request includes credentials. The "Download File" links we generate
-      // in the web UI are forms which use POST to satisfy this requirement.
-
-      // The intent is to make attacks based on tags like "<iframe />" and
-      // "<script />" (which can issue GET requests, but can not easily issue
-      // POST requests) more difficult to execute.
-
-      // The best defense against these attacks is to use an alternate file
-      // domain, which is why we strongly recommend doing so.
+      // NOTE: Require POST to download files from the primary domain. If the
+      // request is not a POST request but arrives on the primary domain, we
+      // render a confirmation dialog. For discussion, see T13094.
 
-      $is_safe = ($is_alternate_domain || $is_lfs || $is_post || $is_public);
+      $is_safe = ($is_alternate_domain || $is_lfs || $is_post);
       if (!$is_safe) {
-        // This is marked as "external" because it is fully qualified.
-        return id(new AphrontRedirectResponse())
-          ->setIsExternal(true)
-          ->setURI(PhabricatorEnv::getProductionURI($file->getBestURI()));
+        return $this->newDialog()
+          ->setSubmitURI($file->getDownloadURI())
+          ->setTitle(pht('Download File'))
+          ->appendParagraph(
+            pht(
+              'Download file %s (%s)?',
+              phutil_tag('strong', array(), $file->getName()),
+              phutil_format_bytes($file->getByteSize())))
+          ->addCancelButton($file->getURI())
+          ->addSubmitButton(pht('Download File'));
       }
 
       $response->setMimeType($file->getMimeType());
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
index f30421c132..976324d0b2 100644
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -137,11 +137,10 @@ private function buildCurtainView(PhabricatorFile $file) {
       $curtain->addAction(
         id(new PhabricatorActionView())
           ->setUser($viewer)
-          ->setRenderAsForm($can_download)
           ->setDownload($can_download)
           ->setName(pht('Download File'))
           ->setIcon('fa-download')
-          ->setHref($file->getViewURI())
+          ->setHref($file->getDownloadURI())
           ->setDisabled(!$can_download)
           ->setWorkflow(!$can_download));
     }
diff --git a/src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php b/src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php
index e4fe826f5b..9cbc119c84 100644
--- a/src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php
+++ b/src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php
@@ -144,7 +144,7 @@ private function renderImageFile(
 
           $existing_xform = $file->getTransform($preview_key);
           if ($existing_xform) {
-            $xform_uri = $existing_xform->getCDNURI();
+            $xform_uri = $existing_xform->getCDNURI('data');
           } else {
             $xform_uri = $file->getURIForTransform($xform);
           }
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index 2b8624b9c0..29fb606a4b 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -810,16 +810,24 @@ public function getViewURI() {
         pht('You must save a file before you can generate a view URI.'));
     }
 
-    return $this->getCDNURI();
+    return $this->getCDNURI('data');
   }
 
-  public function getCDNURI() {
+  public function getCDNURI($request_kind) {
+    if (($request_kind !== 'data') &&
+        ($request_kind !== 'download')) {
+      throw new Exception(
+        pht(
+          'Unknown file content request kind "%s".',
+          $request_kind));
+    }
+
     $name = self::normalizeFileName($this->getName());
     $name = phutil_escape_uri($name);
 
     $parts = array();
     $parts[] = 'file';
-    $parts[] = 'data';
+    $parts[] = $request_kind;
 
     // If this is an instanced install, add the instance identifier to the URI.
     // Instanced configurations behind a CDN may not be able to control the
@@ -861,9 +869,7 @@ public function getBestURI() {
   }
 
   public function getDownloadURI() {
-    $uri = id(new PhutilURI($this->getViewURI()))
-      ->setQueryParam('download', true);
-    return (string)$uri;
+    return $this->getCDNURI('download');
   }
 
   public function getURIForTransform(PhabricatorFileTransform $transform) {
@@ -1469,6 +1475,16 @@ public function getRedirectResponse() {
       ->setURI($uri);
   }
 
+  public function newDownloadResponse() {
+    // We're cheating a little bit here and relying on the fact that
+    // getDownloadURI() always returns a fully qualified URI with a complete
+    // domain.
+    return id(new AphrontRedirectResponse())
+      ->setIsExternal(true)
+      ->setCloseDialogBeforeRedirect(true)
+      ->setURI($this->getDownloadURI());
+  }
+
   public function attachTransforms(array $map) {
     $this->transforms = $map;
     return $this;
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php
index 6bdd04edc3..40313cdafd 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogDownloadController.php
@@ -44,19 +44,7 @@ public function handleRequest(AphrontRequest $request) {
         ->addCancelButton($cancel_uri);
     }
 
-    $size = $file->getByteSize();
-
-    return $this->newDialog()
-      ->setTitle(pht('Download Build Log'))
-      ->appendParagraph(
-        pht(
-          'This log has a total size of %s. If you insist, you may '.
-          'download it.',
-          phutil_tag('strong', array(), phutil_format_bytes($size))))
-      ->setDisableWorkflowOnSubmit(true)
-      ->addSubmitButton(pht('Download Log'))
-      ->setSubmitURI($file->getDownloadURI())
-      ->addCancelButton($cancel_uri, pht('Done'));
+    return $file->newDownloadResponse();
   }
 
 }
diff --git a/src/applications/harbormaster/view/HarbormasterBuildLogView.php b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
index e240aab510..7200cdce70 100644
--- a/src/applications/harbormaster/view/HarbormasterBuildLogView.php
+++ b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
@@ -34,12 +34,14 @@ public function render() {
 
     $download_uri = "/harbormaster/log/download/{$id}/";
 
+    $can_download = (bool)$log->getFilePHID();
+
     $download_button = id(new PHUIButtonView())
       ->setTag('a')
       ->setHref($download_uri)
       ->setIcon('fa-download')
-      ->setDisabled(!$log->getFilePHID())
-      ->setWorkflow(true)
+      ->setDisabled(!$can_download)
+      ->setWorkflow(!$can_download)
       ->setText(pht('Download Log'));
 
     $header->addActionLink($download_button);
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
index cc8bcefff1..cf4f95c16d 100644
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -512,15 +512,7 @@ private function processExportRequest() {
             ->setURI($job->getMonitorURI());
         } else {
           $file = $export_engine->exportFile();
-
-          return $this->newDialog()
-            ->setTitle(pht('Download Results'))
-            ->appendParagraph(
-              pht('Click the download button to download the exported data.'))
-            ->addCancelButton($cancel_uri, pht('Done'))
-            ->setSubmitURI($file->getDownloadURI())
-            ->setDisableWorkflowOnSubmit(true)
-            ->addSubmitButton(pht('Download Data'));
+          return $file->newDownloadResponse();
         }
       }
     }
@@ -535,12 +527,18 @@ private function processExportRequest() {
           ->setValue($format_key)
           ->setOptions($format_options));
 
+    if ($is_large_export) {
+      $submit_button = pht('Continue');
+    } else {
+      $submit_button = pht('Download Data');
+    }
+
     return $this->newDialog()
       ->setTitle(pht('Export Results'))
       ->setErrors($errors)
       ->appendForm($export_form)
       ->addCancelButton($cancel_uri)
-      ->addSubmitButton(pht('Continue'));
+      ->addSubmitButton($submit_button);
   }
 
   private function processEditRequest() {
diff --git a/src/infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php b/src/infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php
index 712127f479..cf54bc7995 100644
--- a/src/infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php
+++ b/src/infrastructure/export/engine/PhabricatorExportEngineBulkJobType.php
@@ -36,7 +36,6 @@ public function getCurtainActions(
           ->setName(pht('Temporary File Expired'));
       } else {
         $actions[] = id(new PhabricatorActionView())
-          ->setRenderAsForm(true)
           ->setHref($file->getDownloadURI())
           ->setIcon('fa-download')
           ->setName(pht('Download Data Export'));
diff --git a/webroot/rsrc/externals/javelin/lib/Workflow.js b/webroot/rsrc/externals/javelin/lib/Workflow.js
index 7f0818d4e0..995f204c5d 100644
--- a/webroot/rsrc/externals/javelin/lib/Workflow.js
+++ b/webroot/rsrc/externals/javelin/lib/Workflow.js
@@ -276,6 +276,13 @@ JX.install('Workflow', {
       // It is permissible to send back a falsey redirect to force a page
       // reload, so we need to take this branch if the key is present.
       if (r && (typeof r.redirect != 'undefined')) {
+        // Before we redirect to file downloads, we close the dialog. These
+        // redirects aren't real navigation events so we end up stuck in the
+        // dialog otherwise.
+        if (r.close) {
+          this._pop();
+        }
+
         JX.$U(r.redirect).go();
       } else if (r && r.dialog) {
         this._push();

From a2fdf14275f932fcf70baf345ec2d944ffbd5a45 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 17:04:40 -0800
Subject: [PATCH 644/865] Stop using forms to download files in file embed and
 lightbox elements

Summary: Depends on D19156. Ref T13094. This replaces the remaining forms in the file embed view and lightbox with normal download links.

Test Plan: Clicked "Download" and lightbox -> download for embedded files.

Maniphest Tasks: T13094

Differential Revision: https://secure.phabricator.com/D19157
---
 resources/celerity/map.php                    | 24 ++++----
 src/view/layout/PhabricatorFileLinkView.php   | 20 ++-----
 src/view/page/PhabricatorStandardPageView.php | 30 +---------
 .../js/core/behavior-lightbox-attachments.js  | 59 +++++++++----------
 4 files changed, 47 insertions(+), 86 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 42a4c854ef..4eebc07609 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '2fa91e14',
-    'core.pkg.js' => 'e7ce7bba',
+    'core.pkg.js' => 'a3ceffdb',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -494,7 +494,7 @@
     'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
-    'rsrc/js/core/behavior-lightbox-attachments.js' => '560f41da',
+    'rsrc/js/core/behavior-lightbox-attachments.js' => 'e31fad01',
     'rsrc/js/core/behavior-line-linker.js' => '1499a8cb',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
@@ -642,7 +642,7 @@
     'javelin-behavior-history-install' => '7ee2b591',
     'javelin-behavior-icon-composer' => '8499b6ab',
     'javelin-behavior-launch-icon-composer' => '48086888',
-    'javelin-behavior-lightbox-attachments' => '560f41da',
+    'javelin-behavior-lightbox-attachments' => 'e31fad01',
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-selector' => 'ad54037e',
@@ -1359,15 +1359,6 @@
       'javelin-vector',
       'javelin-dom',
     ),
-    '560f41da' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-mask',
-      'javelin-util',
-      'phuix-icon-view',
-      'phabricator-busy',
-    ),
     '58dea2fa' => array(
       'javelin-install',
       'javelin-util',
@@ -2070,6 +2061,15 @@
       'javelin-dom',
       'phabricator-draggable-list',
     ),
+    'e31fad01' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-mask',
+      'javelin-util',
+      'phuix-icon-view',
+      'phabricator-busy',
+    ),
     'e379b58e' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/view/layout/PhabricatorFileLinkView.php b/src/view/layout/PhabricatorFileLinkView.php
index b0649381dd..82715c0294 100644
--- a/src/view/layout/PhabricatorFileLinkView.php
+++ b/src/view/layout/PhabricatorFileLinkView.php
@@ -134,21 +134,13 @@ protected function getTagContent() {
     $dl_icon = id(new PHUIIconView())
       ->setIcon('fa-download');
 
-    $download_form = phabricator_form(
-      $this->getViewer(),
+    $download_link = phutil_tag(
+      'a',
       array(
-        'action' => $this->getFileDownloadURI(),
-        'method' => 'POST',
-        'class'  => 'embed-download-form',
-        'sigil'  => 'embed-download-form download',
+        'class' => 'phabricator-remarkup-embed-layout-download',
+        'href' => $this->getFileDownloadURI(),
       ),
-      phutil_tag(
-        'button',
-        array(
-          'class' => 'phabricator-remarkup-embed-layout-download',
-          'type' => 'submit',
-        ),
-        pht('Download')));
+      pht('Download'));
 
     $info = phutil_tag(
       'span',
@@ -177,7 +169,7 @@ protected function getTagContent() {
     return array(
       $icon,
       $inner,
-      $download_form,
+      $download_link,
     );
   }
 }
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 266e6592ee..8ee7566969 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -279,35 +279,7 @@ protected function willRenderPage() {
         }
       }
 
-      $icon = id(new PHUIIconView())
-        ->setIcon('fa-download')
-        ->addClass('phui-icon-circle-icon');
-      $lightbox_id = celerity_generate_unique_node_id();
-      $download_form = phabricator_form(
-        $user,
-        array(
-          'action' => '#',
-          'method' => 'POST',
-          'class'  => 'lightbox-download-form',
-          'sigil'  => 'download lightbox-download-submit',
-          'id'     => 'lightbox-download-form',
-        ),
-        phutil_tag(
-          'a',
-          array(
-            'class' => 'lightbox-download phui-icon-circle hover-green',
-            'href' => '#',
-          ),
-          array(
-            $icon,
-          )));
-
-      Javelin::initBehavior(
-        'lightbox-attachments',
-        array(
-          'lightbox_id'     => $lightbox_id,
-          'downloadForm'    => $download_form,
-        ));
+      Javelin::initBehavior('lightbox-attachments');
     }
 
     Javelin::initBehavior('aphront-form-disable-on-submit');
diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
index b9ea0dd8db..eb31d22c60 100644
--- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js
+++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
@@ -9,19 +9,18 @@
  *           phabricator-busy
  */
 
-JX.behavior('lightbox-attachments', function (config) {
+JX.behavior('lightbox-attachments', function() {
+
+  var lightbox = null;
 
-  var lightbox     = null;
   var prev         = null;
   var next         = null;
   var shown        = false;
-  var downloadForm = JX.$H(config.downloadForm).getFragment().firstChild;
-  var lightbox_id  = config.lightbox_id;
 
   function _toggleComment(e) {
     e.kill();
     shown = !shown;
-    JX.DOM.alterClass(JX.$(lightbox_id), 'comment-panel-open', shown);
+    JX.DOM.alterClass(lightbox, 'comment-panel-open', shown);
   }
 
   function markCommentsLoading(loading) {
@@ -48,6 +47,12 @@ JX.behavior('lightbox-attachments', function (config) {
       return;
     }
 
+    // If you click the "Download" link inside an embedded file element,
+    // don't lightbox the file.
+    if (e.getNode('tag:a')) {
+      return;
+    }
+
     e.kill();
 
     var mainFrame = JX.$('main-page-frame');
@@ -82,8 +87,7 @@ JX.behavior('lightbox-attachments', function (config) {
     var img_uri = '';
     var img = '';
     var extra_status = '';
-    // for now, this conditional is always true
-    // revisit if / when we decide to add non-images to lightbox view
+
     if (target_data.viewable) {
       img_uri = target_data.uri;
       var alt_name = '';
@@ -114,7 +118,7 @@ JX.behavior('lightbox-attachments', function (config) {
           {
             className : 'lightbox-icon-frame',
             sigil : 'lightbox-download-submit',
-            href : '#',
+            href : target_data.dUri,
           },
           [ imgIcon, nameElement ]
         );
@@ -138,12 +142,12 @@ JX.behavior('lightbox-attachments', function (config) {
       );
 
     var commentClass = (shown) ? 'comment-panel-open' : '';
+
     lightbox =
       JX.$N('div',
         {
           className : 'lightbox-attachment ' + commentClass,
-          sigil : 'lightbox-attachment',
-          id : lightbox_id
+          sigil : 'lightbox-attachment'
         },
         [imgFrame, commentFrame]
       );
@@ -161,12 +165,17 @@ JX.behavior('lightbox-attachments', function (config) {
         ]
       );
 
-    var downloadSpan =
-      JX.$N('span',
-        {
-          className : 'lightbox-download'
-        }
-      );
+    var download_icon = new JX.PHUIXIconView()
+      .setIcon('fa-download phui-icon-circle-icon')
+      .getNode();
+
+    var download_button = JX.$N(
+      'a',
+      {
+        className: 'lightbox-download phui-icon-circle hover-sky',
+        href: target_data.dUri
+      },
+      download_icon);
 
     var commentIcon = new JX.PHUIXIconView()
       .setIcon('fa-comments phui-icon-circle-icon')
@@ -180,6 +189,7 @@ JX.behavior('lightbox-attachments', function (config) {
         },
         commentIcon
       );
+
     var closeIcon = new JX.PHUIXIconView()
       .setIcon('fa-times phui-icon-circle-icon')
       .getNode();
@@ -190,12 +200,13 @@ JX.behavior('lightbox-attachments', function (config) {
           href : '#'
         },
         closeIcon);
+
     var statusHTML =
       JX.$N('div',
         {
           className : 'lightbox-status'
         },
-       [statusSpan, closeButton, commentButton, downloadSpan]
+       [statusSpan, closeButton, commentButton, download_button]
       );
     JX.DOM.appendContent(lightbox, statusHTML);
     JX.DOM.listen(closeButton, 'click', null, closeLightBox);
@@ -246,9 +257,6 @@ JX.behavior('lightbox-attachments', function (config) {
     JX.DOM.alterClass(document.body, 'lightbox-attached', true);
     JX.Mask.show('jx-dark-mask');
 
-    downloadForm.action = target_data.dUri;
-    downloadSpan.appendChild(downloadForm);
-
     document.body.appendChild(lightbox);
 
     if (img_uri) {
@@ -365,23 +373,12 @@ JX.behavior('lightbox-attachments', function (config) {
     'lightbox-comment-form',
     _sendMessage);
 
-  var _startDownload = function(e) {
-    e.kill();
-    var form = JX.$('lightbox-download-form');
-    form.submit();
-  };
-
   var _startPageDownload = function(e) {
     e.kill();
     var form = e.getNode('tag:form');
     form.submit();
   };
 
-  JX.Stratcom.listen(
-    'click',
-    'lightbox-download-submit',
-    _startDownload);
-
   JX.Stratcom.listen(
     'click',
     'embed-download-form',

From d5befb1a0ea3658feb88997cb9c016ce82492012 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 18:51:37 -0800
Subject: [PATCH 645/865] Block use of "<base />" in the Content Security
 Policy

Summary: Ref T4340. We don't use "<base />" so we can safely block it.

Test Plan: Injected "<base />" into a page, saw an error in the console showing that the browser had blocked it.

Maniphest Tasks: T4340

Differential Revision: https://secure.phabricator.com/D19158
---
 src/aphront/response/AphrontResponse.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index ed3d6d3435..05d230aa71 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -154,6 +154,9 @@ private function newContentSecurityPolicyHeader() {
     // download URI instead of submitting a form to it.
     $csp[] = "form-action 'self'";
 
+    // Block use of "<base>" to change the origin of relative URIs on the page.
+    $csp[] = "base-uri 'none'";
+
     $csp = implode('; ', $csp);
 
     return $csp;

From 94d340fcffab6642e9ddc2e51dfa1a95f76f2c35 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Feb 2018 19:07:19 -0800
Subject: [PATCH 646/865] Include OAuth targets in "form-action"
 Content-Security-Policy

Summary:
Ref T4340. Some "Register/Login" and "Link External Account" buttons are forms which submit to third-party sites. Whitelist these targets when pages render an OAuth form.

Safari, at least, also prevents a redirect to a third-party domain after a form submission to the local domain, so when we first redirect locally (as with Twitter and other OAuth1 providers) we need to authorize an additional URI.

Test Plan: Clicked all my registration buttons locally without hitting CSP issues.

Maniphest Tasks: T4340

Differential Revision: https://secure.phabricator.com/D19159
---
 src/aphront/response/AphrontResponse.php        | 17 +++++++++--------
 .../auth/provider/PhabricatorAuthProvider.php   | 11 +++++++++++
 .../provider/PhabricatorOAuth1AuthProvider.php  |  3 +++
 .../provider/PhortuneStripePaymentProvider.php  |  4 ++--
 .../control/AphrontFormRecaptchaControl.php     |  6 +++---
 src/view/page/PhabricatorStandardPageView.php   |  2 +-
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 05d230aa71..73c4e68f00 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -24,9 +24,10 @@ public function getRequest() {
   final public function addContentSecurityPolicyURI($kind, $uri) {
     if ($this->contentSecurityPolicyURIs === null) {
       $this->contentSecurityPolicyURIs = array(
-         'script' => array(),
-         'connect' => array(),
-         'frame' => array(),
+         'script-src' => array(),
+         'connect-src' => array(),
+         'frame-src' => array(),
+         'form-action' => array(),
        );
     }
 
@@ -125,14 +126,14 @@ private function newContentSecurityPolicyHeader() {
 
     // On a small number of pages, including the Stripe workflow and the
     // ReCAPTCHA challenge, we embed external Javascript directly.
-    $csp[] = $this->newContentSecurityPolicy('script', $default);
+    $csp[] = $this->newContentSecurityPolicy('script-src', $default);
 
     // We need to specify that we can connect to ourself in order for AJAX
     // requests to work.
-    $csp[] = $this->newContentSecurityPolicy('connect', "'self'");
+    $csp[] = $this->newContentSecurityPolicy('connect-src', "'self'");
 
     // DarkConsole and PHPAST both use frames to render some content.
-    $csp[] = $this->newContentSecurityPolicy('frame', "'self'");
+    $csp[] = $this->newContentSecurityPolicy('frame-src', "'self'");
 
     // This is a more modern flavor of of "X-Frame-Options" and prevents
     // clickjacking attacks where the page is included in a tiny iframe and
@@ -152,7 +153,7 @@ private function newContentSecurityPolicyHeader() {
     // This can result in some trickiness with file downloads if applications
     // try to start downloads by submitting a dialog. Redirect to the file's
     // download URI instead of submitting a form to it.
-    $csp[] = "form-action 'self'";
+    $csp[] = $this->newContentSecurityPolicy('form-action', "'self'");
 
     // Block use of "<base>" to change the origin of relative URIs on the page.
     $csp[] = "base-uri 'none'";
@@ -177,7 +178,7 @@ private function newContentSecurityPolicy($type, $defaults) {
     }
     $sources = array_unique($sources);
 
-    return "{$type}-src ".implode(' ', $sources);
+    return $type.' '.implode(' ', $sources);
   }
 
   private function newContentSecurityPolicySource($uri) {
diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php
index d655efd790..0525edad54 100644
--- a/src/applications/auth/provider/PhabricatorAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorAuthProvider.php
@@ -447,6 +447,13 @@ protected function renderStandardLoginButton(
         ));
     }
 
+    $static_response = CelerityAPI::getStaticResourceResponse();
+    $static_response->addContentSecurityPolicyURI('form-action', (string)$uri);
+
+    foreach ($this->getContentSecurityPolicyFormActions() as $csp_uri) {
+      $static_response->addContentSecurityPolicyURI('form-action', $csp_uri);
+    }
+
     return phabricator_form(
       $viewer,
       array(
@@ -505,4 +512,8 @@ public function getAutoLoginURI(AphrontRequest $request) {
     throw new PhutilMethodNotImplementedException();
   }
 
+  protected function getContentSecurityPolicyFormActions() {
+    return array();
+  }
+
 }
diff --git a/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php b/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
index c62983de2f..2fbc637460 100644
--- a/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorOAuth1AuthProvider.php
@@ -208,6 +208,9 @@ public function willRenderLinkedAccount(
     parent::willRenderLinkedAccount($viewer, $item, $account);
   }
 
+  protected function getContentSecurityPolicyFormActions() {
+    return $this->getAdapter()->getContentSecurityPolicyFormActions();
+  }
 
 /* -(  Temporary Secrets  )-------------------------------------------------- */
 
diff --git a/src/applications/phortune/provider/PhortuneStripePaymentProvider.php b/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
index 370f132a1f..bdaa4294b2 100644
--- a/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
+++ b/src/applications/phortune/provider/PhortuneStripePaymentProvider.php
@@ -285,8 +285,8 @@ public function renderCreatePaymentMethodForm(
       ->addScript($src);
 
     CelerityAPI::getStaticResourceResponse()
-      ->addContentSecurityPolicyURI('script', $src)
-      ->addContentSecurityPolicyURI('frame', $src);
+      ->addContentSecurityPolicyURI('script-src', $src)
+      ->addContentSecurityPolicyURI('frame-src', $src);
 
     Javelin::initBehavior(
       'stripe-payment-form',
diff --git a/src/view/form/control/AphrontFormRecaptchaControl.php b/src/view/form/control/AphrontFormRecaptchaControl.php
index b0559754e9..4152f7d8b7 100644
--- a/src/view/form/control/AphrontFormRecaptchaControl.php
+++ b/src/view/form/control/AphrontFormRecaptchaControl.php
@@ -43,9 +43,9 @@ protected function renderInput() {
     $pubkey = PhabricatorEnv::getEnvConfig('recaptcha.public-key');
 
     CelerityAPI::getStaticResourceResponse()
-      ->addContentSecurityPolicyURI('script', $js)
-      ->addContentSecurityPolicyURI('script', 'https://www.gstatic.com/')
-      ->addContentSecurityPolicyURI('frame', 'https://www.google.com/');
+      ->addContentSecurityPolicyURI('script-src', $js)
+      ->addContentSecurityPolicyURI('script-src', 'https://www.gstatic.com/')
+      ->addContentSecurityPolicyURI('frame-src', 'https://www.google.com/');
 
     return array(
       phutil_tag(
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 8ee7566969..aca98b7205 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -584,7 +584,7 @@ protected function getTail() {
           ) + $this->buildAphlictListenConfigData());
 
         CelerityAPI::getStaticResourceResponse()
-          ->addContentSecurityPolicyURI('connect', $client_uri);
+          ->addContentSecurityPolicyURI('connect-src', $client_uri);
       }
     }
 

From 4466402c5a6dd35e0f0a4fb58423b1f7dc10a618 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Mar 2018 06:09:51 -0800
Subject: [PATCH 647/865] Move Paste line range reading code into
 AphrontRequest

Summary: Ref T13088. This lifts the code for parsing "$x-y" line ranges in URIs into AphrontRequest so Diffusion, Paste, Harbormaster, etc., can share it.

Test Plan: Viewed lines, line ranges, no lines, negative line ranges, line ranges with 0, and extremely long line ranges in Paste.

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19162
---
 src/aphront/AphrontRequest.php                | 48 +++++++++++++++++++
 .../PhabricatorPasteViewController.php        | 29 ++++-------
 2 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
index 9d806a851d..c1dc0d1305 100644
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -49,6 +49,54 @@ public function getURIData($key, $default = null) {
     return idx($this->uriData, $key, $default);
   }
 
+  /**
+   * Read line range parameter data from the request.
+   *
+   * Applications like Paste, Diffusion, and Harbormaster use "$12-14" in the
+   * URI to allow users to link to particular lines.
+   *
+   * @param string URI data key to pull line range information from.
+   * @param int|null Maximum length of the range.
+   * @return null|pair<int, int> Null, or beginning and end of the range.
+   */
+  public function getURILineRange($key, $limit) {
+    $range = $this->getURIData($key);
+    if (!strlen($range)) {
+      return null;
+    }
+
+    $range = explode('-', $range, 2);
+
+    foreach ($range as $key => $value) {
+      $value = (int)$value;
+      if (!$value) {
+        // If either value is "0", discard the range.
+        return null;
+      }
+      $range[$key] = $value;
+    }
+
+    // If the range is like "$10", treat it like "$10-10".
+    if (count($range) == 1) {
+      $range[] = head($range);
+    }
+
+    // If the range is "$7-5", treat it like "$5-7".
+    if ($range[1] < $range[0]) {
+      $range = array_reverse($range);
+    }
+
+    // If the user specified something like "$1-999999999" and we have a limit,
+    // clamp it to a more reasonable range.
+    if ($limit !== null) {
+      if ($range[1] - $range[0] > $limit) {
+        $range[1] = $range[0] + $limit;
+      }
+    }
+
+    return $range;
+  }
+
   public function setApplicationConfiguration(
     $application_configuration) {
     $this->applicationConfiguration = $application_configuration;
diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
index f29c93a162..9b4079fd46 100644
--- a/src/applications/paste/controller/PhabricatorPasteViewController.php
+++ b/src/applications/paste/controller/PhabricatorPasteViewController.php
@@ -2,30 +2,10 @@
 
 final class PhabricatorPasteViewController extends PhabricatorPasteController {
 
-  private $highlightMap;
-
   public function shouldAllowPublic() {
     return true;
   }
 
-  public function willProcessRequest(array $data) {
-    $raw_lines = idx($data, 'lines');
-    $map = array();
-    if ($raw_lines) {
-      $lines = explode('-', $raw_lines);
-      $first = idx($lines, 0, 0);
-      $last = idx($lines, 1);
-      if ($last) {
-        $min = min($first, $last);
-        $max = max($first, $last);
-        $map = array_fuse(range($min, $max));
-      } else {
-        $map[$first] = $first;
-      }
-    }
-    $this->highlightMap = $map;
-  }
-
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
@@ -40,11 +20,18 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
+    $lines = $request->getURILineRange('lines', 1000);
+    if ($lines) {
+      $map = range($lines[0], $lines[1]);
+    } else {
+      $map = array();
+    }
+
     $header = $this->buildHeaderView($paste);
     $curtain = $this->buildCurtain($paste);
 
     $subheader = $this->buildSubheaderView($paste);
-    $source_code = $this->buildSourceCodeView($paste, $this->highlightMap);
+    $source_code = $this->buildSourceCodeView($paste, $map);
 
     require_celerity_resource('paste-css');
 

From 49af4165bc70b47b7fde68ff7b259fe187ea9d67 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Mar 2018 06:43:24 -0800
Subject: [PATCH 648/865] Support rendering arbitrary sections in the middle of
 a Harbormaster build log so links to line 3500 work

Summary:
Depends on D19162. Ref T13088. When a user links to `$1234`, we need to render a default view of the log with a piece at the head, a piece at the end, and a piece in the middle.

We also need to figure out the offset for line 1234, or multiple offsets for "1234-2345".

Since the logic views/reads mostly anticipated this it isn't too much of a mess, although there are a couple of bugs this exposes with view specifications that use combinations of parameters which were previously impossible.

Test Plan: Viewed a large log with no line marker. Viewed `$1`. Viewed `$end`. Viewed `$35-40`, etc. Expanded context around logs.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19163
---
 resources/celerity/map.php                    |  10 +-
 .../HarbormasterBuildLogRenderController.php  | 190 +++++++++++++++---
 .../storage/build/HarbormasterBuildLog.php    |  30 +++
 .../view/HarbormasterBuildLogView.php         |   3 +-
 .../harbormaster/behavior-harbormaster-log.js |   2 +-
 5 files changed, 202 insertions(+), 33 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 4eebc07609..9b68b42952 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -416,7 +416,7 @@
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '796a8803',
+    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => 'ab1173d1',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
@@ -636,7 +636,7 @@
     'javelin-behavior-event-all-day' => 'b41537c9',
     'javelin-behavior-fancy-datepicker' => 'ecf4e799',
     'javelin-behavior-global-drag-and-drop' => '960f6a39',
-    'javelin-behavior-harbormaster-log' => '796a8803',
+    'javelin-behavior-harbormaster-log' => 'ab1173d1',
     'javelin-behavior-herald-rule-editor' => '7ebaeed3',
     'javelin-behavior-high-security-warning' => 'a464fe03',
     'javelin-behavior-history-install' => '7ee2b591',
@@ -1526,9 +1526,6 @@
       'javelin-behavior',
       'javelin-quicksand',
     ),
-    '796a8803' => array(
-      'javelin-behavior',
-    ),
     '7a68dda3' => array(
       'owners-path-editor',
       'javelin-behavior',
@@ -1768,6 +1765,9 @@
       'javelin-util',
       'phabricator-prefab',
     ),
+    'ab1173d1' => array(
+      'javelin-behavior',
+    ),
     'ab2f381b' => array(
       'javelin-request',
       'javelin-behavior',
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
index 6d623f2bc5..27a75f288b 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -16,6 +16,8 @@ public function handleRequest(AphrontRequest $request) {
       return new Aphront404Response();
     }
 
+    $highlight_range = $request->getURILineRange('lines', 1000);
+
     $log_size = $this->getTotalByteLength($log);
 
     $head_lines = $request->getInt('head');
@@ -65,6 +67,16 @@ public function handleRequest(AphrontRequest $request) {
       );
     }
 
+    if ($highlight_range) {
+      $highlight_views = $this->getHighlightViews(
+        $log,
+        $highlight_range,
+        $log_size);
+      foreach ($highlight_views as $highlight_view) {
+        $views[] = $highlight_view;
+      }
+    }
+
     if ($tail_lines > 0) {
       $views[] = array(
         'offset' => $tail_offset,
@@ -86,10 +98,11 @@ public function handleRequest(AphrontRequest $request) {
 
       $direction = $read['direction'];
       if ($direction < 0) {
-        $offset -= $read_length;
-        if ($offset < 0) {
+        if ($offset > $read_length) {
+          $offset -= $read_length;
+        } else {
+          $read_length = $offset;
           $offset = 0;
-          $read_length = $log_size;
         }
       }
 
@@ -215,8 +228,10 @@ public function handleRequest(AphrontRequest $request) {
         }
 
         $limit = $view['limit'];
-        if ($limit < ($view_offset + $view_length)) {
-          $view_length = ($limit - $view_offset);
+        if ($limit !== null) {
+          if ($limit < ($view_offset + $view_length)) {
+            $view_length = ($limit - $view_offset);
+          }
         }
       } else {
         $view_offset = $data_offset;
@@ -226,9 +241,11 @@ public function handleRequest(AphrontRequest $request) {
         }
 
         $limit = $view['limit'];
-        if ($limit > $view_offset) {
-          $view_length -= ($limit - $view_offset);
-          $view_offset = $limit;
+        if ($limit !== null) {
+          if ($limit > $view_offset) {
+            $view_length -= ($limit - $view_offset);
+            $view_offset = $limit;
+          }
         }
       }
 
@@ -325,7 +342,6 @@ public function handleRequest(AphrontRequest $request) {
     }
 
     $uri = $log->getURI();
-    $highlight_range = $request->getURIData('lines');
 
     $rows = array();
     foreach ($render as $range) {
@@ -339,6 +355,16 @@ public function handleRequest(AphrontRequest $request) {
         $display_line = ($line['line'] + 1);
         $display_text = ($line['data']);
 
+        $cell_attr = array();
+        if ($highlight_range) {
+          if (($display_line >= $highlight_range[0]) &&
+              ($display_line <= $highlight_range[1])) {
+            $cell_attr = array(
+              'class' => 'phabricator-source-highlight',
+            );
+          }
+        }
+
         $display_line = phutil_tag(
           'a',
           array(
@@ -347,7 +373,7 @@ public function handleRequest(AphrontRequest $request) {
           $display_line);
 
         $line_cell = phutil_tag('th', array(), $display_line);
-        $text_cell = phutil_tag('td', array(), $display_text);
+        $text_cell = phutil_tag('td', $cell_attr, $display_text);
 
         $rows[] = phutil_tag(
           'tr',
@@ -557,25 +583,43 @@ private function mergeOverlappingViews(array $views) {
         $vs = $vview['viewOffset'];
         $ve = $vs + $vview['viewLength'];
 
+        // Don't merge if one of the slices starts at a byte offset
+        // significantly after the other ends.
+        if (($vs > $ue + $body_bytes) || ($us > $ve + $body_bytes)) {
+          continue;
+        }
+
         $uss = $uview['sliceOffset'];
         $use = $uss + $uview['sliceLength'];
 
         $vss = $vview['sliceOffset'];
         $vse = $vss + $vview['sliceLength'];
 
-        if ($ue <= $vs) {
-          if (($ue + $body_bytes) >= $vs) {
-            if (($use + $body_lines) >= $vss) {
-              $views[$ukey] = array(
-                'sliceLength' => ($vse - $uss),
-                'viewLength' => ($ve - $us),
-              ) + $views[$ukey];
-
-              unset($views[$vkey]);
-              continue;
-            }
-          }
+        // Don't merge if one of the slices starts at a line offset
+        // significantly after the other ends.
+        if ($uss > ($vse + $body_lines) || $vss > ($use + $body_lines)) {
+          continue;
         }
+
+        // These views are overlapping or nearly overlapping, so we merge
+        // them. We merge views even if they aren't exactly adjacent since
+        // it's silly to render an "expand more" which only expands a couple
+        // of lines.
+
+        $offset = min($us, $vs);
+        $length = max($ue, $ve) - $offset;
+
+        $slice_offset = min($uss, $vss);
+        $slice_length = max($use, $vse) - $slice_offset;
+
+        $views[$ukey] = array(
+          'viewOffset' => $offset,
+          'viewLength' => $length,
+          'sliceOffset' => $slice_offset,
+          'sliceLength' => $slice_length,
+        ) + $views[$ukey];
+
+        unset($views[$vkey]);
       }
     }
 
@@ -603,7 +647,7 @@ private function renderExpandRow($range) {
         'meta' => array(
           'headOffset' => $range['head'],
           'tailOffset' => $range['tail'],
-          'head' => 4,
+          'head' => 128,
           'tail' => 0,
         ),
       ),
@@ -620,8 +664,8 @@ private function renderExpandRow($range) {
         'meta' => array(
           'headOffset' => $range['head'],
           'tailOffset' => $range['tail'],
-          'head' => 2,
-          'tail' => 2,
+          'head' => 128,
+          'tail' => 128,
         ),
       ),
       $mid_text);
@@ -640,7 +684,7 @@ private function renderExpandRow($range) {
           'headOffset' => $range['head'],
           'tailOffset' => $range['tail'],
           'head' => 0,
-          'tail' => 4,
+          'tail' => 128,
         ),
       ),
       $down_text);
@@ -727,4 +771,98 @@ private function renderActionTable(array $action_cells) {
     return phutil_tag('tr', array(), $format_cells);
   }
 
+  private function getHighlightViews(
+    HarbormasterBuildLog $log,
+    array $range,
+    $log_size) {
+    // If we're highlighting a line range in the file, we first need to figure
+    // out the offsets for the lines we care about.
+    list($range_min, $range_max) = $range;
+
+    // Read the markers to find a range we can load which includes both lines.
+    $read_range = $log->getLineSpanningRange($range_min, $range_max);
+    list($min_pos, $max_pos, $min_line) = $read_range;
+
+    $length = ($max_pos - $min_pos);
+
+    // Reject to do the read if it requires us to examine a huge amount of
+    // data. For example, the user may request lines "$1-1000" of a file where
+    // each line has 100MB of text.
+    $limit = (1024 * 1024 * 16);
+    if ($length > $limit) {
+      return array();
+    }
+
+    $data = $log->loadData($min_pos, $length);
+
+    $offset = $min_pos;
+    $min_offset = null;
+    $max_offset = null;
+
+    $lines = $this->getLines($data);
+    $number = ($min_line + 1);
+
+    foreach ($lines as $line) {
+      if ($min_offset === null) {
+        if ($number === $range_min) {
+          $min_offset = $offset;
+        }
+      }
+
+      $offset += strlen($line);
+
+      if ($max_offset === null) {
+        if ($number === $range_max) {
+          $max_offset = $offset;
+          break;
+        }
+      }
+
+      $number += 1;
+    }
+
+    $context_lines = 8;
+
+    // Build views around the beginning and ends of the respective lines. We
+    // expect these views to overlap significantly in normal circumstances
+    // and be merged later.
+    $views = array();
+
+    if ($min_offset !== null) {
+      $views[] = array(
+        'offset' => $min_offset,
+        'lines' => $context_lines + ($range_max - $range_min) - 1,
+        'direction' => 1,
+        'limit' => null,
+      );
+      if ($min_offset > 0) {
+        $views[] = array(
+          'offset' => $min_offset,
+          'lines' => $context_lines,
+          'direction' => -1,
+          'limit' => null,
+        );
+      }
+    }
+
+    if ($max_offset !== null) {
+      $views[] = array(
+        'offset' => $max_offset,
+        'lines' => $context_lines + ($range_max - $range_min),
+        'direction' => -1,
+        'limit' => null,
+      );
+      if ($max_offset < $log_size) {
+        $views[] = array(
+          'offset' => $max_offset,
+          'lines' => $context_lines,
+          'direction' => 1,
+          'limit' => null,
+        );
+      }
+    }
+
+    return $views;
+  }
+
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
index bf69457254..5bc358ccc8 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
@@ -212,6 +212,36 @@ public function loadData($offset, $length) {
     return $parts;
   }
 
+  public function getLineSpanningRange($min_line, $max_line) {
+    $map = $this->getLineMap();
+    if (!$map) {
+      throw new Exception(pht('No line map.'));
+    }
+
+    $min_pos = 0;
+    $min_line = 0;
+    $max_pos = $this->getByteLength();
+    list($map) = $map;
+    foreach ($map as $marker) {
+      list($offset, $count) = $marker;
+
+      if ($count < $min_line) {
+        if ($offset > $min_pos) {
+          $min_pos = $offset;
+          $min_line = $count;
+        }
+      }
+
+      if ($count > $max_line) {
+        $max_pos = min($max_pos, $offset);
+        break;
+      }
+    }
+
+    return array($min_pos, $max_pos, $min_line);
+  }
+
+
   public function getReadPosition($read_offset) {
     $position = array(0, 0);
 
diff --git a/src/applications/harbormaster/view/HarbormasterBuildLogView.php b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
index 7200cdce70..768c55a504 100644
--- a/src/applications/harbormaster/view/HarbormasterBuildLogView.php
+++ b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
@@ -67,7 +67,8 @@ public function render() {
         'harbormaster-log',
         array(
           'contentNodeID' => $content_id,
-          'renderURI' => $log->getRenderURI($this->getHighlightedLineRange()),
+          'initialURI' => $log->getRenderURI($this->getHighlightedLineRange()),
+          'renderURI' => $log->getRenderURI(null),
         ));
 
       $box_view->appendChild($content_div);
diff --git a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
index 510631e1e0..2b91106725 100644
--- a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
+++ b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
@@ -79,7 +79,7 @@ JX.behavior('harbormaster-log', function(config) {
     JX.DOM.setContent(contentNode, JX.$H(r.markup));
   }
 
-  var uri = new JX.URI(config.renderURI);
+  var uri = new JX.URI(config.initialURI);
 
   new JX.Request(uri, onresponse)
     .send();

From fe3de5dd58b4b7ae3b696dd250c837971682cd96 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Mar 2018 07:43:53 -0800
Subject: [PATCH 649/865] Make Paste source code line highlighting behavior
 more generic

Summary: Depends on D19163. Ref T13088. Increase the generality of this code so it can be shared with Harbormaster.

Test Plan: Clicked individual lines, clicked-and-dragged, etc., in Paste. Got sensible URI and highlight behaviors.

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19164
---
 resources/celerity/map.php                    |  20 +--
 src/view/layout/PhabricatorSourceCodeView.php |  14 +-
 .../layout/phabricator-source-code-view.css   |  11 +-
 webroot/rsrc/js/core/behavior-line-linker.js  | 122 +++++++++++++-----
 4 files changed, 117 insertions(+), 50 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 9b68b42952..f636013c3b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -122,7 +122,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => 'aea41829',
+    'rsrc/css/layout/phabricator-source-code-view.css' => '926ced2d',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -495,7 +495,7 @@
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
     'rsrc/js/core/behavior-lightbox-attachments.js' => 'e31fad01',
-    'rsrc/js/core/behavior-line-linker.js' => '1499a8cb',
+    'rsrc/js/core/behavior-line-linker.js' => 'c479ac01',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
@@ -658,7 +658,7 @@
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
-    'javelin-behavior-phabricator-line-linker' => '1499a8cb',
+    'javelin-behavior-phabricator-line-linker' => 'c479ac01',
     'javelin-behavior-phabricator-nav' => '836f966d',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
@@ -802,7 +802,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => 'aea41829',
+    'phabricator-source-code-view-css' => '926ced2d',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
@@ -998,12 +998,6 @@
       'javelin-dom',
       'javelin-typeahead-normalizer',
     ),
-    '1499a8cb' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-history',
-    ),
     '15d5ff71' => array(
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
@@ -1937,6 +1931,12 @@
       'javelin-stratcom',
       'phabricator-tooltip',
     ),
+    'c479ac01' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-history',
+    ),
     'c587b80f' => array(
       'javelin-install',
     ),
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index eb34925b3f..f5f6c22b51 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -73,6 +73,7 @@ public function render() {
           pht('...')));
     }
 
+    $base_uri = (string)$this->uri;
     foreach ($lines as $line) {
 
       // NOTE: See phabricator-oncopy behavior.
@@ -84,17 +85,16 @@ public function render() {
       }
 
       if ($this->canClickHighlight) {
-        $line_uri = $this->uri.'$'.$line_number;
-        $line_href = (string)new PhutilURI($line_uri);
+        $line_href = $base_uri.'$'.$line_number;
 
-        $tag_number = javelin_tag(
+        $tag_number = phutil_tag(
           'a',
           array(
             'href' => $line_href,
           ),
           $line_number);
       } else {
-        $tag_number = javelin_tag(
+        $tag_number = phutil_tag(
           'span',
           array(),
           $line_number);
@@ -104,11 +104,10 @@ public function render() {
         'tr',
         $row_attributes,
         array(
-          javelin_tag(
+          phutil_tag(
             'th',
             array(
               'class' => 'phabricator-source-line',
-              'sigil' => 'phabricator-source-line',
             ),
             $tag_number),
           phutil_tag(
@@ -134,6 +133,9 @@ public function render() {
         array(
           'class' => implode(' ', $classes),
           'sigil' => 'phabricator-source',
+          'meta' => array(
+            'uri' => (string)$this->uri,
+          ),
         ),
         phutil_implode_html('', $rows)));
   }
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index a855e01447..446366cdf1 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -31,7 +31,6 @@
 .phabricator-source-line {
   background-color: {$paste.highlight};
   text-align: right;
-  padding: 2px 6px 1px 12px;
   border-right: 1px solid {$paste.border};
   color: {$sh-yellowtext};
 
@@ -48,17 +47,23 @@
 
 th.phabricator-source-line a {
   color: {$darkbluetext};
+  display: block;
+  padding: 2px 6px 1px 12px;
 }
 
-th.phabricator-source-line:hover {
+th.phabricator-source-line a:hover {
   background: {$paste.border};
-  cursor: pointer;
+  text-decoration: none;
 }
 
 .phabricator-source-highlight {
   background: {$paste.highlight};
 }
 
+.phabricator-source-highlight th.phabricator-source-line {
+  background: {$paste.border};
+}
+
 .phabricator-source-code-summary {
   padding-bottom: 8px;
 }
diff --git a/webroot/rsrc/js/core/behavior-line-linker.js b/webroot/rsrc/js/core/behavior-line-linker.js
index 0a651d6ca0..ed93e6e11b 100644
--- a/webroot/rsrc/js/core/behavior-line-linker.js
+++ b/webroot/rsrc/js/core/behavior-line-linker.js
@@ -10,6 +10,7 @@ JX.behavior('phabricator-line-linker', function() {
   var origin = null;
   var target = null;
   var root = null;
+  var highlighted = null;
 
   var editor_link = null;
   try {
@@ -19,48 +20,101 @@ JX.behavior('phabricator-line-linker', function() {
   }
 
   function getRowNumber(tr) {
-    var th = JX.DOM.find(tr, 'th', 'phabricator-source-line');
+    var th = tr.firstChild;
     return +(th.textContent || th.innerText);
   }
 
   JX.Stratcom.listen(
-    'mousedown',
-    'phabricator-source-line',
+    ['click', 'mousedown'],
+    ['phabricator-source', 'tag:tr', 'tag:th', 'tag:a'],
     function(e) {
       if (!e.isNormalMouseEvent()) {
         return;
       }
-      origin = e.getNode('tag:tr');
-      target = origin;
-      root = e.getNode('phabricator-source');
-      e.kill();
-    });
 
-  JX.Stratcom.listen(
-    'click',
-    'phabricator-source-line',
-    function(e) {
+      // Make sure the link we clicked is actually a line number in a source
+      // table, not some kind of link in some element embedded inside the
+      // table. The row's immediate ancestor table needs to be the table with
+      // the "phabricator-source" sigil.
+
+      var row = e.getNode('tag:tr');
+      var table = e.getNode('phabricator-source');
+      if (JX.DOM.findAbove(row, 'table') !== table) {
+        return;
+      }
+
+      var number = getRowNumber(row);
+      if (!number) {
+        return;
+      }
+
       e.kill();
+
+      // If this is a click event, kill it. We handle mousedown and mouseup
+      // instead.
+      if (e.getType() === 'click') {
+        return;
+      }
+
+      origin = row;
+      target = origin;
+
+      root = table;
     });
 
   var highlight = function(e) {
-    if (!origin || e.getNode('phabricator-source') !== root) {
+    if (!origin) {
+      return;
+    }
+
+    if (e.getNode('phabricator-source') !== root) {
       return;
     }
     target = e.getNode('tag:tr');
 
-    var highlighting = false;
-    var source = null;
-    var trs = JX.DOM.scry(root, 'tr');
-    for (var i = 0; i < trs.length; i++) {
-      if (!highlighting && (trs[i] === origin || trs[i] === target)) {
-        highlighting = true;
-        source = trs[i];
+    var min;
+    var max;
+
+    // NOTE: We're using position to figure out which order these rows are in,
+    // not row numbers. We do this because Harbormaster build logs may have
+    // multiple rows with the same row number.
+
+    if (JX.$V(origin).y <= JX.$V(target).y) {
+      min = origin;
+      max = target;
+    } else {
+      min = target;
+      max = origin;
+    }
+
+    // If we haven't changed highlighting, we don't have a list of highlighted
+    // nodes yet. Assume every row is highlighted.
+    var ii;
+    if (highlighted === null) {
+      highlighted = [];
+      var rows = JX.DOM.scry(root, 'tr');
+      for (ii = 0; ii < rows.length; ii++) {
+        highlighted.push(rows[ii]);
       }
-      JX.DOM.alterClass(trs[i], 'phabricator-source-highlight', highlighting);
-      if (trs[i] === (source === origin ? target : origin)) {
-        highlighting = false;
+    }
+
+    // Unhighlight any existing highlighted rows.
+    for (ii = 0; ii < highlighted.length; ii++) {
+      JX.DOM.alterClass(highlighted[ii], 'phabricator-source-highlight', false);
+    }
+    highlighted = [];
+
+    // Highlight the newly selected rows.
+    var cursor = min;
+    while (true) {
+      JX.DOM.alterClass(cursor, 'phabricator-source-highlight', true);
+      highlighted.push(cursor);
+
+      if (cursor === max) {
+        break;
       }
+
+      cursor = cursor.nextSibling;
     }
   };
 
@@ -75,20 +129,26 @@ JX.behavior('phabricator-line-linker', function() {
       }
 
       highlight(e);
+      e.kill();
 
       var o = getRowNumber(origin);
       var t = getRowNumber(target);
-      var lines = (o == t ? o : Math.min(o, t) + '-' + Math.max(o, t));
-      var th = JX.DOM.find(origin, 'th', 'phabricator-source-line');
-      var uri = JX.DOM.find(th, 'a').href;
-      uri = uri.replace(/(.*\$)\d+/, '$1' + lines);
+      var uri = JX.Stratcom.getData(root).uri;
+
       origin = null;
       target = null;
-      e.kill();
+      root = null;
+
+      var lines = (o == t ? o : Math.min(o, t) + '-' + Math.max(o, t));
+      uri = uri + '$' + lines;
+
       JX.History.replace(uri);
-      if (editor_link.href) {
-        var editdata = JX.Stratcom.getData(editor_link);
-        editor_link.href = editdata.link_template.replace('%25l', o);
+
+      if (editor_link) {
+        if (editor_link.href) {
+          var editdata = JX.Stratcom.getData(editor_link);
+          editor_link.href = editdata.link_template.replace('%25l', o);
+        }
       }
     });
 

From 73619c4643c9e3c9111294eb93d779cef4c5bdeb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Mar 2018 08:02:32 -0800
Subject: [PATCH 650/865] Share the Paste line highlighting behavior for
 Harbormaster build logs

Summary: Depends on D19164. Ref T13088. Now that the JS behaviors are generic, use them on the Harbormaster standalone page.

Test Plan: Clicked lines and dragged across line ranges. Reloaded pages. Saw expected highlighting behavior in the client and on the server across reloads.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19165
---
 resources/celerity/map.php                         |  4 ++--
 .../HarbormasterBuildLogRenderController.php       | 14 +++++++++-----
 .../HarbormasterBuildLogViewController.php         |  3 ++-
 .../harbormaster/view/HarbormasterBuildLogView.php | 10 ++++++++++
 .../css/application/harbormaster/harbormaster.css  |  6 +++++-
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f636013c3b..112c75919b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -78,7 +78,7 @@
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
-    'rsrc/css/application/harbormaster/harbormaster.css' => '5dd4c2de',
+    'rsrc/css/application/harbormaster/harbormaster.css' => '2999ccaa',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'cd8d0134',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
@@ -579,7 +579,7 @@
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => 'b556a948',
-    'harbormaster-css' => '5dd4c2de',
+    'harbormaster-css' => '2999ccaa',
     'herald-css' => 'cd8d0134',
     'herald-rule-editor' => 'dca75c0e',
     'herald-test-css' => 'a52e323e',
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
index 27a75f288b..4fa826b690 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -355,11 +355,11 @@ public function handleRequest(AphrontRequest $request) {
         $display_line = ($line['line'] + 1);
         $display_text = ($line['data']);
 
-        $cell_attr = array();
+        $row_attr = array();
         if ($highlight_range) {
           if (($display_line >= $highlight_range[0]) &&
               ($display_line <= $highlight_range[1])) {
-            $cell_attr = array(
+            $row_attr = array(
               'class' => 'phabricator-source-highlight',
             );
           }
@@ -373,11 +373,11 @@ public function handleRequest(AphrontRequest $request) {
           $display_line);
 
         $line_cell = phutil_tag('th', array(), $display_line);
-        $text_cell = phutil_tag('td', $cell_attr, $display_text);
+        $text_cell = phutil_tag('td', array(), $display_text);
 
         $rows[] = phutil_tag(
           'tr',
-          array(),
+          $row_attr,
           array(
             $line_cell,
             $text_cell,
@@ -401,10 +401,14 @@ public function handleRequest(AphrontRequest $request) {
       }
     }
 
-    $table = phutil_tag(
+    $table = javelin_tag(
       'table',
       array(
         'class' => 'harbormaster-log-table PhabricatorMonospaced',
+        'sigil' => 'phabricator-source',
+        'meta' => array(
+          'uri' => $log->getURI(),
+        ),
       ),
       $rows);
 
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
index 40641795c5..888b3bddb2 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogViewController.php
@@ -24,7 +24,8 @@ public function handleRequest(AphrontRequest $request) {
     $log_view = id(new HarbormasterBuildLogView())
       ->setViewer($viewer)
       ->setBuildLog($log)
-      ->setHighlightedLineRange($request->getURIData('lines'));
+      ->setHighlightedLineRange($request->getURIData('lines'))
+      ->setEnableHighlighter(true);
 
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb(pht('Build Logs'))
diff --git a/src/applications/harbormaster/view/HarbormasterBuildLogView.php b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
index 768c55a504..5eb32a84e5 100644
--- a/src/applications/harbormaster/view/HarbormasterBuildLogView.php
+++ b/src/applications/harbormaster/view/HarbormasterBuildLogView.php
@@ -4,6 +4,7 @@ final class HarbormasterBuildLogView extends AphrontView {
 
   private $log;
   private $highlightedLineRange;
+  private $enableHighlighter;
 
   public function setBuildLog(HarbormasterBuildLog $log) {
     $this->log = $log;
@@ -23,6 +24,11 @@ public function getHighlightedLineRange() {
     return $this->highlightedLineRange;
   }
 
+  public function setEnableHighlighter($enable) {
+    $this->enableHighlighter = $enable;
+    return $this;
+  }
+
   public function render() {
     $viewer = $this->getViewer();
     $log = $this->getBuildLog();
@@ -50,6 +56,10 @@ public function render() {
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setHeader($header);
 
+    if ($this->enableHighlighter) {
+      Javelin::initBehavior('phabricator-line-linker');
+    }
+
     $has_linemap = $log->getLineMap();
     if ($has_linemap) {
       $content_id = celerity_generate_unique_node_id();
diff --git a/webroot/rsrc/css/application/harbormaster/harbormaster.css b/webroot/rsrc/css/application/harbormaster/harbormaster.css
index b22658219a..0e8574464d 100644
--- a/webroot/rsrc/css/application/harbormaster/harbormaster.css
+++ b/webroot/rsrc/css/application/harbormaster/harbormaster.css
@@ -69,7 +69,11 @@
   padding: 4px 0;
 }
 
-.harbormaster-log-table tr.harbormaster-log-highlighted > td {
+.harbormaster-log-table tr.phabricator-source-highlight > th {
+  background: {$paste.border};
+}
+
+.harbormaster-log-table tr.phabricator-source-highlight > td {
   background: {$paste.highlight};
 }
 

From 4e91ad276d8ab45dc7ec26ebf72cc43ba945c892 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Mar 2018 08:14:17 -0800
Subject: [PATCH 651/865] Prevent copying Harbormaster build log line numbers
 with CSS psuedocontent instead of ZWS

Summary:
Depends on D19165. Ref T13088. Currently, in other applications, we use Zero Width Spaces and Javascript "copy" listeners to prevent line numbers from being copied. This isn't terribly elegant.

Modern browsers support a second approach: using psuedo-elements with `content`. Try this in Harbormaster since it's conceptually cleaner, at least. One immediate drawback is that Command-F can't find this text either.

Test Plan: In Safari, Chrome and Firefox, highlighted ranges of lines and copy/pasted text. Got just text (no line numbers) in all cases.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19166
---
 resources/celerity/map.php                    | 20 +++++++++----------
 .../HarbormasterBuildLogRenderController.php  |  3 ++-
 .../application/harbormaster/harbormaster.css |  6 ++++++
 webroot/rsrc/js/core/behavior-line-linker.js  | 10 ++++++++++
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 112c75919b..3ffa4bb058 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -78,7 +78,7 @@
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
-    'rsrc/css/application/harbormaster/harbormaster.css' => '2999ccaa',
+    'rsrc/css/application/harbormaster/harbormaster.css' => 'cd73d427',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'cd8d0134',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
@@ -495,7 +495,7 @@
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
     'rsrc/js/core/behavior-lightbox-attachments.js' => 'e31fad01',
-    'rsrc/js/core/behavior-line-linker.js' => 'c479ac01',
+    'rsrc/js/core/behavior-line-linker.js' => 'a9b946f8',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
@@ -579,7 +579,7 @@
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => 'b556a948',
-    'harbormaster-css' => '2999ccaa',
+    'harbormaster-css' => 'cd73d427',
     'herald-css' => 'cd8d0134',
     'herald-rule-editor' => 'dca75c0e',
     'herald-test-css' => 'a52e323e',
@@ -658,7 +658,7 @@
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
-    'javelin-behavior-phabricator-line-linker' => 'c479ac01',
+    'javelin-behavior-phabricator-line-linker' => 'a9b946f8',
     'javelin-behavior-phabricator-nav' => '836f966d',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
@@ -1743,6 +1743,12 @@
       'javelin-uri',
       'phabricator-keyboard-shortcut',
     ),
+    'a9b946f8' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-history',
+    ),
     'a9f88de2' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1931,12 +1937,6 @@
       'javelin-stratcom',
       'phabricator-tooltip',
     ),
-    'c479ac01' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-history',
-    ),
     'c587b80f' => array(
       'javelin-install',
     ),
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
index 4fa826b690..cc8da38da9 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -369,8 +369,9 @@ public function handleRequest(AphrontRequest $request) {
           'a',
           array(
             'href' => $uri.'$'.$display_line,
+            'data-n' => $display_line,
           ),
-          $display_line);
+          '');
 
         $line_cell = phutil_tag('th', array(), $display_line);
         $text_cell = phutil_tag('td', array(), $display_text);
diff --git a/webroot/rsrc/css/application/harbormaster/harbormaster.css b/webroot/rsrc/css/application/harbormaster/harbormaster.css
index 0e8574464d..38a65bf9a0 100644
--- a/webroot/rsrc/css/application/harbormaster/harbormaster.css
+++ b/webroot/rsrc/css/application/harbormaster/harbormaster.css
@@ -48,6 +48,12 @@
   user-select: none;
 }
 
+.harbormaster-log-table > tbody > tr > th a::before {
+  /* Render the line numbers into the document using a pseudo-element so that
+     the text is not copied. */
+  content: attr(data-n);
+}
+
 .harbormaster-log-table > tbody > tr > th a {
   display: block;
   color: {$darkbluetext};
diff --git a/webroot/rsrc/js/core/behavior-line-linker.js b/webroot/rsrc/js/core/behavior-line-linker.js
index ed93e6e11b..a0f99fb3bc 100644
--- a/webroot/rsrc/js/core/behavior-line-linker.js
+++ b/webroot/rsrc/js/core/behavior-line-linker.js
@@ -21,6 +21,16 @@ JX.behavior('phabricator-line-linker', function() {
 
   function getRowNumber(tr) {
     var th = tr.firstChild;
+
+    // If the "<th />" tag contains an "<a />" with "data-n" that we're using
+    // to prevent copy/paste of line numbers, use that.
+    if (th.firstChild) {
+      var line = th.firstChild.getAttribute('data-n');
+      if (line) {
+        return line;
+      }
+    }
+
     return +(th.textContent || th.innerText);
   }
 

From 1f40e50f7e50f7217b931f350e58a7572809c913 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Mar 2018 10:43:28 -0800
Subject: [PATCH 652/865] Improve live Harbormaster log follow behaviors

Summary:
Depends on D19166. Ref T13088. When the user scrolls away from a followed log, break the focus lock.

Let users stop following a live log.

Show when lines are added more clearly.

Don't refresh quite as quickly give users a better shot at clicking the stop button.

These behaviors can probably be refined but are at least more plausible and less actively user-hostile than the first version of this behavior was.

Test Plan: Used `write-log --rate` to write a large log slowly. Clicked "Follow Log", followed for a bit. Scrolled away, still got live updates but no more scroll lock. Clicked stop, no more updates.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19167
---
 resources/celerity/map.php                    | 14 +++---
 .../HarbormasterBuildLogRenderController.php  | 26 +++++++++--
 .../application/harbormaster/harbormaster.css | 28 ++++++++++++
 .../harbormaster/behavior-harbormaster-log.js | 45 +++++++++++++++----
 4 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 3ffa4bb058..f601b5cec3 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -78,7 +78,7 @@
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
-    'rsrc/css/application/harbormaster/harbormaster.css' => 'cd73d427',
+    'rsrc/css/application/harbormaster/harbormaster.css' => '730a4a3c',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'cd8d0134',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
@@ -416,7 +416,7 @@
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => 'ab1173d1',
+    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
@@ -579,7 +579,7 @@
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => 'b556a948',
-    'harbormaster-css' => 'cd73d427',
+    'harbormaster-css' => '730a4a3c',
     'herald-css' => 'cd8d0134',
     'herald-rule-editor' => 'dca75c0e',
     'herald-test-css' => 'a52e323e',
@@ -636,7 +636,7 @@
     'javelin-behavior-event-all-day' => 'b41537c9',
     'javelin-behavior-fancy-datepicker' => 'ecf4e799',
     'javelin-behavior-global-drag-and-drop' => '960f6a39',
-    'javelin-behavior-harbormaster-log' => 'ab1173d1',
+    'javelin-behavior-harbormaster-log' => '191b4909',
     'javelin-behavior-herald-rule-editor' => '7ebaeed3',
     'javelin-behavior-high-security-warning' => 'a464fe03',
     'javelin-behavior-history-install' => '7ee2b591',
@@ -1022,6 +1022,9 @@
     '185bbd53' => array(
       'javelin-install',
     ),
+    '191b4909' => array(
+      'javelin-behavior',
+    ),
     '1ad0a787' => array(
       'javelin-install',
       'javelin-reactor',
@@ -1765,9 +1768,6 @@
       'javelin-util',
       'phabricator-prefab',
     ),
-    'ab1173d1' => array(
-      'javelin-behavior',
-    ),
     'ab2f381b' => array(
       'javelin-request',
       'javelin-behavior',
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
index cc8da38da9..7a5050becf 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildLogRenderController.php
@@ -720,12 +720,16 @@ private function renderExpandRow($range) {
 
   private function renderLiveRow($log_size) {
     $icon_down = id(new PHUIIconView())
-      ->setIcon('fa-chevron-down');
+      ->setIcon('fa-angle-double-down');
+
+    $icon_pause = id(new PHUIIconView())
+      ->setIcon('fa-pause');
 
     $follow = javelin_tag(
       'a',
       array(
         'sigil' => 'harbormaster-log-expand harbormaster-log-live',
+        'class' => 'harbormaster-log-follow-start',
         'meta' => array(
           'headOffset' => $log_size,
           'head' => 0,
@@ -737,8 +741,21 @@ private function renderLiveRow($log_size) {
         $icon_down,
         ' ',
         pht('Follow Log'),
+      ));
+
+    $stop_following = javelin_tag(
+      'a',
+      array(
+        'sigil' => 'harbormaster-log-expand',
+        'class' => 'harbormaster-log-follow-stop',
+        'meta' => array(
+          'stop' => true,
+        ),
+      ),
+      array(
+        $icon_pause,
         ' ',
-        $icon_down,
+        pht('Stop Following Log'),
       ));
 
     $expand_cells = array(
@@ -747,7 +764,10 @@ private function renderLiveRow($log_size) {
         array(
           'class' => 'harbormaster-log-follow',
         ),
-        $follow),
+        array(
+          $follow,
+          $stop_following,
+        )),
     );
 
     return $this->renderActionTable($expand_cells);
diff --git a/webroot/rsrc/css/application/harbormaster/harbormaster.css b/webroot/rsrc/css/application/harbormaster/harbormaster.css
index 38a65bf9a0..f3b75a397b 100644
--- a/webroot/rsrc/css/application/harbormaster/harbormaster.css
+++ b/webroot/rsrc/css/application/harbormaster/harbormaster.css
@@ -139,3 +139,31 @@
 .harbormaster-log-expand-down .phui-icon-view {
   margin: 0 4px 0 0;
 }
+
+
+.harbormaster-log-following .harbormaster-log-table
+  .harbormaster-log-follow-start {
+  display: none;
+}
+
+.harbormaster-log-table .harbormaster-log-follow-stop {
+  display: none;
+}
+
+.harbormaster-log-following .harbormaster-log-table
+  .harbormaster-log-follow-stop {
+  display: block;
+}
+
+.harbormaster-log-appear > td {
+  animation: harbormaster-fade-in 1s linear;
+}
+
+@keyframes harbormaster-fade-in {
+  0% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 1.0;
+  }
+}
diff --git a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
index 2b91106725..5bff2c1bb0 100644
--- a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
+++ b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
@@ -5,7 +5,9 @@
 
 JX.behavior('harbormaster-log', function(config) {
   var contentNode = JX.$(config.contentNodeID);
+
   var following = false;
+  var autoscroll = false;
 
   JX.DOM.listen(contentNode, 'click', 'harbormaster-log-expand', function(e) {
     if (!e.isNormalClick()) {
@@ -14,20 +16,29 @@ JX.behavior('harbormaster-log', function(config) {
 
     e.kill();
 
-    expand(e.getTarget());
+    expand(e.getTarget(), true);
   });
 
-  function expand(node) {
+  function expand(node, is_action) {
     var row = JX.DOM.findAbove(node, 'tr');
     row = JX.DOM.findAbove(row, 'tr');
 
     var data = JX.Stratcom.getData(node);
 
+    if (data.stop) {
+      following = false;
+      autoscroll = false;
+      JX.DOM.alterClass(contentNode, 'harbormaster-log-following', false);
+      return;
+    }
+
     var uri = new JX.URI(config.renderURI)
       .addQueryParams(data);
 
-    if (data.live) {
+    if (data.live && is_action) {
       following = true;
+      autoscroll = true;
+      JX.DOM.alterClass(contentNode, 'harbormaster-log-following', true);
     }
 
     var request = new JX.Request(uri, function(r) {
@@ -46,18 +57,34 @@ JX.behavior('harbormaster-log', function(config) {
       if (data.live) {
         // If this was a live follow, scroll the new data into view. This is
         // probably intensely annoying in practice but seems cool for now.
-        var last_row = rows[rows.length - 1];
-        var tail_pos = JX.$V(last_row).y + JX.Vector.getDim(last_row).y;
-        var view_y = JX.Vector.getViewport().y;
-        JX.DOM.scrollToPosition(null, (tail_pos - view_y) + 32);
-
-        setTimeout(follow, 500);
+        if (autoscroll) {
+          var last_row = rows[rows.length - 1];
+          var tail_pos = JX.$V(last_row).y + JX.Vector.getDim(last_row).y;
+          var view_y = JX.Vector.getViewport().y;
+          JX.DOM.scrollToPosition(null, (tail_pos - view_y) + 32);
+
+          // This will fire a scroll event, but we want to keep autoscroll
+          // enabled until we see an explicit scroll event by the user.
+          setTimeout(function() { autoscroll = true; }, 0);
+        }
+
+        setTimeout(follow, 2000);
+
+        for (var ii = 1; ii < (rows.length - 1); ii++) {
+          JX.DOM.alterClass(rows[ii], 'harbormaster-log-appear', true);
+        }
       }
     });
 
     request.send();
   }
 
+  // If the user explicitly scrolls while following a log, keep live updating
+  // it but stop following it with the scrollbar.
+  JX.Stratcom.listen('scroll', null, function() {
+    autoscroll = false;
+  });
+
   function follow() {
     if (!following) {
       return;

From 14fe941c349cafba70dda0662a2161ad5043e12d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Mar 2018 16:28:41 -0800
Subject: [PATCH 653/865] Reduce the cost of generating default user profile
 images

Summary:
See PHI413. You can pre-generate these with `bin/people profileimage --all`, but they're needlessly expensive to generate.

Streamline the workflow and cache some of the cacheable parts to reduce the generation cost.

Test Plan:
  - Ran `bin/people profileimage --all` and saw cost drop from {nav 15.801s > 4.839s}.
  - Set `defaultProfileImagePHID` to `NULL` in `phabricator_user.user` and purged caches with `bin/cache purge --all`.
  - Loaded user directory.
  - Saw default images regenerate relatively quickly.

Differential Revision: https://secure.phabricator.com/D19168
---
 src/__phutil_library_map__.php                |   2 -
 .../files/PhabricatorImageTransformer.php     |   6 +-
 ...abricatorFilesComposeAvatarBuiltinFile.php | 172 ++++++++++--------
 .../PhabricatorUserProfileImageCacheType.php  |  19 +-
 .../PhabricatorPeopleProfileImageWorkflow.php |   8 +-
 .../people/storage/PhabricatorUser.php        |   6 +-
 .../PhabricatorFilesComposeAvatarExample.php  |  95 ----------
 7 files changed, 111 insertions(+), 197 deletions(-)
 delete mode 100644 src/applications/uiexample/examples/PhabricatorFilesComposeAvatarExample.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 76bc79498e..bb08685634 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3044,7 +3044,6 @@
     'PhabricatorFilesApplicationStorageEnginePanel' => 'applications/files/applicationpanel/PhabricatorFilesApplicationStorageEnginePanel.php',
     'PhabricatorFilesBuiltinFile' => 'applications/files/builtin/PhabricatorFilesBuiltinFile.php',
     'PhabricatorFilesComposeAvatarBuiltinFile' => 'applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php',
-    'PhabricatorFilesComposeAvatarExample' => 'applications/uiexample/examples/PhabricatorFilesComposeAvatarExample.php',
     'PhabricatorFilesComposeIconBuiltinFile' => 'applications/files/builtin/PhabricatorFilesComposeIconBuiltinFile.php',
     'PhabricatorFilesConfigOptions' => 'applications/files/config/PhabricatorFilesConfigOptions.php',
     'PhabricatorFilesManagementCatWorkflow' => 'applications/files/management/PhabricatorFilesManagementCatWorkflow.php',
@@ -8628,7 +8627,6 @@
     'PhabricatorFilesApplicationStorageEnginePanel' => 'PhabricatorApplicationConfigurationPanel',
     'PhabricatorFilesBuiltinFile' => 'Phobject',
     'PhabricatorFilesComposeAvatarBuiltinFile' => 'PhabricatorFilesBuiltinFile',
-    'PhabricatorFilesComposeAvatarExample' => 'PhabricatorUIExample',
     'PhabricatorFilesComposeIconBuiltinFile' => 'PhabricatorFilesBuiltinFile',
     'PhabricatorFilesConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorFilesManagementCatWorkflow' => 'PhabricatorFilesManagementWorkflow',
diff --git a/src/applications/files/PhabricatorImageTransformer.php b/src/applications/files/PhabricatorImageTransformer.php
index df4243cfdd..f29ce97835 100644
--- a/src/applications/files/PhabricatorImageTransformer.php
+++ b/src/applications/files/PhabricatorImageTransformer.php
@@ -333,8 +333,12 @@ private static function saveImageDataAsPNG($image) {
       return null;
     }
 
+    // NOTE: Empirically, the highest compression level (9) seems to take
+    // up to twice as long as the default compression level (6) but produce
+    // only slightly smaller files (10% on avatars, 3% on screenshots).
+
     ob_start();
-    $result = imagepng($image, null, 9);
+    $result = imagepng($image, null, 6);
     $output = ob_get_clean();
 
     if (!$result) {
diff --git a/src/applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php b/src/applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php
index fcd6f97601..4f827f7603 100644
--- a/src/applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php
+++ b/src/applications/files/builtin/PhabricatorFilesComposeAvatarBuiltinFile.php
@@ -7,8 +7,79 @@ final class PhabricatorFilesComposeAvatarBuiltinFile
   private $color;
   private $border;
 
+  private $maps = array();
+
   const VERSION = 'v1';
 
+  public function updateUser(PhabricatorUser $user) {
+    $username = $user->getUsername();
+
+    $image_map = $this->getMap('image');
+    $initial = phutil_utf8_strtoupper(substr($username, 0, 1));
+    $pack = $this->pickMap('pack', $username);
+    $icon = "alphanumeric/{$pack}/{$initial}.png";
+    if (!isset($image_map[$icon])) {
+      $icon = "alphanumeric/{$pack}/_default.png";
+    }
+
+    $border = $this->pickMap('border', $username);
+    $color = $this->pickMap('color', $username);
+
+    $data = $this->composeImage($color, $icon, $border);
+    $name = $this->getImageDisplayName($color, $icon, $border);
+
+    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+
+      $file = PhabricatorFile::newFromFileData(
+        $data,
+        array(
+          'name' => $name,
+          'profile' => true,
+          'canCDN' => true,
+        ));
+
+      $user
+        ->setDefaultProfileImagePHID($file->getPHID())
+        ->setDefaultProfileImageVersion(self::VERSION)
+        ->saveWithoutIndex();
+
+    unset($unguarded);
+
+    return $file;
+  }
+
+  private function getMap($map_key) {
+    if (!isset($this->maps[$map_key])) {
+      switch ($map_key) {
+        case 'pack':
+          $map = $this->newPackMap();
+          break;
+        case 'image':
+          $map = $this->newImageMap();
+          break;
+        case 'color':
+          $map = $this->newColorMap();
+          break;
+        case 'border':
+          $map = $this->newBorderMap();
+          break;
+        default:
+          throw new Exception(pht('Unknown map "%s".', $map_key));
+      }
+      $this->maps[$map_key] = $map;
+    }
+
+    return $this->maps[$map_key];
+  }
+
+  private function pickMap($map_key, $username) {
+    $map = $this->getMap($map_key);
+    $seed = $username.'_'.$map_key;
+    $key = PhabricatorHash::digestToRange($seed, 0, count($map) - 1);
+    return $map[$key];
+  }
+
+
   public function setIcon($icon) {
     $this->icon = $icon;
     return $this;
@@ -46,15 +117,22 @@ public function getBuiltinFileKey() {
   }
 
   public function getBuiltinDisplayName() {
-    $icon = $this->getIcon();
-    $color = $this->getColor();
-    $border = implode(',', $this->getBorder());
+    return $this->getImageDisplayName(
+      $this->getIcon(),
+      $this->getColor(),
+      $this->getBorder());
+  }
+
+  private function getImageDisplayName($icon, $color, $border) {
+    $border = implode(',', $border);
     return "{$icon}-{$color}-{$border}.png";
   }
 
   public function loadBuiltinFileData() {
     return $this->composeImage(
-      $this->getColor(), $this->getIcon(), $this->getBorder());
+      $this->getColor(),
+      $this->getIcon(),
+      $this->getBorder());
   }
 
   private function composeImage($color, $image, $border) {
@@ -68,7 +146,7 @@ private function composeImage($color, $image, $border) {
 
     $color_const = hexdec(trim($color, '#'));
     $true_border = self::rgba2gd($border);
-    $image_map = self::getImageMap();
+    $image_map = $this->getMap('image');
     $data = Filesystem::readFile($image_map[$image]);
 
     $img = imagecreatefromstring($data);
@@ -111,10 +189,10 @@ private static function rgba2gd($rgba) {
     $b = $rgba[2];
     $a = $rgba[3];
     $a = (1 - $a) * 255;
-      return ($a << 24) | ($r << 16) | ($g << 8) | $b;
+    return ($a << 24) | ($r << 16) | ($g << 8) | $b;
   }
 
-  public static function getImageMap() {
+  private function newImageMap() {
     $root = dirname(phutil_get_library_root('phabricator'));
     $root = $root.'/resources/builtin/alphanumeric/';
 
@@ -131,64 +209,7 @@ public static function getImageMap() {
     return $map;
   }
 
-  public function getUniqueProfileImage($username) {
-    $pack_map = $this->getImagePackMap();
-    $image_map = $this->getImageMap();
-    $color_map = $this->getColorMap();
-    $border_map = $this->getBorderMap();
-    $file = phutil_utf8_strtoupper(substr($username, 0, 1));
-
-    $pack_count = count($pack_map);
-    $color_count = count($color_map);
-    $border_count = count($border_map);
-
-    $pack_seed = $username.'_pack';
-    $color_seed = $username.'_color';
-    $border_seed = $username.'_border';
-
-    $pack_key =
-      PhabricatorHash::digestToRange($pack_seed, 0, $pack_count - 1);
-    $color_key =
-      PhabricatorHash::digestToRange($color_seed, 0, $color_count - 1);
-    $border_key =
-      PhabricatorHash::digestToRange($border_seed, 0, $border_count - 1);
-
-    $pack = $pack_map[$pack_key];
-    $icon = 'alphanumeric/'.$pack.'/'.$file.'.png';
-    $color = $color_map[$color_key];
-    $border = $border_map[$border_key];
-
-    if (!isset($image_map[$icon])) {
-    $icon = 'alphanumeric/'.$pack.'/_default.png';
-    }
-
-    return array('color' => $color, 'icon' => $icon, 'border' => $border);
-  }
-
-  public function getUserProfileImageFile($username) {
-    $unique = $this->getUniqueProfileImage($username);
-
-    $composer = id(new self())
-      ->setIcon($unique['icon'])
-      ->setColor($unique['color'])
-      ->setBorder($unique['border']);
-
-    $data = $composer->loadBuiltinFileData();
-
-    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-    $file = PhabricatorFile::newFromFileData(
-      $data,
-      array(
-        'name' => $composer->getBuiltinDisplayName(),
-        'profile' => true,
-        'canCDN' => true,
-      ));
-    unset($unguarded);
-
-    return $file;
-  }
-
-  public static function getImagePackMap() {
+  private function newPackMap() {
     $root = dirname(phutil_get_library_root('phabricator'));
     $root = $root.'/resources/builtin/alphanumeric/';
 
@@ -196,28 +217,24 @@ public static function getImagePackMap() {
       ->withType('d')
       ->withFollowSymlinks(false)
       ->find();
+    $map = array_values($map);
 
-    return array_values($map);
+    return $map;
   }
 
-  public static function getBorderMap() {
-
-    $map = array(
+  private function newBorderMap() {
+    return array(
       array(0, 0, 0, 0),
       array(0, 0, 0, 0.3),
       array(255, 255, 255, 0.4),
       array(255, 255, 255, 0.7),
     );
-
-    return $map;
   }
 
-  public static function getColorMap() {
-    //
-    // Generated Colors
-    // http://tools.medialab.sciences-po.fr/iwanthue/
-    //
-    $map = array(
+  private function newColorMap() {
+    // Via: http://tools.medialab.sciences-po.fr/iwanthue/
+
+    return array(
       '#335862',
       '#2d5192',
       '#3c5da0',
@@ -447,7 +464,6 @@ public static function getColorMap() {
       '#335862',
       '#335862',
     );
-    return $map;
   }
 
 }
diff --git a/src/applications/people/cache/PhabricatorUserProfileImageCacheType.php b/src/applications/people/cache/PhabricatorUserProfileImageCacheType.php
index e2a535cdd4..8babff859f 100644
--- a/src/applications/people/cache/PhabricatorUserProfileImageCacheType.php
+++ b/src/applications/people/cache/PhabricatorUserProfileImageCacheType.php
@@ -45,21 +45,10 @@ public function newValueForUsers($key, array $users) {
       $generate_users[] = $user;
     }
 
-    // Generate Files for anyone without a default
-    foreach ($generate_users as $generate_user) {
-      $generate_user_phid = $generate_user->getPHID();
-      $generate_username = $generate_user->getUsername();
-      $generate_version = PhabricatorFilesComposeAvatarBuiltinFile::VERSION;
-      $generate_file = id(new PhabricatorFilesComposeAvatarBuiltinFile())
-        ->getUserProfileImageFile($generate_username);
-
-      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-      $generate_user->setDefaultProfileImagePHID($generate_file->getPHID());
-      $generate_user->setDefaultProfileImageVersion($generate_version);
-      $generate_user->save();
-      unset($unguarded);
-
-      $file_phids[$generate_user_phid] = $generate_file->getPHID();
+    $generator = new PhabricatorFilesComposeAvatarBuiltinFile();
+    foreach ($generate_users as $user) {
+      $file = $generator->updateUser($user);
+      $file_phids[$user->getPHID()] = $file->getPHID();
     }
 
     if ($file_phids) {
diff --git a/src/applications/people/management/PhabricatorPeopleProfileImageWorkflow.php b/src/applications/people/management/PhabricatorPeopleProfileImageWorkflow.php
index 358756cecd..8bf3c8e118 100644
--- a/src/applications/people/management/PhabricatorPeopleProfileImageWorkflow.php
+++ b/src/applications/people/management/PhabricatorPeopleProfileImageWorkflow.php
@@ -51,6 +51,7 @@ public function execute(PhutilArgumentParser $args) {
     }
 
     $version = PhabricatorFilesComposeAvatarBuiltinFile::VERSION;
+    $generator = new PhabricatorFilesComposeAvatarBuiltinFile();
 
     foreach ($iterator as $user) {
       $username = $user->getUsername();
@@ -63,16 +64,13 @@ public function execute(PhutilArgumentParser $args) {
       }
 
       if ($default_phid == null || $is_force || $generate) {
-        $file = id(new PhabricatorFilesComposeAvatarBuiltinFile())
-          ->getUserProfileImageFile($username);
-        $user->setDefaultProfileImagePHID($file->getPHID());
-        $user->setDefaultProfileImageVersion($version);
-        $user->save();
         $console->writeOut(
           "%s\n",
           pht(
             'Generating profile image for "%s".',
             $username));
+
+        $generator->updateUser($user);
       } else {
         $console->writeOut(
           "%s\n",
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 6c8b7ac6b5..ba8b1cf292 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -267,6 +267,10 @@ public function isLoggedIn() {
     return !($this->getPHID() === null);
   }
 
+  public function saveWithoutIndex() {
+    return parent::save();
+  }
+
   public function save() {
     if (!$this->getConduitCertificate()) {
       $this->setConduitCertificate($this->generateConduitCertificate());
@@ -276,7 +280,7 @@ public function save() {
       $this->setAccountSecret(Filesystem::readRandomCharacters(64));
     }
 
-    $result = parent::save();
+    $result = $this->saveWithoutIndex();
 
     if ($this->profile) {
       $this->profile->save();
diff --git a/src/applications/uiexample/examples/PhabricatorFilesComposeAvatarExample.php b/src/applications/uiexample/examples/PhabricatorFilesComposeAvatarExample.php
deleted file mode 100644
index 57a65863db..0000000000
--- a/src/applications/uiexample/examples/PhabricatorFilesComposeAvatarExample.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-final class PhabricatorFilesComposeAvatarExample extends PhabricatorUIExample {
-
-  public function getName() {
-    return pht('Avatars');
-  }
-
-  public function getDescription() {
-    return pht('Tests various color palettes and sizes.');
-  }
-
-  public function getCategory() {
-    return pht('Technical');
-  }
-
-  public function renderExample() {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
-
-    $colors = PhabricatorFilesComposeAvatarBuiltinFile::getColorMap();
-    $packs = PhabricatorFilesComposeAvatarBuiltinFile::getImagePackMap();
-    $builtins = PhabricatorFilesComposeAvatarBuiltinFile::getImageMap();
-    $borders = PhabricatorFilesComposeAvatarBuiltinFile::getBorderMap();
-
-    $images = array();
-    foreach ($builtins as $builtin => $raw_file) {
-      $file = PhabricatorFile::loadBuiltin($viewer, $builtin);
-      $images[] = $file->getBestURI();
-    }
-
-    $content = array();
-    shuffle($colors);
-    foreach ($colors as $color) {
-      shuffle($borders);
-      $color_const = hexdec(trim($color, '#'));
-      $border = head($borders);
-      $border_color = implode(', ', $border);
-
-      $styles = array();
-      $styles[] = 'background-color: '.$color.';';
-      $styles[] = 'display: inline-block;';
-      $styles[] = 'height: 42px;';
-      $styles[] = 'width: 42px;';
-      $styles[] = 'border-radius: 3px;';
-      $styles[] = 'border: 4px solid rgba('.$border_color.');';
-
-      shuffle($images);
-      $png = head($images);
-
-      $image = phutil_tag(
-        'img',
-        array(
-          'src' => $png,
-          'height' => 42,
-          'width' => 42,
-        ));
-
-      $tag = phutil_tag(
-        'div',
-        array(
-          'style' => implode(' ', $styles),
-        ),
-        $image);
-
-      $content[] = phutil_tag(
-        'div',
-        array(
-          'class' => 'mlr mlb',
-          'style' => 'float: left;',
-        ),
-        $tag);
-    }
-
-    $count = new PhutilNumber(
-      count($colors) * count($builtins) * count($borders));
-
-    $infoview = id(new PHUIInfoView())
-      ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
-      ->appendChild(pht('This installation can generate %s unique '.
-      'avatars. You can add additional image packs in '.
-      'resources/builtins/alphanumeric/.', $count));
-
-    $info = phutil_tag_div('pmb', $infoview);
-    $view = phutil_tag_div('ml', $content);
-
-    return phutil_tag(
-      'div',
-        array(),
-        array(
-          $info,
-          $view,
-        ));
-      }
-}

From 2121f2dea6979586f0edf4a4e2f0861f4d6e62f2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 1 Mar 2018 18:38:26 -0800
Subject: [PATCH 654/865] Don't require project edit permission to create a
 project with members other than yourself

Summary: See PHI193. Previously, see similar D18763. Skip this legacy-style policy check when creating a project, since we know you can add members, even if the policy doesn't actually resolve in your favor.

Test Plan:
  - Created a project with edit policy "Members of project" and myself, plus any other user (so the code goes down this path, not the "join/leave" path) as members.

Differential Revision: https://secure.phabricator.com/D19169
---
 .../editor/PhabricatorProjectTransactionEditor.php  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
index de61c2a09b..2a90d6ce29 100644
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -156,11 +156,14 @@ protected function requireCapabilities(
                   PhabricatorPolicyCapability::CAN_EDIT);
               }
             } else {
-              // You need CAN_EDIT to change members other than yourself.
-              PhabricatorPolicyFilter::requireCapability(
-                $this->requireActor(),
-                $object,
-                PhabricatorPolicyCapability::CAN_EDIT);
+              if (!$this->getIsNewObject()) {
+                // You need CAN_EDIT to change members other than yourself.
+                // (PHI193) Just skip this check if we're creating a project.
+                PhabricatorPolicyFilter::requireCapability(
+                  $this->requireActor(),
+                  $object,
+                  PhabricatorPolicyCapability::CAN_EDIT);
+              }
             }
             return;
         }

From 42e5b8a04bece0abe4e018deb381347ac1bf7d37 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 2 Mar 2018 06:59:55 -0800
Subject: [PATCH 655/865] Include the primary domain in the
 Content-Security-Policy explicitly if there's no CDN

Summary:
Ref T4340. If you don't configure a CDN and visit a custom site (like a Phame blog site, or a CORGI sandbox internally) we serve resources from the main site. This violates the Content-Security-Policy.

When there's no CDN, include the primary domain in the CSP explicitly.

Test Plan: Loaded `local.www.phacility.com`, got resources.

Maniphest Tasks: T4340

Differential Revision: https://secure.phabricator.com/D19170
---
 src/aphront/response/AphrontResponse.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 73c4e68f00..892417fcb1 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -109,7 +109,14 @@ private function newContentSecurityPolicyHeader() {
     if ($cdn) {
       $default = $this->newContentSecurityPolicySource($cdn);
     } else {
-      $default = "'self'";
+      // If an alternate file domain is not configured and the user is viewing
+      // a Phame blog on a custom domain or some other custom site, we'll still
+      // serve resources from the main site. Include the main site explicitly.
+
+      $base_uri = PhabricatorEnv::getURI('/');
+      $base_uri = $this->newContentSecurityPolicySource($base_uri);
+
+      $default = "'self' {$base_uri}";
     }
 
     $csp[] = "default-src {$default}";

From 584495215301bf9fa94cc09b3f53469efff8c979 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 2 Mar 2018 17:26:11 -0800
Subject: [PATCH 656/865] Show lint messages in deleted files on the left-hand
 side of the change

Summary:
See PHI416. If you raise a lint message in a deleted file, we don't render any text on the right hand side so the message never displays.

This is occasionally still legitimate/useful, e.g. to display a "don't delete this file" message. At least for now, show these messages on the left.

Test Plan: Posted a lint message on a deleted file via `harbormaster.sendmessage`, viewed revision, saw file expand with synthetic inline for lint.

Differential Revision: https://secure.phabricator.com/D19171
---
 .../DifferentialChangesetViewController.php      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php
index c2bd4bf8de..9d02202f9f 100644
--- a/src/applications/differential/controller/DifferentialChangesetViewController.php
+++ b/src/applications/differential/controller/DifferentialChangesetViewController.php
@@ -390,10 +390,20 @@ private function buildLintInlineComments($changeset) {
       return array();
     }
 
+    $change_type = $changeset->getChangeType();
+    if (DifferentialChangeType::isDeleteChangeType($change_type)) {
+      // If this is a lint message on a deleted file, show it on the left
+      // side of the UI because there are no source code lines on the right
+      // side of the UI so inlines don't have anywhere to render. See PHI416.
+      $is_new = 0;
+    } else {
+      $is_new = 1;
+    }
+
     $template = id(new DifferentialInlineComment())
-        ->setChangesetID($changeset->getID())
-        ->setIsNewFile(1)
-        ->setLineLength(0);
+      ->setChangesetID($changeset->getID())
+      ->setIsNewFile($is_new)
+      ->setLineLength(0);
 
     $inlines = array();
     foreach ($messages as $message) {

From f31975f7a3be3790b7ecfe6f3b64227dc96002ff Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Mar 2018 06:49:30 -0800
Subject: [PATCH 657/865] Don't emit Content-Security-Policy when returning a
 response during preflight setup checks

Summary:
Ref T4340. See <https://discourse.phabricator-community.org/t/core-exception-during-installation/1193/8>.

If we return a response very early during setup, we may not be able to read from the environment yet. Just decline to build a "Content-Security-Policy" header in these cases.

Test Plan:
  - Faked a preflight error (e.g., safe_mode enabled), restarted apache.
    - Before patch: environment error while generating CSP.
    - After patch: no error.
  - Loaded a normal page, observed an normal CSP header.

Maniphest Tasks: T4340

Differential Revision: https://secure.phabricator.com/D19172
---
 src/aphront/response/AphrontResponse.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 892417fcb1..2ee222d61c 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -103,9 +103,20 @@ private function newContentSecurityPolicyHeader() {
       return null;
     }
 
-    $csp = array();
+    // NOTE: We may return a response during preflight checks (for example,
+    // if a user has a bad version of PHP).
+
+    // In this case, setup isn't complete yet and we can't access environmental
+    // configuration. If we aren't able to read the environment, just decline
+    // to emit a Content-Security-Policy header.
+
+    try {
+      $cdn = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
+    } catch (Exception $ex) {
+      return null;
+    }
 
-    $cdn = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
+    $csp = array();
     if ($cdn) {
       $default = $this->newContentSecurityPolicySource($cdn);
     } else {

From e43f2e0cee09d7d327c0564835a14796a6cdcd98 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Mar 2018 06:49:30 -0800
Subject: [PATCH 658/865] (stable) Don't emit Content-Security-Policy when
 returning a response during preflight setup checks

Summary:
Ref T4340. See <https://discourse.phabricator-community.org/t/core-exception-during-installation/1193/8>.

If we return a response very early during setup, we may not be able to read from the environment yet. Just decline to build a "Content-Security-Policy" header in these cases.

Test Plan:
  - Faked a preflight error (e.g., safe_mode enabled), restarted apache.
    - Before patch: environment error while generating CSP.
    - After patch: no error.
  - Loaded a normal page, observed an normal CSP header.

Maniphest Tasks: T4340

Differential Revision: https://secure.phabricator.com/D19172
---
 src/aphront/response/AphrontResponse.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 892417fcb1..2ee222d61c 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -103,9 +103,20 @@ private function newContentSecurityPolicyHeader() {
       return null;
     }
 
-    $csp = array();
+    // NOTE: We may return a response during preflight checks (for example,
+    // if a user has a bad version of PHP).
+
+    // In this case, setup isn't complete yet and we can't access environmental
+    // configuration. If we aren't able to read the environment, just decline
+    // to emit a Content-Security-Policy header.
+
+    try {
+      $cdn = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
+    } catch (Exception $ex) {
+      return null;
+    }
 
-    $cdn = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
+    $csp = array();
     if ($cdn) {
       $default = $this->newContentSecurityPolicySource($cdn);
     } else {

From fd367adbaf85f0fcb4b80c830f829ae61d30de68 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Mar 2018 14:07:47 -0800
Subject: [PATCH 659/865] Parameterize PhabricatorGlobalLock

Summary:
Ref T13096. Currently, we do a fair amount of clever digesting and string manipulation to build lock names which are less than 64 characters long while still being reasonably readable.

Instead, do more of this automatically. This will let lock acquisition become simpler and make it more possible to build a useful lock log.

Test Plan: Ran `bin/repository update`, saw a reasonable lock acquire and release.

Maniphest Tasks: T13096

Differential Revision: https://secure.phabricator.com/D19173
---
 .../engine/PhabricatorRepositoryEngine.php    | 11 +++--
 .../util/PhabricatorGlobalLock.php            | 40 +++++++++++++------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/applications/repository/engine/PhabricatorRepositoryEngine.php b/src/applications/repository/engine/PhabricatorRepositoryEngine.php
index 244ed0cd45..fed5b09521 100644
--- a/src/applications/repository/engine/PhabricatorRepositoryEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryEngine.php
@@ -56,19 +56,18 @@ protected function newRepositoryLock(
     $lock_key,
     $lock_device_only) {
 
-    $lock_parts = array();
-    $lock_parts[] = $lock_key;
-    $lock_parts[] = $repository->getID();
+    $lock_parts = array(
+      'repositoryPHID' => $repository->getPHID(),
+    );
 
     if ($lock_device_only) {
       $device = AlmanacKeys::getLiveDevice();
       if ($device) {
-        $lock_parts[] = $device->getID();
+        $lock_parts['devicePHID'] = $device->getPHID();
       }
     }
 
-    $lock_name = implode(':', $lock_parts);
-    return PhabricatorGlobalLock::newLock($lock_name);
+    return PhabricatorGlobalLock::newLock($lock_key, $lock_parts);
   }
 
 
diff --git a/src/infrastructure/util/PhabricatorGlobalLock.php b/src/infrastructure/util/PhabricatorGlobalLock.php
index 26e11d1899..8aecb40873 100644
--- a/src/infrastructure/util/PhabricatorGlobalLock.php
+++ b/src/infrastructure/util/PhabricatorGlobalLock.php
@@ -28,6 +28,7 @@
  */
 final class PhabricatorGlobalLock extends PhutilLock {
 
+  private $parameters;
   private $conn;
   private $isExternalConnection = false;
 
@@ -37,27 +38,42 @@ final class PhabricatorGlobalLock extends PhutilLock {
 /* -(  Constructing Locks  )------------------------------------------------- */
 
 
-  public static function newLock($name) {
+  public static function newLock($name, $parameters = array()) {
     $namespace = PhabricatorLiskDAO::getStorageNamespace();
     $namespace = PhabricatorHash::digestToLength($namespace, 20);
 
-    $full_name = 'ph:'.$namespace.':'.$name;
-
-    $length_limit = 64;
-    if (strlen($full_name) > $length_limit) {
-      throw new Exception(
-        pht(
-          'Lock name "%s" is too long (full lock name is "%s"). The '.
-          'full lock name must not be longer than %s bytes.',
-          $name,
-          $full_name,
-          new PhutilNumber($length_limit)));
+    $parts = array();
+    ksort($parameters);
+    foreach ($parameters as $key => $parameter) {
+      if (!preg_match('/^[a-zA-Z0-9]+\z/', $key)) {
+        throw new Exception(
+          pht(
+            'Lock parameter key "%s" must be alphanumeric.',
+            $key));
+      }
+
+      if (!is_scalar($parameter) && !is_null($parameter)) {
+        throw new Exception(
+          pht(
+            'Lock parameter for key "%s" must be a scalar.',
+            $key));
+      }
+
+      $value = phutil_json_encode($parameter);
+      $parts[] = "{$key}={$value}";
     }
+    $parts = implode(', ', $parts);
 
+    $local = "{$name}({$parts})";
+    $local = PhabricatorHash::digestToLength($local, 20);
+
+    $full_name = "ph:{$namespace}:{$local}";
     $lock = self::getLock($full_name);
     if (!$lock) {
       $lock = new PhabricatorGlobalLock($full_name);
       self::registerLock($lock);
+
+      $lock->parameters = $parameters;
     }
 
     return $lock;

From 44f0664d2c6f1700881c8da9d00d0f1813c4f34e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Mar 2018 14:22:13 -0800
Subject: [PATCH 660/865] Add a "lock log" for debugging where locks are being
 held

Summary: Depends on D19173. Ref T13096. Adds an optional, disabled-by-default lock log to make it easier to figure out what is acquiring and holding locks.

Test Plan: Ran `bin/lock log --enable`, `--disable`, `--name`, etc. Saw sensible-looking output with log enabled and daemons restarted. Saw no additional output with log disabled and daemons restarted.

Maniphest Tasks: T13096

Differential Revision: https://secure.phabricator.com/D19174
---
 bin/lock                                      |   1 +
 .../autopatches/20180305.lock.01.locklog.sql  |   9 +
 scripts/setup/manage_lock.php                 |  21 ++
 src/__phutil_library_map__.php                |   8 +
 ...abricatorDaemonLockLogGarbageCollector.php |  29 +++
 .../PhabricatorLockLogManagementWorkflow.php  | 222 ++++++++++++++++++
 .../PhabricatorLockManagementWorkflow.php     |   4 +
 .../storage/PhabricatorDaemonLockLog.php      |  32 +++
 .../PhabricatorGarbageCollector.php           |   6 +-
 .../PhabricatorStorageManagementWorkflow.php  |  12 +-
 .../util/PhabricatorGlobalLock.php            |  51 ++++
 11 files changed, 389 insertions(+), 6 deletions(-)
 create mode 120000 bin/lock
 create mode 100644 resources/sql/autopatches/20180305.lock.01.locklog.sql
 create mode 100755 scripts/setup/manage_lock.php
 create mode 100644 src/applications/daemon/garbagecollector/PhabricatorDaemonLockLogGarbageCollector.php
 create mode 100644 src/applications/daemon/management/PhabricatorLockLogManagementWorkflow.php
 create mode 100644 src/applications/daemon/management/PhabricatorLockManagementWorkflow.php
 create mode 100644 src/applications/daemon/storage/PhabricatorDaemonLockLog.php

diff --git a/bin/lock b/bin/lock
new file mode 120000
index 0000000000..686fa38798
--- /dev/null
+++ b/bin/lock
@@ -0,0 +1 @@
+../scripts/setup/manage_lock.php
\ No newline at end of file
diff --git a/resources/sql/autopatches/20180305.lock.01.locklog.sql b/resources/sql/autopatches/20180305.lock.01.locklog.sql
new file mode 100644
index 0000000000..fa10c21c07
--- /dev/null
+++ b/resources/sql/autopatches/20180305.lock.01.locklog.sql
@@ -0,0 +1,9 @@
+CREATE TABLE {$NAMESPACE}_daemon.daemon_locklog (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  lockName VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT},
+  lockReleased INT UNSIGNED,
+  lockParameters LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  lockContext LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/scripts/setup/manage_lock.php b/scripts/setup/manage_lock.php
new file mode 100755
index 0000000000..ec5405ec01
--- /dev/null
+++ b/scripts/setup/manage_lock.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+
+$root = dirname(dirname(dirname(__FILE__)));
+require_once $root.'/scripts/init/init-script.php';
+
+$args = new PhutilArgumentParser($argv);
+$args->setTagline(pht('manage locks'));
+$args->setSynopsis(<<<EOSYNOPSIS
+**lock** __command__ [__options__]
+  Manage locks.
+
+EOSYNOPSIS
+  );
+$args->parseStandardArguments();
+
+$workflows = id(new PhutilClassMapQuery())
+  ->setAncestorClass('PhabricatorLockManagementWorkflow')
+  ->execute();
+$workflows[] = new PhutilHelpArgumentWorkflow();
+$args->parseWorkflows($workflows);
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index bb08685634..c65ff759f6 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2670,6 +2670,8 @@
     'PhabricatorDaemonController' => 'applications/daemon/controller/PhabricatorDaemonController.php',
     'PhabricatorDaemonDAO' => 'applications/daemon/storage/PhabricatorDaemonDAO.php',
     'PhabricatorDaemonEventListener' => 'applications/daemon/event/PhabricatorDaemonEventListener.php',
+    'PhabricatorDaemonLockLog' => 'applications/daemon/storage/PhabricatorDaemonLockLog.php',
+    'PhabricatorDaemonLockLogGarbageCollector' => 'applications/daemon/garbagecollector/PhabricatorDaemonLockLogGarbageCollector.php',
     'PhabricatorDaemonLog' => 'applications/daemon/storage/PhabricatorDaemonLog.php',
     'PhabricatorDaemonLogEvent' => 'applications/daemon/storage/PhabricatorDaemonLogEvent.php',
     'PhabricatorDaemonLogEventGarbageCollector' => 'applications/daemon/garbagecollector/PhabricatorDaemonLogEventGarbageCollector.php',
@@ -3204,6 +3206,8 @@
     'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
     'PhabricatorLocaleScopeGuard' => 'infrastructure/internationalization/scope/PhabricatorLocaleScopeGuard.php',
     'PhabricatorLocaleScopeGuardTestCase' => 'infrastructure/internationalization/scope/__tests__/PhabricatorLocaleScopeGuardTestCase.php',
+    'PhabricatorLockLogManagementWorkflow' => 'applications/daemon/management/PhabricatorLockLogManagementWorkflow.php',
+    'PhabricatorLockManagementWorkflow' => 'applications/daemon/management/PhabricatorLockManagementWorkflow.php',
     'PhabricatorLogTriggerAction' => 'infrastructure/daemon/workers/action/PhabricatorLogTriggerAction.php',
     'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
     'PhabricatorLunarPhasePolicyRule' => 'applications/policy/rule/PhabricatorLunarPhasePolicyRule.php',
@@ -8194,6 +8198,8 @@
     'PhabricatorDaemonController' => 'PhabricatorController',
     'PhabricatorDaemonDAO' => 'PhabricatorLiskDAO',
     'PhabricatorDaemonEventListener' => 'PhabricatorEventListener',
+    'PhabricatorDaemonLockLog' => 'PhabricatorDaemonDAO',
+    'PhabricatorDaemonLockLogGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorDaemonLog' => array(
       'PhabricatorDaemonDAO',
       'PhabricatorPolicyInterface',
@@ -8794,6 +8800,8 @@
     'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase',
     'PhabricatorLocaleScopeGuard' => 'Phobject',
     'PhabricatorLocaleScopeGuardTestCase' => 'PhabricatorTestCase',
+    'PhabricatorLockLogManagementWorkflow' => 'PhabricatorLockManagementWorkflow',
+    'PhabricatorLockManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorLogTriggerAction' => 'PhabricatorTriggerAction',
     'PhabricatorLogoutController' => 'PhabricatorAuthController',
     'PhabricatorLunarPhasePolicyRule' => 'PhabricatorPolicyRule',
diff --git a/src/applications/daemon/garbagecollector/PhabricatorDaemonLockLogGarbageCollector.php b/src/applications/daemon/garbagecollector/PhabricatorDaemonLockLogGarbageCollector.php
new file mode 100644
index 0000000000..1fc62b9862
--- /dev/null
+++ b/src/applications/daemon/garbagecollector/PhabricatorDaemonLockLogGarbageCollector.php
@@ -0,0 +1,29 @@
+<?php
+
+final class PhabricatorDaemonLockLogGarbageCollector
+  extends PhabricatorGarbageCollector {
+
+  const COLLECTORCONST = 'daemon.lock-log';
+
+  public function getCollectorName() {
+    return pht('Lock Logs');
+  }
+
+  public function getDefaultRetentionPolicy() {
+    return 0;
+  }
+
+  protected function collectGarbage() {
+    $table = new PhabricatorDaemonLockLog();
+    $conn = $table->establishConnection('w');
+
+    queryfx(
+      $conn,
+      'DELETE FROM %T WHERE dateCreated < %d LIMIT 100',
+      $table->getTableName(),
+      $this->getGarbageEpoch());
+
+    return ($conn->getAffectedRows() == 100);
+  }
+
+}
diff --git a/src/applications/daemon/management/PhabricatorLockLogManagementWorkflow.php b/src/applications/daemon/management/PhabricatorLockLogManagementWorkflow.php
new file mode 100644
index 0000000000..5602bda309
--- /dev/null
+++ b/src/applications/daemon/management/PhabricatorLockLogManagementWorkflow.php
@@ -0,0 +1,222 @@
+<?php
+
+final class PhabricatorLockLogManagementWorkflow
+  extends PhabricatorLockManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('log')
+      ->setSynopsis(pht('Enable, disable, or show the lock log.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'enable',
+            'help' => pht('Enable the lock log.'),
+          ),
+          array(
+            'name' => 'disable',
+            'help' => pht('Disable the lock log.'),
+          ),
+          array(
+            'name' => 'name',
+            'param' => 'name',
+            'help' => pht('Review logs for a specific lock.'),
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $is_enable = $args->getArg('enable');
+    $is_disable = $args->getArg('disable');
+
+    if ($is_enable && $is_disable) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'You can not both "--enable" and "--disable" the lock log.'));
+    }
+
+    $with_name = $args->getArg('name');
+
+    if ($is_enable || $is_disable) {
+      if (strlen($with_name)) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'You can not both "--enable" or "--disable" with search '.
+            'parameters like "--name".'));
+      }
+
+      $gc = new PhabricatorDaemonLockLogGarbageCollector();
+      $is_enabled = (bool)$gc->getRetentionPolicy();
+
+      $config_key = 'phd.garbage-collection';
+      $const = $gc->getCollectorConstant();
+      $value = PhabricatorEnv::getEnvConfig($config_key);
+
+      if ($is_disable) {
+        if (!$is_enabled) {
+          echo tsprintf(
+            "%s\n",
+            pht('Lock log is already disabled.'));
+          return 0;
+        }
+        echo tsprintf(
+          "%s\n",
+          pht('Disabling the lock log.'));
+
+        unset($value[$const]);
+      } else {
+        if ($is_enabled) {
+          echo tsprintf(
+            "%s\n",
+            pht('Lock log is already enabled.'));
+          return 0;
+        }
+        echo tsprintf(
+          "%s\n",
+          pht('Enabling the lock log.'));
+
+        $value[$const] = phutil_units('24 hours in seconds');
+      }
+
+      id(new PhabricatorConfigLocalSource())
+        ->setKeys(
+          array(
+            $config_key => $value,
+          ));
+
+      echo tsprintf(
+        "%s\n",
+        pht('Done.'));
+
+      echo tsprintf(
+        "%s\n",
+        pht('Restart daemons to apply changes.'));
+
+      return 0;
+    }
+
+    $table = new PhabricatorDaemonLockLog();
+    $conn = $table->establishConnection('r');
+
+    $parts = array();
+    if (strlen($with_name)) {
+      $parts[] = qsprintf(
+        $conn,
+        'lockName = %s',
+        $with_name);
+    }
+
+    if (!$parts) {
+      $constraint = '1 = 1';
+    } else {
+      $constraint = '('.implode(') AND (', $parts).')';
+    }
+
+    $logs = $table->loadAllWhere(
+      '%Q ORDER BY id DESC LIMIT 100',
+      $constraint);
+    $logs = array_reverse($logs);
+
+    if (!$logs) {
+      echo tsprintf(
+        "%s\n",
+        pht('No matching lock logs.'));
+      return 0;
+    }
+
+    $table = id(new PhutilConsoleTable())
+      ->setBorders(true)
+      ->addColumn(
+        'id',
+        array(
+          'title' => pht('Lock'),
+        ))
+      ->addColumn(
+        'name',
+        array(
+          'title' => pht('Name'),
+        ))
+      ->addColumn(
+        'acquired',
+        array(
+          'title' => pht('Acquired'),
+        ))
+      ->addColumn(
+        'released',
+        array(
+          'title' => pht('Released'),
+        ))
+      ->addColumn(
+        'held',
+        array(
+          'title' => pht('Held'),
+        ))
+      ->addColumn(
+        'parameters',
+        array(
+          'title' => pht('Parameters'),
+        ))
+      ->addColumn(
+        'context',
+        array(
+          'title' => pht('Context'),
+        ));
+
+    $viewer = $this->getViewer();
+
+    foreach ($logs as $log) {
+      $created = $log->getDateCreated();
+      $released = $log->getLockReleased();
+
+      if ($released) {
+        $held = '+'.($released - $created);
+      } else {
+        $held = null;
+      }
+
+      $created = phabricator_datetime($created, $viewer);
+      $released = phabricator_datetime($released, $viewer);
+
+      $parameters = $log->getLockParameters();
+      $context = $log->getLockContext();
+
+      $table->addRow(
+        array(
+          'id' => $log->getID(),
+          'name' => $log->getLockName(),
+          'acquired' => $created,
+          'released' => $released,
+          'held' => $held,
+          'parameters' => $this->flattenParameters($parameters),
+          'context' => $this->flattenParameters($context),
+        ));
+    }
+
+    $table->draw();
+
+    return 0;
+  }
+
+  private function flattenParameters(array $params, $keys = true) {
+    $flat = array();
+    foreach ($params as $key => $value) {
+      if (is_array($value)) {
+        $value = $this->flattenParameters($value, false);
+      }
+      if ($keys) {
+        $flat[] = "{$key}={$value}";
+      } else {
+        $flat[] = "{$value}";
+      }
+    }
+
+    if ($keys) {
+      $flat = implode(', ', $flat);
+    } else {
+      $flat = implode(' ', $flat);
+    }
+
+    return $flat;
+  }
+
+}
diff --git a/src/applications/daemon/management/PhabricatorLockManagementWorkflow.php b/src/applications/daemon/management/PhabricatorLockManagementWorkflow.php
new file mode 100644
index 0000000000..e791f51090
--- /dev/null
+++ b/src/applications/daemon/management/PhabricatorLockManagementWorkflow.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class PhabricatorLockManagementWorkflow
+  extends PhabricatorManagementWorkflow {}
diff --git a/src/applications/daemon/storage/PhabricatorDaemonLockLog.php b/src/applications/daemon/storage/PhabricatorDaemonLockLog.php
new file mode 100644
index 0000000000..f9d80138cd
--- /dev/null
+++ b/src/applications/daemon/storage/PhabricatorDaemonLockLog.php
@@ -0,0 +1,32 @@
+<?php
+
+final class PhabricatorDaemonLockLog
+  extends PhabricatorDaemonDAO {
+
+  protected $lockName;
+  protected $lockReleased;
+  protected $lockParameters = array();
+  protected $lockContext = array();
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_SERIALIZATION => array(
+        'lockParameters' => self::SERIALIZATION_JSON,
+        'lockContext' => self::SERIALIZATION_JSON,
+      ),
+      self::CONFIG_COLUMN_SCHEMA => array(
+        'lockName' => 'text64',
+        'lockReleased' => 'epoch?',
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_lock' => array(
+          'columns' => array('lockName'),
+        ),
+        'key_created' => array(
+          'columns' => array('dateCreated'),
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+}
diff --git a/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php b/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php
index f5960e9504..9cf1c22527 100644
--- a/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php
+++ b/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php
@@ -100,8 +100,10 @@ final public function runCollector() {
 
     // Hold a lock while performing collection to avoid racing other daemons
     // running the same collectors.
-    $lock_name = 'gc:'.$this->getCollectorConstant();
-    $lock = PhabricatorGlobalLock::newLock($lock_name);
+    $params = array(
+      'collector' => $this->getCollectorConstant(),
+    );
+    $lock = PhabricatorGlobalLock::newLock('gc', $params);
 
     try {
       $lock->lock(5);
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
index f6b120ba83..5b9459cfb8 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
@@ -1163,12 +1163,16 @@ final protected function lock(PhabricatorStorageManagementAPI $api) {
     // Although we're holding this lock on different databases so it could
     // have the same name on each as far as the database is concerned, the
     // locks would be the same within this process.
-    $ref_key = $api->getRef()->getRefKey();
-    $ref_hash = PhabricatorHash::digestForIndex($ref_key);
-    $lock_name = 'adjust('.$ref_hash.')';
+    $parameters = array(
+      'refKey' => $api->getRef()->getRefKey(),
+    );
+
+    // We disable logging for this lock because we may not have created the
+    // log table yet, or may need to adjust it.
 
-    return PhabricatorGlobalLock::newLock($lock_name)
+    return PhabricatorGlobalLock::newLock('adjust', $parameters)
       ->useSpecificConnection($api->getConn(null))
+      ->setDisableLogging(true)
       ->lock();
   }
 
diff --git a/src/infrastructure/util/PhabricatorGlobalLock.php b/src/infrastructure/util/PhabricatorGlobalLock.php
index 8aecb40873..827d7e0e3d 100644
--- a/src/infrastructure/util/PhabricatorGlobalLock.php
+++ b/src/infrastructure/util/PhabricatorGlobalLock.php
@@ -31,6 +31,8 @@ final class PhabricatorGlobalLock extends PhutilLock {
   private $parameters;
   private $conn;
   private $isExternalConnection = false;
+  private $log;
+  private $disableLogging;
 
   private static $pool = array();
 
@@ -95,6 +97,11 @@ public function useSpecificConnection(AphrontDatabaseConnection $conn) {
     return $this;
   }
 
+  public function setDisableLogging($disable) {
+    $this->disableLogging = $disable;
+    return $this;
+  }
+
 
 /* -(  Implementation  )----------------------------------------------------- */
 
@@ -143,6 +150,24 @@ protected function doLock($wait) {
     $conn->rememberLock($lock_name);
 
     $this->conn = $conn;
+
+    if ($this->shouldLogLock()) {
+      global $argv;
+
+      $lock_context = array(
+        'pid' => getmypid(),
+        'host' => php_uname('n'),
+        'argv' => $argv,
+      );
+
+      $log = id(new PhabricatorDaemonLockLog())
+        ->setLockName($lock_name)
+        ->setLockParameters($this->parameters)
+        ->setLockContext($lock_context)
+        ->save();
+
+      $this->log = $log;
+    }
   }
 
   protected function doUnlock() {
@@ -175,6 +200,32 @@ protected function doUnlock() {
       $conn->close();
       self::$pool[] = $conn;
     }
+
+    if ($this->log) {
+      $log = $this->log;
+      $this->log = null;
+
+      $conn = $log->establishConnection('w');
+      queryfx(
+        $conn,
+        'UPDATE %T SET lockReleased = UNIX_TIMESTAMP() WHERE id = %d',
+        $log->getTableName(),
+        $log->getID());
+    }
+  }
+
+  private function shouldLogLock() {
+    if ($this->disableLogging) {
+      return false;
+    }
+
+    $policy = id(new PhabricatorDaemonLockLogGarbageCollector())
+      ->getRetentionPolicy();
+    if (!$policy) {
+      return false;
+    }
+
+    return true;
   }
 
 }

From 743d1ac426fbb82ac9ca5736cbca26d3a84e7bbc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 08:12:04 -0800
Subject: [PATCH 661/865] Mostly modularize the Differential "update"
 transaction

Summary: Ref T13099. Move most of the "Update" logic to modular transactions

Test Plan: Created and updated revisions. Flushed the task queue. Grepped for `TYPE_UPDATE`. Reviewed update transactions in the timeline and feed.

Maniphest Tasks: T13099

Differential Revision: https://secure.phabricator.com/D19175
---
 .../autopatches/20140212.dx.1.armageddon.php  |   2 +-
 src/__phutil_library_map__.php                |   2 +
 .../conduit/DifferentialConduitAPIMethod.php  |   2 +-
 .../editor/DifferentialRevisionEditEngine.php |   7 +-
 .../editor/DifferentialTransactionEditor.php  | 148 +-------------
 .../DifferentialDiffExtractionEngine.php      |   4 +-
 ...rDifferentialRevisionTestDataGenerator.php |   4 +-
 .../storage/DifferentialTransaction.php       |  60 +-----
 .../DifferentialRevisionUpdateTransaction.php | 185 ++++++++++++++++++
 .../ReleephDiffChurnFieldSpecification.php    |   2 +-
 10 files changed, 208 insertions(+), 208 deletions(-)
 create mode 100644 src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php

diff --git a/resources/sql/autopatches/20140212.dx.1.armageddon.php b/resources/sql/autopatches/20140212.dx.1.armageddon.php
index 021e886629..a7e978b559 100644
--- a/resources/sql/autopatches/20140212.dx.1.armageddon.php
+++ b/resources/sql/autopatches/20140212.dx.1.armageddon.php
@@ -75,7 +75,7 @@
 
   if ($diff_id || $row['action'] == DifferentialAction::ACTION_UPDATE) {
     $xactions[] = array(
-      'type' => DifferentialTransaction::TYPE_UPDATE,
+      'type' => DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE,
       'old' => null,
       'new' => $diff_id,
     );
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c65ff759f6..6cc7450820 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -598,6 +598,7 @@
     'DifferentialRevisionTitleTransaction' => 'applications/differential/xaction/DifferentialRevisionTitleTransaction.php',
     'DifferentialRevisionTransactionType' => 'applications/differential/xaction/DifferentialRevisionTransactionType.php',
     'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/DifferentialRevisionUpdateHistoryView.php',
+    'DifferentialRevisionUpdateTransaction' => 'applications/differential/xaction/DifferentialRevisionUpdateTransaction.php',
     'DifferentialRevisionViewController' => 'applications/differential/controller/DifferentialRevisionViewController.php',
     'DifferentialRevisionVoidTransaction' => 'applications/differential/xaction/DifferentialRevisionVoidTransaction.php',
     'DifferentialRevisionWrongStateTransaction' => 'applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php',
@@ -5822,6 +5823,7 @@
     'DifferentialRevisionTitleTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionTransactionType' => 'PhabricatorModularTransactionType',
     'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
+    'DifferentialRevisionUpdateTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionViewController' => 'DifferentialController',
     'DifferentialRevisionVoidTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionWrongStateTransaction' => 'DifferentialRevisionTransactionType',
diff --git a/src/applications/differential/conduit/DifferentialConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialConduitAPIMethod.php
index 34843b5609..13ed71c96e 100644
--- a/src/applications/differential/conduit/DifferentialConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialConduitAPIMethod.php
@@ -58,7 +58,7 @@ protected function applyFieldEdit(
 
     $xactions = array();
     $xactions[] = array(
-      'type' => DifferentialRevisionEditEngine::KEY_UPDATE,
+      'type' => DifferentialRevisionUpdateTransaction::EDITKEY,
       'value' => $diff->getPHID(),
     );
 
diff --git a/src/applications/differential/editor/DifferentialRevisionEditEngine.php b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
index 2bd3a5cdc3..fe1b983f1a 100644
--- a/src/applications/differential/editor/DifferentialRevisionEditEngine.php
+++ b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
@@ -7,8 +7,6 @@ final class DifferentialRevisionEditEngine
 
   const ENGINECONST = 'differential.revision';
 
-  const KEY_UPDATE = 'update';
-
   const ACTIONGROUP_REVIEW = 'review';
   const ACTIONGROUP_REVISION = 'revision';
 
@@ -123,12 +121,13 @@ protected function buildCustomEditFields($object) {
     $fields = array();
 
     $fields[] = id(new PhabricatorHandlesEditField())
-      ->setKey(self::KEY_UPDATE)
+      ->setKey(DifferentialRevisionUpdateTransaction::EDITKEY)
       ->setLabel(pht('Update Diff'))
       ->setDescription(pht('New diff to create or update the revision with.'))
       ->setConduitDescription(pht('Create or update a revision with a diff.'))
       ->setConduitTypeDescription(pht('PHID of the diff.'))
-      ->setTransactionType(DifferentialTransaction::TYPE_UPDATE)
+      ->setTransactionType(
+        DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE)
       ->setHandleParameterType(new AphrontPHIDListHTTPParameterType())
       ->setSingleValue($diff_phid)
       ->setIsConduitOnly(!$diff)
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index a092bf2693..03af04dd0f 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -33,7 +33,7 @@ public function isFirstBroadcast() {
   }
 
   public function getDiffUpdateTransaction(array $xactions) {
-    $type_update = DifferentialTransaction::TYPE_UPDATE;
+    $type_update = DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE;
 
     foreach ($xactions as $xaction) {
       if ($xaction->getTransactionType() == $type_update) {
@@ -76,7 +76,6 @@ public function getTransactionTypes() {
     $types[] = PhabricatorTransactions::TYPE_INLINESTATE;
 
     $types[] = DifferentialTransaction::TYPE_INLINE;
-    $types[] = DifferentialTransaction::TYPE_UPDATE;
 
     return $types;
   }
@@ -88,12 +87,6 @@ protected function getCustomTransactionOldValue(
     switch ($xaction->getTransactionType()) {
       case DifferentialTransaction::TYPE_INLINE:
         return null;
-      case DifferentialTransaction::TYPE_UPDATE:
-        if ($this->getIsNewObject()) {
-          return null;
-        } else {
-          return $object->getActiveDiff()->getPHID();
-        }
     }
 
     return parent::getCustomTransactionOldValue($object, $xaction);
@@ -104,8 +97,6 @@ protected function getCustomTransactionNewValue(
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
-      case DifferentialTransaction::TYPE_UPDATE:
-        return $xaction->getNewValue();
       case DifferentialTransaction::TYPE_INLINE:
         return null;
     }
@@ -120,29 +111,6 @@ protected function applyCustomInternalTransaction(
     switch ($xaction->getTransactionType()) {
       case DifferentialTransaction::TYPE_INLINE:
         return;
-      case DifferentialTransaction::TYPE_UPDATE:
-        if (!$this->getIsCloseByCommit()) {
-          if ($object->isNeedsRevision() ||
-              $object->isChangePlanned() ||
-              $object->isAbandoned()) {
-            $object->setModernRevisionStatus(
-              DifferentialRevisionStatus::NEEDS_REVIEW);
-          }
-        }
-
-        $diff = $this->requireDiff($xaction->getNewValue());
-
-        $this->updateRevisionLineCounts($object, $diff);
-
-        if ($this->repositoryPHIDOverride !== false) {
-          $object->setRepositoryPHID($this->repositoryPHIDOverride);
-        } else {
-          $object->setRepositoryPHID($diff->getRepositoryPHID());
-        }
-
-        $object->attachActiveDiff($diff);
-        $object->setActiveDiffPHID($diff->getPHID());
-        return;
     }
 
     return parent::applyCustomInternalTransaction($object, $xaction);
@@ -196,7 +164,7 @@ protected function expandTransaction(
       // commit.
     } else {
       switch ($xaction->getTransactionType()) {
-        case DifferentialTransaction::TYPE_UPDATE:
+        case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
           $downgrade_rejects = true;
           if (!$is_sticky_accept) {
             // If "sticky accept" is disabled, also downgrade the accepts.
@@ -243,7 +211,7 @@ protected function expandTransaction(
 
     $is_commandeer = false;
     switch ($xaction->getTransactionType()) {
-      case DifferentialTransaction::TYPE_UPDATE:
+      case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
         if ($this->getIsCloseByCommit()) {
           // Don't bother with any of this if this update is a side effect of
           // commit detection.
@@ -293,7 +261,7 @@ protected function expandTransaction(
     if (!$this->didExpandInlineState) {
       switch ($xaction->getTransactionType()) {
         case PhabricatorTransactions::TYPE_COMMENT:
-        case DifferentialTransaction::TYPE_UPDATE:
+        case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
         case DifferentialTransaction::TYPE_INLINE:
           $this->didExpandInlineState = true;
 
@@ -343,45 +311,6 @@ protected function applyCustomExternalTransaction(
         if ($reply && !$reply->getHasReplies()) {
           $reply->setHasReplies(1)->save();
         }
-        return;
-      case DifferentialTransaction::TYPE_UPDATE:
-        // Now that we're inside the transaction, do a final check.
-        $diff = $this->requireDiff($xaction->getNewValue());
-
-        // TODO: It would be slightly cleaner to just revalidate this
-        // transaction somehow using the same validation code, but that's
-        // not easy to do at the moment.
-
-        $revision_id = $diff->getRevisionID();
-        if ($revision_id && ($revision_id != $object->getID())) {
-          throw new Exception(
-            pht(
-              'Diff is already attached to another revision. You lost '.
-              'a race?'));
-        }
-
-        // TODO: This can race with diff updates, particularly those from
-        // Harbormaster. See discussion in T8650.
-        $diff->setRevisionID($object->getID());
-        $diff->save();
-
-        // If there are any outstanding buildables for this diff, tell
-        // Harbormaster that their containers need to be updated. This is
-        // common, because `arc` creates buildables so it can upload lint
-        // and unit results.
-
-        $buildables = id(new HarbormasterBuildableQuery())
-          ->setViewer(PhabricatorUser::getOmnipotentUser())
-          ->withManualBuildables(false)
-          ->withBuildablePHIDs(array($diff->getPHID()))
-          ->execute();
-        foreach ($buildables as $buildable) {
-          $buildable->sendMessage(
-            $this->getActor(),
-            HarbormasterMessageType::BUILDABLE_CONTAINER,
-            true);
-        }
-
         return;
     }
 
@@ -437,7 +366,7 @@ protected function applyFinalEffects(
 
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
-        case DifferentialTransaction::TYPE_UPDATE:
+        case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
           $diff = $this->requireDiff($xaction->getNewValue(), true);
 
           // Update these denormalized index tables when we attach a new
@@ -554,44 +483,6 @@ private function updateReviewStatus(
     return $xactions;
   }
 
-
-  protected function validateTransaction(
-    PhabricatorLiskDAO $object,
-    $type,
-    array $xactions) {
-
-    $errors = parent::validateTransaction($object, $type, $xactions);
-
-    $config_self_accept_key = 'differential.allow-self-accept';
-    $allow_self_accept = PhabricatorEnv::getEnvConfig($config_self_accept_key);
-
-    foreach ($xactions as $xaction) {
-      switch ($type) {
-        case DifferentialTransaction::TYPE_UPDATE:
-          $diff = $this->loadDiff($xaction->getNewValue());
-          if (!$diff) {
-            $errors[] = new PhabricatorApplicationTransactionValidationError(
-              $type,
-              pht('Invalid'),
-              pht('The specified diff does not exist.'),
-              $xaction);
-          } else if (($diff->getRevisionID()) &&
-            ($diff->getRevisionID() != $object->getID())) {
-            $errors[] = new PhabricatorApplicationTransactionValidationError(
-              $type,
-              pht('Invalid'),
-              pht(
-                'You can not update this revision to the specified diff, '.
-                'because the diff is already attached to another revision.'),
-              $xaction);
-          }
-          break;
-      }
-    }
-
-    return $errors;
-  }
-
   protected function sortTransactions(array $xactions) {
     $xactions = parent::sortTransactions($xactions);
 
@@ -674,7 +565,7 @@ protected function getMailAction(
       $action = parent::getMailAction($object, $xactions);
 
       $strongest = $this->getStrongestAction($object, $xactions);
-      $type_update = DifferentialTransaction::TYPE_UPDATE;
+      $type_update = DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE;
       if ($strongest->getTransactionType() == $type_update) {
         $show_lines = true;
       }
@@ -772,7 +663,7 @@ protected function buildMailBody(
     $update_xaction = null;
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
-        case DifferentialTransaction::TYPE_UPDATE:
+        case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
           $update_xaction = $xaction;
           break;
       }
@@ -1053,7 +944,7 @@ private function loadDiff($phid, $need_changesets = false) {
     return $query->executeOne();
   }
 
-  private function requireDiff($phid, $need_changesets = false) {
+  public function requireDiff($phid, $need_changesets = false) {
     $diff = $this->loadDiff($phid, $need_changesets);
     if (!$diff) {
       throw new Exception(pht('Diff "%s" does not exist!', $phid));
@@ -1274,7 +1165,7 @@ protected function buildHeraldAdapter(
     $has_update = false;
     $has_commit = false;
 
-    $type_update = DifferentialTransaction::TYPE_UPDATE;
+    $type_update = DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE;
     foreach ($xactions as $xaction) {
       if ($xaction->getTransactionType() != $type_update) {
         continue;
@@ -1721,27 +1612,6 @@ private function hasActiveBuilds($object) {
     return true;
   }
 
-  private function updateRevisionLineCounts(
-    DifferentialRevision $revision,
-    DifferentialDiff $diff) {
-
-    $revision->setLineCount($diff->getLineCount());
-
-    $conn = $revision->establishConnection('r');
-
-    $row = queryfx_one(
-      $conn,
-      'SELECT SUM(addLines) A, SUM(delLines) D FROM %T
-        WHERE diffID = %d',
-      id(new DifferentialChangeset())->getTableName(),
-      $diff->getID());
-
-    if ($row) {
-      $revision->setAddedLineCount((int)$row['A']);
-      $revision->setRemovedLineCount((int)$row['D']);
-    }
-  }
-
   private function requireReviewers(DifferentialRevision $revision) {
     if ($revision->hasAttachedReviewers()) {
       return;
diff --git a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
index 6fb5e70de5..a6487c8108 100644
--- a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
+++ b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
@@ -278,8 +278,10 @@ public function updateRevisionWithCommit(
         ->setNewValue($revision->getModernRevisionStatus());
     }
 
+    $type_update = DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE;
+
     $xactions[] = id(new DifferentialTransaction())
-      ->setTransactionType(DifferentialTransaction::TYPE_UPDATE)
+      ->setTransactionType($type_update)
       ->setIgnoreOnNoEffect(true)
       ->setNewValue($new_diff->getPHID())
       ->setMetadataValue('isCommitUpdate', true);
diff --git a/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php b/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
index c37974fa2e..2443fe9651 100644
--- a/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
+++ b/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
@@ -22,14 +22,14 @@ public function generateObject() {
     $revision->setTestPlan($this->generateDescription());
 
     $diff = $this->generateDiff($author);
+    $type_update = DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE;
 
     $xactions = array();
 
     $xactions[] = id(new DifferentialTransaction())
-      ->setTransactionType(DifferentialTransaction::TYPE_UPDATE)
+      ->setTransactionType($type_update)
       ->setNewValue($diff->getPHID());
 
-
     id(new DifferentialTransactionEditor())
       ->setActor($author)
       ->setContentSource($this->getLipsumContentSource())
diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index f7dcf29860..53fdc71a15 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -6,7 +6,6 @@ final class DifferentialTransaction
   private $isCommandeerSideEffect;
 
   const TYPE_INLINE  = 'differential:inline';
-  const TYPE_UPDATE  = 'differential:update';
   const TYPE_ACTION  = 'differential:action';
 
   const MAILTAG_REVIEWERS      = 'differential-reviewers';
@@ -75,18 +74,6 @@ public function shouldHide() {
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
-      case self::TYPE_UPDATE:
-        // Older versions of this transaction have an ID for the new value,
-        // and/or do not record the old value. Only hide the transaction if
-        // the new value is a PHID, indicating that this is a newer style
-        // transaction.
-        if ($old === null) {
-          if (phid_get_type($new) == DifferentialDiffPHIDType::TYPECONST) {
-            return true;
-          }
-        }
-        break;
-
       case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
         // Don't hide the initial "X requested review: ..." transaction from
         // mail or feed even when it occurs during creation. We need this
@@ -139,11 +126,6 @@ public function getRequiredHandlePHIDs() {
           }
         }
         break;
-      case self::TYPE_UPDATE:
-        if ($new) {
-          $phids[] = $new;
-        }
-        break;
     }
 
     return $phids;
@@ -153,8 +135,6 @@ public function getActionStrength() {
     switch ($this->getTransactionType()) {
       case self::TYPE_ACTION:
         return 3;
-      case self::TYPE_UPDATE:
-        return 2;
     }
 
     return parent::getActionStrength();
@@ -165,13 +145,6 @@ public function getActionName() {
     switch ($this->getTransactionType()) {
       case self::TYPE_INLINE:
         return pht('Commented On');
-      case self::TYPE_UPDATE:
-        $old = $this->getOldValue();
-        if ($old === null) {
-          return pht('Request');
-        } else {
-          return pht('Updated');
-        }
       case self::TYPE_ACTION:
         $map = array(
           DifferentialAction::ACTION_ACCEPT => pht('Accepted'),
@@ -209,7 +182,7 @@ public function getMailTags() {
             break;
         }
         break;
-      case self::TYPE_UPDATE:
+      case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
         $old = $this->getOldValue();
         if ($old === null) {
           $tags[] = self::MAILTAG_REVIEW_REQUEST;
@@ -248,28 +221,6 @@ public function getTitle() {
         return pht(
           '%s added inline comments.',
           $author_handle);
-      case self::TYPE_UPDATE:
-        if ($this->getMetadataValue('isCommitUpdate')) {
-          return pht(
-            'This revision was automatically updated to reflect the '.
-            'committed changes.');
-        } else if ($new) {
-          // TODO: Migrate to PHIDs and use handles here?
-          if (phid_get_type($new) == DifferentialDiffPHIDType::TYPECONST) {
-            return pht(
-              '%s updated this revision to %s.',
-              $author_handle,
-              $this->renderHandleLink($new));
-          } else {
-            return pht(
-              '%s updated this revision.',
-              $author_handle);
-          }
-        } else {
-          return pht(
-            '%s updated this revision.',
-            $author_handle);
-        }
       case self::TYPE_ACTION:
         switch ($new) {
           case DifferentialAction::ACTION_CLOSE:
@@ -347,11 +298,6 @@ public function getTitleForFeed() {
           '%s added inline comments to %s.',
           $author_link,
           $object_link);
-      case self::TYPE_UPDATE:
-        return pht(
-          '%s updated the diff for %s.',
-          $author_link,
-          $object_link);
       case self::TYPE_ACTION:
         switch ($new) {
           case DifferentialAction::ACTION_ACCEPT:
@@ -462,8 +408,6 @@ public function getIcon() {
     switch ($this->getTransactionType()) {
       case self::TYPE_INLINE:
         return 'fa-comment';
-      case self::TYPE_UPDATE:
-        return 'fa-refresh';
       case self::TYPE_ACTION:
         switch ($this->getNewValue()) {
           case DifferentialAction::ACTION_CLOSE:
@@ -526,8 +470,6 @@ private function isStatusTransaction($xaction) {
 
   public function getColor() {
     switch ($this->getTransactionType()) {
-      case self::TYPE_UPDATE:
-        return PhabricatorTransactions::COLOR_SKY;
       case self::TYPE_ACTION:
         switch ($this->getNewValue()) {
           case DifferentialAction::ACTION_CLOSE:
diff --git a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
new file mode 100644
index 0000000000..8b53bced88
--- /dev/null
+++ b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
@@ -0,0 +1,185 @@
+<?php
+
+final class DifferentialRevisionUpdateTransaction
+  extends DifferentialRevisionTransactionType {
+
+  const TRANSACTIONTYPE = 'differential:update';
+  const EDITKEY = 'update';
+
+  public function generateOldValue($object) {
+    return $object->getActiveDiffPHID();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $should_review = $this->shouldRequestReviewAfterUpdate($object);
+    if ($should_review) {
+      $object->setModernRevisionStatus(
+        DifferentialRevisionStatus::NEEDS_REVIEW);
+    }
+
+    $editor = $this->getEditor();
+    $diff = $editor->requireDiff($value);
+
+    $this->updateRevisionLineCounts($object, $diff);
+
+    $object->setRepositoryPHID($diff->getRepositoryPHID());
+    $object->setActiveDiffPHID($diff->getPHID());
+    $object->attachActiveDiff($diff);
+  }
+
+  private function shouldRequestReviewAfterUpdate($object) {
+    if ($this->isCommitUpdate()) {
+      return false;
+    }
+
+    $should_update =
+      $object->isNeedsRevision() ||
+      $object->isChangePlanned() ||
+      $object->isAbandoned();
+    if ($should_update) {
+      return true;
+    }
+
+    return false;
+  }
+
+  public function applyExternalEffects($object, $value) {
+    $editor = $this->getEditor();
+    $diff = $editor->requireDiff($value);
+
+    // TODO: This can race with diff updates, particularly those from
+    // Harbormaster. See discussion in T8650.
+    $diff->setRevisionID($object->getID());
+    $diff->save();
+
+    // If there are any outstanding buildables for this diff, tell
+    // Harbormaster that their containers need to be updated. This is
+    // common, because `arc` creates buildables so it can upload lint
+    // and unit results.
+
+    $buildables = id(new HarbormasterBuildableQuery())
+      ->setViewer(PhabricatorUser::getOmnipotentUser())
+      ->withManualBuildables(false)
+      ->withBuildablePHIDs(array($diff->getPHID()))
+      ->execute();
+    foreach ($buildables as $buildable) {
+      $buildable->sendMessage(
+        $this->getActor(),
+        HarbormasterMessageType::BUILDABLE_CONTAINER,
+        true);
+    }
+  }
+
+  public function getColor() {
+    return 'sky';
+  }
+
+  public function getIcon() {
+    return 'fa-refresh';
+  }
+
+  public function getActionName() {
+    if ($this->isCreateTransaction()) {
+      return pht('Request');
+    } else {
+      return pht('Updated');
+    }
+  }
+
+  public function getActionStrength() {
+    return 2;
+  }
+
+  public function getTitle() {
+    $old = $this->getOldValue();
+    $new = $this->getNewValue();
+
+    if ($this->isCommitUpdate()) {
+      return pht(
+        'This revision was automatically updated to reflect the '.
+        'committed changes.');
+    }
+
+    // NOTE: Very, very old update transactions did not have a new value or
+    // did not use a diff PHID as a new value. This was changed years ago,
+    // but wasn't migrated. We might consider migrating if this causes issues.
+
+    return pht(
+      '%s updated this revision to %s.',
+      $this->renderAuthor(),
+      $this->renderNewHandle());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s updated the diff for %s.',
+      $this->renderAuthor(),
+      $this->renderObject());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    $diff_phid = null;
+    foreach ($xactions as $xaction) {
+      $diff_phid = $xaction->getNewValue();
+
+      $diff = id(new DifferentialDiffQuery())
+        ->withPHIDs(array($diff_phid))
+        ->setViewer($this->getActor())
+        ->executeOne();
+      if (!$diff) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Specified diff ("%s") does not exist.',
+            $diff_phid),
+          $xaction);
+        continue;
+      }
+
+      if ($diff->getRevisionID()) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You can not update this revision with the specified diff ("%s") '.
+            'because the diff is already attached to another revision.',
+            $diff_phid),
+          $xaction);
+        continue;
+      }
+    }
+
+    if (!$diff_phid && !$object->getActiveDiffPHID()) {
+      $errors[] = $this->newInvalidError(
+        pht(
+          'You must specify an initial diff when creating a revision.'));
+    }
+
+    return $errors;
+  }
+
+  public function isCommitUpdate() {
+    return (bool)$this->getMetadataValue('isCommitUpdate');
+  }
+
+  private function updateRevisionLineCounts(
+    DifferentialRevision $revision,
+    DifferentialDiff $diff) {
+
+    $revision->setLineCount($diff->getLineCount());
+
+    $conn = $revision->establishConnection('r');
+
+    $row = queryfx_one(
+      $conn,
+      'SELECT SUM(addLines) A, SUM(delLines) D FROM %T
+        WHERE diffID = %d',
+      id(new DifferentialChangeset())->getTableName(),
+      $diff->getID());
+
+    if ($row) {
+      $revision->setAddedLineCount((int)$row['A']);
+      $revision->setRemovedLineCount((int)$row['D']);
+    }
+  }
+
+}
diff --git a/src/applications/releeph/field/specification/ReleephDiffChurnFieldSpecification.php b/src/applications/releeph/field/specification/ReleephDiffChurnFieldSpecification.php
index 112ef09885..3b472bbae7 100644
--- a/src/applications/releeph/field/specification/ReleephDiffChurnFieldSpecification.php
+++ b/src/applications/releeph/field/specification/ReleephDiffChurnFieldSpecification.php
@@ -37,7 +37,7 @@ public function renderPropertyViewValue(array $handles) {
         case PhabricatorTransactions::TYPE_COMMENT:
           $comments++;
           break;
-        case DifferentialTransaction::TYPE_UPDATE:
+        case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
           $updates++;
           break;
         case DifferentialTransaction::TYPE_ACTION:

From f3928962096c1dc4472b19bd123812d88a1b9a23 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 08:40:34 -0800
Subject: [PATCH 662/865] Return commit information for Revision "close" and
 "update" transactions over the Conduit API

Summary: Depends on D19175. Ref T13099. This fills in "close" and "update" transactions so that they show which commit(s) caused the action.

Test Plan: Used `transaction.search` to query some revisions, saw commit PHID information.

Maniphest Tasks: T13099

Differential Revision: https://secure.phabricator.com/D19176
---
 .../DifferentialDiffExtractionEngine.php      |  3 ++-
 .../DifferentialRevisionCloseTransaction.php  | 19 +++++++++++++++++++
 .../DifferentialRevisionUpdateTransaction.php | 14 ++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
index a6487c8108..d7d7c767e1 100644
--- a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
+++ b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
@@ -284,7 +284,8 @@ public function updateRevisionWithCommit(
       ->setTransactionType($type_update)
       ->setIgnoreOnNoEffect(true)
       ->setNewValue($new_diff->getPHID())
-      ->setMetadataValue('isCommitUpdate', true);
+      ->setMetadataValue('isCommitUpdate', true)
+      ->setMetadataValue('commitPHIDs', array($commit->getPHID()));
 
     foreach ($more_xactions as $more_xaction) {
       $xactions[] = $more_xaction;
diff --git a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
index b1c796dca4..7ef0f2ba60 100644
--- a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
@@ -136,4 +136,23 @@ public function getTitleForFeed() {
       $this->renderObject());
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'close';
+  }
+
+  public function getFieldValuesForConduit($object, $data) {
+    $commit_phid = $object->getMetadataValue('commitPHID');
+
+    if ($commit_phid) {
+      $commit_phids = array($commit_phid);
+    } else {
+      $commit_phids = array();
+    }
+
+    return array(
+      'commitPHIDs' => $commit_phids,
+    );
+  }
+
+
 }
diff --git a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
index 8b53bced88..c89c3c79e1 100644
--- a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
@@ -182,4 +182,18 @@ private function updateRevisionLineCounts(
     }
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'update';
+  }
+
+  public function getFieldValuesForConduit($object, $data) {
+    $commit_phids = $object->getMetadataValue('commitPHIDs', array());
+
+    return array(
+      'old' => $object->getOldValue(),
+      'new' => $object->getNewValue(),
+      'commitPHIDs' => $commit_phids,
+    );
+  }
+
 }

From dbccfb234f8de6cf08e7946ea3b2204d2555ea0a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 10:25:05 -0800
Subject: [PATCH 663/865] Perform a client-side redirect after OAuth server
 authorization

Summary:
Ref T13099. See that task for discussion. Chrome is unhappy with an MFA form submitting to an endpoint which redirects you to an OAuth URI.

Instead, do the redirect entirely on the client.

Chrome's rationale here isn't obvious, so we may be able to revert this at some point.

Test Plan: Went through the OAuth flow locally, was redirected on the client. Will verify in production.

Maniphest Tasks: T13099

Differential Revision: https://secure.phabricator.com/D19177
---
 resources/celerity/map.php                    |  6 ++++
 .../PhabricatorOAuthServerAuthController.php  | 30 +++++++++++++++++--
 webroot/rsrc/js/core/behavior-redirect.js     |  9 ++++++
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 webroot/rsrc/js/core/behavior-redirect.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f601b5cec3..f90e3bd511 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -502,6 +502,7 @@
     'rsrc/js/core/behavior-phabricator-nav.js' => '836f966d',
     'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'acd29eee',
     'rsrc/js/core/behavior-read-only-warning.js' => 'ba158207',
+    'rsrc/js/core/behavior-redirect.js' => '0213259f',
     'rsrc/js/core/behavior-refresh-csrf.js' => 'ab2f381b',
     'rsrc/js/core/behavior-remarkup-preview.js' => '4b700e9e',
     'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
@@ -686,6 +687,7 @@
     'javelin-behavior-project-create' => '065227cc',
     'javelin-behavior-quicksand-blacklist' => '7927a7d3',
     'javelin-behavior-read-only-warning' => 'ba158207',
+    'javelin-behavior-redirect' => '0213259f',
     'javelin-behavior-refresh-csrf' => 'ab2f381b',
     'javelin-behavior-releeph-preview-branch' => 'b2b4fbaf',
     'javelin-behavior-releeph-request-state-change' => 'a0b57eb8',
@@ -934,6 +936,10 @@
       'javelin-dom',
       'phabricator-keyboard-shortcut',
     ),
+    '0213259f' => array(
+      'javelin-behavior',
+      'javelin-uri',
+    ),
     '04b2ae03' => array(
       'javelin-install',
       'javelin-util',
diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
index b9d916e82b..8fdd6fdb75 100644
--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
@@ -172,9 +172,33 @@ public function handleRequest(AphrontRequest $request) {
         ));
 
       if ($client->getIsTrusted()) {
-        return id(new AphrontRedirectResponse())
-          ->setIsExternal(true)
-          ->setURI((string)$full_uri);
+        // NOTE: See T13099. We currently emit a "Content-Security-Policy"
+        // which includes a narrow "form-action". At the time of writing,
+        // Chrome applies "form-action" to redirects following form submission.
+
+        // This can lead to a situation where a user enters the OAuth workflow
+        // and is prompted for MFA. When they submit an MFA response, the form
+        // can redirect here, and Chrome will block the "Location" redirect.
+
+        // To avoid this, render an interstitial. We only actually need to do
+        // this in Chrome (but do it everywhere for consistency) and only need
+        // to do it if the request is a redirect after a form submission (but
+        // we can't tell if it is or not).
+
+        Javelin::initBehavior(
+          'redirect',
+          array(
+            'uri' => (string)$full_uri,
+          ));
+
+        return $this->newDialog()
+          ->setTitle(pht('Authenticate: %s', $name))
+          ->setRedirect(true)
+          ->appendParagraph(
+            pht(
+              'Authorization for "%s" confirmed, redirecting...',
+              phutil_tag('strong', array(), $name)))
+          ->addCancelButton((string)$full_uri, pht('Continue'));
       }
 
       // TODO: It would be nice to give the user more options here, like
diff --git a/webroot/rsrc/js/core/behavior-redirect.js b/webroot/rsrc/js/core/behavior-redirect.js
new file mode 100644
index 0000000000..4f6e234c0a
--- /dev/null
+++ b/webroot/rsrc/js/core/behavior-redirect.js
@@ -0,0 +1,9 @@
+/**
+ * @provides javelin-behavior-redirect
+ * @requires javelin-behavior
+ *           javelin-uri
+ */
+
+JX.behavior('redirect', function(config) {
+  JX.$U(config.uri).go();
+});

From 573bf15124bb9b204e72bd32ca75f0ef109188ac Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 12:12:53 -0800
Subject: [PATCH 664/865] Provide a more tailored error message when a Herald
 rule fails because of PCRE limits

Summary: Ref T13100. Since rules may begin failing for PRCE configuration reasons soon, provide a more complete explanation of possible causes in the UI.

Test Plan: Faked this, hit it via test console, saw explanation in web UI.

Maniphest Tasks: T13100

Differential Revision: https://secure.phabricator.com/D19178
---
 src/applications/herald/adapter/HeraldAdapter.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index 08a0ca7a52..a266e21f39 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -490,7 +490,13 @@ public function doesConditionMatch(
           $result = @preg_match($condition_value.'S', $value);
           if ($result === false) {
             throw new HeraldInvalidConditionException(
-              pht('Regular expression is not valid!'));
+              pht(
+                'Regular expression "%s" in Herald rule "%s" is not valid, '.
+                'or exceeded backtracking or recursion limits while '.
+                'executing. Verify the expression and correct it or rewrite '.
+                'it with less backtracking.',
+                $condition_value,
+                $rule->getMonogram()));
           }
           if ($result) {
             return $result_if_match;

From 9356a993a8a0e7138c9ce8fb5878f6f7f7581841 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 10:25:05 -0800
Subject: [PATCH 665/865] (stable) Perform a client-side redirect after OAuth
 server authorization

Summary:
Ref T13099. See that task for discussion. Chrome is unhappy with an MFA form submitting to an endpoint which redirects you to an OAuth URI.

Instead, do the redirect entirely on the client.

Chrome's rationale here isn't obvious, so we may be able to revert this at some point.

Test Plan: Went through the OAuth flow locally, was redirected on the client. Will verify in production.

Maniphest Tasks: T13099

Differential Revision: https://secure.phabricator.com/D19177
---
 resources/celerity/map.php                    |  6 ++++
 .../PhabricatorOAuthServerAuthController.php  | 30 +++++++++++++++++--
 webroot/rsrc/js/core/behavior-redirect.js     |  9 ++++++
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 webroot/rsrc/js/core/behavior-redirect.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f601b5cec3..f90e3bd511 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -502,6 +502,7 @@
     'rsrc/js/core/behavior-phabricator-nav.js' => '836f966d',
     'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'acd29eee',
     'rsrc/js/core/behavior-read-only-warning.js' => 'ba158207',
+    'rsrc/js/core/behavior-redirect.js' => '0213259f',
     'rsrc/js/core/behavior-refresh-csrf.js' => 'ab2f381b',
     'rsrc/js/core/behavior-remarkup-preview.js' => '4b700e9e',
     'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
@@ -686,6 +687,7 @@
     'javelin-behavior-project-create' => '065227cc',
     'javelin-behavior-quicksand-blacklist' => '7927a7d3',
     'javelin-behavior-read-only-warning' => 'ba158207',
+    'javelin-behavior-redirect' => '0213259f',
     'javelin-behavior-refresh-csrf' => 'ab2f381b',
     'javelin-behavior-releeph-preview-branch' => 'b2b4fbaf',
     'javelin-behavior-releeph-request-state-change' => 'a0b57eb8',
@@ -934,6 +936,10 @@
       'javelin-dom',
       'phabricator-keyboard-shortcut',
     ),
+    '0213259f' => array(
+      'javelin-behavior',
+      'javelin-uri',
+    ),
     '04b2ae03' => array(
       'javelin-install',
       'javelin-util',
diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
index b9d916e82b..8fdd6fdb75 100644
--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
@@ -172,9 +172,33 @@ public function handleRequest(AphrontRequest $request) {
         ));
 
       if ($client->getIsTrusted()) {
-        return id(new AphrontRedirectResponse())
-          ->setIsExternal(true)
-          ->setURI((string)$full_uri);
+        // NOTE: See T13099. We currently emit a "Content-Security-Policy"
+        // which includes a narrow "form-action". At the time of writing,
+        // Chrome applies "form-action" to redirects following form submission.
+
+        // This can lead to a situation where a user enters the OAuth workflow
+        // and is prompted for MFA. When they submit an MFA response, the form
+        // can redirect here, and Chrome will block the "Location" redirect.
+
+        // To avoid this, render an interstitial. We only actually need to do
+        // this in Chrome (but do it everywhere for consistency) and only need
+        // to do it if the request is a redirect after a form submission (but
+        // we can't tell if it is or not).
+
+        Javelin::initBehavior(
+          'redirect',
+          array(
+            'uri' => (string)$full_uri,
+          ));
+
+        return $this->newDialog()
+          ->setTitle(pht('Authenticate: %s', $name))
+          ->setRedirect(true)
+          ->appendParagraph(
+            pht(
+              'Authorization for "%s" confirmed, redirecting...',
+              phutil_tag('strong', array(), $name)))
+          ->addCancelButton((string)$full_uri, pht('Continue'));
       }
 
       // TODO: It would be nice to give the user more options here, like
diff --git a/webroot/rsrc/js/core/behavior-redirect.js b/webroot/rsrc/js/core/behavior-redirect.js
new file mode 100644
index 0000000000..4f6e234c0a
--- /dev/null
+++ b/webroot/rsrc/js/core/behavior-redirect.js
@@ -0,0 +1,9 @@
+/**
+ * @provides javelin-behavior-redirect
+ * @requires javelin-behavior
+ *           javelin-uri
+ */
+
+JX.behavior('redirect', function(config) {
+  JX.$U(config.uri).go();
+});

From b52783af80bd310d99b450ddbc4816bd2c5a1978 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 12:12:53 -0800
Subject: [PATCH 666/865] (stable) Provide a more tailored error message when a
 Herald rule fails because of PCRE limits

Summary: Ref T13100. Since rules may begin failing for PRCE configuration reasons soon, provide a more complete explanation of possible causes in the UI.

Test Plan: Faked this, hit it via test console, saw explanation in web UI.

Maniphest Tasks: T13100

Differential Revision: https://secure.phabricator.com/D19178
---
 src/applications/herald/adapter/HeraldAdapter.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index 08a0ca7a52..a266e21f39 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -490,7 +490,13 @@ public function doesConditionMatch(
           $result = @preg_match($condition_value.'S', $value);
           if ($result === false) {
             throw new HeraldInvalidConditionException(
-              pht('Regular expression is not valid!'));
+              pht(
+                'Regular expression "%s" in Herald rule "%s" is not valid, '.
+                'or exceeded backtracking or recursion limits while '.
+                'executing. Verify the expression and correct it or rewrite '.
+                'it with less backtracking.',
+                $condition_value,
+                $rule->getMonogram()));
           }
           if ($result) {
             return $result_if_match;

From e57dbcda336ac7c8e2667fa72abccc31289a8244 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 17:36:14 -0800
Subject: [PATCH 667/865] Hide "abraham landed Dxyz irresponsibly" stories from
 feed

Summary:
Ref T13099. Ref T12787. See PHI417. Differential has new "irresponsible" warnings in the timeline somewhat recently, but these publish feed stories that don't link to the revision or have other relevant details, so they're confusing on the balance.

These have a high strength so they render on top, but we actually just want to hide them from the feed and let "abraham closed Dxyz by committing rXzzz." be the primary story.

Modularize things more so that we can get this behavior. Also, respect `shouldHideForFeed()` at display time, not just publishing time.

Test Plan: Used `bin/differential attach-commit` on a non-accepted revision to "irresponsibly land" a revision. Verified that feed story now shows "closed by commit" instead of "closed irresponsibly".

Maniphest Tasks: T13099, T12787

Differential Revision: https://secure.phabricator.com/D19179
---
 ...ferentialRevisionWrongStateTransaction.php |  5 +--
 .../storage/ManiphestTransaction.php          | 16 ---------
 .../ManiphestTaskUnblockTransaction.php       | 10 ++++++
 .../storage/PhrictionTransaction.php          | 12 -------
 .../PhrictionDocumentMoveAwayTransaction.php  |  4 +++
 .../PhrictionDocumentMoveToTransaction.php    |  4 +++
 ...ricatorApplicationTransactionFeedStory.php | 33 ++++++++++++++++++-
 .../storage/PhabricatorModularTransaction.php |  8 +++++
 .../PhabricatorModularTransactionType.php     |  4 +++
 9 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php b/src/applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php
index e19e54199c..47678e886f 100644
--- a/src/applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionWrongStateTransaction.php
@@ -35,7 +35,8 @@ public function getTitle() {
       $this->renderValue($status->getDisplayName()));
   }
 
-  public function getTitleForFeed() {
-    return null;
+  public function shouldHideForFeed() {
+    return true;
   }
+
 }
diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
index 6301241050..e2739c1d09 100644
--- a/src/applications/maniphest/storage/ManiphestTransaction.php
+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
@@ -40,22 +40,6 @@ public function shouldGenerateOldValue() {
     return parent::shouldGenerateOldValue();
   }
 
-  public function shouldHideForFeed() {
-    // NOTE: Modular transactions don't currently support this, and it has
-    // very few callsites, and it's publish-time rather than display-time.
-    // This should probably become a supported, display-time behavior. For
-    // discussion, see T12787.
-
-    // Hide "alice created X, a task blocking Y." from feed because it
-    // will almost always appear adjacent to "alice created Y".
-    $is_new = $this->getMetadataValue('blocker.new');
-    if ($is_new) {
-      return true;
-    }
-
-    return parent::shouldHideForFeed();
-  }
-
   public function getRequiredHandlePHIDs() {
     $phids = parent::getRequiredHandlePHIDs();
 
diff --git a/src/applications/maniphest/xaction/ManiphestTaskUnblockTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskUnblockTransaction.php
index 1c7a88dec7..8833e62b79 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskUnblockTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskUnblockTransaction.php
@@ -112,5 +112,15 @@ public function getIcon() {
     return 'fa-shield';
   }
 
+  public function shouldHideForFeed() {
+    // Hide "alice created X, a task blocking Y." from feed because it
+    // will almost always appear adjacent to "alice created Y".
+    $is_new = $this->getMetadataValue('blocker.new');
+    if ($is_new) {
+      return true;
+    }
+
+    return parent::shouldHideForFeed();
+  }
 
 }
diff --git a/src/applications/phriction/storage/PhrictionTransaction.php b/src/applications/phriction/storage/PhrictionTransaction.php
index 2ce9d38a08..860a86be35 100644
--- a/src/applications/phriction/storage/PhrictionTransaction.php
+++ b/src/applications/phriction/storage/PhrictionTransaction.php
@@ -54,18 +54,6 @@ public function shouldHideForMail(array $xactions) {
     return parent::shouldHideForMail($xactions);
   }
 
-  public function shouldHideForFeed() {
-    switch ($this->getTransactionType()) {
-      case PhrictionDocumentMoveToTransaction::TRANSACTIONTYPE:
-      case PhrictionDocumentMoveAwayTransaction::TRANSACTIONTYPE:
-        return true;
-      case PhrictionDocumentTitleTransaction::TRANSACTIONTYPE:
-        return $this->getMetadataValue('stub:create:phid', false);
-    }
-    return parent::shouldHideForFeed();
-  }
-
-
   public function getMailTags() {
     $tags = array();
     switch ($this->getTransactionType()) {
diff --git a/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
index c827f7337d..3cd45f73b7 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
@@ -59,4 +59,8 @@ public function getIcon() {
     return 'fa-arrows';
   }
 
+  public function shouldHideForFeed() {
+    return true;
+  }
+
 }
diff --git a/src/applications/phriction/xaction/PhrictionDocumentMoveToTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentMoveToTransaction.php
index a95e70ebdb..bdf2c5d8fc 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentMoveToTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentMoveToTransaction.php
@@ -102,4 +102,8 @@ public function getIcon() {
     return 'fa-arrows';
   }
 
+  public function shouldHideForFeed() {
+    return true;
+  }
+
 }
diff --git a/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php b/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php
index 6cc18d5181..305e38ab09 100644
--- a/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php
+++ b/src/applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php
@@ -6,6 +6,8 @@
 class PhabricatorApplicationTransactionFeedStory
   extends PhabricatorFeedStory {
 
+  private $primaryTransactionPHID;
+
   public function getPrimaryObjectPHID() {
     return $this->getValue('objectPHID');
   }
@@ -27,7 +29,36 @@ public function getRequiredHandlePHIDs() {
   }
 
   protected function getPrimaryTransactionPHID() {
-    return head($this->getValue('transactionPHIDs'));
+    if ($this->primaryTransactionPHID === null) {
+      // Transactions are filtered and sorted before they're stored, but the
+      // rendering logic can change between the time an edit occurs and when
+      // we actually render the story. Recalculate the filtering at display
+      // time because it's cheap and gets us better results when things change
+      // by letting the changes apply retroactively.
+
+      $xaction_phids = $this->getValue('transactionPHIDs');
+
+      $xactions = array();
+      foreach ($xaction_phids as $xaction_phid) {
+        $xactions[] = $this->getObject($xaction_phid);
+      }
+
+      foreach ($xactions as $key => $xaction) {
+        if ($xaction->shouldHideForFeed()) {
+          unset($xactions[$key]);
+        }
+      }
+
+      if ($xactions) {
+        $primary_phid = head($xactions)->getPHID();
+      } else {
+        $primary_phid = head($xaction_phids);
+      }
+
+      $this->primaryTransactionPHID = $primary_phid;
+    }
+
+    return $this->primaryTransactionPHID;
   }
 
   public function getPrimaryTransaction() {
diff --git a/src/applications/transactions/storage/PhabricatorModularTransaction.php b/src/applications/transactions/storage/PhabricatorModularTransaction.php
index 9f3c24b946..fff2b842d1 100644
--- a/src/applications/transactions/storage/PhabricatorModularTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransaction.php
@@ -92,6 +92,14 @@ final public function applyExternalEffects($object) {
     return parent::shouldHide();
   }
 
+  final public function shouldHideForFeed() {
+    if ($this->getTransactionImplementation()->shouldHideForFeed()) {
+      return true;
+    }
+
+    return parent::shouldHideForFeed();
+  }
+
   /* final */ public function getIcon() {
     $icon = $this->getTransactionImplementation()->getIcon();
     if ($icon !== null) {
diff --git a/src/applications/transactions/storage/PhabricatorModularTransactionType.php b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
index f2b59c8a2b..d93831affc 100644
--- a/src/applications/transactions/storage/PhabricatorModularTransactionType.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
@@ -47,6 +47,10 @@ public function shouldHide() {
     return false;
   }
 
+  public function shouldHideForFeed() {
+    return false;
+  }
+
   public function getIcon() {
     return null;
   }

From d14a0f4787b5bc563b129b08947f964001dbecfe Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 18:38:23 -0800
Subject: [PATCH 668/865] Add "All" and "With Non-Owner Author" options for all
 Owners Package autoreview rules

Summary: Ref T13099. See PHI424. Fixes T11664. Several installs are interested in having these behaviors available in Owners by default and they aren't difficult to provide, it just makes the UI kind of messy. But I think there's enough general interest to justify it, now.

Test Plan: Created a package which owns "/" with a "With Non-Owner Author" review rule which I own. Created a revision, no package reviewer. Changed rule to "All", updated revision, got package reviewer.

Maniphest Tasks: T13099, T11664

Differential Revision: https://secure.phabricator.com/D19180
---
 .../editor/DifferentialTransactionEditor.php  | 55 +++++++++++++------
 .../storage/PhabricatorOwnersPackage.php      | 25 +++++++--
 src/docs/user/userguide/owners.diviner        | 23 +++++---
 3 files changed, 72 insertions(+), 31 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 03af04dd0f..d04b0d684a 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -982,25 +982,43 @@ protected function didApplyHeraldRules(
       return array();
     }
 
-    // Remove packages that the revision author is an owner of. If you own
-    // code, you don't need another owner to review it.
-    $authority = id(new PhabricatorOwnersPackageQuery())
-      ->setViewer(PhabricatorUser::getOmnipotentUser())
-      ->withPHIDs(mpull($packages, 'getPHID'))
-      ->withAuthorityPHIDs(array($object->getAuthorPHID()))
-      ->execute();
-    $authority = mpull($authority, null, 'getPHID');
+    // Identify the packages with "Non-Owner Author" review rules and remove
+    // them if the author has authority over the package.
+
+    $autoreview_map = PhabricatorOwnersPackage::getAutoreviewOptionsMap();
+    $need_authority = array();
+    foreach ($packages as $package) {
+      $autoreview_setting = $package->getAutoReview();
 
-    foreach ($packages as $key => $package) {
-      $package_phid = $package->getPHID();
-      if (isset($authority[$package_phid])) {
-        unset($packages[$key]);
+      $spec = idx($autoreview_map, $autoreview_setting);
+      if (!$spec) {
         continue;
       }
+
+      if (idx($spec, 'authority')) {
+        $need_authority[$package->getPHID()] = $package->getPHID();
+      }
     }
 
-    if (!$packages) {
-      return array();
+    if ($need_authority) {
+      $authority = id(new PhabricatorOwnersPackageQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withPHIDs($need_authority)
+        ->withAuthorityPHIDs(array($object->getAuthorPHID()))
+        ->execute();
+      $authority = mpull($authority, null, 'getPHID');
+
+      foreach ($packages as $key => $package) {
+        $package_phid = $package->getPHID();
+        if (isset($authority[$package_phid])) {
+          unset($packages[$key]);
+          continue;
+        }
+      }
+
+      if (!$packages) {
+        return array();
+      }
     }
 
     $auto_subscribe = array();
@@ -1009,15 +1027,18 @@ protected function didApplyHeraldRules(
 
     foreach ($packages as $package) {
       switch ($package->getAutoReview()) {
-        case PhabricatorOwnersPackage::AUTOREVIEW_SUBSCRIBE:
-          $auto_subscribe[] = $package;
-          break;
         case PhabricatorOwnersPackage::AUTOREVIEW_REVIEW:
+        case PhabricatorOwnersPackage::AUTOREVIEW_REVIEW_ALWAYS:
           $auto_review[] = $package;
           break;
         case PhabricatorOwnersPackage::AUTOREVIEW_BLOCK:
+        case PhabricatorOwnersPackage::AUTOREVIEW_BLOCK_ALWAYS:
           $auto_block[] = $package;
           break;
+        case PhabricatorOwnersPackage::AUTOREVIEW_SUBSCRIBE:
+        case PhabricatorOwnersPackage::AUTOREVIEW_SUBSCRIBE_ALWAYS:
+          $auto_subscribe[] = $package;
+          break;
         case PhabricatorOwnersPackage::AUTOREVIEW_NONE:
         default:
           break;
diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
index a09137c4df..60d244052f 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
@@ -33,8 +33,11 @@ final class PhabricatorOwnersPackage
 
   const AUTOREVIEW_NONE = 'none';
   const AUTOREVIEW_SUBSCRIBE = 'subscribe';
+  const AUTOREVIEW_SUBSCRIBE_ALWAYS = 'subscribe-always';
   const AUTOREVIEW_REVIEW = 'review';
+  const AUTOREVIEW_REVIEW_ALWAYS = 'review-always';
   const AUTOREVIEW_BLOCK = 'block';
+  const AUTOREVIEW_BLOCK_ALWAYS = 'block-always';
 
   const DOMINION_STRONG = 'strong';
   const DOMINION_WEAK = 'weak';
@@ -74,14 +77,26 @@ public static function getAutoreviewOptionsMap() {
       self::AUTOREVIEW_NONE => array(
         'name' => pht('No Autoreview'),
       ),
-      self::AUTOREVIEW_SUBSCRIBE => array(
-        'name' => pht('Subscribe to Changes'),
-      ),
       self::AUTOREVIEW_REVIEW => array(
-        'name' => pht('Review Changes'),
+        'name' => pht('Review Changes With Non-Owner Author'),
+        'authority' => true,
       ),
       self::AUTOREVIEW_BLOCK => array(
-        'name' => pht('Review Changes (Blocking)'),
+        'name' => pht('Review Changes With Non-Owner Author (Blocking)'),
+        'authority' => true,
+      ),
+      self::AUTOREVIEW_SUBSCRIBE => array(
+        'name' => pht('Subscribe to Changes With Non-Owner Author'),
+        'authority' => true,
+      ),
+      self::AUTOREVIEW_REVIEW_ALWAYS => array(
+        'name' => pht('Review All Changes'),
+      ),
+      self::AUTOREVIEW_BLOCK_ALWAYS => array(
+        'name' => pht('Review All Changes (Blocking)'),
+      ),
+      self::AUTOREVIEW_SUBSCRIBE_ALWAYS => array(
+        'name' => pht('Subscribe to All Changes'),
       ),
     );
   }
diff --git a/src/docs/user/userguide/owners.diviner b/src/docs/user/userguide/owners.diviner
index f30fe5023c..35260b08af 100644
--- a/src/docs/user/userguide/owners.diviner
+++ b/src/docs/user/userguide/owners.diviner
@@ -84,21 +84,26 @@ You can configure **Auto Review** for packages. When a new code review is
 created in Differential which affects code in a package, the package can
 automatically be added as a subscriber or reviewer.
 
-The available settings are:
+The available settings allow you to take these actions:
 
-  - **No Autoreview**: This package will not be added to new reviews.
-  - **Subscribe to Changes**: This package will be added to reviews as a
-    subscriber. Owners will be notified of changes, but not required to act.
   - **Review Changes**: This package will be added to reviews as a reviewer.
     Reviews will appear on the dashboards of package owners.
-  - **Review Changes (Blocking)** This package will be added to reviews
-    as a blocking reviewer. A package owner will be required to accept changes
+  - **Review Changes (Blocking)** This package will be added to reviews as a
+    blocking reviewer. A package owner will be required to accept changes
     before they may land.
+  - **Subscribe to Changes**: This package will be added to reviews as a
+    subscriber. Owners will be notified of changes, but not required to act.
+
+If you select the **With Non-Owner Author** option for these actions, the
+action will not trigger if the author of the revision is a package owner. This
+mode may be helpful if you are using Owners mostly to make sure that someone
+who is qualified is involved in each change to a piece of code.
 
-NOTE: These rules **do not trigger** if the change author is a package owner.
-They only apply to changes made by users who aren't already owners.
+If you select the **All** option for these actions, the action will always
+trigger even if the author is a package owner. This mode may be helpful if you
+are using Owners mostly to suggest reviewers.
 
-These rules also do not trigger if the package has been archived.
+These rules do not trigger if the package has been archived.
 
 The intent of this feature is to make it easy to configure simple, reasonable
 behaviors. If you want more tailored or specific triggers, you can write more

From 1bf4422c749c8a6777e4e77eb7806c8dcad6e2b8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 19:33:49 -0800
Subject: [PATCH 669/865] Add and populate a `pathIndex` column for OwnersPath

Summary: Ref T11015. This supports making path names arbitrarily long and putting a proper unique key on the table.

Test Plan:
  - Migrated, checked database, saw nice digested indexes.
  - Edited a package, saw new rows update with digested indexes.

Maniphest Tasks: T11015

Differential Revision: https://secure.phabricator.com/D19181
---
 .../autopatches/20180306.opath.01.digest.sql  |  2 ++
 .../20180306.opath.02.digestpopulate.php      | 19 +++++++++++++++++++
 .../owners/storage/PhabricatorOwnersPath.php  | 11 +++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 resources/sql/autopatches/20180306.opath.01.digest.sql
 create mode 100644 resources/sql/autopatches/20180306.opath.02.digestpopulate.php

diff --git a/resources/sql/autopatches/20180306.opath.01.digest.sql b/resources/sql/autopatches/20180306.opath.01.digest.sql
new file mode 100644
index 0000000000..2418366fc5
--- /dev/null
+++ b/resources/sql/autopatches/20180306.opath.01.digest.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_owners.owners_path
+  ADD pathIndex BINARY(12) NOT NULL;
diff --git a/resources/sql/autopatches/20180306.opath.02.digestpopulate.php b/resources/sql/autopatches/20180306.opath.02.digestpopulate.php
new file mode 100644
index 0000000000..a6b817fc46
--- /dev/null
+++ b/resources/sql/autopatches/20180306.opath.02.digestpopulate.php
@@ -0,0 +1,19 @@
+<?php
+
+$table = new PhabricatorOwnersPath();
+$conn = $table->establishConnection('w');
+
+foreach (new LiskMigrationIterator($table) as $path) {
+  $index = PhabricatorHash::digestForIndex($path->getPath());
+
+  if ($index === $path->getPathIndex()) {
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET pathIndex = %s WHERE id = %d',
+    $table->getTableName(),
+    $index,
+    $path->getID());
+}
diff --git a/src/applications/owners/storage/PhabricatorOwnersPath.php b/src/applications/owners/storage/PhabricatorOwnersPath.php
index f240db2851..47f7faa2b3 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPath.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPath.php
@@ -4,6 +4,7 @@ final class PhabricatorOwnersPath extends PhabricatorOwnersDAO {
 
   protected $packageID;
   protected $repositoryPHID;
+  protected $pathIndex;
   protected $path;
   protected $excluded;
 
@@ -15,6 +16,7 @@ protected function getConfiguration() {
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_COLUMN_SCHEMA => array(
         'path' => 'text255',
+        'pathIndex' => 'bytes12',
         'excluded' => 'bool',
       ),
       self::CONFIG_KEY_SCHEMA => array(
@@ -25,12 +27,17 @@ protected function getConfiguration() {
     ) + parent::getConfiguration();
   }
 
-
   public static function newFromRef(array $ref) {
     $path = new PhabricatorOwnersPath();
     $path->repositoryPHID = $ref['repositoryPHID'];
-    $path->path = $ref['path'];
+
+    $raw_path = $ref['path'];
+
+    $path->pathIndex = PhabricatorHash::digestForIndex($raw_path);
+    $path->path = $raw_path;
+
     $path->excluded = $ref['excluded'];
+
     return $path;
   }
 

From 8cb273a0532b128b75b3a30aefe3a2a2c1ea36e2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 19:42:02 -0800
Subject: [PATCH 670/865] Add a unique key to OwnersPath on "<packageID,
 repositoryPHID, pathIndex>"

Summary:
Depends on D19181. Ref T11015. This nukes duplicates from the table if they exist, then adds a unique key.

(Duplicates should not exist and can not be added with any recent version of the web UI.)

Test Plan:
  - Tried to add duplicates with web UI, didn't have any luck.
  - Explicitly added duplicates with manual `INSERT`s.
  - Viewed packages in web UI and saw duplicates.
  - Ran migrations, got a clean purge and a nice unique key.
  - There's still no way to actually hit a duplicate key error in the UI (unless you can collide hashes, I suppose), this is purely a correctness/robustness change.

Maniphest Tasks: T11015

Differential Revision: https://secure.phabricator.com/D19182
---
 .../autopatches/20180306.opath.03.purge.php   | 22 +++++++++++++++++++
 .../autopatches/20180306.opath.04.unique.sql  |  2 ++
 .../owners/storage/PhabricatorOwnersPath.php  |  5 +++--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 resources/sql/autopatches/20180306.opath.03.purge.php
 create mode 100644 resources/sql/autopatches/20180306.opath.04.unique.sql

diff --git a/resources/sql/autopatches/20180306.opath.03.purge.php b/resources/sql/autopatches/20180306.opath.03.purge.php
new file mode 100644
index 0000000000..91a15e2a58
--- /dev/null
+++ b/resources/sql/autopatches/20180306.opath.03.purge.php
@@ -0,0 +1,22 @@
+<?php
+
+$table = new PhabricatorOwnersPath();
+$conn = $table->establishConnection('w');
+
+$seen = array();
+foreach (new LiskMigrationIterator($table) as $path) {
+  $package_id = $path->getPackageID();
+  $repository_phid = $path->getRepositoryPHID();
+  $path_index = $path->getPathIndex();
+
+  if (!isset($seen[$package_id][$repository_phid][$path_index])) {
+    $seen[$package_id][$repository_phid][$path_index] = true;
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'DELETE FROM %T WHERE id = %d',
+    $table->getTableName(),
+    $path->getID());
+}
diff --git a/resources/sql/autopatches/20180306.opath.04.unique.sql b/resources/sql/autopatches/20180306.opath.04.unique.sql
new file mode 100644
index 0000000000..2349533b1f
--- /dev/null
+++ b/resources/sql/autopatches/20180306.opath.04.unique.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_owners.owners_path
+  ADD UNIQUE KEY `key_path` (packageID, repositoryPHID, pathIndex);
diff --git a/src/applications/owners/storage/PhabricatorOwnersPath.php b/src/applications/owners/storage/PhabricatorOwnersPath.php
index 47f7faa2b3..7e7822df1a 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPath.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPath.php
@@ -20,8 +20,9 @@ protected function getConfiguration() {
         'excluded' => 'bool',
       ),
       self::CONFIG_KEY_SCHEMA => array(
-        'packageID' => array(
-          'columns' => array('packageID'),
+        'key_path' => array(
+          'columns' => array('packageID', 'repositoryPHID', 'pathIndex'),
+          'unique' => true,
         ),
       ),
     ) + parent::getConfiguration();

From adde4089b49b71f7761a02c66b43eb807f86747f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 19:50:09 -0800
Subject: [PATCH 671/865] Allow owners paths to be arbitrarily long and add
 storage for display paths

Summary:
Depends on D19182. Ref T11015. This changes `path` from `text255` to `longtext` because paths may be arbitrarily long.

It adds `pathDisplay` to prepare for display paths and storage paths having different values. For now, `pathDisplay` is copied from `path` and always has the same value.

Test Plan:
  - Ran migration, checked database for sanity (all `pathDisplay` and `path` values identical).
  - Added new paths, saw `pathDisplay` and `path` get the same values.
  - Added an unreasonably enormous path with far more than 255 characters.

Maniphest Tasks: T11015

Differential Revision: https://secure.phabricator.com/D19183
---
 resources/sql/autopatches/20180306.opath.05.longpath.sql    | 2 ++
 resources/sql/autopatches/20180306.opath.06.pathdisplay.sql | 2 ++
 resources/sql/autopatches/20180306.opath.07.copypaths.sql   | 2 ++
 src/applications/owners/storage/PhabricatorOwnersPath.php   | 5 ++++-
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20180306.opath.05.longpath.sql
 create mode 100644 resources/sql/autopatches/20180306.opath.06.pathdisplay.sql
 create mode 100644 resources/sql/autopatches/20180306.opath.07.copypaths.sql

diff --git a/resources/sql/autopatches/20180306.opath.05.longpath.sql b/resources/sql/autopatches/20180306.opath.05.longpath.sql
new file mode 100644
index 0000000000..79ff2f7a7f
--- /dev/null
+++ b/resources/sql/autopatches/20180306.opath.05.longpath.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_owners.owners_path
+  CHANGE path path LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180306.opath.06.pathdisplay.sql b/resources/sql/autopatches/20180306.opath.06.pathdisplay.sql
new file mode 100644
index 0000000000..b9b336ecd7
--- /dev/null
+++ b/resources/sql/autopatches/20180306.opath.06.pathdisplay.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_owners.owners_path
+  ADD pathDisplay LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180306.opath.07.copypaths.sql b/resources/sql/autopatches/20180306.opath.07.copypaths.sql
new file mode 100644
index 0000000000..74ebecfa9a
--- /dev/null
+++ b/resources/sql/autopatches/20180306.opath.07.copypaths.sql
@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_owners.owners_path
+  SET pathDisplay = path WHERE pathDisplay = '';
diff --git a/src/applications/owners/storage/PhabricatorOwnersPath.php b/src/applications/owners/storage/PhabricatorOwnersPath.php
index 7e7822df1a..6c49023e69 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPath.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPath.php
@@ -6,6 +6,7 @@ final class PhabricatorOwnersPath extends PhabricatorOwnersDAO {
   protected $repositoryPHID;
   protected $pathIndex;
   protected $path;
+  protected $pathDisplay;
   protected $excluded;
 
   private $fragments;
@@ -15,7 +16,8 @@ protected function getConfiguration() {
     return array(
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_COLUMN_SCHEMA => array(
-        'path' => 'text255',
+        'path' => 'text',
+        'pathDisplay' => 'text',
         'pathIndex' => 'bytes12',
         'excluded' => 'bool',
       ),
@@ -36,6 +38,7 @@ public static function newFromRef(array $ref) {
 
     $path->pathIndex = PhabricatorHash::digestForIndex($raw_path);
     $path->path = $raw_path;
+    $path->pathDisplay = $raw_path;
 
     $path->excluded = $ref['excluded'];
 

From df1e9ce646c03a9e23be5b1f254a1b67a0b24c0e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 20:07:32 -0800
Subject: [PATCH 672/865] Treat Owners paths like "/src/backend" and
 "/src/backend/" identically

Summary:
Depends on D19183. Ref T11015. Currently, adding a trailing slash works great and omitting it mysteriously doesn't work.

Store a normalized version with an unconditional trailing slash for the lookup logic to operate on, and a separate display version which tracks what the user actually typed.

Test Plan:
  - Entered "/src/main.c", "/src/main.c/", saw them de-duplicate.
  - Entered "/src/main.c", saw it stay that way in the UI but appear as "/src/main.c/" internally.
  - Added a rule for "/src/applications/owners" (no slash), created a revision touching paths in that directory, saw Owners fire for it.
  - Changed the display value of a path only ("/src/main.c" to "/src/main.c/"), saw the update reflected in the UI without any beahvioral change.

Maniphest Tasks: T11015

Differential Revision: https://secure.phabricator.com/D19184
---
 resources/celerity/map.php                    | 20 ++++++------
 .../PhabricatorOwnersDetailController.php     |  4 +--
 ...catorOwnersPathsSearchEngineAttachment.php |  2 +-
 .../owners/storage/PhabricatorOwnersPath.php  |  1 +
 ...abricatorOwnersPackagePathsTransaction.php | 32 +++++++++++++++++++
 .../js/application/owners/OwnersPathEditor.js |  2 +-
 6 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f90e3bd511..a6435d6afd 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -424,7 +424,7 @@
     'rsrc/js/application/maniphest/behavior-line-chart.js' => 'e4232876',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
     'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '71237763',
-    'rsrc/js/application/owners/OwnersPathEditor.js' => 'aa1733d0',
+    'rsrc/js/application/owners/OwnersPathEditor.js' => '996d62b9',
     'rsrc/js/application/owners/owners-path-editor.js' => '7a68dda3',
     'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc',
     'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => 'bee502c8',
@@ -764,7 +764,7 @@
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
     'multirow-row-manager' => 'b5d57730',
-    'owners-path-editor' => 'aa1733d0',
+    'owners-path-editor' => '996d62b9',
     'owners-path-editor-css' => '2f00933b',
     'paste-css' => '9fcc9773',
     'path-typeahead' => 'f7fc67ec',
@@ -1676,6 +1676,14 @@
       'javelin-mask',
       'phabricator-drag-and-drop-file-upload',
     ),
+    '996d62b9' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'path-typeahead',
+      'javelin-dom',
+      'javelin-util',
+      'phabricator-prefab',
+    ),
     '9a6dd75c' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1766,14 +1774,6 @@
       'javelin-fx',
       'javelin-util',
     ),
-    'aa1733d0' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'path-typeahead',
-      'javelin-dom',
-      'javelin-util',
-      'phabricator-prefab',
-    ),
     'ab2f381b' => array(
       'javelin-request',
       'javelin-behavior',
diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
index 3c6ae3836c..c7e96594f3 100644
--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
@@ -279,7 +279,7 @@ private function renderPathsTable(array $paths, array $repositories) {
       $href = $repo->generateURI(
         array(
           'branch'   => $repo->getDefaultBranch(),
-          'path'     => $path->getPath(),
+          'path'     => $path->getPathDisplay(),
           'action'   => 'browse',
         ));
 
@@ -288,7 +288,7 @@ private function renderPathsTable(array $paths, array $repositories) {
         array(
           'href' => (string)$href,
         ),
-        $path->getPath());
+        $path->getPathDisplay());
 
       $rows[] = array(
         ($path->getExcluded() ? '-' : '+'),
diff --git a/src/applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php b/src/applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php
index ad5415ef69..19e699e8ff 100644
--- a/src/applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php
+++ b/src/applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php
@@ -22,7 +22,7 @@ public function getAttachmentForObject($object, $data, $spec) {
     foreach ($paths as $path) {
       $list[] = array(
         'repositoryPHID' => $path->getRepositoryPHID(),
-        'path' => $path->getPath(),
+        'path' => $path->getPathDisplay(),
         'excluded' => (bool)$path->getExcluded(),
       );
     }
diff --git a/src/applications/owners/storage/PhabricatorOwnersPath.php b/src/applications/owners/storage/PhabricatorOwnersPath.php
index 6c49023e69..0ef7fce59b 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPath.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPath.php
@@ -49,6 +49,7 @@ public function getRef() {
     return array(
       'repositoryPHID' => $this->getRepositoryPHID(),
       'path' => $this->getPath(),
+      'display' => $this->getPathDisplay(),
       'excluded' => (int)$this->getExcluded(),
     );
   }
diff --git a/src/applications/owners/xaction/PhabricatorOwnersPackagePathsTransaction.php b/src/applications/owners/xaction/PhabricatorOwnersPackagePathsTransaction.php
index 5952b78aed..984b26b8ac 100644
--- a/src/applications/owners/xaction/PhabricatorOwnersPackagePathsTransaction.php
+++ b/src/applications/owners/xaction/PhabricatorOwnersPackagePathsTransaction.php
@@ -103,6 +103,26 @@ public function applyExternalEffects($object, $value) {
 
     $paths = $object->getPaths();
 
+    // We store paths in a normalized format with a trailing slash, regardless
+    // of whether the user enters "path/to/file.c" or "src/backend/". Normalize
+    // paths now.
+
+    $display_map = array();
+    foreach ($new as $key => $spec) {
+      $display_path = $spec['path'];
+      $raw_path = rtrim($display_path, '/').'/';
+
+      // If the user entered two paths which normalize to the same value
+      // (like "src/main.c" and "src/main.c/"), discard the duplicates.
+      if (isset($display_map[$raw_path])) {
+        unset($new[$key]);
+        continue;
+      }
+
+      $new[$key]['path'] = $raw_path;
+      $display_map[$raw_path] = $display_path;
+    }
+
     $diffs = PhabricatorOwnersPath::getTransactionValueChanges($old, $new);
     list($rem, $add) = $diffs;
 
@@ -111,12 +131,24 @@ public function applyExternalEffects($object, $value) {
       $ref = $path->getRef();
       if (PhabricatorOwnersPath::isRefInSet($ref, $set)) {
         $path->delete();
+        continue;
+      }
+
+      // If the user has changed the display value for a path but the raw
+      // storage value hasn't changed, update the display value.
+
+      if (isset($display_map[$path->getPath()])) {
+        $path
+          ->setPathDisplay($display_map[$path->getPath()])
+          ->save();
+        continue;
       }
     }
 
     foreach ($add as $ref) {
       $path = PhabricatorOwnersPath::newFromRef($ref)
         ->setPackageID($object->getID())
+        ->setPathDisplay($display_map[$ref['path']])
         ->save();
     }
   }
diff --git a/webroot/rsrc/js/application/owners/OwnersPathEditor.js b/webroot/rsrc/js/application/owners/OwnersPathEditor.js
index 3199ac4e2a..f1d47a7908 100644
--- a/webroot/rsrc/js/application/owners/OwnersPathEditor.js
+++ b/webroot/rsrc/js/application/owners/OwnersPathEditor.js
@@ -115,7 +115,7 @@ JX.install('OwnersPathEditor', {
       JX.copy(
         path_input,
         {
-          value : path_ref.path || '',
+          value : path_ref.display || '',
           name : 'path[' + this._count + ']'
         });
 

From 516aaad3410c242b47ee270b4cdca8e56f6b379b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 20:25:17 -0800
Subject: [PATCH 673/865] Use "pathIndex" in some owners package queries to
 improve query plans

Summary: Depends on D19184. Ref T11015. Now that we have a digest index column, we can improve some of the queries a bit.

Test Plan:
  - Ran queries from revision pages before and after with and without EXPLAIN.
  - Saw the same results with much better EXPLAIN plans.
  - Fragment size is now fixed at 12 bytes per fragment, so we can shove more of them in a single query.

Maniphest Tasks: T11015

Differential Revision: https://secure.phabricator.com/D19185
---
 .../query/PhabricatorOwnersPackageQuery.php   | 20 ++++++++++++++-----
 .../storage/PhabricatorOwnersPackage.php      | 11 +++++++---
 .../owners/storage/PhabricatorOwnersPath.php  |  3 +++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
index ce411aad35..ff0665b344 100644
--- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
+++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
@@ -206,8 +206,8 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->paths !== null) {
       $where[] = qsprintf(
         $conn,
-        'rpath.path IN (%Ls)',
-        $this->getFragmentsForPaths($this->paths));
+        'rpath.pathIndex IN (%Ls)',
+        $this->getFragmentIndexesForPaths($this->paths));
     }
 
     if ($this->statuses !== null) {
@@ -220,13 +220,13 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     if ($this->controlMap) {
       $clauses = array();
       foreach ($this->controlMap as $repository_phid => $paths) {
-        $fragments = $this->getFragmentsForPaths($paths);
+        $indexes = $this->getFragmentIndexesForPaths($paths);
 
         $clauses[] = qsprintf(
           $conn,
-          '(rpath.repositoryPHID = %s AND rpath.path IN (%Ls))',
+          '(rpath.repositoryPHID = %s AND rpath.pathIndex IN (%Ls))',
           $repository_phid,
-          $fragments);
+          $indexes);
       }
       $where[] = implode(' OR ', $clauses);
     }
@@ -333,6 +333,16 @@ private function getFragmentsForPaths(array $paths) {
     return $fragments;
   }
 
+  private function getFragmentIndexesForPaths(array $paths) {
+    $indexes = array();
+
+    foreach ($this->getFragmentsForPaths($paths) as $fragment) {
+      $indexes[] = PhabricatorHash::digestForIndex($fragment);
+    }
+
+    return $indexes;
+  }
+
 
 /* -(  Path Control  )------------------------------------------------------- */
 
diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
index 60d244052f..7f155d7c89 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
@@ -218,15 +218,20 @@ private static function loadPackagesForPaths(
     // and then merge results in PHP.
 
     $rows = array();
-    foreach (array_chunk(array_keys($fragments), 128) as $chunk) {
+    foreach (array_chunk(array_keys($fragments), 1024) as $chunk) {
+      $indexes = array();
+      foreach ($chunk as $fragment) {
+        $indexes[] = PhabricatorHash::digestForIndex($fragment);
+      }
+
       $rows[] = queryfx_all(
         $conn,
         'SELECT pkg.id, pkg.dominion, p.excluded, p.path
           FROM %T pkg JOIN %T p ON p.packageID = pkg.id
-          WHERE p.path IN (%Ls) AND pkg.status IN (%Ls) %Q',
+          WHERE p.pathIndex IN (%Ls) AND pkg.status IN (%Ls) %Q',
         $package->getTableName(),
         $path->getTableName(),
-        $chunk,
+        $indexes,
         array(
           self::STATUS_ACTIVE,
         ),
diff --git a/src/applications/owners/storage/PhabricatorOwnersPath.php b/src/applications/owners/storage/PhabricatorOwnersPath.php
index 0ef7fce59b..7022cb887c 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPath.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPath.php
@@ -26,6 +26,9 @@ protected function getConfiguration() {
           'columns' => array('packageID', 'repositoryPHID', 'pathIndex'),
           'unique' => true,
         ),
+        'key_repository' => array(
+          'columns' => array('repositoryPHID', 'pathIndex'),
+        ),
       ),
     ) + parent::getConfiguration();
   }

From 9462f8aa8908c3e81352dd149c362bfeed9e2204 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 20:40:16 -0800
Subject: [PATCH 674/865] Remove client OAuth redirect code which was only
 partially cleaned up

See T13099. I took a different approach here but didn't fully clean up
the old one.
---
 .../controller/PhabricatorOAuthServerAuthController.php          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
index 8fdd6fdb75..745be3e820 100644
--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
@@ -193,7 +193,6 @@ public function handleRequest(AphrontRequest $request) {
 
         return $this->newDialog()
           ->setTitle(pht('Authenticate: %s', $name))
-          ->setRedirect(true)
           ->appendParagraph(
             pht(
               'Authorization for "%s" confirmed, redirecting...',

From 18708bb59a72d0936a7da22654a60aa283123c26 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 6 Mar 2018 20:40:16 -0800
Subject: [PATCH 675/865] (stable) Remove client OAuth redirect code which was
 only partially cleaned up

See T13099. I took a different approach here but didn't fully clean up
the old one.
---
 .../controller/PhabricatorOAuthServerAuthController.php          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
index 8fdd6fdb75..745be3e820 100644
--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
@@ -193,7 +193,6 @@ public function handleRequest(AphrontRequest $request) {
 
         return $this->newDialog()
           ->setTitle(pht('Authenticate: %s', $name))
-          ->setRedirect(true)
           ->appendParagraph(
             pht(
               'Authorization for "%s" confirmed, redirecting...',

From 28854ae8121b02ab0d78997cf416ec562afb01c3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Mar 2018 06:20:18 -0800
Subject: [PATCH 676/865] Return a integer JSON type from "*.edit" endpoints
 for the object ID

Summary: See PHI425. See T12678. This should be an integer, but may be a string.

Test Plan: Called `differential.revision.edit`, observed integer in result instead of string.

Differential Revision: https://secure.phabricator.com/D19186
---
 .../transactions/editengine/PhabricatorEditEngine.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index ea171a421c..de8139b145 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -2092,7 +2092,7 @@ final public function buildConduitResponse(ConduitAPIRequest $request) {
 
     return array(
       'object' => array(
-        'id' => $object->getID(),
+        'id' => (int)$object->getID(),
         'phid' => $object->getPHID(),
       ),
       'transactions' => $xactions_struct,

From c6a042b59acfb0a5dd3c2b8432a2eea6aa0e7eec Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Mar 2018 07:02:34 -0800
Subject: [PATCH 677/865] Correct line highlighting behavior in Diffusion

Summary: See <https://discourse.phabricator-community.org/t/line-highlighting-in-diffusion-breaks-url/1207>. Ref T13088. This was disrupted by changes for the new Harbormaster build logs and now needs an explicit base URI.

Test Plan: Clicked lines and dragged across line ranges in Diffusion, observed correct URI behavior.

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19187
---
 .../controller/DiffusionBrowseController.php   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 8df5579a62..ada75f688a 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -593,6 +593,9 @@ private function buildCorpus(
       array(
         'class' => 'diffusion-source remarkup-code PhabricatorMonospaced',
         'sigil' => 'phabricator-source',
+        'meta' => array(
+          'uri' => $this->getLineNumberBaseURI(),
+        ),
       ),
       $rows);
 
@@ -1126,11 +1129,7 @@ private function buildDisplayRows(
 
     // NOTE: We're doing this manually because rendering is otherwise
     // dominated by URI generation for very large files.
-    $line_base = (string)$drequest->generateURI(
-      array(
-        'action'  => 'browse',
-        'stable'  => true,
-      ));
+    $line_base = $this->getLineNumberBaseURI();
 
     require_celerity_resource('aphront-tooltip-css');
     Javelin::initBehavior('phabricator-oncopy');
@@ -2039,4 +2038,13 @@ private function buildBranchTable() {
       ->setTable($history_table);
   }
 
+  private function getLineNumberBaseURI() {
+    $drequest = $this->getDiffusionRequest();
+
+    return (string)$drequest->generateURI(
+      array(
+        'action'  => 'browse',
+        'stable'  => true,
+      ));
+  }
 }

From dab0f84b670db8ad355f1feea1a52b3f6e36ac13 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Mar 2018 07:02:34 -0800
Subject: [PATCH 678/865] (stable) Correct line highlighting behavior in
 Diffusion

Summary: See <https://discourse.phabricator-community.org/t/line-highlighting-in-diffusion-breaks-url/1207>. Ref T13088. This was disrupted by changes for the new Harbormaster build logs and now needs an explicit base URI.

Test Plan: Clicked lines and dragged across line ranges in Diffusion, observed correct URI behavior.

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19187
---
 .../controller/DiffusionBrowseController.php   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 8df5579a62..ada75f688a 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -593,6 +593,9 @@ private function buildCorpus(
       array(
         'class' => 'diffusion-source remarkup-code PhabricatorMonospaced',
         'sigil' => 'phabricator-source',
+        'meta' => array(
+          'uri' => $this->getLineNumberBaseURI(),
+        ),
       ),
       $rows);
 
@@ -1126,11 +1129,7 @@ private function buildDisplayRows(
 
     // NOTE: We're doing this manually because rendering is otherwise
     // dominated by URI generation for very large files.
-    $line_base = (string)$drequest->generateURI(
-      array(
-        'action'  => 'browse',
-        'stable'  => true,
-      ));
+    $line_base = $this->getLineNumberBaseURI();
 
     require_celerity_resource('aphront-tooltip-css');
     Javelin::initBehavior('phabricator-oncopy');
@@ -2039,4 +2038,13 @@ private function buildBranchTable() {
       ->setTable($history_table);
   }
 
+  private function getLineNumberBaseURI() {
+    $drequest = $this->getDiffusionRequest();
+
+    return (string)$drequest->generateURI(
+      array(
+        'action'  => 'browse',
+        'stable'  => true,
+      ));
+  }
 }

From 229d4677701aa50fa6feebea2e3d791771f86482 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Mar 2018 07:23:47 -0800
Subject: [PATCH 679/865] Restore lightbox behavior for thumbnailed images

Summary: Ref T13099. See <https://discourse.phabricator-community.org/t/lightbox-not-working/1201>. The Content-Security-Policy changes rewrote some of this code and the handling for "Download" links is incorrectly catching clicks on thumbnailed images.

Test Plan: Clicked a thumbnailed image, got a lightbox. Command-clicked a download link, still got link behavior instead of a lightbox.

Maniphest Tasks: T13099

Differential Revision: https://secure.phabricator.com/D19188
---
 resources/celerity/map.php                    | 24 +++++++++----------
 .../js/core/behavior-lightbox-attachments.js  |  5 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index a6435d6afd..f4a855da99 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '2fa91e14',
-    'core.pkg.js' => 'a3ceffdb',
+    'core.pkg.js' => 'e4d73c62',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -494,7 +494,7 @@
     'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
-    'rsrc/js/core/behavior-lightbox-attachments.js' => 'e31fad01',
+    'rsrc/js/core/behavior-lightbox-attachments.js' => '562bcce0',
     'rsrc/js/core/behavior-line-linker.js' => 'a9b946f8',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
@@ -643,7 +643,7 @@
     'javelin-behavior-history-install' => '7ee2b591',
     'javelin-behavior-icon-composer' => '8499b6ab',
     'javelin-behavior-launch-icon-composer' => '48086888',
-    'javelin-behavior-lightbox-attachments' => 'e31fad01',
+    'javelin-behavior-lightbox-attachments' => '562bcce0',
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-selector' => 'ad54037e',
@@ -1362,6 +1362,15 @@
       'javelin-vector',
       'javelin-dom',
     ),
+    '562bcce0' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-mask',
+      'javelin-util',
+      'phuix-icon-view',
+      'phabricator-busy',
+    ),
     '58dea2fa' => array(
       'javelin-install',
       'javelin-util',
@@ -2067,15 +2076,6 @@
       'javelin-dom',
       'phabricator-draggable-list',
     ),
-    'e31fad01' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-mask',
-      'javelin-util',
-      'phuix-icon-view',
-      'phabricator-busy',
-    ),
     'e379b58e' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
index eb31d22c60..cacec257b3 100644
--- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js
+++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
@@ -48,8 +48,9 @@ JX.behavior('lightbox-attachments', function() {
     }
 
     // If you click the "Download" link inside an embedded file element,
-    // don't lightbox the file.
-    if (e.getNode('tag:a')) {
+    // don't lightbox the file. But do lightbox when the user clicks an
+    // "<img />" inside an "<a />".
+    if (e.getNode('tag:a') && !e.getNode('tag:img')) {
       return;
     }
 

From 05b9016fc385552042eed87fd5f3ab1a630b955d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Mar 2018 07:23:47 -0800
Subject: [PATCH 680/865] (stable) Restore lightbox behavior for thumbnailed
 images

Summary: Ref T13099. See <https://discourse.phabricator-community.org/t/lightbox-not-working/1201>. The Content-Security-Policy changes rewrote some of this code and the handling for "Download" links is incorrectly catching clicks on thumbnailed images.

Test Plan: Clicked a thumbnailed image, got a lightbox. Command-clicked a download link, still got link behavior instead of a lightbox.

Maniphest Tasks: T13099

Differential Revision: https://secure.phabricator.com/D19188
---
 resources/celerity/map.php                    | 24 +++++++++----------
 .../js/core/behavior-lightbox-attachments.js  |  5 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f90e3bd511..7cc74e812c 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '2fa91e14',
-    'core.pkg.js' => 'a3ceffdb',
+    'core.pkg.js' => 'e4d73c62',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -494,7 +494,7 @@
     'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
-    'rsrc/js/core/behavior-lightbox-attachments.js' => 'e31fad01',
+    'rsrc/js/core/behavior-lightbox-attachments.js' => '562bcce0',
     'rsrc/js/core/behavior-line-linker.js' => 'a9b946f8',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
@@ -643,7 +643,7 @@
     'javelin-behavior-history-install' => '7ee2b591',
     'javelin-behavior-icon-composer' => '8499b6ab',
     'javelin-behavior-launch-icon-composer' => '48086888',
-    'javelin-behavior-lightbox-attachments' => 'e31fad01',
+    'javelin-behavior-lightbox-attachments' => '562bcce0',
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-selector' => 'ad54037e',
@@ -1362,6 +1362,15 @@
       'javelin-vector',
       'javelin-dom',
     ),
+    '562bcce0' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-mask',
+      'javelin-util',
+      'phuix-icon-view',
+      'phabricator-busy',
+    ),
     '58dea2fa' => array(
       'javelin-install',
       'javelin-util',
@@ -2067,15 +2076,6 @@
       'javelin-dom',
       'phabricator-draggable-list',
     ),
-    'e31fad01' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-mask',
-      'javelin-util',
-      'phuix-icon-view',
-      'phabricator-busy',
-    ),
     'e379b58e' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
index eb31d22c60..cacec257b3 100644
--- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js
+++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
@@ -48,8 +48,9 @@ JX.behavior('lightbox-attachments', function() {
     }
 
     // If you click the "Download" link inside an embedded file element,
-    // don't lightbox the file.
-    if (e.getNode('tag:a')) {
+    // don't lightbox the file. But do lightbox when the user clicks an
+    // "<img />" inside an "<a />".
+    if (e.getNode('tag:a') && !e.getNode('tag:img')) {
       return;
     }
 

From ab0ac7f61bab621daee1067a837d06166c628ace Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Mar 2018 16:41:35 -0800
Subject: [PATCH 681/865] Remove very old "owners-default-path" code from
 Owners

Summary: Ref T12590. This is ancient code which was used to prefill `/trunk/tfb/www/` or similar at Facebook. I don't think it ever had a UI and no install has asked for this feature since 2011.

Test Plan: Grepped for affected symbols, edited paths in Owners.

Maniphest Tasks: T12590

Differential Revision: https://secure.phabricator.com/D19189
---
 resources/celerity/map.php                    | 40 +++++++++----------
 .../PhabricatorOwnersPathsController.php      | 11 -----
 .../js/application/herald/PathTypeahead.js    |  7 +---
 .../js/application/owners/OwnersPathEditor.js |  7 +---
 4 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f4a855da99..8bccfbb406 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -418,13 +418,13 @@
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
-    'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
+    'rsrc/js/application/herald/PathTypeahead.js' => '78039abe',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
     'rsrc/js/application/maniphest/behavior-batch-selector.js' => 'ad54037e',
     'rsrc/js/application/maniphest/behavior-line-chart.js' => 'e4232876',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
     'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '71237763',
-    'rsrc/js/application/owners/OwnersPathEditor.js' => '996d62b9',
+    'rsrc/js/application/owners/OwnersPathEditor.js' => '52b9cbc4',
     'rsrc/js/application/owners/owners-path-editor.js' => '7a68dda3',
     'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc',
     'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => 'bee502c8',
@@ -764,10 +764,10 @@
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
     'multirow-row-manager' => 'b5d57730',
-    'owners-path-editor' => '996d62b9',
+    'owners-path-editor' => '52b9cbc4',
     'owners-path-editor-css' => '2f00933b',
     'paste-css' => '9fcc9773',
-    'path-typeahead' => 'f7fc67ec',
+    'path-typeahead' => '78039abe',
     'people-picture-menu-item-css' => 'a06f7f34',
     'people-profile-css' => '4df76faf',
     'phabricator-action-list-view-css' => '0bcd9a45',
@@ -1337,6 +1337,14 @@
       'javelin-vector',
       'javelin-typeahead-static-source',
     ),
+    '52b9cbc4' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'path-typeahead',
+      'javelin-dom',
+      'javelin-util',
+      'phabricator-prefab',
+    ),
     '54b612ba' => array(
       'javelin-color',
       'javelin-install',
@@ -1534,6 +1542,14 @@
       'javelin-request',
       'javelin-util',
     ),
+    '78039abe' => array(
+      'javelin-install',
+      'javelin-typeahead',
+      'javelin-dom',
+      'javelin-request',
+      'javelin-typeahead-ondemand-source',
+      'javelin-util',
+    ),
     '7927a7d3' => array(
       'javelin-behavior',
       'javelin-quicksand',
@@ -1685,14 +1701,6 @@
       'javelin-mask',
       'phabricator-drag-and-drop-file-upload',
     ),
-    '996d62b9' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'path-typeahead',
-      'javelin-dom',
-      'javelin-util',
-      'phabricator-prefab',
-    ),
     '9a6dd75c' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2163,14 +2171,6 @@
       'javelin-util',
       'javelin-reactor',
     ),
-    'f7fc67ec' => array(
-      'javelin-install',
-      'javelin-typeahead',
-      'javelin-dom',
-      'javelin-request',
-      'javelin-typeahead-ondemand-source',
-      'javelin-util',
-    ),
     'f829edb3' => array(
       'javelin-view',
       'javelin-install',
diff --git a/src/applications/owners/controller/PhabricatorOwnersPathsController.php b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
index e5463b4cb4..ec7322a7c0 100644
--- a/src/applications/owners/controller/PhabricatorOwnersPathsController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
@@ -74,15 +74,6 @@ public function handleRequest(AphrontRequest $request) {
       ->setViewer($viewer)
       ->execute();
 
-    $default_paths = array();
-    foreach ($repos as $repo) {
-      $default_path = $repo->getDetail('default-owners-path');
-      if ($default_path) {
-        $default_paths[$repo->getPHID()] = $default_path;
-      }
-    }
-
-
     $repo_map = array();
     foreach ($repos as $key => $repo) {
       $monogram = $repo->getMonogram();
@@ -106,8 +97,6 @@ public function handleRequest(AphrontRequest $request) {
 
         'completeURI'         => '/diffusion/services/path/complete/',
         'validateURI'         => '/diffusion/services/path/validate/',
-
-        'repositoryDefaultPaths' => $default_paths,
       ));
 
     require_celerity_resource('owners-path-editor-css');
diff --git a/webroot/rsrc/js/application/herald/PathTypeahead.js b/webroot/rsrc/js/application/herald/PathTypeahead.js
index 988d728ced..5df0263086 100644
--- a/webroot/rsrc/js/application/herald/PathTypeahead.js
+++ b/webroot/rsrc/js/application/herald/PathTypeahead.js
@@ -17,12 +17,7 @@ JX.install('PathTypeahead', {
     this._completeURI = config.completeURI;
     this._validateURI = config.validateURI;
     this._errorDisplay = config.error_display;
-
-    /*
-     * Default values to preload the typeahead with, for extremely common
-     * cases.
-     */
-    this._textInputValues = config.repositoryDefaultPaths;
+    this._textInputValues = {};
 
     this._initializeDatasource();
     this._initializeTypeahead(this._input);
diff --git a/webroot/rsrc/js/application/owners/OwnersPathEditor.js b/webroot/rsrc/js/application/owners/OwnersPathEditor.js
index f1d47a7908..75dff4c71f 100644
--- a/webroot/rsrc/js/application/owners/OwnersPathEditor.js
+++ b/webroot/rsrc/js/application/owners/OwnersPathEditor.js
@@ -28,7 +28,6 @@ JX.install('OwnersPathEditor', {
 
     this._completeURI = config.completeURI;
     this._validateURI = config.validateURI;
-    this._repositoryDefaultPaths = config.repositoryDefaultPaths;
 
     this._initializePaths(config.pathRefs);
   },
@@ -67,8 +66,6 @@ JX.install('OwnersPathEditor', {
      */
     _lastRepositoryChoice : null,
 
-    _repositoryDefaultPaths : null,
-
     /*
      * Initialize with 0 or more rows.
      * Adds one initial row if none are given.
@@ -144,13 +141,13 @@ JX.install('OwnersPathEditor', {
         [exclude_cell, repo_cell, typeahead_cell, error_display_cell]);
 
       new JX.PathTypeahead({
-        repositoryDefaultPaths : this._repositoryDefaultPaths,
         repo_select : repo_select,
         path_input : path_input,
         hardpoint : hardpoint,
         error_display : error_display,
         completeURI : this._completeURI,
-        validateURI : this._validateURI}).start();
+        validateURI : this._validateURI
+      }).start();
 
       this._count++;
       return row;

From b41a0e6ddda3495eed2904e355862e39721ae64e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Mar 2018 17:31:39 -0800
Subject: [PATCH 682/865] Fix broken suggestion/validation for Owners paths in
 repositories with short names

Summary:
Depends on D19189. Ref T12590. The "validate" and "complete" endpoints for this UI could incorrectly return redirect responses. These aren't critical to the behavior of Owners, but they're nice to have, and shouldn't redirect.

Instead, skip the canonicalizing redirect for AJAX requests.

Test Plan: Edited Owners paths in a repository with a short name, got completion/validation again.

Maniphest Tasks: T12590

Differential Revision: https://secure.phabricator.com/D19190
---
 .../controller/DiffusionController.php          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
index 7ae67c2b5d..a220ac05e0 100644
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -69,13 +69,18 @@ private function loadContext(array $options) {
     // repository has a different canonical path like "/diffusion/XYZ/...",
     // redirect them to the canonical path.
 
-    $request_path = $request->getPath();
-    $repository = $drequest->getRepository();
+    // Skip this redirect if the request is an AJAX request, like the requests
+    // that Owners makes to complete and validate paths.
+
+    if (!$request->isAjax()) {
+      $request_path = $request->getPath();
+      $repository = $drequest->getRepository();
 
-    $canonical_path = $repository->getCanonicalPath($request_path);
-    if ($canonical_path !== null) {
-      if ($canonical_path != $request_path) {
-        return id(new AphrontRedirectResponse())->setURI($canonical_path);
+      $canonical_path = $repository->getCanonicalPath($request_path);
+      if ($canonical_path !== null) {
+        if ($canonical_path != $request_path) {
+          return id(new AphrontRedirectResponse())->setURI($canonical_path);
+        }
       }
     }
 

From a4cc1373d3a2f4c589bf772088e111301850ba77 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 7 Mar 2018 17:29:06 -0800
Subject: [PATCH 683/865] Use a tokenizer, not a gigantic poorly-ordered
 "<select />", to choose repositories in Owners

Summary: Depends on D19190. Fixes T12590. Ref T13099. Replaces the barely-usable, gigantic, poorly ordered "<select />" control with a tokenizer. Attempts to fix various minor issues.

Test Plan:
  - Edited paths: include/exclude paths, from different repositories, different actual paths.
  - Used "Add New Path" to add rows, got repository selector prepopulated with last value.
  - Used "remove".
  - Used validation typeahead, got reasonable behaviors?

The error behavior if you delete the repository for a path is a little sketchy still, but roughly okay.

Maniphest Tasks: T13099, T12590

Differential Revision: https://secure.phabricator.com/D19191
---
 resources/celerity/map.php                    |  75 +++----
 .../DiffusionPathValidateController.php       |  13 --
 .../PhabricatorOwnersPathsController.php      |  68 ++++--
 .../application/owners/owners-path-editor.css |  40 ++--
 .../typeahead/source/TypeaheadSource.js       |   9 +-
 .../js/application/herald/PathTypeahead.js    |  90 ++++----
 .../js/application/owners/OwnersPathEditor.js | 204 +++++++++++-------
 webroot/rsrc/js/phuix/PHUIXFormControl.js     |   9 +-
 8 files changed, 310 insertions(+), 198 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 8bccfbb406..699d3288e5 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '2fa91e14',
-    'core.pkg.js' => 'e4d73c62',
+    'core.pkg.js' => '32bb68e9',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -85,7 +85,7 @@
     'rsrc/css/application/maniphest/task-edit.css' => 'fda62a9b',
     'rsrc/css/application/maniphest/task-summary.css' => '11cc5344',
     'rsrc/css/application/objectselector/object-selector.css' => '85ee8ce6',
-    'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
+    'rsrc/css/application/owners/owners-path-editor.css' => '9c136c29',
     'rsrc/css/application/paste/paste.css' => '9fcc9773',
     'rsrc/css/application/people/people-picture-menu-item.css' => 'a06f7f34',
     'rsrc/css/application/people/people-profile.css' => '4df76faf',
@@ -268,7 +268,7 @@
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js' => '503e17fd',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js' => '013ffff9',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js' => '54f314a0',
-    'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js' => '0fcf201c',
+    'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js' => 'ab9e0a82',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js' => '6c0e62fa',
     'rsrc/favicons/apple-touch-icon-114x114.png' => '12a24178',
     'rsrc/favicons/apple-touch-icon-120x120.png' => '0d1543c7',
@@ -418,13 +418,13 @@
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
-    'rsrc/js/application/herald/PathTypeahead.js' => '78039abe',
+    'rsrc/js/application/herald/PathTypeahead.js' => '662e9cea',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
     'rsrc/js/application/maniphest/behavior-batch-selector.js' => 'ad54037e',
     'rsrc/js/application/maniphest/behavior-line-chart.js' => 'e4232876',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
     'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '71237763',
-    'rsrc/js/application/owners/OwnersPathEditor.js' => '52b9cbc4',
+    'rsrc/js/application/owners/OwnersPathEditor.js' => 'c96502cf',
     'rsrc/js/application/owners/owners-path-editor.js' => '7a68dda3',
     'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc',
     'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => 'bee502c8',
@@ -534,7 +534,7 @@
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
-    'rsrc/js/phuix/PHUIXFormControl.js' => '16ad6224',
+    'rsrc/js/phuix/PHUIXFormControl.js' => '210a16c1',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
   ),
   'symbols' => array(
@@ -744,7 +744,7 @@
     'javelin-typeahead-normalizer' => '185bbd53',
     'javelin-typeahead-ondemand-source' => '013ffff9',
     'javelin-typeahead-preloaded-source' => '54f314a0',
-    'javelin-typeahead-source' => '0fcf201c',
+    'javelin-typeahead-source' => 'ab9e0a82',
     'javelin-typeahead-static-source' => '6c0e62fa',
     'javelin-uri' => 'c989ade3',
     'javelin-util' => '93cc50d6',
@@ -764,10 +764,10 @@
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
     'multirow-row-manager' => 'b5d57730',
-    'owners-path-editor' => '52b9cbc4',
-    'owners-path-editor-css' => '2f00933b',
+    'owners-path-editor' => 'c96502cf',
+    'owners-path-editor-css' => '9c136c29',
     'paste-css' => '9fcc9773',
-    'path-typeahead' => '78039abe',
+    'path-typeahead' => '662e9cea',
     'people-picture-menu-item-css' => 'a06f7f34',
     'people-profile-css' => '4df76faf',
     'phabricator-action-list-view-css' => '0bcd9a45',
@@ -888,7 +888,7 @@
     'phuix-autocomplete' => '7fa5c915',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
-    'phuix-form-control-view' => '16ad6224',
+    'phuix-form-control-view' => '210a16c1',
     'phuix-icon-view' => 'bff6884b',
     'policy-css' => '957ea14c',
     'policy-edit-css' => '815c66f7',
@@ -998,20 +998,10 @@
       'javelin-install',
       'javelin-util',
     ),
-    '0fcf201c' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-typeahead-normalizer',
-    ),
     '15d5ff71' => array(
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
     ),
-    '16ad6224' => array(
-      'javelin-install',
-      'javelin-dom',
-    ),
     '17bb8539' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1061,6 +1051,10 @@
       'javelin-install',
       'javelin-dom',
     ),
+    '210a16c1' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     '2290aeef' => array(
       'javelin-install',
       'javelin-dom',
@@ -1337,14 +1331,6 @@
       'javelin-vector',
       'javelin-typeahead-static-source',
     ),
-    '52b9cbc4' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'path-typeahead',
-      'javelin-dom',
-      'javelin-util',
-      'phabricator-prefab',
-    ),
     '54b612ba' => array(
       'javelin-color',
       'javelin-install',
@@ -1439,6 +1425,14 @@
       'javelin-workflow',
       'javelin-dom',
     ),
+    '662e9cea' => array(
+      'javelin-install',
+      'javelin-typeahead',
+      'javelin-dom',
+      'javelin-request',
+      'javelin-typeahead-ondemand-source',
+      'javelin-util',
+    ),
     '66a6def1' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1542,14 +1536,6 @@
       'javelin-request',
       'javelin-util',
     ),
-    '78039abe' => array(
-      'javelin-install',
-      'javelin-typeahead',
-      'javelin-dom',
-      'javelin-request',
-      'javelin-typeahead-ondemand-source',
-      'javelin-util',
-    ),
     '7927a7d3' => array(
       'javelin-behavior',
       'javelin-quicksand',
@@ -1799,6 +1785,12 @@
       'javelin-util',
       'phabricator-busy',
     ),
+    'ab9e0a82' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-typeahead-normalizer',
+    ),
     'acd29eee' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1974,6 +1966,15 @@
       'javelin-install',
       'javelin-util',
     ),
+    'c96502cf' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'path-typeahead',
+      'javelin-dom',
+      'javelin-util',
+      'phabricator-prefab',
+      'phuix-form-control-view',
+    ),
     'c989ade3' => array(
       'javelin-install',
       'javelin-util',
diff --git a/src/applications/diffusion/controller/DiffusionPathValidateController.php b/src/applications/diffusion/controller/DiffusionPathValidateController.php
index e6fbc41132..62e9e04796 100644
--- a/src/applications/diffusion/controller/DiffusionPathValidateController.php
+++ b/src/applications/diffusion/controller/DiffusionPathValidateController.php
@@ -45,19 +45,6 @@ public function handleRequest(AphrontRequest $request) {
       'valid' => (bool)$valid,
     );
 
-    if (!$valid) {
-      $branch = $drequest->getBranch();
-      if ($branch) {
-        $message = pht('Not found in %s', $branch);
-      } else {
-        $message = pht('Not found at %s', 'HEAD');
-      }
-    } else {
-      $message = pht('OK');
-    }
-
-    $output['message'] = $message;
-
     return id(new AphrontAjaxResponse())->setContent($output);
   }
 }
diff --git a/src/applications/owners/controller/PhabricatorOwnersPathsController.php b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
index ec7322a7c0..d4d97290f9 100644
--- a/src/applications/owners/controller/PhabricatorOwnersPathsController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
@@ -27,7 +27,7 @@ public function handleRequest(AphrontRequest $request) {
 
       $path_refs = array();
       foreach ($paths as $key => $path) {
-        if (!isset($repos[$key])) {
+        if (!isset($repos[$key]) || !strlen($repos[$key])) {
           throw new Exception(
             pht(
               'No repository PHID for path "%s"!',
@@ -70,17 +70,39 @@ public function handleRequest(AphrontRequest $request) {
       $path_refs = mpull($paths, 'getRef');
     }
 
-    $repos = id(new PhabricatorRepositoryQuery())
-      ->setViewer($viewer)
-      ->execute();
+    $template = new AphrontTokenizerTemplateView();
+
+    $datasource = id(new DiffusionRepositoryDatasource())
+      ->setViewer($viewer);
 
-    $repo_map = array();
-    foreach ($repos as $key => $repo) {
-      $monogram = $repo->getMonogram();
-      $name = $repo->getName();
-      $repo_map[$repo->getPHID()] = "{$monogram} {$name}";
+    $tokenizer_spec = array(
+      'markup' => $template->render(),
+      'config' => array(
+        'src' => $datasource->getDatasourceURI(),
+        'browseURI' => $datasource->getBrowseURI(),
+        'placeholder' => $datasource->getPlaceholderText(),
+        'limit' => 1,
+      ),
+    );
+
+    foreach ($path_refs as $key => $path_ref) {
+      $path_refs[$key]['repositoryValue'] = $datasource->getWireTokens(
+        array(
+          $path_ref['repositoryPHID'],
+        ));
     }
-    asort($repos);
+
+    $icon_test = id(new PHUIIconView())
+      ->setIcon('fa-spinner grey')
+      ->setTooltip(pht('Validating...'));
+
+    $icon_okay = id(new PHUIIconView())
+      ->setIcon('fa-check-circle green')
+      ->setTooltip(pht('Path Exists in Repository'));
+
+    $icon_fail = id(new PHUIIconView())
+      ->setIcon('fa-question-circle-o red')
+      ->setTooltip(pht('Path Not Found On Default Branch'));
 
     $template = new AphrontTypeaheadTemplateView();
     $template = $template->render();
@@ -88,15 +110,23 @@ public function handleRequest(AphrontRequest $request) {
     Javelin::initBehavior(
       'owners-path-editor',
       array(
-        'root'                => 'path-editor',
-        'table'               => 'paths',
-        'add_button'          => 'addpath',
-        'repositories'        => $repo_map,
-        'input_template'      => $template,
-        'pathRefs'            => $path_refs,
-
-        'completeURI'         => '/diffusion/services/path/complete/',
-        'validateURI'         => '/diffusion/services/path/validate/',
+        'root' => 'path-editor',
+        'table' => 'paths',
+        'add_button' => 'addpath',
+        'input_template' => $template,
+        'pathRefs' => $path_refs,
+        'completeURI' => '/diffusion/services/path/complete/',
+        'validateURI' => '/diffusion/services/path/validate/',
+        'repositoryTokenizerSpec' => $tokenizer_spec,
+        'icons' => array(
+          'test' => hsprintf('%s', $icon_test),
+          'okay' => hsprintf('%s', $icon_okay),
+          'fail' => hsprintf('%s', $icon_fail),
+        ),
+        'modeOptions' => array(
+          0 => pht('Include'),
+          1 => pht('Exclude'),
+        ),
       ));
 
     require_celerity_resource('owners-path-editor-css');
diff --git a/webroot/rsrc/css/application/owners/owners-path-editor.css b/webroot/rsrc/css/application/owners/owners-path-editor.css
index 026420123b..b703656369 100644
--- a/webroot/rsrc/css/application/owners/owners-path-editor.css
+++ b/webroot/rsrc/css/application/owners/owners-path-editor.css
@@ -3,7 +3,8 @@
  */
 
 .owners-path-editor-table {
-  margin: 10px;
+  margin: 10px 0;
+  width: 100%;
 }
 
 .owners-path-editor-table td {
@@ -11,27 +12,38 @@
   vertical-align: middle;
 }
 
-.owners-path-editor-table select.owners-repo {
-  width: 150px;
+.owners-path-editor-table td.owners-path-mode-control {
+  width: 180px;
 }
 
-.owners-path-editor-table input {
-  width: 400px;
+.owners-path-editor-table td.owners-path-mode-control select {
+  width: 100%;
 }
 
-.owners-path-editor-table div.error-display {
-  padding: 4px 12px 0;
+.owners-path-editor-table td.owners-path-repo-control {
+  width: 280px;
 }
 
-.owners-path-editor-table div.validating {
-  color: {$greytext};
+.owners-path-editor-table td.owners-path-path-control {
+  width: auto;
 }
 
-.owners-path-editor-table div.invalid {
-  color: #aa0000;
+.owners-path-editor-table td.owners-path-path-control input {
+  width: 100%;
 }
 
-.owners-path-editor-table div.valid {
-  color: #00aa00;
-  font-weight: bold;
+.owners-path-editor-table td.owners-path-path-control .jx-typeahead-results a {
+  padding: 4px;
+}
+
+.owners-path-editor-table td.owners-path-icon-control {
+  width: 18px;
+}
+
+.owners-path-editor-table td.remove-column {
+  width: 100px;
+}
+
+.owners-path-editor-table td.remove-column a {
+  display: block;
 }
diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js
index 91eec515f5..0dedc08666 100644
--- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js
+++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js
@@ -9,8 +9,7 @@
 
 JX.install('TypeaheadSource', {
   construct : function() {
-    this._raw = {};
-    this._lookup = {};
+    this.resetResults();
     this.setNormalizer(JX.TypeaheadNormalizer.normalize);
     this._excludeIDs = {};
   },
@@ -359,6 +358,12 @@ JX.install('TypeaheadSource', {
       }
       return str.split(/\s+/g);
     },
+
+    resetResults: function() {
+      this._raw = {};
+      this._lookup = {};
+    },
+
     _defaultTransformer : function(object) {
       return {
         name : object[0],
diff --git a/webroot/rsrc/js/application/herald/PathTypeahead.js b/webroot/rsrc/js/application/herald/PathTypeahead.js
index 5df0263086..0ce9823d13 100644
--- a/webroot/rsrc/js/application/herald/PathTypeahead.js
+++ b/webroot/rsrc/js/application/herald/PathTypeahead.js
@@ -11,7 +11,7 @@
 
 JX.install('PathTypeahead', {
   construct : function(config) {
-    this._repositorySelect = config.repo_select;
+    this._repositoryTokenizer = config.repositoryTokenizer;
     this._hardpoint = config.hardpoint;
     this._input = config.path_input;
     this._completeURI = config.completeURI;
@@ -19,14 +19,14 @@ JX.install('PathTypeahead', {
     this._errorDisplay = config.error_display;
     this._textInputValues = {};
 
+    this._icons = config.icons;
+
     this._initializeDatasource();
     this._initializeTypeahead(this._input);
   },
   members : {
-    /*
-     * DOM <select> elem for choosing the repository of a path.
-     */
-    _repositorySelect : null,
+    _repositoryTokenizer : null,
+
     /*
      * DOM parent div "hardpoint" to be passed to the JX.Typeahead.
      */
@@ -79,31 +79,28 @@ JX.install('PathTypeahead', {
      */
     start : function() {
       if (this._typeahead.getValue()) {
-        this._textInputValues[this._repositorySelect.value] =
-          this._typeahead.getValue();
+        var phid = this._getRepositoryPHID();
+        if (phid) {
+          this._textInputValues[phid] = this._typeahead.getValue();
+        }
       }
 
       this._typeahead.listen(
         'change',
         JX.bind(this, function(value) {
-          this._textInputValues[this._repositorySelect.value] = value;
-          this._validate();
-        }));
+          var phid = this._getRepositoryPHID();
+          if (phid) {
+            this._textInputValues[phid] = value;
+          }
 
-      this._typeahead.listen(
-        'choose',
-        JX.bind(this, function() {
-          setTimeout(JX.bind(this._typeahead, this._typeahead.refresh), 0);
+          this._validate();
         }));
 
       var repo_set_input = JX.bind(this, this._onrepochange);
 
       this._typeahead.listen('start', repo_set_input);
-      JX.DOM.listen(
-        this._repositorySelect,
-        'change',
-        null,
-        repo_set_input);
+
+      this._repositoryTokenizer.listen('change', repo_set_input);
 
       this._typeahead.start();
       this._validate();
@@ -115,13 +112,18 @@ JX.install('PathTypeahead', {
         this._textInputValues);
 
       this._datasource.setAuxiliaryData(
-        {repositoryPHID : this._repositorySelect.value}
-      );
+        {
+          repositoryPHID: this._getRepositoryPHID()
+        });
+
+      // Since we've changed the repository, reset the results.
+      this._datasource.resetResults();
     },
 
     _setPathInputBasedOnRepository : function(typeahead, lookup) {
-      if (lookup[this._repositorySelect.value]) {
-        typeahead.setValue(lookup[this._repositorySelect.value]);
+      var phid = this._getRepositoryPHID();
+      if (phid && lookup[phid]) {
+        typeahead.setValue(lookup[phid]);
       } else {
         typeahead.setValue('/');
       }
@@ -147,9 +149,24 @@ JX.install('PathTypeahead', {
       return ('' + str).replace(/[\/]+/g, '\/');
     },
 
+    _getRepositoryPHID: function() {
+      var tokens = this._repositoryTokenizer.getTokens();
+      var keys = JX.keys(tokens);
+
+      if (keys.length) {
+        return keys[0];
+      }
+
+      return null;
+    },
+
     _validate : function() {
+      var repo_phid = this._getRepositoryPHID();
+      if (!repo_phid) {
+        return;
+      }
+
       var input = this._input;
-      var repo_id = this._repositorySelect.value;
       var input_value = input.value;
       var error_display = this._errorDisplay;
 
@@ -165,33 +182,32 @@ JX.install('PathTypeahead', {
 
       var validation_request = new JX.Request(
         this._validateURI,
-        function(payload) {
+        JX.bind(this, function(payload) {
           // Don't change validation display state if the input has been
           // changed since we started validation
-          if (input.value === input_value) {
-            if (payload.valid) {
-              JX.DOM.alterClass(error_display, 'invalid', false);
-              JX.DOM.alterClass(error_display, 'valid', true);
-            } else {
-              JX.DOM.alterClass(error_display, 'invalid', true);
-              JX.DOM.alterClass(error_display, 'valid', false);
-            }
-            JX.DOM.setContent(error_display, payload.message);
+          if (input.value !== input_value) {
+            return;
           }
-        });
+
+          if (payload.valid) {
+            JX.DOM.setContent(error_display, JX.$H(this._icons.okay));
+          } else {
+            JX.DOM.setContent(error_display, JX.$H(this._icons.fail));
+          }
+        }));
 
       validation_request.listen('finally', function() {
-        JX.DOM.alterClass(error_display, 'validating', false);
         this._validationInflight = null;
       });
 
       validation_request.setData(
         {
-          repositoryPHID : repo_id,
+          repositoryPHID : repo_phid,
           path : input_value
         });
 
       this._validationInflight = validation_request;
+      JX.DOM.setContent(error_display, JX.$H(this._icons.test));
 
       validation_request.setTimeout(750);
       validation_request.send();
diff --git a/webroot/rsrc/js/application/owners/OwnersPathEditor.js b/webroot/rsrc/js/application/owners/OwnersPathEditor.js
index 75dff4c71f..51780d8a9c 100644
--- a/webroot/rsrc/js/application/owners/OwnersPathEditor.js
+++ b/webroot/rsrc/js/application/owners/OwnersPathEditor.js
@@ -5,6 +5,7 @@
  *           javelin-dom
  *           javelin-util
  *           phabricator-prefab
+ *           phuix-form-control-view
  * @provides owners-path-editor
  * @javelin
  */
@@ -23,11 +24,13 @@ JX.install('OwnersPathEditor', {
       JX.bind(this, this._onaddpath));
 
     this._count = 0;
-    this._repositories = config.repositories;
     this._inputTemplate = config.input_template;
+    this._repositoryTokenizerSpec = config.repositoryTokenizerSpec;
 
     this._completeURI = config.completeURI;
     this._validateURI = config.validateURI;
+    this._icons = config.icons;
+    this._modeOptions = config.modeOptions;
 
     this._initializePaths(config.pathRefs);
   },
@@ -37,12 +40,6 @@ JX.install('OwnersPathEditor', {
      */
     _rowManager : null,
 
-    /*
-     * Array of objects with 'name' and 'repo_id' keys for
-     * selecting the repository of a path.
-     */
-    _repositories : null,
-
     /*
      * How many rows have been created, for form name generation.
      */
@@ -65,6 +62,8 @@ JX.install('OwnersPathEditor', {
      * default for future rows.
      */
     _lastRepositoryChoice : null,
+    _icons: null,
+    _modeOptions: null,
 
     /*
      * Initialize with 0 or more rows.
@@ -85,68 +84,34 @@ JX.install('OwnersPathEditor', {
     addPath : function(path_ref) {
       // Smart default repository. See _lastRepositoryChoice.
       if (path_ref) {
-        this._lastRepositoryChoice = path_ref.repositoryPHID;
+        this._lastRepositoryChoice = path_ref.repositoryValue;
+      } else {
+        path_ref = {
+          repositoryValue: this._lastRepositoryChoice || {}
+        };
       }
-      path_ref = path_ref || {};
-
-      var selected_repository = path_ref.repositoryPHID ||
-        this._lastRepositoryChoice;
-      var options = this._buildRepositoryOptions(selected_repository);
-      var attrs = {
-        name : 'repo[' + this._count + ']',
-        className : 'owners-repo'
-      };
-      var repo_select = JX.$N('select', attrs, options);
-
-      JX.DOM.listen(repo_select, 'change', null, JX.bind(this, function() {
-        this._lastRepositoryChoice = repo_select.value;
-      }));
-
-      var repo_cell = JX.$N('td', {}, repo_select);
-      var typeahead_cell = JX.$N(
-        'td',
-        JX.$H(this._inputTemplate));
-
-      // Text input for path.
-      var path_input = JX.DOM.find(typeahead_cell, 'input');
-      JX.copy(
-        path_input,
-        {
-          value : path_ref.display || '',
-          name : 'path[' + this._count + ']'
-        });
-
-      // The Typeahead requires a display div called hardpoint.
-      var hardpoint = JX.DOM.find(
-        typeahead_cell,
-        'div',
-        'typeahead-hardpoint');
 
-      var error_display = JX.$N(
-        'div',
-        {
-          className : 'error-display validating'
-        },
-        'Validating...');
-
-      var error_display_cell = JX.$N('td', {}, error_display);
-
-      var exclude = JX.Prefab.renderSelect(
-        {'0' : 'Include', '1' : 'Exclude'},
-        path_ref.excluded,
-        {name : 'exclude[' + this._count + ']'});
-      var exclude_cell = JX.$N('td', {}, exclude);
+      var repo = this._newRepoCell(path_ref.repositoryValue);
+      var path = this._newPathCell(path_ref.display);
+      var icon = this._newIconCell();
+      var mode_cell = this._newModeCell(path_ref.excluded);
 
       var row = this._rowManager.addRow(
-        [exclude_cell, repo_cell, typeahead_cell, error_display_cell]);
+        [
+          mode_cell,
+          repo.cell,
+          path.cell,
+          icon.cell
+        ]);
 
       new JX.PathTypeahead({
-        repo_select : repo_select,
-        path_input : path_input,
-        hardpoint : hardpoint,
-        error_display : error_display,
+        repositoryTokenizer: repo.tokenizer,
+        path_input : path.input,
+        hardpoint : path.hardpoint,
+        error_display : icon.cell,
         completeURI : this._completeURI,
-        validateURI : this._validateURI
+        validateURI : this._validateURI,
+        icons: this._icons
       }).start();
 
       this._count++;
@@ -158,20 +123,109 @@ JX.install('OwnersPathEditor', {
       this.addPath();
     },
 
-    /**
-     * Helper to build the options for the repository choice dropdown.
-     */
-    _buildRepositoryOptions : function(selected) {
-      var repos = this._repositories;
-      var result = [];
-      for (var k in repos) {
-        var attr = {
-          value : k,
-          selected : (selected == k)
-        };
-        result.push(JX.$N('option', attr, repos[k]));
+    _newModeCell: function(value) {
+      var options = this._modeOptions;
+
+      var name = 'exclude[' + this._count + ']';
+
+      var control = JX.Prefab.renderSelect(options, value, {name: name});
+
+      return JX.$N(
+        'td',
+        {
+          className: 'owners-path-mode-control'
+        },
+        control);
+    },
+
+    _newRepoCell: function(value) {
+      var repo_control = new JX.PHUIXFormControl()
+        .setControl('tokenizer', this._repositoryTokenizerSpec)
+        .setValue(value);
+
+      var repo_tokenizer = repo_control.getTokenizer();
+      var name = 'repo[' + this._count + ']';
+
+      function get_phid() {
+        var phids = repo_control.getValue();
+        if (!phids.length) {
+          return null;
+        }
+
+        return phids[0];
       }
-      return result;
+
+      var input = JX.$N(
+        'input',
+        {
+          type: 'hidden',
+          name: name,
+          value: get_phid()
+        });
+
+      repo_tokenizer.listen('change', JX.bind(this, function() {
+        this._lastRepositoryChoice = repo_tokenizer.getTokens();
+
+        input.value = get_phid();
+      }));
+
+      var cell = JX.$N(
+        'td',
+        {
+          className: 'owners-path-repo-control'
+        },
+        [
+          repo_control.getRawInputNode(),
+          input
+        ]);
+
+      return {
+        cell: cell,
+        tokenizer: repo_tokenizer
+      };
+    },
+
+    _newPathCell: function(value) {
+      var path_cell = JX.$N(
+        'td',
+        {
+          className: 'owners-path-path-control'
+        },
+        JX.$H(this._inputTemplate));
+
+      var path_input = JX.DOM.find(path_cell, 'input');
+
+      JX.copy(
+        path_input,
+        {
+          value: value || '',
+          name: 'path[' + this._count + ']'
+        });
+
+      var hardpoint = JX.DOM.find(
+        path_cell,
+        'div',
+        'typeahead-hardpoint');
+
+      return {
+        cell: path_cell,
+        input: path_input,
+        hardpoint: hardpoint
+      };
+    },
+
+    _newIconCell: function() {
+      var cell = JX.$N(
+        'td',
+        {
+          className: 'owners-path-icon-control'
+        });
+
+      return {
+        cell: cell
+      };
     }
+
   }
+
 });
diff --git a/webroot/rsrc/js/phuix/PHUIXFormControl.js b/webroot/rsrc/js/phuix/PHUIXFormControl.js
index eb5f32963d..88a1cd3f3d 100644
--- a/webroot/rsrc/js/phuix/PHUIXFormControl.js
+++ b/webroot/rsrc/js/phuix/PHUIXFormControl.js
@@ -15,6 +15,7 @@ JX.install('PHUIXFormControl', {
     _valueSetCallback: null,
     _valueGetCallback: null,
     _rawInputNode: null,
+    _tokenizer: null,
 
     setLabel: function(label) {
       JX.DOM.setContent(this._getLabelNode(), label);
@@ -70,6 +71,7 @@ JX.install('PHUIXFormControl', {
       this._valueGetCallback = input.get;
       this._valueSetCallback = input.set;
       this._rawInputNode = input.node;
+      this._tokenizer = input.tokenizer || null;
 
       return this;
     },
@@ -87,6 +89,10 @@ JX.install('PHUIXFormControl', {
       return this._rawInputNode;
     },
 
+    getTokenizer: function() {
+      return this._tokenizer;
+    },
+
     getNode: function() {
       if (!this._node) {
 
@@ -168,7 +174,8 @@ JX.install('PHUIXFormControl', {
       return {
         node: build.node,
         get: get_value,
-        set: set_value
+        set: set_value,
+        tokenizer: build.tokenizer
       };
     },
 

From 01bbd71b9683a393a6376b82d481e39884d42158 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 05:00:07 -0800
Subject: [PATCH 684/865] Separate the "{img ...}" remarkup rule into separate
 parse and markup phases

Summary:
Ref T13101. Ref T4190. This rule is currently single-phase but I'd like to check for a valid proxied image in cache already and just emit an `<img ... />` tag pointing at it if we have one.

To support batching these lookups, split the rule into a parse phase (where we extract URIs) and a markup phase (where we build tags).

Test Plan: Used `{img ...}` in Remarkup with no apparent behavioral changes. (This change should do nothing on its own.)

Maniphest Tasks: T13101, T4190

Differential Revision: https://secure.phabricator.com/D19192
---
 .../markup/PhabricatorImageRemarkupRule.php   | 67 +++++++++++++++++--
 1 file changed, 60 insertions(+), 7 deletions(-)

diff --git a/src/applications/files/markup/PhabricatorImageRemarkupRule.php b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
index 36089dc57e..69e9d6bcf1 100644
--- a/src/applications/files/markup/PhabricatorImageRemarkupRule.php
+++ b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
@@ -1,6 +1,9 @@
 <?php
 
 final class PhabricatorImageRemarkupRule extends PhutilRemarkupRule {
+
+  const KEY_RULE_EXTERNAL_IMAGE = 'rule.external-image';
+
   public function getPriority() {
     return 200.0;
   }
@@ -16,6 +19,7 @@ public function markupImage(array $matches) {
     if (!$this->isFlatText($matches[0])) {
       return $matches[0];
     }
+
     $args = array();
     $defaults = array(
       'uri' => null,
@@ -23,9 +27,10 @@ public function markupImage(array $matches) {
       'width' => null,
       'height' => null,
     );
+
     $trimmed_match = trim($matches[2]);
     if ($this->isURI($trimmed_match)) {
-      $args['uri'] = new PhutilURI($trimmed_match);
+      $args['uri'] = $trimmed_match;
     } else {
       $parser = new PhutilSimpleOptions();
       $keys = $parser->parse($trimmed_match);
@@ -37,16 +42,64 @@ public function markupImage(array $matches) {
         }
       }
       if ($uri_key) {
-        $args['uri'] = new PhutilURI($keys[$uri_key]);
+        $args['uri'] = $keys[$uri_key];
       }
       $args += $keys;
     }
 
     $args += $defaults;
 
-    if ($args['uri']) {
+    if (!strlen($args['uri'])) {
+      return $matches[0];
+    }
+
+    // Make sure this is something that looks roughly like a real URI. We'll
+    // validate it more carefully before proxying it, but if whatever the user
+    // has typed isn't even close, just decline to activate the rule behavior.
+    try {
+      $uri = new PhutilURI($args['uri']);
+
+      if (!strlen($uri->getProtocol())) {
+        return $matches[0];
+      }
+
+      $args['uri'] = (string)$uri;
+    } catch (Exception $ex) {
+      return $matches[0];
+    }
+
+    $engine = $this->getEngine();
+    $metadata_key = self::KEY_RULE_EXTERNAL_IMAGE;
+    $metadata = $engine->getTextMetadata($metadata_key, array());
+
+    $token = $engine->storeText('<img>');
+
+    $metadata[] = array(
+      'token' => $token,
+      'args' => $args,
+    );
+
+    $engine->setTextMetadata($metadata_key, $metadata);
+
+    return $token;
+  }
+
+  public function didMarkupText() {
+    $engine = $this->getEngine();
+    $metadata_key = self::KEY_RULE_EXTERNAL_IMAGE;
+    $images = $engine->getTextMetadata($metadata_key, array());
+    $engine->setTextMetadata($metadata_key, array());
+
+    if (!$images) {
+      return;
+    }
+
+    foreach ($images as $image) {
+      $args = $image['args'];
+
       $src_uri = id(new PhutilURI('/file/imageproxy/'))
-        ->setQueryParam('uri', (string)$args['uri']);
+        ->setQueryParam('uri', $args['uri']);
+
       $img = $this->newTag(
         'img',
         array(
@@ -55,9 +108,8 @@ public function markupImage(array $matches) {
           'width' => $args['width'],
           'height' => $args['height'],
         ));
-      return $this->getEngine()->storeText($img);
-    } else {
-      return $matches[0];
+
+      $engine->overwriteStoredText($image['token'], $img);
     }
   }
 
@@ -66,4 +118,5 @@ private function isURI($uri_string) {
     // If it does, we'll try to treat it like a valid URI
     return preg_match('~^https?\:\/\/.*\z~i', $uri_string);
   }
+
 }

From 9d3a722eb1fedeb448f567a0c33e2f224bd3fbbe Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 05:29:24 -0800
Subject: [PATCH 685/865] When proxying an "{image ...}" image fails, show the
 user an error message

Summary:
Depends on D19192. Ref T4190. Ref T13101. Instead of directly including the proxy endpoint with `<img src="http://github.com/..." />`, emit a placeholder and use AJAX to make the request. If the proxy fetch fails, replace the placeholder with an error message.

This isn't the most polished implementation imaginable, but it's much less mysterious about errors.

Test Plan: Used `{image ...}` for valid and invalid images, got images and useful error messages respectively.

Maniphest Tasks: T13101, T4190

Differential Revision: https://secure.phabricator.com/D19193
---
 resources/celerity/map.php                    | 12 ++-
 src/__phutil_library_map__.php                |  2 +
 .../PhabricatorFileImageProxyController.php   | 83 +++++++++++++------
 .../markup/PhabricatorImageRemarkupRule.php   | 13 ++-
 .../markup/view/PHUIRemarkupImageView.php     | 67 +++++++++++++++
 webroot/rsrc/css/core/remarkup.css            |  7 ++
 .../js/core/behavior-remarkup-load-image.js   | 45 ++++++++++
 7 files changed, 192 insertions(+), 37 deletions(-)
 create mode 100644 src/infrastructure/markup/view/PHUIRemarkupImageView.php
 create mode 100644 webroot/rsrc/js/core/behavior-remarkup-load-image.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 699d3288e5..48e8362194 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '2fa91e14',
+    'core.pkg.css' => 'c218ed53',
     'core.pkg.js' => '32bb68e9',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
@@ -114,7 +114,7 @@
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '62fa3ace',
-    'rsrc/css/core/remarkup.css' => 'cad18339',
+    'rsrc/css/core/remarkup.css' => '97dc3523',
     'rsrc/css/core/syntax.css' => 'cae95e89',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
@@ -504,6 +504,7 @@
     'rsrc/js/core/behavior-read-only-warning.js' => 'ba158207',
     'rsrc/js/core/behavior-redirect.js' => '0213259f',
     'rsrc/js/core/behavior-refresh-csrf.js' => 'ab2f381b',
+    'rsrc/js/core/behavior-remarkup-load-image.js' => '040fce04',
     'rsrc/js/core/behavior-remarkup-preview.js' => '4b700e9e',
     'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
     'rsrc/js/core/behavior-reveal-content.js' => '60821bc7',
@@ -692,6 +693,7 @@
     'javelin-behavior-releeph-preview-branch' => 'b2b4fbaf',
     'javelin-behavior-releeph-request-state-change' => 'a0b57eb8',
     'javelin-behavior-releeph-request-typeahead' => 'de2e896f',
+    'javelin-behavior-remarkup-load-image' => '040fce04',
     'javelin-behavior-remarkup-preview' => '4b700e9e',
     'javelin-behavior-reorder-applications' => '76b9fc3e',
     'javelin-behavior-reorder-columns' => 'e1d25dfb',
@@ -800,7 +802,7 @@
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '77b0ae28',
-    'phabricator-remarkup-css' => 'cad18339',
+    'phabricator-remarkup-css' => '97dc3523',
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
@@ -940,6 +942,10 @@
       'javelin-behavior',
       'javelin-uri',
     ),
+    '040fce04' => array(
+      'javelin-behavior',
+      'javelin-request',
+    ),
     '04b2ae03' => array(
       'javelin-install',
       'javelin-util',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 6cc7450820..69c0801f9a 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1883,6 +1883,7 @@
     'PHUIPropertyGroupView' => 'view/phui/PHUIPropertyGroupView.php',
     'PHUIPropertyListExample' => 'applications/uiexample/examples/PHUIPropertyListExample.php',
     'PHUIPropertyListView' => 'view/phui/PHUIPropertyListView.php',
+    'PHUIRemarkupImageView' => 'infrastructure/markup/view/PHUIRemarkupImageView.php',
     'PHUIRemarkupPreviewPanel' => 'view/phui/PHUIRemarkupPreviewPanel.php',
     'PHUIRemarkupView' => 'infrastructure/markup/view/PHUIRemarkupView.php',
     'PHUISegmentBarSegmentView' => 'view/phui/PHUISegmentBarSegmentView.php',
@@ -7287,6 +7288,7 @@
     'PHUIPropertyGroupView' => 'AphrontTagView',
     'PHUIPropertyListExample' => 'PhabricatorUIExample',
     'PHUIPropertyListView' => 'AphrontView',
+    'PHUIRemarkupImageView' => 'AphrontView',
     'PHUIRemarkupPreviewPanel' => 'AphrontTagView',
     'PHUIRemarkupView' => 'AphrontView',
     'PHUISegmentBarSegmentView' => 'AphrontTagView',
diff --git a/src/applications/files/controller/PhabricatorFileImageProxyController.php b/src/applications/files/controller/PhabricatorFileImageProxyController.php
index 44573aea46..b1d94c0801 100644
--- a/src/applications/files/controller/PhabricatorFileImageProxyController.php
+++ b/src/applications/files/controller/PhabricatorFileImageProxyController.php
@@ -44,6 +44,7 @@ public function handleRequest(AphrontRequest $request) {
       ->setTTL($ttl);
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+    $save_request = false;
     // Cache missed so we'll need to validate and download the image
     try {
       // Rate limit outbound fetches to make this mechanism less useful for
@@ -75,44 +76,74 @@ public function handleRequest(AphrontRequest $request) {
         $file->save();
       }
 
-      $external_request->setIsSuccessful(true)
-        ->setFilePHID($file->getPHID())
-        ->save();
-      unset($unguarded);
-      return $this->getExternalResponse($external_request);
+      $external_request
+        ->setIsSuccessful(1)
+        ->setFilePHID($file->getPHID());
+
+      $save_request = true;
     } catch (HTTPFutureHTTPResponseStatus $status) {
-      $external_request->setIsSuccessful(false)
+      $external_request
+        ->setIsSuccessful(0)
         ->setResponseMessage($status->getMessage())
         ->save();
-      return $this->getExternalResponse($external_request);
+
+      $save_request = true;
     } catch (Exception $ex) {
       // Not actually saving the request in this case
       $external_request->setResponseMessage($ex->getMessage());
-      return $this->getExternalResponse($external_request);
     }
+
+    if ($save_request) {
+      try {
+        $external_request->save();
+      } catch (AphrontDuplicateKeyQueryException $ex) {
+        // We may have raced against another identical request. If we did,
+        // just throw our result away and use the winner's result.
+        $external_request = $external_request->loadOneWhere(
+          'uriIndex = %s',
+          PhabricatorHash::digestForIndex($img_uri));
+        if (!$external_request) {
+          throw new Exception(
+            pht(
+              'Hit duplicate key collision when saving proxied image, but '.
+              'failed to load duplicate row (for URI "%s").',
+              $img_uri));
+        }
+      }
+    }
+
+    unset($unguarded);
+
+
+    return $this->getExternalResponse($external_request);
   }
 
   private function getExternalResponse(
     PhabricatorFileExternalRequest $request) {
-    if ($request->getIsSuccessful()) {
-      $file = id(new PhabricatorFileQuery())
-        ->setViewer(PhabricatorUser::getOmnipotentUser())
-        ->withPHIDs(array($request->getFilePHID()))
-        ->executeOne();
-      if (!$file) {
-        throw new Exception(pht(
+    if (!$request->getIsSuccessful()) {
+      throw new Exception(
+        pht(
+          'Request to "%s" failed: %s',
+          $request->getURI(),
+          $request->getResponseMessage()));
+    }
+
+    $file = id(new PhabricatorFileQuery())
+      ->setViewer(PhabricatorUser::getOmnipotentUser())
+      ->withPHIDs(array($request->getFilePHID()))
+      ->executeOne();
+    if (!$file) {
+      throw new Exception(
+        pht(
           'The underlying file does not exist, but the cached request was '.
-          'successful. This likely means the file record was manually deleted '.
-          'by an administrator.'));
-      }
-      return id(new AphrontRedirectResponse())
-        ->setIsExternal(true)
-        ->setURI($file->getViewURI());
-    } else {
-      throw new Exception(pht(
-        "The request to get the external file from '%s' was unsuccessful:\n %s",
-        $request->getURI(),
-        $request->getResponseMessage()));
+          'successful. This likely means the file record was manually '.
+          'deleted by an administrator.'));
     }
+
+    return id(new AphrontAjaxResponse())
+      ->setContent(
+        array(
+          'imageURI' => $file->getViewURI(),
+        ));
   }
 }
diff --git a/src/applications/files/markup/PhabricatorImageRemarkupRule.php b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
index 69e9d6bcf1..c07ab9d496 100644
--- a/src/applications/files/markup/PhabricatorImageRemarkupRule.php
+++ b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
@@ -100,14 +100,11 @@ public function didMarkupText() {
       $src_uri = id(new PhutilURI('/file/imageproxy/'))
         ->setQueryParam('uri', $args['uri']);
 
-      $img = $this->newTag(
-        'img',
-        array(
-          'src' => $src_uri,
-          'alt' => $args['alt'],
-          'width' => $args['width'],
-          'height' => $args['height'],
-        ));
+      $img = id(new PHUIRemarkupImageView())
+        ->setURI($src_uri)
+        ->setAlt($args['alt'])
+        ->setWidth($args['width'])
+        ->setHeight($args['height']);
 
       $engine->overwriteStoredText($image['token'], $img);
     }
diff --git a/src/infrastructure/markup/view/PHUIRemarkupImageView.php b/src/infrastructure/markup/view/PHUIRemarkupImageView.php
new file mode 100644
index 0000000000..0a73efb83b
--- /dev/null
+++ b/src/infrastructure/markup/view/PHUIRemarkupImageView.php
@@ -0,0 +1,67 @@
+<?php
+
+final class PHUIRemarkupImageView
+  extends AphrontView {
+
+  private $uri;
+  private $width;
+  private $height;
+  private $alt;
+
+  public function setURI($uri) {
+    $this->uri = $uri;
+    return $this;
+  }
+
+  public function getURI() {
+    return $this->uri;
+  }
+
+  public function setWidth($width) {
+    $this->width = $width;
+    return $this;
+  }
+
+  public function getWidth() {
+    return $this->width;
+  }
+
+  public function setHeight($height) {
+    $this->height = $height;
+    return $this;
+  }
+
+  public function getHeight() {
+    return $this->height;
+  }
+
+  public function setAlt($alt) {
+    $this->alt = $alt;
+    return $this;
+  }
+
+  public function getAlt() {
+    return $this->alt;
+  }
+
+  public function render() {
+    $id = celerity_generate_unique_node_id();
+
+    Javelin::initBehavior(
+      'remarkup-load-image',
+      array(
+        'uri' => (string)$this->uri,
+        'imageID' => $id,
+      ));
+
+    return phutil_tag(
+      'img',
+      array(
+        'id' => $id,
+        'width' => $this->getWidth(),
+        'height' => $this->getHeight(),
+        'alt' => $this->getAlt(),
+      ));
+  }
+
+}
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index 8750598780..a51c1ce1d9 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -472,6 +472,13 @@ video.phabricator-media {
   margin: .5em 1em 0;
 }
 
+.phabricator-remarkup-image-error {
+  border: 1px solid {$redborder};
+  background: {$sh-redbackground};
+  padding: 8px 12px;
+  color: {$darkgreytext};
+}
+
 .phabricator-remarkup-embed-image {
   display: inline-block;
   border: 3px solid white;
diff --git a/webroot/rsrc/js/core/behavior-remarkup-load-image.js b/webroot/rsrc/js/core/behavior-remarkup-load-image.js
new file mode 100644
index 0000000000..a13f3b0d78
--- /dev/null
+++ b/webroot/rsrc/js/core/behavior-remarkup-load-image.js
@@ -0,0 +1,45 @@
+/**
+ * @provides javelin-behavior-remarkup-load-image
+ * @requires javelin-behavior
+ *           javelin-request
+ */
+
+JX.behavior('remarkup-load-image', function(config) {
+
+  function get_node() {
+    try {
+      return JX.$(config.imageID);
+    } catch (ex) {
+      return null;
+    }
+  }
+
+  function onload(r) {
+    var node = get_node();
+    if (!node) {
+      return;
+    }
+
+    node.src = r.imageURI;
+  }
+
+  function onerror(r) {
+    var node = get_node();
+    if (!node) {
+      return;
+    }
+
+    var error = JX.$N(
+      'div',
+      {
+        className: 'phabricator-remarkup-image-error'
+      },
+      r.info);
+
+    JX.DOM.replace(node, error);
+  }
+
+  var request = new JX.Request(config.uri, onload);
+  request.listen('error', onerror);
+  request.send();
+});

From b30535a36f5f9ad0180c78c66e4d6272de8e3ef4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 06:44:18 -0800
Subject: [PATCH 686/865] When rendering "{image ...}" images, check the cache
 and just render a direct "<img />" tag if possible

Summary: Depends on D19193. Ref T13101. Fixes T4190. Before we render a fancy AJAX placeholder, check if we already have a valid cache for the image. If we do, render a direct `<img />` tag. This is a little cleaner and, e.g., avoids flicker in Safari, at least.

Test Plan: Rendered `{image ...}` rules in remarkup with new and existing URIs.

Maniphest Tasks: T13101, T4190

Differential Revision: https://secure.phabricator.com/D19194
---
 .../markup/PhabricatorImageRemarkupRule.php   | 68 ++++++++++++++++---
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/applications/files/markup/PhabricatorImageRemarkupRule.php b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
index c07ab9d496..5d1979ed3c 100644
--- a/src/applications/files/markup/PhabricatorImageRemarkupRule.php
+++ b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
@@ -94,17 +94,69 @@ public function didMarkupText() {
       return;
     }
 
+    // Look for images we've already successfully fetched that aren't about
+    // to get eaten by the GC. For any we find, we can just emit a normal
+    // "<img />" tag pointing directly to the file.
+
+    // For files which we don't hit in the cache, we emit a placeholder
+    // instead and use AJAX to actually perform the fetch.
+
+    $digests = array();
     foreach ($images as $image) {
-      $args = $image['args'];
+      $uri = $image['args']['uri'];
+      $digests[] = PhabricatorHash::digestForIndex($uri);
+    }
+
+    $caches = id(new PhabricatorFileExternalRequest())->loadAllWhere(
+      'uriIndex IN (%Ls) AND isSuccessful = 1 AND ttl > %d',
+      $digests,
+      PhabricatorTime::getNow() + phutil_units('1 hour in seconds'));
+
+    $file_phids = array();
+    foreach ($caches as $cache) {
+      $file_phids[$cache->getFilePHID()] = $cache->getURI();
+    }
 
-      $src_uri = id(new PhutilURI('/file/imageproxy/'))
-        ->setQueryParam('uri', $args['uri']);
+    $file_map = array();
+    if ($file_phids) {
+      $files = id(new PhabricatorFileQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withPHIDs(array_keys($file_phids))
+        ->execute();
+      foreach ($files as $file) {
+        $phid = $file->getPHID();
 
-      $img = id(new PHUIRemarkupImageView())
-        ->setURI($src_uri)
-        ->setAlt($args['alt'])
-        ->setWidth($args['width'])
-        ->setHeight($args['height']);
+        $file_remote_uri = $file_phids[$phid];
+        $file_view_uri = $file->getViewURI();
+
+        $file_map[$file_remote_uri] = $file_view_uri;
+      }
+    }
+
+    foreach ($images as $image) {
+      $args = $image['args'];
+      $uri = $args['uri'];
+
+      $direct_uri = idx($file_map, $uri);
+      if ($direct_uri) {
+        $img = phutil_tag(
+          'img',
+          array(
+            'src' => $direct_uri,
+            'alt' => $args['alt'],
+            'width' => $args['width'],
+            'height' => $args['height'],
+          ));
+      } else {
+        $src_uri = id(new PhutilURI('/file/imageproxy/'))
+          ->setQueryParam('uri', $uri);
+
+        $img = id(new PHUIRemarkupImageView())
+          ->setURI($src_uri)
+          ->setAlt($args['alt'])
+          ->setWidth($args['width'])
+          ->setHeight($args['height']);
+      }
 
       $engine->overwriteStoredText($image['token'], $img);
     }

From 6095d889987d4d53dc07f9ec6972b9a464f3c756 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 06:59:06 -0800
Subject: [PATCH 687/865] Don't require prototypes for "{image ...}"

Summary: Depends on D19194. Fixes T4190. This should be in good-enough shape now to release and support more generally.

Test Plan: Used `{image ...}` in remarkup.

Maniphest Tasks: T4190

Differential Revision: https://secure.phabricator.com/D19195
---
 .../PhabricatorFileImageProxyController.php   | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/applications/files/controller/PhabricatorFileImageProxyController.php b/src/applications/files/controller/PhabricatorFileImageProxyController.php
index b1d94c0801..05a49c7f3e 100644
--- a/src/applications/files/controller/PhabricatorFileImageProxyController.php
+++ b/src/applications/files/controller/PhabricatorFileImageProxyController.php
@@ -8,15 +8,6 @@ public function shouldAllowPublic() {
   }
 
   public function handleRequest(AphrontRequest $request) {
-
-    $show_prototypes = PhabricatorEnv::getEnvConfig(
-      'phabricator.show-prototypes');
-    if (!$show_prototypes) {
-      throw new Exception(
-        pht('Show prototypes is disabled.
-          Set `phabricator.show-prototypes` to `true` to use the image proxy'));
-    }
-
     $viewer = $request->getViewer();
     $img_uri = $request->getStr('uri');
 
@@ -24,9 +15,16 @@ public function handleRequest(AphrontRequest $request) {
     PhabricatorEnv::requireValidRemoteURIForLink($img_uri);
     $uri = new PhutilURI($img_uri);
     $proto = $uri->getProtocol();
-    if (!in_array($proto, array('http', 'https'))) {
+
+    $allowed_protocols = array(
+      'http',
+      'https',
+    );
+    if (!in_array($proto, $allowed_protocols)) {
       throw new Exception(
-        pht('The provided image URI must be either http or https'));
+        pht(
+          'The provided image URI must use one of these protocols: %s.',
+          implode(', ', $allowed_protocols)));
     }
 
     // Check if we already have the specified image URI downloaded
@@ -43,9 +41,9 @@ public function handleRequest(AphrontRequest $request) {
       ->setURI($img_uri)
       ->setTTL($ttl);
 
+    // Cache missed, so we'll need to validate and download the image.
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
     $save_request = false;
-    // Cache missed so we'll need to validate and download the image
     try {
       // Rate limit outbound fetches to make this mechanism less useful for
       // scanning networks and ports.
@@ -60,6 +58,7 @@ public function handleRequest(AphrontRequest $request) {
           'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
           'canCDN' => true,
         ));
+
       if (!$file->isViewableImage()) {
         $mime_type = $file->getMimeType();
         $engine = new PhabricatorDestructionEngine();
@@ -67,15 +66,15 @@ public function handleRequest(AphrontRequest $request) {
         $file = null;
         throw new Exception(
           pht(
-            'The URI "%s" does not correspond to a valid image file, got '.
-            'a file with MIME type "%s". You must specify the URI of a '.
+            'The URI "%s" does not correspond to a valid image file (got '.
+            'a file with MIME type "%s"). You must specify the URI of a '.
             'valid image file.',
             $uri,
             $mime_type));
-      } else {
-        $file->save();
       }
 
+      $file->save();
+
       $external_request
         ->setIsSuccessful(1)
         ->setFilePHID($file->getPHID());
@@ -84,8 +83,7 @@ public function handleRequest(AphrontRequest $request) {
     } catch (HTTPFutureHTTPResponseStatus $status) {
       $external_request
         ->setIsSuccessful(0)
-        ->setResponseMessage($status->getMessage())
-        ->save();
+        ->setResponseMessage($status->getMessage());
 
       $save_request = true;
     } catch (Exception $ex) {

From 98cac2cc2994d4584678c3be79f6f32b2965d2fb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 07:36:32 -0800
Subject: [PATCH 688/865] Always serve "{meme ...}" from the CDN domain, never
 from the primary domain

Summary:
Ref T13101. This is a minimal change to make "{meme ...}" work with the new Content-Security-Policy by using an Ajax request to generate the image and then swapping the source on the client.

This could be much cleaner (see T5258, etc).

Test Plan: Used `{meme, src=cat6, above=i am, below=cat}`, chuckled completely unironically.

Maniphest Tasks: T13101

Differential Revision: https://secure.phabricator.com/D19196
---
 .../PhabricatorMacroMemeController.php        | 120 ++++++++++++------
 .../markup/PhabricatorMemeRemarkupRule.php    |  11 +-
 .../markup/view/PHUIRemarkupImageView.php     |  12 ++
 3 files changed, 100 insertions(+), 43 deletions(-)

diff --git a/src/applications/macro/controller/PhabricatorMacroMemeController.php b/src/applications/macro/controller/PhabricatorMacroMemeController.php
index 03b13f6205..794e24e36d 100644
--- a/src/applications/macro/controller/PhabricatorMacroMemeController.php
+++ b/src/applications/macro/controller/PhabricatorMacroMemeController.php
@@ -13,18 +13,25 @@ public function handleRequest(AphrontRequest $request) {
     $lower_text = $request->getStr('lowertext');
     $viewer = $request->getViewer();
 
-    $uri = self::generateMacro($viewer, $macro_name,
-      $upper_text, $lower_text);
-    if ($uri === false) {
-      return new Aphront404Response();
-    }
-    return id(new AphrontRedirectResponse())
-      ->setIsExternal(true)
-      ->setURI($uri);
+    $uri = self::generateMacro(
+      $viewer,
+      $macro_name,
+      $upper_text,
+      $lower_text);
+
+    $content = array(
+      'imageURI' => $uri,
+    );
+
+    return id(new AphrontAjaxResponse())->setContent($content);
   }
 
-  public static function generateMacro($viewer, $macro_name, $upper_text,
-      $lower_text) {
+  public static function generateMacro(
+    PhabricatorUser $viewer,
+    $macro_name,
+    $upper_text,
+    $lower_text) {
+
     $macro = id(new PhabricatorMacroQuery())
       ->setViewer($viewer)
       ->withNames(array($macro_name))
@@ -35,34 +42,75 @@ public static function generateMacro($viewer, $macro_name, $upper_text,
     }
     $file = $macro->getFile();
 
-    $upper_text = strtoupper($upper_text);
-    $lower_text = strtoupper($lower_text);
-    $mixed_text = md5($upper_text).':'.md5($lower_text);
-    $hash = 'meme'.hash('sha256', $mixed_text);
-    $xform = id(new PhabricatorTransformedFile())
-      ->loadOneWhere('originalphid=%s and transform=%s',
-        $file->getPHID(), $hash);
-
-    if ($xform) {
-      $memefile = id(new PhabricatorFileQuery())
-        ->setViewer($viewer)
-        ->withPHIDs(array($xform->getTransformedPHID()))
-        ->executeOne();
-      if ($memefile) {
-        return $memefile->getBestURI();
+    $upper_text = phutil_utf8_strtoupper($upper_text);
+    $lower_text = phutil_utf8_strtoupper($lower_text);
+
+    $hash = PhabricatorHash::digestForIndex(
+      phutil_json_encode(
+        array(
+          'kind' => 'meme',
+          'upper' => $upper_text,
+          'lower' => $lower_text,
+        )));
+
+    $xfile = self::loadTransformedFile($viewer, $file->getPHID(), $hash);
+    if ($xfile) {
+      return $xfile->getViewURI();
+    }
+
+    $transformer = new PhabricatorImageTransformer();
+
+    $new_file = $transformer->executeMemeTransform(
+      $file,
+      $upper_text,
+      $lower_text);
+
+    $xfile = id(new PhabricatorTransformedFile())
+      ->setOriginalPHID($file->getPHID())
+      ->setTransformedPHID($new_file->getPHID())
+      ->setTransform($hash);
+
+    try {
+      $caught = null;
+
+      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+      try {
+        $xfile->save();
+      } catch (Exception $ex) {
+        $caught = $ex;
+      }
+      unset($unguarded);
+
+      if ($caught) {
+        throw $caught;
       }
+
+      return $new_file->getViewURI();
+    } catch (AphrontDuplicateKeyQueryException $ex) {
+      $xfile = self::loadTransformedFile($viewer, $file->getPHID(), $hash);
+      if (!$xfile) {
+        throw $ex;
+      }
+      return $xfile->getViewURI();
     }
+  }
 
-    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-    $transformers = (new PhabricatorImageTransformer());
-    $newfile = $transformers
-      ->executeMemeTransform($file, $upper_text, $lower_text);
-    $xfile = new PhabricatorTransformedFile();
-    $xfile->setOriginalPHID($file->getPHID());
-    $xfile->setTransformedPHID($newfile->getPHID());
-    $xfile->setTransform($hash);
-    $xfile->save();
-
-    return $newfile->getBestURI();
+  private static function loadTransformedFile(
+    PhabricatorUser $viewer,
+    $file_phid,
+    $hash) {
+
+    $xform = id(new PhabricatorTransformedFile())->loadOneWhere(
+      'originalPHID = %s AND transform = %s',
+      $file_phid,
+      $hash);
+    if (!$xform) {
+      return null;
+    }
+
+    return id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($xform->getTransformedPHID()))
+      ->executeOne();
   }
 }
diff --git a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
index 004e415450..278bd403cb 100644
--- a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
@@ -50,13 +50,10 @@ public function markupMeme(array $matches) {
         $options['above'],
         $options['below']);
 
-      $img = $this->newTag(
-        'img',
-        array(
-          'src' => $uri,
-          'alt' => $alt_text,
-          'class' => 'phabricator-remarkup-macro',
-        ));
+      $img = id(new PHUIRemarkupImageView())
+        ->setURI($uri)
+        ->addClass('phabricator-remarkup-macro')
+        ->setAlt($alt_text);
     }
 
     return $this->getEngine()->storeText($img);
diff --git a/src/infrastructure/markup/view/PHUIRemarkupImageView.php b/src/infrastructure/markup/view/PHUIRemarkupImageView.php
index 0a73efb83b..0402f000a4 100644
--- a/src/infrastructure/markup/view/PHUIRemarkupImageView.php
+++ b/src/infrastructure/markup/view/PHUIRemarkupImageView.php
@@ -7,6 +7,7 @@ final class PHUIRemarkupImageView
   private $width;
   private $height;
   private $alt;
+  private $classes = array();
 
   public function setURI($uri) {
     $this->uri = $uri;
@@ -44,6 +45,11 @@ public function getAlt() {
     return $this->alt;
   }
 
+  public function addClass($class) {
+    $this->classes[] = $class;
+    return $this;
+  }
+
   public function render() {
     $id = celerity_generate_unique_node_id();
 
@@ -54,6 +60,11 @@ public function render() {
         'imageID' => $id,
       ));
 
+    $classes = null;
+    if ($this->classes) {
+      $classes = implode(' ', $this->classes);
+    }
+
     return phutil_tag(
       'img',
       array(
@@ -61,6 +72,7 @@ public function render() {
         'width' => $this->getWidth(),
         'height' => $this->getHeight(),
         'alt' => $this->getAlt(),
+        'class' => $classes,
       ));
   }
 

From e83cfa295bff0e198fa2737aa41439fe7b694780 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 08:22:16 -0800
Subject: [PATCH 689/865] Fix image prev/next cycling in lightboxes

Summary:
See <https://discourse.phabricator-community.org/t/lightbox-not-working/1201/3>. The lightbox code is fragile and currently relies on simulating a click on the actual "<a />" tag surrounding other images in the document.

This breaks the prev/next links which ignore the event because it there's no "<img />".

Instead, don't simulate clicks and just call the code we want directly.

Test Plan: Added several images to a page, used lightbox prev/next buttons to cycle between them.

Differential Revision: https://secure.phabricator.com/D19197
---
 resources/celerity/map.php                    | 24 +++++++++----------
 .../js/core/behavior-lightbox-attachments.js  |  8 +++++--
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 48e8362194..38343475d0 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => 'c218ed53',
-    'core.pkg.js' => '32bb68e9',
+    'core.pkg.js' => '8b7400e7',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -494,7 +494,7 @@
     'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
-    'rsrc/js/core/behavior-lightbox-attachments.js' => '562bcce0',
+    'rsrc/js/core/behavior-lightbox-attachments.js' => '6b31879a',
     'rsrc/js/core/behavior-line-linker.js' => 'a9b946f8',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
@@ -644,7 +644,7 @@
     'javelin-behavior-history-install' => '7ee2b591',
     'javelin-behavior-icon-composer' => '8499b6ab',
     'javelin-behavior-launch-icon-composer' => '48086888',
-    'javelin-behavior-lightbox-attachments' => '562bcce0',
+    'javelin-behavior-lightbox-attachments' => '6b31879a',
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-selector' => 'ad54037e',
@@ -1362,15 +1362,6 @@
       'javelin-vector',
       'javelin-dom',
     ),
-    '562bcce0' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-mask',
-      'javelin-util',
-      'phuix-icon-view',
-      'phabricator-busy',
-    ),
     '58dea2fa' => array(
       'javelin-install',
       'javelin-util',
@@ -1463,6 +1454,15 @@
     '69adf288' => array(
       'javelin-install',
     ),
+    '6b31879a' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-mask',
+      'javelin-util',
+      'phuix-icon-view',
+      'phabricator-busy',
+    ),
     '6b8ef10b' => array(
       'javelin-install',
     ),
diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
index cacec257b3..af134f9b06 100644
--- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js
+++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
@@ -56,6 +56,10 @@ JX.behavior('lightbox-attachments', function() {
 
     e.kill();
 
+    activateLightbox(e.getNode('lightboxable'));
+  }
+
+  function activateLightbox(target) {
     var mainFrame = JX.$('main-page-frame');
     var links = JX.DOM.scry(mainFrame, '*', 'lightboxable');
     var phids = {};
@@ -68,7 +72,6 @@ JX.behavior('lightbox-attachments', function() {
     // Now that we have the big picture phid situation sorted out, figure
     // out how the actual node the user clicks fits into that big picture
     // and build some pretty UI to show the attachment.
-    var target      = e.getNode('lightboxable');
     var target_data = JX.Stratcom.getData(target);
     var total       = JX.keys(phids).length;
     var current     = 1;
@@ -324,7 +327,8 @@ JX.behavior('lightbox-attachments', function() {
     }
     e.prevent();
     closeLightBox(e);
-    el.click();
+
+    activateLightbox(el);
   }
 
   // Only look for lightboxable inside the main page, not other lightboxes.

From fc1ee20efe44dba7f02a0cf1a02765fb86f40a5f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 10:52:35 -0800
Subject: [PATCH 690/865] Support repository query by short name in Diffusion

Summary: See PHI432. Ref T13099. Short names never made it to the UI/API but seem stable now, so support them.

Test Plan: {F5465173}

Maniphest Tasks: T13099

Differential Revision: https://secure.phabricator.com/D19202
---
 .../repository/query/PhabricatorRepositorySearchEngine.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
index 5cd88183e1..9b5b721edb 100644
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -24,6 +24,9 @@ protected function buildCustomSearchFields() {
       id(new PhabricatorSearchStringListField())
         ->setLabel(pht('Callsigns'))
         ->setKey('callsigns'),
+      id(new PhabricatorSearchStringListField())
+        ->setLabel(pht('Short Names'))
+        ->setKey('shortNames'),
       id(new PhabricatorSearchSelectField())
         ->setLabel(pht('Status'))
         ->setKey('status')
@@ -51,6 +54,10 @@ protected function buildQueryFromParameters(array $map) {
       $query->withCallsigns($map['callsigns']);
     }
 
+    if ($map['shortNames']) {
+      $query->withSlugs($map['shortNames']);
+    }
+
     if ($map['status']) {
       $status = idx($this->getStatusValues(), $map['status']);
       if ($status) {

From a099a06265326057742214f27921f8e1e4421d7e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 08:30:39 -0800
Subject: [PATCH 691/865] Remove some old image transform code with no
 callsites

Summary: Ref T13101. Ref T5258. This old image transform code no longer has callsites.

Test Plan: Grepped for removed methods, no hits.

Maniphest Tasks: T13101, T5258

Differential Revision: https://secure.phabricator.com/D19198
---
 .../files/PhabricatorImageTransformer.php     | 75 -------------------
 1 file changed, 75 deletions(-)

diff --git a/src/applications/files/PhabricatorImageTransformer.php b/src/applications/files/PhabricatorImageTransformer.php
index f29ce97835..71f07a231e 100644
--- a/src/applications/files/PhabricatorImageTransformer.php
+++ b/src/applications/files/PhabricatorImageTransformer.php
@@ -20,81 +20,6 @@ public function executeMemeTransform(
       ));
   }
 
-  public function executeConpherenceTransform(
-    PhabricatorFile $file,
-    $top,
-    $left,
-    $width,
-    $height) {
-
-    $image = $this->crasslyCropTo(
-      $file,
-      $top,
-      $left,
-      $width,
-      $height);
-
-    return PhabricatorFile::newFromFileData(
-      $image,
-      array(
-        'name' => 'conpherence-'.$file->getName(),
-        'profile' => true,
-        'canCDN' => true,
-      ));
-  }
-
-  private function crasslyCropTo(PhabricatorFile $file, $top, $left, $w, $h) {
-    $data = $file->loadFileData();
-    $src = imagecreatefromstring($data);
-    $dst = $this->getBlankDestinationFile($w, $h);
-
-    $scale = self::getScaleForCrop($file, $w, $h);
-    $orig_x = $left / $scale;
-    $orig_y = $top / $scale;
-    $orig_w = $w / $scale;
-    $orig_h = $h / $scale;
-
-    imagecopyresampled(
-      $dst,
-      $src,
-      0, 0,
-      $orig_x, $orig_y,
-      $w, $h,
-      $orig_w, $orig_h);
-
-    return self::saveImageDataInAnyFormat($dst, $file->getMimeType());
-  }
-
-  private function getBlankDestinationFile($dx, $dy) {
-    $dst = imagecreatetruecolor($dx, $dy);
-    imagesavealpha($dst, true);
-    imagefill($dst, 0, 0, imagecolorallocatealpha($dst, 255, 255, 255, 127));
-
-    return $dst;
-  }
-
-  public static function getScaleForCrop(
-    PhabricatorFile $file,
-    $des_width,
-    $des_height) {
-
-    $metadata = $file->getMetadata();
-    $width = $metadata[PhabricatorFile::METADATA_IMAGE_WIDTH];
-    $height = $metadata[PhabricatorFile::METADATA_IMAGE_HEIGHT];
-
-    if ($height < $des_height) {
-      $scale = $height / $des_height;
-    } else if ($width < $des_width) {
-      $scale = $width / $des_width;
-    } else {
-      $scale_x = $des_width / $width;
-      $scale_y = $des_height / $height;
-      $scale = max($scale_x, $scale_y);
-    }
-
-    return $scale;
-  }
-
   private function applyMemeToFile(
     PhabricatorFile $file,
     $upper_text,

From c7408f27977dd0f2d0b11f9c4fd7cd71c6711bc2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 09:29:33 -0800
Subject: [PATCH 692/865] PhabricatorMemeEngine HA HA HA HA

Summary:
Depends on D19198. Ref T13101. Ref T5258. Pull compositing logic out of the `Controller`.

This is moving toward fixing memes in email.

Test Plan: Used new and old memes. Used API memes.

Maniphest Tasks: T13101, T5258

Differential Revision: https://secure.phabricator.com/D19200
---
 src/__phutil_library_map__.php                |   2 +
 .../MacroCreateMemeConduitAPIMethod.php       |  21 +--
 .../PhabricatorMacroMemeController.php        | 100 +----------
 .../macro/engine/PhabricatorMemeEngine.php    | 163 ++++++++++++++++++
 .../markup/PhabricatorMemeRemarkupRule.php    |  30 +++-
 5 files changed, 201 insertions(+), 115 deletions(-)
 create mode 100644 src/applications/macro/engine/PhabricatorMemeEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 69c0801f9a..8677f47b6e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3295,6 +3295,7 @@
     'PhabricatorMarkupInterface' => 'infrastructure/markup/PhabricatorMarkupInterface.php',
     'PhabricatorMarkupOneOff' => 'infrastructure/markup/PhabricatorMarkupOneOff.php',
     'PhabricatorMarkupPreviewController' => 'infrastructure/markup/PhabricatorMarkupPreviewController.php',
+    'PhabricatorMemeEngine' => 'applications/macro/engine/PhabricatorMemeEngine.php',
     'PhabricatorMemeRemarkupRule' => 'applications/macro/markup/PhabricatorMemeRemarkupRule.php',
     'PhabricatorMentionRemarkupRule' => 'applications/people/markup/PhabricatorMentionRemarkupRule.php',
     'PhabricatorMentionableInterface' => 'applications/transactions/interface/PhabricatorMentionableInterface.php',
@@ -8893,6 +8894,7 @@
       'PhabricatorMarkupInterface',
     ),
     'PhabricatorMarkupPreviewController' => 'PhabricatorController',
+    'PhabricatorMemeEngine' => 'Phobject',
     'PhabricatorMemeRemarkupRule' => 'PhutilRemarkupRule',
     'PhabricatorMentionRemarkupRule' => 'PhutilRemarkupRule',
     'PhabricatorMercurialGraphStream' => 'PhabricatorRepositoryGraphStream',
diff --git a/src/applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php b/src/applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php
index e63d831a70..3c939f97d5 100644
--- a/src/applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php
+++ b/src/applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php
@@ -35,22 +35,15 @@ protected function defineErrorTypes() {
   protected function execute(ConduitAPIRequest $request) {
     $user = $request->getUser();
 
-    $macro_name = $request->getValue('macroName');
-    $upper_text = $request->getValue('upperText');
-    $lower_text = $request->getValue('lowerText');
-
-    $uri = PhabricatorMacroMemeController::generateMacro(
-      $user,
-      $macro_name,
-      $upper_text,
-      $lower_text);
-
-    if (!$uri) {
-      throw new ConduitException('ERR-NOT-FOUND');
-    }
+    $file = id(new PhabricatorMemeEngine())
+      ->setViewer($user)
+      ->setTemplate($request->getValue('macroName'))
+      ->setAboveText($request->getValue('upperText'))
+      ->setBelowText($request->getValue('lowerText'))
+      ->newAsset();
 
     return array(
-      'uri' => $uri,
+      'uri' => $file->getViewURI(),
     );
   }
 
diff --git a/src/applications/macro/controller/PhabricatorMacroMemeController.php b/src/applications/macro/controller/PhabricatorMacroMemeController.php
index 794e24e36d..eb1dcbeb2f 100644
--- a/src/applications/macro/controller/PhabricatorMacroMemeController.php
+++ b/src/applications/macro/controller/PhabricatorMacroMemeController.php
@@ -13,104 +13,18 @@ public function handleRequest(AphrontRequest $request) {
     $lower_text = $request->getStr('lowertext');
     $viewer = $request->getViewer();
 
-    $uri = self::generateMacro(
-      $viewer,
-      $macro_name,
-      $upper_text,
-      $lower_text);
+    $file = id(new PhabricatorMemeEngine())
+      ->setViewer($viewer)
+      ->setTemplate($macro_name)
+      ->setAboveText($request->getStr('above'))
+      ->setBelowText($request->getStr('below'))
+      ->newAsset();
 
     $content = array(
-      'imageURI' => $uri,
+      'imageURI' => $file->getViewURI(),
     );
 
     return id(new AphrontAjaxResponse())->setContent($content);
   }
 
-  public static function generateMacro(
-    PhabricatorUser $viewer,
-    $macro_name,
-    $upper_text,
-    $lower_text) {
-
-    $macro = id(new PhabricatorMacroQuery())
-      ->setViewer($viewer)
-      ->withNames(array($macro_name))
-      ->needFiles(true)
-      ->executeOne();
-    if (!$macro) {
-      return false;
-    }
-    $file = $macro->getFile();
-
-    $upper_text = phutil_utf8_strtoupper($upper_text);
-    $lower_text = phutil_utf8_strtoupper($lower_text);
-
-    $hash = PhabricatorHash::digestForIndex(
-      phutil_json_encode(
-        array(
-          'kind' => 'meme',
-          'upper' => $upper_text,
-          'lower' => $lower_text,
-        )));
-
-    $xfile = self::loadTransformedFile($viewer, $file->getPHID(), $hash);
-    if ($xfile) {
-      return $xfile->getViewURI();
-    }
-
-    $transformer = new PhabricatorImageTransformer();
-
-    $new_file = $transformer->executeMemeTransform(
-      $file,
-      $upper_text,
-      $lower_text);
-
-    $xfile = id(new PhabricatorTransformedFile())
-      ->setOriginalPHID($file->getPHID())
-      ->setTransformedPHID($new_file->getPHID())
-      ->setTransform($hash);
-
-    try {
-      $caught = null;
-
-      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-      try {
-        $xfile->save();
-      } catch (Exception $ex) {
-        $caught = $ex;
-      }
-      unset($unguarded);
-
-      if ($caught) {
-        throw $caught;
-      }
-
-      return $new_file->getViewURI();
-    } catch (AphrontDuplicateKeyQueryException $ex) {
-      $xfile = self::loadTransformedFile($viewer, $file->getPHID(), $hash);
-      if (!$xfile) {
-        throw $ex;
-      }
-      return $xfile->getViewURI();
-    }
-  }
-
-  private static function loadTransformedFile(
-    PhabricatorUser $viewer,
-    $file_phid,
-    $hash) {
-
-    $xform = id(new PhabricatorTransformedFile())->loadOneWhere(
-      'originalPHID = %s AND transform = %s',
-      $file_phid,
-      $hash);
-    if (!$xform) {
-      return null;
-    }
-
-    return id(new PhabricatorFileQuery())
-      ->setViewer($viewer)
-      ->withPHIDs(array($xform->getTransformedPHID()))
-      ->executeOne();
-  }
 }
diff --git a/src/applications/macro/engine/PhabricatorMemeEngine.php b/src/applications/macro/engine/PhabricatorMemeEngine.php
new file mode 100644
index 0000000000..21a9b44e99
--- /dev/null
+++ b/src/applications/macro/engine/PhabricatorMemeEngine.php
@@ -0,0 +1,163 @@
+<?php
+
+final class PhabricatorMemeEngine extends Phobject {
+
+  private $viewer;
+  private $template;
+  private $aboveText;
+  private $belowText;
+
+  private $templateFile;
+
+  public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  public function getViewer() {
+    return $this->viewer;
+  }
+
+  public function setTemplate($template) {
+    $this->template = $template;
+    return $this;
+  }
+
+  public function getTemplate() {
+    return $this->template;
+  }
+
+  public function setAboveText($above_text) {
+    $this->aboveText = $above_text;
+    return $this;
+  }
+
+  public function getAboveText() {
+    return $this->aboveText;
+  }
+
+  public function setBelowText($below_text) {
+    $this->belowText = $below_text;
+    return $this;
+  }
+
+  public function getBelowText() {
+    return $this->belowText;
+  }
+
+  public function getGenerateURI() {
+    return id(new PhutilURI('/macro/meme/'))
+      ->alter('macro', $this->getTemplate())
+      ->alter('above', $this->getAboveText())
+      ->alter('below', $this->getBelowText());
+  }
+
+  public function newAsset() {
+    $cache = $this->loadCachedFile();
+    if ($cache) {
+      return $cache;
+    }
+
+    $template = $this->loadTemplateFile();
+    if (!$template) {
+      throw new Exception(
+        pht(
+          'Template "%s" is not a valid template.',
+          $template));
+    }
+
+    $hash = $this->newTransformHash();
+
+    $transformer = new PhabricatorImageTransformer();
+    $asset = $transformer->executeMemeTransform(
+      $template,
+      $this->getAboveText(),
+      $this->getBelowText());
+
+    $xfile = id(new PhabricatorTransformedFile())
+      ->setOriginalPHID($template->getPHID())
+      ->setTransformedPHID($asset->getPHID())
+      ->setTransform($hash);
+
+    try {
+      $caught = null;
+
+      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+      try {
+        $xfile->save();
+      } catch (Exception $ex) {
+        $caught = $ex;
+      }
+      unset($unguarded);
+
+      if ($caught) {
+        throw $caught;
+      }
+
+      return $asset;
+    } catch (AphrontDuplicateKeyQueryException $ex) {
+      $xfile = $this->loadCachedFile();
+      if (!$xfile) {
+        throw $ex;
+      }
+      return $xfile;
+    }
+  }
+
+  private function newTransformHash() {
+    $properties = array(
+      'kind' => 'meme',
+      'above' => phutil_utf8_strtoupper($this->getAboveText()),
+      'below' => phutil_utf8_strtoupper($this->getBelowText()),
+    );
+
+    $properties = phutil_json_encode($properties);
+
+    return PhabricatorHash::digestForIndex($properties);
+  }
+
+  public function loadCachedFile() {
+    $viewer = $this->getViewer();
+
+    $template_file = $this->loadTemplateFile();
+    if (!$template_file) {
+      return null;
+    }
+
+    $hash = $this->newTransformHash();
+
+    $xform = id(new PhabricatorTransformedFile())->loadOneWhere(
+      'originalPHID = %s AND transform = %s',
+      $template_file->getPHID(),
+      $hash);
+    if (!$xform) {
+      return null;
+    }
+
+    return id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($xform->getTransformedPHID()))
+      ->executeOne();
+  }
+
+  private function loadTemplateFile() {
+    if ($this->templateFile === null) {
+      $viewer = $this->getViewer();
+      $template = $this->getTemplate();
+
+      $macro = id(new PhabricatorMacroQuery())
+        ->setViewer($viewer)
+        ->withNames(array($template))
+        ->needFiles(true)
+        ->executeOne();
+      if (!$macro) {
+        return null;
+      }
+
+      $this->templateFile = $macro->getFile();
+    }
+
+    return $this->templateFile;
+  }
+
+}
diff --git a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
index 278bd403cb..cdee10676c 100644
--- a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
@@ -29,10 +29,14 @@ public function markupMeme(array $matches) {
     $parser = new PhutilSimpleOptions();
     $options = $parser->parse($matches[1]) + $options;
 
-    $uri = id(new PhutilURI('/macro/meme/'))
-      ->alter('macro', $options['src'])
-      ->alter('uppertext', $options['above'])
-      ->alter('lowertext', $options['below']);
+    $engine = id(new PhabricatorMemeEngine())
+      ->setViewer(PhabricatorUser::getOmnipotentUser())
+      ->setTemplate($options['src'])
+      ->setAboveText($options['above'])
+      ->setBelowText($options['below']);
+
+    $asset = $engine->loadCachedFile();
+    $uri = $engine->getGenerateURI();
 
     if ($this->getEngine()->isHTMLMailMode()) {
       $uri = PhabricatorEnv::getProductionURI($uri);
@@ -50,10 +54,20 @@ public function markupMeme(array $matches) {
         $options['above'],
         $options['below']);
 
-      $img = id(new PHUIRemarkupImageView())
-        ->setURI($uri)
-        ->addClass('phabricator-remarkup-macro')
-        ->setAlt($alt_text);
+      if ($asset) {
+        $img = $this->newTag(
+          'img',
+          array(
+            'src' => $asset->getViewURI(),
+            'class' => 'phabricator-remarkup-macro',
+            'alt' => $alt_text,
+          ));
+      } else {
+        $img = id(new PHUIRemarkupImageView())
+          ->setURI($uri)
+          ->addClass('phabricator-remarkup-macro')
+          ->setAlt($alt_text);
+      }
     }
 
     return $this->getEngine()->storeText($img);

From a3d282d33efe275b14a73f2d2f96197a9059892b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 10:27:29 -0800
Subject: [PATCH 693/865] Somewhat improve meme transform code so it is merely
 very bad

Summary: Depends on D19200. Fixes T5258. Ref T13101. Attempt to simplify and modernize this code and improve error handling.

Test Plan: did real hard dank memes

Maniphest Tasks: T13101, T5258

Differential Revision: https://secure.phabricator.com/D19201
---
 .../files/PhabricatorImageTransformer.php     | 187 --------------
 .../macro/engine/PhabricatorMemeEngine.php    | 228 +++++++++++++++++-
 2 files changed, 223 insertions(+), 192 deletions(-)

diff --git a/src/applications/files/PhabricatorImageTransformer.php b/src/applications/files/PhabricatorImageTransformer.php
index 71f07a231e..1075969a42 100644
--- a/src/applications/files/PhabricatorImageTransformer.php
+++ b/src/applications/files/PhabricatorImageTransformer.php
@@ -6,193 +6,6 @@
  */
 final class PhabricatorImageTransformer extends Phobject {
 
-  public function executeMemeTransform(
-    PhabricatorFile $file,
-    $upper_text,
-    $lower_text) {
-    $image = $this->applyMemeToFile($file, $upper_text, $lower_text);
-    return PhabricatorFile::newFromFileData(
-      $image,
-      array(
-        'name' => 'meme-'.$file->getName(),
-        'ttl.relative' => phutil_units('24 hours in seconds'),
-        'canCDN' => true,
-      ));
-  }
-
-  private function applyMemeToFile(
-    PhabricatorFile $file,
-    $upper_text,
-    $lower_text) {
-    $data = $file->loadFileData();
-
-    $img_type = $file->getMimeType();
-    $imagemagick = PhabricatorEnv::getEnvConfig('files.enable-imagemagick');
-
-    if ($img_type != 'image/gif' || $imagemagick == false) {
-      return $this->applyMemeTo(
-        $data, $upper_text, $lower_text, $img_type);
-    }
-
-    $data = $file->loadFileData();
-    $input = new TempFile();
-    Filesystem::writeFile($input, $data);
-
-    list($out) = execx('convert %s info:', $input);
-    $split = phutil_split_lines($out);
-    if (count($split) > 1) {
-      return $this->applyMemeWithImagemagick(
-        $input,
-        $upper_text,
-        $lower_text,
-        count($split),
-        $img_type);
-    } else {
-      return $this->applyMemeTo($data, $upper_text, $lower_text, $img_type);
-    }
-  }
-
-  private function applyMemeTo(
-    $data,
-    $upper_text,
-    $lower_text,
-    $mime_type) {
-    $img = imagecreatefromstring($data);
-
-    // Some PNGs have color palettes, and allocating the dark border color
-    // fails and gives us whatever's first in the color table. Copy the image
-    // to a fresh truecolor canvas before working with it.
-
-    $truecolor = imagecreatetruecolor(imagesx($img), imagesy($img));
-    imagecopy($truecolor, $img, 0, 0, 0, 0, imagesx($img), imagesy($img));
-    $img = $truecolor;
-
-    $phabricator_root = dirname(phutil_get_library_root('phabricator'));
-    $font_root = $phabricator_root.'/resources/font/';
-    $font_path = $font_root.'tuffy.ttf';
-    if (Filesystem::pathExists($font_root.'impact.ttf')) {
-      $font_path = $font_root.'impact.ttf';
-    }
-    $text_color = imagecolorallocate($img, 255, 255, 255);
-    $border_color = imagecolorallocatealpha($img, 0, 0, 0, 110);
-    $border_width = 4;
-    $font_max = 200;
-    $font_min = 5;
-    for ($i = $font_max; $i > $font_min; $i--) {
-      $fit = $this->doesTextBoundingBoxFitInImage(
-        $img,
-        $upper_text,
-        $i,
-        $font_path);
-      if ($fit['doesfit']) {
-        $x = ($fit['imgwidth'] - $fit['txtwidth']) / 2;
-        $y = $fit['txtheight'] + 10;
-        $this->makeImageWithTextBorder($img,
-          $i,
-          $x,
-          $y,
-          $text_color,
-          $border_color,
-          $border_width,
-          $font_path,
-          $upper_text);
-        break;
-      }
-    }
-    for ($i = $font_max; $i > $font_min; $i--) {
-      $fit = $this->doesTextBoundingBoxFitInImage($img,
-        $lower_text, $i, $font_path);
-      if ($fit['doesfit']) {
-        $x = ($fit['imgwidth'] - $fit['txtwidth']) / 2;
-        $y = $fit['imgheight'] - 10;
-        $this->makeImageWithTextBorder(
-          $img,
-          $i,
-          $x,
-          $y,
-          $text_color,
-          $border_color,
-          $border_width,
-          $font_path,
-          $lower_text);
-        break;
-      }
-    }
-    return self::saveImageDataInAnyFormat($img, $mime_type);
-  }
-
-  private function makeImageWithTextBorder($img, $font_size, $x, $y,
-    $color, $stroke_color, $bw, $font, $text) {
-    $angle = 0;
-    $bw = abs($bw);
-    for ($c1 = $x - $bw; $c1 <= $x + $bw; $c1++) {
-      for ($c2 = $y - $bw; $c2 <= $y + $bw; $c2++) {
-        if (!(($c1 == $x - $bw || $x + $bw) &&
-          $c2 == $y - $bw || $c2 == $y + $bw)) {
-          $bg = imagettftext($img, $font_size,
-            $angle, $c1, $c2, $stroke_color, $font, $text);
-          }
-        }
-      }
-    imagettftext($img, $font_size, $angle,
-            $x , $y, $color , $font, $text);
-  }
-
-  private function doesTextBoundingBoxFitInImage($img,
-    $text, $font_size, $font_path) {
-    // Default Angle = 0
-    $angle = 0;
-
-    $bbox = imagettfbbox($font_size, $angle, $font_path, $text);
-    $text_height = abs($bbox[3] - $bbox[5]);
-    $text_width = abs($bbox[0] - $bbox[2]);
-    return array(
-      'doesfit' => ($text_height * 1.05 <= imagesy($img) / 2
-        && $text_width * 1.05 <= imagesx($img)),
-      'txtwidth' => $text_width,
-      'txtheight' => $text_height,
-      'imgwidth' => imagesx($img),
-      'imgheight' => imagesy($img),
-    );
-  }
-
-  private function applyMemeWithImagemagick(
-    $input,
-    $above,
-    $below,
-    $count,
-    $img_type) {
-
-    $output = new TempFile();
-    $future = new ExecFuture(
-      'convert %s -coalesce +adjoin %s_%s',
-      $input,
-      $input,
-      '%09d');
-    $future->setTimeout(10)->resolvex();
-
-    $output_files = array();
-    for ($ii = 0; $ii < $count; $ii++) {
-      $frame_name = sprintf('%s_%09d', $input, $ii);
-      $output_name = sprintf('%s_%09d', $output, $ii);
-
-      $output_files[] = $output_name;
-
-      $frame_data = Filesystem::readFile($frame_name);
-      $memed_frame_data = $this->applyMemeTo(
-        $frame_data,
-        $above,
-        $below,
-        $img_type);
-      Filesystem::writeFile($output_name, $memed_frame_data);
-    }
-
-    $future = new ExecFuture('convert -loop 0 %Ls %s', $output_files, $output);
-    $future->setTimeout(10)->resolvex();
-
-    return Filesystem::readFile($output);
-  }
-
 
 /* -(  Saving Image Data  )-------------------------------------------------- */
 
diff --git a/src/applications/macro/engine/PhabricatorMemeEngine.php b/src/applications/macro/engine/PhabricatorMemeEngine.php
index 21a9b44e99..8e0ffbcbba 100644
--- a/src/applications/macro/engine/PhabricatorMemeEngine.php
+++ b/src/applications/macro/engine/PhabricatorMemeEngine.php
@@ -8,6 +8,7 @@ final class PhabricatorMemeEngine extends Phobject {
   private $belowText;
 
   private $templateFile;
+  private $metrics;
 
   public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
@@ -68,11 +69,7 @@ public function newAsset() {
 
     $hash = $this->newTransformHash();
 
-    $transformer = new PhabricatorImageTransformer();
-    $asset = $transformer->executeMemeTransform(
-      $template,
-      $this->getAboveText(),
-      $this->getBelowText());
+    $asset = $this->newAssetFile($template);
 
     $xfile = id(new PhabricatorTransformedFile())
       ->setOriginalPHID($template->getPHID())
@@ -160,4 +157,225 @@ private function loadTemplateFile() {
     return $this->templateFile;
   }
 
+  private function newAssetFile(PhabricatorFile $template) {
+    $data = $this->newAssetData($template);
+    return PhabricatorFile::newFromFileData(
+      $data,
+      array(
+        'name' => 'meme-'.$template->getName(),
+        'ttl.relative' => phutil_units('24 hours in seconds'),
+        'canCDN' => true,
+      ));
+  }
+
+  private function newAssetData(PhabricatorFile $template) {
+    $template_data = $template->loadFileData();
+
+    $result = $this->newImagemagickAsset($template, $template_data);
+    if ($result) {
+      return $result;
+    }
+
+    return $this->newGDAsset($template, $template_data);
+  }
+
+  private function newImagemagickAsset(
+    PhabricatorFile $template,
+    $template_data) {
+
+    // We're only going to use Imagemagick on GIFs.
+    $mime_type = $template->getMimeType();
+    if ($mime_type != 'image/gif') {
+      return null;
+    }
+
+    // We're only going to use Imagemagick if it is actually available.
+    $available = PhabricatorEnv::getEnvConfig('files.enable-imagemagick');
+    if (!$available) {
+      return null;
+    }
+
+    // Test of the GIF is an animated GIF. If it's a flat GIF, we'll fall
+    // back to GD.
+    $input = new TempFile();
+    Filesystem::writeFile($input, $template_data);
+    list($err, $out) = exec_manual('convert %s info:', $input);
+    if ($err) {
+      return null;
+    }
+
+    $split = phutil_split_lines($out);
+    $frames = count($split);
+    if ($frames <= 1) {
+      return null;
+    }
+
+    // Split the frames apart, transform each frame, then merge them back
+    // together.
+    $output = new TempFile();
+
+    $future = new ExecFuture(
+      'convert %s -coalesce +adjoin %s_%s',
+      $input,
+      $input,
+      '%09d');
+    $future->setTimeout(10)->resolvex();
+
+    $output_files = array();
+    for ($ii = 0; $ii < $frames; $ii++) {
+      $frame_name = sprintf('%s_%09d', $input, $ii);
+      $output_name = sprintf('%s_%09d', $output, $ii);
+
+      $output_files[] = $output_name;
+
+      $frame_data = Filesystem::readFile($frame_name);
+      $memed_frame_data = $this->newGDAsset($template, $frame_data);
+      Filesystem::writeFile($output_name, $memed_frame_data);
+    }
+
+    $future = new ExecFuture('convert -loop 0 %Ls %s', $output_files, $output);
+    $future->setTimeout(10)->resolvex();
+
+    return Filesystem::readFile($output);
+  }
+
+  private function newGDAsset(PhabricatorFile $template, $data) {
+    $img = imagecreatefromstring($data);
+    if (!$img) {
+      throw new Exception(
+        pht('Failed to imagecreatefromstring() image template data.'));
+    }
+
+    $dx = imagesx($img);
+    $dy = imagesy($img);
+
+    $metrics = $this->getMetrics($dx, $dy);
+    $font = $this->getFont();
+    $size = $metrics['size'];
+
+    $above = $this->getAboveText();
+    if (strlen($above)) {
+      $x = (int)floor(($dx - $metrics['text']['above']['width']) / 2);
+      $y = $metrics['text']['above']['height'] + 12;
+
+      $this->drawText($img, $font, $metrics['size'], $x, $y, $above);
+    }
+
+    $below = $this->getBelowText();
+    if (strlen($below)) {
+      $x = (int)floor(($dx - $metrics['text']['below']['width']) / 2);
+      $y = $dy - 12 - $metrics['text']['below']['descend'];
+
+      $this->drawText($img, $font, $metrics['size'], $x, $y, $below);
+    }
+
+    return PhabricatorImageTransformer::saveImageDataInAnyFormat(
+      $img,
+      $template->getMimeType());
+  }
+
+  private function getFont() {
+    $phabricator_root = dirname(phutil_get_library_root('phabricator'));
+
+    $font_root = $phabricator_root.'/resources/font/';
+    if (Filesystem::pathExists($font_root.'impact.ttf')) {
+      $font_path = $font_root.'impact.ttf';
+    } else {
+      $font_path = $font_root.'tuffy.ttf';
+    }
+
+    return $font_path;
+  }
+
+  private function getMetrics($dim_x, $dim_y) {
+    if ($this->metrics === null) {
+      $font = $this->getFont();
+
+      $font_max = 72;
+      $font_min = 5;
+
+      $last = null;
+      $cursor = floor(($font_max + $font_min) / 2);
+      $min = $font_min;
+      $max = $font_max;
+
+      $texts = array(
+        'above' => $this->getAboveText(),
+        'below' => $this->getBelowText(),
+      );
+
+      $metrics = null;
+      $best = null;
+      while (true) {
+        $all_fit = true;
+        $text_metrics = array();
+        foreach ($texts as $key => $text) {
+          $box = imagettfbbox($cursor, 0, $font, $text);
+          $height = abs($box[3] - $box[5]);
+          $width = abs($box[0] - $box[2]);
+
+          // This is the number of pixels below the baseline that the
+          // text extends, for example if it has a "y".
+          $descend = $box[3];
+
+          if ($height > $dim_y) {
+            $all_fit = false;
+            break;
+          }
+
+          if ($width > $dim_x) {
+            $all_fit = false;
+            break;
+          }
+
+          $text_metrics[$key]['width'] = $width;
+          $text_metrics[$key]['height'] = $height;
+          $text_metrics[$key]['descend'] = $descend;
+        }
+
+        if ($all_fit || $best === null) {
+          $best = $cursor;
+          $metrics = $text_metrics;
+        }
+
+        if ($all_fit) {
+          $min = $cursor;
+        } else {
+          $max = $cursor;
+        }
+
+        $last = $cursor;
+        $cursor = floor(($max + $min) / 2);
+        if ($cursor === $last) {
+          break;
+        }
+      }
+
+      $this->metrics = array(
+        'size' => $best,
+        'text' => $metrics,
+      );
+    }
+
+    return $this->metrics;
+  }
+
+  private function drawText($img, $font, $size, $x, $y, $text) {
+    $text_color = imagecolorallocate($img, 255, 255, 255);
+    $border_color = imagecolorallocate($img, 0, 0, 0);
+
+    $border = 2;
+    for ($xx = ($x - $border); $xx <= ($x + $border); $xx += $border) {
+      for ($yy = ($y - $border); $yy <= ($y + $border); $yy += $border) {
+        if (($xx === $x) && ($yy === $y)) {
+          continue;
+        }
+        imagettftext($img, $size, 0, $xx, $yy, $border_color, $font, $text);
+      }
+    }
+
+    imagettftext($img, $size, 0, $x, $y, $text_color, $font, $text);
+  }
+
+
 }

From 10b3ddf426573f4d4b01ca47ca313d8856fdabcd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 11:02:40 -0800
Subject: [PATCH 694/865] Possibly fix memes in email

Summary:
Depends on D19201. Ref T13101. This likely produces relatively stable-ish image references for email.

They currently TTL after 30 days but this makes the jokes more exclusive and special so it's a feature, not a bug.

Test Plan: I'm just going to test this in production because I'm a ninja superstar developer.

Maniphest Tasks: T13101

Differential Revision: https://secure.phabricator.com/D19203
---
 .../macro/engine/PhabricatorMemeEngine.php    |  5 +-
 .../markup/PhabricatorMemeRemarkupRule.php    | 81 ++++++++++++-------
 2 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/src/applications/macro/engine/PhabricatorMemeEngine.php b/src/applications/macro/engine/PhabricatorMemeEngine.php
index 8e0ffbcbba..f72a161171 100644
--- a/src/applications/macro/engine/PhabricatorMemeEngine.php
+++ b/src/applications/macro/engine/PhabricatorMemeEngine.php
@@ -163,8 +163,11 @@ private function newAssetFile(PhabricatorFile $template) {
       $data,
       array(
         'name' => 'meme-'.$template->getName(),
-        'ttl.relative' => phutil_units('24 hours in seconds'),
         'canCDN' => true,
+
+        // In modern code these can end up linked directly in email, so let
+        // them stick around for a while.
+        'ttl.relative' => phutil_units('30 days in seconds'),
       ));
   }
 
diff --git a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
index cdee10676c..eacb1a33ed 100644
--- a/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorMemeRemarkupRule.php
@@ -36,38 +36,65 @@ public function markupMeme(array $matches) {
       ->setBelowText($options['below']);
 
     $asset = $engine->loadCachedFile();
-    $uri = $engine->getGenerateURI();
 
-    if ($this->getEngine()->isHTMLMailMode()) {
-      $uri = PhabricatorEnv::getProductionURI($uri);
+    $is_html_mail = $this->getEngine()->isHTMLMailMode();
+    $is_text = $this->getEngine()->isTextMode();
+    $must_inline = ($is_html_mail || $is_text);
+
+    if ($must_inline) {
+      if (!$asset) {
+        try {
+          $asset = $engine->newAsset();
+        } catch (Exception $ex) {
+          return $matches[0];
+        }
+      }
     }
 
-    if ($this->getEngine()->isTextMode()) {
-      $img =
-        ($options['above'] != '' ? "\"{$options['above']}\"\n" : '').
-        $options['src'].' <'.PhabricatorEnv::getProductionURI($uri).'>'.
-        ($options['below'] != '' ? "\n\"{$options['below']}\"" : '');
+    if ($asset) {
+      $uri = $asset->getViewURI();
     } else {
-      $alt_text = pht(
-        'Macro %s: %s %s',
-        $options['src'],
-        $options['above'],
-        $options['below']);
-
-      if ($asset) {
-        $img = $this->newTag(
-          'img',
-          array(
-            'src' => $asset->getViewURI(),
-            'class' => 'phabricator-remarkup-macro',
-            'alt' => $alt_text,
-          ));
-      } else {
-        $img = id(new PHUIRemarkupImageView())
-          ->setURI($uri)
-          ->addClass('phabricator-remarkup-macro')
-          ->setAlt($alt_text);
+      $uri = $engine->getGenerateURI();
+    }
+
+    if ($is_text) {
+      $parts = array();
+
+      $above = $options['above'];
+      if (strlen($above)) {
+        $parts[] = pht('"%s"', $above);
       }
+
+      $parts[] = $options['src'].' <'.$uri.'>';
+
+      $below = $options['below'];
+      if (strlen($below)) {
+        $parts[] = pht('"%s"', $below);
+      }
+
+      $parts = implode("\n", $parts);
+      return $this->getEngine()->storeText($parts);
+    }
+
+    $alt_text = pht(
+      'Macro %s: %s %s',
+      $options['src'],
+      $options['above'],
+      $options['below']);
+
+    if ($asset) {
+      $img = $this->newTag(
+        'img',
+        array(
+          'src' => $uri,
+          'class' => 'phabricator-remarkup-macro',
+          'alt' => $alt_text,
+        ));
+    } else {
+      $img = id(new PHUIRemarkupImageView())
+        ->setURI($uri)
+        ->addClass('phabricator-remarkup-macro')
+        ->setAlt($alt_text);
     }
 
     return $this->getEngine()->storeText($img);

From 2de06a5375c6b786d8f32d69bc98a695cdbed9ce Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Mar 2018 11:52:48 -0800
Subject: [PATCH 695/865] Add some more UI reminder text about draft revisions

Summary: See PHI433. This beefs up reminder texts for drafts a little bit since some users in the wild aren't always seeing/remembering the existing, fairly subtle hints.

Test Plan: Created a reivsion with `--draft`, viewed it, saw richer reminders.

Differential Revision: https://secure.phabricator.com/D19204
---
 .../constants/DifferentialRevisionStatus.php  |  6 ++---
 .../customfield/DifferentialDraftField.php    | 24 +++++++++++++++++--
 .../editor/DifferentialRevisionEditEngine.php |  8 +++++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
index 70f0e33b28..e3acace3f0 100644
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -172,10 +172,10 @@ private static function getMap() {
         'name' => pht('Draft'),
         // For legacy clients, treat this as though it is "Needs Review".
         'legacy' => 0,
-        'icon' => 'fa-file-text-o',
+        'icon' => 'fa-spinner',
         'closed' => false,
-        'color.icon' => 'grey',
-        'color.tag' => 'grey',
+        'color.icon' => 'pink',
+        'color.tag' => 'pink',
         'color.ansi' => null,
       ),
     );
diff --git a/src/applications/differential/customfield/DifferentialDraftField.php b/src/applications/differential/customfield/DifferentialDraftField.php
index 5d625e3ce9..8147708bca 100644
--- a/src/applications/differential/customfield/DifferentialDraftField.php
+++ b/src/applications/differential/customfield/DifferentialDraftField.php
@@ -37,9 +37,14 @@ public function getWarningsForRevisionHeader(array $handles) {
     }
 
     // If the author has held this revision as a draft explicitly, don't
-    // show any misleading messages about it autosubmitting later.
+    // show any misleading messages about it autosubmitting later. We do show
+    // reminder text.
     if ($revision->getHoldAsDraft()) {
-      return array();
+      return array(
+        pht(
+          'This is a draft revision that has not yet been submitted for '.
+          'review.'),
+      );
     }
 
     $warnings = array();
@@ -93,4 +98,19 @@ public function getWarningsForRevisionHeader(array $handles) {
     return $warnings;
   }
 
+  public function getWarningsForDetailView() {
+    $revision = $this->getObject();
+
+    if (!$revision->isDraft()) {
+      return array();
+    }
+
+    return array(
+      pht(
+        'This revision is currently a draft. You can leave comments, but '.
+        'no one will be notified until the revision is submitted for '.
+        'review.'),
+    );
+  }
+
 }
diff --git a/src/applications/differential/editor/DifferentialRevisionEditEngine.php b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
index fe1b983f1a..d462fd7571 100644
--- a/src/applications/differential/editor/DifferentialRevisionEditEngine.php
+++ b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
@@ -71,6 +71,14 @@ protected function getObjectName() {
     return pht('Revision');
   }
 
+  protected function getCommentViewButtonText($object) {
+    if ($object->isDraft()) {
+      return pht('Submit Quietly');
+    }
+
+    return parent::getCommentViewButtonText();
+  }
+
   protected function getObjectViewURI($object) {
     return $object->getURI();
   }

From 1763b516b158d5efad344111d332da524a129e75 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Mar 2018 05:19:06 -0800
Subject: [PATCH 696/865] Fix missing parameter in parent call for Differential
 button text

Summary: See <https://discourse.phabricator-community.org/t/openning-any-differential-fails-with-undefined-variable-object/1216/1>.

Test Plan: Loaded any //non//-draft revision.

Differential Revision: https://secure.phabricator.com/D19205
---
 .../differential/editor/DifferentialRevisionEditEngine.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/differential/editor/DifferentialRevisionEditEngine.php b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
index d462fd7571..0404bd6201 100644
--- a/src/applications/differential/editor/DifferentialRevisionEditEngine.php
+++ b/src/applications/differential/editor/DifferentialRevisionEditEngine.php
@@ -76,7 +76,7 @@ protected function getCommentViewButtonText($object) {
       return pht('Submit Quietly');
     }
 
-    return parent::getCommentViewButtonText();
+    return parent::getCommentViewButtonText($object);
   }
 
   protected function getObjectViewURI($object) {

From 3e992c671372cafb3bee5ba64a9720b7185fc814 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Mar 2018 12:06:17 -0800
Subject: [PATCH 697/865] Add audit, review, and dominion information to
 "owners.search" API method

Summary:
See PHI439. This fills in additional information about Owners packages.

Also removes dead `primaryOwnerPHID`.

Test Plan: Called `owners.search` and reviewed the results. Grepped for `primaryOwnerPHID`.

Differential Revision: https://secure.phabricator.com/D19207
---
 .../20180309.owners.01.primaryowner.sql       |  2 +
 .../storage/PhabricatorOwnersPackage.php      | 43 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 resources/sql/autopatches/20180309.owners.01.primaryowner.sql

diff --git a/resources/sql/autopatches/20180309.owners.01.primaryowner.sql b/resources/sql/autopatches/20180309.owners.01.primaryowner.sql
new file mode 100644
index 0000000000..a5eb4368f2
--- /dev/null
+++ b/resources/sql/autopatches/20180309.owners.01.primaryowner.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_owners.owners_package
+  DROP primaryOwnerPHID;
diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
index 7f155d7c89..eb17a3890e 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
@@ -16,7 +16,6 @@ final class PhabricatorOwnersPackage
   protected $auditingEnabled;
   protected $autoReview;
   protected $description;
-  protected $primaryOwnerPHID;
   protected $mailKey;
   protected $status;
   protected $viewPolicy;
@@ -122,7 +121,6 @@ protected function getConfiguration() {
       self::CONFIG_COLUMN_SCHEMA => array(
         'name' => 'sort',
         'description' => 'text',
-        'primaryOwnerPHID' => 'phid?',
         'auditingEnabled' => 'bool',
         'mailKey' => 'bytes20',
         'status' => 'text32',
@@ -601,6 +599,18 @@ public function getFieldSpecificationsForConduit() {
         ->setKey('owners')
         ->setType('list<map<string, wild>>')
         ->setDescription(pht('List of package owners.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('review')
+        ->setType('map<string, wild>')
+        ->setDescription(pht('Auto review information.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('audit')
+        ->setType('map<string, wild>')
+        ->setDescription(pht('Auto audit information.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('dominion')
+        ->setType('string')
+        ->setDescription(pht('Dominion setting.')),
     );
   }
 
@@ -612,11 +622,40 @@ public function getFieldValuesForConduit() {
       );
     }
 
+    $review_map = self::getAutoreviewOptionsMap();
+    $review_value = $this->getAutoReview();
+    if (isset($review_map[$review_value])) {
+      $review_label = $review_map[$review_value]['name'];
+    } else {
+      $review_label = pht('Unknown ("%s")', $review_value);
+    }
+
+    $review = array(
+      'value' => $review_value,
+      'label' => $review_label,
+    );
+
+    if ($this->getAuditingEnabled()) {
+      $audit_value = 'audit';
+      $audit_label = pht('Auditing Enabled');
+    } else {
+      $audit_value = 'none';
+      $audit_label = pht('No Auditing');
+    }
+
+    $audit = array(
+      'value' => $audit_value,
+      'label' => $audit_label,
+    );
+
     return array(
       'name' => $this->getName(),
       'description' => $this->getDescription(),
       'status' => $this->getStatus(),
       'owners' => $owner_list,
+      'review' => $review,
+      'audit' => $audit,
+      'dominion' => $this->getDominion(),
     );
   }
 

From 9d0cf3c8b82d550de7f6b44801b29796d688c493 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Mar 2018 12:16:10 -0800
Subject: [PATCH 698/865] Before anyone notices, break the API

Summary: See PHI439. Use slightly richer "dominion" return values for consistency.

Test Plan: Fetched results with `owners.search` API method.

Differential Revision: https://secure.phabricator.com/D19208
---
 .../storage/PhabricatorOwnersPackage.php      | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
index eb17a3890e..56dd51a3c6 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
@@ -609,8 +609,8 @@ public function getFieldSpecificationsForConduit() {
         ->setDescription(pht('Auto audit information.')),
       id(new PhabricatorConduitSearchFieldSpecification())
         ->setKey('dominion')
-        ->setType('string')
-        ->setDescription(pht('Dominion setting.')),
+        ->setType('map<string, wild>')
+        ->setDescription(pht('Dominion setting information.')),
     );
   }
 
@@ -648,6 +648,22 @@ public function getFieldValuesForConduit() {
       'label' => $audit_label,
     );
 
+    $dominion_value = $this->getDominion();
+    $dominion_map = self::getDominionOptionsMap();
+    if (isset($dominion_map[$dominion_value])) {
+      $dominion_label = $dominion_map[$dominion_value]['name'];
+      $dominion_short = $dominion_map[$dominion_value]['short'];
+    } else {
+      $dominion_label = pht('Unknown ("%s")', $dominion_value);
+      $dominion_short = pht('Unknown ("%s")', $dominion_value);
+    }
+
+    $dominion = array(
+      'value' => $dominion_value,
+      'label' => $dominion_label,
+      'short' => $dominion_short,
+    );
+
     return array(
       'name' => $this->getName(),
       'description' => $this->getDescription(),
@@ -655,7 +671,7 @@ public function getFieldValuesForConduit() {
       'owners' => $owner_list,
       'review' => $review,
       'audit' => $audit,
-      'dominion' => $this->getDominion(),
+      'dominion' => $dominion,
     );
   }
 

From f0da189798fa00af46eee1289d733f4bb058b1ba Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 9 Mar 2018 13:12:43 -0800
Subject: [PATCH 699/865] (stable) Update Celerity map for 2018 Week 10

---
 resources/celerity/map.php | 109 ++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 51 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 7cc74e812c..38343475d0 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,8 +9,8 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '2fa91e14',
-    'core.pkg.js' => 'e4d73c62',
+    'core.pkg.css' => 'c218ed53',
+    'core.pkg.js' => '8b7400e7',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -85,7 +85,7 @@
     'rsrc/css/application/maniphest/task-edit.css' => 'fda62a9b',
     'rsrc/css/application/maniphest/task-summary.css' => '11cc5344',
     'rsrc/css/application/objectselector/object-selector.css' => '85ee8ce6',
-    'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
+    'rsrc/css/application/owners/owners-path-editor.css' => '9c136c29',
     'rsrc/css/application/paste/paste.css' => '9fcc9773',
     'rsrc/css/application/people/people-picture-menu-item.css' => 'a06f7f34',
     'rsrc/css/application/people/people-profile.css' => '4df76faf',
@@ -114,7 +114,7 @@
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '62fa3ace',
-    'rsrc/css/core/remarkup.css' => 'cad18339',
+    'rsrc/css/core/remarkup.css' => '97dc3523',
     'rsrc/css/core/syntax.css' => 'cae95e89',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
@@ -268,7 +268,7 @@
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js' => '503e17fd',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js' => '013ffff9',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js' => '54f314a0',
-    'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js' => '0fcf201c',
+    'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js' => 'ab9e0a82',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js' => '6c0e62fa',
     'rsrc/favicons/apple-touch-icon-114x114.png' => '12a24178',
     'rsrc/favicons/apple-touch-icon-120x120.png' => '0d1543c7',
@@ -418,13 +418,13 @@
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
-    'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
+    'rsrc/js/application/herald/PathTypeahead.js' => '662e9cea',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
     'rsrc/js/application/maniphest/behavior-batch-selector.js' => 'ad54037e',
     'rsrc/js/application/maniphest/behavior-line-chart.js' => 'e4232876',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
     'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '71237763',
-    'rsrc/js/application/owners/OwnersPathEditor.js' => 'aa1733d0',
+    'rsrc/js/application/owners/OwnersPathEditor.js' => 'c96502cf',
     'rsrc/js/application/owners/owners-path-editor.js' => '7a68dda3',
     'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc',
     'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => 'bee502c8',
@@ -494,7 +494,7 @@
     'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
-    'rsrc/js/core/behavior-lightbox-attachments.js' => '562bcce0',
+    'rsrc/js/core/behavior-lightbox-attachments.js' => '6b31879a',
     'rsrc/js/core/behavior-line-linker.js' => 'a9b946f8',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
@@ -504,6 +504,7 @@
     'rsrc/js/core/behavior-read-only-warning.js' => 'ba158207',
     'rsrc/js/core/behavior-redirect.js' => '0213259f',
     'rsrc/js/core/behavior-refresh-csrf.js' => 'ab2f381b',
+    'rsrc/js/core/behavior-remarkup-load-image.js' => '040fce04',
     'rsrc/js/core/behavior-remarkup-preview.js' => '4b700e9e',
     'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
     'rsrc/js/core/behavior-reveal-content.js' => '60821bc7',
@@ -534,7 +535,7 @@
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
-    'rsrc/js/phuix/PHUIXFormControl.js' => '16ad6224',
+    'rsrc/js/phuix/PHUIXFormControl.js' => '210a16c1',
     'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
   ),
   'symbols' => array(
@@ -643,7 +644,7 @@
     'javelin-behavior-history-install' => '7ee2b591',
     'javelin-behavior-icon-composer' => '8499b6ab',
     'javelin-behavior-launch-icon-composer' => '48086888',
-    'javelin-behavior-lightbox-attachments' => '562bcce0',
+    'javelin-behavior-lightbox-attachments' => '6b31879a',
     'javelin-behavior-line-chart' => 'e4232876',
     'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-selector' => 'ad54037e',
@@ -692,6 +693,7 @@
     'javelin-behavior-releeph-preview-branch' => 'b2b4fbaf',
     'javelin-behavior-releeph-request-state-change' => 'a0b57eb8',
     'javelin-behavior-releeph-request-typeahead' => 'de2e896f',
+    'javelin-behavior-remarkup-load-image' => '040fce04',
     'javelin-behavior-remarkup-preview' => '4b700e9e',
     'javelin-behavior-reorder-applications' => '76b9fc3e',
     'javelin-behavior-reorder-columns' => 'e1d25dfb',
@@ -744,7 +746,7 @@
     'javelin-typeahead-normalizer' => '185bbd53',
     'javelin-typeahead-ondemand-source' => '013ffff9',
     'javelin-typeahead-preloaded-source' => '54f314a0',
-    'javelin-typeahead-source' => '0fcf201c',
+    'javelin-typeahead-source' => 'ab9e0a82',
     'javelin-typeahead-static-source' => '6c0e62fa',
     'javelin-uri' => 'c989ade3',
     'javelin-util' => '93cc50d6',
@@ -764,10 +766,10 @@
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
     'multirow-row-manager' => 'b5d57730',
-    'owners-path-editor' => 'aa1733d0',
-    'owners-path-editor-css' => '2f00933b',
+    'owners-path-editor' => 'c96502cf',
+    'owners-path-editor-css' => '9c136c29',
     'paste-css' => '9fcc9773',
-    'path-typeahead' => 'f7fc67ec',
+    'path-typeahead' => '662e9cea',
     'people-picture-menu-item-css' => 'a06f7f34',
     'people-profile-css' => '4df76faf',
     'phabricator-action-list-view-css' => '0bcd9a45',
@@ -800,7 +802,7 @@
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '77b0ae28',
-    'phabricator-remarkup-css' => 'cad18339',
+    'phabricator-remarkup-css' => '97dc3523',
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
@@ -888,7 +890,7 @@
     'phuix-autocomplete' => '7fa5c915',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
-    'phuix-form-control-view' => '16ad6224',
+    'phuix-form-control-view' => '210a16c1',
     'phuix-icon-view' => 'bff6884b',
     'policy-css' => '957ea14c',
     'policy-edit-css' => '815c66f7',
@@ -940,6 +942,10 @@
       'javelin-behavior',
       'javelin-uri',
     ),
+    '040fce04' => array(
+      'javelin-behavior',
+      'javelin-request',
+    ),
     '04b2ae03' => array(
       'javelin-install',
       'javelin-util',
@@ -998,20 +1004,10 @@
       'javelin-install',
       'javelin-util',
     ),
-    '0fcf201c' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-typeahead-normalizer',
-    ),
     '15d5ff71' => array(
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
     ),
-    '16ad6224' => array(
-      'javelin-install',
-      'javelin-dom',
-    ),
     '17bb8539' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1061,6 +1057,10 @@
       'javelin-install',
       'javelin-dom',
     ),
+    '210a16c1' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     '2290aeef' => array(
       'javelin-install',
       'javelin-dom',
@@ -1362,15 +1362,6 @@
       'javelin-vector',
       'javelin-dom',
     ),
-    '562bcce0' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-mask',
-      'javelin-util',
-      'phuix-icon-view',
-      'phabricator-busy',
-    ),
     '58dea2fa' => array(
       'javelin-install',
       'javelin-util',
@@ -1431,6 +1422,14 @@
       'javelin-workflow',
       'javelin-dom',
     ),
+    '662e9cea' => array(
+      'javelin-install',
+      'javelin-typeahead',
+      'javelin-dom',
+      'javelin-request',
+      'javelin-typeahead-ondemand-source',
+      'javelin-util',
+    ),
     '66a6def1' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1455,6 +1454,15 @@
     '69adf288' => array(
       'javelin-install',
     ),
+    '6b31879a' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-mask',
+      'javelin-util',
+      'phuix-icon-view',
+      'phabricator-busy',
+    ),
     '6b8ef10b' => array(
       'javelin-install',
     ),
@@ -1775,14 +1783,6 @@
       'javelin-fx',
       'javelin-util',
     ),
-    'aa1733d0' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'path-typeahead',
-      'javelin-dom',
-      'javelin-util',
-      'phabricator-prefab',
-    ),
     'ab2f381b' => array(
       'javelin-request',
       'javelin-behavior',
@@ -1791,6 +1791,12 @@
       'javelin-util',
       'phabricator-busy',
     ),
+    'ab9e0a82' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-typeahead-normalizer',
+    ),
     'acd29eee' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1966,6 +1972,15 @@
       'javelin-install',
       'javelin-util',
     ),
+    'c96502cf' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'path-typeahead',
+      'javelin-dom',
+      'javelin-util',
+      'phabricator-prefab',
+      'phuix-form-control-view',
+    ),
     'c989ade3' => array(
       'javelin-install',
       'javelin-util',
@@ -2163,14 +2178,6 @@
       'javelin-util',
       'javelin-reactor',
     ),
-    'f7fc67ec' => array(
-      'javelin-install',
-      'javelin-typeahead',
-      'javelin-dom',
-      'javelin-request',
-      'javelin-typeahead-ondemand-source',
-      'javelin-util',
-    ),
     'f829edb3' => array(
       'javelin-view',
       'javelin-install',

From 3c4f31e4b9213eb70571dec1feab399fa4bcee6d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Mar 2018 15:07:06 -0700
Subject: [PATCH 700/865] Dynamically composite favicons from customizable
 sources

Summary: Ref T13103. Make favicons customizable, and perform dynamic compositing to add marker to indicate things like "unread messages".

Test Plan: Viewed favicons in Safari, Firefox and Chrome. With unread messages, saw pink dot composited into icon.

Maniphest Tasks: T13103

Differential Revision: https://secure.phabricator.com/D19209
---
 .../builtin/favicon/default-120x120.png       | Bin
 .../builtin/favicon/default-128x128.png       | Bin
 .../builtin/favicon/default-152x152.png       | Bin
 .../builtin/favicon/default-76x76.png         | Bin
 resources/builtin/favicon/dot-pink-64x64.png  | Bin 0 -> 1468 bytes
 resources/builtin/favicon/dot-red-64x64.png   | Bin 0 -> 1138 bytes
 resources/celerity/map.php                    |  21 -
 src/__phutil_library_map__.php                |   6 +-
 .../option/PhabricatorUIConfigOptions.php     |   4 +
 .../files/favicon/PhabricatorFaviconRef.php   | 447 ++++++++++++++++++
 .../favicon/PhabricatorFaviconRefQuery.php    |  55 +++
 .../files/storage/PhabricatorFile.php         |   3 +-
 .../PhabricatorSystemApplication.php          |   1 -
 .../PhabricatorSystemFaviconController.php    |  19 -
 src/view/page/PhabricatorBarePageView.php     | 114 +++--
 .../page/menu/PhabricatorMainMenuView.php     |  47 +-
 webroot/favicon.ico                           | Bin 34494 -> 0 bytes
 .../favicons/apple-touch-icon-114x114.png     | Bin 10773 -> 0 bytes
 .../favicons/apple-touch-icon-144x144.png     | Bin 13270 -> 0 bytes
 .../rsrc/favicons/apple-touch-icon-57x57.png  | Bin 3806 -> 0 bytes
 .../rsrc/favicons/apple-touch-icon-60x60.png  | Bin 3834 -> 0 bytes
 .../rsrc/favicons/apple-touch-icon-72x72.png  | Bin 4929 -> 0 bytes
 webroot/rsrc/favicons/favicon-196x196.png     | Bin 26744 -> 0 bytes
 webroot/rsrc/favicons/favicon-32x32.png       | Bin 1421 -> 0 bytes
 webroot/rsrc/favicons/favicon-96x96.png       | Bin 6371 -> 0 bytes
 webroot/rsrc/favicons/favicon-mention.ico     | Bin 34494 -> 0 bytes
 webroot/rsrc/favicons/favicon-message.ico     | Bin 34494 -> 0 bytes
 webroot/rsrc/favicons/favicon.ico             | Bin 34494 -> 0 bytes
 webroot/rsrc/favicons/mstile-144x144.png      | Bin 13270 -> 0 bytes
 webroot/rsrc/favicons/mstile-150x150.png      | Bin 48875 -> 0 bytes
 webroot/rsrc/favicons/mstile-310x150.png      | Bin 89534 -> 0 bytes
 webroot/rsrc/favicons/mstile-310x310.png      | Bin 178811 -> 0 bytes
 webroot/rsrc/favicons/mstile-70x70.png        | Bin 6505 -> 0 bytes
 33 files changed, 605 insertions(+), 112 deletions(-)
 rename webroot/rsrc/favicons/apple-touch-icon-120x120.png => resources/builtin/favicon/default-120x120.png (100%)
 rename webroot/rsrc/favicons/favicon-128.png => resources/builtin/favicon/default-128x128.png (100%)
 rename webroot/rsrc/favicons/apple-touch-icon-152x152.png => resources/builtin/favicon/default-152x152.png (100%)
 rename webroot/rsrc/favicons/apple-touch-icon-76x76.png => resources/builtin/favicon/default-76x76.png (100%)
 create mode 100644 resources/builtin/favicon/dot-pink-64x64.png
 create mode 100644 resources/builtin/favicon/dot-red-64x64.png
 create mode 100644 src/applications/files/favicon/PhabricatorFaviconRef.php
 create mode 100644 src/applications/files/favicon/PhabricatorFaviconRefQuery.php
 delete mode 100644 src/applications/system/controller/PhabricatorSystemFaviconController.php
 delete mode 100644 webroot/favicon.ico
 delete mode 100644 webroot/rsrc/favicons/apple-touch-icon-114x114.png
 delete mode 100644 webroot/rsrc/favicons/apple-touch-icon-144x144.png
 delete mode 100644 webroot/rsrc/favicons/apple-touch-icon-57x57.png
 delete mode 100644 webroot/rsrc/favicons/apple-touch-icon-60x60.png
 delete mode 100644 webroot/rsrc/favicons/apple-touch-icon-72x72.png
 delete mode 100644 webroot/rsrc/favicons/favicon-196x196.png
 delete mode 100644 webroot/rsrc/favicons/favicon-32x32.png
 delete mode 100644 webroot/rsrc/favicons/favicon-96x96.png
 delete mode 100644 webroot/rsrc/favicons/favicon-mention.ico
 delete mode 100644 webroot/rsrc/favicons/favicon-message.ico
 delete mode 100644 webroot/rsrc/favicons/favicon.ico
 delete mode 100644 webroot/rsrc/favicons/mstile-144x144.png
 delete mode 100644 webroot/rsrc/favicons/mstile-150x150.png
 delete mode 100644 webroot/rsrc/favicons/mstile-310x150.png
 delete mode 100644 webroot/rsrc/favicons/mstile-310x310.png
 delete mode 100644 webroot/rsrc/favicons/mstile-70x70.png

diff --git a/webroot/rsrc/favicons/apple-touch-icon-120x120.png b/resources/builtin/favicon/default-120x120.png
similarity index 100%
rename from webroot/rsrc/favicons/apple-touch-icon-120x120.png
rename to resources/builtin/favicon/default-120x120.png
diff --git a/webroot/rsrc/favicons/favicon-128.png b/resources/builtin/favicon/default-128x128.png
similarity index 100%
rename from webroot/rsrc/favicons/favicon-128.png
rename to resources/builtin/favicon/default-128x128.png
diff --git a/webroot/rsrc/favicons/apple-touch-icon-152x152.png b/resources/builtin/favicon/default-152x152.png
similarity index 100%
rename from webroot/rsrc/favicons/apple-touch-icon-152x152.png
rename to resources/builtin/favicon/default-152x152.png
diff --git a/webroot/rsrc/favicons/apple-touch-icon-76x76.png b/resources/builtin/favicon/default-76x76.png
similarity index 100%
rename from webroot/rsrc/favicons/apple-touch-icon-76x76.png
rename to resources/builtin/favicon/default-76x76.png
diff --git a/resources/builtin/favicon/dot-pink-64x64.png b/resources/builtin/favicon/dot-pink-64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..99595c8e1af04787f7bbd1b21d686af6a6d3b28b
GIT binary patch
literal 1468
zcmV;t1w;CYP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%UP(kjRCwC#TRlu0XBd9Zv2l!T2%?nM
zrPK-%m53@>l2lF=#Z!igBx;AUhA~5xcBnE`9jXpdh7@JUNLF`f6=HSBM1@k+mL;ev
zQjw?}N@*!Y31H)ZiLdYb-JyK<-FIil;mrN;NRMRT&b-fa_x;{;imIv*WP~8#2shz>
z^dSe41IT`48ks_NA`|*CMdTWC8CgKiBj=E_$OR{hQygjnCy`m?Sy0vYKvCKo`W97P
z$8#Uxrzzwla>mUDM3I+}!%$T(KuAgMYo%3n6TkBwe##^7BDdXSz=+O^O=`Lm$ehjt
zH6Vi=1r;uXV&9=wmdmj7$0qDNDnVsw3o0vRc($fp#3P+ih;+vw($fkpZ^fbIcoHJ1
zSdHcZRs5fK@Y6VQy4eOO$Sdk@^<yO*>bE**`}YkfKYR@3UmwHM-`1g8tkgF&B_eS2
zL_5UZ>44Z!2Snd)v-V-PI*&En!jHF^Eln_>7x@YDs<fa=6-qy@Lg}Yf*!uZD6utX$
z<8&ent*2js_`6*YKhp(D#PUWPLw=21bkcw!<Td0+vOg9lSD^UAKTw)pb)@0PGhL84
z_ZlR!-ByQugS?J>=!5~MkY6C*7ym%F_vZb-VB`MZ)LT0|byJ}2{OgcB{|0L&5`2&R
z68X!18bDY6E0cIUbv^$lY~+_<r%-C@46Y>|hqmD!Xdix4>ygYRd|uC;P>%uB=5L6%
z{qDa{;mNm)u>Rd593<L5=!Ih+_Com8qq64kS*<>ymI37LO|iq<Uf6^uxdOKL6<5sX
z6X&|&*hm_peMwoz_^I9KP-`)CMHJ7jyo<!M&KGN;ny5AbS9J{ytp+nR&WmlHZhJS0
zH<*C6iPu`!kZHt#QE`$(9o|8=c{@;TRHLB{YZ^vh)PNB-y%mN!>h0YQs*!3H?%d1z
zTBR-nqU>N{ZcpQUvxmAyKs8dWLRTKr4T#obz$I~2M>9M&$?*uNR;pRRMO|A>1BS)9
zJxy;NpW*HA-T|wbYPZuSGvFlK%;3NlHV)10odnfPwF|~v(08jW4akZ+Ikc+tDonL&
z+Ol>AoE6vew50VasCLp|r;#_Hk8NObpv{bzUC$qASAeyX2IG*(H1^317!-GJX(z|)
zFlo><4$2G|;E$s{Jkx~2gCGs0MZkc}0K>GGHZbem!*h2ts4y)8`eg>B4F)_afnOle
zl9m~eGBkmuE#DX*(UOuG&}lenrR*OA%vw5S1|;|+_8waJ0TL~VdUu3;58i+x{|9<p
z<rhe_6lDgi@kh|JI=?`oWld(lvf-qjR{t1a*0L-!puitNPig%EiI#%QfO*47$CK<S
zt>-&A)IeGU%*zazGu$?*nANj4Pk}T@vIcW917=w!hXXyI_c}}(G>x+|0~Yi^(({vt
zI@t4h@814lra@Q^KL9RyCQgK=_#Y^lLE!|if@+tfOQx(QLWD_{#^ON946njeyQXc@
z&VU&`iuU|V&UCS4hUdg*v`CGyO)zaUb_Njgh9(mUu~-TvGrZII6;`t(Pn5S?3+#bH
zh!cjTQ?{GMQoI7HRgxo`(6!YxfYy#Vmc!#fnH-9xxPI1$HBzm{p^s_Ffh1jOwH(gr
zAw<K3f-*U-zxr6CX#%Hd$<<m8ix{U6BL52tBvB^Et)SXiXo|o1nuhUu_5(yr>j_NW
zNft<=Ope>Yaza>}m>APFOgCZxf#RoQ{4XetMS&zYnXng<k|f2(bPbj`jL97aB@d&r
zhhga#ts~HJd2T=q?h6w<0{hC0h`_!yW!ON10KYaTB9JdmS|O0H&U$C_2m+4(1sDKV
Wij+a)E!r6X0000<MNUMnLSTZqB(b^x

literal 0
HcmV?d00001

diff --git a/resources/builtin/favicon/dot-red-64x64.png b/resources/builtin/favicon/dot-red-64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..e727375be044796d3d9862b68133a43bdf102707
GIT binary patch
literal 1138
zcmV-&1daQNP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$6iGxuRCwC#TQN%`K@^^tgEStOV3$Gy
zffTWbO|A$cqz*Z+OTg;RGL3)3%EnUe8o@2SGkrkR!Yht6!U+Lw(uv-kg#nXy@3|Yu
z?7ZEJYc|R3?t>2^&d$8=+nL#!H*aD9Ai``5BINdF3T<Q&1w<Z^Lu3$X#1dlBD)WH2
zMRXC@h%3Y;qK)YI>0HdGAy7n=5$j?wSQ85i?>yBq82rX(Px03YqJ{V|&jKV69}!j2
z?|%^S_}htk+VB6xI=|zuW5f}nH%|i8Eo@9_=zc>O7G^3y3GrC~d=jyk`-IxTq1?tH
zeThT+3WxYL4)t!={9hWUgbYp%Ih-Q$I8_vI%E)HjTLu_ln_uzQ7sR<|1|)z7kZ=v?
z^?reyU0eX{>;P0M0I3v7JszkmJwwk@9d2g&(6D@ZF&8i7ml3;;4m~~s7zV)RCO|Sd
zK4~XV9aI<9Np(BhuH~Dr0<0noM;8tc0X8;XPudAoH?`qxhUKF#0=!2w*=Enq0JgRO
z;&K1T4?%5EThu0RP0QDb3b4wO9}EEY_5fB^{3mV)wMlK054;GglM-N=?e;e}0NdNs
zCvFG%K)&$9VfnQJ#MlY%=TCrIZT94cAYaHQeqxNhMt}zU=I4q0s0e&dXm}N%q<rUT
zyv;+mcN-4&Il<&m@*=>#q9si_^GbdQ@=>+@mkLlvCHu;!ZWgn>m#>5U6KQg(k1Id|
zainNS-`;sAKLq)z+L6WWzXH_Q72Y%!Ig?y0@hirfoiDe8t4e?MaNBJdv>(?e&PBeG
z&%K^IH)c0jgr}!J@^Zq^=gr$;*w$|*x1w7QC@Ybi<70gzo_60&Ze_O~&{X#Gli1SE
z3go*QPiQ*zfb4SsbJSWbA@1+>?E&OFagYP8YgVLMITt7>(c6;~{R97Y4kpI}CqQ0_
z;hmrBF931qC`Su<PJo<LgaVj%clrxJ9Egi-IZl9#RD`0pK{1s}h7%wy6`{~|P)y~L
z<^))hics7>D5i2*;sjWfiVP1ef?z6_#prmP5#T`{CF$U>RJlBG0^G{;WF|NQs9bJ2
z0px*_%LPXOl}ncsK%Oe|`QQkka=GRNkUy4mM4d|MPo6jw3d+iW6F^=r(fNF-q`v^f
zLCrO|<OFCx=j4pq`nvuC*g2RS+nfL$D<NqlK2#PWnbem&`CcyDx5KAmB=gL^5Rx~~
z#i9_EioODn@5I4{qg{a3b2iqfRjc|6VE5hRCWnZabAbaT<;Bme4?nX>)RdZoan1$g
zP--F}M7>TCRejz(`AR;M?{3^2dO+xp#zKEM8Xb>E2@+9?Oq3)QrO8E!l2NK`lq?;k
z%ZK5@MCh-~M3<(bYje@XN#8F|hw|#ImZ!s^w0{B&0C>N42Gmn6wEzGB07*qoM6N<$
Ef+Z0OUjP6A

literal 0
HcmV?d00001

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 38343475d0..b4806e5500 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -16,7 +16,6 @@
     'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
-    'favicon.ico' => '30672e08',
     'maniphest.pkg.css' => '4845691a',
     'maniphest.pkg.js' => '4d7e79c8',
     'rsrc/audio/basic/alert.mp3' => '98461568',
@@ -270,28 +269,8 @@
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js' => '54f314a0',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js' => 'ab9e0a82',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js' => '6c0e62fa',
-    'rsrc/favicons/apple-touch-icon-114x114.png' => '12a24178',
-    'rsrc/favicons/apple-touch-icon-120x120.png' => '0d1543c7',
-    'rsrc/favicons/apple-touch-icon-144x144.png' => '8043b5a5',
-    'rsrc/favicons/apple-touch-icon-152x152.png' => '65905ecd',
-    'rsrc/favicons/apple-touch-icon-57x57.png' => '2bfc7b0a',
-    'rsrc/favicons/apple-touch-icon-60x60.png' => '8ff52925',
-    'rsrc/favicons/apple-touch-icon-72x72.png' => 'a2bb65d6',
-    'rsrc/favicons/apple-touch-icon-76x76.png' => '2d061a11',
-    'rsrc/favicons/favicon-128.png' => '72f7e812',
     'rsrc/favicons/favicon-16x16.png' => 'fc6275ba',
-    'rsrc/favicons/favicon-196x196.png' => '95db275e',
-    'rsrc/favicons/favicon-32x32.png' => '5bd18b6c',
-    'rsrc/favicons/favicon-96x96.png' => '7242c8e9',
-    'rsrc/favicons/favicon-mention.ico' => '1fdd0fa4',
-    'rsrc/favicons/favicon-message.ico' => '115bc010',
-    'rsrc/favicons/favicon.ico' => 'cdb11121',
     'rsrc/favicons/mask-icon.svg' => 'e132a80f',
-    'rsrc/favicons/mstile-144x144.png' => '310c2ee5',
-    'rsrc/favicons/mstile-150x150.png' => '74bf5133',
-    'rsrc/favicons/mstile-310x150.png' => '4a49d3ee',
-    'rsrc/favicons/mstile-310x310.png' => 'a52ab264',
-    'rsrc/favicons/mstile-70x70.png' => '5edce7b8',
     'rsrc/image/BFCFDA.png' => 'd5ec91f4',
     'rsrc/image/actions/edit.png' => '2fc41442',
     'rsrc/image/avatar.png' => '17d346a4',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 8677f47b6e..7dc658b28a 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2953,6 +2953,8 @@
     'PhabricatorFactObjectDimension' => 'applications/fact/storage/PhabricatorFactObjectDimension.php',
     'PhabricatorFactRaw' => 'applications/fact/storage/PhabricatorFactRaw.php',
     'PhabricatorFactUpdateIterator' => 'applications/fact/extract/PhabricatorFactUpdateIterator.php',
+    'PhabricatorFaviconRef' => 'applications/files/favicon/PhabricatorFaviconRef.php',
+    'PhabricatorFaviconRefQuery' => 'applications/files/favicon/PhabricatorFaviconRefQuery.php',
     'PhabricatorFavoritesApplication' => 'applications/favorites/application/PhabricatorFavoritesApplication.php',
     'PhabricatorFavoritesController' => 'applications/favorites/controller/PhabricatorFavoritesController.php',
     'PhabricatorFavoritesMainMenuBarExtension' => 'applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php',
@@ -4331,7 +4333,6 @@
     'PhabricatorSystemDAO' => 'applications/system/storage/PhabricatorSystemDAO.php',
     'PhabricatorSystemDestructionGarbageCollector' => 'applications/system/garbagecollector/PhabricatorSystemDestructionGarbageCollector.php',
     'PhabricatorSystemDestructionLog' => 'applications/system/storage/PhabricatorSystemDestructionLog.php',
-    'PhabricatorSystemFaviconController' => 'applications/system/controller/PhabricatorSystemFaviconController.php',
     'PhabricatorSystemReadOnlyController' => 'applications/system/controller/PhabricatorSystemReadOnlyController.php',
     'PhabricatorSystemRemoveDestroyWorkflow' => 'applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php',
     'PhabricatorSystemRemoveLogWorkflow' => 'applications/system/management/PhabricatorSystemRemoveLogWorkflow.php',
@@ -8512,6 +8513,8 @@
     'PhabricatorFactObjectDimension' => 'PhabricatorFactDimension',
     'PhabricatorFactRaw' => 'PhabricatorFactDAO',
     'PhabricatorFactUpdateIterator' => 'PhutilBufferedIterator',
+    'PhabricatorFaviconRef' => 'Phobject',
+    'PhabricatorFaviconRefQuery' => 'Phobject',
     'PhabricatorFavoritesApplication' => 'PhabricatorApplication',
     'PhabricatorFavoritesController' => 'PhabricatorController',
     'PhabricatorFavoritesMainMenuBarExtension' => 'PhabricatorMainMenuBarExtension',
@@ -10142,7 +10145,6 @@
     'PhabricatorSystemDAO' => 'PhabricatorLiskDAO',
     'PhabricatorSystemDestructionGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorSystemDestructionLog' => 'PhabricatorSystemDAO',
-    'PhabricatorSystemFaviconController' => 'PhabricatorController',
     'PhabricatorSystemReadOnlyController' => 'PhabricatorController',
     'PhabricatorSystemRemoveDestroyWorkflow' => 'PhabricatorSystemRemoveWorkflow',
     'PhabricatorSystemRemoveLogWorkflow' => 'PhabricatorSystemRemoveWorkflow',
diff --git a/src/applications/config/option/PhabricatorUIConfigOptions.php b/src/applications/config/option/PhabricatorUIConfigOptions.php
index 7b2823f6ba..391ba7e123 100644
--- a/src/applications/config/option/PhabricatorUIConfigOptions.php
+++ b/src/applications/config/option/PhabricatorUIConfigOptions.php
@@ -64,6 +64,10 @@ public function getOptions() {
             "Phabricator logo in the site header.\n\n".
             "  - **Wordmark**: Choose new text to display next to the logo. ".
             "By default, the header displays //Phabricator//.\n\n")),
+      $this->newOption('ui.favicons', 'wild', array())
+        ->setSummary(pht('Customize favicons.'))
+        ->setDescription(pht('Customize favicons.'))
+        ->setLocked(true),
       $this->newOption('ui.footer-items', $footer_type, array())
         ->setSummary(
           pht(
diff --git a/src/applications/files/favicon/PhabricatorFaviconRef.php b/src/applications/files/favicon/PhabricatorFaviconRef.php
new file mode 100644
index 0000000000..d6c2fd80a8
--- /dev/null
+++ b/src/applications/files/favicon/PhabricatorFaviconRef.php
@@ -0,0 +1,447 @@
+<?php
+
+final class PhabricatorFaviconRef extends Phobject {
+
+  private $viewer;
+  private $width;
+  private $height;
+  private $emblems;
+  private $uri;
+  private $cacheKey;
+
+  public function __construct() {
+    $this->emblems = array(null, null, null, null);
+  }
+
+  public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  public function getViewer() {
+    return $this->viewer;
+  }
+
+  public function setWidth($width) {
+    $this->width = $width;
+    return $this;
+  }
+
+  public function getWidth() {
+    return $this->width;
+  }
+
+  public function setHeight($height) {
+    $this->height = $height;
+    return $this;
+  }
+
+  public function getHeight() {
+    return $this->height;
+  }
+
+  public function setEmblems(array $emblems) {
+    if (count($emblems) !== 4) {
+      throw new Exception(
+        pht(
+          'Expected four elements in icon emblem list. To omit an emblem, '.
+          'pass "null".'));
+    }
+
+    $this->emblems = $emblems;
+    return $this;
+  }
+
+  public function getEmblems() {
+    return $this->emblems;
+  }
+
+  public function setURI($uri) {
+    $this->uri = $uri;
+    return $this;
+  }
+
+  public function getURI() {
+    return $this->uri;
+  }
+
+  public function setCacheKey($cache_key) {
+    $this->cacheKey = $cache_key;
+    return $this;
+  }
+
+  public function getCacheKey() {
+    return $this->cacheKey;
+  }
+
+  public function newDigest() {
+    return PhabricatorHash::digestForIndex(serialize($this->toDictionary()));
+  }
+
+  public function toDictionary() {
+    return array(
+      'width' => $this->width,
+      'height' => $this->height,
+      'emblems' => $this->emblems,
+    );
+  }
+
+  public static function newConfigurationDigest() {
+    $all_resources = self::getAllResources();
+
+    // Because we need to access this cache on every page, it's very sticky.
+    // Try to dirty it automatically if any relevant configuration changes.
+    $inputs = array(
+      'resources' => $all_resources,
+      'prod' => PhabricatorEnv::getProductionURI('/'),
+      'cdn' => PhabricatorEnv::getEnvConfig('security.alternate-file-domain'),
+      'havepng' => function_exists('imagepng'),
+    );
+
+    return PhabricatorHash::digestForIndex(serialize($inputs));
+  }
+
+  private static function getAllResources() {
+    $custom_resources = PhabricatorEnv::getEnvConfig('ui.favicons');
+
+    foreach ($custom_resources as $key => $custom_resource) {
+      $custom_resources[$key] = array(
+        'source-type' => 'file',
+        'default' => false,
+      ) + $custom_resource;
+    }
+
+    $builtin_resources = self::getBuiltinResources();
+
+    return array_merge($builtin_resources, $custom_resources);
+  }
+
+  private static function getBuiltinResources() {
+    return array(
+      array(
+        'source-type' => 'builtin',
+        'source' => 'favicon/default-76x76.png',
+        'version' => 1,
+        'width' => 76,
+        'height' => 76,
+        'default' => true,
+      ),
+      array(
+        'source-type' => 'builtin',
+        'source' => 'favicon/default-120x120.png',
+        'version' => 1,
+        'width' => 120,
+        'height' => 120,
+        'default' => true,
+      ),
+      array(
+        'source-type' => 'builtin',
+        'source' => 'favicon/default-128x128.png',
+        'version' => 1,
+        'width' => 128,
+        'height' => 128,
+        'default' => true,
+      ),
+      array(
+        'source-type' => 'builtin',
+        'source' => 'favicon/default-152x152.png',
+        'version' => 1,
+        'width' => 152,
+        'height' => 152,
+        'default' => true,
+      ),
+      array(
+        'source-type' => 'builtin',
+        'source' => 'favicon/dot-pink-64x64.png',
+        'version' => 1,
+        'width' => 64,
+        'height' => 64,
+        'emblem' => 'dot-pink',
+        'default' => true,
+      ),
+      array(
+        'source-type' => 'builtin',
+        'source' => 'favicon/dot-red-64x64.png',
+        'version' => 1,
+        'width' => 64,
+        'height' => 64,
+        'emblem' => 'dot-red',
+        'default' => true,
+      ),
+    );
+  }
+
+  public function newURI() {
+    $dst_w = $this->getWidth();
+    $dst_h = $this->getHeight();
+
+    $template = $this->newTemplateFile(null, $dst_w, $dst_h);
+    $template_file = $template['file'];
+
+    $cache = $this->loadCachedFile($template_file);
+    if ($cache) {
+      return $cache->getViewURI();
+    }
+
+    $data = $this->newCompositedFavicon($template);
+
+    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+
+    $caught = null;
+    try {
+      $favicon_file = $this->newFaviconFile($data);
+
+      $xform = id(new PhabricatorTransformedFile())
+        ->setOriginalPHID($template_file->getPHID())
+        ->setTransformedPHID($favicon_file->getPHID())
+        ->setTransform($this->getCacheKey());
+
+      try {
+        $xform->save();
+      } catch (AphrontDuplicateKeyQueryException $ex) {
+        unset($unguarded);
+
+        $cache = $this->loadCachedFile($template_file);
+        if (!$cache) {
+          throw $ex;
+        }
+
+        id(new PhabricatorDestructionEngine())
+          ->destroyObject($favicon_file);
+
+        return $cache->getViewURI();
+      }
+    } catch (Exception $ex) {
+      $caught = $ex;
+    }
+
+    unset($unguarded);
+
+    if ($caught) {
+      throw $caught;
+    }
+
+    return $favicon_file->getViewURI();
+  }
+
+  private function loadCachedFile(PhabricatorFile $template_file) {
+    $viewer = $this->getViewer();
+
+    $xform = id(new PhabricatorTransformedFile())->loadOneWhere(
+      'originalPHID = %s AND transform = %s',
+      $template_file->getPHID(),
+      $this->getCacheKey());
+    if (!$xform) {
+      return null;
+    }
+
+    return id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($xform->getTransformedPHID()))
+      ->executeOne();
+  }
+
+  private function newCompositedFavicon($template) {
+    $dst_w = $this->getWidth();
+    $dst_h = $this->getHeight();
+    $src_w = $template['width'];
+    $src_h = $template['height'];
+
+    $template_data = $template['file']->loadFileData();
+
+    if (!function_exists('imagecreatefromstring')) {
+      return $template_data;
+    }
+
+    $src = @imagecreatefromstring($template_data);
+    if (!$src) {
+      return $template_data;
+    }
+
+    $dst = imagecreatetruecolor($dst_w, $dst_h);
+    imagesavealpha($dst, true);
+
+    $transparent = imagecolorallocatealpha($dst, 0, 255, 0, 127);
+    imagefill($dst, 0, 0, $transparent);
+
+    imagecopyresampled(
+      $dst,
+      $src,
+      0,
+      0,
+      0,
+      0,
+      $dst_w,
+      $dst_h,
+      $src_w,
+      $src_h);
+
+    // Now, copy any icon emblems on top of the image. These are dots or other
+    // marks used to indicate status information.
+    $emblem_w = (int)floor(min($dst_w, $dst_h) / 2);
+    $emblem_h = $emblem_w;
+    foreach ($this->emblems as $key => $emblem) {
+      if ($emblem === null) {
+        continue;
+      }
+
+      $emblem_template = $this->newTemplateFile(
+        $emblem,
+        $emblem_w,
+        $emblem_h);
+
+      switch ($key) {
+        case 0:
+          $emblem_x = $dst_w - $emblem_w;
+          $emblem_y = 0;
+          break;
+        case 1:
+          $emblem_x = $dst_w - $emblem_w;
+          $emblem_y = $dst_h - $emblem_h;
+          break;
+        case 2:
+          $emblem_x = 0;
+          $emblem_y = $dst_h - $emblem_h;
+          break;
+        case 3:
+          $emblem_x = 0;
+          $emblem_y = 0;
+          break;
+      }
+
+      $emblem_data = $emblem_template['file']->loadFileData();
+
+      $src = @imagecreatefromstring($emblem_data);
+      if (!$src) {
+        continue;
+      }
+
+      imagecopyresampled(
+        $dst,
+        $src,
+        $emblem_x,
+        $emblem_y,
+        0,
+        0,
+        $emblem_w,
+        $emblem_h,
+        $emblem_template['width'],
+        $emblem_template['height']);
+    }
+
+    return PhabricatorImageTransformer::saveImageDataInAnyFormat(
+      $dst,
+      'image/png');
+  }
+
+  private function newTemplateFile($emblem, $width, $height) {
+    $all_resources = self::getAllResources();
+
+    $scores = array();
+    $ratio = $width / $height;
+    foreach ($all_resources as $key => $resource) {
+      // We can't use an emblem resource for a different emblem, nor for an
+      // icon base. We also can't use an icon base as an emblem. That is, if
+      // we're looking for a picture of a red dot, we have to actually find
+      // a red dot, not just any image which happens to have a similar size.
+      if (idx($resource, 'emblem') !== $emblem) {
+        continue;
+      }
+
+      $resource_width = $resource['width'];
+      $resource_height = $resource['height'];
+
+      // Never use a resource with a different aspect ratio.
+      if (($resource_width / $resource_height) !== $ratio) {
+        continue;
+      }
+
+      // Try to use custom resources instead of default resources.
+      if ($resource['default']) {
+        $default_score = 1;
+      } else {
+        $default_score = 0;
+      }
+
+      $width_diff = ($resource_width - $width);
+
+      // If we have to resize an image, we'd rather scale a larger image down
+      // than scale a smaller image up.
+      if ($width_diff < 0) {
+        $scale_score = 1;
+      } else {
+        $scale_score = 0;
+      }
+
+      // Otherwise, we'd rather scale an image a little bit (ideally, zero)
+      // than scale an image a lot.
+      $width_score = abs($width_diff);
+
+      $scores[$key] = id(new PhutilSortVector())
+        ->addInt($default_score)
+        ->addInt($scale_score)
+        ->addInt($width_score);
+    }
+
+    if (!$scores) {
+      if ($emblem === null) {
+        throw new Exception(
+          pht(
+            'Found no background template resource for dimensions %dx%d.',
+            $width,
+            $height));
+      } else {
+        throw new Exception(
+          pht(
+            'Found no template resource (for emblem "%s") with dimensions '.
+            '%dx%d.',
+            $emblem,
+            $width,
+            $height));
+      }
+    }
+
+    $scores = msortv($scores, 'getSelf');
+    $best_score = head_key($scores);
+
+    $viewer = $this->getViewer();
+
+    $resource = $all_resources[$best_score];
+    if ($resource['source-type'] === 'builtin') {
+      $file = PhabricatorFile::loadBuiltin($viewer, $resource['source']);
+      if (!$file) {
+        throw new Exception(
+          pht(
+            'Failed to load favicon template builtin "%s".',
+            $resource['source']));
+      }
+    } else {
+      $file = id(new PhabricatorFileQuery())
+        ->setViewer($viewer)
+        ->withPHIDs(array($resource['source']))
+        ->executeOne();
+      if (!$file) {
+        throw new Exception(
+          pht(
+            'Failed to load favicon template with PHID "%s".',
+            $resource['source']));
+      }
+    }
+
+    return array(
+      'width' => $resource['width'],
+      'height' => $resource['height'],
+      'file' => $file,
+    );
+  }
+
+  private function newFaviconFile($data) {
+    return PhabricatorFile::newFromFileData(
+      $data,
+      array(
+        'name' => 'favicon',
+        'canCDN' => true,
+      ));
+  }
+
+}
diff --git a/src/applications/files/favicon/PhabricatorFaviconRefQuery.php b/src/applications/files/favicon/PhabricatorFaviconRefQuery.php
new file mode 100644
index 0000000000..f4e5556150
--- /dev/null
+++ b/src/applications/files/favicon/PhabricatorFaviconRefQuery.php
@@ -0,0 +1,55 @@
+<?php
+
+final class PhabricatorFaviconRefQuery extends Phobject {
+
+  private $refs;
+
+  public function withRefs(array $refs) {
+    assert_instances_of($refs, 'PhabricatorFaviconRef');
+    $this->refs = $refs;
+    return $this;
+  }
+
+  public function execute() {
+    $viewer = PhabricatorUser::getOmnipotentUser();
+
+    $refs = $this->refs;
+
+    $config_digest = PhabricatorFaviconRef::newConfigurationDigest();
+
+    $ref_map = array();
+    foreach ($refs as $ref) {
+      $ref_digest = $ref->newDigest();
+      $ref_key = "favicon({$config_digest},{$ref_digest},8)";
+
+      $ref
+        ->setViewer($viewer)
+        ->setCacheKey($ref_key);
+
+      $ref_map[$ref_key] = $ref;
+    }
+
+    $cache = PhabricatorCaches::getImmutableCache();
+    $ref_hits = $cache->getKeys(array_keys($ref_map));
+
+    foreach ($ref_hits as $ref_key => $ref_uri) {
+      $ref_map[$ref_key]->setURI($ref_uri);
+      unset($ref_map[$ref_key]);
+    }
+
+    if ($ref_map) {
+      $new_map = array();
+      foreach ($ref_map as $ref_key => $ref) {
+        $ref_uri = $ref->newURI();
+        $ref->setURI($ref_uri);
+        $new_map[$ref_key] = $ref_uri;
+      }
+
+      $cache->setKeys($new_map);
+    }
+
+    return $refs;
+  }
+
+
+}
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index 29fb606a4b..60b4ca0e74 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -1152,7 +1152,6 @@ public static function loadBuiltins(PhabricatorUser $user, array $builtins) {
 
       $params = array(
         'name' => $builtin->getBuiltinDisplayName(),
-        'ttl.relative' => phutil_units('7 days in seconds'),
         'canCDN' => true,
         'builtin' => $key,
       );
@@ -1648,7 +1647,7 @@ public function getFieldSpecificationsForConduit() {
   public function getFieldValuesForConduit() {
     return array(
       'name' => $this->getName(),
-      'dataURI' => $this->getCDNURI(),
+      'dataURI' => $this->getCDNURI('data'),
       'size' => (int)$this->getByteSize(),
     );
   }
diff --git a/src/applications/system/application/PhabricatorSystemApplication.php b/src/applications/system/application/PhabricatorSystemApplication.php
index 7ce2b4dbe0..0ec8f6a7a4 100644
--- a/src/applications/system/application/PhabricatorSystemApplication.php
+++ b/src/applications/system/application/PhabricatorSystemApplication.php
@@ -26,7 +26,6 @@ public function getRoutes() {
       '/readonly/' => array(
         '(?P<reason>[^/]+)/' => 'PhabricatorSystemReadOnlyController',
       ),
-      '/favicon.ico' => 'PhabricatorSystemFaviconController',
     );
   }
 
diff --git a/src/applications/system/controller/PhabricatorSystemFaviconController.php b/src/applications/system/controller/PhabricatorSystemFaviconController.php
deleted file mode 100644
index d9a31cbcb6..0000000000
--- a/src/applications/system/controller/PhabricatorSystemFaviconController.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-final class PhabricatorSystemFaviconController extends PhabricatorController {
-
-  public function shouldRequireLogin() {
-    return false;
-  }
-
-  public function processRequest() {
-    $webroot = dirname(phutil_get_library_root('phabricator')).'/webroot/';
-    $content = Filesystem::readFile($webroot.'/rsrc/favicons/favicon.ico');
-
-    return id(new AphrontFileResponse())
-      ->setContent($content)
-      ->setMimeType('image/x-icon')
-      ->setCacheDurationInSeconds(phutil_units('24 hours in seconds'))
-      ->setCanCDN(true);
-  }
-}
diff --git a/src/view/page/PhabricatorBarePageView.php b/src/view/page/PhabricatorBarePageView.php
index afdc482170..de421d9e70 100644
--- a/src/view/page/PhabricatorBarePageView.php
+++ b/src/view/page/PhabricatorBarePageView.php
@@ -71,56 +71,24 @@ protected function getHead() {
         ));
     }
 
-    $mask_icon = phutil_tag(
-      'link',
-      array(
-        'rel' => 'mask-icon',
-        'color' => '#3D4B67',
-        'href' => celerity_get_resource_uri(
-          '/rsrc/favicons/mask-icon.svg'),
-      ));
-
-    $icon_tag_76 = phutil_tag(
-      'link',
-      array(
-        'rel' => 'apple-touch-icon',
-        'href' => celerity_get_resource_uri(
-          '/rsrc/favicons/apple-touch-icon-76x76.png'),
-      ));
-
-    $icon_tag_120 = phutil_tag(
-      'link',
+    $referrer_tag = phutil_tag(
+      'meta',
       array(
-        'rel' => 'apple-touch-icon',
-        'sizes' => '120x120',
-        'href' => celerity_get_resource_uri(
-          '/rsrc/favicons/apple-touch-icon-120x120.png'),
+        'name' => 'referrer',
+        'content' => 'no-referrer',
       ));
 
-    $icon_tag_152 = phutil_tag(
-      'link',
-      array(
-        'rel' => 'apple-touch-icon',
-        'sizes' => '152x152',
-        'href' => celerity_get_resource_uri(
-          '/rsrc/favicons/apple-touch-icon-152x152.png'),
-      ));
 
-    $favicon_tag = phutil_tag(
+    $mask_icon = phutil_tag(
       'link',
       array(
-        'id' => 'favicon',
-        'rel' => 'shortcut icon',
+        'rel' => 'mask-icon',
+        'color' => '#3D4B67',
         'href' => celerity_get_resource_uri(
-          '/rsrc/favicons/favicon.ico'),
+          '/rsrc/favicons/mask-icon.svg'),
       ));
 
-    $referrer_tag = phutil_tag(
-      'meta',
-      array(
-        'name' => 'referrer',
-        'content' => 'no-referrer',
-      ));
+    $favicon_links = $this->newFavicons();
 
     $response = CelerityAPI::getStaticResourceResponse();
 
@@ -136,13 +104,10 @@ protected function getHead() {
     }
 
     return hsprintf(
-      '%s%s%s%s%s%s%s%s',
+      '%s%s%s%s%s',
       $viewport_tag,
       $mask_icon,
-      $icon_tag_76,
-      $icon_tag_120,
-      $icon_tag_152,
-      $favicon_tag,
+      $favicon_links,
       $referrer_tag,
       $response->renderResourcesOfType('css'));
   }
@@ -156,4 +121,61 @@ protected function getTail() {
     return $response->renderResourcesOfType('js');
   }
 
+  private function newFavicons() {
+    $favicon_refs = array(
+      array(
+        'rel' => 'apple-touch-icon',
+        'sizes' => '76x76',
+        'width' => 76,
+        'height' => 76,
+      ),
+      array(
+        'rel' => 'apple-touch-icon',
+        'sizes' => '120x120',
+        'width' => 120,
+        'height' => 120,
+      ),
+      array(
+        'rel' => 'apple-touch-icon',
+        'sizes' => '152x152',
+        'width' => 152,
+        'height' => 152,
+      ),
+      array(
+        'rel' => 'icon',
+        'id' => 'favicon',
+        'width' => 64,
+        'height' => 64,
+      ),
+    );
+
+    $fetch_refs = array();
+    foreach ($favicon_refs as $key => $spec) {
+      $ref = id(new PhabricatorFaviconRef())
+        ->setWidth($spec['width'])
+        ->setHeight($spec['height']);
+
+      $favicon_refs[$key]['ref'] = $ref;
+      $fetch_refs[] = $ref;
+    }
+
+    id(new PhabricatorFaviconRefQuery())
+      ->withRefs($fetch_refs)
+      ->execute();
+
+    $favicon_links = array();
+    foreach ($favicon_refs as $spec) {
+      $favicon_links[] = phutil_tag(
+        'link',
+        array(
+          'rel' => $spec['rel'],
+          'sizes' => idx($spec, 'sizes'),
+          'id' => idx($spec, 'id'),
+          'href' => $spec['ref']->getURI(),
+        ));
+    }
+
+    return $favicon_links;
+  }
+
 }
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index ad9510f348..583952b0a9 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -23,15 +23,29 @@ public function getController() {
     return $this->controller;
   }
 
-  private function getFaviconURI($type = null) {
-    switch ($type) {
-      case 'message':
-        return celerity_get_resource_uri('/rsrc/favicons/favicon-message.ico');
-      case 'mention':
-        return celerity_get_resource_uri('/rsrc/favicons/favicon-mention.ico');
-      default:
-        return celerity_get_resource_uri('/rsrc/favicons/favicon.ico');
-    }
+  private static function getFavicons() {
+    $refs = array();
+
+    $refs['favicon'] = id(new PhabricatorFaviconRef())
+      ->setWidth(64)
+      ->setHeight(64);
+
+    $refs['message_favicon'] = id(new PhabricatorFaviconRef())
+      ->setWidth(64)
+      ->setHeight(64)
+      ->setEmblems(
+        array(
+          'dot-pink',
+          null,
+          null,
+          null,
+        ));
+
+    id(new PhabricatorFaviconRefQuery())
+      ->withRefs($refs)
+      ->execute();
+
+    return mpull($refs, 'getURI');
   }
 
   public function render() {
@@ -428,10 +442,7 @@ private function renderNotificationMenu() {
           'countType'   => $conpherence_data['countType'],
           'countNumber' => $message_count_number,
           'unreadClass' => 'message-unread',
-          'favicon'     => $this->getFaviconURI('default'),
-          'message_favicon' => $this->getFaviconURI('message'),
-          'mention_favicon' => $this->getFaviconURI('mention'),
-        ));
+        ) + self::getFavicons());
 
       $message_notification_dropdown = javelin_tag(
         'div',
@@ -509,10 +520,7 @@ private function renderNotificationMenu() {
           'countType'   => $notification_data['countType'],
           'countNumber' => $count_number,
           'unreadClass' => 'alert-unread',
-          'favicon'     => $this->getFaviconURI('default'),
-          'message_favicon' => $this->getFaviconURI('message'),
-          'mention_favicon' => $this->getFaviconURI('mention'),
-        ));
+        ) + self::getFavicons());
 
       $notification_dropdown = javelin_tag(
         'div',
@@ -594,10 +602,7 @@ private function renderNotificationMenu() {
             'countType'   => null,
             'countNumber' => null,
             'unreadClass' => 'setup-unread',
-            'favicon'     => $this->getFaviconURI('default'),
-            'message_favicon' => $this->getFaviconURI('message'),
-            'mention_favicon' => $this->getFaviconURI('mention'),
-          ));
+          ) + self::getFavicons());
 
         $setup_notification_dropdown = javelin_tag(
           'div',
diff --git a/webroot/favicon.ico b/webroot/favicon.ico
deleted file mode 100644
index f07770aa8af41bf586735e246c954f2fddbf57ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34494
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
HY`y;<ZZL))

diff --git a/webroot/rsrc/favicons/apple-touch-icon-114x114.png b/webroot/rsrc/favicons/apple-touch-icon-114x114.png
deleted file mode 100644
index cb4d8cd937a0bf284acaa1aa54512f5a3e19e527..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10773
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

diff --git a/webroot/rsrc/favicons/apple-touch-icon-144x144.png b/webroot/rsrc/favicons/apple-touch-icon-144x144.png
deleted file mode 100644
index 92f2114b205565d9029e10ede56cdf23827ee1e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13270
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
bFYpXZa^goDzqnxc>i`sG)nqEAOuzjf>K7hx

diff --git a/webroot/rsrc/favicons/apple-touch-icon-57x57.png b/webroot/rsrc/favicons/apple-touch-icon-57x57.png
deleted file mode 100644
index 55df0a48e555448b1f3fe3a7dc055c0c0fddbea2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3806
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
U)wrs+{{R3007*qoM6N<$f|-7T<NyEw

diff --git a/webroot/rsrc/favicons/apple-touch-icon-60x60.png b/webroot/rsrc/favicons/apple-touch-icon-60x60.png
deleted file mode 100644
index 97dfdbc36e7781140a41c3016719d3a22f0c2c5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3834
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

diff --git a/webroot/rsrc/favicons/apple-touch-icon-72x72.png b/webroot/rsrc/favicons/apple-touch-icon-72x72.png
deleted file mode 100644
index cb1f066ad0ccb22991440241ea43855dfc9dfeeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4929
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

diff --git a/webroot/rsrc/favicons/favicon-196x196.png b/webroot/rsrc/favicons/favicon-196x196.png
deleted file mode 100644
index bf30eb1cf82a8f81e1547ad2f9871940ab2cbdda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26744
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
G>;C{DbN2NB

diff --git a/webroot/rsrc/favicons/favicon-32x32.png b/webroot/rsrc/favicons/favicon-32x32.png
deleted file mode 100644
index c6f2a75566f7888970319499a8bc714b02733096..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1421
zcmV;81#<d{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000G4Nkl<ZScT13
zeN0nV6#w=0we&+6LsR)`U==D8aYd<EDHF%4DJ)SooQ{ccqKnHk`!F#hFpb*~<6;)4
zS#*x<gTz53f`$(TQ6?W9unCHE3gU_tTa6#YN-eZ~-5)~N*Vn!^W{dm%_3k<MoZor(
zo_p@O90Z7mma$M>cYjt--(cpo>o*nVJNIM9thP`95Q_w(;gT>zoGiLGIVrwbrA(|3
z2^NnA;+OMJ6AVVP{Ag8EVM}}O8oS*g2*fFmN7^#d6cu^7n$lQl_`p*IV0~;8m6g|(
z)HJkhp(u(BgxDJdK{!@w)dvgmvx`JRfi>U&hK*+Vr=?}p#*sU7o`%>P(kO}k^TL9h
z7$2*_2;j=V@ciw&4mDXGS;PJf@+kyQ6W!mtbF(Hv9&^D{PIwN6jb^z&@)^^g!@AYW
z@!kIIn3p(<L9lk!GL#f=f-*S)93Sgyd1MXSzUxrau+c2{l)I-|AKOHmx9#ipx9nf;
zdJhX;nhgN3jZdJs<OnWY8Uz5my-I@(d0F60GVlAQ5_OF_pDQ7alIRcZ+oqh#33qap
zmDiQ9?YYbK_qQO3k1vWg;q=)qh=f6SbxDew900^Z|A)mma%WCid0h#BkATT7Fc{79
znufM5eysqEPfXCpf*?LtXw}eUC~4#XKyYb0%Ro&-+ZMy*RuBMiw5q9)?WhR_d_+j5
zvpV%ebi@o+Jw;LE(W<6G0N^~djD_aDv%}<BWFlrx$GX+aK@c1`DHmqNMj~Do9dH0H
zmkSMNI$^qf4+O!%gx!H-Ct5&JlzR@3N7|~s|15&kb@yj^SGW~gHI~1!FknJ&a5x-f
zX%^9Bw@i1@`s*e4*lu?Sblv?~WKZ8<Cfyj&WTdbXP%amAU6*l5e;q;rA4?W1@Ip)k
zt4&UJIxPSI=;<5G<i^fU-T7eDLbJA5tWYTv8Oa3z4u=yv_LSkL%G1zaHQ-|Z5NaDc
z@O)?pX2(f=lDk|k9Iri(KL&;w3T~uqL8;yD5PHh5{W*dW(_Ji9&ILixGrGF26~}AO
zd-(ynd#*r}k%Hi9A_n=9@>(1_agGt##DqPFn7UHE(R}`Qw6ymy<Q-j?eg37>=|p$W
z6^8tmj$Tw8Z}w?3X0?T~9#}yTpG_SQY~yxTJs}ned^QgGZ!SYxY7#@fNSWx<5y|CZ
zVR8aPp84{8ELA7_v=NI0qeQqQ%;2q9^Li%Mzoqq=ggIGiq%L@o{ucxXTi<;H;WL@V
zibs+t`ZyoUmMR&#a7mbfjFUz84jFFE_f)7-e4hXSAW0G>MVrvxc^Q5BAqa&*SdylI
zEGE+D{3iht*tqsJG@k3G$>U_vy<~DyeDmqET^l?V)%C4Nnj>R%n68?Kbk#h+bG*@b
zu8Sc{PKs|PRm#MA9*?wnR>M}^MI8R&BuE|?F3N?-h#AmkrutnKU${DW1J`euKoA^I
zP6{Vab<p%Y9%)l46YI&4VDaegugWW$T7FwUrF1$eRMwoO8E^?A;PN~;bQ2#IAHX=v
z3CKuORD=YJM+pGP%hi+;1mR$FI%2vT5IF#tZr@`iCkVokm#ZlSCa>dIY52fOt@<FF
zQ_q_Wcv9g`HFu(>z76B!^j?9_=dlL3QmZ~V)vmh>Q9*uoku*x8_h&R_eM}=i{NqXN
zJ@7NW{<aFmyUS=nu%(JLN}?~w&n|M$^;8ZU&GN0E?AQ5fN;w=LMUjA<>~vi0A3|j{
zJx3IC<M95*9JI9e;?$W=+<WklK^{C!bpODf4^*D*`7>|J|9=mYDLm7snJ1pv<J24f
b)${x>^k+uQ!MIP)00000NkvXXu0mjfiE^8=

diff --git a/webroot/rsrc/favicons/favicon-96x96.png b/webroot/rsrc/favicons/favicon-96x96.png
deleted file mode 100644
index 5f0522be65a4b554c4673f71b1bdfc6eec3bca14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6371
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

diff --git a/webroot/rsrc/favicons/favicon-mention.ico b/webroot/rsrc/favicons/favicon-mention.ico
deleted file mode 100644
index 6e27ce83392d0bb27aed3afd9506b298a7a596fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34494
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
Y<DUgFf(p};uCFWd4pu1Yy}Y*iUuS`=d;kCd

diff --git a/webroot/rsrc/favicons/favicon-message.ico b/webroot/rsrc/favicons/favicon-message.ico
deleted file mode 100644
index 07408f3182f06f2f096283b855af0102d835468e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34494
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

diff --git a/webroot/rsrc/favicons/favicon.ico b/webroot/rsrc/favicons/favicon.ico
deleted file mode 100644
index f07770aa8af41bf586735e246c954f2fddbf57ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34494
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
HY`y;<ZZL))

diff --git a/webroot/rsrc/favicons/mstile-144x144.png b/webroot/rsrc/favicons/mstile-144x144.png
deleted file mode 100644
index 92f2114b205565d9029e10ede56cdf23827ee1e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13270
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
bFYpXZa^goDzqnxc>i`sG)nqEAOuzjf>K7hx

diff --git a/webroot/rsrc/favicons/mstile-150x150.png b/webroot/rsrc/favicons/mstile-150x150.png
deleted file mode 100644
index df1804953a5b5f5dd16710687a15f33b07d57ac3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 48875
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
U1zrWmBEUcLGAhzFpG`yl507)iHUIzs

diff --git a/webroot/rsrc/favicons/mstile-310x150.png b/webroot/rsrc/favicons/mstile-310x150.png
deleted file mode 100644
index 56c3ed1985508436594e0fd05cbb1e6f50985b1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89534
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
ULK_BGTL1t607*qoM6N<$f{fD4oB#j-

diff --git a/webroot/rsrc/favicons/mstile-310x310.png b/webroot/rsrc/favicons/mstile-310x310.png
deleted file mode 100644
index ef911d803d571e4ce8771a7ae70304c2a2abc41a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178811
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

diff --git a/webroot/rsrc/favicons/mstile-70x70.png b/webroot/rsrc/favicons/mstile-70x70.png
deleted file mode 100644
index 3b51e6052b524df55cb73db342db9e4507f5a1c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6505
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
R;1>!=Szbe~Qr0~9{{ZQ3<*@(&


From df8d4dff679b21573ac89adf6b7766f97ec4decb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Mar 2018 16:01:46 -0700
Subject: [PATCH 701/865] Raise a warning when mentioning a user in a comment
 on a draft revision

Summary: See PHI433. Ref T13102. Users in the wild have mixed expecations about exactly what "draft" means. Recent changes have tried to make behavior more clear. As part of clarifying messaging, make it explicit that `@mention` does not work on drafts by showing users a warning when they try to `@mention` a user.

Test Plan:
  - Mentioned users on drafts, got a warning.
  - Posted normal comments on drafts, no warning.
  - Posted normal/mention comments on non-drafts, no warning.

Maniphest Tasks: T13102

Differential Revision: https://secure.phabricator.com/D19210
---
 src/__phutil_library_map__.php                |  4 ++
 .../editengine/PhabricatorEditEngine.php      |  5 ++
 ...habricatorApplicationTransactionEditor.php | 47 +++++++++++++++
 ...ApplicationTransactionWarningException.php | 13 +++++
 ...rApplicationTransactionWarningResponse.php | 58 +++++++++++++++++++
 5 files changed, 127 insertions(+)
 create mode 100644 src/applications/transactions/exception/PhabricatorApplicationTransactionWarningException.php
 create mode 100644 src/applications/transactions/response/PhabricatorApplicationTransactionWarningResponse.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7dc658b28a..4caa7f563d 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2055,6 +2055,8 @@
     'PhabricatorApplicationTransactionValidationResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionValidationResponse.php',
     'PhabricatorApplicationTransactionValueController' => 'applications/transactions/controller/PhabricatorApplicationTransactionValueController.php',
     'PhabricatorApplicationTransactionView' => 'applications/transactions/view/PhabricatorApplicationTransactionView.php',
+    'PhabricatorApplicationTransactionWarningException' => 'applications/transactions/exception/PhabricatorApplicationTransactionWarningException.php',
+    'PhabricatorApplicationTransactionWarningResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionWarningResponse.php',
     'PhabricatorApplicationUninstallController' => 'applications/meta/controller/PhabricatorApplicationUninstallController.php',
     'PhabricatorApplicationsApplication' => 'applications/meta/application/PhabricatorApplicationsApplication.php',
     'PhabricatorApplicationsController' => 'applications/meta/controller/PhabricatorApplicationsController.php',
@@ -7484,6 +7486,8 @@
     'PhabricatorApplicationTransactionValidationResponse' => 'AphrontProxyResponse',
     'PhabricatorApplicationTransactionValueController' => 'PhabricatorApplicationTransactionController',
     'PhabricatorApplicationTransactionView' => 'AphrontView',
+    'PhabricatorApplicationTransactionWarningException' => 'Exception',
+    'PhabricatorApplicationTransactionWarningResponse' => 'AphrontProxyResponse',
     'PhabricatorApplicationUninstallController' => 'PhabricatorApplicationsController',
     'PhabricatorApplicationsApplication' => 'PhabricatorApplication',
     'PhabricatorApplicationsController' => 'PhabricatorController',
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index de8139b145..f0d2aae9ea 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1968,6 +1968,7 @@ private function buildCommentResponse($object) {
       ->setContinueOnNoEffect($request->isContinueRequest())
       ->setContinueOnMissingFields(true)
       ->setContentSourceFromRequest($request)
+      ->setRaiseWarnings(!$request->getBool('editEngine.warnings'))
       ->setIsPreview($is_preview);
 
     try {
@@ -1980,6 +1981,10 @@ private function buildCommentResponse($object) {
       return id(new PhabricatorApplicationTransactionNoEffectResponse())
         ->setCancelURI($view_uri)
         ->setException($ex);
+    } catch (PhabricatorApplicationTransactionWarningException $ex) {
+      return id(new PhabricatorApplicationTransactionWarningResponse())
+        ->setCancelURI($view_uri)
+        ->setException($ex);
     }
 
     if (!$is_preview) {
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 1d02d0fdb0..26be0f87af 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -48,6 +48,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $mentionedPHIDs;
   private $continueOnNoEffect;
   private $continueOnMissingFields;
+  private $raiseWarnings;
   private $parentMessageID;
   private $heraldAdapter;
   private $heraldTranscript;
@@ -273,6 +274,15 @@ public function getApplicationEmail() {
     return $this->applicationEmail;
   }
 
+  public function setRaiseWarnings($raise_warnings) {
+    $this->raiseWarnings = $raise_warnings;
+    return $this;
+  }
+
+  public function getRaiseWarnings() {
+    return $this->raiseWarnings;
+  }
+
   public function getTransactionTypesForObject($object) {
     $old = $this->object;
     try {
@@ -919,6 +929,19 @@ final public function applyTransactions(
         throw new PhabricatorApplicationTransactionValidationException($errors);
       }
 
+      if ($this->raiseWarnings) {
+        $warnings = array();
+        foreach ($xactions as $xaction) {
+          if ($this->hasWarnings($object, $xaction)) {
+            $warnings[] = $xaction;
+          }
+        }
+        if ($warnings) {
+          throw new PhabricatorApplicationTransactionWarningException(
+            $warnings);
+        }
+      }
+
       $this->willApplyTransactions($object, $xactions);
 
       if ($object->getID()) {
@@ -4277,4 +4300,28 @@ private function queueWebhooks($object, array $xactions) {
     }
   }
 
+  private function hasWarnings($object, $xaction) {
+    // TODO: For the moment, this is a very un-modular hack to support
+    // exactly one type of warning (mentioning users on a draft revision)
+    // that we want to show. See PHI433.
+
+    if (!($object instanceof DifferentialRevision)) {
+      return false;
+    }
+
+    if (!$object->isDraft()) {
+      return false;
+    }
+
+    $type = $xaction->getTransactionType();
+    if ($type != PhabricatorTransactions::TYPE_SUBSCRIBERS) {
+      return false;
+    }
+
+    // NOTE: This will currently warn even if you're only removing
+    // subscribers.
+
+    return true;
+  }
+
 }
diff --git a/src/applications/transactions/exception/PhabricatorApplicationTransactionWarningException.php b/src/applications/transactions/exception/PhabricatorApplicationTransactionWarningException.php
new file mode 100644
index 0000000000..e577071549
--- /dev/null
+++ b/src/applications/transactions/exception/PhabricatorApplicationTransactionWarningException.php
@@ -0,0 +1,13 @@
+<?php
+
+final class PhabricatorApplicationTransactionWarningException
+  extends Exception {
+
+  private $xactions;
+
+  public function __construct(array $xactions) {
+    $this->xactions = $xactions;
+    parent::__construct();
+  }
+
+}
diff --git a/src/applications/transactions/response/PhabricatorApplicationTransactionWarningResponse.php b/src/applications/transactions/response/PhabricatorApplicationTransactionWarningResponse.php
new file mode 100644
index 0000000000..21b3ee61c8
--- /dev/null
+++ b/src/applications/transactions/response/PhabricatorApplicationTransactionWarningResponse.php
@@ -0,0 +1,58 @@
+<?php
+
+final class PhabricatorApplicationTransactionWarningResponse
+  extends AphrontProxyResponse {
+
+  private $viewer;
+  private $exception;
+  private $cancelURI;
+
+  public function setCancelURI($cancel_uri) {
+    $this->cancelURI = $cancel_uri;
+    return $this;
+  }
+
+  public function setException(
+    PhabricatorApplicationTransactionWarningException $exception) {
+    $this->exception = $exception;
+    return $this;
+  }
+
+  protected function buildProxy() {
+    return new AphrontDialogResponse();
+  }
+
+  public function reduceProxyResponse() {
+    $request = $this->getRequest();
+
+    $title = pht('Warning: Unexpected Effects');
+
+    $head = pht(
+      'This is a draft revision that will not publish any notifications '.
+      'until the author requests review.');
+    $tail = pht(
+      'Mentioned or subscribed users will not be notified.');
+
+    $continue = pht('Tell No One');
+
+    $dialog = id(new AphrontDialogView())
+      ->setViewer($request->getViewer())
+      ->setTitle($title);
+
+    $dialog->appendParagraph($head);
+    $dialog->appendParagraph($tail);
+
+    $passthrough = $request->getPassthroughRequestParameters();
+    foreach ($passthrough as $key => $value) {
+      $dialog->addHiddenInput($key, $value);
+    }
+
+    $dialog
+      ->addHiddenInput('editEngine.warnings', 1)
+      ->addSubmitButton($continue)
+      ->addCancelButton($this->cancelURI);
+
+    return $this->getProxy()->setDialog($dialog);
+  }
+
+}

From 1e93b49b1bf23b8d63bc984b6c1d0ab37c1d3c20 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 12 Mar 2018 16:39:29 -0700
Subject: [PATCH 702/865] Allow custom actions in Differential to explicitly
 override "accept" stickiness

Summary:
See PHI431. Ref T13102. An install is interested in a custom "non-sticky" accept action, roughly.

On the one hand, this is a pretty hacky patch. However, I suspect it inches us closer to T731, and I'm generally comfortable with exploring the realms of "Accept Next Update", "Unblock Without Accepting", etc., as long as most of it doesn't end up enabled by default in the upstream.

Test Plan:
  - Accepted and updated revisions normally, saw accepts respect global stickiness.
  - Modified the "Accept" action to explicitly be unsticky, saw nonsticky accept behavior after update.

Maniphest Tasks: T13102

Differential Revision: https://secure.phabricator.com/D19211
---
 .../20180312.reviewers.01.options.sql         |  2 +
 .../20180312.reviewers.02.optionsdefault.sql  |  2 +
 .../editor/DifferentialTransactionEditor.php  | 52 ++++++-------------
 .../storage/DifferentialReviewer.php          | 13 +++++
 .../DifferentialRevisionReviewTransaction.php | 11 +++-
 .../DifferentialRevisionVoidTransaction.php   | 46 +++++++++++-----
 6 files changed, 78 insertions(+), 48 deletions(-)
 create mode 100644 resources/sql/autopatches/20180312.reviewers.01.options.sql
 create mode 100644 resources/sql/autopatches/20180312.reviewers.02.optionsdefault.sql

diff --git a/resources/sql/autopatches/20180312.reviewers.01.options.sql b/resources/sql/autopatches/20180312.reviewers.01.options.sql
new file mode 100644
index 0000000000..159426614d
--- /dev/null
+++ b/resources/sql/autopatches/20180312.reviewers.01.options.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_differential.differential_reviewer
+  ADD options LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180312.reviewers.02.optionsdefault.sql b/resources/sql/autopatches/20180312.reviewers.02.optionsdefault.sql
new file mode 100644
index 0000000000..d509011f73
--- /dev/null
+++ b/resources/sql/autopatches/20180312.reviewers.02.optionsdefault.sql
@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_differential.differential_reviewer
+  SET options = '{}' WHERE options = '';
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index d04b0d684a..9882246608 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -154,59 +154,41 @@ protected function expandTransaction(
 
     $edge_ref_task = DifferentialRevisionHasTaskEdgeType::EDGECONST;
 
-    $is_sticky_accept = PhabricatorEnv::getEnvConfig(
-      'differential.sticky-accept');
-
-    $downgrade_rejects = false;
-    $downgrade_accepts = false;
+    $want_downgrade = array();
+    $must_downgrade = array();
     if ($this->getIsCloseByCommit()) {
       // Never downgrade reviewers when we're closing a revision after a
       // commit.
     } else {
       switch ($xaction->getTransactionType()) {
         case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
-          $downgrade_rejects = true;
-          if (!$is_sticky_accept) {
-            // If "sticky accept" is disabled, also downgrade the accepts.
-            $downgrade_accepts = true;
-          }
+          $want_downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
+          $want_downgrade[] = DifferentialReviewerStatus::STATUS_REJECTED;
           break;
         case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
-          $downgrade_rejects = true;
-          if ((!$is_sticky_accept) ||
-              (!$object->isChangePlanned())) {
-            // If the old state isn't "changes planned", downgrade the accepts.
-            // This exception allows an accepted revision to go through
-            // "Plan Changes" -> "Request Review" and return to "accepted" if
-            // the author didn't update the revision, essentially undoing the
-            // "Plan Changes".
-            $downgrade_accepts = true;
+          if (!$object->isChangePlanned()) {
+            // If the old state isn't "Changes Planned", downgrade the accepts
+            // even if they're sticky.
+
+            // We don't downgrade for "Changes Planned" to allow an author to
+            // undo a "Plan Changes" by immediately following it up with a
+            // "Request Review".
+            $want_downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
+            $must_downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
           }
+          $want_downgrade[] = DifferentialReviewerStatus::STATUS_REJECTED;
           break;
       }
     }
 
-    $new_accept = DifferentialReviewerStatus::STATUS_ACCEPTED;
-    $new_reject = DifferentialReviewerStatus::STATUS_REJECTED;
-    $old_accept = DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER;
-    $old_reject = DifferentialReviewerStatus::STATUS_REJECTED_OLDER;
-
-    $downgrade = array();
-    if ($downgrade_accepts) {
-      $downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
-    }
-
-    if ($downgrade_rejects) {
-      $downgrade[] = DifferentialReviewerStatus::STATUS_REJECTED;
-    }
-
-    if ($downgrade) {
+    if ($want_downgrade) {
       $void_type = DifferentialRevisionVoidTransaction::TRANSACTIONTYPE;
 
       $results[] = id(new DifferentialTransaction())
         ->setTransactionType($void_type)
         ->setIgnoreOnNoEffect(true)
-        ->setNewValue($downgrade);
+        ->setMetadataValue('void.force', $must_downgrade)
+        ->setNewValue($want_downgrade);
     }
 
     $is_commandeer = false;
diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewer.php
index e3f9bdaf8d..823047f218 100644
--- a/src/applications/differential/storage/DifferentialReviewer.php
+++ b/src/applications/differential/storage/DifferentialReviewer.php
@@ -10,12 +10,16 @@ final class DifferentialReviewer
   protected $lastCommentDiffPHID;
   protected $lastActorPHID;
   protected $voidedPHID;
+  protected $options = array();
 
   private $authority = array();
   private $changesets = self::ATTACHABLE;
 
   protected function getConfiguration() {
     return array(
+      self::CONFIG_SERIALIZATION => array(
+        'options' => self::SERIALIZATION_JSON,
+      ),
       self::CONFIG_COLUMN_SCHEMA => array(
         'reviewerStatus' => 'text64',
         'lastActionDiffPHID' => 'phid?',
@@ -64,6 +68,15 @@ public function getChangesets() {
     return $this->assertAttached($this->changesets);
   }
 
+  public function setOption($key, $value) {
+    $this->options[$key] = $value;
+    return $this;
+  }
+
+  public function getOption($key, $default = null) {
+    return idx($this->options, $key, $default);
+  }
+
   public function isResigned() {
     $status_resigned = DifferentialReviewerStatus::STATUS_RESIGNED;
     return ($this->getReviewerStatus() == $status_resigned);
diff --git a/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
index b112eb638f..8aec75d2fb 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
@@ -164,7 +164,14 @@ protected function applyReviewerEffect(
     DifferentialRevision $revision,
     PhabricatorUser $viewer,
     $value,
-    $status) {
+    $status,
+    array $reviewer_options = array()) {
+
+    PhutilTypeSpec::checkMap(
+      $reviewer_options,
+      array(
+        'sticky' => 'optional bool',
+      ));
 
     $map = array();
 
@@ -253,6 +260,8 @@ protected function applyReviewerEffect(
         // accepted.
         $reviewer->setVoidedPHID(null);
 
+        $reviewer->setOption('sticky', idx($reviewer_options, 'sticky'));
+
         try {
           $reviewer->save();
         } catch (AphrontDuplicateKeyQueryException $ex) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionVoidTransaction.php b/src/applications/differential/xaction/DifferentialRevisionVoidTransaction.php
index 5073a9c464..331c637aad 100644
--- a/src/applications/differential/xaction/DifferentialRevisionVoidTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionVoidTransaction.php
@@ -16,21 +16,43 @@ public function generateOldValue($object) {
   }
 
   public function generateNewValue($object, $value) {
-    $table = new DifferentialReviewer();
-    $table_name = $table->getTableName();
-    $conn = $table->establishConnection('w');
-
-    $rows = queryfx_all(
-      $conn,
-      'SELECT reviewerPHID FROM %T
-        WHERE revisionPHID = %s
-          AND voidedPHID IS NULL
-          AND reviewerStatus IN (%Ls)',
-      $table_name,
+    $reviewers = id(new DifferentialReviewer())->loadAllWhere(
+      'revisionPHID = %s
+        AND voidedPHID IS NULL
+        AND reviewerStatus IN (%Ls)',
       $object->getPHID(),
       $value);
 
-    return ipull($rows, 'reviewerPHID');
+    $must_downgrade = $this->getMetadataValue('void.force', array());
+    $must_downgrade = array_fuse($must_downgrade);
+
+    $default = PhabricatorEnv::getEnvConfig('differential.sticky-accept');
+    foreach ($reviewers as $key => $reviewer) {
+      $status = $reviewer->getReviewerStatus();
+
+      // If this void is forced, always downgrade. For example, this happens
+      // when an author chooses "Request Review": existing reviews are always
+      // voided, even if they're sticky.
+      if (isset($must_downgrade[$status])) {
+        continue;
+      }
+
+      // Otherwise, if this is a sticky accept, don't void it. Accepts may be
+      // explicitly sticky or unsticky, or they'll use the default value if
+      // no value is specified.
+      $is_sticky = $reviewer->getOption('sticky');
+      $is_sticky = coalesce($is_sticky, $default);
+
+      if ($status === DifferentialReviewerStatus::STATUS_ACCEPTED) {
+        if ($is_sticky) {
+          unset($reviewers[$key]);
+          continue;
+        }
+      }
+    }
+
+
+    return mpull($reviewers, 'getReviewerPHID');
   }
 
   public function getTransactionHasEffect($object, $old, $new) {

From 598d0c04e7167783d7afc1d6ee74667a621e7d42 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Mar 2018 08:22:45 -0700
Subject: [PATCH 703/865] When computing the "Subscribers" policy, use
 materialized membership

Summary:
Fixes T13104. The "Subscribers" policy implementation still uses older logic to query project membership and misses parent projects and milestones which a user is a member of.

Instead of doing an edge query for explicit membership, use a project query to find all projects the viewer belongs to.

Test Plan:
  - Created a parent project A.
  - Created a subproject B.
  - As Bailey, created a task with "Visible To: Bailey, Subscribers".
  - Added parent project A as a task subscriber.

Then:

  - As Alice, verified I could not see the task.
  - As Alice, joined subproject B.
    - Before patch: still unable to see the task.
    - After patch: can see the task.
  - Removed parent project A as a subscriber, verified I could no longer see the task.

Maniphest Tasks: T13104

Differential Revision: https://secure.phabricator.com/D19213
---
 .../PhabricatorSubscriptionsSubscribersPolicyRule.php  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php b/src/applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php
index 7da35f3703..b7644cd68d 100644
--- a/src/applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php
+++ b/src/applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php
@@ -47,10 +47,14 @@ public function willApplyRules(
 
     // Load the project PHIDs the user is a member of.
     if (!isset($this->sourcePHIDs[$viewer_phid])) {
-      $source_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
-        $viewer_phid,
-        PhabricatorProjectMemberOfProjectEdgeType::EDGECONST);
+      $projects = id(new PhabricatorProjectQuery())
+        ->setViewer($viewer)
+        ->withMemberPHIDs(array($viewer_phid))
+        ->execute();
+
+      $source_phids = mpull($projects, 'getPHID');
       $source_phids[] = $viewer_phid;
+
       $this->sourcePHIDs[$viewer_phid] = $source_phids;
     }
 

From a4a390fe2d9f1ac24c069c331d621751f32da67c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Mar 2018 09:04:15 -0700
Subject: [PATCH 704/865] Use "-dispose background" to improve reassembly of
 GIFs with transparency

Summary:
Fixes T5741. We break GIFs apart with "-coalesce" which completely rasterizes each frame, but stitch them back together without specifying "-dispose".

This produces the default "-dispose none" behavior, which causes GIF frames to "pile up" if they contain transparency.

Instead, use "-dispose background" so that the previous frame is erased before each new frame is drawn.

Test Plan: See T5741 for additional details.

Maniphest Tasks: T5741

Differential Revision: https://secure.phabricator.com/D19214
---
 .../macro/engine/PhabricatorMemeEngine.php           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/applications/macro/engine/PhabricatorMemeEngine.php b/src/applications/macro/engine/PhabricatorMemeEngine.php
index f72a161171..175aa2fb46 100644
--- a/src/applications/macro/engine/PhabricatorMemeEngine.php
+++ b/src/applications/macro/engine/PhabricatorMemeEngine.php
@@ -236,7 +236,10 @@ private function newImagemagickAsset(
       Filesystem::writeFile($output_name, $memed_frame_data);
     }
 
-    $future = new ExecFuture('convert -loop 0 %Ls %s', $output_files, $output);
+    $future = new ExecFuture(
+      'convert -dispose background -loop 0 %Ls %s',
+      $output_files,
+      $output);
     $future->setTimeout(10)->resolvex();
 
     return Filesystem::readFile($output);
@@ -297,6 +300,9 @@ private function getMetrics($dim_x, $dim_y) {
       $font_max = 72;
       $font_min = 5;
 
+      $margin_x = 16;
+      $margin_y = 16;
+
       $last = null;
       $cursor = floor(($font_max + $font_min) / 2);
       $min = $font_min;
@@ -321,12 +327,12 @@ private function getMetrics($dim_x, $dim_y) {
           // text extends, for example if it has a "y".
           $descend = $box[3];
 
-          if ($height > $dim_y) {
+          if (($height + $margin_y) > $dim_y) {
             $all_fit = false;
             break;
           }
 
-          if ($width > $dim_x) {
+          if (($width + $margin_x) > $dim_x) {
             $all_fit = false;
             break;
           }

From 2b19f91936f23e1d59d51a4d971d4cb425d88f37 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Mar 2018 11:09:22 -0700
Subject: [PATCH 705/865] Allow Doorkeeper references to have multiple display
 variations (full, short, etc.)

Summary:
Ref T13102. An install has a custom rule for bridging JIRA references via Doorkeeper and would like to be able to render them as `JIRA-123` instead of `JIRA JIRA-123 Full JIRA title`.

I think it's reasonable to imagine future support upstream for `JIRA-123`, `{JIRA-123}`, and so on, although we do not support these today. We can take a small step toward eventual support by letting the rendering pipeline understand different view modes.

This adds an optional `name` (the default text rendered before we do the OAuth sync) and an optional `view`, which can be `short` or `full`.

Test Plan:
I tested this primarily with Asana, since it's less of a pain to set up than JIRA. The logic should be similar, hopefully.

I changed `DoorkeeperAsanaRemarkupRule` to specify `name` and `view`, e.g `'view' => (mt_rand(0, 1) ? 'short' : 'full')`. Then I made a bunch of Asana references in a comment and saw them randomly go short or long.

Maniphest Tasks: T13102

Differential Revision: https://secure.phabricator.com/D19215
---
 resources/celerity/map.php                    | 20 +++----
 .../bridge/DoorkeeperBridgeJIRA.php           |  1 +
 .../controller/DoorkeeperTagsController.php   | 25 ++++++---
 .../doorkeeper/engine/DoorkeeperObjectRef.php |  7 +++
 .../remarkup/DoorkeeperRemarkupRule.php       | 55 ++++++++++++++++---
 .../doorkeeper/behavior-doorkeeper-tag.js     | 20 ++++++-
 6 files changed, 98 insertions(+), 30 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index b4806e5500..67ee4aa8e1 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => 'c218ed53',
-    'core.pkg.js' => '8b7400e7',
+    'core.pkg.js' => '0fabde4f',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -391,7 +391,7 @@
     'rsrc/js/application/diffusion/behavior-load-blame.js' => '42126667',
     'rsrc/js/application/diffusion/behavior-locate-file.js' => '6d3e1947',
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
-    'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => 'e5822781',
+    'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
@@ -608,7 +608,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-doorkeeper-tag' => 'e5822781',
+    'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
     'javelin-behavior-editengine-reorder-configs' => 'd7a74243',
@@ -1024,6 +1024,13 @@
       'javelin-request',
       'javelin-uri',
     ),
+    '1db13e70' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-json',
+      'javelin-workflow',
+      'javelin-magical-init',
+    ),
     '1f6794f6' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2087,13 +2094,6 @@
       'javelin-behavior',
       'javelin-dom',
     ),
-    'e5822781' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-json',
-      'javelin-workflow',
-      'javelin-magical-init',
-    ),
     'e74b7517' => array(
       'javelin-install',
       'phuix-button-view',
diff --git a/src/applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php b/src/applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php
index 199f049dce..920f2eeb91 100644
--- a/src/applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php
+++ b/src/applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php
@@ -97,6 +97,7 @@ public function pullRefs(array $refs) {
 
       $ref->setAttribute('title', idx($fields, 'summary'));
       $ref->setAttribute('description', idx($result, 'description'));
+      $ref->setAttribute('shortname', $result['key']);
 
       $obj = $ref->getExternalObject();
       if ($obj->getID()) {
diff --git a/src/applications/doorkeeper/controller/DoorkeeperTagsController.php b/src/applications/doorkeeper/controller/DoorkeeperTagsController.php
index 9957b82026..5a886cba3e 100644
--- a/src/applications/doorkeeper/controller/DoorkeeperTagsController.php
+++ b/src/applications/doorkeeper/controller/DoorkeeperTagsController.php
@@ -13,17 +13,13 @@ public function handleRequest(AphrontRequest $request) {
     }
 
     $refs = array();
-    $id_map = array();
-    foreach ($tags as $tag_spec) {
+    foreach ($tags as $key => $tag_spec) {
       $tag = $tag_spec['ref'];
       $ref = id(new DoorkeeperObjectRef())
         ->setApplicationType($tag[0])
         ->setApplicationDomain($tag[1])
         ->setObjectType($tag[2])
         ->setObjectID($tag[3]);
-
-      $key = $ref->getObjectKey();
-      $id_map[$key] = $tag_spec['id'];
       $refs[$key] = $ref;
     }
 
@@ -43,19 +39,30 @@ public function handleRequest(AphrontRequest $request) {
         continue;
       }
 
-      $id = $id_map[$key];
+      $tag_spec = $tags[$key];
+
+      $id = $tag_spec['id'];
+      $view = idx($tag_spec, 'view');
+
+      $is_short = ($view == 'short');
+
+      if ($is_short) {
+        $name = $ref->getShortName();
+      } else {
+        $name = $ref->getFullName();
+      }
 
       $tag = id(new PHUITagView())
         ->setID($id)
-        ->setName($ref->getFullName())
+        ->setName($name)
         ->setHref($uri)
         ->setType(PHUITagView::TYPE_OBJECT)
         ->setExternal(true)
         ->render();
 
       $results[] = array(
-        'id'      => $id,
-        'markup'  => $tag,
+        'id' => $id,
+        'markup' => $tag,
       );
     }
 
diff --git a/src/applications/doorkeeper/engine/DoorkeeperObjectRef.php b/src/applications/doorkeeper/engine/DoorkeeperObjectRef.php
index 3cf2a8dbe2..bbccc7a5d8 100644
--- a/src/applications/doorkeeper/engine/DoorkeeperObjectRef.php
+++ b/src/applications/doorkeeper/engine/DoorkeeperObjectRef.php
@@ -107,6 +107,13 @@ public function getFullName() {
       pht('External Object'));
   }
 
+  public function getShortName() {
+    return coalesce(
+      $this->getAttribute('shortname'),
+      $this->getAttribute('name'),
+      pht('External Object'));
+  }
+
   public function getObjectKey() {
     if (!$this->objectKey) {
       $this->objectKey = PhabricatorHash::digestForIndex(
diff --git a/src/applications/doorkeeper/remarkup/DoorkeeperRemarkupRule.php b/src/applications/doorkeeper/remarkup/DoorkeeperRemarkupRule.php
index b24d53705c..9654d12bb8 100644
--- a/src/applications/doorkeeper/remarkup/DoorkeeperRemarkupRule.php
+++ b/src/applications/doorkeeper/remarkup/DoorkeeperRemarkupRule.php
@@ -4,11 +4,41 @@ abstract class DoorkeeperRemarkupRule extends PhutilRemarkupRule {
 
   const KEY_TAGS = 'doorkeeper.tags';
 
+  const VIEW_FULL = 'full';
+  const VIEW_SHORT = 'short';
+
   public function getPriority() {
     return 350.0;
   }
 
   protected function addDoorkeeperTag(array $spec) {
+    PhutilTypeSpec::checkMap(
+      $spec,
+      array(
+        'href' => 'string',
+        'tag' => 'map<string, wild>',
+
+        'name' => 'optional string',
+        'view' => 'optional string',
+      ));
+
+    $spec = $spec + array(
+      'view' => self::VIEW_FULL,
+    );
+
+    $views = array(
+      self::VIEW_FULL,
+      self::VIEW_SHORT,
+    );
+    $views = array_fuse($views);
+    if (!isset($views[$spec['view']])) {
+      throw new Exception(
+        pht(
+          'Unsupported Doorkeeper tag view mode "%s". Supported modes are: %s.',
+          $spec['view'],
+          implode(', ', $views)));
+    }
+
     $key = self::KEY_TAGS;
     $engine = $this->getEngine();
     $token = $engine->storeText(get_class($this));
@@ -36,19 +66,26 @@ public function didMarkupText() {
 
     $refs = array();
     foreach ($tags as $spec) {
-      $tag_id = celerity_generate_unique_node_id();
+      $href = $spec['href'];
+      $name = idx($spec, 'name', $href);
 
-      $refs[] = array(
-        'id' => $tag_id,
-      ) + $spec['tag'];
+      $this->assertFlatText($href);
+      $this->assertFlatText($name);
 
       if ($this->getEngine()->isTextMode()) {
-        $view = $spec['href'];
+        $view = "{$name} <{$href}>";
       } else {
+        $tag_id = celerity_generate_unique_node_id();
+
+        $refs[] = array(
+          'id' => $tag_id,
+          'view' => $spec['view'],
+        ) + $spec['tag'];
+
         $view = id(new PHUITagView())
           ->setID($tag_id)
-          ->setName($this->assertFlatText($spec['href']))
-          ->setHref($this->assertFlatText($spec['href']))
+          ->setName($name)
+          ->setHref($href)
           ->setType(PHUITagView::TYPE_OBJECT)
           ->setExternal(true);
       }
@@ -56,7 +93,9 @@ public function didMarkupText() {
       $engine->overwriteStoredText($spec['token'], $view);
     }
 
-    Javelin::initBehavior('doorkeeper-tag', array('tags' => $refs));
+    if ($refs) {
+      Javelin::initBehavior('doorkeeper-tag', array('tags' => $refs));
+    }
 
     $engine->setTextMetadata($key, array());
   }
diff --git a/webroot/rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js b/webroot/rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js
index c7b850f44f..f725ef6082 100644
--- a/webroot/rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js
+++ b/webroot/rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js
@@ -40,9 +40,19 @@ JX.behavior('doorkeeper-tag', function(config, statics) {
     };
 
     for (var ii = 0; ii < tags.length; ii++) {
-      var tag_key = tags[ii].ref.join('@');
+      var key_parts = [];
+
+      key_parts = key_parts.concat(tags[ii].ref);
+      key_parts.push(tags[ii].view);
+
+      var tag_key = key_parts.join(' ');
+
       if (tag_key in statics.cache) {
-        have.push({id: tags[ii].id, markup: statics.cache[tag_key]});
+        have.push(
+          {
+            id: tags[ii].id,
+            markup: statics.cache[tag_key]
+          });
       } else {
         need.push(tags[ii]);
         keys[tags[ii].id] = tag_key;
@@ -54,7 +64,11 @@ JX.behavior('doorkeeper-tag', function(config, statics) {
     }
 
     if (need.length) {
-      new JX.Workflow('/doorkeeper/tags/', {tags: JX.JSON.stringify(need)})
+      var data = {
+        tags: JX.JSON.stringify(need)
+      };
+
+      new JX.Workflow('/doorkeeper/tags/', data)
         .setHandler(function(r) { draw(r.tags); })
         .start();
     }

From 0bf8e33bb6c17e41712dd6f4db11139a850e82cd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Mar 2018 12:14:36 -0700
Subject: [PATCH 706/865] Issue setup guidance recommending MySQLi and MySQL
 Native Driver

Summary:
Fixes T12994. We need `MYSQLI_ASYNC` to implement client-side query timeouts, and we need MySQLi + MySQL Native Driver to get `MYSQLI_ASYNC`.

Recommend users install MySQLi and MySQL Native Driver if they don't have them. These are generally the defaults and best practice anyway, but Ubuntu makes it easy to use the older stuff.

All the cases we're currently aware of stem from `apt-get install php5-mysql` (which explicitly selects the non-native driver) so issue particular guidance about `php5-mysqlnd`.

Test Plan:
  - Faked both issues locally, reviewed the text.
  - Will deploy to `secure`, which currently has the non-native driver.

Maniphest Tasks: T12994

Differential Revision: https://secure.phabricator.com/D19216
---
 resources/celerity/map.php                    |  4 +-
 scripts/install/install_ubuntu.sh             |  2 +-
 .../check/PhabricatorPHPConfigSetupCheck.php  | 45 +++++++++++++++++++
 src/docs/user/installation_guide.diviner      |  2 +-
 .../css/application/config/setup-issue.css    |  2 +-
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 67ee4aa8e1..769e8dfabe 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -46,7 +46,7 @@
     'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
     'rsrc/css/application/config/config-options.css' => '4615667b',
     'rsrc/css/application/config/config-template.css' => '8f18fa41',
-    'rsrc/css/application/config/setup-issue.css' => '7dae7f18',
+    'rsrc/css/application/config/setup-issue.css' => '30ee0173',
     'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
     'rsrc/css/application/conpherence/color.css' => 'abb4c358',
     'rsrc/css/application/conpherence/durable-column.css' => '89ea6bef',
@@ -881,7 +881,7 @@
     'releeph-preview-branch' => 'b7a6f4a5',
     'releeph-request-differential-create-dialog' => '8d8b92cd',
     'releeph-request-typeahead-css' => '667a48ae',
-    'setup-issue-css' => '7dae7f18',
+    'setup-issue-css' => '30ee0173',
     'sprite-login-css' => '396f3c3a',
     'sprite-tokens-css' => '9cdfd599',
     'syntax-default-css' => '9923583c',
diff --git a/scripts/install/install_ubuntu.sh b/scripts/install/install_ubuntu.sh
index b3e678450d..5408cdb3e1 100755
--- a/scripts/install/install_ubuntu.sh
+++ b/scripts/install/install_ubuntu.sh
@@ -45,7 +45,7 @@ set +x
 sudo apt-get -qq update
 sudo apt-get install \
   $GIT mysql-server apache2 dpkg-dev \
-  php5 php5-mysql php5-gd php5-dev php5-curl php-apc php5-cli php5-json
+  php5 php5-mysqlnd php5-gd php5-dev php5-curl php-apc php5-cli php5-json
 
 # Enable mod_rewrite
 sudo a2enmod rewrite
diff --git a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
index 5382a27b7a..cf3148b5be 100644
--- a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php
@@ -67,6 +67,51 @@ protected function executeChecks() {
         ->addPHPConfig('always_populate_raw_post_data');
     }
 
+    if (!extension_loaded('mysqli')) {
+      $summary = pht(
+        'Install the MySQLi extension to improve database behavior.');
+
+      $message = pht(
+        'PHP is currently using the very old "mysql" extension to interact '.
+        'with the database. You should install the newer "mysqli" extension '.
+        'to improve behaviors (like error handling and query timeouts).'.
+        "\n\n".
+        'Phabricator will work with the older extension, but upgrading to the '.
+        'newer extension is recommended.'.
+        "\n\n".
+        'You may be able to install the extension with a command like: %s',
+
+        // NOTE: We're intentionally telling you to install "mysqlnd" here; on
+        // Ubuntu, there's no separate "mysqli" package.
+        phutil_tag('tt', array(), 'sudo apt-get install php5-mysqlnd'));
+
+      $this->newIssue('php.mysqli')
+        ->setName(pht('MySQLi Extension Not Available'))
+        ->setSummary($summary)
+        ->setMessage($message);
+    } else if (!defined('MYSQLI_ASYNC')) {
+      $summary = pht(
+        'Configure the MySQL Native Driver to improve database behavior.');
+
+      $message = pht(
+        'PHP is currently using the older MySQL external driver instead of '.
+        'the newer MySQL native driver. The older driver lacks options and '.
+        'features (like support for query timeouts) which allow Phabricator '.
+        'to interact better with the database.'.
+        "\n\n".
+        'Phabricator will work with the older driver, but upgrading to the '.
+        'native driver is recommended.'.
+        "\n\n".
+        'You may be able to install the native driver with a command like: %s',
+        phutil_tag('tt', array(), 'sudo apt-get install php5-mysqlnd'));
+
+
+      $this->newIssue('php.myqlnd')
+        ->setName(pht('MySQL Native Driver Not Available'))
+        ->setSummary($summary)
+        ->setMessage($message);
+    }
+
   }
 
 }
diff --git a/src/docs/user/installation_guide.diviner b/src/docs/user/installation_guide.diviner
index 8feb8ae1d0..29895eb2a9 100644
--- a/src/docs/user/installation_guide.diviner
+++ b/src/docs/user/installation_guide.diviner
@@ -123,7 +123,7 @@ Otherwise, here's a general description of what you need to install:
   - MySQL Server (usually "mysqld" or "mysql-server")
   - PHP (usually "php")
   - Required PHP extensions: mbstring, iconv, mysql (or mysqli), curl, pcntl
-    (these might be something like "php-mysql" or "php5-mysql")
+    (these might be something like "php-mysql" or "php5-mysqlnd")
   - Optional PHP extensions: gd, apc (special instructions for APC are available
     below if you have difficulty installing it), xhprof (instructions below,
     you only need this if you are developing Phabricator)
diff --git a/webroot/rsrc/css/application/config/setup-issue.css b/webroot/rsrc/css/application/config/setup-issue.css
index 7ba033d9c2..a80b02815c 100644
--- a/webroot/rsrc/css/application/config/setup-issue.css
+++ b/webroot/rsrc/css/application/config/setup-issue.css
@@ -84,7 +84,7 @@
 }
 
 .setup-issue-body {
-  padding: 16px 16px 0 16px;
+  padding: 16px;
 }
 
 .setup-issue-status {

From dfd8b0225b3de45533c46f04ff76f2cabcfd3a9b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Mar 2018 16:01:01 -0700
Subject: [PATCH 707/865] Add a UI element for reviewing older generations of
 Harbormaster builds

Summary:
See PHI446. Ref T13088. Currently, there's no way to access older generations of a build unless you know the secret `?g=1` URI magic.

When a build has multiple generations, show a history table and let users click to see older run information.

This is currently very basic. It would be nice to show when each generation started, who started/restarted it, and what the build status was at the time the build was restarted. There's currently no convenient source for this information so just add a bare-bones, working version of this for now.

Test Plan:
Viewed pending, single-run and multi-restart builds. Saw table on builds with more than one generation. Clicked table entries to see different build data.

{F5471160}

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13088

Differential Revision: https://secure.phabricator.com/D19217
---
 .../PhabricatorHarbormasterApplication.php    |   3 +-
 .../HarbormasterBuildViewController.php       | 122 +++++++++++++++---
 .../engine/HarbormasterBuildEngine.php        |   2 +-
 3 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
index 103e6bce69..80be90b375 100644
--- a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
+++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
@@ -71,7 +71,8 @@ public function getRoutes() {
         ),
         'build/' => array(
           $this->getQueryRoutePattern() => 'HarbormasterBuildListController',
-          '(?P<id>\d+)/' => 'HarbormasterBuildViewController',
+          '(?P<id>\d+)/(?:(?P<generation>\d+)/)?'
+            => 'HarbormasterBuildViewController',
           '(?P<action>pause|resume|restart|abort)/'.
             '(?P<id>\d+)/(?:(?P<via>[^/]+)/)?'
             => 'HarbormasterBuildActionController',
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
index 0e09b4d658..0646bd9309 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -8,7 +8,6 @@ public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getUser();
 
     $id = $request->getURIData('id');
-    $generation = $request->getInt('g');
 
     $build = id(new HarbormasterBuildQuery())
       ->setViewer($viewer)
@@ -21,6 +20,7 @@ public function handleRequest(AphrontRequest $request) {
     require_celerity_resource('harbormaster-css');
 
     $title = pht('Build %d', $id);
+    $warnings = array();
 
     $page_header = id(new PHUIHeaderView())
       ->setHeader($title)
@@ -28,7 +28,9 @@ public function handleRequest(AphrontRequest $request) {
       ->setPolicyObject($build)
       ->setHeaderIcon('fa-cubes');
 
-    if ($build->isRestarting()) {
+    $is_restarting = $build->isRestarting();
+
+    if ($is_restarting) {
       $page_header->setStatus(
         'fa-exclamation-triangle', 'red', pht('Restarting'));
     } else if ($build->isPausing()) {
@@ -42,19 +44,53 @@ public function handleRequest(AphrontRequest $request) {
         'fa-exclamation-triangle', 'red', pht('Aborting'));
     }
 
+    $max_generation = (int)$build->getBuildGeneration();
+    if ($max_generation === 0) {
+      $min_generation = 0;
+    } else {
+      $min_generation = 1;
+    }
+
+    if ($is_restarting) {
+      $max_generation = $max_generation + 1;
+    }
+
+    $generation = $request->getURIData('generation');
+    if ($generation === null) {
+      $generation = $max_generation;
+    } else {
+      $generation = (int)$generation;
+    }
+
+    if ($generation < $min_generation || $generation > $max_generation) {
+      return new Aphront404Response();
+    }
+
+    if ($generation < $max_generation) {
+      $warnings[] = pht(
+        'You are viewing an older run of this build. %s',
+        phutil_tag(
+          'a',
+          array(
+            'href' => $build->getURI(),
+          ),
+          pht('View Current Build')));
+    }
+
+
     $curtain = $this->buildCurtainView($build);
     $properties = $this->buildPropertyList($build);
+    $history = $this->buildHistoryTable(
+      $build,
+      $generation,
+      $min_generation,
+      $max_generation);
 
     $crumbs = $this->buildApplicationCrumbs();
     $this->addBuildableCrumb($crumbs, $build->getBuildable());
     $crumbs->addTextCrumb($title);
     $crumbs->setBorder(true);
 
-    if ($generation === null || $generation > $build->getBuildGeneration() ||
-      $generation < 0) {
-      $generation = $build->getBuildGeneration();
-    }
-
     $build_targets = id(new HarbormasterBuildTargetQuery())
       ->setViewer($viewer)
       ->needBuildSteps(true)
@@ -264,14 +300,25 @@ public function handleRequest(AphrontRequest $request) {
       new HarbormasterBuildTransactionQuery());
     $timeline->setShouldTerminate(true);
 
+    if ($warnings) {
+      $warnings = id(new PHUIInfoView())
+        ->setErrors($warnings)
+        ->setSeverity(PHUIInfoView::SEVERITY_WARNING);
+    } else {
+      $warnings = null;
+    }
+
     $view = id(new PHUITwoColumnView())
       ->setHeader($page_header)
       ->setCurtain($curtain)
-      ->setMainColumn(array(
-        $properties,
-        $targets,
-        $timeline,
-      ));
+      ->setMainColumn(
+        array(
+          $warnings,
+          $properties,
+          $history,
+          $targets,
+          $timeline,
+        ));
 
     return $this->newPage()
       ->setTitle($title)
@@ -561,10 +608,6 @@ private function buildPropertyList(HarbormasterBuild $build) {
       pht('Build Plan'),
       $handles[$build->getBuildPlanPHID()]->renderLink());
 
-    $properties->addProperty(
-      pht('Restarts'),
-      $build->getBuildGeneration());
-
     $properties->addProperty(
       pht('Status'),
       $this->getStatus($build));
@@ -576,6 +619,53 @@ private function buildPropertyList(HarbormasterBuild $build) {
 
   }
 
+  private function buildHistoryTable(
+    HarbormasterBuild $build,
+    $generation,
+    $min_generation,
+    $max_generation) {
+
+    if ($max_generation === $min_generation) {
+      return null;
+    }
+
+    $viewer = $this->getViewer();
+
+    $uri = $build->getURI();
+
+    $rows = array();
+    $rowc = array();
+    for ($ii = $max_generation; $ii >= $min_generation; $ii--) {
+      if ($generation == $ii) {
+        $rowc[] = 'highlighted';
+      } else {
+        $rowc[] = null;
+      }
+
+      $rows[] = array(
+        phutil_tag(
+          'a',
+          array(
+            'href' => $uri.$ii.'/',
+          ),
+          pht('Run %d', $ii)),
+      );
+    }
+
+    $table = id(new AphrontTableView($rows))
+      ->setColumnClasses(
+        array(
+          'pri wide',
+        ))
+      ->setRowClasses($rowc);
+
+    return id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('History'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setTable($table);
+  }
+
+
   private function getStatus(HarbormasterBuild $build) {
     $status_view = new PHUIStatusListView();
 
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
index 454fec7f37..f3589bfc53 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -147,7 +147,7 @@ private function restartBuild(HarbormasterBuild $build) {
     // If it is different, they will automatically stop what they're doing
     // and abort.
 
-    // Previously we used to delete targets, logs and artifacts here.  Instead
+    // Previously we used to delete targets, logs and artifacts here. Instead,
     // leave them around so users can view previous generations of this build.
   }
 

From dc7e40ff3fc7c1e882ebf0b6c6002c0dc33f9d6e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 13 Mar 2018 16:26:01 -0700
Subject: [PATCH 708/865] Fix the DarkConsole inline error log stack trace
 expansion behavior for Content-Security-Policy

Summary:
See PHI451. Ref T13102. DarkConsole uses an ancient inline "onclick" handler to expand the stack traces for errors.

The new Content-Security-Policy prevents this from functioning.

Replace this with a more modern behavior-driven action instead.

Test Plan:
  - Clicked some errors in DarkConsole, saw stack traces appear.
  - Grepped for `onclick` and `jsprintf()` to see if I could find any more of these, but came up empty.

Maniphest Tasks: T13102

Differential Revision: https://secure.phabricator.com/D19218
---
 resources/celerity/map.php                    | 34 +++++++------------
 resources/celerity/packages.php               |  4 ---
 .../plugin/DarkConsoleErrorLogPlugin.php      |  7 ++--
 src/view/page/PhabricatorStandardPageView.php |  3 --
 webroot/rsrc/js/core/behavior-error-log.js    | 19 -----------
 .../core/darkconsole/behavior-dark-console.js | 20 +++++++++++
 6 files changed, 37 insertions(+), 50 deletions(-)
 delete mode 100644 webroot/rsrc/js/core/behavior-error-log.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 769e8dfabe..15388ab9a2 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -11,7 +11,6 @@
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => 'c218ed53',
     'core.pkg.js' => '0fabde4f',
-    'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -462,7 +461,6 @@
     'rsrc/js/core/behavior-detect-timezone.js' => '4c193c96',
     'rsrc/js/core/behavior-device.js' => 'a3714c76',
     'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '484a6e22',
-    'rsrc/js/core/behavior-error-log.js' => '6882e80a',
     'rsrc/js/core/behavior-fancy-datepicker.js' => 'ecf4e799',
     'rsrc/js/core/behavior-file-tree.js' => '88236f00',
     'rsrc/js/core/behavior-form.js' => '5c54cbf3',
@@ -501,7 +499,7 @@
     'rsrc/js/core/behavior-workflow.js' => '0a3f3021',
     'rsrc/js/core/darkconsole/DarkLog.js' => 'c8e1ffe3',
     'rsrc/js/core/darkconsole/DarkMessage.js' => 'c48cccdd',
-    'rsrc/js/core/darkconsole/behavior-dark-console.js' => '17bb8539',
+    'rsrc/js/core/darkconsole/behavior-dark-console.js' => '66888767',
     'rsrc/js/core/phtize.js' => 'd254d646',
     'rsrc/js/phui/behavior-phui-dropdown-menu.js' => 'b95d6f7d',
     'rsrc/js/phui/behavior-phui-file-upload.js' => 'b003d4fb',
@@ -588,7 +586,7 @@
     'javelin-behavior-conpherence-pontificate' => '55616e04',
     'javelin-behavior-conpherence-search' => '9bbf3762',
     'javelin-behavior-countdown-timer' => 'e4cc26b3',
-    'javelin-behavior-dark-console' => '17bb8539',
+    'javelin-behavior-dark-console' => '66888767',
     'javelin-behavior-dashboard-async-panel' => '469c0d9e',
     'javelin-behavior-dashboard-move-panels' => '408bf173',
     'javelin-behavior-dashboard-query-panel-select' => '453c5375',
@@ -613,7 +611,6 @@
     'javelin-behavior-durable-column' => '2ae077e1',
     'javelin-behavior-editengine-reorder-configs' => 'd7a74243',
     'javelin-behavior-editengine-reorder-fields' => 'b59e1e96',
-    'javelin-behavior-error-log' => '6882e80a',
     'javelin-behavior-event-all-day' => 'b41537c9',
     'javelin-behavior-fancy-datepicker' => 'ecf4e799',
     'javelin-behavior-global-drag-and-drop' => '960f6a39',
@@ -987,16 +984,6 @@
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
     ),
-    '17bb8539' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-request',
-      'phabricator-keyboard-shortcut',
-      'phabricator-darklog',
-      'phabricator-darkmessage',
-    ),
     '1802a242' => array(
       'phui-theme-css',
     ),
@@ -1416,6 +1403,16 @@
       'javelin-typeahead-ondemand-source',
       'javelin-util',
     ),
+    66888767 => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-request',
+      'phabricator-keyboard-shortcut',
+      'phabricator-darklog',
+      'phabricator-darkmessage',
+    ),
     '66a6def1' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1429,9 +1426,6 @@
       'javelin-dom',
       'phabricator-notification',
     ),
-    '6882e80a' => array(
-      'javelin-dom',
-    ),
     '68af71ca' => array(
       'javelin-install',
       'javelin-dom',
@@ -2343,10 +2337,6 @@
       'javelin-behavior-user-menu',
       'phabricator-favicon',
     ),
-    'darkconsole.pkg.js' => array(
-      'javelin-behavior-dark-console',
-      'javelin-behavior-error-log',
-    ),
     'differential.pkg.css' => array(
       'differential-core-view-css',
       'differential-changeset-view-css',
diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php
index abbf1d77e2..3cec508678 100644
--- a/resources/celerity/packages.php
+++ b/resources/celerity/packages.php
@@ -224,8 +224,4 @@
     'javelin-behavior-maniphest-subpriority-editor',
     'javelin-behavior-maniphest-list-editor',
   ),
-  'darkconsole.pkg.js' => array(
-    'javelin-behavior-dark-console',
-    'javelin-behavior-error-log',
-  ),
 );
diff --git a/src/applications/console/plugin/DarkConsoleErrorLogPlugin.php b/src/applications/console/plugin/DarkConsoleErrorLogPlugin.php
index 0d9604dcba..213b578c75 100644
--- a/src/applications/console/plugin/DarkConsoleErrorLogPlugin.php
+++ b/src/applications/console/plugin/DarkConsoleErrorLogPlugin.php
@@ -39,10 +39,13 @@ public function renderPanel() {
       $file = $row['file'];
       $line = $row['line'];
 
-      $tag = phutil_tag(
+      $tag = javelin_tag(
         'a',
         array(
-          'onclick' => jsprintf('show_details(%d)', $index),
+          'sigil' => 'darkconsole-expand',
+          'meta' => array(
+            'expandID' => 'row-details-'.$index,
+          ),
         ),
         $row['str'].' at ['.basename($file).':'.$line.']');
       $rows[] = array($tag);
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index aca98b7205..99143add5f 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -330,9 +330,6 @@ protected function willRenderPage() {
       Javelin::initBehavior(
         'dark-console',
         $this->getConsoleConfig());
-
-      // Change this to initBehavior when there is some behavior to initialize
-      require_celerity_resource('javelin-behavior-error-log');
     }
 
     if ($user) {
diff --git a/webroot/rsrc/js/core/behavior-error-log.js b/webroot/rsrc/js/core/behavior-error-log.js
deleted file mode 100644
index 24f3f61141..0000000000
--- a/webroot/rsrc/js/core/behavior-error-log.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @provides javelin-behavior-error-log
- * @requires javelin-dom
- */
-
-/* exported show_details */
-
-var current_details = null;
-
-function show_details(row) {
-  var node = JX.$('row-details-' + row);
-
-  if (current_details !== null) {
-    JX.$('row-details-' + current_details).style.display = 'none';
-  }
-
-  node.style.display = 'block';
-  current_details = row;
-}
diff --git a/webroot/rsrc/js/core/darkconsole/behavior-dark-console.js b/webroot/rsrc/js/core/darkconsole/behavior-dark-console.js
index 13949432ff..a9f33d4594 100644
--- a/webroot/rsrc/js/core/darkconsole/behavior-dark-console.js
+++ b/webroot/rsrc/js/core/darkconsole/behavior-dark-console.js
@@ -404,4 +404,24 @@ JX.behavior('dark-console', function(config, statics) {
 
   }
 
+  if (!statics.expand) {
+    statics.expand = true;
+
+    var current_details = null;
+    JX.Stratcom.listen('click', 'darkconsole-expand', function(e) {
+      e.kill();
+
+      if (current_details) {
+        current_details.style.display = 'none';
+        current_details = null;
+      }
+
+      var id = e.getNodeData('darkconsole-expand').expandID;
+      var node = JX.$(id);
+
+      node.style.display = 'block';
+      current_details = node;
+    });
+  }
+
 });

From 403dd629362dec5a60c058f4f3c04e2f330cdaf5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 08:19:06 -0700
Subject: [PATCH 709/865] Update the "Support Resources" documentation for
 pacts instead of consulting

Summary: Support pacts have been working well and are here to stay, so guide users toward them rather than older resources (consulting / paid prioritization).

Test Plan: Read document. Twice!

Differential Revision: https://secure.phabricator.com/D19219
---
 src/docs/user/support.diviner | 43 +++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/docs/user/support.diviner b/src/docs/user/support.diviner
index 9dc06b15a3..c99b272de9 100644
--- a/src/docs/user/support.diviner
+++ b/src/docs/user/support.diviner
@@ -9,14 +9,23 @@ Overview
 
 This document describes available support resources.
 
-The upstream provides active, free support for a narrow range of problems
-(primarily, security issues and reproducible bugs).
+The upstream provides free support for a narrow range of problems (primarily,
+security issues and reproducible bugs) and paid support for virtually anything.
 
 The upstream does not provide free support for general problems with installing
 or configuring Phabricator. You may be able to get some help with these
 kinds of issues from the community.
 
 
+Paid Support
+============
+
+If you'd like upstream support, see ((pacts)).
+
+This is the only way to request features and the only way to get guaranteed
+answers from experts quickly.
+
+
 Reporting Security Vulnerabilities
 ==================================
 
@@ -31,8 +40,7 @@ Reporting Bugs
 
 The upstream will accept **reproducible** bug reports in modern, first-party
 production code running in reasonable environments.  Before submitting a bug
-report you **must update** to the latest version of Phabricator. This reduces
-support costs on the upstream, please be mindful.
+report you **must update** to the latest version of Phabricator.
 
 To report bugs, see @{article:Contributing Bug Reports}.
 
@@ -52,14 +60,10 @@ If you'd like to contribute to Phabricator, start with
 Installation and Setup Help
 ===========================
 
-Installation and setup help is available from the upstream at consulting rates.
-See [[ https://secure.phabricator.com/w/consulting/ | Consulting ]] for details.
-
-Helping individual installs navigate unique setup problems takes our time
-away from developing Phabricator, so we can not offer this service for free.
-
 You may be able to get free help with these issues from the
-[[ https://phurl.io/u/discourse | community ]]. See below for details.
+[[ https://phurl.io/u/discourse | community ]].
+
+You can also pay us for support. See ((pacts)).
 
 
 Hosting
@@ -67,8 +71,8 @@ Hosting
 
 The upstream offers Phabricator as a hosted service at
 [[ https://phacility.com | Phacility ]]. This simplifies setting up and
-operating a Phabricator instance, and gives you access to a broader range
-of upstream support services.
+operating a Phabricator instance, and automatically gives you access to a
+broader range of upstream support services.
 
 Running this service gives us a strong financial incentive to make installing
 and operating Phabricator as difficult as possible. Blinded by greed, we toil
@@ -79,9 +83,10 @@ ourselves can hope to navigate.
 Phabricator Community
 =====================
 
-We provide hosting for a
-[[ https://phurl.io/u/discourse | Discussion Forum ]]
-where admins and users help and answer questions from other community members.
-Upstream developers may occasionally participate, but this is mostly
-a user to user community. If you run into general problems, but are not
-interested in paid support, this is the main place to find help.
+We provide hosting for a [[ https://phurl.io/u/discourse | Discussion Forum ]]
+where admininstrators and users help and answer questions from other community
+members.
+
+Upstream developers occasionally participate, but this is mostly a user to user
+community. If you run into general problems, but are not interested in paid
+support, this is the main place to find help.

From 49e6358fce2706206ce59b8455214e018ff3404d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 11:20:33 -0700
Subject: [PATCH 710/865] Bulk load builtin project default profile images

Summary: Depends on D19221. Ref T13106. When we fall back to default profile images for projects, bulk load them instead of doing individual queries.

Test Plan: Saw local task drop from 199 queries to 151 queries with the same actual outcome. Saw custom and default profile images on the project list page.

Maniphest Tasks: T13106

Differential Revision: https://secure.phabricator.com/D19222
---
 .../project/query/PhabricatorProjectQuery.php | 66 +++++++++++++++----
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php
index 955eba9972..98713078fb 100644
--- a/src/applications/project/query/PhabricatorProjectQuery.php
+++ b/src/applications/project/query/PhabricatorProjectQuery.php
@@ -357,29 +357,69 @@ protected function willFilterPage(array $projects) {
   }
 
   protected function didFilterPage(array $projects) {
+    $viewer = $this->getViewer();
+
     if ($this->needImages) {
-      $file_phids = mpull($projects, 'getProfileImagePHID');
-      $file_phids = array_filter($file_phids);
+      $need_images = $projects;
+
+      // First, try to load custom profile images for any projects with custom
+      // images.
+      $file_phids = array();
+      foreach ($need_images as $key => $project) {
+        $image_phid = $project->getProfileImagePHID();
+        if ($image_phid) {
+          $file_phids[$key] = $image_phid;
+        }
+      }
+
       if ($file_phids) {
         $files = id(new PhabricatorFileQuery())
           ->setParentQuery($this)
-          ->setViewer($this->getViewer())
+          ->setViewer($viewer)
           ->withPHIDs($file_phids)
           ->execute();
         $files = mpull($files, null, 'getPHID');
-      } else {
-        $files = array();
+
+        foreach ($file_phids as $key => $image_phid) {
+          $file = idx($files, $image_phid);
+          if (!$file) {
+            continue;
+          }
+
+          $need_images[$key]->attachProfileImageFile($file);
+          unset($need_images[$key]);
+        }
       }
 
-      foreach ($projects as $project) {
-        $file = idx($files, $project->getProfileImagePHID());
-        if (!$file) {
-          $builtin = PhabricatorProjectIconSet::getIconImage(
-            $project->getIcon());
-          $file = PhabricatorFile::loadBuiltin($this->getViewer(),
-            'projects/'.$builtin);
+      // For projects with default images, or projects where the custom image
+      // failed to load, load a builtin image.
+      if ($need_images) {
+        $builtin_map = array();
+        $builtins = array();
+        foreach ($need_images as $key => $project) {
+          $icon = $project->getIcon();
+
+          $builtin_name = PhabricatorProjectIconSet::getIconImage($icon);
+          $builtin_name = 'projects/'.$builtin_name;
+
+          $builtin = id(new PhabricatorFilesOnDiskBuiltinFile())
+            ->setName($builtin_name);
+
+          $builtin_key = $builtin->getBuiltinFileKey();
+
+          $builtins[] = $builtin;
+          $builtin_map[$key] = $builtin_key;
+        }
+
+        $builtin_files = PhabricatorFile::loadBuiltins(
+          $viewer,
+          $builtins);
+
+        foreach ($need_images as $key => $project) {
+          $builtin_key = $builtin_map[$key];
+          $builtin_file = $builtin_files[$builtin_key];
+          $project->attachProfileImageFile($builtin_file);
         }
-        $project->attachProfileImageFile($file);
       }
     }
 

From 31bd3679f0255f2b0b9daacfa3076b30cb872c56 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 11:42:53 -0700
Subject: [PATCH 711/865] Skip loading attached objects for files when we know
 the file is visible

Summary:
Depends on D19222. Ref T13106. We currently execute an edge query (and possibly an object query) when loading builtin files, but this is never necessary because we know these files are always visible.

Instead, skip this logic for builtin files and profile image files; these files have global visibility and will never get a different policy result because of file attachment information.

(In theory, we could additionally skip this for files with the most open visibility policy or some other trivially visible policy like the user's PHID, but we do actually care about the attachment data some of the time.)

Test Plan: Saw queries drop from 151 to 145 on local test page. Checked file attachment data in Files, saw it still working correctly.

Maniphest Tasks: T13106

Differential Revision: https://secure.phabricator.com/D19223
---
 .../files/query/PhabricatorFileQuery.php      | 82 +++++++++++++------
 1 file changed, 55 insertions(+), 27 deletions(-)

diff --git a/src/applications/files/query/PhabricatorFileQuery.php b/src/applications/files/query/PhabricatorFileQuery.php
index 071ee03991..83bf2d8dec 100644
--- a/src/applications/files/query/PhabricatorFileQuery.php
+++ b/src/applications/files/query/PhabricatorFileQuery.php
@@ -152,46 +152,74 @@ public function newResultObject() {
   }
 
   protected function loadPage() {
-    $files = $this->loadStandardPage(new PhabricatorFile());
+    $files = $this->loadStandardPage($this->newResultObject());
 
     if (!$files) {
       return $files;
     }
 
-    $viewer = $this->getViewer();
-    $is_omnipotent = $viewer->isOmnipotent();
-
-    // We need to load attached objects to perform policy checks for files.
-    // First, load the edges.
+    // Figure out which files we need to load attached objects for. In most
+    // cases, we need to load attached objects to perform policy checks for
+    // files.
 
-    $edge_type = PhabricatorFileHasObjectEdgeType::EDGECONST;
-    $file_phids = mpull($files, 'getPHID');
-    $edges = id(new PhabricatorEdgeQuery())
-      ->withSourcePHIDs($file_phids)
-      ->withEdgeTypes(array($edge_type))
-      ->execute();
-
-    $object_phids = array();
+    // However, in some special cases where we know files will always be
+    // visible, we skip this. See T8478 and T13106.
+    $need_objects = array();
     foreach ($files as $file) {
-      $phids = array_keys($edges[$file->getPHID()][$edge_type]);
-      $file->attachObjectPHIDs($phids);
+      $always_visible = false;
 
       if ($file->getIsProfileImage()) {
-        // If this is a profile image, don't bother loading related files.
-        // It will always be visible, and we can get into trouble if we try
-        // to load objects and end up stuck in a cycle. See T8478.
-        continue;
+        $always_visible = true;
       }
 
-      if ($is_omnipotent) {
-        // If the viewer is omnipotent, we don't need to load the associated
-        // objects either since they can certainly see the object. Skipping
-        // this can improve performance and prevent cycles.
+      if ($file->isBuiltin()) {
+        $always_visible = true;
+      }
+
+      if ($always_visible) {
+        // We just treat these files as though they aren't attached to
+        // anything. This saves a query in common cases when we're loading
+        // profile images or builtins. We could be slightly more nuanced
+        // about this and distinguish between "not attached to anything" and
+        // "might be attached but policy checks don't need to care".
+        $file->attachObjectPHIDs(array());
         continue;
       }
 
-      foreach ($phids as $phid) {
-        $object_phids[$phid] = true;
+      $need_objects[] = $file;
+    }
+
+    $viewer = $this->getViewer();
+    $is_omnipotent = $viewer->isOmnipotent();
+
+    // If we have any files left which do need objects, load the edges now.
+    $object_phids = array();
+    if ($need_objects) {
+      $edge_type = PhabricatorFileHasObjectEdgeType::EDGECONST;
+      $file_phids = mpull($need_objects, 'getPHID');
+
+      $edges = id(new PhabricatorEdgeQuery())
+        ->withSourcePHIDs($file_phids)
+        ->withEdgeTypes(array($edge_type))
+        ->execute();
+
+      foreach ($need_objects as $file) {
+        $phids = array_keys($edges[$file->getPHID()][$edge_type]);
+        $file->attachObjectPHIDs($phids);
+
+        if ($is_omnipotent) {
+          // If the viewer is omnipotent, we don't need to load the associated
+          // objects either since the viewer can certainly see the object.
+          // Skipping this can improve performance and prevent cycles. This
+          // could possibly become part of the profile/builtin code above which
+          // short circuits attacment policy checks in cases where we know them
+          // to be unnecessary.
+          continue;
+        }
+
+        foreach ($phids as $phid) {
+          $object_phids[$phid] = true;
+        }
       }
     }
 
@@ -203,7 +231,7 @@ protected function loadPage() {
 
     $xforms = id(new PhabricatorTransformedFile())->loadAllWhere(
       'transformedPHID IN (%Ls)',
-      $file_phids);
+      mpull($files, 'getPHID'));
     $xform_phids = mpull($xforms, 'getOriginalPHID', 'getTransformedPHID');
     foreach ($xform_phids as $derived_phid => $original_phid) {
       $object_phids[$original_phid] = true;

From d80a53abccc7e165a54d07e96cd556850f749ce5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 11:50:53 -0700
Subject: [PATCH 712/865] Skip loading file transform sources when we know a
 file is not transformed

Summary:
Depends on D19223. Ref T13106. When we're loading a file, we currently test if it's a transformed version of another file (usually, a thumbnail) and apply policy behavior if it is.

We know that builtins and profile images are never transforms and that the policy behavior for these files doesn't matter anyway. Skip loading transforms for these files.

Test Plan: Saw local queries drop from 146 to 139 with no change in behavior.

Maniphest Tasks: T13106

Differential Revision: https://secure.phabricator.com/D19224
---
 .../files/query/PhabricatorFileQuery.php      | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/applications/files/query/PhabricatorFileQuery.php b/src/applications/files/query/PhabricatorFileQuery.php
index 83bf2d8dec..9f1659a7f3 100644
--- a/src/applications/files/query/PhabricatorFileQuery.php
+++ b/src/applications/files/query/PhabricatorFileQuery.php
@@ -165,6 +165,7 @@ protected function loadPage() {
     // However, in some special cases where we know files will always be
     // visible, we skip this. See T8478 and T13106.
     $need_objects = array();
+    $need_xforms = array();
     foreach ($files as $file) {
       $always_visible = false;
 
@@ -187,6 +188,7 @@ protected function loadPage() {
       }
 
       $need_objects[] = $file;
+      $need_xforms[] = $file;
     }
 
     $viewer = $this->getViewer();
@@ -226,15 +228,20 @@ protected function loadPage() {
     // If this file is a transform of another file, load that file too. If you
     // can see the original file, you can see the thumbnail.
 
-    // TODO: It might be nice to put this directly on PhabricatorFile and remove
-    // the PhabricatorTransformedFile table, which would be a little simpler.
+    // TODO: It might be nice to put this directly on PhabricatorFile and
+    // remove the PhabricatorTransformedFile table, which would be a little
+    // simpler.
 
-    $xforms = id(new PhabricatorTransformedFile())->loadAllWhere(
-      'transformedPHID IN (%Ls)',
-      mpull($files, 'getPHID'));
-    $xform_phids = mpull($xforms, 'getOriginalPHID', 'getTransformedPHID');
-    foreach ($xform_phids as $derived_phid => $original_phid) {
-      $object_phids[$original_phid] = true;
+    if ($need_xforms) {
+      $xforms = id(new PhabricatorTransformedFile())->loadAllWhere(
+        'transformedPHID IN (%Ls)',
+        mpull($need_xforms, 'getPHID'));
+      $xform_phids = mpull($xforms, 'getOriginalPHID', 'getTransformedPHID');
+      foreach ($xform_phids as $derived_phid => $original_phid) {
+        $object_phids[$original_phid] = true;
+      }
+    } else {
+      $xform_phids = array();
     }
 
     $object_phids = array_keys($object_phids);

From ce6e020d5ddb087cb881c3b491b7e55f40cdb424 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 12:12:20 -0700
Subject: [PATCH 713/865] Don't make an expensive, unused call to test if a
 viewer can reassign a task

Summary: Depends on D19224. Ref T13106. Computing this is expensive and the value is not used. This came from D15432, but we never actually shipped that feature.

Test Plan: Saw local query cost drop from 139 to 110 with no change in functionality. Grepped for removed symbols.

Maniphest Tasks: T13106

Differential Revision: https://secure.phabricator.com/D19225
---
 .../ManiphestTaskDetailController.php         |  3 --
 .../editengine/PhabricatorEditEngine.php      | 53 -------------------
 2 files changed, 56 deletions(-)

diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
index ecfb723f97..a11cc4d85f 100644
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -284,9 +284,6 @@ private function buildCurtain(
     $edit_config = $edit_engine->loadDefaultEditConfiguration($task);
     $can_create = (bool)$edit_config;
 
-    $can_reassign = $edit_engine->hasEditAccessToTransaction(
-      ManiphestTaskOwnerTransaction::TRANSACTIONTYPE);
-
     if ($can_create) {
       $form_key = $edit_config->getIdentifier();
       $edit_uri = id(new PhutilURI("/task/edit/form/{$form_key}/"))
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index f0d2aae9ea..f8f6f371bc 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1398,59 +1398,6 @@ private function buildEditFormActions($object) {
   }
 
 
-  /**
-   * Test if the viewer could apply a certain type of change by using the
-   * normal "Edit" form.
-   *
-   * This method returns `true` if the user has access to an edit form and
-   * that edit form has a field which applied the specified transaction type,
-   * and that field is visible and editable for the user.
-   *
-   * For example, you can use it to test if a user is able to reassign tasks
-   * or not, prior to rendering dedicated UI for task reassignment.
-   *
-   * Note that this method does NOT test if the user can actually edit the
-   * current object, just if they have access to the related field.
-   *
-   * @param const Transaction type to test for.
-   * @return bool True if the user could "Edit" to apply the transaction type.
-   */
-  final public function hasEditAccessToTransaction($xaction_type) {
-    $viewer = $this->getViewer();
-
-    $object = $this->getTargetObject();
-    if (!$object) {
-      $object = $this->newEditableObject();
-    }
-
-    $config = $this->loadDefaultEditConfiguration($object);
-    if (!$config) {
-      return false;
-    }
-
-    $fields = $this->buildEditFields($object);
-
-    $field = null;
-    foreach ($fields as $form_field) {
-      $field_xaction_type = $form_field->getTransactionType();
-      if ($field_xaction_type === $xaction_type) {
-        $field = $form_field;
-        break;
-      }
-    }
-
-    if (!$field) {
-      return false;
-    }
-
-    if (!$field->shouldReadValueFromSubmit()) {
-      return false;
-    }
-
-    return true;
-  }
-
-
   public function newNUXButton($text) {
     $specs = $this->newCreateActionSpecifications(array());
     $head = head($specs);

From f348721aed42fb2015a7ce4ee1983e5ac343a2c5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 12:48:20 -0700
Subject: [PATCH 714/865] When loading project membership to evaluate the
 "Subscribers" policy, use the ominipotent viewer

Summary: See PHI448. Ref T13106. The current implementation here can end up in an infinite stack if, e.g., a project uses "Visible to: Subscribers".

Test Plan: Will push.

Maniphest Tasks: T13106

Differential Revision: https://secure.phabricator.com/D19226
---
 .../PhabricatorSubscriptionsSubscribersPolicyRule.php      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php b/src/applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php
index b7644cd68d..922f8c9651 100644
--- a/src/applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php
+++ b/src/applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php
@@ -45,10 +45,13 @@ public function willApplyRules(
       $this->subscribed[$viewer_phid] = array();
     }
 
-    // Load the project PHIDs the user is a member of.
+    // Load the project PHIDs the user is a member of. We use the omnipotent
+    // user here because projects may themselves have "Subscribers" visibility
+    // policies and we don't want to get stuck in an infinite stack of
+    // recursive policy checks. See T13106.
     if (!isset($this->sourcePHIDs[$viewer_phid])) {
       $projects = id(new PhabricatorProjectQuery())
-        ->setViewer($viewer)
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
         ->withMemberPHIDs(array($viewer_phid))
         ->execute();
 

From cd7ba6cd7bf94e690802dc0a3a773c48e19c6a3f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 13:05:49 -0700
Subject: [PATCH 715/865] Improve documentation around using Mail stamps with
 Gmail

Summary: Ref T13069. See PHI54. Some of this behavior isn't entirely obvious, so give users a heads up in the documentation to help warn them about what is to come.

Test Plan: Read documentation.

Maniphest Tasks: T13069

Differential Revision: https://secure.phabricator.com/D19227
---
 src/docs/user/userguide/mail_rules.diviner | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/docs/user/userguide/mail_rules.diviner b/src/docs/user/userguide/mail_rules.diviner
index 61bc3210e9..cdbbf1919d 100644
--- a/src/docs/user/userguide/mail_rules.diviner
+++ b/src/docs/user/userguide/mail_rules.diviner
@@ -43,6 +43,27 @@ The most useful header for routing is generally `X-Phabricator-Stamps`. This
 is a list of attributes which describe the object the mail is about and the
 actions which the mail informs you about.
 
+Stamps and Gmail
+================
+
 If you use a client which can not perform header matching (like Gmail), you can
 change the {nav Settings > Email Format > Send Stamps} setting to include the
 stamps in the mail body and then match them with body rules.
+
+When writing filter rules against mail stamps in Gmail, you should quote any
+filters you want to apply. For example, specify rules like this, with quotes:
+
+> "author(@alice)"
+
+Note that Gmail will ignore some symbols when matching mail against filtering
+rules, so you can get false positives if the body of the message includes text
+like `author alice` (the same words in the same order, without the special
+symbols).
+
+You'll also get false positives if the message body includes the text of a
+mail stamp explicitly in a normal text field like a summary, description, or
+comment.
+
+There's no way to avoid these false positives other than using a different
+client with support for more powerful filtering rules, but these false
+positives should normally be uncommon.

From af8269d2fb064acf01ce4b4b15e28d8434385a2a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 13:56:10 -0700
Subject: [PATCH 716/865] Allow draft revisions to be commandeered

Summary:
See PHI457. There's no real reason not to allow this, it just wasn't clear if it was useful. See D18626.

An install had a user `arc diff` and then sprint out the door to take a very long vacation before the builds finished. One failed, so the revision is stuck as a draft forever. This seems like a reasonable motivation for allowing "Commandeer".

Test Plan: Successfully commandeered a draft.

Differential Revision: https://secure.phabricator.com/D19228
---
 .../xaction/DifferentialRevisionCommandeerTransaction.php    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
index 4169c3e4dc..561e57c7c4 100644
--- a/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php
@@ -66,11 +66,6 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'been closed. You can only commandeer open revisions.'));
     }
 
-    if ($object->isDraft()) {
-      throw new Exception(
-        pht('You can not commandeer a draft revision.'));
-    }
-
     if ($this->isViewerRevisionAuthor($object, $viewer)) {
       throw new Exception(
         pht(

From 2b5c73fc3d7004e46aef0106f171195402040f03 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 14 Mar 2018 10:55:08 -0700
Subject: [PATCH 717/865] In "Analyze Query Plans" mode, collect service call
 stack traces in DarkConsole

Summary: Ref T13106. When profiling service queries, there's no convenient way to easily get a sense of why a query was issued. Add a mode to collect traces for each query to make this more clear. This is rough, but works well enough to be useful.

Test Plan: Clicked "Analyze Query Plans", got stack traces for each service call.

Maniphest Tasks: T13106

Differential Revision: https://secure.phabricator.com/D19221
---
 resources/celerity/map.php                    |  4 ++--
 .../plugin/DarkConsoleServicesPlugin.php      | 24 ++++++++++++++++++-
 webroot/rsrc/css/aphront/dark-console.css     |  9 +++----
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 15388ab9a2..0b49e9f21a 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -23,7 +23,7 @@
     'rsrc/audio/basic/tap.mp3' => 'fc2fd796',
     'rsrc/audio/basic/ting.mp3' => '17660001',
     'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
-    'rsrc/css/aphront/dark-console.css' => 'f7b071f1',
+    'rsrc/css/aphront/dark-console.css' => '0e14e8f6',
     'rsrc/css/aphront/dialog-view.css' => '6bfc244b',
     'rsrc/css/aphront/list-filter-view.css' => '5d6f0526',
     'rsrc/css/aphront/multi-column.css' => '84cc6640',
@@ -518,7 +518,7 @@
   'symbols' => array(
     'almanac-css' => 'dbb9b3af',
     'aphront-bars' => '231ac33c',
-    'aphront-dark-console-css' => 'f7b071f1',
+    'aphront-dark-console-css' => '0e14e8f6',
     'aphront-dialog-view-css' => '6bfc244b',
     'aphront-list-filter-view-css' => '5d6f0526',
     'aphront-multi-column-view-css' => '84cc6640',
diff --git a/src/applications/console/plugin/DarkConsoleServicesPlugin.php b/src/applications/console/plugin/DarkConsoleServicesPlugin.php
index 7d779027da..a14ed4b541 100644
--- a/src/applications/console/plugin/DarkConsoleServicesPlugin.php
+++ b/src/applications/console/plugin/DarkConsoleServicesPlugin.php
@@ -29,6 +29,18 @@ public static function isQueryAnalyzerRequested() {
     return false;
   }
 
+  public function didStartup() {
+    $should_analyze = self::isQueryAnalyzerRequested();
+
+    if ($should_analyze) {
+      PhutilServiceProfiler::getInstance()
+        ->setCollectStackTraces(true);
+    }
+
+    return null;
+  }
+
+
   /**
    * @phutil-external-symbol class PhabricatorStartup
    */
@@ -266,6 +278,16 @@ public function renderPanel() {
         $info,
         $analysis,
       );
+
+      if ($row['trace']) {
+        $rows[] = array(
+          null,
+          null,
+          null,
+          $row['trace'],
+          null,
+        );
+      }
     }
 
     $table = new AphrontTableView($rows);
@@ -274,7 +296,7 @@ public function renderPanel() {
         null,
         'n',
         'n',
-        'wide',
+        'wide prewrap',
         '',
       ));
     $table->setHeaders(
diff --git a/webroot/rsrc/css/aphront/dark-console.css b/webroot/rsrc/css/aphront/dark-console.css
index 81e888ba46..c3833e75bb 100644
--- a/webroot/rsrc/css/aphront/dark-console.css
+++ b/webroot/rsrc/css/aphront/dark-console.css
@@ -104,6 +104,7 @@
   font-size: 11px;
   background: #333333;
   color: #ffffff;
+  border-bottom: 0px;
 }
 
 .dark-console .aphront-table-view td {
@@ -210,10 +211,10 @@
 }
 
 .dark-console-panel-request-log-separator {
-    background-color: #e8e8e8;
-    border-bottom: 1px solid #b7b7b7;
-    border-top: 1px solid #b7b7b7;
-    height: 2px;
+  background-color: #e8e8e8;
+  border-bottom: 1px solid #b7b7b7;
+  border-top: 1px solid #b7b7b7;
+  height: 2px;
 }
 
 .dark-console-panel-ErrorLog {

From c216fd40728bdac9ab415cbcf408ef5e11ad0e9f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Mar 2018 12:53:03 -0700
Subject: [PATCH 718/865] Allow projects to be queried by slug in
 "project.search"

Summary:
Ref T13102. See PHI461. An install is interested in querying projects by slug.

I think I omitted this capability originally only because we're not consistent about what slugs are called (they are "Slugs" internally, but "Hashtags" in the UI).

However, this ship has sort of already sailed because the results have a "slug" field. Just expose this as "slugs" for consistency with the existing API field and try to smooth thing over with a little documentation hint.

Test Plan: Queried for projects by slug, got the desired results back.

Maniphest Tasks: T13102

Differential Revision: https://secure.phabricator.com/D19230
---
 .../project/query/PhabricatorProjectSearchEngine.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
index 452085fa9f..e38532c419 100644
--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
@@ -23,6 +23,14 @@ protected function buildCustomSearchFields() {
       id(new PhabricatorSearchTextField())
         ->setLabel(pht('Name'))
         ->setKey('name'),
+      id(new PhabricatorSearchStringListField())
+        ->setLabel(pht('Slugs'))
+        ->setIsHidden(true)
+        ->setKey('slugs')
+        ->setDescription(
+          pht(
+            'Search for projects with particular slugs. (Slugs are the same '.
+            'as project hashtags.)')),
       id(new PhabricatorUsersSearchField())
         ->setLabel(pht('Members'))
         ->setKey('memberPHIDs')
@@ -81,6 +89,10 @@ protected function buildQueryFromParameters(array $map) {
       $query->withNameTokens($tokens);
     }
 
+    if ($map['slugs']) {
+      $query->withSlugs($map['slugs']);
+    }
+
     if ($map['memberPHIDs']) {
       $query->withMemberPHIDs($map['memberPHIDs']);
     }

From 667955b8aeca6fc10dd1900db068da7a96b7ef33 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Mar 2018 13:03:36 -0700
Subject: [PATCH 719/865] Clarify that a PHUITagView API argument is boolean,
 not a value in "millimeters"

Summary:
See PHI454. Ref T13102. This parameter is not named as clearly as it could be.

This is a buff to API humor.

See also <https://secure.phabricator.com/differential/diff/46024/>.

Test Plan: Read API method, laughed aloud ("LAL") much harder because the humor was now less subtle. Subtle humor is unsuitable for this project.

Maniphest Tasks: T13102

Differential Revision: https://secure.phabricator.com/D19231
---
 src/view/phui/PHUITagView.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/view/phui/PHUITagView.php b/src/view/phui/PHUITagView.php
index 482b3f4400..aa309a4bb6 100644
--- a/src/view/phui/PHUITagView.php
+++ b/src/view/phui/PHUITagView.php
@@ -117,8 +117,8 @@ public function setIcon($icon) {
     return $this;
   }
 
-  public function setSlimShady($mm) {
-    $this->slimShady = $mm;
+  public function setSlimShady($is_eminem) {
+    $this->slimShady = $is_eminem;
     return $this;
   }
 

From fa6cd200e87823a7fd05480015a80ced233d9cd3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Mar 2018 13:18:35 -0700
Subject: [PATCH 720/865] Reduce the severity of policy fatals when building
 the Harbormaster "build status" element

Summary:
See PHI430. Ref T13102. When the "Build Status" element raises a policy exception, we currently fatal the whole page rather than raising a normal policy error.

This is because the policy check happens very late in page construction, long after we've made the decision to show the page instead of a policy error, and gets treated as a rendering error.

In turn, this is because the rendering is event-based rather than using a more modern Engine + EngineExtension sort of construct, so some of the actual logic runs way later than it should.

Since unwinding all of this isn't trivial and the current behavior is materially bad, limit the damage here for now by just hiding the element. See T13088 for notes on handling this in a more nuanced way in the future.

Test Plan:
  - Created a revision visible to "Public".
  - Ran a build against it with a build plan visible to "All Users".
  - Viewed revision in an incognito window.
    - Before patch: Policy fatal with a red "rendering phase" error box.
    - After patch: Mostly-functional page with a missing "Build Status" element.
  - Viewed revision as a user with a normal session, saw the same UI before and after the change.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13102

Differential Revision: https://secure.phabricator.com/D19232
---
 .../event/HarbormasterUIEventListener.php     | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/applications/harbormaster/event/HarbormasterUIEventListener.php b/src/applications/harbormaster/event/HarbormasterUIEventListener.php
index 1227fbbe31..f5e6aee3e7 100644
--- a/src/applications/harbormaster/event/HarbormasterUIEventListener.php
+++ b/src/applications/harbormaster/event/HarbormasterUIEventListener.php
@@ -51,13 +51,22 @@ private function handlePropertyEvent($ui_event) {
       return;
     }
 
-    $buildable = id(new HarbormasterBuildableQuery())
-      ->setViewer($viewer)
-      ->withManualBuildables(false)
-      ->withBuildablePHIDs(array($buildable_phid))
-      ->needBuilds(true)
-      ->needTargets(true)
-      ->executeOne();
+    try {
+      $buildable = id(new HarbormasterBuildableQuery())
+        ->setViewer($viewer)
+        ->withManualBuildables(false)
+        ->withBuildablePHIDs(array($buildable_phid))
+        ->needBuilds(true)
+        ->needTargets(true)
+        ->executeOne();
+    } catch (PhabricatorPolicyException $ex) {
+      // TODO: See PHI430. When this query raises a policy exception, it
+      // fatals the whole page because it happens very late in execution,
+      // during final page rendering. If the viewer can't see the buildable or
+      // some of the builds, just hide this element for now.
+      return;
+    }
+
     if (!$buildable) {
       return;
     }

From dbc72a05bc3918e226db45f91d91c39ab1536c79 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Mar 2018 15:10:26 -0700
Subject: [PATCH 721/865] Correct the behavior of "Desktop Only" in
 Notifications preferences

Summary:
See <https://discourse.phabricator-community.org/t/desktop-only-notifications-mode-is-broken/1234>. Ref T13102. The "Desktop Only" mode for notifications currently shows both desktop and web notifications.

In fact, `JX.Notification` currently has no ability to render notifications as desktop-only. Make this work.

Note that many of the variables and parameters here, including `showAnyNotification`, `web_ready`, and `desktop_ready`, are named in an incorrect or misleading way. However, the new behavior appears to be correct.

Test Plan:
  - Emitted test notifications in "No Notifications", "Web Only", "Web and Desktop", and "Desktop" modes.
  - Saw appropriate notifications appear in the UI.

Maniphest Tasks: T13102

Differential Revision: https://secure.phabricator.com/D19233
---
 resources/celerity/map.php                    | 52 +++++++++----------
 .../aphlict/behavior-aphlict-listen.js        |  3 +-
 webroot/rsrc/js/core/Notification.js          | 13 +++++
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 0b49e9f21a..f5a5a57904 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => 'c218ed53',
-    'core.pkg.js' => '0fabde4f',
+    'core.pkg.js' => '8581cd02',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -352,7 +352,7 @@
     'rsrc/image/texture/table_header_tall.png' => 'd56b434f',
     'rsrc/js/application/aphlict/Aphlict.js' => 'e1d4b11a',
     'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => 'caade6f2',
-    'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => '4cc4f460',
+    'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => '599a8f5f',
     'rsrc/js/application/aphlict/behavior-aphlict-status.js' => '5e2634b9',
     'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => '27ca6289',
     'rsrc/js/application/calendar/behavior-day-view.js' => '4b3c4443',
@@ -445,7 +445,7 @@
     'rsrc/js/core/KeyboardShortcut.js' => '1ae869f2',
     'rsrc/js/core/KeyboardShortcutManager.js' => 'c19dd9b9',
     'rsrc/js/core/MultirowRowManager.js' => 'b5d57730',
-    'rsrc/js/core/Notification.js' => '008faf9c',
+    'rsrc/js/core/Notification.js' => '4f774dac',
     'rsrc/js/core/Prefab.js' => '77b0ae28',
     'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
     'rsrc/js/core/TextAreaUtils.js' => '320810c8',
@@ -566,7 +566,7 @@
     'javelin-aphlict' => 'e1d4b11a',
     'javelin-behavior' => '61cbc29a',
     'javelin-behavior-aphlict-dropdown' => 'caade6f2',
-    'javelin-behavior-aphlict-listen' => '4cc4f460',
+    'javelin-behavior-aphlict-listen' => '599a8f5f',
     'javelin-behavior-aphlict-status' => '5e2634b9',
     'javelin-behavior-aphront-basic-tokenizer' => 'b3a4b884',
     'javelin-behavior-aphront-drag-and-drop-textarea' => '484a6e22',
@@ -772,7 +772,7 @@
     'phabricator-keyboard-shortcut-manager' => 'c19dd9b9',
     'phabricator-main-menu-view' => '1802a242',
     'phabricator-nav-view-css' => 'a9e3e6d5',
-    'phabricator-notification' => '008faf9c',
+    'phabricator-notification' => '4f774dac',
     'phabricator-notification-css' => '457861ec',
     'phabricator-notification-menu-css' => '10685bd4',
     'phabricator-object-selector-css' => '85ee8ce6',
@@ -894,13 +894,6 @@
       'javelin-typeahead-preloaded-source',
       'javelin-util',
     ),
-    '008faf9c' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-util',
-      'phabricator-notification-css',
-    ),
     '013ffff9' => array(
       'javelin-install',
       'javelin-util',
@@ -1259,20 +1252,6 @@
       'javelin-uri',
       'phabricator-notification',
     ),
-    '4cc4f460' => array(
-      'javelin-behavior',
-      'javelin-aphlict',
-      'javelin-stratcom',
-      'javelin-request',
-      'javelin-uri',
-      'javelin-dom',
-      'javelin-json',
-      'javelin-router',
-      'javelin-util',
-      'javelin-leader',
-      'javelin-sound',
-      'phabricator-notification',
-    ),
     '4d863052' => array(
       'javelin-dom',
       'javelin-util',
@@ -1289,6 +1268,13 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
+    '4f774dac' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-util',
+      'phabricator-notification-css',
+    ),
     '503e17fd' => array(
       'javelin-install',
       'javelin-typeahead-source',
@@ -1343,6 +1329,20 @@
       'javelin-uri',
       'phabricator-file-upload',
     ),
+    '599a8f5f' => array(
+      'javelin-behavior',
+      'javelin-aphlict',
+      'javelin-stratcom',
+      'javelin-request',
+      'javelin-uri',
+      'javelin-dom',
+      'javelin-json',
+      'javelin-router',
+      'javelin-util',
+      'javelin-leader',
+      'javelin-sound',
+      'phabricator-notification',
+    ),
     '59a7976a' => array(
       'javelin-install',
       'javelin-dom',
diff --git a/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js b/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
index 24571b5981..ac058bde40 100644
--- a/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
+++ b/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
@@ -78,7 +78,7 @@ JX.behavior('aphlict-listen', function(config) {
     JX.Stratcom.invoke('notification-panel-update', null, {});
     var response = e.getData();
 
-    if (!response.showAnyNotification) {
+    if (!response.showAnyNotification && !response.showDesktopNotification) {
       return;
     }
 
@@ -86,6 +86,7 @@ JX.behavior('aphlict-listen', function(config) {
     new JX.Notification()
       .setContent(JX.$H(response.content))
       .setKey(response.primaryObjectPHID)
+      .setShowAsWebNotification(response.showAnyNotification)
       .setShowAsDesktopNotification(response.showDesktopNotification)
       .setTitle(response.title)
       .setBody(response.body)
diff --git a/webroot/rsrc/js/core/Notification.js b/webroot/rsrc/js/core/Notification.js
index 13e6cc47ae..67e1e5c910 100644
--- a/webroot/rsrc/js/core/Notification.js
+++ b/webroot/rsrc/js/core/Notification.js
@@ -27,6 +27,7 @@ JX.install('Notification', {
     _hideTimer : null,
     _duration : 12000,
     _asDesktop : false,
+    _asWeb : true,
     _key : null,
     _title : null,
     _body : null,
@@ -88,6 +89,11 @@ JX.install('Notification', {
       return this;
     },
 
+    setShowAsWebNotification: function(mode) {
+      this._asWeb = mode;
+      return this;
+    },
+
     setShowAsDesktopNotification : function(mode) {
       this._asDesktop = mode;
       return this;
@@ -242,6 +248,13 @@ JX.install('Notification', {
 
       var notifications = [];
       for (var ii = 0; ii < self._active.length; ii++) {
+
+        // Don't render this notification if it's not configured to show as
+        // a web notification.
+        if (!self._active[ii]._asWeb) {
+          continue;
+        }
+
         notifications.push(self._active[ii]._getContainer());
         if (!(--limit)) {
           break;

From 2fa904921e1a37b566227e3c37e4b1bccffcb2d5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Mar 2018 15:33:57 -0700
Subject: [PATCH 722/865] Render object monograms and embedding references more
 gracefully when building a Remarkup table of contents

Summary:
Fixes T8845. Ref T13102. See PHI467. Currently, object monograms like `L1` which appear in Remarkup headers render incorrectly (with an internal placeholder "x") in the table of contents:

{F5475505}

Instead, render them down to just, e.g., `L1` in plain text.

For `{P123}` I just rendered it to `{P123}` since it's not really clear to me what users intend. This could be adjusted if there's some reasonable thing that someone is trying to do with this.

Test Plan: Wrote a Phriction document with several object references (like `L1` and `{P123}`) in headers. After patch, saw "x"-free, sensible-looking header names in the table of contents.

Maniphest Tasks: T13102, T8845

Differential Revision: https://secure.phabricator.com/D19234
---
 .../markup/rule/PhabricatorObjectRemarkupRule.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php b/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
index fbbfa36805..31b4e52250 100644
--- a/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
+++ b/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
@@ -279,6 +279,15 @@ public function markupObjectEmbed(array $matches) {
       return $matches[0];
     }
 
+    // If we're rendering a table of contents, just render the raw input.
+    // This could perhaps be handled more gracefully but it seems unusual to
+    // put something like "{P123}" in a header and it's not obvious what users
+    // expect? See T8845.
+    $engine = $this->getEngine();
+    if ($engine->getState('toc')) {
+      return $matches[0];
+    }
+
     return $this->markupObject(array(
       'type' => 'embed',
       'id' => $matches[1],
@@ -292,6 +301,12 @@ public function markupObjectReference(array $matches) {
       return $matches[0];
     }
 
+    // If we're rendering a table of contents, just render the monogram.
+    $engine = $this->getEngine();
+    if ($engine->getState('toc')) {
+      return $matches[0];
+    }
+
     return $this->markupObject(array(
       'type' => 'ref',
       'id' => $matches[1],

From 7e43b740551265378097dba614c0eda0f07ed01c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 15 Mar 2018 13:34:34 -0700
Subject: [PATCH 723/865] Give all commands from DiffusionCommandEngine a
 default 15 minute timeout

Summary:
Ref T13108. See PHI364. See the task and issue for discussion.

If a `git fetch` during synchronization hangs, the whole node currently hangs. While the causes of a `git fetch` hang aren't clear, we don't expect synchronization to ever reasonably take more than 15 minutes, so add a default timeout.

Test Plan: Will deploy and observe; this is difficult to reproduce or test directly.

Maniphest Tasks: T13108

Differential Revision: https://secure.phabricator.com/D19235
---
 .../diffusion/protocol/DiffusionCommandEngine.php            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/applications/diffusion/protocol/DiffusionCommandEngine.php b/src/applications/diffusion/protocol/DiffusionCommandEngine.php
index 53a086db33..d7da62b11d 100644
--- a/src/applications/diffusion/protocol/DiffusionCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionCommandEngine.php
@@ -135,6 +135,11 @@ public function newFuture() {
 
     $future->setEnv($env);
 
+    // See T13108. By default, don't let any cluster command run indefinitely
+    // to try to avoid cases where `git fetch` hangs for some reason and we're
+    // left sitting with a held lock forever.
+    $future->setTimeout(phutil_units('15 minutes in seconds'));
+
     return $future;
   }
 

From c5e4bd8187c6a0529b1a509df8b5d43036e17a3b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 18 Mar 2018 14:33:40 -0700
Subject: [PATCH 724/865] Fix some minor errors (DarkConsole warning, unstable
 Ferret sort)

Summary:
DarkConsole could warn when "Analyze Query Plans" was not active.

`msort()` is not stable, so Ferret results with similar relevance could be returned out-of-order.

Test Plan: Saw fewer traces and more-stable result ordering.

Differential Revision: https://secure.phabricator.com/D19236
---
 src/applications/console/plugin/DarkConsoleServicesPlugin.php   | 2 +-
 .../fulltextstorage/PhabricatorFerretFulltextStorageEngine.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/console/plugin/DarkConsoleServicesPlugin.php b/src/applications/console/plugin/DarkConsoleServicesPlugin.php
index a14ed4b541..4a26665e0a 100644
--- a/src/applications/console/plugin/DarkConsoleServicesPlugin.php
+++ b/src/applications/console/plugin/DarkConsoleServicesPlugin.php
@@ -279,7 +279,7 @@ public function renderPanel() {
         $analysis,
       );
 
-      if ($row['trace']) {
+      if (isset($row['trace'])) {
         $rows[] = array(
           null,
           null,
diff --git a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
index a7d9570c57..fa03bcafdd 100644
--- a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
+++ b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php
@@ -104,7 +104,7 @@ public function executeSearch(PhabricatorSavedQuery $query) {
     // Reorder the results so that the highest-ranking results come first,
     // no matter which object types they belong to.
 
-    $metadata = msort($metadata, 'getRelevanceSortVector');
+    $metadata = msortv($metadata, 'getRelevanceSortVector');
     $list = array_select_keys($list, array_keys($metadata)) + $list;
 
     $result_slice = array_slice($list, $offset, $limit, true);

From 01f22a8d06c9a85dc6bf2deebfab55281153a851 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 19 Mar 2018 09:00:48 -0700
Subject: [PATCH 725/865] Roughly modularize document rendering in Files

Summary:
Ref T13105. This change begins modularizing document rendering. I'm starting in Files since it's the use case with the smallest amount of complexity.

Currently, we hard-coding the inline rendering for images, audio, and video. Instead, use the modular engine pattern to make rendering flexible and extensible.

There aren't any options for switching modes yet and none of the renderers do anything fancy. This API is also probably very unstable.

Test Plan: Viewwed images, audio, video, and other files. Saw reasonable renderings, with "nothing can render this" for any other file type.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19237
---
 resources/celerity/map.php                    |   6 +-
 src/__phutil_library_map__.php                |  12 ++
 .../PhabricatorFileInfoController.php         | 122 +++++++++---------
 .../PhabricatorAudioDocumentEngine.php        |  61 +++++++++
 .../document/PhabricatorDocumentEngine.php    |  62 +++++++++
 .../files/document/PhabricatorDocumentRef.php |  93 +++++++++++++
 .../PhabricatorImageDocumentEngine.php        |  63 +++++++++
 .../PhabricatorVideoDocumentEngine.php        |  61 +++++++++
 .../PhabricatorVoidDocumentEngine.php         |  34 +++++
 src/view/phui/PHUIHeaderView.php              |  11 +-
 .../rsrc/css/phui/phui-property-list-view.css |  47 ++++---
 11 files changed, 485 insertions(+), 87 deletions(-)
 create mode 100644 src/applications/files/document/PhabricatorAudioDocumentEngine.php
 create mode 100644 src/applications/files/document/PhabricatorDocumentEngine.php
 create mode 100644 src/applications/files/document/PhabricatorDocumentRef.php
 create mode 100644 src/applications/files/document/PhabricatorImageDocumentEngine.php
 create mode 100644 src/applications/files/document/PhabricatorVideoDocumentEngine.php
 create mode 100644 src/applications/files/document/PhabricatorVoidDocumentEngine.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f5a5a57904..88a4a366d7 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'c218ed53',
+    'core.pkg.css' => '6a8ba174',
     'core.pkg.js' => '8581cd02',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -168,7 +168,7 @@
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-property-list-view.css' => '2dc7993f',
+    'rsrc/css/phui/phui-property-list-view.css' => '79fc3a02',
     'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -848,7 +848,7 @@
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-property-list-view-css' => '2dc7993f',
+    'phui-property-list-view-css' => '79fc3a02',
     'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4caa7f563d..5fff5b53df 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2066,6 +2066,7 @@
     'PhabricatorAsanaConfigOptions' => 'applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php',
     'PhabricatorAsanaSubtaskHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorAsanaSubtaskHasObjectEdgeType.php',
     'PhabricatorAsanaTaskHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorAsanaTaskHasObjectEdgeType.php',
+    'PhabricatorAudioDocumentEngine' => 'applications/files/document/PhabricatorAudioDocumentEngine.php',
     'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php',
     'PhabricatorAuditApplication' => 'applications/audit/application/PhabricatorAuditApplication.php',
     'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php',
@@ -2808,6 +2809,8 @@
     'PhabricatorDividerEditField' => 'applications/transactions/editfield/PhabricatorDividerEditField.php',
     'PhabricatorDividerProfileMenuItem' => 'applications/search/menuitem/PhabricatorDividerProfileMenuItem.php',
     'PhabricatorDivinerApplication' => 'applications/diviner/application/PhabricatorDivinerApplication.php',
+    'PhabricatorDocumentEngine' => 'applications/files/document/PhabricatorDocumentEngine.php',
+    'PhabricatorDocumentRef' => 'applications/files/document/PhabricatorDocumentRef.php',
     'PhabricatorDoorkeeperApplication' => 'applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php',
     'PhabricatorDraft' => 'applications/draft/storage/PhabricatorDraft.php',
     'PhabricatorDraftDAO' => 'applications/draft/storage/PhabricatorDraftDAO.php',
@@ -3155,6 +3158,7 @@
     'PhabricatorIconSet' => 'applications/files/iconset/PhabricatorIconSet.php',
     'PhabricatorIconSetEditField' => 'applications/transactions/editfield/PhabricatorIconSetEditField.php',
     'PhabricatorIconSetIcon' => 'applications/files/iconset/PhabricatorIconSetIcon.php',
+    'PhabricatorImageDocumentEngine' => 'applications/files/document/PhabricatorImageDocumentEngine.php',
     'PhabricatorImageMacroRemarkupRule' => 'applications/macro/markup/PhabricatorImageMacroRemarkupRule.php',
     'PhabricatorImageRemarkupRule' => 'applications/files/markup/PhabricatorImageRemarkupRule.php',
     'PhabricatorImageTransformer' => 'applications/files/PhabricatorImageTransformer.php',
@@ -4481,7 +4485,9 @@
     'PhabricatorVCSResponse' => 'applications/repository/response/PhabricatorVCSResponse.php',
     'PhabricatorVersionedDraft' => 'applications/draft/storage/PhabricatorVersionedDraft.php',
     'PhabricatorVeryWowEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorVeryWowEnglishTranslation.php',
+    'PhabricatorVideoDocumentEngine' => 'applications/files/document/PhabricatorVideoDocumentEngine.php',
     'PhabricatorViewerDatasource' => 'applications/people/typeahead/PhabricatorViewerDatasource.php',
+    'PhabricatorVoidDocumentEngine' => 'applications/files/document/PhabricatorVoidDocumentEngine.php',
     'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php',
     'PhabricatorWebContentSource' => 'infrastructure/contentsource/PhabricatorWebContentSource.php',
     'PhabricatorWebServerSetupCheck' => 'applications/config/check/PhabricatorWebServerSetupCheck.php',
@@ -7497,6 +7503,7 @@
     'PhabricatorAsanaConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorAsanaSubtaskHasObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorAsanaTaskHasObjectEdgeType' => 'PhabricatorEdgeType',
+    'PhabricatorAudioDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorAuditActionConstants' => 'Phobject',
     'PhabricatorAuditApplication' => 'PhabricatorApplication',
     'PhabricatorAuditCommentEditor' => 'PhabricatorEditor',
@@ -8362,6 +8369,8 @@
     'PhabricatorDividerEditField' => 'PhabricatorEditField',
     'PhabricatorDividerProfileMenuItem' => 'PhabricatorProfileMenuItem',
     'PhabricatorDivinerApplication' => 'PhabricatorApplication',
+    'PhabricatorDocumentEngine' => 'Phobject',
+    'PhabricatorDocumentRef' => 'Phobject',
     'PhabricatorDoorkeeperApplication' => 'PhabricatorApplication',
     'PhabricatorDraft' => 'PhabricatorDraftDAO',
     'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
@@ -8756,6 +8765,7 @@
     'PhabricatorIconSet' => 'Phobject',
     'PhabricatorIconSetEditField' => 'PhabricatorEditField',
     'PhabricatorIconSetIcon' => 'Phobject',
+    'PhabricatorImageDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorImageMacroRemarkupRule' => 'PhutilRemarkupRule',
     'PhabricatorImageRemarkupRule' => 'PhutilRemarkupRule',
     'PhabricatorImageTransformer' => 'Phobject',
@@ -10330,7 +10340,9 @@
     'PhabricatorVCSResponse' => 'AphrontResponse',
     'PhabricatorVersionedDraft' => 'PhabricatorDraftDAO',
     'PhabricatorVeryWowEnglishTranslation' => 'PhutilTranslation',
+    'PhabricatorVideoDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorViewerDatasource' => 'PhabricatorTypeaheadDatasource',
+    'PhabricatorVoidDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorWebContentSource' => 'PhabricatorContentSource',
     'PhabricatorWebServerSetupCheck' => 'PhabricatorSetupCheck',
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
index 976324d0b2..fe8d37ab80 100644
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -23,6 +23,7 @@ public function handleRequest(AphrontRequest $request) {
       }
       return id(new AphrontRedirectResponse())->setURI($file->getInfoURI());
     }
+
     $file = id(new PhabricatorFileQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
@@ -62,31 +63,34 @@ public function handleRequest(AphrontRequest $request) {
     $timeline = $this->buildTransactionView($file);
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(
-      'F'.$file->getID(),
-      $this->getApplicationURI("/info/{$phid}/"));
+      $file->getMonogram(),
+      $file->getInfoURI());
     $crumbs->setBorder(true);
 
     $object_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('File'))
+      ->setHeaderText(pht('File Metadata'))
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
 
     $this->buildPropertyViews($object_box, $file);
     $title = $file->getName();
 
+    $file_content = $this->newFileContent($file);
+
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->setCurtain($curtain)
-      ->setMainColumn(array(
-        $object_box,
-        $timeline,
-      ));
+      ->setMainColumn(
+        array(
+          $object_box,
+          $file_content,
+          $timeline,
+        ));
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
       ->setPageObjectPHIDs(array($file->getPHID()))
       ->appendChild($view);
-
   }
 
   private function buildTransactionView(PhabricatorFile $file) {
@@ -325,61 +329,6 @@ private function buildPropertyViews(
         $viewer->renderHandleList($phids));
     }
 
-    if ($file->isViewableImage()) {
-      $image = phutil_tag(
-        'img',
-        array(
-          'src' => $file->getViewURI(),
-          'class' => 'phui-property-list-image',
-        ));
-
-      $linked_image = phutil_tag(
-        'a',
-        array(
-          'href' => $file->getViewURI(),
-        ),
-        $image);
-
-      $media = id(new PHUIPropertyListView())
-        ->addImageContent($linked_image);
-
-      $box->addPropertyList($media);
-    } else if ($file->isVideo()) {
-      $video = phutil_tag(
-        'video',
-        array(
-          'controls' => 'controls',
-          'class' => 'phui-property-list-video',
-        ),
-        phutil_tag(
-          'source',
-          array(
-            'src' => $file->getViewURI(),
-            'type' => $file->getMimeType(),
-          )));
-      $media = id(new PHUIPropertyListView())
-        ->addImageContent($video);
-
-      $box->addPropertyList($media);
-    } else if ($file->isAudio()) {
-      $audio = phutil_tag(
-        'audio',
-        array(
-          'controls' => 'controls',
-          'class' => 'phui-property-list-audio',
-        ),
-        phutil_tag(
-          'source',
-          array(
-            'src' => $file->getViewURI(),
-            'type' => $file->getMimeType(),
-          )));
-      $media = id(new PHUIPropertyListView())
-        ->addImageContent($audio);
-
-      $box->addPropertyList($media);
-    }
-
     $engine = $this->loadStorageEngine($file);
     if ($engine) {
       if ($engine->isChunkEngine()) {
@@ -453,5 +402,52 @@ private function loadStorageEngine(PhabricatorFile $file) {
     return $engine;
   }
 
+  private function newFileContent(PhabricatorFile $file) {
+    $viewer = $this->getViewer();
+    $engines = PhabricatorDocumentEngine::getAllEngines();
+
+    $ref = id(new PhabricatorDocumentRef())
+      ->setFile($file);
+
+    foreach ($engines as $key => $engine) {
+      $engine = id(clone $engine)
+        ->setViewer($viewer);
+
+      if (!$engine->canRenderDocument($ref)) {
+        unset($engines[$key]);
+        continue;
+      }
+
+      $engines[$key] = $engine;
+    }
+
+    if (!$engines) {
+      throw new Exception(pht('No engine can render this document.'));
+    }
+
+    $vectors = array();
+    foreach ($engines as $key => $usable_engine) {
+      $vectors[$key] = $usable_engine->newSortVector($ref);
+    }
+    $vectors = msortv($vectors, 'getSelf');
+
+    $engine = $engines[head_key($vectors)];
+
+    $content = $engine->newDocument($ref);
+    if (!$content) {
+      return null;
+    }
+
+    $icon = $engine->newDocumentIcon($ref);
+
+    $header = id(new PHUIHeaderView())
+      ->setHeaderIcon($icon)
+      ->setHeader($ref->getName());
+
+    return id(new PHUIObjectBoxView())
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setHeader($header)
+      ->appendChild($content);
+  }
 
 }
diff --git a/src/applications/files/document/PhabricatorAudioDocumentEngine.php b/src/applications/files/document/PhabricatorAudioDocumentEngine.php
new file mode 100644
index 0000000000..afbc10e70b
--- /dev/null
+++ b/src/applications/files/document/PhabricatorAudioDocumentEngine.php
@@ -0,0 +1,61 @@
+<?php
+
+final class PhabricatorAudioDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  const ENGINEKEY = 'audio';
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-file-sound-o';
+  }
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    $file = $ref->getFile();
+    if ($file) {
+      return $file->isAudio();
+    }
+
+    $viewable_types = PhabricatorEnv::getEnvConfig('files.viewable-mime-types');
+    $viewable_types = array_keys($viewable_types);
+
+    $audio_types = PhabricatorEnv::getEnvConfig('files.audio-mime-types');
+    $audio_types = array_keys($audio_types);
+
+    return
+      $ref->hasAnyMimeType($viewable_types) &&
+      $ref->hasAnyMimeType($audio_types);
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $file = $ref->getFile();
+    if ($file) {
+      $source_uri = $file->getViewURI();
+    } else {
+      throw new PhutilMethodNotImplementedException();
+    }
+
+    $mime_type = $ref->getMimeType();
+
+    $audio = phutil_tag(
+      'audio',
+      array(
+        'controls' => 'controls',
+      ),
+      phutil_tag(
+        'source',
+        array(
+          'src' => $source_uri,
+          'type' => $mime_type,
+        )));
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-audio',
+      ),
+      $audio);
+
+    return $container;
+  }
+
+}
diff --git a/src/applications/files/document/PhabricatorDocumentEngine.php b/src/applications/files/document/PhabricatorDocumentEngine.php
new file mode 100644
index 0000000000..0c72ce9fd1
--- /dev/null
+++ b/src/applications/files/document/PhabricatorDocumentEngine.php
@@ -0,0 +1,62 @@
+<?php
+
+abstract class PhabricatorDocumentEngine
+  extends Phobject {
+
+  private $viewer;
+
+  final public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  final public function canRenderDocument(PhabricatorDocumentRef $ref) {
+    return $this->canRenderDocumentType($ref);
+  }
+
+  abstract protected function canRenderDocumentType(
+    PhabricatorDocumentRef $ref);
+
+  final public function newDocument(PhabricatorDocumentRef $ref) {
+    return $this->newDocumentContent($ref);
+  }
+
+  final public function newDocumentIcon(PhabricatorDocumentRef $ref) {
+    return id(new PHUIIconView())
+      ->setIcon($this->getDocumentIconIcon($ref));
+  }
+
+  abstract protected function newDocumentContent(
+    PhabricatorDocumentRef $ref);
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-file-o';
+  }
+
+  final public function getDocumentEngineKey() {
+    return $this->getPhobjectClassConstant('ENGINEKEY');
+  }
+
+  final public static function getAllEngines() {
+    return id(new PhutilClassMapQuery())
+      ->setAncestorClass(__CLASS__)
+      ->setUniqueMethod('getDocumentEngineKey')
+      ->execute();
+  }
+
+  final public function newSortVector(PhabricatorDocumentRef $ref) {
+    $content_score = $this->getContentScore($ref);
+
+    return id(new PhutilSortVector())
+      ->addInt(-$content_score);
+  }
+
+  protected function getContentScore() {
+    return 2000;
+  }
+
+}
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
new file mode 100644
index 0000000000..cb36cbaed7
--- /dev/null
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -0,0 +1,93 @@
+<?php
+
+final class PhabricatorDocumentRef
+  extends Phobject {
+
+  private $name;
+  private $mimeType;
+  private $file;
+  private $byteLength;
+
+  public function setFile(PhabricatorFile $file) {
+    $this->file = $file;
+    return $this;
+  }
+
+  public function getFile() {
+    return $this->file;
+  }
+
+  public function setMimeType($mime_type) {
+    $this->mimeType = $mime_type;
+    return $this;
+  }
+
+  public function getMimeType() {
+    if ($this->mimeType !== null) {
+      return $this->mimeType;
+    }
+
+    if ($this->file) {
+      return $this->file->getMimeType();
+    }
+
+    return null;
+  }
+
+  public function setName($name) {
+    $this->name = $name;
+    return $this;
+  }
+
+  public function getName() {
+    if ($this->name !== null) {
+      return $this->name;
+    }
+
+    if ($this->file) {
+      return $this->file->getName();
+    }
+
+    return null;
+  }
+
+  public function setByteLength($length) {
+    $this->byteLength = $length;
+    return $this;
+  }
+
+  public function getLength() {
+    if ($this->byteLength !== null) {
+      return $this->byteLength;
+    }
+
+    if ($this->file) {
+      return (int)$this->file->getByteSize();
+    }
+
+    return null;
+  }
+
+  public function hasAnyMimeType(array $candidate_types) {
+    $mime_full = $this->getMimeType();
+    $mime_parts = explode(';', $mime_full);
+
+    $mime_type = head($mime_parts);
+    $mime_type = $this->normalizeMimeType($mime_type);
+
+    foreach ($candidate_types as $candidate_type) {
+      if ($this->normalizeMimeType($candidate_type) === $mime_type) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  private function normalizeMimeType($mime_type) {
+    $mime_type = trim($mime_type);
+    $mime_type = phutil_utf8_strtolower($mime_type);
+    return $mime_type;
+  }
+
+}
diff --git a/src/applications/files/document/PhabricatorImageDocumentEngine.php b/src/applications/files/document/PhabricatorImageDocumentEngine.php
new file mode 100644
index 0000000000..ab5753680b
--- /dev/null
+++ b/src/applications/files/document/PhabricatorImageDocumentEngine.php
@@ -0,0 +1,63 @@
+<?php
+
+final class PhabricatorImageDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  const ENGINEKEY = 'image';
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-file-image-o';
+  }
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    $file = $ref->getFile();
+    if ($file) {
+      return $file->isViewableImage();
+    }
+
+    $viewable_types = PhabricatorEnv::getEnvConfig('files.viewable-mime-types');
+    $viewable_types = array_keys($viewable_types);
+
+    $image_types = PhabricatorEnv::getEnvConfig('files.image-mime-types');
+    $image_types = array_keys($image_types);
+
+    return
+      $ref->hasAnyMimeType($viewable_types) &&
+      $ref->hasAnyMimeType($image_types);
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $file = $ref->getFile();
+    if ($file) {
+      $source_uri = $file->getViewURI();
+    } else {
+      // We could use a "data:" URI here. It's not yet clear if or when we'll
+      // have a ref but no backing file.
+      throw new PhutilMethodNotImplementedException();
+    }
+
+    $image = phutil_tag(
+      'img',
+      array(
+        'src' => $source_uri,
+      ));
+
+    $linked_image = phutil_tag(
+      'a',
+      array(
+        'href' => $source_uri,
+        'rel' => 'noreferrer',
+      ),
+      $image);
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-image',
+      ),
+      $linked_image);
+
+    return $container;
+  }
+
+}
diff --git a/src/applications/files/document/PhabricatorVideoDocumentEngine.php b/src/applications/files/document/PhabricatorVideoDocumentEngine.php
new file mode 100644
index 0000000000..81573b6e93
--- /dev/null
+++ b/src/applications/files/document/PhabricatorVideoDocumentEngine.php
@@ -0,0 +1,61 @@
+<?php
+
+final class PhabricatorVideoDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  const ENGINEKEY = 'video';
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-film';
+  }
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    $file = $ref->getFile();
+    if ($file) {
+      return $file->isVideo();
+    }
+
+    $viewable_types = PhabricatorEnv::getEnvConfig('files.viewable-mime-types');
+    $viewable_types = array_keys($viewable_types);
+
+    $video_types = PhabricatorEnv::getEnvConfig('files.video-mime-types');
+    $video_types = array_keys($video_types);
+
+    return
+      $ref->hasAnyMimeType($viewable_types) &&
+      $ref->hasAnyMimeType($video_types);
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $file = $ref->getFile();
+    if ($file) {
+      $source_uri = $file->getViewURI();
+    } else {
+      throw new PhutilMethodNotImplementedException();
+    }
+
+    $mime_type = $ref->getMimeType();
+
+    $video = phutil_tag(
+      'video',
+      array(
+        'controls' => 'controls',
+      ),
+      phutil_tag(
+        'source',
+        array(
+          'src' => $source_uri,
+          'type' => $mime_type,
+        )));
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-video',
+      ),
+      $video);
+
+    return $container;
+  }
+
+}
diff --git a/src/applications/files/document/PhabricatorVoidDocumentEngine.php b/src/applications/files/document/PhabricatorVoidDocumentEngine.php
new file mode 100644
index 0000000000..a57514edb8
--- /dev/null
+++ b/src/applications/files/document/PhabricatorVoidDocumentEngine.php
@@ -0,0 +1,34 @@
+<?php
+
+final class PhabricatorVoidDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  const ENGINEKEY = 'void';
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-file';
+  }
+
+  protected function getContentScore() {
+    return 1000;
+  }
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    return true;
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $message = pht(
+      'No document engine can render the contents of this file.');
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-message',
+      ),
+      $message);
+
+    return $container;
+  }
+
+}
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
index 53ec096265..4ac4b2de54 100644
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -307,9 +307,14 @@ protected function getTagContent() {
 
     $icon = null;
     if ($this->headerIcon) {
-      $icon = id(new PHUIIconView())
-        ->setIcon($this->headerIcon)
-        ->addClass('phui-header-icon');
+      if ($this->headerIcon instanceof PHUIIconView) {
+        $icon = id(clone $this->headerIcon)
+          ->addClass('phui-header-icon');
+      } else {
+        $icon = id(new PHUIIconView())
+          ->setIcon($this->headerIcon)
+          ->addClass('phui-header-icon');
+      }
     }
 
     $header_content = $this->header;
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
index 16a78e219c..a598438d99 100644
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -149,24 +149,6 @@ div.phui-property-list-stacked .phui-property-list-properties
 }
 
 
-.phui-property-list-image {
-  margin: auto;
-  max-width: 95%;
-}
-
-.phui-property-list-audio {
-  display: block;
-  margin: 16px auto;
-  width: 50%;
-  min-width: 240px;
-}
-
-.phui-property-list-video {
-  display: block;
-  margin: 0 auto;
-  max-width: 95%;
-}
-
 /* When tags appear in property lists, give them a little more vertical
    spacing. */
 .phui-property-list-value .phui-tag-view {
@@ -220,3 +202,32 @@ div.phui-property-list-stacked .phui-property-list-properties
   border-right: 1px solid {$lightblueborder};
   border-bottom: 1px solid {$blueborder};
 }
+
+
+.document-engine-image img {
+  margin: 20px auto;
+  background: url('http://github.com/rsrc/image/checker_light.png');
+}
+
+.device-desktop .document-engine-image img:hover {
+  background: url('http://github.com/rsrc/image/checker_dark.png');
+}
+
+.document-engine-video video {
+  margin: 20px auto;
+  display: block;
+  max-width: 95%;
+}
+
+.document-engine-audio audio {
+  display: block;
+  margin: 16px auto;
+  width: 50%;
+  min-width: 240px;
+}
+
+.document-engine-message {
+  margin: 20px auto;
+  text-align: center;
+  color: {$greytext};
+}

From f646153f4dbe6303856a2f383526d1c539a3b060 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 19 Mar 2018 10:55:02 -0700
Subject: [PATCH 726/865] Add an async driver for document rendering and a
 crude "Hexdump" document engine

Summary: Depends on D19237. Ref T13105. This adds a (very basic) "Hexdump" engine (mostly just to have a second option to switch to) and a selector for choosing view modes.

Test Plan: Viewed some files, switched between audio/video/image/hexdump.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19238
---
 resources/celerity/map.php                    |  13 +-
 src/__phutil_library_map__.php                |   4 +
 .../PhabricatorFilesApplication.php           |   2 +
 .../PhabricatorFileDocumentController.php     | 113 ++++++++++++++++++
 .../PhabricatorFileInfoController.php         |  66 ++++++----
 .../PhabricatorAudioDocumentEngine.php        |   4 +
 .../document/PhabricatorDocumentEngine.php    |  48 ++++++++
 .../files/document/PhabricatorDocumentRef.php |   8 ++
 .../PhabricatorHexdumpDocumentEngine.php      |  83 +++++++++++++
 .../PhabricatorImageDocumentEngine.php        |   4 +
 .../PhabricatorVideoDocumentEngine.php        |   4 +
 .../PhabricatorVoidDocumentEngine.php         |   4 +
 .../rsrc/css/phui/phui-property-list-view.css |  11 ++
 .../files/behavior-document-engine.js         |  67 +++++++++++
 14 files changed, 405 insertions(+), 26 deletions(-)
 create mode 100644 src/applications/files/controller/PhabricatorFileDocumentController.php
 create mode 100644 src/applications/files/document/PhabricatorHexdumpDocumentEngine.php
 create mode 100644 webroot/rsrc/js/application/files/behavior-document-engine.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 88a4a366d7..8e7ce6e258 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '6a8ba174',
+    'core.pkg.css' => '97dc0e74',
     'core.pkg.js' => '8581cd02',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -168,7 +168,7 @@
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-property-list-view.css' => '79fc3a02',
+    'rsrc/css/phui/phui-property-list-view.css' => 'ef864066',
     'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -392,6 +392,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
+    'rsrc/js/application/files/behavior-document-engine.js' => 'f6d6f389',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -606,6 +607,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
+    'javelin-behavior-document-engine' => 'f6d6f389',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -848,7 +850,7 @@
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-property-list-view-css' => '79fc3a02',
+    'phui-property-list-view-css' => 'ef864066',
     'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
@@ -2151,6 +2153,11 @@
       'javelin-util',
       'javelin-reactor',
     ),
+    'f6d6f389' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     'f829edb3' => array(
       'javelin-view',
       'javelin-install',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 5fff5b53df..aef91c2e6b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3001,6 +3001,7 @@
     'PhabricatorFileDataController' => 'applications/files/controller/PhabricatorFileDataController.php',
     'PhabricatorFileDeleteController' => 'applications/files/controller/PhabricatorFileDeleteController.php',
     'PhabricatorFileDeleteTransaction' => 'applications/files/xaction/PhabricatorFileDeleteTransaction.php',
+    'PhabricatorFileDocumentController' => 'applications/files/controller/PhabricatorFileDocumentController.php',
     'PhabricatorFileDropUploadController' => 'applications/files/controller/PhabricatorFileDropUploadController.php',
     'PhabricatorFileEditController' => 'applications/files/controller/PhabricatorFileEditController.php',
     'PhabricatorFileEditEngine' => 'applications/files/editor/PhabricatorFileEditEngine.php',
@@ -3140,6 +3141,7 @@
     'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/PhabricatorHelpKeyboardShortcutController.php',
     'PhabricatorHeraldApplication' => 'applications/herald/application/PhabricatorHeraldApplication.php',
     'PhabricatorHeraldContentSource' => 'applications/herald/contentsource/PhabricatorHeraldContentSource.php',
+    'PhabricatorHexdumpDocumentEngine' => 'applications/files/document/PhabricatorHexdumpDocumentEngine.php',
     'PhabricatorHighSecurityRequestExceptionHandler' => 'aphront/handler/PhabricatorHighSecurityRequestExceptionHandler.php',
     'PhabricatorHomeApplication' => 'applications/home/application/PhabricatorHomeApplication.php',
     'PhabricatorHomeConstants' => 'applications/home/constants/PhabricatorHomeConstants.php',
@@ -8590,6 +8592,7 @@
     'PhabricatorFileDataController' => 'PhabricatorFileController',
     'PhabricatorFileDeleteController' => 'PhabricatorFileController',
     'PhabricatorFileDeleteTransaction' => 'PhabricatorFileTransactionType',
+    'PhabricatorFileDocumentController' => 'PhabricatorFileController',
     'PhabricatorFileDropUploadController' => 'PhabricatorFileController',
     'PhabricatorFileEditController' => 'PhabricatorFileController',
     'PhabricatorFileEditEngine' => 'PhabricatorEditEngine',
@@ -8747,6 +8750,7 @@
     'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController',
     'PhabricatorHeraldApplication' => 'PhabricatorApplication',
     'PhabricatorHeraldContentSource' => 'PhabricatorContentSource',
+    'PhabricatorHexdumpDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorHighSecurityRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
     'PhabricatorHomeApplication' => 'PhabricatorApplication',
     'PhabricatorHomeConstants' => 'PhabricatorHomeController',
diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
index 2d3a1b35c6..d95972d10e 100644
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -89,6 +89,8 @@ public function getRoutes() {
         'iconset/(?P<key>[^/]+)/' => array(
           'select/' => 'PhabricatorFileIconSetSelectController',
         ),
+        'document/(?P<engineKey>[^/]+)/(?P<phid>[^/]+)/'
+          => 'PhabricatorFileDocumentController',
       ) + $this->getResourceSubroutes(),
     );
   }
diff --git a/src/applications/files/controller/PhabricatorFileDocumentController.php b/src/applications/files/controller/PhabricatorFileDocumentController.php
new file mode 100644
index 0000000000..b74d98f48e
--- /dev/null
+++ b/src/applications/files/controller/PhabricatorFileDocumentController.php
@@ -0,0 +1,113 @@
+<?php
+
+final class PhabricatorFileDocumentController
+  extends PhabricatorFileController {
+
+  private $file;
+  private $engine;
+  private $ref;
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+
+    $file_phid = $request->getURIData('phid');
+
+    $file = id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($file_phid))
+      ->executeOne();
+    if (!$file) {
+      return $this->newErrorResponse(
+        pht(
+          'This file ("%s") does not exist or could not be loaded.',
+          $file_phid));
+    }
+    $this->file = $file;
+
+    $ref = id(new PhabricatorDocumentRef())
+      ->setFile($file);
+    $this->ref = $ref;
+
+    $engines = PhabricatorDocumentEngine::getEnginesForRef($viewer, $ref);
+    $engine_key = $request->getURIData('engineKey');
+    if (!isset($engines[$engine_key])) {
+      return $this->newErrorResponse(
+        pht(
+          'The engine ("%s") is unknown, or unable to render this document.',
+          $engine_key));
+    }
+    $engine = $engines[$engine_key];
+    $this->engine = $engine;
+
+    try {
+      $content = $engine->newDocument($ref);
+    } catch (Exception $ex) {
+      return $this->newErrorResponse($ex->getMessage());
+    }
+
+    return $this->newContentResponse($content);
+  }
+
+  private function newErrorResponse($message) {
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-error',
+      ),
+      array(
+        id(new PHUIIconView())
+          ->setIcon('fa-exclamation-triangle red'),
+        ' ',
+        $message,
+      ));
+
+    return $this->newContentResponse($container);
+  }
+
+
+  private function newContentResponse($content) {
+    $viewer = $this->getViewer();
+    $request = $this->getRequest();
+
+    $file = $this->file;
+    $engine = $this->engine;
+    $ref = $this->ref;
+
+    if ($request->isAjax()) {
+      return id(new AphrontAjaxResponse())
+        ->setContent(
+          array(
+            'markup' => hsprintf('%s', $content),
+          ));
+    }
+
+    $crumbs = $this->buildApplicationCrumbs();
+    if ($file) {
+      $crumbs->addTextCrumb($file->getMonogram(), $file->getInfoURI());
+    }
+
+    $label = $engine->getViewAsLabel($ref);
+    if ($label) {
+      $crumbs->addTextCrumb($label);
+    }
+
+    $crumbs->setBorder(true);
+
+    $content_frame = id(new PHUIObjectBoxView())
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->appendChild($content);
+
+    $page_frame = id(new PHUITwoColumnView())
+      ->setFooter($content_frame);
+
+    return $this->newPage()
+      ->setCrumbs($crumbs)
+      ->setTitle(
+        array(
+          $ref->getName(),
+          pht('Standalone'),
+        ))
+      ->appendChild($page_frame);
+  }
+
+}
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
index fe8d37ab80..4badb7a140 100644
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -404,50 +404,70 @@ private function loadStorageEngine(PhabricatorFile $file) {
 
   private function newFileContent(PhabricatorFile $file) {
     $viewer = $this->getViewer();
-    $engines = PhabricatorDocumentEngine::getAllEngines();
 
     $ref = id(new PhabricatorDocumentRef())
       ->setFile($file);
 
-    foreach ($engines as $key => $engine) {
-      $engine = id(clone $engine)
-        ->setViewer($viewer);
+    $engines = PhabricatorDocumentEngine::getEnginesForRef($viewer, $ref);
+    $engine = head($engines);
 
-      if (!$engine->canRenderDocument($ref)) {
-        unset($engines[$key]);
+    $content = $engine->newDocument($ref);
+
+    $icon = $engine->newDocumentIcon($ref);
+
+    $views = array();
+    foreach ($engines as $candidate_engine) {
+      $label = $candidate_engine->getViewAsLabel($ref);
+      if ($label === null) {
         continue;
       }
 
-      $engines[$key] = $engine;
-    }
+      $view_icon = $candidate_engine->getViewAsIconIcon($ref);
 
-    if (!$engines) {
-      throw new Exception(pht('No engine can render this document.'));
+      $views[] = array(
+        'viewKey' => $candidate_engine->getDocumentEngineKey(),
+        'icon' => $view_icon,
+        'name' => $label,
+        'engineURI' => $candidate_engine->getRenderURI($ref),
+      );
     }
 
-    $vectors = array();
-    foreach ($engines as $key => $usable_engine) {
-      $vectors[$key] = $usable_engine->newSortVector($ref);
-    }
-    $vectors = msortv($vectors, 'getSelf');
+    Javelin::initBehavior('document-engine');
 
-    $engine = $engines[head_key($vectors)];
+    $viewport_id = celerity_generate_unique_node_id();
 
-    $content = $engine->newDocument($ref);
-    if (!$content) {
-      return null;
-    }
+    $viewport = phutil_tag(
+      'div',
+      array(
+        'id' => $viewport_id,
+      ),
+      $content);
 
-    $icon = $engine->newDocumentIcon($ref);
+    $meta = array(
+      'viewportID' => $viewport_id,
+      'viewKey' => $engine->getDocumentEngineKey(),
+      'views' => $views,
+      'standaloneURI' => $engine->getRenderURI($ref),
+    );
+
+    $view_button = id(new PHUIButtonView())
+      ->setTag('a')
+      ->setText(pht('View Options'))
+      ->setIcon('fa-file-image-o')
+      ->setColor(PHUIButtonView::GREY)
+      ->setMetadata($meta)
+      ->setDropdown(true)
+      ->addSigil('document-engine-view-dropdown');
 
     $header = id(new PHUIHeaderView())
       ->setHeaderIcon($icon)
-      ->setHeader($ref->getName());
+      ->setHeader($ref->getName())
+      ->addActionLink($view_button);
 
     return id(new PHUIObjectBoxView())
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setHeader($header)
-      ->appendChild($content);
+      ->appendChild($viewport);
   }
 
 }
diff --git a/src/applications/files/document/PhabricatorAudioDocumentEngine.php b/src/applications/files/document/PhabricatorAudioDocumentEngine.php
index afbc10e70b..9f6274de84 100644
--- a/src/applications/files/document/PhabricatorAudioDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorAudioDocumentEngine.php
@@ -5,6 +5,10 @@ final class PhabricatorAudioDocumentEngine
 
   const ENGINEKEY = 'audio';
 
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as Audio');
+  }
+
   protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-file-sound-o';
   }
diff --git a/src/applications/files/document/PhabricatorDocumentEngine.php b/src/applications/files/document/PhabricatorDocumentEngine.php
index 0c72ce9fd1..65596975c9 100644
--- a/src/applications/files/document/PhabricatorDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorDocumentEngine.php
@@ -59,4 +59,52 @@ protected function getContentScore() {
     return 2000;
   }
 
+  abstract public function getViewAsLabel(PhabricatorDocumentRef $ref);
+
+  public function getViewAsIconIcon(PhabricatorDocumentRef $ref) {
+    return $this->getDocumentIconIcon($ref);
+  }
+
+  public function getRenderURI(PhabricatorDocumentRef $ref) {
+    $file = $ref->getFile();
+    if (!$file) {
+      throw new PhutilMethodNotImplementedException();
+    }
+
+    $engine_key = $this->getDocumentEngineKey();
+    $file_phid = $file->getPHID();
+
+    return "/file/document/{$engine_key}/{$file_phid}/";
+  }
+
+  final public static function getEnginesForRef(
+    PhabricatorUser $viewer,
+    PhabricatorDocumentRef $ref) {
+    $engines = self::getAllEngines();
+
+    foreach ($engines as $key => $engine) {
+      $engine = id(clone $engine)
+        ->setViewer($viewer);
+
+      if (!$engine->canRenderDocument($ref)) {
+        unset($engines[$key]);
+        continue;
+      }
+
+      $engines[$key] = $engine;
+    }
+
+    if (!$engines) {
+      throw new Exception(pht('No content engine can render this document.'));
+    }
+
+    $vectors = array();
+    foreach ($engines as $key => $usable_engine) {
+      $vectors[$key] = $usable_engine->newSortVector($ref);
+    }
+    $vectors = msortv($vectors, 'getSelf');
+
+    return array_select_keys($engines, array_keys($vectors));
+  }
+
 }
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
index cb36cbaed7..91f41eb871 100644
--- a/src/applications/files/document/PhabricatorDocumentRef.php
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -68,6 +68,14 @@ public function getLength() {
     return null;
   }
 
+  public function loadData() {
+    if ($this->file) {
+      return $this->file->loadFileData();
+    }
+
+    throw new PhutilMethodNotImplementedException();
+  }
+
   public function hasAnyMimeType(array $candidate_types) {
     $mime_full = $this->getMimeType();
     $mime_parts = explode(';', $mime_full);
diff --git a/src/applications/files/document/PhabricatorHexdumpDocumentEngine.php b/src/applications/files/document/PhabricatorHexdumpDocumentEngine.php
new file mode 100644
index 0000000000..4ceeca9cf3
--- /dev/null
+++ b/src/applications/files/document/PhabricatorHexdumpDocumentEngine.php
@@ -0,0 +1,83 @@
+<?php
+
+final class PhabricatorHexdumpDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  const ENGINEKEY = 'hexdump';
+
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as Hexdump');
+  }
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-microchip';
+  }
+
+  protected function getContentScore() {
+    return 500;
+  }
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    return true;
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $content = $ref->loadData();
+
+    $output = array();
+    $offset = 0;
+
+    $lines = str_split($content, 16);
+    foreach ($lines as $line) {
+      $output[] = sprintf(
+        '%08x  %- 23s  %- 23s  %- 16s',
+        $offset,
+        $this->renderHex(substr($line, 0, 8)),
+        $this->renderHex(substr($line, 8)),
+        $this->renderBytes($line));
+
+      $offset += 16;
+    }
+
+    $output = implode("\n", $output);
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-hexdump PhabricatorMonospaced',
+      ),
+      $output);
+
+    return $container;
+  }
+
+  private function renderHex($bytes) {
+    $length = strlen($bytes);
+
+    $output = array();
+    for ($ii = 0; $ii < $length; $ii++) {
+      $output[] = sprintf('%02x', ord($bytes[$ii]));
+    }
+
+    return implode(' ', $output);
+  }
+
+  private function renderBytes($bytes) {
+    $length = strlen($bytes);
+
+    $output = array();
+    for ($ii = 0; $ii < $length; $ii++) {
+      $chr = $bytes[$ii];
+      $ord = ord($chr);
+
+      if ($ord < 0x20 || $ord >= 0x7F) {
+        $chr = '.';
+      }
+
+      $output[] = $chr;
+    }
+
+    return implode('', $output);
+  }
+
+}
diff --git a/src/applications/files/document/PhabricatorImageDocumentEngine.php b/src/applications/files/document/PhabricatorImageDocumentEngine.php
index ab5753680b..84ad3110df 100644
--- a/src/applications/files/document/PhabricatorImageDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorImageDocumentEngine.php
@@ -5,6 +5,10 @@ final class PhabricatorImageDocumentEngine
 
   const ENGINEKEY = 'image';
 
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as Image');
+  }
+
   protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-file-image-o';
   }
diff --git a/src/applications/files/document/PhabricatorVideoDocumentEngine.php b/src/applications/files/document/PhabricatorVideoDocumentEngine.php
index 81573b6e93..591a24cb3e 100644
--- a/src/applications/files/document/PhabricatorVideoDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorVideoDocumentEngine.php
@@ -5,6 +5,10 @@ final class PhabricatorVideoDocumentEngine
 
   const ENGINEKEY = 'video';
 
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as Video');
+  }
+
   protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-film';
   }
diff --git a/src/applications/files/document/PhabricatorVoidDocumentEngine.php b/src/applications/files/document/PhabricatorVoidDocumentEngine.php
index a57514edb8..75d74e05a5 100644
--- a/src/applications/files/document/PhabricatorVoidDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorVoidDocumentEngine.php
@@ -5,6 +5,10 @@ final class PhabricatorVoidDocumentEngine
 
   const ENGINEKEY = 'void';
 
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return null;
+  }
+
   protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-file';
   }
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
index a598438d99..1ca39a8486 100644
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -231,3 +231,14 @@ div.phui-property-list-stacked .phui-property-list-properties
   text-align: center;
   color: {$greytext};
 }
+
+.document-engine-error {
+  margin: 20px auto;
+  text-align: center;
+  color: {$redtext};
+}
+
+.document-engine-hexdump {
+  margin: 20px;
+  white-space: pre;
+}
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
new file mode 100644
index 0000000000..3af1d681fd
--- /dev/null
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -0,0 +1,67 @@
+/**
+ * @provides javelin-behavior-document-engine
+ * @requires javelin-behavior
+ *           javelin-dom
+ *           javelin-stratcom
+ */
+
+JX.behavior('document-engine', function() {
+
+  function onmenu(e) {
+    var node = e.getNode('document-engine-view-dropdown');
+    var data = JX.Stratcom.getData(node);
+
+    if (data.menu) {
+      return;
+    }
+
+    e.prevent();
+
+    var menu = new JX.PHUIXDropdownMenu(node);
+    var list = new JX.PHUIXActionListView();
+
+    var view;
+    for (var ii = 0; ii < data.views.length; ii++) {
+      var spec = data.views[ii];
+
+      view = new JX.PHUIXActionView()
+        .setName(spec.name)
+        .setIcon(spec.icon)
+        .setHref(spec.engineURI);
+
+      view.setHandler(JX.bind(null, function(spec, e) {
+        if (!e.isNormalClick()) {
+          return;
+        }
+
+        e.prevent();
+        menu.close();
+
+        onview(data, spec);
+      }, spec));
+
+      list.addItem(view);
+    }
+
+    menu.setContent(list.getNode());
+
+    data.menu = menu;
+    menu.open();
+  }
+
+  function onview(data, spec) {
+    var handler = JX.bind(null, onrender, data);
+
+    new JX.Request(spec.engineURI, handler)
+      .send();
+  }
+
+  function onrender(data, r) {
+    var viewport = JX.$(data.viewportID);
+
+    JX.DOM.setContent(viewport, JX.$H(r.markup));
+  }
+
+  JX.Stratcom.listen('click', 'document-engine-view-dropdown', onmenu);
+
+});

From 4aafce686202aca64d945a3c2798837de62c1cd1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 19 Mar 2018 12:36:39 -0700
Subject: [PATCH 727/865] Add filesize limits for document rendering engines
 and support partial/complete rendering

Summary:
Depends on D19238. Ref T13105. Give document engines some reasonable automatic support for degrading gracefully when someone tries to hexdump a 100MB file or similar.

Also, make "Video" sort above "Audio" for files which could be rendered either way.

Test Plan: Viewed audio, video, image, and other files. Adjusted limits and saw full, partial, and fallback/error rendering.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19239
---
 resources/celerity/map.php                    | 36 +++++-----
 .../PhabricatorFileInfoController.php         |  2 +
 .../PhabricatorAudioDocumentEngine.php        |  4 ++
 .../document/PhabricatorDocumentEngine.php    | 72 ++++++++++++++++++-
 .../files/document/PhabricatorDocumentRef.php | 12 +++-
 .../PhabricatorHexdumpDocumentEngine.php      | 37 +++++++++-
 .../PhabricatorImageDocumentEngine.php        |  4 ++
 .../PhabricatorVideoDocumentEngine.php        | 10 +++
 .../PhabricatorVoidDocumentEngine.php         |  6 +-
 .../rsrc/css/phui/phui-property-list-view.css |  4 +-
 .../files/behavior-document-engine.js         |  1 +
 webroot/rsrc/js/phuix/PHUIXActionView.js      | 11 +++
 12 files changed, 172 insertions(+), 27 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 8e7ce6e258..562bd50fc1 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,8 +9,8 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '97dc0e74',
-    'core.pkg.js' => '8581cd02',
+    'core.pkg.css' => '6da3c0e5',
+    'core.pkg.js' => '932d60d4',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -168,7 +168,7 @@
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-property-list-view.css' => 'ef864066',
+    'rsrc/css/phui/phui-property-list-view.css' => '6ef560df',
     'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -392,7 +392,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => 'f6d6f389',
+    'rsrc/js/application/files/behavior-document-engine.js' => '396ef112',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -508,7 +508,7 @@
     'rsrc/js/phui/behavior-phui-submenu.js' => 'a6f7a73b',
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
-    'rsrc/js/phuix/PHUIXActionView.js' => '442efd08',
+    'rsrc/js/phuix/PHUIXActionView.js' => 'ed18356a',
     'rsrc/js/phuix/PHUIXAutocomplete.js' => '7fa5c915',
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
@@ -607,7 +607,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => 'f6d6f389',
+    'javelin-behavior-document-engine' => '396ef112',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -850,7 +850,7 @@
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-property-list-view-css' => 'ef864066',
+    'phui-property-list-view-css' => '6ef560df',
     'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
@@ -864,7 +864,7 @@
     'phui-workcard-view-css' => 'cca5fa92',
     'phui-workpanel-view-css' => 'a3a63478',
     'phuix-action-list-view' => 'b5c256b8',
-    'phuix-action-view' => '442efd08',
+    'phuix-action-view' => 'ed18356a',
     'phuix-autocomplete' => '7fa5c915',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
@@ -1114,6 +1114,11 @@
       'javelin-dom',
       'javelin-vector',
     ),
+    '396ef112' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     '3ab51e2c' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1184,11 +1189,6 @@
       'javelin-workflow',
       'javelin-workboard-controller',
     ),
-    '442efd08' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-util',
-    ),
     '44959b73' => array(
       'javelin-util',
       'javelin-uri',
@@ -2125,6 +2125,11 @@
       'javelin-stratcom',
       'javelin-vector',
     ),
+    'ed18356a' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-util',
+    ),
     'edf8a145' => array(
       'javelin-behavior',
       'javelin-uri',
@@ -2153,11 +2158,6 @@
       'javelin-util',
       'javelin-reactor',
     ),
-    'f6d6f389' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     'f829edb3' => array(
       'javelin-view',
       'javelin-install',
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
index 4badb7a140..e25cf8d74c 100644
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -423,10 +423,12 @@ private function newFileContent(PhabricatorFile $file) {
       }
 
       $view_icon = $candidate_engine->getViewAsIconIcon($ref);
+      $view_color = $candidate_engine->getViewAsIconColor($ref);
 
       $views[] = array(
         'viewKey' => $candidate_engine->getDocumentEngineKey(),
         'icon' => $view_icon,
+        'color' => $view_color,
         'name' => $label,
         'engineURI' => $candidate_engine->getRenderURI($ref),
       );
diff --git a/src/applications/files/document/PhabricatorAudioDocumentEngine.php b/src/applications/files/document/PhabricatorAudioDocumentEngine.php
index 9f6274de84..859f167627 100644
--- a/src/applications/files/document/PhabricatorAudioDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorAudioDocumentEngine.php
@@ -13,6 +13,10 @@ protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-file-sound-o';
   }
 
+  protected function getByteLengthLimit() {
+    return null;
+  }
+
   protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
     $file = $ref->getFile();
     if ($file) {
diff --git a/src/applications/files/document/PhabricatorDocumentEngine.php b/src/applications/files/document/PhabricatorDocumentEngine.php
index 65596975c9..6ad7f74f9a 100644
--- a/src/applications/files/document/PhabricatorDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorDocumentEngine.php
@@ -22,6 +22,18 @@ abstract protected function canRenderDocumentType(
     PhabricatorDocumentRef $ref);
 
   final public function newDocument(PhabricatorDocumentRef $ref) {
+    $can_complete = $this->canRenderCompleteDocument($ref);
+    $can_partial = $this->canRenderPartialDocument($ref);
+
+    if (!$can_complete && !$can_partial) {
+      return $this->newMessage(
+        pht(
+          'This document is too large to be rendered inline. (The document '.
+          'is %s bytes, the limit for this engine is %s bytes.)',
+          new PhutilNumber($ref->getByteLength()),
+          new PhutilNumber($this->getByteLengthLimit())));
+    }
+
     return $this->newDocumentContent($ref);
   }
 
@@ -51,20 +63,49 @@ final public static function getAllEngines() {
   final public function newSortVector(PhabricatorDocumentRef $ref) {
     $content_score = $this->getContentScore($ref);
 
+    // Prefer engines which can render the entire file over engines which
+    // can only render a header, and engines which can render a header over
+    // engines which can't render anything.
+    if ($this->canRenderCompleteDocument($ref)) {
+      $limit_score = 0;
+    } else if ($this->canRenderPartialDocument($ref)) {
+      $limit_score = 1;
+    } else {
+      $limit_score = 2;
+    }
+
     return id(new PhutilSortVector())
+      ->addInt($limit_score)
       ->addInt(-$content_score);
   }
 
-  protected function getContentScore() {
+  protected function getContentScore(PhabricatorDocumentRef $ref) {
     return 2000;
   }
 
   abstract public function getViewAsLabel(PhabricatorDocumentRef $ref);
 
   public function getViewAsIconIcon(PhabricatorDocumentRef $ref) {
+    $can_complete = $this->canRenderCompleteDocument($ref);
+    $can_partial = $this->canRenderPartialDocument($ref);
+
+    if (!$can_complete && !$can_partial) {
+      return 'fa-times';
+    }
+
     return $this->getDocumentIconIcon($ref);
   }
 
+  public function getViewAsIconColor(PhabricatorDocumentRef $ref) {
+    $can_complete = $this->canRenderCompleteDocument($ref);
+
+    if (!$can_complete) {
+      return 'grey';
+    }
+
+    return null;
+  }
+
   public function getRenderURI(PhabricatorDocumentRef $ref) {
     $file = $ref->getFile();
     if (!$file) {
@@ -107,4 +148,33 @@ final public static function getEnginesForRef(
     return array_select_keys($engines, array_keys($vectors));
   }
 
+  protected function getByteLengthLimit() {
+    return (1024 * 1024 * 8);
+  }
+
+  protected function canRenderCompleteDocument(PhabricatorDocumentRef $ref) {
+    $limit = $this->getByteLengthLimit();
+    if ($limit) {
+      $length = $ref->getByteLength();
+      if ($length > $limit) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  protected function canRenderPartialDocument(PhabricatorDocumentRef $ref) {
+    return false;
+  }
+
+  protected function newMessage($message) {
+    return phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-error',
+      ),
+      $message);
+  }
+
 }
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
index 91f41eb871..862c0596d3 100644
--- a/src/applications/files/document/PhabricatorDocumentRef.php
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -56,7 +56,7 @@ public function setByteLength($length) {
     return $this;
   }
 
-  public function getLength() {
+  public function getByteLength() {
     if ($this->byteLength !== null) {
       return $this->byteLength;
     }
@@ -68,9 +68,15 @@ public function getLength() {
     return null;
   }
 
-  public function loadData() {
+  public function loadData($begin = null, $end = null) {
     if ($this->file) {
-      return $this->file->loadFileData();
+      $iterator = $this->file->getFileDataIterator($begin, $end);
+
+      $result = '';
+      foreach ($iterator as $chunk) {
+        $result .= $chunk;
+      }
+      return $result;
     }
 
     throw new PhutilMethodNotImplementedException();
diff --git a/src/applications/files/document/PhabricatorHexdumpDocumentEngine.php b/src/applications/files/document/PhabricatorHexdumpDocumentEngine.php
index 4ceeca9cf3..4217c24d62 100644
--- a/src/applications/files/document/PhabricatorHexdumpDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorHexdumpDocumentEngine.php
@@ -13,7 +13,11 @@ protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-microchip';
   }
 
-  protected function getContentScore() {
+  protected function getByteLengthLimit() {
+    return (1024 * 1024 * 1);
+  }
+
+  protected function getContentScore(PhabricatorDocumentRef $ref) {
     return 500;
   }
 
@@ -21,8 +25,23 @@ protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
     return true;
   }
 
+  protected function canRenderPartialDocument(PhabricatorDocumentRef $ref) {
+    return true;
+  }
+
   protected function newDocumentContent(PhabricatorDocumentRef $ref) {
-    $content = $ref->loadData();
+    $limit = $this->getByteLengthLimit();
+    $length = $ref->getByteLength();
+
+    $is_partial = false;
+    if ($limit) {
+      if ($length > $limit) {
+        $is_partial = true;
+        $length = $limit;
+      }
+    }
+
+    $content = $ref->loadData(null, $length);
 
     $output = array();
     $offset = 0;
@@ -48,7 +67,19 @@ protected function newDocumentContent(PhabricatorDocumentRef $ref) {
       ),
       $output);
 
-    return $container;
+    $message = null;
+    if ($is_partial) {
+      $message = $this->newMessage(
+        pht(
+          'This document is too large to be completely rendered inline. The '.
+          'first %s bytes are shown.',
+          new PhutilNumber($limit)));
+    }
+
+    return array(
+      $message,
+      $container,
+    );
   }
 
   private function renderHex($bytes) {
diff --git a/src/applications/files/document/PhabricatorImageDocumentEngine.php b/src/applications/files/document/PhabricatorImageDocumentEngine.php
index 84ad3110df..d0b2099dd0 100644
--- a/src/applications/files/document/PhabricatorImageDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorImageDocumentEngine.php
@@ -13,6 +13,10 @@ protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-file-image-o';
   }
 
+  protected function getByteLengthLimit() {
+    return (1024 * 1024 * 64);
+  }
+
   protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
     $file = $ref->getFile();
     if ($file) {
diff --git a/src/applications/files/document/PhabricatorVideoDocumentEngine.php b/src/applications/files/document/PhabricatorVideoDocumentEngine.php
index 591a24cb3e..4e03c62ebc 100644
--- a/src/applications/files/document/PhabricatorVideoDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorVideoDocumentEngine.php
@@ -9,6 +9,16 @@ public function getViewAsLabel(PhabricatorDocumentRef $ref) {
     return pht('View as Video');
   }
 
+  protected function getContentScore(PhabricatorDocumentRef $ref) {
+    // Some video documents can be rendered as either video or audio, but we
+    // want to prefer video.
+    return 2500;
+  }
+
+  protected function getByteLengthLimit() {
+    return null;
+  }
+
   protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-film';
   }
diff --git a/src/applications/files/document/PhabricatorVoidDocumentEngine.php b/src/applications/files/document/PhabricatorVoidDocumentEngine.php
index 75d74e05a5..c5395632eb 100644
--- a/src/applications/files/document/PhabricatorVoidDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorVoidDocumentEngine.php
@@ -13,10 +13,14 @@ protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-file';
   }
 
-  protected function getContentScore() {
+  protected function getContentScore(PhabricatorDocumentRef $ref) {
     return 1000;
   }
 
+  protected function getByteLengthLimit() {
+    return null;
+  }
+
   protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
     return true;
   }
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
index 1ca39a8486..840364723d 100644
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -233,9 +233,11 @@ div.phui-property-list-stacked .phui-property-list-properties
 }
 
 .document-engine-error {
-  margin: 20px auto;
+  margin: 20px;
+  padding: 12px;
   text-align: center;
   color: {$redtext};
+  background: {$sh-redbackground};
 }
 
 .document-engine-hexdump {
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index 3af1d681fd..6b9b3eeb24 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -27,6 +27,7 @@ JX.behavior('document-engine', function() {
       view = new JX.PHUIXActionView()
         .setName(spec.name)
         .setIcon(spec.icon)
+        .setIconColor(spec.color)
         .setHref(spec.engineURI);
 
       view.setHandler(JX.bind(null, function(spec, e) {
diff --git a/webroot/rsrc/js/phuix/PHUIXActionView.js b/webroot/rsrc/js/phuix/PHUIXActionView.js
index 2db58dbdc4..7967fa7366 100644
--- a/webroot/rsrc/js/phuix/PHUIXActionView.js
+++ b/webroot/rsrc/js/phuix/PHUIXActionView.js
@@ -12,6 +12,7 @@ JX.install('PHUIXActionView', {
     _node: null,
     _name: null,
     _icon: 'none',
+    _iconColor: null,
     _disabled: false,
     _label: false,
     _handler: null,
@@ -79,6 +80,12 @@ JX.install('PHUIXActionView', {
       return this;
     },
 
+    setIconColor: function(color) {
+      this._iconColor = color;
+      this._buildIconNode(true);
+      return this;
+    },
+
     setHref: function(href) {
       this._href = href;
       this._buildNameNode(true);
@@ -129,6 +136,10 @@ JX.install('PHUIXActionView', {
           icon_class = icon_class + ' grey';
         }
 
+        if (this._iconColor) {
+          icon_class = icon_class + ' ' + this._iconColor;
+        }
+
         JX.DOM.alterClass(node, icon_class, true);
 
         if (this._iconNode && this._iconNode.parentNode) {

From 3bf8d5682ed06a6905fc0ca896531312427de1d9 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 20 Mar 2018 15:50:51 -0700
Subject: [PATCH 728/865] Fix outdated link for Font Awesome icon set

Summary:
The current link has a redirect for a while now, from
http://fortawesome.github.io/Font-Awesome/ to https://fontawesome.com

However, since the release of Version 5, the docs no longer
match the icons that are valid for use in Phabricator, which
uses Version 4.

Update the reference to link to the same logical content as before.

Test Plan: The content now lives at <https://fontawesome.com/v4.7.0/icons/>.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D19241
---
 src/docs/user/userguide/remarkup.diviner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/user/userguide/remarkup.diviner b/src/docs/user/userguide/remarkup.diviner
index 28a1a31fc4..d052a9a248 100644
--- a/src/docs/user/userguide/remarkup.diviner
+++ b/src/docs/user/userguide/remarkup.diviner
@@ -530,7 +530,7 @@ This renders: {icon camera color=blue}
 
 For a list of available icons and colors, check the UIExamples application.
 (The icons are sourced from
-[[ http://fortawesome.github.io/Font-Awesome/ | FontAwesome ]], so you can also
+[[ https://fontawesome.com/v4.7.0/icons/ | FontAwesome ]], so you can also
 browse the collection there.)
 
 You can add `spin` to make the icon spin:

From 73b68bc2a61910b6e6fc291a9109eb492f9dfaec Mon Sep 17 00:00:00 2001
From: Tino Breddin <t@tolbrino.com>
Date: Wed, 21 Mar 2018 07:39:34 -0700
Subject: [PATCH 729/865] Fix a possible `count(null)` in
 DifferentialRevisionActionTransaction

Summary:
This change prevents the following error when using PHP 7.2:

```
ERROR 2: count(): Parameter must be an array or an object that implements Countable at [/usr/local/lib/php/phabricator/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php:132]
```

A similar issue was fixed in D18964

Test Plan: Tested in a live system.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19242
---
 .../xaction/DifferentialRevisionActionTransaction.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
index a1e66379f7..07809dca59 100644
--- a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
@@ -80,7 +80,7 @@ protected function getActionOptions(
     DifferentialRevision $revision) {
     return array(
       array(),
-      null,
+      array(),
     );
   }
 

From 6ed123e0801a980e47624341e7f1f913694101cf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 21 Mar 2018 11:11:43 -0700
Subject: [PATCH 730/865] Propagate "unexpandable" PHIDs to feed notification
 recipient expansion

Summary:
See PHI466. Ref T13108. Somewhat recently, new rules were added so that "Resigning" from a revision takes you off the default recipient list, even if you're still a member of a project or package that is still a reviewer or subscriber.

However, these rules don't currently apply to the similar expansion which occurs in notifications. If you resign from a revision you may still get some notifications (just not email) if a package or project you're a member of is a reviewer or subscriber.

(Possibly these should eventually share more code, but just get things working for now.)

Test Plan:
  - Created a revision as A.
  - Added B as a reviewer.
  - Added a package B is an owner for as a reviewer.
  - As B, resigned. (Make sure B is also not an explicit subscriber.)
  - Commented on the revision as A.
    - Before: B is included in the expanded notification recipient list.
    - After: B is no longer included in the expanded notification recipient list.

Maniphest Tasks: T13108

Differential Revision: https://secure.phabricator.com/D19244
---
 .../feed/PhabricatorFeedStoryPublisher.php    | 38 ++++++++++++++++++-
 ...habricatorApplicationTransactionEditor.php |  6 +++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/applications/feed/PhabricatorFeedStoryPublisher.php b/src/applications/feed/PhabricatorFeedStoryPublisher.php
index 8d018c61b3..47dde8c98a 100644
--- a/src/applications/feed/PhabricatorFeedStoryPublisher.php
+++ b/src/applications/feed/PhabricatorFeedStoryPublisher.php
@@ -12,6 +12,7 @@ final class PhabricatorFeedStoryPublisher extends Phobject {
   private $mailRecipientPHIDs = array();
   private $notifyAuthor;
   private $mailTags = array();
+  private $unexpandablePHIDs = array();
 
   public function setMailTags(array $mail_tags) {
     $this->mailTags = $mail_tags;
@@ -46,6 +47,15 @@ public function setPrimaryObjectPHID($phid) {
     return $this;
   }
 
+  public function setUnexpandablePHIDs(array $unexpandable_phids) {
+    $this->unexpandablePHIDs = $unexpandable_phids;
+    return $this;
+  }
+
+  public function getUnexpandablePHIDs() {
+    return $this->unexpandablePHIDs;
+  }
+
   public function setStoryType($story_type) {
     $this->storyType = $story_type;
     return $this;
@@ -254,10 +264,36 @@ private function filterSubscribedPHIDs(array $phids) {
   }
 
   private function expandRecipients(array $phids) {
-    return id(new PhabricatorMetaMTAMemberQuery())
+    $expanded_phids = id(new PhabricatorMetaMTAMemberQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withPHIDs($phids)
       ->executeExpansion();
+
+    // Filter out unexpandable PHIDs from the results. The typical case for
+    // this is that resigned reviewers should not be notified just because
+    // they are a member of some project or package reviewer.
+
+    $original_map = array_fuse($phids);
+    $unexpandable_map = array_fuse($this->unexpandablePHIDs);
+
+    foreach ($expanded_phids as $key => $phid) {
+      // We can keep this expanded PHID if it was present originally.
+      if (isset($original_map[$phid])) {
+        continue;
+      }
+
+      // We can also keep it if it isn't marked as unexpandable.
+      if (!isset($unexpandable_map[$phid])) {
+        continue;
+      }
+
+      // If it's unexpandable and we produced it by expanding recipients,
+      // throw it away.
+      unset($expanded_phids[$key]);
+    }
+    $expanded_phids = array_values($expanded_phids);
+
+    return $expanded_phids;
   }
 
   /**
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 26be0f87af..8184eafb50 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -3199,6 +3199,11 @@ protected function publishFeedStory(
     $story_type = $this->getFeedStoryType();
     $story_data = $this->getFeedStoryData($object, $xactions);
 
+    $unexpandable_phids = $this->mailUnexpandablePHIDs;
+    if (!is_array($unexpandable_phids)) {
+      $unexpandable_phids = array();
+    }
+
     id(new PhabricatorFeedStoryPublisher())
       ->setStoryType($story_type)
       ->setStoryData($story_data)
@@ -3207,6 +3212,7 @@ protected function publishFeedStory(
       ->setRelatedPHIDs($related_phids)
       ->setPrimaryObjectPHID($object->getPHID())
       ->setSubscribedPHIDs($subscribed_phids)
+      ->setUnexpandablePHIDs($unexpandable_phids)
       ->setMailRecipientPHIDs($mailed_phids)
       ->setMailTags($this->getMailTags($object, $xactions))
       ->publish();

From 9e278a89ba302307184389be63d390a6a8d2c7ff Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 21 Mar 2018 11:42:58 -0700
Subject: [PATCH 731/865] If a Workflow form receives a redirect response,
 don't re-enable the submit buttons

Summary:
See PHI488. Ref T13108. Currently, there is a narrow window between when the response returns and when the browser actually follows the redirect where the form is live and you can click the button again.

This is relativey easy if Phabricator is running //too fast// since the button may be disabled only momentarily. This seems to be easier in Firefox/Chrome than Safari.

Test Plan:
  - In Firefox and Chrome, spam-clicked a comment submit button.
    - Before: could sometimes get a double-submit.
    - After: couldn't get a double-submit.
    - This could probably be reproduced more reliabily by adding a `sleep(1)` to whatever we're redirecting //to//.
  - Submitted an empty comment, got a dialog plus a still-enabled form (so this doesn't break the non-redirect case).

Maniphest Tasks: T13108

Differential Revision: https://secure.phabricator.com/D19245
---
 resources/celerity/map.php                    | 28 +++++++++----------
 .../rsrc/externals/javelin/lib/Workflow.js    | 15 +++++++---
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 562bd50fc1..dab7a5e395 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '6da3c0e5',
-    'core.pkg.js' => '932d60d4',
+    'core.pkg.js' => 'b305dbe2',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -253,7 +253,7 @@
     'rsrc/externals/javelin/lib/URI.js' => 'c989ade3',
     'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
     'rsrc/externals/javelin/lib/WebSocket.js' => '3ffe32d6',
-    'rsrc/externals/javelin/lib/Workflow.js' => '0eb1db0c',
+    'rsrc/externals/javelin/lib/Workflow.js' => '33fea02f',
     'rsrc/externals/javelin/lib/__tests__/Cookie.js' => '5ed109e8',
     'rsrc/externals/javelin/lib/__tests__/DOM.js' => 'c984504b',
     'rsrc/externals/javelin/lib/__tests__/JSON.js' => '837a7d68',
@@ -739,7 +739,7 @@
     'javelin-workboard-card' => 'c587b80f',
     'javelin-workboard-column' => '758b4758',
     'javelin-workboard-controller' => '26167537',
-    'javelin-workflow' => '0eb1db0c',
+    'javelin-workflow' => '33fea02f',
     'maniphest-report-css' => '9b9580b7',
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
@@ -960,17 +960,6 @@
       'javelin-dom',
       'javelin-router',
     ),
-    '0eb1db0c' => array(
-      'javelin-stratcom',
-      'javelin-request',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-install',
-      'javelin-util',
-      'javelin-mask',
-      'javelin-uri',
-      'javelin-routable',
-    ),
     '0f764c35' => array(
       'javelin-install',
       'javelin-util',
@@ -1108,6 +1097,17 @@
       'javelin-util',
       'javelin-magical-init',
     ),
+    '33fea02f' => array(
+      'javelin-stratcom',
+      'javelin-request',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-install',
+      'javelin-util',
+      'javelin-mask',
+      'javelin-uri',
+      'javelin-routable',
+    ),
     '358b8c04' => array(
       'javelin-install',
       'javelin-util',
diff --git a/webroot/rsrc/externals/javelin/lib/Workflow.js b/webroot/rsrc/externals/javelin/lib/Workflow.js
index 995f204c5d..c3a1b90b44 100644
--- a/webroot/rsrc/externals/javelin/lib/Workflow.js
+++ b/webroot/rsrc/externals/javelin/lib/Workflow.js
@@ -59,12 +59,15 @@ JX.install('Workflow', {
 
       workflow.setDataWithListOfPairs(pairs);
       workflow.setMethod(form.getAttribute('method'));
-      workflow.listen('finally', function() {
-        // Re-enable form elements
-        for (var ii = 0; ii < inputs.length; ii++) {
-          inputs[ii] && (inputs[ii].disabled = false);
+
+      var onfinally = JX.bind(workflow, function() {
+        if (!this._keepControlsDisabled) {
+          for (var ii = 0; ii < inputs.length; ii++) {
+            inputs[ii] && (inputs[ii].disabled = false);
+          }
         }
       });
+      workflow.listen('finally', onfinally);
 
       return workflow;
     },
@@ -242,6 +245,7 @@ JX.install('Workflow', {
     _form: null,
     _paused: 0,
     _nextCallback: null,
+    _keepControlsDisabled: false,
 
     getSourceForm: function() {
       return this._form;
@@ -283,6 +287,9 @@ JX.install('Workflow', {
           this._pop();
         }
 
+        // If we're redirecting, don't re-enable for controls.
+        this._keepControlsDisabled = true;
+
         JX.$U(r.redirect).go();
       } else if (r && r.dialog) {
         this._push();

From c8583b016daf4931f359f128d4d7d96caa3b2139 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 21 Mar 2018 11:51:12 -0700
Subject: [PATCH 732/865] When workflow dialog buttons are clicked, disable the
 button

Summary:
Depends on D19245. Fixes T11145. Ref T13108. See PHI488. Disable workflow buttons when they're clicked to prevent accidental client-side double submission.

This might have some weird side effects but we should normally never need to re-use a workflow dialog form so it's not immediately obvious that this can break anything.

Test Plan:
  - Added `sleep(1)` to the Mute controller and the Maniphest task controller.
  - Added `phlog(...)` to the Mute controller.
  - Opened the mute dialog, mashed the button a thousand times.
    - Before: Saw a bunch of logs.
    - After: Button immediately disables, saw only one log.

Maniphest Tasks: T13108, T11145

Differential Revision: https://secure.phabricator.com/D19246
---
 resources/celerity/map.php                    | 28 +++++++++----------
 .../rsrc/externals/javelin/lib/Workflow.js    |  4 +++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index dab7a5e395..06ab100482 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '6da3c0e5',
-    'core.pkg.js' => 'b305dbe2',
+    'core.pkg.js' => '27f3489f',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -253,7 +253,7 @@
     'rsrc/externals/javelin/lib/URI.js' => 'c989ade3',
     'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
     'rsrc/externals/javelin/lib/WebSocket.js' => '3ffe32d6',
-    'rsrc/externals/javelin/lib/Workflow.js' => '33fea02f',
+    'rsrc/externals/javelin/lib/Workflow.js' => '7dd6653c',
     'rsrc/externals/javelin/lib/__tests__/Cookie.js' => '5ed109e8',
     'rsrc/externals/javelin/lib/__tests__/DOM.js' => 'c984504b',
     'rsrc/externals/javelin/lib/__tests__/JSON.js' => '837a7d68',
@@ -739,7 +739,7 @@
     'javelin-workboard-card' => 'c587b80f',
     'javelin-workboard-column' => '758b4758',
     'javelin-workboard-controller' => '26167537',
-    'javelin-workflow' => '33fea02f',
+    'javelin-workflow' => '7dd6653c',
     'maniphest-report-css' => '9b9580b7',
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
@@ -1097,17 +1097,6 @@
       'javelin-util',
       'javelin-magical-init',
     ),
-    '33fea02f' => array(
-      'javelin-stratcom',
-      'javelin-request',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-install',
-      'javelin-util',
-      'javelin-mask',
-      'javelin-uri',
-      'javelin-routable',
-    ),
     '358b8c04' => array(
       'javelin-install',
       'javelin-util',
@@ -1538,6 +1527,17 @@
       'javelin-request',
       'javelin-router',
     ),
+    '7dd6653c' => array(
+      'javelin-stratcom',
+      'javelin-request',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-install',
+      'javelin-util',
+      'javelin-mask',
+      'javelin-uri',
+      'javelin-routable',
+    ),
     '7e41274a' => array(
       'javelin-install',
     ),
diff --git a/webroot/rsrc/externals/javelin/lib/Workflow.js b/webroot/rsrc/externals/javelin/lib/Workflow.js
index c3a1b90b44..c669a98706 100644
--- a/webroot/rsrc/externals/javelin/lib/Workflow.js
+++ b/webroot/rsrc/externals/javelin/lib/Workflow.js
@@ -151,6 +151,10 @@ JX.install('Workflow', {
         // NOTE: Don't remove the current dialog yet because additional
         // handlers may still want to access the nodes.
 
+        // Disable whatever button the user clicked to prevent duplicate
+        // submission mistakes when you accidentally . See T11145.
+        button.disabled = true;
+
         active
           .setURI(form.getAttribute('action') || active.getURI())
           .setDataWithListOfPairs(data)

From 859b2749709583e12ac46c6375cd77dbeecd56a1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 21 Mar 2018 17:51:14 -0700
Subject: [PATCH 733/865] Provide more information to users during `git push`
 while waiting for write locks

Summary:
Ref T13109. Make it slightly more clear what the scope of the write and read locks are, and slightly more clear that we're actively acquiring locks, not just sitting around waiting.

While waiting on another writer, show who we're waiting on so you can walk over to their desk and glare at them.

Test Plan:
Added `sleep(15)` after `willWrite()`. Pushed in two windows. Saw new, more informative messages. In the second window, saw the new guidance:

> # Waiting for hector to finish writing (on device "repo1.local.phacility.net" for 11s)...

Reviewers: asherkin

Reviewed By: asherkin

Subscribers: asherkin

Maniphest Tasks: T13109

Differential Revision: https://secure.phabricator.com/D19247
---
 .../DiffusionRepositoryClusterEngine.php      | 60 ++++++++++++++++---
 ...habricatorRepositoryWorkingCopyVersion.php | 32 ++++++++++
 2 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
index 35bb4d4acf..c855b6c532 100644
--- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
@@ -151,8 +151,8 @@ public function synchronizeWorkingCopyBeforeRead() {
 
     $this->logLine(
       pht(
-        'Waiting up to %s second(s) for a cluster read lock on "%s"...',
-        new PhutilNumber($lock_wait),
+        'Acquiring read lock for repository "%s" on device "%s"...',
+        $repository->getDisplayName(),
         $device->getName()));
 
     try {
@@ -308,18 +308,34 @@ public function synchronizeWorkingCopyBeforeWrite() {
 
     $write_lock->useSpecificConnection($locked_connection);
 
-    $lock_wait = phutil_units('2 minutes in seconds');
-
     $this->logLine(
       pht(
-        'Waiting up to %s second(s) for a cluster write lock...',
-        new PhutilNumber($lock_wait)));
+        'Acquiring write lock for repository "%s"...',
+        $repository->getDisplayName()));
 
+    $lock_wait = phutil_units('2 minutes in seconds');
     try {
       $start = PhabricatorTime::getNow();
-      $write_lock->lock($lock_wait);
-      $waited = (PhabricatorTime::getNow() - $start);
+      $step_wait = 1;
+
+      while (true) {
+        try {
+          $write_lock->lock((int)floor($step_wait));
+          break;
+        } catch (PhutilLockException $ex) {
+          $waited = (PhabricatorTime::getNow() - $start);
+          if ($waited > $lock_wait) {
+            throw $ex;
+          }
+          $this->logActiveWriter($viewer, $repository);
+        }
+
+        // Wait a little longer before the next message we print.
+        $step_wait = $step_wait + 0.5;
+        $step_wait = min($step_wait, 3);
+      }
 
+      $waited = (PhabricatorTime::getNow() - $start);
       if ($waited) {
         $this->logLine(
           pht(
@@ -763,4 +779,32 @@ private function requireWorkingCopy() {
     }
   }
 
+  private function logActiveWriter(
+    PhabricatorUser $viewer,
+    PhabricatorRepository $repository) {
+
+    $writer = PhabricatorRepositoryWorkingCopyVersion::loadWriter(
+      $repository->getPHID());
+    if (!$writer) {
+      $this->logLine(pht('Waiting on another user to finish writing...'));
+      return;
+    }
+
+    $user_phid = $writer->getWriteProperty('userPHID');
+    $device_phid = $writer->getWriteProperty('devicePHID');
+    $epoch = $writer->getWriteProperty('epoch');
+
+    $phids = array($user_phid, $device_phid);
+    $handles = $viewer->loadHandles($phids);
+
+    $duration = (PhabricatorTime::getNow() - $epoch) + 1;
+
+    $this->logLine(
+      pht(
+        'Waiting for %s to finish writing (on device "%s" for %ss)...',
+        $handles[$user_phid]->getName(),
+        $handles[$device_phid]->getName(),
+        new PhutilNumber($duration)));
+  }
+
 }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php b/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
index 750cc91c47..da5d54b57d 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
@@ -28,6 +28,17 @@ protected function getConfiguration() {
     ) + parent::getConfiguration();
   }
 
+  public function getWriteProperty($key, $default = null) {
+    // The "writeProperties" don't currently get automatically serialized or
+    // deserialized. Perhaps they should.
+    try {
+      $properties = phutil_json_decode($this->writeProperties);
+      return idx($properties, $key, $default);
+    } catch (Exception $ex) {
+      return null;
+    }
+  }
+
   public static function loadVersions($repository_phid) {
     $version = new self();
     $conn_w = $version->establishConnection('w');
@@ -43,6 +54,27 @@ public static function loadVersions($repository_phid) {
     return $version->loadAllFromArray($rows);
   }
 
+  public static function loadWriter($repository_phid) {
+    $version = new self();
+    $conn_w = $version->establishConnection('w');
+    $table = $version->getTableName();
+
+    // We're forcing this read to go to the master.
+    $row = queryfx_one(
+      $conn_w,
+      'SELECT * FROM %T WHERE repositoryPHID = %s AND isWriting = 1
+        LIMIT 1',
+      $table,
+      $repository_phid);
+
+    if (!$row) {
+      return null;
+    }
+
+    return $version->loadFromArray($row);
+  }
+
+
   public static function getReadLock($repository_phid, $device_phid) {
     $repository_hash = PhabricatorHash::digestForIndex($repository_phid);
     $device_hash = PhabricatorHash::digestForIndex($device_phid);

From e010aaca4329d1ff401d4f13938ac4c8dab549d2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Mar 2018 10:58:56 -0700
Subject: [PATCH 734/865] accidentally a word

Summary: Sometimes I dream I am a small turtle.

Test Plan: squeak squeak

Differential Revision: https://secure.phabricator.com/D19248
---
 resources/celerity/map.php                    | 28 +++++++++----------
 .../rsrc/externals/javelin/lib/Workflow.js    |  3 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 06ab100482..cb646d386e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '6da3c0e5',
-    'core.pkg.js' => '27f3489f',
+    'core.pkg.js' => 'b9b4a943',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -253,7 +253,7 @@
     'rsrc/externals/javelin/lib/URI.js' => 'c989ade3',
     'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
     'rsrc/externals/javelin/lib/WebSocket.js' => '3ffe32d6',
-    'rsrc/externals/javelin/lib/Workflow.js' => '7dd6653c',
+    'rsrc/externals/javelin/lib/Workflow.js' => '6a726c55',
     'rsrc/externals/javelin/lib/__tests__/Cookie.js' => '5ed109e8',
     'rsrc/externals/javelin/lib/__tests__/DOM.js' => 'c984504b',
     'rsrc/externals/javelin/lib/__tests__/JSON.js' => '837a7d68',
@@ -739,7 +739,7 @@
     'javelin-workboard-card' => 'c587b80f',
     'javelin-workboard-column' => '758b4758',
     'javelin-workboard-controller' => '26167537',
-    'javelin-workflow' => '7dd6653c',
+    'javelin-workflow' => '6a726c55',
     'maniphest-report-css' => '9b9580b7',
     'maniphest-task-edit-css' => 'fda62a9b',
     'maniphest-task-summary-css' => '11cc5344',
@@ -1425,6 +1425,17 @@
     '69adf288' => array(
       'javelin-install',
     ),
+    '6a726c55' => array(
+      'javelin-stratcom',
+      'javelin-request',
+      'javelin-dom',
+      'javelin-vector',
+      'javelin-install',
+      'javelin-util',
+      'javelin-mask',
+      'javelin-uri',
+      'javelin-routable',
+    ),
     '6b31879a' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1527,17 +1538,6 @@
       'javelin-request',
       'javelin-router',
     ),
-    '7dd6653c' => array(
-      'javelin-stratcom',
-      'javelin-request',
-      'javelin-dom',
-      'javelin-vector',
-      'javelin-install',
-      'javelin-util',
-      'javelin-mask',
-      'javelin-uri',
-      'javelin-routable',
-    ),
     '7e41274a' => array(
       'javelin-install',
     ),
diff --git a/webroot/rsrc/externals/javelin/lib/Workflow.js b/webroot/rsrc/externals/javelin/lib/Workflow.js
index c669a98706..d767a58780 100644
--- a/webroot/rsrc/externals/javelin/lib/Workflow.js
+++ b/webroot/rsrc/externals/javelin/lib/Workflow.js
@@ -152,7 +152,8 @@ JX.install('Workflow', {
         // handlers may still want to access the nodes.
 
         // Disable whatever button the user clicked to prevent duplicate
-        // submission mistakes when you accidentally . See T11145.
+        // submission mistakes when you accidentally click a button multiple
+        // times. See T11145.
         button.disabled = true;
 
         active

From 69bff489d4ec80db3f8ba843b7d0f7ba6ff8656b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Mar 2018 12:42:08 -0700
Subject: [PATCH 735/865] Generate a random unique "Request ID" for SSH
 requests so processes can coordinate better

Summary:
Depends on D19247. Ref T13109. When we receive an SSH request, generate a random unique ID for the request. Then thread it down through the process tree.

The immediate goal is to let the `ssh-exec` process coordinate with `commit-hook` process and log information about read and write lock wait times. Today, there's no way for `ssh-exec` to interact with the `PushEvent`, but this is the most helpful place to store this data for users.

Test Plan: Made pushes, saw the `PushEvent` table populate with a random request ID. Exported data and saw the ID preserved in the export.

Maniphest Tasks: T13109

Differential Revision: https://secure.phabricator.com/D19249
---
 .../20180322.lock.01.identifier.sql           |  5 ++++
 scripts/repository/commit_hook.php            |  5 ++++
 scripts/ssh/ssh-exec.php                      |  7 +++++
 .../PhabricatorAccessLogConfigOptions.php     |  4 +++
 .../engine/DiffusionCommitHookEngine.php      | 26 ++++++++++++++++---
 .../diffusion/ssh/DiffusionSSHWorkflow.php    |  5 ++++
 ...abricatorRepositoryPushLogSearchEngine.php |  4 +++
 .../PhabricatorRepositoryPushEvent.php        |  6 +++++
 .../ssh/PhabricatorSSHWorkflow.php            | 10 +++++++
 9 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 resources/sql/autopatches/20180322.lock.01.identifier.sql

diff --git a/resources/sql/autopatches/20180322.lock.01.identifier.sql b/resources/sql/autopatches/20180322.lock.01.identifier.sql
new file mode 100644
index 0000000000..b115a691fa
--- /dev/null
+++ b/resources/sql/autopatches/20180322.lock.01.identifier.sql
@@ -0,0 +1,5 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_pushevent
+  ADD requestIdentifier VARBINARY(12);
+
+ALTER TABLE {$NAMESPACE}_repository.repository_pushevent
+  ADD UNIQUE KEY `key_request` (requestIdentifier);
diff --git a/scripts/repository/commit_hook.php b/scripts/repository/commit_hook.php
index 51abcb6c89..07d6d7cfa2 100755
--- a/scripts/repository/commit_hook.php
+++ b/scripts/repository/commit_hook.php
@@ -187,6 +187,11 @@
   $engine->setRemoteProtocol($remote_protocol);
 }
 
+$request_identifier = getenv(DiffusionCommitHookEngine::ENV_REQUEST);
+if (strlen($request_identifier)) {
+  $engine->setRequestIdentifier($request_identifier);
+}
+
 try {
   $err = $engine->execute();
 } catch (DiffusionCommitHookRejectException $ex) {
diff --git a/scripts/ssh/ssh-exec.php b/scripts/ssh/ssh-exec.php
index 2ff1bdc198..0f2275cda8 100755
--- a/scripts/ssh/ssh-exec.php
+++ b/scripts/ssh/ssh-exec.php
@@ -8,6 +8,12 @@
 
 $ssh_log = PhabricatorSSHLog::getLog();
 
+$request_identifier = Filesystem::readRandomCharacters(12);
+$ssh_log->setData(
+  array(
+    'Q' => $request_identifier,
+  ));
+
 $args = new PhutilArgumentParser($argv);
 $args->setTagline(pht('execute SSH requests'));
 $args->setSynopsis(<<<EOSYNOPSIS
@@ -248,6 +254,7 @@
   $workflow->setSSHUser($user);
   $workflow->setOriginalArguments($original_argv);
   $workflow->setIsClusterRequest($is_cluster_request);
+  $workflow->setRequestIdentifier($request_identifier);
 
   $sock_stdin = fopen('php://stdin', 'r');
   if (!$sock_stdin) {
diff --git a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
index 9ae60825ea..2b9c4bbc75 100644
--- a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
@@ -47,6 +47,10 @@ public function getOptions() {
       's' => pht('The system user.'),
       'S' => pht('The system sudo user.'),
       'k' => pht('ID of the SSH key used to authenticate the request.'),
+
+      // TODO: This is a reasonable thing to support in the HTTP access
+      // log, too.
+      'Q' => pht('A random, unique string which identifies the request.'),
     );
 
     $http_desc = pht(
diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index a0769a51f0..cc4526dbdc 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -12,6 +12,7 @@ final class DiffusionCommitHookEngine extends Phobject {
 
   const ENV_REPOSITORY = 'PHABRICATOR_REPOSITORY';
   const ENV_USER = 'PHABRICATOR_USER';
+  const ENV_REQUEST = 'PHABRICATOR_REQUEST';
   const ENV_REMOTE_ADDRESS = 'PHABRICATOR_REMOTE_ADDRESS';
   const ENV_REMOTE_PROTOCOL = 'PHABRICATOR_REMOTE_PROTOCOL';
 
@@ -25,6 +26,7 @@ final class DiffusionCommitHookEngine extends Phobject {
   private $subversionRepository;
   private $remoteAddress;
   private $remoteProtocol;
+  private $requestIdentifier;
   private $transactionKey;
   private $mercurialHook;
   private $mercurialCommits = array();
@@ -58,6 +60,15 @@ public function getRemoteAddress() {
     return $this->remoteAddress;
   }
 
+  public function setRequestIdentifier($request_identifier) {
+    $this->requestIdentifier = $request_identifier;
+    return $this;
+  }
+
+  public function getRequestIdentifier() {
+    return $this->requestIdentifier;
+  }
+
   public function setSubversionTransactionInfo($transaction, $repository) {
     $this->subversionTransaction = $transaction;
     $this->subversionRepository = $repository;
@@ -620,6 +631,7 @@ private function applyCustomHooks(array $updates) {
     $env = array(
       self::ENV_REPOSITORY => $this->getRepository()->getPHID(),
       self::ENV_USER => $this->getViewer()->getUsername(),
+      self::ENV_REQUEST => $this->getRequestIdentifier(),
       self::ENV_REMOTE_PROTOCOL => $this->getRemoteProtocol(),
       self::ENV_REMOTE_ADDRESS => $this->getRemoteAddress(),
     );
@@ -1081,16 +1093,24 @@ private function newPushLog() {
       ->setDevicePHID($device_phid)
       ->setRepositoryPHID($this->getRepository()->getPHID())
       ->attachRepository($this->getRepository())
-      ->setEpoch(time());
+      ->setEpoch(PhabricatorTime::getNow());
   }
 
   private function newPushEvent() {
     $viewer = $this->getViewer();
-    return PhabricatorRepositoryPushEvent::initializeNewEvent($viewer)
+
+    $event = PhabricatorRepositoryPushEvent::initializeNewEvent($viewer)
       ->setRepositoryPHID($this->getRepository()->getPHID())
       ->setRemoteAddress($this->getRemoteAddress())
       ->setRemoteProtocol($this->getRemoteProtocol())
-      ->setEpoch(time());
+      ->setEpoch(PhabricatorTime::getNow());
+
+    $identifier = $this->getRequestIdentifier();
+    if (strlen($identifier)) {
+      $event->setRequestIdentifier($identifier);
+    }
+
+    return $event;
   }
 
   private function rejectEnormousChanges(array $content_updates) {
diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
index e40d8e1f51..baf1749252 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
@@ -30,6 +30,11 @@ public function getEnvironment() {
       DiffusionCommitHookEngine::ENV_REMOTE_PROTOCOL => 'ssh',
     );
 
+    $identifier = $this->getRequestIdentifier();
+    if ($identifier !== null) {
+      $env[DiffusionCommitHookEngine::ENV_REQUEST] = $identifier;
+    }
+
     $remote_address = $this->getSSHRemoteAddress();
     if ($remote_address !== null) {
       $env[DiffusionCommitHookEngine::ENV_REMOTE_ADDRESS] = $remote_address;
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
index 8ad76987f9..5bf2c84aeb 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
@@ -101,6 +101,9 @@ protected function newExportFields() {
       $fields[] = id(new PhabricatorIDExportField())
         ->setKey('pushID')
         ->setLabel(pht('Push ID')),
+      $fields[] = id(new PhabricatorStringExportField())
+        ->setKey('unique')
+        ->setLabel(pht('Unique')),
       $fields[] = id(new PhabricatorStringExportField())
         ->setKey('protocol')
         ->setLabel(pht('Protocol')),
@@ -209,6 +212,7 @@ protected function newExportData(array $logs) {
 
       $map = array(
         'pushID' => $event->getID(),
+        'unique' => $event->getRequestIdentifier(),
         'protocol' => $event->getRemoteProtocol(),
         'repositoryPHID' => $repository_phid,
         'repository' => $repository_name,
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
index 2bc751ffca..369af15635 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
@@ -11,6 +11,7 @@ final class PhabricatorRepositoryPushEvent
   protected $repositoryPHID;
   protected $epoch;
   protected $pusherPHID;
+  protected $requestIdentifier;
   protected $remoteAddress;
   protected $remoteProtocol;
   protected $rejectCode;
@@ -29,6 +30,7 @@ protected function getConfiguration() {
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_COLUMN_SCHEMA => array(
+        'requestIdentifier' => 'bytes12?',
         'remoteAddress' => 'ipaddress?',
         'remoteProtocol' => 'text32?',
         'rejectCode' => 'uint32',
@@ -38,6 +40,10 @@ protected function getConfiguration() {
         'key_repository' => array(
           'columns' => array('repositoryPHID'),
         ),
+        'key_request' => array(
+          'columns' => array('requestIdentifier'),
+          'unique' => true,
+        ),
       ),
     ) + parent::getConfiguration();
   }
diff --git a/src/infrastructure/ssh/PhabricatorSSHWorkflow.php b/src/infrastructure/ssh/PhabricatorSSHWorkflow.php
index 6b6222304c..f7739f1332 100644
--- a/src/infrastructure/ssh/PhabricatorSSHWorkflow.php
+++ b/src/infrastructure/ssh/PhabricatorSSHWorkflow.php
@@ -13,6 +13,7 @@ abstract class PhabricatorSSHWorkflow
   private $errorChannel;
   private $isClusterRequest;
   private $originalArguments;
+  private $requestIdentifier;
 
   public function isExecutable() {
     return false;
@@ -89,6 +90,15 @@ public function getOriginalArguments() {
     return $this->originalArguments;
   }
 
+  public function setRequestIdentifier($request_identifier) {
+    $this->requestIdentifier = $request_identifier;
+    return $this;
+  }
+
+  public function getRequestIdentifier() {
+    return $this->requestIdentifier;
+  }
+
   public function getSSHRemoteAddress() {
     $ssh_client = getenv('SSH_CLIENT');
     if (!strlen($ssh_client)) {

From df3c937dab8c0c56289f9fe59e95e57eaa703417 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 22 Mar 2018 12:08:20 -0700
Subject: [PATCH 736/865] Record lock timing information on PushEvents

Summary:
Depends on D19249. Ref T13109. Add timing information to the `PushEvent`:

  - `writeWait`: Time spent waiting for a write lock.
  - `readWait`: Time spent waiting for a read lock.
  - `hostWait`: Roughly, total time spent on the leaf node.

The primary goal here is to see if `readWait` is meaningful in the wild. If it is, that motivates smarter routing, and the value of smarter routing can be demonstrated by looking for a reduction in read wait times.

Test Plan: Pushed some stuff, saw reasonable timing values in the table. Saw timing information in "Export Data".

Maniphest Tasks: T13109

Differential Revision: https://secure.phabricator.com/D19250
---
 .../sql/autopatches/20180322.lock.02.wait.sql |  8 ++++
 .../DiffusionRepositoryClusterEngine.php      | 14 ++++++
 ...ionRepositoryClusterEngineLogInterface.php |  1 +
 .../DiffusionGitReceivePackSSHWorkflow.php    | 43 +++++++++++++++++
 .../diffusion/ssh/DiffusionGitSSHWorkflow.php | 10 ++++
 ...abricatorRepositoryPushLogSearchEngine.php | 46 ++++++++++++-------
 .../PhabricatorRepositoryPushEvent.php        |  6 +++
 7 files changed, 111 insertions(+), 17 deletions(-)
 create mode 100644 resources/sql/autopatches/20180322.lock.02.wait.sql

diff --git a/resources/sql/autopatches/20180322.lock.02.wait.sql b/resources/sql/autopatches/20180322.lock.02.wait.sql
new file mode 100644
index 0000000000..cba7cc64d0
--- /dev/null
+++ b/resources/sql/autopatches/20180322.lock.02.wait.sql
@@ -0,0 +1,8 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_pushevent
+  ADD writeWait BIGINT UNSIGNED;
+
+ALTER TABLE {$NAMESPACE}_repository.repository_pushevent
+  ADD readWait BIGINT UNSIGNED;
+
+ALTER TABLE {$NAMESPACE}_repository.repository_pushevent
+  ADD hostWait BIGINT UNSIGNED;
diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
index c855b6c532..d5ba74a30e 100644
--- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
@@ -315,12 +315,15 @@ public function synchronizeWorkingCopyBeforeWrite() {
 
     $lock_wait = phutil_units('2 minutes in seconds');
     try {
+      $write_wait_start = microtime(true);
+
       $start = PhabricatorTime::getNow();
       $step_wait = 1;
 
       while (true) {
         try {
           $write_lock->lock((int)floor($step_wait));
+          $write_wait_end = microtime(true);
           break;
         } catch (PhutilLockException $ex) {
           $waited = (PhabricatorTime::getNow() - $start);
@@ -370,12 +373,14 @@ public function synchronizeWorkingCopyBeforeWrite() {
           'documentation for instructions.'));
     }
 
+    $read_wait_start = microtime(true);
     try {
       $max_version = $this->synchronizeWorkingCopyBeforeRead();
     } catch (Exception $ex) {
       $write_lock->unlock();
       throw $ex;
     }
+    $read_wait_end = microtime(true);
 
     $pid = getmypid();
     $hash = Filesystem::readRandomCharacters(12);
@@ -394,6 +399,15 @@ public function synchronizeWorkingCopyBeforeWrite() {
 
     $this->clusterWriteVersion = $max_version;
     $this->clusterWriteLock = $write_lock;
+
+    $write_wait = ($write_wait_end - $write_wait_start);
+    $read_wait = ($read_wait_end - $read_wait_start);
+
+    $log = $this->logger;
+    if ($log) {
+      $log->writeClusterEngineLogProperty('readWait', $read_wait);
+      $log->writeClusterEngineLogProperty('writeWait', $write_wait);
+    }
   }
 
 
diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngineLogInterface.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngineLogInterface.php
index 9b1fe9a506..3e43d72779 100644
--- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngineLogInterface.php
+++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngineLogInterface.php
@@ -3,5 +3,6 @@
 interface DiffusionRepositoryClusterEngineLogInterface {
 
   public function writeClusterEngineLogMessage($message);
+  public function writeClusterEngineLogProperty($key, $value);
 
 }
diff --git a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
index 91c8238718..400340abeb 100644
--- a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
@@ -14,6 +14,8 @@ protected function didConstruct() {
   }
 
   protected function executeRepositoryOperations() {
+    $host_wait_start = microtime(true);
+
     $repository = $this->getRepository();
     $viewer = $this->getSSHUser();
     $device = AlmanacKeys::getLiveDevice();
@@ -71,6 +73,14 @@ protected function executeRepositoryOperations() {
         PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE,
         PhabricatorRepositoryStatusMessage::CODE_OKAY);
       $this->waitForGitClient();
+
+      $host_wait_end = microtime(true);
+
+      $this->updatePushLogWithTimingInformation(
+        $this->getClusterEngineLogProperty('writeWait'),
+        $this->getClusterEngineLogProperty('readWait'),
+        ($host_wait_end - $host_wait_start));
+
     }
 
     return $err;
@@ -89,4 +99,37 @@ private function executeRepositoryCommand($command) {
       ->execute();
   }
 
+  private function updatePushLogWithTimingInformation(
+    $write_wait,
+    $read_wait,
+    $host_wait) {
+
+    if ($write_wait !== null) {
+      $write_wait = (int)(1000000 * $write_wait);
+    }
+
+    if ($read_wait !== null) {
+      $read_wait = (int)(1000000 * $read_wait);
+    }
+
+    if ($host_wait !== null) {
+      $host_wait = (int)(1000000 * $host_wait);
+    }
+
+    $identifier = $this->getRequestIdentifier();
+
+    $event = new PhabricatorRepositoryPushEvent();
+    $conn = $event->establishConnection('w');
+
+    queryfx(
+      $conn,
+      'UPDATE %T SET writeWait = %nd, readWait = %nd, hostWait = %nd
+        WHERE requestIdentifier = %s',
+      $event->getTableName(),
+      $write_wait,
+      $read_wait,
+      $host_wait,
+      $identifier);
+  }
+
 }
diff --git a/src/applications/diffusion/ssh/DiffusionGitSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitSSHWorkflow.php
index 6de16e723d..6bc56d767d 100644
--- a/src/applications/diffusion/ssh/DiffusionGitSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitSSHWorkflow.php
@@ -4,6 +4,8 @@ abstract class DiffusionGitSSHWorkflow
   extends DiffusionSSHWorkflow
   implements DiffusionRepositoryClusterEngineLogInterface {
 
+  private $engineLogProperties = array();
+
   protected function writeError($message) {
     // Git assumes we'll add our own newlines.
     return parent::writeError($message."\n");
@@ -14,6 +16,14 @@ public function writeClusterEngineLogMessage($message) {
     $this->getErrorChannel()->update();
   }
 
+  public function writeClusterEngineLogProperty($key, $value) {
+    $this->engineLogProperties[$key] = $value;
+  }
+
+  protected function getClusterEngineLogProperty($key, $default = null) {
+    return idx($this->engineLogProperties, $key, $default);
+  }
+
   protected function identifyRepository() {
     $args = $this->getArgs();
     $path = head($args->getArg('dir'));
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
index 5bf2c84aeb..7b626fff32 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
@@ -98,57 +98,66 @@ protected function newExportFields() {
     $viewer = $this->requireViewer();
 
     $fields = array(
-      $fields[] = id(new PhabricatorIDExportField())
+      id(new PhabricatorIDExportField())
         ->setKey('pushID')
         ->setLabel(pht('Push ID')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('unique')
         ->setLabel(pht('Unique')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('protocol')
         ->setLabel(pht('Protocol')),
-      $fields[] = id(new PhabricatorPHIDExportField())
+      id(new PhabricatorPHIDExportField())
         ->setKey('repositoryPHID')
         ->setLabel(pht('Repository PHID')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('repository')
         ->setLabel(pht('Repository')),
-      $fields[] = id(new PhabricatorPHIDExportField())
+      id(new PhabricatorPHIDExportField())
         ->setKey('pusherPHID')
         ->setLabel(pht('Pusher PHID')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('pusher')
         ->setLabel(pht('Pusher')),
-      $fields[] = id(new PhabricatorPHIDExportField())
+      id(new PhabricatorPHIDExportField())
         ->setKey('devicePHID')
         ->setLabel(pht('Device PHID')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('device')
         ->setLabel(pht('Device')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('type')
         ->setLabel(pht('Ref Type')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('name')
         ->setLabel(pht('Ref Name')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('old')
         ->setLabel(pht('Ref Old')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('new')
         ->setLabel(pht('Ref New')),
-      $fields[] = id(new PhabricatorIntExportField())
+      id(new PhabricatorIntExportField())
         ->setKey('flags')
         ->setLabel(pht('Flags')),
-      $fields[] = id(new PhabricatorStringListExportField())
+      id(new PhabricatorStringListExportField())
         ->setKey('flagNames')
         ->setLabel(pht('Flag Names')),
-      $fields[] = id(new PhabricatorIntExportField())
+      id(new PhabricatorIntExportField())
         ->setKey('result')
         ->setLabel(pht('Result')),
-      $fields[] = id(new PhabricatorStringExportField())
+      id(new PhabricatorStringExportField())
         ->setKey('resultName')
         ->setLabel(pht('Result Name')),
+      id(new PhabricatorIntExportField())
+        ->setKey('writeWait')
+        ->setLabel(pht('Write Wait (us)')),
+      id(new PhabricatorIntExportField())
+        ->setKey('readWait')
+        ->setLabel(pht('Read Wait (us)')),
+      id(new PhabricatorIntExportField())
+        ->setKey('hostWait')
+        ->setLabel(pht('Host Wait (us)')),
     );
 
     if ($viewer->getIsAdmin()) {
@@ -228,6 +237,9 @@ protected function newExportData(array $logs) {
         'flagNames' => $flag_names,
         'result' => $result,
         'resultName' => $result_name,
+        'writeWait' => $event->getWriteWait(),
+        'readWait' => $event->getReadWait(),
+        'hostWait' => $event->getHostWait(),
       );
 
       if ($viewer->getIsAdmin()) {
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
index 369af15635..451f8acda5 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
@@ -16,6 +16,9 @@ final class PhabricatorRepositoryPushEvent
   protected $remoteProtocol;
   protected $rejectCode;
   protected $rejectDetails;
+  protected $writeWait;
+  protected $readWait;
+  protected $hostWait;
 
   private $repository = self::ATTACHABLE;
   private $logs = self::ATTACHABLE;
@@ -35,6 +38,9 @@ protected function getConfiguration() {
         'remoteProtocol' => 'text32?',
         'rejectCode' => 'uint32',
         'rejectDetails' => 'text64?',
+        'writeWait' => 'uint64?',
+        'readWait' => 'uint64?',
+        'hostWait' => 'uint64?',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_repository' => array(

From 8b658706a8c4989e7a22b4af23703c04f8b4fb47 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Mar 2018 03:52:11 -0700
Subject: [PATCH 737/865] Add a basic Remarkup document rendering engine

Summary:
Ref T13105. Although Markdown is trickier to deal with, we can handle Remarkup easily.

This may need some support for encoding options.

Test Plan: Viewed `.remarkup` files, got remarkup document presentation by default. Viewed other text files, got an option to render as remarkup.

Reviewers: avivey

Reviewed By: avivey

Subscribers: mydeveloperday, avivey

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19251
---
 resources/celerity/map.php                    |  6 +--
 src/__phutil_library_map__.php                |  2 +
 .../files/document/PhabricatorDocumentRef.php | 14 ++++++
 .../PhabricatorRemarkupDocumentEngine.php     | 47 +++++++++++++++++++
 .../rsrc/css/phui/phui-property-list-view.css |  4 ++
 5 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/files/document/PhabricatorRemarkupDocumentEngine.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index cb646d386e..6fcfc52bab 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '6da3c0e5',
+    'core.pkg.css' => 'afe29a6c',
     'core.pkg.js' => 'b9b4a943',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -168,7 +168,7 @@
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-property-list-view.css' => '6ef560df',
+    'rsrc/css/phui/phui-property-list-view.css' => '94a14381',
     'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -850,7 +850,7 @@
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-property-list-view-css' => '6ef560df',
+    'phui-property-list-view-css' => '94a14381',
     'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index aef91c2e6b..ff7c145fb7 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3967,6 +3967,7 @@
     'PhabricatorRemarkupCowsayBlockInterpreter' => 'infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php',
     'PhabricatorRemarkupCustomBlockRule' => 'infrastructure/markup/rule/PhabricatorRemarkupCustomBlockRule.php',
     'PhabricatorRemarkupCustomInlineRule' => 'infrastructure/markup/rule/PhabricatorRemarkupCustomInlineRule.php',
+    'PhabricatorRemarkupDocumentEngine' => 'applications/files/document/PhabricatorRemarkupDocumentEngine.php',
     'PhabricatorRemarkupEditField' => 'applications/transactions/editfield/PhabricatorRemarkupEditField.php',
     'PhabricatorRemarkupFigletBlockInterpreter' => 'infrastructure/markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php',
     'PhabricatorRemarkupUIExample' => 'applications/uiexample/examples/PhabricatorRemarkupUIExample.php',
@@ -9710,6 +9711,7 @@
     'PhabricatorRemarkupCowsayBlockInterpreter' => 'PhutilRemarkupBlockInterpreter',
     'PhabricatorRemarkupCustomBlockRule' => 'PhutilRemarkupBlockRule',
     'PhabricatorRemarkupCustomInlineRule' => 'PhutilRemarkupRule',
+    'PhabricatorRemarkupDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorRemarkupEditField' => 'PhabricatorEditField',
     'PhabricatorRemarkupFigletBlockInterpreter' => 'PhutilRemarkupBlockInterpreter',
     'PhabricatorRemarkupUIExample' => 'PhabricatorUIExample',
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
index 862c0596d3..6b4b6a6796 100644
--- a/src/applications/files/document/PhabricatorDocumentRef.php
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -7,6 +7,7 @@ final class PhabricatorDocumentRef
   private $mimeType;
   private $file;
   private $byteLength;
+  private $snippet;
 
   public function setFile(PhabricatorFile $file) {
     $this->file = $file;
@@ -104,4 +105,17 @@ private function normalizeMimeType($mime_type) {
     return $mime_type;
   }
 
+  public function isProbablyText() {
+    $snippet = $this->getSnippet();
+    return (strpos($snippet, "\0") === false);
+  }
+
+  public function getSnippet() {
+    if ($this->snippet === null) {
+      $this->snippet = $this->loadData(null, (1024 * 1024 * 1));
+    }
+
+    return $this->snippet;
+  }
+
 }
diff --git a/src/applications/files/document/PhabricatorRemarkupDocumentEngine.php b/src/applications/files/document/PhabricatorRemarkupDocumentEngine.php
new file mode 100644
index 0000000000..296b78196f
--- /dev/null
+++ b/src/applications/files/document/PhabricatorRemarkupDocumentEngine.php
@@ -0,0 +1,47 @@
+<?php
+
+final class PhabricatorRemarkupDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  const ENGINEKEY = 'remarkup';
+
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as Remarkup');
+  }
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-file-text-o';
+  }
+
+  protected function getContentScore(PhabricatorDocumentRef $ref) {
+    $name = $ref->getName();
+    if (preg_match('/\\.remarkup\z/i', $name)) {
+      return 2000;
+    }
+
+    return 500;
+  }
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    return $ref->isProbablyText();
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $viewer = $this->getViewer();
+
+    $content = $ref->loadData();
+    $content = phutil_utf8ize($content);
+
+    $remarkup = new PHUIRemarkupView($viewer, $content);
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-remarkup',
+      ),
+      $remarkup);
+
+    return $container;
+  }
+
+}
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
index 840364723d..685c01fd0a 100644
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -244,3 +244,7 @@ div.phui-property-list-stacked .phui-property-list-properties
   margin: 20px;
   white-space: pre;
 }
+
+.document-engine-remarkup {
+  margin: 20px;
+}

From fb4ce851c4aeac84b4e1a264bc09019aeb9149f8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Mar 2018 04:50:48 -0700
Subject: [PATCH 738/865] Add a PDF document "rendering" engine

Summary:
Depends on D19251. Ref T13105. This adds rendering engine support for PDFs.

It doesn't actually render them, it just renders a link which you can click to view them in a new window. This is much easier than actually rendering them inline and at least 95% as good most of the time (and probably more-than-100%-as-good some of the time).

This makes PDF a viewable MIME type by default and adds a narrow CSP exception for it. See also T13112.

Test Plan:
  - Viewed PDFs in Files, got a link to view them in a new tab.
  - Clicked the link in Safari, Chrome, and Firefox; got inline PDFs.
  - Verified primary CSP is still `object-src 'none'` with `curl ...`.
  - Interacted with the vanilla lightbox element to check that it still works.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19252
---
 resources/celerity/map.php                    | 10 ++--
 src/__phutil_library_map__.php                |  2 +
 src/aphront/response/AphrontResponse.php      |  7 ++-
 .../config/PhabricatorFilesConfigOptions.php  |  2 +
 .../PhabricatorFileDataController.php         | 20 ++++++-
 .../document/PhabricatorPDFDocumentEngine.php | 57 ++++++++++++++++++
 .../files/storage/PhabricatorFile.php         | 13 +++++
 src/view/layout/PhabricatorFileLinkView.php   | 58 ++++++++++++-------
 webroot/rsrc/css/core/remarkup.css            |  6 +-
 .../rsrc/css/phui/phui-property-list-view.css |  9 +++
 10 files changed, 154 insertions(+), 30 deletions(-)
 create mode 100644 src/applications/files/document/PhabricatorPDFDocumentEngine.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 6fcfc52bab..0d80821050 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'afe29a6c',
+    'core.pkg.css' => '2d73b2f3',
     'core.pkg.js' => 'b9b4a943',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -112,7 +112,7 @@
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '62fa3ace',
-    'rsrc/css/core/remarkup.css' => '97dc3523',
+    'rsrc/css/core/remarkup.css' => 'b375546d',
     'rsrc/css/core/syntax.css' => 'cae95e89',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
@@ -168,7 +168,7 @@
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-property-list-view.css' => '94a14381',
+    'rsrc/css/phui/phui-property-list-view.css' => '47018d3c',
     'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -780,7 +780,7 @@
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '77b0ae28',
-    'phabricator-remarkup-css' => '97dc3523',
+    'phabricator-remarkup-css' => 'b375546d',
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
@@ -850,7 +850,7 @@
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-property-list-view-css' => '94a14381',
+    'phui-property-list-view-css' => '47018d3c',
     'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index ff7c145fb7..6090161840 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3519,6 +3519,7 @@
     'PhabricatorOwnersPathsSearchEngineAttachment' => 'applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php',
     'PhabricatorOwnersSchemaSpec' => 'applications/owners/storage/PhabricatorOwnersSchemaSpec.php',
     'PhabricatorOwnersSearchField' => 'applications/owners/searchfield/PhabricatorOwnersSearchField.php',
+    'PhabricatorPDFDocumentEngine' => 'applications/files/document/PhabricatorPDFDocumentEngine.php',
     'PhabricatorPHDConfigOptions' => 'applications/config/option/PhabricatorPHDConfigOptions.php',
     'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
     'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
@@ -9169,6 +9170,7 @@
     'PhabricatorOwnersPathsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'PhabricatorOwnersSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'PhabricatorOwnersSearchField' => 'PhabricatorSearchTokenizerField',
+    'PhabricatorPDFDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPHID' => 'Phobject',
     'PhabricatorPHIDConstants' => 'Phobject',
diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index 2ee222d61c..fe1e80318f 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -28,6 +28,7 @@ final public function addContentSecurityPolicyURI($kind, $uri) {
          'connect-src' => array(),
          'frame-src' => array(),
          'form-action' => array(),
+         'object-src' => array(),
        );
     }
 
@@ -163,8 +164,10 @@ private function newContentSecurityPolicyHeader() {
       $csp[] = "frame-ancestors 'none'";
     }
 
-    // Block relics of the old world: Flash, Java applets, and so on.
-    $csp[] = "object-src 'none'";
+    // Block relics of the old world: Flash, Java applets, and so on. Note
+    // that Chrome prevents the user from viewing PDF documents if they are
+    // served with a policy which excludes the domain they are served from.
+    $csp[] = $this->newContentSecurityPolicy('object-src', "'none'");
 
     // Don't allow forms to submit offsite.
 
diff --git a/src/applications/files/config/PhabricatorFilesConfigOptions.php b/src/applications/files/config/PhabricatorFilesConfigOptions.php
index 1493c54f59..751a06ffdb 100644
--- a/src/applications/files/config/PhabricatorFilesConfigOptions.php
+++ b/src/applications/files/config/PhabricatorFilesConfigOptions.php
@@ -45,6 +45,8 @@ public function getOptions() {
       'video/ogg' => 'video/ogg',
       'video/webm' => 'video/webm',
       'video/quicktime' => 'video/quicktime',
+
+      'application/pdf' => 'application/pdf',
     );
 
     $image_default = array(
diff --git a/src/applications/files/controller/PhabricatorFileDataController.php b/src/applications/files/controller/PhabricatorFileDataController.php
index 91dfb4fa4f..bd3d933283 100644
--- a/src/applications/files/controller/PhabricatorFileDataController.php
+++ b/src/applications/files/controller/PhabricatorFileDataController.php
@@ -73,11 +73,14 @@ public function handleRequest(AphrontRequest $request) {
       list($begin, $end) = $response->parseHTTPRange($range);
     }
 
-    $is_viewable = $file->isViewableInBrowser();
+    if (!$file->isViewableInBrowser()) {
+      $is_download = true;
+    }
+
     $request_type = $request->getHTTPHeader('X-Phabricator-Request-Type');
     $is_lfs = ($request_type == 'git-lfs');
 
-    if ($is_viewable && !$is_download) {
+    if (!$is_download) {
       $response->setMimeType($file->getViewableMimeType());
     } else {
       $is_post = $request->isHTTPPost();
@@ -109,6 +112,19 @@ public function handleRequest(AphrontRequest $request) {
     $response->setContentLength($file->getByteSize());
     $response->setContentIterator($iterator);
 
+    // In Chrome, we must permit this domain in "object-src" CSP when serving a
+    // PDF or the browser will refuse to render it.
+    if (!$is_download && $file->isPDF()) {
+      $request_uri = id(clone $request->getAbsoluteRequestURI())
+        ->setPath(null)
+        ->setFragment(null)
+        ->setQueryParams(array());
+
+      $response->addContentSecurityPolicyURI(
+        'object-src',
+        (string)$request_uri);
+    }
+
     return $response;
   }
 
diff --git a/src/applications/files/document/PhabricatorPDFDocumentEngine.php b/src/applications/files/document/PhabricatorPDFDocumentEngine.php
new file mode 100644
index 0000000000..1e85bd4ae5
--- /dev/null
+++ b/src/applications/files/document/PhabricatorPDFDocumentEngine.php
@@ -0,0 +1,57 @@
+<?php
+
+final class PhabricatorPDFDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  const ENGINEKEY = 'pdf';
+
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as PDF');
+  }
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-file-pdf-o';
+  }
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    // Since we just render a link to the document anyway, we don't need to
+    // check anything fancy in config to see if the MIME type is actually
+    // viewable.
+
+    return $ref->hasAnyMimeType(
+      array(
+        'application/pdf',
+      ));
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $viewer = $this->getViewer();
+
+    $file = $ref->getFile();
+    if ($file) {
+      $source_uri = $file->getViewURI();
+    } else {
+      throw new PhutilMethodNotImplementedException();
+    }
+
+    $name = $ref->getName();
+    $length = $ref->getByteLength();
+
+    $link = id(new PhabricatorFileLinkView())
+      ->setViewer($viewer)
+      ->setFileName($name)
+      ->setFileViewURI($source_uri)
+      ->setFileViewable(true)
+      ->setFileSize(phutil_format_bytes($length));
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-pdf',
+      ),
+      $link);
+
+    return $container;
+  }
+
+}
diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index 60b4ca0e74..a8d16b7651 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -930,6 +930,19 @@ public function isVideo() {
     return idx($mime_map, $mime_type);
   }
 
+  public function isPDF() {
+    if (!$this->isViewableInBrowser()) {
+      return false;
+    }
+
+    $mime_map = array(
+      'application/pdf' => 'application/pdf',
+    );
+
+    $mime_type = $this->getMimeType();
+    return idx($mime_map, $mime_type);
+  }
+
   public function isTransformableImage() {
     // NOTE: The way the 'gd' extension works in PHP is that you can install it
     // with support for only some file types, so it might be able to handle
diff --git a/src/view/layout/PhabricatorFileLinkView.php b/src/view/layout/PhabricatorFileLinkView.php
index 82715c0294..49320c4b8c 100644
--- a/src/view/layout/PhabricatorFileLinkView.php
+++ b/src/view/layout/PhabricatorFileLinkView.php
@@ -101,26 +101,39 @@ public function getMeta() {
   }
 
   protected function getTagName() {
-    return 'div';
+    if ($this->getFileDownloadURI()) {
+      return 'div';
+    } else {
+      return 'a';
+    }
   }
 
   protected function getTagAttributes() {
-    $mustcapture = true;
-    $sigil = 'lightboxable';
-    $meta = $this->getMeta();
-
     $class = 'phabricator-remarkup-embed-layout-link';
     if ($this->getCustomClass()) {
       $class = $this->getCustomClass();
     }
 
-    return array(
-      'href'        => $this->getFileViewURI(),
-      'class'       => $class,
-      'sigil'       => $sigil,
-      'meta'        => $meta,
-      'mustcapture' => $mustcapture,
+    $attributes = array(
+      'href' => $this->getFileViewURI(),
+      'target' => '_blank',
+      'rel' => 'noreferrer',
+      'class' => $class,
     );
+
+    if ($this->getFilePHID()) {
+      $mustcapture = true;
+      $sigil = 'lightboxable';
+      $meta = $this->getMeta();
+
+      $attributes += array(
+        'sigil'       => $sigil,
+        'meta'        => $meta,
+        'mustcapture' => $mustcapture,
+      );
+    }
+
+    return $attributes;
   }
 
   protected function getTagContent() {
@@ -131,16 +144,21 @@ protected function getTagContent() {
       ->setIcon($this->getFileIcon())
       ->addClass('phabricator-remarkup-embed-layout-icon');
 
-    $dl_icon = id(new PHUIIconView())
-      ->setIcon('fa-download');
+    $download_link = null;
 
-    $download_link = phutil_tag(
-      'a',
-      array(
-        'class' => 'phabricator-remarkup-embed-layout-download',
-        'href' => $this->getFileDownloadURI(),
-      ),
-      pht('Download'));
+    $download_uri = $this->getFileDownloadURI();
+    if ($download_uri) {
+      $dl_icon = id(new PHUIIconView())
+        ->setIcon('fa-download');
+
+      $download_link = phutil_tag(
+        'a',
+        array(
+          'class' => 'phabricator-remarkup-embed-layout-download',
+          'href' => $download_uri,
+        ),
+        pht('Download'));
+    }
 
     $info = phutil_tag(
       'span',
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index a51c1ce1d9..949deadbe4 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -405,8 +405,9 @@ video.phabricator-media {
   color: {$blacktext};
   min-width: 256px;
   position: relative;
-  /*height: 22px;*/
   line-height: 20px;
+  overflow: hidden;
+  min-height: 38px;
 }
 
 .phabricator-remarkup-embed-layout-icon {
@@ -426,6 +427,9 @@ video.phabricator-media {
 .phabricator-remarkup-embed-layout-link:hover {
   border-color: {$violet};
   cursor: pointer;
+}
+
+.device-desktop .phabricator-remarkup-embed-layout-link:hover {
   text-decoration: none;
 }
 
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
index 685c01fd0a..59dc6cc054 100644
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -248,3 +248,12 @@ div.phui-property-list-stacked .phui-property-list-properties
 .document-engine-remarkup {
   margin: 20px;
 }
+
+.document-engine-pdf {
+  margin: 20px;
+  text-align: center;
+}
+
+.document-engine-pdf .phabricator-remarkup-embed-layout-link {
+  text-align: left;
+}

From cbf3d3c37154ad255ac803627427e9397601689d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Mar 2018 06:40:30 -0700
Subject: [PATCH 739/865] Add a very rough, proof-of-concept Jupyter notebook
 document engine

Summary:
Depends on D19252. Ref T13105. This very roughly renders Jupyter notebooks.

It's probably better than showing the raw JSON, but not by much.

Test Plan:
  - Viewed various notebooks with various cell types, including markdown, code, stdout, stderr, images, HTML, and Javascript.
  - HTML and Javascript are not live-fired since they're wildly dangerous.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19253
---
 resources/celerity/map.php                    |   6 +-
 src/__phutil_library_map__.php                |   2 +
 .../files/document/PhabricatorDocumentRef.php |   9 +
 .../PhabricatorJupyterDocumentEngine.php      | 305 ++++++++++++++++++
 .../rsrc/css/phui/phui-property-list-view.css |  47 +++
 5 files changed, 366 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/files/document/PhabricatorJupyterDocumentEngine.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 0d80821050..231c7fe5da 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '2d73b2f3',
+    'core.pkg.css' => '7daac340',
     'core.pkg.js' => 'b9b4a943',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -168,7 +168,7 @@
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-property-list-view.css' => '47018d3c',
+    'rsrc/css/phui/phui-property-list-view.css' => '871f6815',
     'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -850,7 +850,7 @@
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-property-list-view-css' => '47018d3c',
+    'phui-property-list-view-css' => '871f6815',
     'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 6090161840..a7b85ba4c5 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3190,6 +3190,7 @@
     'PhabricatorJSONExportFormat' => 'infrastructure/export/format/PhabricatorJSONExportFormat.php',
     'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorJiraIssueHasObjectEdgeType.php',
+    'PhabricatorJupyterDocumentEngine' => 'applications/files/document/PhabricatorJupyterDocumentEngine.php',
     'PhabricatorKeyValueDatabaseCache' => 'applications/cache/PhabricatorKeyValueDatabaseCache.php',
     'PhabricatorKeyValueSerializingCacheProxy' => 'applications/cache/PhabricatorKeyValueSerializingCacheProxy.php',
     'PhabricatorKeyboardRemarkupRule' => 'infrastructure/markup/rule/PhabricatorKeyboardRemarkupRule.php',
@@ -8800,6 +8801,7 @@
     'PhabricatorJSONExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorJavelinLinter' => 'ArcanistLinter',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'PhabricatorEdgeType',
+    'PhabricatorJupyterDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorKeyValueDatabaseCache' => 'PhutilKeyValueCache',
     'PhabricatorKeyValueSerializingCacheProxy' => 'PhutilKeyValueCacheProxy',
     'PhabricatorKeyboardRemarkupRule' => 'PhutilRemarkupRule',
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
index 6b4b6a6796..e27d164cd7 100644
--- a/src/applications/files/document/PhabricatorDocumentRef.php
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -110,6 +110,15 @@ public function isProbablyText() {
     return (strpos($snippet, "\0") === false);
   }
 
+  public function isProbablyJSON() {
+    if (!$this->isProbablyText()) {
+      return false;
+    }
+
+    $snippet = $this->getSnippet();
+    return phutil_is_utf8($snippet);
+  }
+
   public function getSnippet() {
     if ($this->snippet === null) {
       $this->snippet = $this->loadData(null, (1024 * 1024 * 1));
diff --git a/src/applications/files/document/PhabricatorJupyterDocumentEngine.php b/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
new file mode 100644
index 0000000000..7b2246a315
--- /dev/null
+++ b/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
@@ -0,0 +1,305 @@
+<?php
+
+final class PhabricatorJupyterDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  const ENGINEKEY = 'jupyter';
+
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as Jupyter Notebook');
+  }
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-sun-o';
+  }
+
+  protected function getContentScore(PhabricatorDocumentRef $ref) {
+    $name = $ref->getName();
+
+    if (preg_match('/\\.ipynb\z/i', $name)) {
+      return 2000;
+    }
+
+    return 500;
+  }
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    return $ref->isProbablyJSON();
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $viewer = $this->getViewer();
+    $content = $ref->loadData();
+
+    try {
+      $data = phutil_json_decode($content);
+    } catch (PhutilJSONParserException $ex) {
+      return $this->newMessage(
+        pht(
+          'This is not a valid JSON document and can not be rendered as '.
+          'a Jupyter notebook: %s.',
+          $ex->getMessage()));
+    }
+
+    if (!is_array($data)) {
+      return $this->newMessage(
+        pht(
+          'This document does not encode a valid JSON object and can not '.
+          'be rendered as a Jupyter notebook.'));
+    }
+
+
+    $nbformat = idx($data, 'nbformat');
+    if (!strlen($nbformat)) {
+      return $this->newMessage(
+        pht(
+          'This document is missing an "nbformat" field. Jupyter notebooks '.
+          'must have this field.'));
+    }
+
+    if ($nbformat !== 4) {
+      return $this->newMessage(
+        pht(
+          'This Jupyter notebook uses an unsupported version of the file '.
+          'format (found version %s, expected version 4).',
+          $nbformat));
+    }
+
+    $cells = idx($data, 'cells');
+    if (!is_array($cells)) {
+      return $this->newMessage(
+        pht(
+          'This Jupyter notebook does not specify a list of "cells".'));
+    }
+
+    if (!$cells) {
+      return $this->newMessage(
+        pht(
+          'This Jupyter notebook does not specify any notebook cells.'));
+    }
+
+    $rows = array();
+    foreach ($cells as $cell) {
+      $rows[] = $this->renderJupyterCell($viewer, $cell);
+    }
+
+    $notebook_table = phutil_tag(
+      'table',
+      array(
+        'class' => 'jupyter-notebook',
+      ),
+      $rows);
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-jupyter',
+      ),
+      $notebook_table);
+
+    return $container;
+  }
+
+  private function renderJupyterCell(
+    PhabricatorUser $viewer,
+    array $cell) {
+
+    list($label, $content) = $this->renderJupyterCellContent($viewer, $cell);
+
+    $label_cell = phutil_tag(
+      'th',
+      array(),
+      $label);
+
+    $content_cell = phutil_tag(
+      'td',
+      array(),
+      $content);
+
+    return phutil_tag(
+      'tr',
+      array(),
+      array(
+        $label_cell,
+        $content_cell,
+      ));
+  }
+
+  private function renderJupyterCellContent(
+    PhabricatorUser $viewer,
+    array $cell) {
+
+    $cell_type = idx($cell, 'cell_type');
+    switch ($cell_type) {
+      case 'markdown':
+        return $this->newMarkdownCell($cell);
+      case 'code':
+       return $this->newCodeCell($cell);
+    }
+
+    return $this->newRawCell(id(new PhutilJSON())->encodeFormatted($cell));
+  }
+
+  private function newRawCell($content) {
+    return array(
+      null,
+      phutil_tag(
+        'div',
+        array(
+          'class' => 'jupyter-cell-raw PhabricatorMonospaced',
+        ),
+        $content),
+    );
+  }
+
+  private function newMarkdownCell(array $cell) {
+    $content = idx($cell, 'source');
+    if (!is_array($content)) {
+      $content = array();
+    }
+
+    $content = implode('', $content);
+    $content = phutil_escape_html_newlines($content);
+
+    return array(
+      null,
+      phutil_tag(
+        'div',
+        array(
+          'class' => 'jupyter-cell-markdown',
+        ),
+        $content),
+    );
+  }
+
+  private function newCodeCell(array $cell) {
+    $execution_count = idx($cell, 'execution_count');
+    if ($execution_count) {
+      $label = 'In ['.$execution_count.']:';
+    } else {
+      $label = null;
+    }
+
+    $content = idx($cell, 'source');
+    if (!is_array($content)) {
+      $content = array();
+    }
+
+    $content = implode('', $content);
+
+    $content = PhabricatorSyntaxHighlighter::highlightWithLanguage(
+      'python',
+      $content);
+
+    $outputs = array();
+    $output_list = idx($cell, 'outputs');
+    if (is_array($output_list)) {
+      foreach ($output_list as $output) {
+        $outputs[] = $this->newOutput($output);
+      }
+    }
+
+    return array(
+      $label,
+      array(
+        phutil_tag(
+          'div',
+          array(
+            'class' => 'jupyter-cell-code PhabricatorMonospaced remarkup-code',
+          ),
+          array(
+            $content,
+          )),
+        $outputs,
+      ),
+    );
+  }
+
+  private function newOutput(array $output) {
+    if (!is_array($output)) {
+      return pht('<Invalid Output>');
+    }
+
+    $classes = array(
+      'jupyter-output',
+      'PhabricatorMonospaced',
+    );
+
+    $output_name = idx($output, 'name');
+    switch ($output_name) {
+      case 'stderr':
+        $classes[] = 'jupyter-output-stderr';
+        break;
+    }
+
+    $output_type = idx($output, 'output_type');
+    switch ($output_type) {
+      case 'execute_result':
+      case 'display_data':
+        $data = idx($output, 'data');
+
+        $image_formats = array(
+          'image/png',
+          'image/jpeg',
+          'image/jpg',
+          'image/gif',
+        );
+
+        foreach ($image_formats as $image_format) {
+          if (!isset($data[$image_format])) {
+            continue;
+          }
+
+          $raw_data = $data[$image_format];
+          if (!is_array($raw_data)) {
+            continue;
+          }
+
+          $raw_data = implode('', $raw_data);
+
+          $content = phutil_tag(
+            'img',
+            array(
+              'src' => 'data:'.$image_format.';base64,'.$raw_data,
+            ));
+
+          break 2;
+        }
+
+        if (isset($data['text/html'])) {
+          $content = $data['text/html'];
+          $classes[] = 'jupyter-output-html';
+          break;
+        }
+
+        if (isset($data['application/javascript'])) {
+          $content = $data['application/javascript'];
+          $classes[] = 'jupyter-output-html';
+          break;
+        }
+
+        if (isset($data['text/plain'])) {
+          $content = $data['text/plain'];
+          break;
+        }
+
+        break;
+      case 'stream':
+      default:
+        $content = idx($output, 'text');
+        if (!is_array($content)) {
+          $content = array();
+        }
+        $content = implode('', $content);
+        break;
+    }
+
+    return phutil_tag(
+      'div',
+      array(
+        'class' => implode(' ', $classes),
+      ),
+      $content);
+  }
+
+}
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
index 59dc6cc054..0ff882a746 100644
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -257,3 +257,50 @@ div.phui-property-list-stacked .phui-property-list-properties
 .document-engine-pdf .phabricator-remarkup-embed-layout-link {
   text-align: left;
 }
+
+.document-engine-jupyter {
+  overflow: hidden;
+  margin: 20px;
+}
+
+.jupyter-cell-raw {
+  white-space: pre-wrap;
+  background: {$lightgreybackground};
+  color: {$greytext};
+  padding: 8px;
+}
+
+.jupyter-cell-code {
+  white-space: pre-wrap;
+  background: {$lightgreybackground};
+  padding: 8px;
+  border: 1px solid {$lightgreyborder};
+  border-radius: 2px;
+}
+
+.jupyter-notebook > tbody > tr > th,
+.jupyter-notebook > tbody > tr > td {
+  padding: 8px;
+}
+
+.jupyter-notebook > tbody > tr > th {
+  white-space: nowrap;
+  text-align: right;
+  min-width: 48px;
+  font-weight: bold;
+}
+
+.jupyter-output {
+  margin: 4px 0;
+  padding: 8px;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+
+.jupyter-output-stderr {
+  background: {$sh-redbackground};
+}
+
+.jupyter-output-html {
+  background: {$sh-indigobackground};
+}

From d2727d24da6e3142fee64ec9edbdcba9fa5dc357 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Mar 2018 07:29:28 -0700
Subject: [PATCH 740/865] Add an abstract "Text" document engine and a "Source"
 document engine

Summary: Ref T13105. Allow normal text files to be rendered as documents, and add a "source code" rendering engine.

Test Plan: Viewed some source code.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19254
---
 resources/celerity/map.php                    | 10 +++---
 src/__phutil_library_map__.php                |  4 +++
 .../PhabricatorSourceDocumentEngine.php       | 30 +++++++++++++++++
 .../PhabricatorTextDocumentEngine.php         | 33 +++++++++++++++++++
 .../layout/phabricator-source-code-view.css   | 20 ++++-------
 .../rsrc/css/phui/phui-property-list-view.css |  4 +++
 6 files changed, 82 insertions(+), 19 deletions(-)
 create mode 100644 src/applications/files/document/PhabricatorSourceDocumentEngine.php
 create mode 100644 src/applications/files/document/PhabricatorTextDocumentEngine.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 231c7fe5da..798f961f90 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '7daac340',
+    'core.pkg.css' => 'da541195',
     'core.pkg.js' => 'b9b4a943',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -120,7 +120,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => '926ced2d',
+    'rsrc/css/layout/phabricator-source-code-view.css' => '31ee3c83',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -168,7 +168,7 @@
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-property-list-view.css' => '871f6815',
+    'rsrc/css/phui/phui-property-list-view.css' => '54c071ed',
     'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -784,7 +784,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => '926ced2d',
+    'phabricator-source-code-view-css' => '31ee3c83',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
@@ -850,7 +850,7 @@
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-property-list-view-css' => '871f6815',
+    'phui-property-list-view-css' => '54c071ed',
     'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index a7b85ba4c5..0e2ff3f0fa 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4222,6 +4222,7 @@
     'PhabricatorSlug' => 'infrastructure/util/PhabricatorSlug.php',
     'PhabricatorSlugTestCase' => 'infrastructure/util/__tests__/PhabricatorSlugTestCase.php',
     'PhabricatorSourceCodeView' => 'view/layout/PhabricatorSourceCodeView.php',
+    'PhabricatorSourceDocumentEngine' => 'applications/files/document/PhabricatorSourceDocumentEngine.php',
     'PhabricatorSpaceEditField' => 'applications/transactions/editfield/PhabricatorSpaceEditField.php',
     'PhabricatorSpacesApplication' => 'applications/spaces/application/PhabricatorSpacesApplication.php',
     'PhabricatorSpacesArchiveController' => 'applications/spaces/controller/PhabricatorSpacesArchiveController.php',
@@ -4363,6 +4364,7 @@
     'PhabricatorTestWorker' => 'infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php',
     'PhabricatorTextAreaEditField' => 'applications/transactions/editfield/PhabricatorTextAreaEditField.php',
     'PhabricatorTextConfigType' => 'applications/config/type/PhabricatorTextConfigType.php',
+    'PhabricatorTextDocumentEngine' => 'applications/files/document/PhabricatorTextDocumentEngine.php',
     'PhabricatorTextEditField' => 'applications/transactions/editfield/PhabricatorTextEditField.php',
     'PhabricatorTextExportFormat' => 'infrastructure/export/format/PhabricatorTextExportFormat.php',
     'PhabricatorTextListConfigType' => 'applications/config/type/PhabricatorTextListConfigType.php',
@@ -10041,6 +10043,7 @@
     'PhabricatorSlug' => 'Phobject',
     'PhabricatorSlugTestCase' => 'PhabricatorTestCase',
     'PhabricatorSourceCodeView' => 'AphrontView',
+    'PhabricatorSourceDocumentEngine' => 'PhabricatorTextDocumentEngine',
     'PhabricatorSpaceEditField' => 'PhabricatorEditField',
     'PhabricatorSpacesApplication' => 'PhabricatorApplication',
     'PhabricatorSpacesArchiveController' => 'PhabricatorSpacesController',
@@ -10188,6 +10191,7 @@
     'PhabricatorTestWorker' => 'PhabricatorWorker',
     'PhabricatorTextAreaEditField' => 'PhabricatorEditField',
     'PhabricatorTextConfigType' => 'PhabricatorConfigType',
+    'PhabricatorTextDocumentEngine' => 'PhabricatorDocumentEngine',
     'PhabricatorTextEditField' => 'PhabricatorEditField',
     'PhabricatorTextExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorTextListConfigType' => 'PhabricatorTextConfigType',
diff --git a/src/applications/files/document/PhabricatorSourceDocumentEngine.php b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
new file mode 100644
index 0000000000..1c3e54575a
--- /dev/null
+++ b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
@@ -0,0 +1,30 @@
+<?php
+
+final class PhabricatorSourceDocumentEngine
+  extends PhabricatorTextDocumentEngine {
+
+  const ENGINEKEY = 'source';
+
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as Source');
+  }
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-code';
+  }
+
+  protected function getContentScore(PhabricatorDocumentRef $ref) {
+    return 1500;
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $content = $this->loadTextData($ref);
+
+    $content = PhabricatorSyntaxHighlighter::highlightWithFilename(
+      $ref->getName(),
+      $content);
+
+    return $this->newTextDocumentContent($content);
+  }
+
+}
diff --git a/src/applications/files/document/PhabricatorTextDocumentEngine.php b/src/applications/files/document/PhabricatorTextDocumentEngine.php
new file mode 100644
index 0000000000..506c73badb
--- /dev/null
+++ b/src/applications/files/document/PhabricatorTextDocumentEngine.php
@@ -0,0 +1,33 @@
+<?php
+
+abstract class PhabricatorTextDocumentEngine
+  extends PhabricatorDocumentEngine {
+
+  protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
+    return $ref->isProbablyText();
+  }
+
+  protected function newTextDocumentContent($content) {
+    $lines = phutil_split_lines($content);
+
+    $view = id(new PhabricatorSourceCodeView())
+      ->setLines($lines)
+      ->disableHighlightOnClick();
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-text',
+      ),
+      $view);
+
+    return $container;
+  }
+
+  protected function loadTextData(PhabricatorDocumentRef $ref) {
+    $content = $ref->loadData();
+    $content = phutil_utf8ize($content);
+    return $content;
+  }
+
+}
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index 446366cdf1..1836d321a5 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -14,14 +14,6 @@
   margin-left: 8px;
 }
 
-.phabricator-source-code-view tr:first-child * {
-  padding-top: 8px;
-}
-
-.phabricator-source-code-view tr:last-child * {
-  padding-bottom: 8px;
-}
-
 .phabricator-source-code {
   white-space: pre-wrap;
   padding: 2px 8px 1px;
@@ -45,12 +37,16 @@
   white-space: nowrap;
 }
 
-th.phabricator-source-line a {
-  color: {$darkbluetext};
+th.phabricator-source-line a,
+th.phabricator-source-line span {
   display: block;
   padding: 2px 6px 1px 12px;
 }
 
+th.phabricator-source-line a {
+  color: {$darkbluetext};
+}
+
 th.phabricator-source-line a:hover {
   background: {$paste.border};
   text-decoration: none;
@@ -60,10 +56,6 @@ th.phabricator-source-line a:hover {
   background: {$paste.highlight};
 }
 
-.phabricator-source-highlight th.phabricator-source-line {
-  background: {$paste.border};
-}
-
 .phabricator-source-code-summary {
   padding-bottom: 8px;
 }
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
index 0ff882a746..c1f9944cbd 100644
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -258,6 +258,10 @@ div.phui-property-list-stacked .phui-property-list-properties
   text-align: left;
 }
 
+.document-engine-text .phabricator-source-code-container {
+  border: none;
+}
+
 .document-engine-jupyter {
   overflow: hidden;
   margin: 20px;

From 49063647515cabaf6bf9a0c4249c5ce357871240 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Mar 2018 08:00:35 -0700
Subject: [PATCH 741/865] Add a JSON document rendering engine

Summary: Depends on D19254. This engine just formats JSON files in a nicer, more readable way.

Test Plan: Looked at some JSON files, saw them become formatted nicely.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Differential Revision: https://secure.phabricator.com/D19255
---
 src/__phutil_library_map__.php                |  2 +
 .../files/document/PhabricatorDocumentRef.php |  4 ++
 .../PhabricatorJSONDocumentEngine.php         | 59 +++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 src/applications/files/document/PhabricatorJSONDocumentEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 0e2ff3f0fa..4c6efe4be2 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3187,6 +3187,7 @@
     'PhabricatorIteratorFileUploadSource' => 'applications/files/uploadsource/PhabricatorIteratorFileUploadSource.php',
     'PhabricatorJIRAAuthProvider' => 'applications/auth/provider/PhabricatorJIRAAuthProvider.php',
     'PhabricatorJSONConfigType' => 'applications/config/type/PhabricatorJSONConfigType.php',
+    'PhabricatorJSONDocumentEngine' => 'applications/files/document/PhabricatorJSONDocumentEngine.php',
     'PhabricatorJSONExportFormat' => 'infrastructure/export/format/PhabricatorJSONExportFormat.php',
     'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorJiraIssueHasObjectEdgeType.php',
@@ -8800,6 +8801,7 @@
     'PhabricatorIteratorFileUploadSource' => 'PhabricatorFileUploadSource',
     'PhabricatorJIRAAuthProvider' => 'PhabricatorOAuth1AuthProvider',
     'PhabricatorJSONConfigType' => 'PhabricatorTextConfigType',
+    'PhabricatorJSONDocumentEngine' => 'PhabricatorTextDocumentEngine',
     'PhabricatorJSONExportFormat' => 'PhabricatorExportFormat',
     'PhabricatorJavelinLinter' => 'ArcanistLinter',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'PhabricatorEdgeType',
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
index e27d164cd7..cca0c102e2 100644
--- a/src/applications/files/document/PhabricatorDocumentRef.php
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -116,6 +116,10 @@ public function isProbablyJSON() {
     }
 
     $snippet = $this->getSnippet();
+    if (!preg_match('/^\s*[{[]/', $snippet)) {
+      return false;
+    }
+
     return phutil_is_utf8($snippet);
   }
 
diff --git a/src/applications/files/document/PhabricatorJSONDocumentEngine.php b/src/applications/files/document/PhabricatorJSONDocumentEngine.php
new file mode 100644
index 0000000000..331a7e6820
--- /dev/null
+++ b/src/applications/files/document/PhabricatorJSONDocumentEngine.php
@@ -0,0 +1,59 @@
+<?php
+
+final class PhabricatorJSONDocumentEngine
+  extends PhabricatorTextDocumentEngine {
+
+  const ENGINEKEY = 'json';
+
+  public function getViewAsLabel(PhabricatorDocumentRef $ref) {
+    return pht('View as JSON');
+  }
+
+  protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
+    return 'fa-database';
+  }
+
+  protected function getContentScore(PhabricatorDocumentRef $ref) {
+    if (preg_match('/\.json\z/', $ref->getName())) {
+      return 2000;
+    }
+
+    if ($ref->isProbablyJSON()) {
+      return 1750;
+    }
+
+    return 500;
+  }
+
+  protected function newDocumentContent(PhabricatorDocumentRef $ref) {
+    $raw_data = $this->loadTextData($ref);
+
+    try {
+      $data = phutil_json_decode($raw_data);
+
+      if (preg_match('/^\s*\[/', $raw_data)) {
+        $content = id(new PhutilJSON())->encodeAsList($data);
+      } else {
+        $content = id(new PhutilJSON())->encodeFormatted($data);
+      }
+
+      $message = null;
+      $content = PhabricatorSyntaxHighlighter::highlightWithLanguage(
+        'json',
+        $content);
+    } catch (PhutilJSONParserException $ex) {
+      $message = $this->newMessage(
+        pht(
+          'This document is not valid JSON: %s',
+          $ex->getMessage()));
+
+      $content = $raw_data;
+    }
+
+    return array(
+      $message,
+      $this->newTextDocumentContent($content),
+    );
+  }
+
+}

From bba1b185f8345e381461d1181568aeb903d433b2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 23 Mar 2018 13:44:14 -0700
Subject: [PATCH 742/865] Improve minor client behaviors for document rendering

Summary:
Ref T13105. This adds various small client-side improvements to document rendering.

  - In the menu, show which renderer is in use.
  - Make linking to lines work.
  - Make URIs persist information about which rendering engine is in use.
  - Improve the UI feedback for transitions between document types.
  - Load slower documents asynchronously by default.
  - Discard irrelevant requests if you spam the view menu.

Test Plan: Loaded files, linked to lines, swapped between modes, copy/pasted URLs.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19256
---
 resources/celerity/map.php                    | 36 ++++----
 src/__phutil_library_map__.php                |  4 +-
 .../PhabricatorFilesApplication.php           |  9 +-
 ....php => PhabricatorFileViewController.php} | 39 +++++++--
 .../document/PhabricatorDocumentEngine.php    | 34 ++++++++
 .../PhabricatorJupyterDocumentEngine.php      |  8 ++
 .../PhabricatorTextDocumentEngine.php         |  4 +-
 src/view/layout/PhabricatorSourceCodeView.php |  6 +-
 .../rsrc/css/phui/phui-property-list-view.css | 17 ++++
 .../files/behavior-document-engine.js         | 87 +++++++++++++++++--
 webroot/rsrc/js/core/behavior-line-linker.js  |  4 +
 11 files changed, 210 insertions(+), 38 deletions(-)
 rename src/applications/files/controller/{PhabricatorFileInfoController.php => PhabricatorFileViewController.php} (91%)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 798f961f90..dabb6f1d5b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'da541195',
+    'core.pkg.css' => '3fd3b7b8',
     'core.pkg.js' => 'b9b4a943',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -168,7 +168,7 @@
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
     'rsrc/css/phui/phui-pager.css' => 'edcbc226',
     'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
-    'rsrc/css/phui/phui-property-list-view.css' => '54c071ed',
+    'rsrc/css/phui/phui-property-list-view.css' => 'de4754d8',
     'rsrc/css/phui/phui-remarkup-preview.css' => '54a34863',
     'rsrc/css/phui/phui-segment-bar-view.css' => 'b1d1b892',
     'rsrc/css/phui/phui-spacing.css' => '042804d6',
@@ -392,7 +392,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => '396ef112',
+    'rsrc/js/application/files/behavior-document-engine.js' => 'd3f8623c',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -473,7 +473,7 @@
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
     'rsrc/js/core/behavior-lightbox-attachments.js' => '6b31879a',
-    'rsrc/js/core/behavior-line-linker.js' => 'a9b946f8',
+    'rsrc/js/core/behavior-line-linker.js' => '13e39479',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
@@ -607,7 +607,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => '396ef112',
+    'javelin-behavior-document-engine' => 'd3f8623c',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -638,7 +638,7 @@
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
-    'javelin-behavior-phabricator-line-linker' => 'a9b946f8',
+    'javelin-behavior-phabricator-line-linker' => '13e39479',
     'javelin-behavior-phabricator-nav' => '836f966d',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
@@ -850,7 +850,7 @@
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
-    'phui-property-list-view-css' => '54c071ed',
+    'phui-property-list-view-css' => 'de4754d8',
     'phui-remarkup-preview-css' => '54a34863',
     'phui-segment-bar-view-css' => 'b1d1b892',
     'phui-spacing-css' => '042804d6',
@@ -964,6 +964,12 @@
       'javelin-install',
       'javelin-util',
     ),
+    '13e39479' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-history',
+    ),
     '15d5ff71' => array(
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
@@ -1103,11 +1109,6 @@
       'javelin-dom',
       'javelin-vector',
     ),
-    '396ef112' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     '3ab51e2c' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1751,12 +1752,6 @@
       'javelin-uri',
       'phabricator-keyboard-shortcut',
     ),
-    'a9b946f8' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-history',
-    ),
     'a9f88de2' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2007,6 +2002,11 @@
     'd254d646' => array(
       'javelin-util',
     ),
+    'd3f8623c' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     'd4505101' => array(
       'javelin-stratcom',
       'javelin-install',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4c6efe4be2..b1afef3600 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3015,7 +3015,6 @@
     'PhabricatorFileImageMacro' => 'applications/macro/storage/PhabricatorFileImageMacro.php',
     'PhabricatorFileImageProxyController' => 'applications/files/controller/PhabricatorFileImageProxyController.php',
     'PhabricatorFileImageTransform' => 'applications/files/transform/PhabricatorFileImageTransform.php',
-    'PhabricatorFileInfoController' => 'applications/files/controller/PhabricatorFileInfoController.php',
     'PhabricatorFileIntegrityException' => 'applications/files/exception/PhabricatorFileIntegrityException.php',
     'PhabricatorFileLightboxController' => 'applications/files/controller/PhabricatorFileLightboxController.php',
     'PhabricatorFileLinkView' => 'view/layout/PhabricatorFileLinkView.php',
@@ -3051,6 +3050,7 @@
     'PhabricatorFileUploadException' => 'applications/files/exception/PhabricatorFileUploadException.php',
     'PhabricatorFileUploadSource' => 'applications/files/uploadsource/PhabricatorFileUploadSource.php',
     'PhabricatorFileUploadSourceByteLimitException' => 'applications/files/uploadsource/PhabricatorFileUploadSourceByteLimitException.php',
+    'PhabricatorFileViewController' => 'applications/files/controller/PhabricatorFileViewController.php',
     'PhabricatorFileinfoSetupCheck' => 'applications/config/check/PhabricatorFileinfoSetupCheck.php',
     'PhabricatorFilesApplication' => 'applications/files/application/PhabricatorFilesApplication.php',
     'PhabricatorFilesApplicationStorageEnginePanel' => 'applications/files/applicationpanel/PhabricatorFilesApplicationStorageEnginePanel.php',
@@ -8622,7 +8622,6 @@
     ),
     'PhabricatorFileImageProxyController' => 'PhabricatorFileController',
     'PhabricatorFileImageTransform' => 'PhabricatorFileTransform',
-    'PhabricatorFileInfoController' => 'PhabricatorFileController',
     'PhabricatorFileIntegrityException' => 'Exception',
     'PhabricatorFileLightboxController' => 'PhabricatorFileController',
     'PhabricatorFileLinkView' => 'AphrontTagView',
@@ -8658,6 +8657,7 @@
     'PhabricatorFileUploadException' => 'Exception',
     'PhabricatorFileUploadSource' => 'Phobject',
     'PhabricatorFileUploadSourceByteLimitException' => 'Exception',
+    'PhabricatorFileViewController' => 'PhabricatorFileController',
     'PhabricatorFileinfoSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorFilesApplication' => 'PhabricatorApplication',
     'PhabricatorFilesApplicationStorageEnginePanel' => 'PhabricatorApplicationConfigurationPanel',
diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
index d95972d10e..5bf1ebccc4 100644
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -69,9 +69,15 @@ protected function getCustomCapabilities() {
 
   public function getRoutes() {
     return array(
-      '/F(?P<id>[1-9]\d*)' => 'PhabricatorFileInfoController',
+      '/F(?P<id>[1-9]\d*)(?:\$(?P<lines>\d+(?:-\d+)?))?'
+        => 'PhabricatorFileViewController',
       '/file/' => array(
         '(query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorFileListController',
+        'view/(?P<id>[^/]+)/'.
+          '(?:(?P<engineKey>[^/]+)/)?'.
+          '(?:\$(?P<lines>\d+(?:-\d+)?))?'
+          => 'PhabricatorFileViewController',
+        'info/(?P<phid>[^/]+)/' => 'PhabricatorFileViewController',
         'upload/' => 'PhabricatorFileUploadController',
         'dropupload/' => 'PhabricatorFileDropUploadController',
         'compose/' => 'PhabricatorFileComposeController',
@@ -80,7 +86,6 @@ public function getRoutes() {
         'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorFileDeleteController',
         $this->getEditRoutePattern('edit/')
           => 'PhabricatorFileEditController',
-        'info/(?P<phid>[^/]+)/' => 'PhabricatorFileInfoController',
         'imageproxy/' => 'PhabricatorFileImageProxyController',
         'transforms/(?P<id>[1-9]\d*)/' =>
           'PhabricatorFileTransformListController',
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileViewController.php
similarity index 91%
rename from src/applications/files/controller/PhabricatorFileInfoController.php
rename to src/applications/files/controller/PhabricatorFileViewController.php
index e25cf8d74c..5251fdd8f1 100644
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileViewController.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorFileInfoController extends PhabricatorFileController {
+final class PhabricatorFileViewController extends PhabricatorFileController {
 
   public function shouldAllowPublic() {
     return true;
@@ -404,26 +404,36 @@ private function loadStorageEngine(PhabricatorFile $file) {
 
   private function newFileContent(PhabricatorFile $file) {
     $viewer = $this->getViewer();
+    $request = $this->getRequest();
 
     $ref = id(new PhabricatorDocumentRef())
       ->setFile($file);
 
     $engines = PhabricatorDocumentEngine::getEnginesForRef($viewer, $ref);
-    $engine = head($engines);
 
-    $content = $engine->newDocument($ref);
+    $engine_key = $request->getURIData('engineKey');
+    if (!isset($engines[$engine_key])) {
+      $engine_key = head_key($engines);
+    }
+    $engine = $engines[$engine_key];
 
-    $icon = $engine->newDocumentIcon($ref);
+    $lines = $request->getURILineRange('lines', 1000);
+    if ($lines) {
+      $engine->setHighlightedLines(range($lines[0], $lines[1]));
+    }
 
     $views = array();
-    foreach ($engines as $candidate_engine) {
+    foreach ($engines as $candidate_key => $candidate_engine) {
       $label = $candidate_engine->getViewAsLabel($ref);
       if ($label === null) {
         continue;
       }
 
+      $view_uri = '/file/view/'.$file->getID().'/'.$candidate_key.'/';
+
       $view_icon = $candidate_engine->getViewAsIconIcon($ref);
       $view_color = $candidate_engine->getViewAsIconColor($ref);
+      $loading = $candidate_engine->newLoadingContent($ref);
 
       $views[] = array(
         'viewKey' => $candidate_engine->getDocumentEngineKey(),
@@ -431,12 +441,26 @@ private function newFileContent(PhabricatorFile $file) {
         'color' => $view_color,
         'name' => $label,
         'engineURI' => $candidate_engine->getRenderURI($ref),
+        'viewURI' => $view_uri,
+        'loadingMarkup' => hsprintf('%s', $loading),
       );
     }
 
-    Javelin::initBehavior('document-engine');
-
     $viewport_id = celerity_generate_unique_node_id();
+    $control_id = celerity_generate_unique_node_id();
+    $icon = $engine->newDocumentIcon($ref);
+
+    if ($engine->shouldRenderAsync($ref)) {
+      $content = $engine->newLoadingContent($ref);
+      $config = array(
+        'renderControlID' => $control_id,
+      );
+    } else {
+      $content = $engine->newDocument($ref);
+      $config = array();
+    }
+
+    Javelin::initBehavior('document-engine', $config);
 
     $viewport = phutil_tag(
       'div',
@@ -457,6 +481,7 @@ private function newFileContent(PhabricatorFile $file) {
       ->setText(pht('View Options'))
       ->setIcon('fa-file-image-o')
       ->setColor(PHUIButtonView::GREY)
+      ->setID($control_id)
       ->setMetadata($meta)
       ->setDropdown(true)
       ->addSigil('document-engine-view-dropdown');
diff --git a/src/applications/files/document/PhabricatorDocumentEngine.php b/src/applications/files/document/PhabricatorDocumentEngine.php
index 6ad7f74f9a..a225d55ea9 100644
--- a/src/applications/files/document/PhabricatorDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorDocumentEngine.php
@@ -4,6 +4,7 @@ abstract class PhabricatorDocumentEngine
   extends Phobject {
 
   private $viewer;
+  private $highlightedLines = array();
 
   final public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
@@ -14,10 +15,23 @@ final public function getViewer() {
     return $this->viewer;
   }
 
+  final public function setHighlightedLines(array $highlighted_lines) {
+    $this->highlightedLines = $highlighted_lines;
+    return $this;
+  }
+
+  final public function getHighlightedLines() {
+    return $this->highlightedLines;
+  }
+
   final public function canRenderDocument(PhabricatorDocumentRef $ref) {
     return $this->canRenderDocumentType($ref);
   }
 
+  public function shouldRenderAsync(PhabricatorDocumentRef $ref) {
+    return false;
+  }
+
   abstract protected function canRenderDocumentType(
     PhabricatorDocumentRef $ref);
 
@@ -49,6 +63,10 @@ protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-file-o';
   }
 
+  protected function getDocumentRenderingText(PhabricatorDocumentRef $ref) {
+    return pht('Loading...');
+  }
+
   final public function getDocumentEngineKey() {
     return $this->getPhobjectClassConstant('ENGINEKEY');
   }
@@ -177,4 +195,20 @@ protected function newMessage($message) {
       $message);
   }
 
+  final public function newLoadingContent(PhabricatorDocumentRef $ref) {
+    $spinner = id(new PHUIIconView())
+      ->setIcon('fa-gear')
+      ->addClass('ph-spin');
+
+    return phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-loading',
+      ),
+      array(
+        $spinner,
+        $this->getDocumentRenderingText($ref),
+      ));
+  }
+
 }
diff --git a/src/applications/files/document/PhabricatorJupyterDocumentEngine.php b/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
index 7b2246a315..f960f5c8c0 100644
--- a/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
@@ -13,6 +13,14 @@ protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-sun-o';
   }
 
+  protected function getDocumentRenderingText(PhabricatorDocumentRef $ref) {
+    return pht('Rendering Jupyter Notebook...');
+  }
+
+  public function shouldRenderAsync(PhabricatorDocumentRef $ref) {
+    return true;
+  }
+
   protected function getContentScore(PhabricatorDocumentRef $ref) {
     $name = $ref->getName();
 
diff --git a/src/applications/files/document/PhabricatorTextDocumentEngine.php b/src/applications/files/document/PhabricatorTextDocumentEngine.php
index 506c73badb..4fb8d052e1 100644
--- a/src/applications/files/document/PhabricatorTextDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorTextDocumentEngine.php
@@ -11,8 +11,8 @@ protected function newTextDocumentContent($content) {
     $lines = phutil_split_lines($content);
 
     $view = id(new PhabricatorSourceCodeView())
-      ->setLines($lines)
-      ->disableHighlightOnClick();
+      ->setHighlights($this->getHighlightedLines())
+      ->setLines($lines);
 
     $container = phutil_tag(
       'div',
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index f5f6c22b51..ce26fa3df7 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -85,7 +85,11 @@ public function render() {
       }
 
       if ($this->canClickHighlight) {
-        $line_href = $base_uri.'$'.$line_number;
+        if ($base_uri) {
+          $line_href = $base_uri.'$'.$line_number;
+        } else {
+          $line_href = null;
+        }
 
         $tag_number = phutil_tag(
           'a',
diff --git a/webroot/rsrc/css/phui/phui-property-list-view.css b/webroot/rsrc/css/phui/phui-property-list-view.css
index c1f9944cbd..15632c902f 100644
--- a/webroot/rsrc/css/phui/phui-property-list-view.css
+++ b/webroot/rsrc/css/phui/phui-property-list-view.css
@@ -267,6 +267,23 @@ div.phui-property-list-stacked .phui-property-list-properties
   margin: 20px;
 }
 
+.document-engine-in-flight {
+  opacity: 0.25;
+}
+
+.document-engine-loading {
+  margin: 20px;
+  text-align: center;
+  color: {$lightgreytext};
+}
+
+.document-engine-loading .phui-icon-view {
+  display: block;
+  font-size: 48px;
+  color: {$lightgreyborder};
+  padding: 8px;
+}
+
 .jupyter-cell-raw {
   white-space: pre-wrap;
   background: {$lightgreybackground};
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index 6b9b3eeb24..4cb7d17723 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -5,7 +5,9 @@
  *           javelin-stratcom
  */
 
-JX.behavior('document-engine', function() {
+JX.behavior('document-engine', function(config, statics) {
+
+
 
   function onmenu(e) {
     var node = e.getNode('document-engine-view-dropdown');
@@ -21,6 +23,7 @@ JX.behavior('document-engine', function() {
     var list = new JX.PHUIXActionListView();
 
     var view;
+    var engines = [];
     for (var ii = 0; ii < data.views.length; ii++) {
       var spec = data.views[ii];
 
@@ -38,31 +41,103 @@ JX.behavior('document-engine', function() {
         e.prevent();
         menu.close();
 
-        onview(data, spec);
+        onview(data, spec, false);
       }, spec));
 
       list.addItem(view);
+
+      engines.push({
+        spec: spec,
+        view: view
+      });
     }
 
     menu.setContent(list.getNode());
 
+    menu.listen('open', function() {
+      for (var ii = 0; ii < engines.length; ii++) {
+        var engine = engines[ii];
+
+        // Highlight the current rendering engine.
+        var is_selected = (engine.spec.viewKey == data.viewKey);
+        engine.view.setSelected(is_selected);
+      }
+    });
+
     data.menu = menu;
     menu.open();
   }
 
-  function onview(data, spec) {
-    var handler = JX.bind(null, onrender, data);
+  function onview(data, spec, immediate) {
+    data.sequence = (data.sequence || 0) + 1;
+    var handler = JX.bind(null, onrender, data, data.sequence);
+
+    data.viewKey = spec.viewKey;
+    JX.History.replace(spec.viewURI);
 
     new JX.Request(spec.engineURI, handler)
       .send();
+
+    if (data.loadingView) {
+      // If we're already showing "Loading...", immediately change it to
+      // show the new document type.
+      onloading(data, spec);
+    } else if (!immediate) {
+      // Otherwise, grey out the document and show "Loading..." after a
+      // short delay. This prevents the content from flickering when rendering
+      // is fast.
+      var viewport = JX.$(data.viewportID);
+      JX.DOM.alterClass(viewport, 'document-engine-in-flight', true);
+
+      var load = JX.bind(null, onloading, data, spec);
+      data.loadTimer = setTimeout(load, 333);
+    }
+  }
+
+  function onloading(data, spec) {
+    data.loadingView = true;
+
+    var viewport = JX.$(data.viewportID);
+    JX.DOM.alterClass(viewport, 'document-engine-in-flight', false);
+    JX.DOM.setContent(viewport, JX.$H(spec.loadingMarkup));
   }
 
-  function onrender(data, r) {
+  function onrender(data, sequence, r) {
+    // If this isn't the most recent request we sent, throw it away. This can
+    // happen if the user makes multiple selections from the menu while we are
+    // still rendering the first view.
+    if (sequence != data.sequence) {
+      return;
+    }
+
+    if (data.loadTimer) {
+      clearTimeout(data.loadTimer);
+      data.loadTimer = null;
+    }
+
     var viewport = JX.$(data.viewportID);
 
+    JX.DOM.alterClass(viewport, 'document-engine-in-flight', false);
+    data.loadingView = false;
+
     JX.DOM.setContent(viewport, JX.$H(r.markup));
   }
 
-  JX.Stratcom.listen('click', 'document-engine-view-dropdown', onmenu);
+  if (!statics.initialized) {
+    JX.Stratcom.listen('click', 'document-engine-view-dropdown', onmenu);
+    statics.initialized = true;
+  }
+
+  if (config.renderControlID) {
+    var control = JX.$(config.renderControlID);
+    var data = JX.Stratcom.getData(control);
+
+    for (var ii = 0; ii < data.views.length; ii++) {
+      if (data.views[ii].viewKey == data.viewKey) {
+        onview(data, data.views[ii], true);
+        break;
+      }
+    }
+  }
 
 });
diff --git a/webroot/rsrc/js/core/behavior-line-linker.js b/webroot/rsrc/js/core/behavior-line-linker.js
index a0f99fb3bc..8a68cec842 100644
--- a/webroot/rsrc/js/core/behavior-line-linker.js
+++ b/webroot/rsrc/js/core/behavior-line-linker.js
@@ -145,6 +145,10 @@ JX.behavior('phabricator-line-linker', function() {
       var t = getRowNumber(target);
       var uri = JX.Stratcom.getData(root).uri;
 
+      if (!uri) {
+        uri = ('' + window.location).split('$')[0];
+      }
+
       origin = null;
       target = null;
       root = null;

From f583406ba93aba8d4e0d7da31554bf7ab2c43daa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 26 Mar 2018 06:55:17 -0700
Subject: [PATCH 743/865] Drop uniqueness constraint on PushEvent request ID

Summary: See <https://discourse.phabricator-community.org/t/pushing-to-mercurial-repository-fails/1275/1>. Mercurial may invoke hooks multiple times per push.

Test Plan: Pushed to Mercurial, saw key constraint failure.

Differential Revision: https://secure.phabricator.com/D19257
---
 resources/sql/autopatches/20180326.lock.03.nonunique.sql       | 2 ++
 .../repository/storage/PhabricatorRepositoryPushEvent.php      | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 resources/sql/autopatches/20180326.lock.03.nonunique.sql

diff --git a/resources/sql/autopatches/20180326.lock.03.nonunique.sql b/resources/sql/autopatches/20180326.lock.03.nonunique.sql
new file mode 100644
index 0000000000..9e12d7e864
--- /dev/null
+++ b/resources/sql/autopatches/20180326.lock.03.nonunique.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_pushevent
+  DROP KEY `key_request`;
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
index 451f8acda5..e44f99df4d 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
@@ -46,9 +46,8 @@ protected function getConfiguration() {
         'key_repository' => array(
           'columns' => array('repositoryPHID'),
         ),
-        'key_request' => array(
+        'key_identifier' => array(
           'columns' => array('requestIdentifier'),
-          'unique' => true,
         ),
       ),
     ) + parent::getConfiguration();

From 5e710959bed93b75f239821b739e55d0b8a63122 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 26 Mar 2018 06:55:17 -0700
Subject: [PATCH 744/865] (stable) Drop uniqueness constraint on PushEvent
 request ID

Summary: See <https://discourse.phabricator-community.org/t/pushing-to-mercurial-repository-fails/1275/1>. Mercurial may invoke hooks multiple times per push.

Test Plan: Pushed to Mercurial, saw key constraint failure.

Differential Revision: https://secure.phabricator.com/D19257
---
 resources/sql/autopatches/20180326.lock.03.nonunique.sql       | 2 ++
 .../repository/storage/PhabricatorRepositoryPushEvent.php      | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 resources/sql/autopatches/20180326.lock.03.nonunique.sql

diff --git a/resources/sql/autopatches/20180326.lock.03.nonunique.sql b/resources/sql/autopatches/20180326.lock.03.nonunique.sql
new file mode 100644
index 0000000000..9e12d7e864
--- /dev/null
+++ b/resources/sql/autopatches/20180326.lock.03.nonunique.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_pushevent
+  DROP KEY `key_request`;
diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
index 451f8acda5..e44f99df4d 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
@@ -46,9 +46,8 @@ protected function getConfiguration() {
         'key_repository' => array(
           'columns' => array('repositoryPHID'),
         ),
-        'key_request' => array(
+        'key_identifier' => array(
           'columns' => array('requestIdentifier'),
-          'unique' => true,
         ),
       ),
     ) + parent::getConfiguration();

From 38999e25ac594c6a6fbb4083ccffdc8491c910f9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 26 Mar 2018 07:14:00 -0700
Subject: [PATCH 745/865] Support logged-out access to the document rendering
 endpoint

Summary: Ref T13105. Currently, logged-out users can't render documents via the endpoint even if they otherwise have access to the file.

Test Plan: Viewed a file as a logged-out user and re-rendered it via Ajax.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19258
---
 .../files/controller/PhabricatorFileDocumentController.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/applications/files/controller/PhabricatorFileDocumentController.php b/src/applications/files/controller/PhabricatorFileDocumentController.php
index b74d98f48e..61bf4427cf 100644
--- a/src/applications/files/controller/PhabricatorFileDocumentController.php
+++ b/src/applications/files/controller/PhabricatorFileDocumentController.php
@@ -7,6 +7,10 @@ final class PhabricatorFileDocumentController
   private $engine;
   private $ref;
 
+  public function shouldAllowPublic() {
+    return true;
+  }
+
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
 

From b7d3101e7cbffb90c282f9ab9338d2f5cad67e3a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 26 Mar 2018 07:17:59 -0700
Subject: [PATCH 746/865] Minor document rendering fixes: dropdown for
 synchronous files, URI normalization for default renderers

Summary:
Depends on D19258. Ref T13105.

  - When the default renderer is an Ajax renderer, don't replace the URI. For example, when viewing a Jupyter notebook, the URI should remain `/F123`, not instantly change to `/view/123/jupyter/`.
  - Fix an issue where non-ajax renderers could fail to display the dropdown menu properly.

Test Plan:
  - Viewed a Jupyter notebook, stayed on the same URI.
  - Changed rendering, got different URIs.
  - Viewed a JSON file and toggled renderers via dropdown.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19259
---
 resources/celerity/map.php                         | 14 +++++++-------
 .../application/files/behavior-document-engine.js  |  7 +++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index dabb6f1d5b..f7a1f391d0 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -392,7 +392,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => 'd3f8623c',
+    'rsrc/js/application/files/behavior-document-engine.js' => '194cbe53',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -607,7 +607,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => 'd3f8623c',
+    'javelin-behavior-document-engine' => '194cbe53',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -983,6 +983,11 @@
     '191b4909' => array(
       'javelin-behavior',
     ),
+    '194cbe53' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     '1ad0a787' => array(
       'javelin-install',
       'javelin-reactor',
@@ -2002,11 +2007,6 @@
     'd254d646' => array(
       'javelin-util',
     ),
-    'd3f8623c' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     'd4505101' => array(
       'javelin-stratcom',
       'javelin-install',
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index 4cb7d17723..3e49f35410 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -73,7 +73,6 @@ JX.behavior('document-engine', function(config, statics) {
     var handler = JX.bind(null, onrender, data, data.sequence);
 
     data.viewKey = spec.viewKey;
-    JX.History.replace(spec.viewURI);
 
     new JX.Request(spec.engineURI, handler)
       .send();
@@ -91,6 +90,10 @@ JX.behavior('document-engine', function(config, statics) {
 
       var load = JX.bind(null, onloading, data, spec);
       data.loadTimer = setTimeout(load, 333);
+
+      // Replace the URI with the URI for the specific rendering the user
+      // has selected.
+      JX.History.replace(spec.viewURI);
     }
   }
 
@@ -128,7 +131,7 @@ JX.behavior('document-engine', function(config, statics) {
     statics.initialized = true;
   }
 
-  if (config.renderControlID) {
+  if (config && config.renderControlID) {
     var control = JX.$(config.renderControlID);
     var data = JX.Stratcom.getData(control);
 

From c5b244bfd04fe8a549f1066ecbad469f6ce82834 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 26 Mar 2018 07:21:24 -0700
Subject: [PATCH 747/865] Render directly embedded image data represented as a
 string in Jupyter notebooks

Summary: Depends on D19259. Ref T13105. Some examples represent image data as `["da", "ta"]` while others represent it as `"data"`. Accept either.

Test Plan: Rendered example notebooks with both kinds of images.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19260
---
 .../files/document/PhabricatorJupyterDocumentEngine.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/applications/files/document/PhabricatorJupyterDocumentEngine.php b/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
index f960f5c8c0..93181921af 100644
--- a/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
@@ -260,9 +260,8 @@ private function newOutput(array $output) {
 
           $raw_data = $data[$image_format];
           if (!is_array($raw_data)) {
-            continue;
+            $raw_data = array($raw_data);
           }
-
           $raw_data = implode('', $raw_data);
 
           $content = phutil_tag(

From b586ee065a7531fb936a4bf44f85178df895a1e3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Mar 2018 15:21:33 -0700
Subject: [PATCH 748/865] Stop evaluating Herald rules when writing "someone
 mentioned this somewhere else." transactions

Summary: Ref T13114. See PHI510. Firing Herald on mentioned objects tends to feel arbitrary and can substantially slow down edits which mention many objects.

Test Plan: Mentioned tasks on other tasks; verified that the normal path is hit normally, the new Herald-free path is hit on the mentioned object, and both still work fine and show up in the timeline.

Maniphest Tasks: T13114

Differential Revision: https://secure.phabricator.com/D19263
---
 .../editor/PhabricatorApplicationTransactionEditor.php       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 8184eafb50..e4a13de54e 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -1120,6 +1120,11 @@ final public function applyTransactions(
       // We are the Herald editor, so stop work here and return the updated
       // transactions.
       return $xactions;
+    } else if ($this->getIsInverseEdgeEditor()) {
+      // Do not run Herald if we're just recording that this object was
+      // mentioned elsewhere. This tends to create Herald side effects which
+      // feel arbitrary, and can really slow down edits which mention a large
+      // number of other objects. See T13114.
     } else if ($this->shouldApplyHeraldRules($object, $xactions)) {
       // We are not the Herald editor, so try to apply Herald rules.
       $herald_xactions = $this->applyHeraldRules($object, $xactions);

From 5cb683257249909ccb50e181b57db72cda020b25 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 28 Mar 2018 16:09:56 -0700
Subject: [PATCH 749/865] Fix usage of fprintf() in `bin/drydock command`

Summary: See PHI513. `fprintf()` takes `(thing, pattern, args, ...)` but we aren't passing a `pattern`, so if the command returns a "%" in the output we get an error.

Test Plan:
  - Installed `bytes`, a great useful program which prints all the bytes, on my HoaxOS(tm) system (see D19102).

```
epriestley@orbital ~/dev/phabricator $ ./bin/drydock command --lease 76287 -- bytes # Before patch.
[2018-03-29 02:09:08] ERROR 2: fprintf(): Too few arguments at [/Users/epriestley/dev/core/lib/phabricator/src/applications/drydock/management/DrydockManagementCommandWorkflow.php:60]
arcanist(head=experimental, ref.master=b8c9c385a7f5, ref.experimental=925c60e7b837), corgi(head=master, ref.master=6371578c9d32), instances(head=master, ref.master=d983b9517924), ledger(head=master, ref.master=4da4a24b8779), libcore(), phabricator(head=hoax1, ref.master=b586ee065a75, ref.hoax1=f8d7480bbdd1, custom=4), phutil(head=master, ref.master=1ad42491e44a), secure(head=master, ref.master=988cf9bd7958), services(head=master, ref.master=6b3fb8d8dd0a)
  #0 fprintf(resource, string) called at [<phabricator>/src/applications/drydock/management/DrydockManagementCommandWorkflow.php:60]
  #1 DrydockManagementCommandWorkflow::execute(PhutilArgumentParser) called at [<phutil>/src/parser/argument/PhutilArgumentParser.php:441]
  #2 PhutilArgumentParser::parseWorkflowsFull(array) called at [<phutil>/src/parser/argument/PhutilArgumentParser.php:333]
  #3 PhutilArgumentParser::parseWorkflows(array) called at [<phabricator>/scripts/drydock/drydock_control.php:21]
epriestley@orbital ~/dev/phabricator $ ./bin/drydock command --lease 76287 -- bytes # After patch.

!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
```

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D19264
---
 .../drydock/management/DrydockManagementCommandWorkflow.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/drydock/management/DrydockManagementCommandWorkflow.php b/src/applications/drydock/management/DrydockManagementCommandWorkflow.php
index bc66966f8c..ae0bd711b2 100644
--- a/src/applications/drydock/management/DrydockManagementCommandWorkflow.php
+++ b/src/applications/drydock/management/DrydockManagementCommandWorkflow.php
@@ -57,8 +57,8 @@ public function execute(PhutilArgumentParser $args) {
       array($interface, 'execx'),
       array('%Ls', $argv));
 
-    fprintf(STDOUT, $stdout);
-    fprintf(STDERR, $stderr);
+    fwrite(STDOUT, $stdout);
+    fwrite(STDERR, $stderr);
 
     return 0;
   }

From 74216ea8e008930ebd1167010f545b83c8948752 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 29 Mar 2018 07:17:37 -0700
Subject: [PATCH 750/865] Disable Herald and enormous change protection for
 repository initial imports

Summary: See PHI514. Ref T13114. Ref T8951. When a push is an "initial import" (a push of at least 7 commits to an empty repository) don't run Herald or enormous change protection.

Test Plan: Pushed some non-initial changes to a repository, and some initial changes.

Maniphest Tasks: T13114, T8951

Differential Revision: https://secure.phabricator.com/D19265
---
 .../engine/DiffusionCommitHookEngine.php      | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index cc4526dbdc..dd5777b2b0 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -126,7 +126,6 @@ public function getMercurialHook() {
 
   public function execute() {
     $ref_updates = $this->findRefUpdates();
-    $all_updates = $ref_updates;
 
     $caught = null;
     try {
@@ -140,21 +139,32 @@ public function execute() {
         throw $ex;
       }
 
-      $this->applyHeraldRefRules($ref_updates, $all_updates);
-
       $content_updates = $this->findContentUpdates($ref_updates);
+      $all_updates = array_merge($ref_updates, $content_updates);
+
+      // If this is an "initial import" (a sizable push to a previously empty
+      // repository) we'll allow enormous changes and disable Herald rules.
+      // These rulesets can consume a large amount of time and memory and are
+      // generally not relevant when importing repository history.
+      $is_initial_import = $this->isInitialImport($all_updates);
+
+      if (!$is_initial_import) {
+        $this->applyHeraldRefRules($ref_updates);
+      }
 
       try {
-        $this->rejectEnormousChanges($content_updates);
+        if (!$is_initial_import) {
+          $this->rejectEnormousChanges($content_updates);
+        }
       } catch (DiffusionCommitHookRejectException $ex) {
         // If we're rejecting enormous changes, flag everything.
         $this->rejectCode = PhabricatorRepositoryPushLog::REJECT_ENORMOUS;
         throw $ex;
       }
 
-      $all_updates = array_merge($all_updates, $content_updates);
-
-      $this->applyHeraldContentRules($content_updates, $all_updates);
+      if (!$is_initial_import) {
+        $this->applyHeraldContentRules($content_updates);
+      }
 
       // Run custom scripts in `hook.d/` directories.
       $this->applyCustomHooks($all_updates);
@@ -186,12 +196,10 @@ public function execute() {
       throw $caught;
     }
 
-    // If this went through cleanly, detect pushes which are actually imports
-    // of an existing repository rather than an addition of new commits. If
-    // this push is importing a bunch of stuff, set the importing flag on
-    // the repository. It will be cleared once we fully process everything.
+    // If this went through cleanly and was an import, set the importing flag
+    // on the repository. It will be cleared once we fully process everything.
 
-    if ($this->isInitialImport($all_updates)) {
+    if ($is_initial_import) {
       $repository = $this->getRepository();
       $repository->markImporting();
     }
@@ -281,28 +289,21 @@ private function findContentUpdates(array $ref_updates) {
 
 /* -(  Herald  )------------------------------------------------------------- */
 
-  private function applyHeraldRefRules(
-    array $ref_updates,
-    array $all_updates) {
+  private function applyHeraldRefRules(array $ref_updates) {
     $this->applyHeraldRules(
       $ref_updates,
-      new HeraldPreCommitRefAdapter(),
-      $all_updates);
+      new HeraldPreCommitRefAdapter());
   }
 
-  private function applyHeraldContentRules(
-    array $content_updates,
-    array $all_updates) {
+  private function applyHeraldContentRules(array $content_updates) {
     $this->applyHeraldRules(
       $content_updates,
-      new HeraldPreCommitContentAdapter(),
-      $all_updates);
+      new HeraldPreCommitContentAdapter());
   }
 
   private function applyHeraldRules(
     array $updates,
-    HeraldAdapter $adapter_template,
-    array $all_updates) {
+    HeraldAdapter $adapter_template) {
 
     if (!$updates) {
       return;

From 93cb6e3bdeb07be7b9c6835bcc2d237e2abb708e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 29 Mar 2018 09:51:18 -0700
Subject: [PATCH 751/865] Make updating a revision with the same active diff a
 no-op

Summary: Ref T13114. See PHI515. Updating a revision with the same, currently active diff became an error at some point (probably D19175). This is inconsistent; make it an allowable no-op instead.

Test Plan:
  - Updated a revision's diff via Conduit.
  - Updated to the same diff, no-op.
  - Tried to update a different revision, error ("already attached elsewhere").
  - Updated with a different diff.
  - Tried to update with the original diff, error ("previously attached version").

Maniphest Tasks: T13114

Differential Revision: https://secure.phabricator.com/D19267
---
 .../DifferentialRevisionUpdateTransaction.php | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
index c89c3c79e1..2b74cbfab5 100644
--- a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
@@ -137,7 +137,32 @@ public function validateTransactions($object, array $xactions) {
         continue;
       }
 
-      if ($diff->getRevisionID()) {
+      $is_attached = ($diff->getRevisionID() == $object->getID());
+      if ($is_attached) {
+        $is_active = ($diff_phid == $object->getActiveDiffPHID());
+      } else {
+        $is_active = false;
+      }
+
+      if ($is_attached) {
+        if ($is_active) {
+          // This is a no-op: we're reattaching the current active diff to the
+          // revision it is already attached to. This is valid and will just
+          // be dropped later on in the process.
+        } else {
+          // At least for now, there's no support for "undoing" a diff and
+          // reverting to an older proposed change without just creating a
+          // new diff from whole cloth.
+          $errors[] = $this->newInvalidError(
+            pht(
+              'You can not update this revision with the specified diff '.
+              '("%s") because this diff is already attached to the revision '.
+              'as an older version of the change.',
+              $diff_phid),
+            $xaction);
+          continue;
+        }
+      } else if ($diff->getRevisionID()) {
         $errors[] = $this->newInvalidError(
           pht(
             'You can not update this revision with the specified diff ("%s") '.

From 79154455437be1210b36dab1939b24e0a06c8fb9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 29 Mar 2018 11:22:02 -0700
Subject: [PATCH 752/865] Fix two issues with Differential updates and Owners

Summary:
Ref T13114.

  - Followup fix for D19267, which didn't work correctly with //new// revision creation.
  - Followup fix for changes in T11015. Some of the querying logic was still handling "/x.y" and "/x.y/" differently. Instead, normalize consistently to "/x.y/"

Test Plan:
  - Created a new revision cleanly.
  - Created a package owning only a `example.txt` file and saw Differential find it as an owning package in the table of contents.

Maniphest Tasks: T13114

Differential Revision: https://secure.phabricator.com/D19268
---
 .../DifferentialRevisionUpdateTransaction.php |  4 +++-
 .../storage/PhabricatorOwnersPackage.php      | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
index 2b74cbfab5..189ed2f2ba 100644
--- a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
@@ -137,7 +137,9 @@ public function validateTransactions($object, array $xactions) {
         continue;
       }
 
-      $is_attached = ($diff->getRevisionID() == $object->getID());
+      $is_attached =
+        ($diff->getRevisionID()) &&
+        ($diff->getRevisionID() == $object->getID());
       if ($is_attached) {
         $is_active = ($diff_phid == $object->getActiveDiffPHID());
       } else {
diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
index 56dd51a3c6..c76864702c 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
@@ -393,19 +393,22 @@ public static function findLongestPathsPerPackage(array $rows, array $paths) {
   }
 
   public static function splitPath($path) {
-    $trailing_slash = preg_match('@/$@', $path) ? '/' : '';
-    $path = trim($path, '/');
+    $result = array(
+      '/',
+    );
+
     $parts = explode('/', $path);
+    $buffer = '/';
+    foreach ($parts as $part) {
+      if (!strlen($part)) {
+        continue;
+      }
 
-    $result = array();
-    while (count($parts)) {
-      $result[] = '/'.implode('/', $parts).$trailing_slash;
-      $trailing_slash = '/';
-      array_pop($parts);
+      $buffer = $buffer.$part.'/';
+      $result[] = $buffer;
     }
-    $result[] = '/';
 
-    return array_reverse($result);
+    return $result;
   }
 
   public function attachPaths(array $paths) {

From 7f9a9bc800f76c10b2f8571f41815e15dfc0653f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 29 Mar 2018 11:20:38 -0700
Subject: [PATCH 753/865] Make Harbormaster objects destructible

Summary:
Ref T13114. See PHI511. Ref T13072. This makes Buildables, Builds, Targets and Artifacts destructible with `bin/remove destroy`.

This might not be totally exhaustive. In particular:

  - File artifacts won't destroy the file. This is sort of okay because file artifacts are currently just a file reference, but probably shouldn't be how things work in the long term.
  - `BuildCommand` doesn't get cleaned up, but `BuildMessage` does on `Build`. See T13072 for more.

Test Plan: Used `bin/remove destroy` to nuke a bunch of builds, buildables, etc. Loaded stuff in the web UI and it all looked like it got nuked properly.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13114, T13072

Differential Revision: https://secure.phabricator.com/D19269
---
 src/__phutil_library_map__.php                |  5 ++
 .../storage/HarbormasterBuildMessage.php      | 16 ++++-
 .../storage/HarbormasterBuildable.php         | 34 +++++++++-
 .../storage/build/HarbormasterBuild.php       | 32 +++++++++-
 .../build/HarbormasterBuildArtifact.php       | 22 ++++++-
 .../storage/build/HarbormasterBuildTarget.php | 62 ++++++++++++++++++-
 6 files changed, 162 insertions(+), 9 deletions(-)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b1afef3600..59d0e7eb99 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -6525,6 +6525,7 @@
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorPolicyInterface',
       'PhabricatorConduitResultInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'HarbormasterBuildAbortedException' => 'Exception',
     'HarbormasterBuildActionController' => 'HarbormasterController',
@@ -6532,6 +6533,7 @@
     'HarbormasterBuildArtifact' => array(
       'HarbormasterDAO',
       'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'HarbormasterBuildArtifactPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildArtifactQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
@@ -6564,6 +6566,7 @@
     'HarbormasterBuildMessage' => array(
       'HarbormasterDAO',
       'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'HarbormasterBuildMessageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'HarbormasterBuildPHIDType' => 'PhabricatorPHIDType',
@@ -6614,6 +6617,7 @@
     'HarbormasterBuildTarget' => array(
       'HarbormasterDAO',
       'PhabricatorPolicyInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'HarbormasterBuildTargetPHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildTargetQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
@@ -6628,6 +6632,7 @@
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorPolicyInterface',
       'HarbormasterBuildableInterface',
+      'PhabricatorDestructibleInterface',
     ),
     'HarbormasterBuildableActionController' => 'HarbormasterController',
     'HarbormasterBuildableListController' => 'HarbormasterController',
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildMessage.php b/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
index 1066a93610..34aab3957e 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildMessage.php
@@ -6,8 +6,11 @@
  * conditions where we receive a message before a build plan is ready to
  * accept it.
  */
-final class HarbormasterBuildMessage extends HarbormasterDAO
-  implements PhabricatorPolicyInterface {
+final class HarbormasterBuildMessage
+  extends HarbormasterDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface {
 
   protected $authorPHID;
   protected $receiverPHID;
@@ -74,4 +77,13 @@ public function describeAutomaticCapability($capability) {
     return pht('Build messages have the same policies as their receivers.');
   }
 
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $this->delete();
+  }
+
 }
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
index 5de2159e8d..3a092900eb 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -1,10 +1,12 @@
 <?php
 
-final class HarbormasterBuildable extends HarbormasterDAO
+final class HarbormasterBuildable
+  extends HarbormasterDAO
   implements
     PhabricatorApplicationTransactionInterface,
     PhabricatorPolicyInterface,
-    HarbormasterBuildableInterface {
+    HarbormasterBuildableInterface,
+    PhabricatorDestructibleInterface {
 
   protected $buildablePHID;
   protected $containerPHID;
@@ -340,4 +342,32 @@ public function getAvailableBuildVariables() {
   }
 
 
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $viewer = $engine->getViewer();
+
+    $this->openTransaction();
+      $builds = id(new HarbormasterBuildQuery())
+        ->setViewer($viewer)
+        ->withBuildablePHIDs(array($this->getPHID()))
+        ->execute();
+      foreach ($builds as $build) {
+        $engine->destroyObject($build);
+      }
+
+      $messages = id(new HarbormasterBuildMessageQuery())
+        ->setViewer($viewer)
+        ->withReceiverPHIDs(array($this->getPHID()))
+        ->execute();
+      foreach ($messages as $message) {
+        $engine->destroyObject($message);
+      }
+
+      $this->delete();
+    $this->saveTransaction();
+  }
+
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
index d43b19d71f..ae0f6b13f3 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
@@ -4,7 +4,8 @@ final class HarbormasterBuild extends HarbormasterDAO
   implements
     PhabricatorApplicationTransactionInterface,
     PhabricatorPolicyInterface,
-    PhabricatorConduitResultInterface {
+    PhabricatorConduitResultInterface,
+    PhabricatorDestructibleInterface {
 
   protected $buildablePHID;
   protected $buildPlanPHID;
@@ -455,4 +456,33 @@ public function getConduitSearchAttachments() {
     );
   }
 
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $viewer = $engine->getViewer();
+
+    $this->openTransaction();
+      $targets = id(new HarbormasterBuildTargetQuery())
+        ->setViewer($viewer)
+        ->withBuildPHIDs(array($this->getPHID()))
+        ->execute();
+      foreach ($targets as $target) {
+        $engine->destroyObject($target);
+      }
+
+      $messages = id(new HarbormasterBuildMessageQuery())
+        ->setViewer($viewer)
+        ->withReceiverPHIDs(array($this->getPHID()))
+        ->execute();
+      foreach ($messages as $message) {
+        $engine->destroyObject($message);
+      }
+
+      $this->delete();
+    $this->saveTransaction();
+  }
+
+
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php b/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
index 461ef4b06f..7cd8d60b6a 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildArtifact.php
@@ -1,7 +1,10 @@
 <?php
 
-final class HarbormasterBuildArtifact extends HarbormasterDAO
-  implements PhabricatorPolicyInterface {
+final class HarbormasterBuildArtifact
+  extends HarbormasterDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface {
 
   protected $buildTargetPHID;
   protected $artifactType;
@@ -147,4 +150,19 @@ public function describeAutomaticCapability($capability) {
     return pht('Users must be able to see a buildable to see its artifacts.');
   }
 
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+
+    $viewer = $this->getViewer();
+
+    $this->openTransaction();
+      $this->releaseArtifact($viewer);
+      $this->delete();
+    $this->saveTransaction();
+  }
+
 }
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php b/src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php
index 8b47bdfc21..b559a66198 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php
@@ -1,7 +1,10 @@
 <?php
 
-final class HarbormasterBuildTarget extends HarbormasterDAO
-  implements PhabricatorPolicyInterface {
+final class HarbormasterBuildTarget
+  extends HarbormasterDAO
+  implements
+    PhabricatorPolicyInterface,
+    PhabricatorDestructibleInterface {
 
   protected $name;
   protected $buildPHID;
@@ -354,4 +357,59 @@ public function describeAutomaticCapability($capability) {
     return pht('Users must be able to see a build to view its build targets.');
   }
 
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+    $viewer = $engine->getViewer();
+
+    $this->openTransaction();
+
+      $lint_message = new HarbormasterBuildLintMessage();
+      $conn = $lint_message->establishConnection('w');
+      queryfx(
+        $conn,
+        'DELETE FROM %T WHERE buildTargetPHID = %s',
+        $lint_message->getTableName(),
+        $this->getPHID());
+
+      $unit_message = new HarbormasterBuildUnitMessage();
+      $conn = $unit_message->establishConnection('w');
+      queryfx(
+        $conn,
+        'DELETE FROM %T WHERE buildTargetPHID = %s',
+        $unit_message->getTableName(),
+        $this->getPHID());
+
+      $logs = id(new HarbormasterBuildLogQuery())
+        ->setViewer($viewer)
+        ->withBuildTargetPHIDs(array($this->getPHID()))
+        ->execute();
+      foreach ($logs as $log) {
+        $engine->destroyObject($log);
+      }
+
+      $artifacts = id(new HarbormasterBuildArtifactQuery())
+        ->setViewer($viewer)
+        ->withBuildTargetPHIDs(array($this->getPHID()))
+        ->execute();
+      foreach ($artifacts as $artifact) {
+        $engine->destroyObject($artifact);
+      }
+
+      $messages = id(new HarbormasterBuildMessageQuery())
+        ->setViewer($viewer)
+        ->withReceiverPHIDs(array($this->getPHID()))
+        ->execute();
+      foreach ($messages as $message) {
+        $engine->destroyObject($message);
+      }
+
+      $this->delete();
+    $this->saveTransaction();
+  }
+
+
 }

From 9fbf4ee58c0d506a8b684dcbbefd75997ae88353 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 29 Mar 2018 14:03:48 -0700
Subject: [PATCH 754/865] Provide comment actions for tokenizer custom fields

Summary:
Ref T13114. See PHI519. An install is interested in modifying a tokenizer custom field from the comment area. Provide this capability.

This patch is fairly narrow but should solve the immediate need.

Test Plan: Added, removed, and modified a tokenizer custom field using the comment action dropdown.

Maniphest Tasks: T13114

Differential Revision: https://secure.phabricator.com/D19270
---
 .../PhabricatorCustomFieldEditField.php       | 34 +++++++++++++++++++
 .../field/PhabricatorCustomField.php          | 21 ++++++++++++
 ...habricatorStandardCustomFieldTokenizer.php | 22 ++++++++++++
 3 files changed, 77 insertions(+)

diff --git a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
index 1153f82a34..27b8276c85 100644
--- a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
+++ b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
@@ -7,6 +7,7 @@ final class PhabricatorCustomFieldEditField
   private $httpParameterType;
   private $conduitParameterType;
   private $bulkParameterType;
+  private $commentAction;
 
   public function setCustomField(PhabricatorCustomField $custom_field) {
     $this->customField = $custom_field;
@@ -47,6 +48,16 @@ public function getCustomFieldBulkParameterType() {
     return $this->bulkParameterType;
   }
 
+  public function setCustomFieldCommentAction(
+    PhabricatorEditEngineCommentAction $comment_action) {
+    $this->commentAction = $comment_action;
+    return $this;
+  }
+
+  public function getCustomFieldCommentAction() {
+    return $this->commentAction;
+  }
+
   protected function buildControl() {
     if ($this->getIsConduitOnly()) {
       return null;
@@ -77,6 +88,19 @@ public function getValueForTransaction() {
     return $clone->getNewValueForApplicationTransactions();
   }
 
+  protected function getValueForCommentAction($value) {
+    $field = $this->getCustomField();
+    $clone = clone $field;
+    $clone->setValueFromApplicationTransactions($value);
+
+    // TODO: This is somewhat bogus because only StandardCustomFields
+    // implement a getFieldValue() method -- not all CustomFields. Today,
+    // only StandardCustomFields can ever actually generate a comment action
+    // so we never reach this method with other field types.
+
+    return $clone->getFieldValue();
+  }
+
   protected function getValueExistsInSubmit(AphrontRequest $request, $key) {
     return true;
   }
@@ -110,6 +134,16 @@ protected function newHTTPParameterType() {
     return null;
   }
 
+  protected function newCommentAction() {
+    $action = $this->getCustomFieldCommentAction();
+
+    if ($action) {
+      return clone $action;
+    }
+
+    return null;
+  }
+
   protected function newConduitParameterType() {
     $type = $this->getCustomFieldConduitParameterType();
 
diff --git a/src/infrastructure/customfield/field/PhabricatorCustomField.php b/src/infrastructure/customfield/field/PhabricatorCustomField.php
index 818bf119ff..36db8f239b 100644
--- a/src/infrastructure/customfield/field/PhabricatorCustomField.php
+++ b/src/infrastructure/customfield/field/PhabricatorCustomField.php
@@ -1127,6 +1127,16 @@ protected function newEditField() {
       $field->setCustomFieldBulkParameterType($bulk_type);
     }
 
+    $comment_action = $this->getCommentAction();
+    if ($comment_action) {
+      $field
+        ->setCustomFieldCommentAction($comment_action)
+        ->setCommentActionLabel(
+          pht(
+            'Change %s',
+            $this->getFieldName()));
+    }
+
     return $field;
   }
 
@@ -1459,6 +1469,17 @@ protected function newConduitEditParameterType() {
     return null;
   }
 
+  public function getCommentAction() {
+    return $this->newCommentAction();
+  }
+
+  protected function newCommentAction() {
+    if ($this->proxy) {
+      return $this->proxy->newCommentAction();
+    }
+    return null;
+  }
+
 
 /* -(  Herald  )------------------------------------------------------------- */
 
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
index 9bf59d41f6..3c5268d65b 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php
@@ -143,4 +143,26 @@ protected function newApplicationSearchDatasource() {
       ->setDatasource($datasource);
   }
 
+  protected function newCommentAction() {
+    $viewer = $this->getViewer();
+
+    $datasource = $this->getDatasource()
+      ->setViewer($viewer);
+
+    $action = id(new PhabricatorEditEngineTokenizerCommentAction())
+      ->setDatasource($datasource);
+
+    $limit = $this->getFieldConfigValue('limit');
+    if ($limit) {
+      $action->setLimit($limit);
+    }
+
+    $value = $this->getFieldValue();
+    if ($value !== null) {
+      $action->setInitialValue($value);
+    }
+
+    return $action;
+  }
+
 }

From 66392e5b8bb482fdbc526ecbede3deb585a5c476 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 30 Mar 2018 07:01:36 -0700
Subject: [PATCH 755/865] Add a rough "bin/repository unpublish" workflow to
 attempt to cleanup improperly published repositories

Summary:
Ref T13114. See PHI514. This makes some attempt to undo the damage caused by incorrectly publishing a repository.

Don't run this.

Test Plan: Yikes.

Maniphest Tasks: T13114

Differential Revision: https://secure.phabricator.com/D19271
---
 src/__phutil_library_map__.php                |   7 +-
 .../feed/storage/PhabricatorFeedStoryData.php |  30 +-
 ...rRepositoryManagementUnpublishWorkflow.php | 273 ++++++++++++++++++
 3 files changed, 308 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/repository/management/PhabricatorRepositoryManagementUnpublishWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 59d0e7eb99..447d4a534e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4020,6 +4020,7 @@
     'PhabricatorRepositoryManagementRefsWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php',
     'PhabricatorRepositoryManagementReparseWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php',
     'PhabricatorRepositoryManagementThawWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementThawWorkflow.php',
+    'PhabricatorRepositoryManagementUnpublishWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementUnpublishWorkflow.php',
     'PhabricatorRepositoryManagementUpdateWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementUpdateWorkflow.php',
     'PhabricatorRepositoryManagementWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementWorkflow.php',
     'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php',
@@ -8563,7 +8564,10 @@
       'PhabricatorPolicyInterface',
       'PhabricatorMarkupInterface',
     ),
-    'PhabricatorFeedStoryData' => 'PhabricatorFeedDAO',
+    'PhabricatorFeedStoryData' => array(
+      'PhabricatorFeedDAO',
+      'PhabricatorDestructibleInterface',
+    ),
     'PhabricatorFeedStoryNotification' => 'PhabricatorFeedDAO',
     'PhabricatorFeedStoryPublisher' => 'Phobject',
     'PhabricatorFeedStoryReference' => 'PhabricatorFeedDAO',
@@ -9814,6 +9818,7 @@
     'PhabricatorRepositoryManagementRefsWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
     'PhabricatorRepositoryManagementReparseWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
     'PhabricatorRepositoryManagementThawWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
+    'PhabricatorRepositoryManagementUnpublishWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
     'PhabricatorRepositoryManagementUpdateWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
     'PhabricatorRepositoryManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
diff --git a/src/applications/feed/storage/PhabricatorFeedStoryData.php b/src/applications/feed/storage/PhabricatorFeedStoryData.php
index 33d19fa616..0513590023 100644
--- a/src/applications/feed/storage/PhabricatorFeedStoryData.php
+++ b/src/applications/feed/storage/PhabricatorFeedStoryData.php
@@ -1,6 +1,8 @@
 <?php
 
-final class PhabricatorFeedStoryData extends PhabricatorFeedDAO {
+final class PhabricatorFeedStoryData
+  extends PhabricatorFeedDAO
+  implements PhabricatorDestructibleInterface {
 
   protected $phid;
 
@@ -66,4 +68,30 @@ public function getValue($key, $default = null) {
     return idx($this->storyData, $key, $default);
   }
 
+
+/* -(  PhabricatorDestructibleInterface  )----------------------------------- */
+
+
+  public function destroyObjectPermanently(
+    PhabricatorDestructionEngine $engine) {
+
+    $this->openTransaction();
+      $conn = $this->establishConnection('w');
+
+      queryfx(
+        $conn,
+        'DELETE FROM %T WHERE chronologicalKey = %s',
+        id(new PhabricatorFeedStoryNotification())->getTableName(),
+        $this->getChronologicalKey());
+
+      queryfx(
+        $conn,
+        'DELETE FROM %T WHERE chronologicalKey = %s',
+        id(new PhabricatorFeedStoryReference())->getTableName(),
+        $this->getChronologicalKey());
+
+      $this->delete();
+    $this->saveTransaction();
+  }
+
 }
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementUnpublishWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementUnpublishWorkflow.php
new file mode 100644
index 0000000000..5a6afb8c6e
--- /dev/null
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementUnpublishWorkflow.php
@@ -0,0 +1,273 @@
+<?php
+
+final class PhabricatorRepositoryManagementUnpublishWorkflow
+  extends PhabricatorRepositoryManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('unpublish')
+      ->setExamples(
+        '**unpublish** [__options__] __repository__')
+      ->setSynopsis(
+        pht(
+          'Unpublish all feed stories and notifications that a repository '.
+          'has generated. Keep expectations low; can not rewind time.'))
+      ->setArguments(
+        array(
+          array(
+            'name' => 'force',
+            'help' => pht('Do not prompt for confirmation.'),
+          ),
+          array(
+            'name' => 'dry-run',
+            'help' => pht('Do not perform any writes.'),
+          ),
+          array(
+            'name' => 'repositories',
+            'wildcard' => true,
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+    $is_force = $args->getArg('force');
+    $is_dry_run = $args->getArg('dry-run');
+
+    $repositories = $this->loadLocalRepositories($args, 'repositories');
+    if (count($repositories) !== 1) {
+      throw new PhutilArgumentUsageException(
+        pht('Specify exactly one repository to unpublish.'));
+    }
+    $repository = head($repositories);
+
+    if (!$is_force) {
+      echo tsprintf(
+        "%s\n",
+        pht(
+          'This script will unpublish all feed stories and notifications '.
+          'which a repository generated during import. This action can not '.
+          'be undone.'));
+
+      $prompt = pht(
+        'Permanently unpublish "%s"?',
+        $repository->getDisplayName());
+      if (!phutil_console_confirm($prompt)) {
+        throw new PhutilArgumentUsageException(
+          pht('User aborted workflow.'));
+      }
+    }
+
+    $commits = id(new DiffusionCommitQuery())
+      ->setViewer($viewer)
+      ->withRepositoryPHIDs(array($repository->getPHID()))
+      ->execute();
+
+    echo pht("Will unpublish %s commits.\n", count($commits));
+
+    foreach ($commits as $commit) {
+      $this->unpublishCommit($commit, $is_dry_run);
+    }
+
+    return 0;
+  }
+
+  private function unpublishCommit(
+    PhabricatorRepositoryCommit $commit,
+    $is_dry_run) {
+    $viewer = $this->getViewer();
+
+    echo tsprintf(
+      "%s\n",
+      pht(
+        'Unpublishing commit "%s".',
+        $commit->getMonogram()));
+
+    $stories = id(new PhabricatorFeedQuery())
+      ->setViewer($viewer)
+      ->withFilterPHIDs(array($commit->getPHID()))
+      ->execute();
+
+    if ($stories) {
+      echo tsprintf(
+        "%s\n",
+        pht(
+          'Found %s feed storie(s).',
+          count($stories)));
+
+      if (!$is_dry_run) {
+        $engine = new PhabricatorDestructionEngine();
+        foreach ($stories as $story) {
+          $story_data = $story->getStoryData();
+          $engine->destroyObject($story_data);
+        }
+
+        echo tsprintf(
+          "%s\n",
+          pht(
+            'Destroyed %s feed storie(s).',
+            count($stories)));
+      }
+    }
+
+    $edge_types = array(
+      PhabricatorObjectMentionsObjectEdgeType::EDGECONST => true,
+      DiffusionCommitHasTaskEdgeType::EDGECONST => true,
+      DiffusionCommitHasRevisionEdgeType::EDGECONST => true,
+      DiffusionCommitRevertsCommitEdgeType::EDGECONST => true,
+    );
+
+    $query = id(new PhabricatorEdgeQuery())
+      ->withSourcePHIDs(array($commit->getPHID()))
+      ->withEdgeTypes(array_keys($edge_types));
+    $edges = $query->execute();
+
+    foreach ($edges[$commit->getPHID()] as $type => $edge_list) {
+      foreach ($edge_list as $edge) {
+        $dst = $edge['dst'];
+
+        echo tsprintf(
+          "%s\n",
+          pht(
+            'Commit "%s" has edge of type "%s" to object "%s".',
+            $commit->getMonogram(),
+            $type,
+            $dst));
+
+        $object = id(new PhabricatorObjectQuery())
+          ->setViewer($viewer)
+          ->withPHIDs(array($dst))
+          ->executeOne();
+        if ($object) {
+          if ($object instanceof PhabricatorApplicationTransactionInterface) {
+            $this->unpublishEdgeTransaction(
+              $commit,
+              $type,
+              $object,
+              $is_dry_run);
+          }
+        }
+      }
+    }
+  }
+
+  private function unpublishEdgeTransaction(
+    $src,
+    $type,
+    PhabricatorApplicationTransactionInterface $dst,
+    $is_dry_run) {
+    $viewer = $this->getViewer();
+
+    $query = PhabricatorApplicationTransactionQuery::newQueryForObject($dst)
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($dst->getPHID()));
+
+    $xactions = id(clone $query)
+      ->withTransactionTypes(
+        array(
+          PhabricatorTransactions::TYPE_EDGE,
+        ))
+      ->execute();
+
+    $type_obj = PhabricatorEdgeType::getByConstant($type);
+    $inverse_type = $type_obj->getInverseEdgeConstant();
+
+    $engine = new PhabricatorDestructionEngine();
+    foreach ($xactions as $xaction) {
+      $edge_type = $xaction->getMetadataValue('edge:type');
+      if ($edge_type != $inverse_type) {
+        // Some other type of edge was edited.
+        continue;
+      }
+
+      $record = PhabricatorEdgeChangeRecord::newFromTransaction($xaction);
+      $changed = $record->getChangedPHIDs();
+      if ($changed !== array($src->getPHID())) {
+        // Affected objects were not just the object we're unpublishing.
+        continue;
+      }
+
+      echo tsprintf(
+        "%s\n",
+        pht(
+          'Found edge transaction "%s" on object "%s" for type "%s".',
+          $xaction->getPHID(),
+          $dst->getPHID(),
+          $type));
+
+      if (!$is_dry_run) {
+        $engine->destroyObject($xaction);
+
+        echo tsprintf(
+          "%s\n",
+          pht(
+            'Destroyed transaction "%s" on object "%s".',
+            $xaction->getPHID(),
+            $dst->getPHID()));
+      }
+    }
+
+    if ($type === DiffusionCommitHasTaskEdgeType::EDGECONST) {
+      $xactions = id(clone $query)
+        ->withTransactionTypes(
+          array(
+            ManiphestTaskStatusTransaction::TRANSACTIONTYPE,
+          ))
+        ->execute();
+
+      if ($xactions) {
+        foreach ($xactions as $xaction) {
+          $metadata = $xaction->getMetadata();
+          if (idx($metadata, 'commitPHID') === $src->getPHID()) {
+            echo tsprintf(
+              "%s\n",
+              pht(
+                'MANUAL Task "%s" was likely closed improperly by "%s".',
+                $dst->getMonogram(),
+                $src->getMonogram()));
+          }
+        }
+      }
+    }
+
+    if ($type === DiffusionCommitHasRevisionEdgeType::EDGECONST) {
+      $xactions = id(clone $query)
+        ->withTransactionTypes(
+          array(
+            DifferentialRevisionCloseTransaction::TRANSACTIONTYPE,
+          ))
+        ->execute();
+
+      if ($xactions) {
+        foreach ($xactions as $xaction) {
+          $metadata = $xaction->getMetadata();
+          if (idx($metadata, 'isCommitClose')) {
+            if (idx($metadata, 'commitPHID') === $src->getPHID()) {
+              echo tsprintf(
+                "%s\n",
+                pht(
+                  'MANUAL Revision "%s" was likely closed improperly by "%s".',
+                  $dst->getMonogram(),
+                  $src->getMonogram()));
+            }
+          }
+        }
+      }
+    }
+
+    if (!$is_dry_run) {
+      id(new PhabricatorEdgeEditor())
+        ->removeEdge($src->getPHID(), $type, $dst->getPHID())
+        ->save();
+      echo tsprintf(
+        "%s\n",
+        pht(
+          'Destroyed edge of type "%s" between "%s" and "%s".',
+          $type,
+          $src->getPHID(),
+          $dst->getPHID()));
+    }
+  }
+
+
+}

From 7eaa27683e973e3b5e74e8736c387f293653cbe3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 30 Mar 2018 08:42:18 -0700
Subject: [PATCH 756/865] Make closed/disabled results in the remarkup
 autocomplete more visually clear

Summary:
Ref T13114. See PHI522. Although it looks like results are already ordered correctly, the override rendering isn't accommodating disabled results gracefully.

Give closed results a distinctive look (grey + strikethru) so it's clear when you're autocompleting `@mention...` into a disabled user.

Test Plan: {F5497621}

Maniphest Tasks: T13114

Differential Revision: https://secure.phabricator.com/D19272
---
 resources/celerity/map.php                 | 22 +++++++++++-----------
 webroot/rsrc/css/core/remarkup.css         |  5 +++++
 webroot/rsrc/js/phuix/PHUIXAutocomplete.js |  5 ++++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f7a1f391d0..c9768ce456 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '3fd3b7b8',
+    'core.pkg.css' => '1dd5fa4b',
     'core.pkg.js' => 'b9b4a943',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -112,7 +112,7 @@
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '62fa3ace',
-    'rsrc/css/core/remarkup.css' => 'b375546d',
+    'rsrc/css/core/remarkup.css' => '1828e2ad',
     'rsrc/css/core/syntax.css' => 'cae95e89',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
@@ -509,7 +509,7 @@
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => 'ed18356a',
-    'rsrc/js/phuix/PHUIXAutocomplete.js' => '7fa5c915',
+    'rsrc/js/phuix/PHUIXAutocomplete.js' => 'df1bbd34',
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
@@ -780,7 +780,7 @@
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '77b0ae28',
-    'phabricator-remarkup-css' => 'b375546d',
+    'phabricator-remarkup-css' => '1828e2ad',
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
@@ -865,7 +865,7 @@
     'phui-workpanel-view-css' => 'a3a63478',
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => 'ed18356a',
-    'phuix-autocomplete' => '7fa5c915',
+    'phuix-autocomplete' => 'df1bbd34',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
     'phuix-form-control-view' => '210a16c1',
@@ -1558,12 +1558,6 @@
     '7f243deb' => array(
       'javelin-install',
     ),
-    '7fa5c915' => array(
-      'javelin-install',
-      'javelin-dom',
-      'phuix-icon-view',
-      'phabricator-prefab',
-    ),
     '834a1173' => array(
       'javelin-behavior',
       'javelin-scrollbar',
@@ -2047,6 +2041,12 @@
       'javelin-typeahead-ondemand-source',
       'javelin-dom',
     ),
+    'df1bbd34' => array(
+      'javelin-install',
+      'javelin-dom',
+      'phuix-icon-view',
+      'phabricator-prefab',
+    ),
     'e1d25dfb' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index 949deadbe4..990c6f0bab 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -724,6 +724,11 @@ var.remarkup-assist-textarea {
   color: {$darkgreytext};
 }
 
+.phuix-autocomplete-list a.jx-result .tokenizer-result-closed {
+  color: {$lightgreytext};
+  text-decoration: line-through;
+}
+
 .phuix-autocomplete-list a.jx-result .phui-icon-view {
   margin-right: 4px;
   color: {$lightbluetext};
diff --git a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
index 8f062d900e..f46e7666e2 100644
--- a/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
+++ b/webroot/rsrc/js/phuix/PHUIXAutocomplete.js
@@ -185,7 +185,10 @@ JX.install('PHUIXAutocomplete', {
           .getNode();
       }
 
-      map.display = [icon, map.displayName];
+      var display = JX.$N('span', {}, [icon, map.displayName]);
+      JX.DOM.alterClass(display, 'tokenizer-result-closed', !!map.closed);
+
+      map.display = display;
 
       return map;
     },

From ccbc8a430f62de470bfffbf4cb7c6b9ea3db8a26 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 30 Mar 2018 09:46:45 -0700
Subject: [PATCH 757/865] Make Jupyter notebooks use the fast builtin Python
 highlighter

Summary:
Ref T13105. This is silly, but "py" and "python" end up in different places today, and "py" is ~100x faster than "python".

See also T3626 for longer-term plans on this.

Test Plan: Reloaded a Jupyter notebook, saw it render almost instantly instead of taking a few seconds.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19273
---
 .../files/document/PhabricatorJupyterDocumentEngine.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/files/document/PhabricatorJupyterDocumentEngine.php b/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
index 93181921af..90b9d33c0e 100644
--- a/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorJupyterDocumentEngine.php
@@ -196,7 +196,7 @@ private function newCodeCell(array $cell) {
     $content = implode('', $content);
 
     $content = PhabricatorSyntaxHighlighter::highlightWithLanguage(
-      'python',
+      'py',
       $content);
 
     $outputs = array();

From 7189cb7ba816185f7da448aa51cfe9678333ee35 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 30 Mar 2018 11:02:01 -0700
Subject: [PATCH 758/865] Support text encoding and syntax highlighting options
 in document rendering

Summary: Depends on D19273. Ref T13105. Adds "Change Text Encoding..." and "Highlight As..." options when rendering documents, and makes an effort to automatically detect and handle text encoding.

Test Plan:
  - Uploaded a Shift-JIS file, saw it auto-detect as Shift-JIS.
  - Converted files between encodings.
  - Highlighted various things as "Rainbow", etc.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19274
---
 resources/celerity/map.php                    | 30 +++---
 .../PhabricatorFileDocumentController.php     | 10 ++
 .../PhabricatorFileViewController.php         | 24 +++++
 .../document/PhabricatorDocumentEngine.php    | 28 ++++++
 .../PhabricatorSourceDocumentEngine.php       | 17 +++-
 .../PhabricatorTextDocumentEngine.php         | 60 ++++++++++-
 .../files/behavior-document-engine.js         | 99 +++++++++++++++++--
 webroot/rsrc/js/phuix/PHUIXActionView.js      |  4 +
 8 files changed, 243 insertions(+), 29 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index c9768ce456..56ee3d5d45 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '1dd5fa4b',
-    'core.pkg.js' => 'b9b4a943',
+    'core.pkg.js' => '1ea38af8',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -392,7 +392,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => '194cbe53',
+    'rsrc/js/application/files/behavior-document-engine.js' => '9108ee1a',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -508,7 +508,7 @@
     'rsrc/js/phui/behavior-phui-submenu.js' => 'a6f7a73b',
     'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
-    'rsrc/js/phuix/PHUIXActionView.js' => 'ed18356a',
+    'rsrc/js/phuix/PHUIXActionView.js' => '8d4a8c72',
     'rsrc/js/phuix/PHUIXAutocomplete.js' => 'df1bbd34',
     'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
@@ -607,7 +607,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => '194cbe53',
+    'javelin-behavior-document-engine' => '9108ee1a',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -864,7 +864,7 @@
     'phui-workcard-view-css' => 'cca5fa92',
     'phui-workpanel-view-css' => 'a3a63478',
     'phuix-action-list-view' => 'b5c256b8',
-    'phuix-action-view' => 'ed18356a',
+    'phuix-action-view' => '8d4a8c72',
     'phuix-autocomplete' => 'df1bbd34',
     'phuix-button-view' => '8a91e1ac',
     'phuix-dropdown-menu' => '04b2ae03',
@@ -983,11 +983,6 @@
     '191b4909' => array(
       'javelin-behavior',
     ),
-    '194cbe53' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     '1ad0a787' => array(
       'javelin-install',
       'javelin-reactor',
@@ -1619,6 +1614,11 @@
       'javelin-stratcom',
       'javelin-install',
     ),
+    '8d4a8c72' => array(
+      'javelin-install',
+      'javelin-dom',
+      'javelin-util',
+    ),
     '8e1baf68' => array(
       'phui-button-css',
     ),
@@ -1644,6 +1644,11 @@
       'javelin-stratcom',
       'javelin-vector',
     ),
+    '9108ee1a' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     '92b9ec77' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2125,11 +2130,6 @@
       'javelin-stratcom',
       'javelin-vector',
     ),
-    'ed18356a' => array(
-      'javelin-install',
-      'javelin-dom',
-      'javelin-util',
-    ),
     'edf8a145' => array(
       'javelin-behavior',
       'javelin-uri',
diff --git a/src/applications/files/controller/PhabricatorFileDocumentController.php b/src/applications/files/controller/PhabricatorFileDocumentController.php
index 61bf4427cf..15fadaa289 100644
--- a/src/applications/files/controller/PhabricatorFileDocumentController.php
+++ b/src/applications/files/controller/PhabricatorFileDocumentController.php
@@ -43,6 +43,16 @@ public function handleRequest(AphrontRequest $request) {
     $engine = $engines[$engine_key];
     $this->engine = $engine;
 
+    $encode_setting = $request->getStr('encode');
+    if (strlen($encode_setting)) {
+      $engine->setEncodingConfiguration($encode_setting);
+    }
+
+    $highlight_setting = $request->getStr('highlight');
+    if (strlen($highlight_setting)) {
+      $engine->setHighlightingConfiguration($highlight_setting);
+    }
+
     try {
       $content = $engine->newDocument($ref);
     } catch (Exception $ex) {
diff --git a/src/applications/files/controller/PhabricatorFileViewController.php b/src/applications/files/controller/PhabricatorFileViewController.php
index 5251fdd8f1..9d32ff6fb1 100644
--- a/src/applications/files/controller/PhabricatorFileViewController.php
+++ b/src/applications/files/controller/PhabricatorFileViewController.php
@@ -422,6 +422,16 @@ private function newFileContent(PhabricatorFile $file) {
       $engine->setHighlightedLines(range($lines[0], $lines[1]));
     }
 
+    $encode_setting = $request->getStr('encode');
+    if (strlen($encode_setting)) {
+      $engine->setEncodingConfiguration($encode_setting);
+    }
+
+    $highlight_setting = $request->getStr('highlight');
+    if (strlen($highlight_setting)) {
+      $engine->setHighlightingConfiguration($highlight_setting);
+    }
+
     $views = array();
     foreach ($engines as $candidate_key => $candidate_engine) {
       $label = $candidate_engine->getViewAsLabel($ref);
@@ -443,6 +453,8 @@ private function newFileContent(PhabricatorFile $file) {
         'engineURI' => $candidate_engine->getRenderURI($ref),
         'viewURI' => $view_uri,
         'loadingMarkup' => hsprintf('%s', $loading),
+        'canEncode' => $candidate_engine->canConfigureEncoding($ref),
+        'canHighlight' => $candidate_engine->CanConfigureHighlighting($ref),
       );
     }
 
@@ -474,6 +486,18 @@ private function newFileContent(PhabricatorFile $file) {
       'viewKey' => $engine->getDocumentEngineKey(),
       'views' => $views,
       'standaloneURI' => $engine->getRenderURI($ref),
+      'encode' => array(
+        'icon' => 'fa-font',
+        'name' => pht('Change Text Encoding...'),
+        'uri' => '/services/encoding/',
+        'value' => $encode_setting,
+      ),
+      'highlight' => array(
+        'icon' => 'fa-lightbulb-o',
+        'name' => pht('Highlight As...'),
+        'uri' => '/services/highlight/',
+        'value' => $highlight_setting,
+      ),
     );
 
     $view_button = id(new PHUIButtonView())
diff --git a/src/applications/files/document/PhabricatorDocumentEngine.php b/src/applications/files/document/PhabricatorDocumentEngine.php
index a225d55ea9..c3a1a7317a 100644
--- a/src/applications/files/document/PhabricatorDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorDocumentEngine.php
@@ -5,6 +5,8 @@ abstract class PhabricatorDocumentEngine
 
   private $viewer;
   private $highlightedLines = array();
+  private $encodingConfiguration;
+  private $highlightingConfiguration;
 
   final public function setViewer(PhabricatorUser $viewer) {
     $this->viewer = $viewer;
@@ -28,6 +30,32 @@ final public function canRenderDocument(PhabricatorDocumentRef $ref) {
     return $this->canRenderDocumentType($ref);
   }
 
+  public function canConfigureEncoding(PhabricatorDocumentRef $ref) {
+    return false;
+  }
+
+  public function canConfigureHighlighting(PhabricatorDocumentRef $ref) {
+    return false;
+  }
+
+  final public function setEncodingConfiguration($config) {
+    $this->encodingConfiguration = $config;
+    return $this;
+  }
+
+  final public function getEncodingConfiguration() {
+    return $this->encodingConfiguration;
+  }
+
+  final public function setHighlightingConfiguration($config) {
+    $this->highlightingConfiguration = $config;
+    return $this;
+  }
+
+  final public function getHighlightingConfiguration() {
+    return $this->highlightingConfiguration;
+  }
+
   public function shouldRenderAsync(PhabricatorDocumentRef $ref) {
     return false;
   }
diff --git a/src/applications/files/document/PhabricatorSourceDocumentEngine.php b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
index 1c3e54575a..cd7c2af92b 100644
--- a/src/applications/files/document/PhabricatorSourceDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
@@ -9,6 +9,10 @@ public function getViewAsLabel(PhabricatorDocumentRef $ref) {
     return pht('View as Source');
   }
 
+  public function canConfigureHighlighting(PhabricatorDocumentRef $ref) {
+    return true;
+  }
+
   protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-code';
   }
@@ -20,9 +24,16 @@ protected function getContentScore(PhabricatorDocumentRef $ref) {
   protected function newDocumentContent(PhabricatorDocumentRef $ref) {
     $content = $this->loadTextData($ref);
 
-    $content = PhabricatorSyntaxHighlighter::highlightWithFilename(
-      $ref->getName(),
-      $content);
+    $highlighting = $this->getHighlightingConfiguration();
+    if ($highlighting !== null) {
+      $content = PhabricatorSyntaxHighlighter::highlightWithLanguage(
+        $highlighting,
+        $content);
+    } else {
+      $content = PhabricatorSyntaxHighlighter::highlightWithFilename(
+        $ref->getName(),
+        $content);
+    }
 
     return $this->newTextDocumentContent($content);
   }
diff --git a/src/applications/files/document/PhabricatorTextDocumentEngine.php b/src/applications/files/document/PhabricatorTextDocumentEngine.php
index 4fb8d052e1..08a5cabe54 100644
--- a/src/applications/files/document/PhabricatorTextDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorTextDocumentEngine.php
@@ -3,10 +3,16 @@
 abstract class PhabricatorTextDocumentEngine
   extends PhabricatorDocumentEngine {
 
+  private $encodingMessage = null;
+
   protected function canRenderDocumentType(PhabricatorDocumentRef $ref) {
     return $ref->isProbablyText();
   }
 
+  public function canConfigureEncoding(PhabricatorDocumentRef $ref) {
+    return true;
+  }
+
   protected function newTextDocumentContent($content) {
     $lines = phutil_split_lines($content);
 
@@ -14,19 +20,69 @@ protected function newTextDocumentContent($content) {
       ->setHighlights($this->getHighlightedLines())
       ->setLines($lines);
 
+    $message = null;
+    if ($this->encodingMessage !== null) {
+      $message = $this->newMessage($this->encodingMessage);
+    }
+
     $container = phutil_tag(
       'div',
       array(
         'class' => 'document-engine-text',
       ),
-      $view);
+      array(
+        $message,
+        $view,
+      ));
 
     return $container;
   }
 
   protected function loadTextData(PhabricatorDocumentRef $ref) {
     $content = $ref->loadData();
-    $content = phutil_utf8ize($content);
+
+    $encoding = $this->getEncodingConfiguration();
+    if ($encoding !== null) {
+      if (function_exists('mb_convert_encoding')) {
+        $content = mb_convert_encoding($content, 'UTF-8', $encoding);
+        $this->encodingMessage = pht(
+          'This document was converted from %s to UTF8 for display.',
+          $encoding);
+      } else {
+        $this->encodingMessage = pht(
+          'Unable to perform text encoding conversion: mbstring extension '.
+          'is not available.');
+      }
+    } else {
+      if (!phutil_is_utf8($content)) {
+        if (function_exists('mb_detect_encoding')) {
+          $try_encodings = array(
+            'JIS' => pht('JIS'),
+            'EUC-JP' => pht('EUC-JP'),
+            'SJIS' => pht('Shift JIS'),
+            'ISO-8859-1' => pht('ISO-8859-1 (Latin 1)'),
+          );
+
+          $guess = mb_detect_encoding($content, array_keys($try_encodings));
+          if ($guess) {
+            $content = mb_convert_encoding($content, 'UTF-8', $guess);
+            $this->encodingMessage = pht(
+              'This document is not UTF8. It was detected as %s and '.
+              'converted to UTF8 for display.',
+              idx($try_encodings, $guess, $guess));
+          }
+        }
+      }
+    }
+
+    if (!phutil_is_utf8($content)) {
+      $content = phutil_utf8ize($content);
+      $this->encodingMessage = pht(
+        'This document is not UTF8 and its text encoding could not be '.
+        'detected automatically. Use "Change Text Encoding..." to choose '.
+        'an encoding.');
+    }
+
     return $content;
   }
 
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index 3e49f35410..ccbd41ca92 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -52,6 +52,61 @@ JX.behavior('document-engine', function(config, statics) {
       });
     }
 
+    list.addItem(
+      new JX.PHUIXActionView()
+        .setDivider(true));
+
+    var encode_item = new JX.PHUIXActionView()
+      .setName(data.encode.name)
+      .setIcon(data.encode.icon);
+
+    var onencode = JX.bind(null, function(data, e) {
+      e.prevent();
+
+      if (encode_item.getDisabled()) {
+        return;
+      }
+
+      new JX.Workflow(data.encode.uri, {encoding: data.encode.value})
+        .setHandler(function(r) {
+          data.encode.value = r.encoding;
+          onview(data);
+        })
+        .start();
+
+      menu.close();
+
+    }, data);
+
+    encode_item.setHandler(onencode);
+
+    list.addItem(encode_item);
+
+    var highlight_item = new JX.PHUIXActionView()
+      .setName(data.highlight.name)
+      .setIcon(data.highlight.icon);
+
+    var onhighlight = JX.bind(null, function(data, e) {
+      e.prevent();
+
+      if (highlight_item.getDisabled()) {
+        return;
+      }
+
+      new JX.Workflow(data.highlight.uri, {highlight: data.highlight.value})
+        .setHandler(function(r) {
+          data.highlight.value = r.highlight;
+          onview(data);
+        })
+        .start();
+
+      menu.close();
+    }, data);
+
+    highlight_item.setHandler(onhighlight);
+
+    list.addItem(highlight_item);
+
     menu.setContent(list.getNode());
 
     menu.listen('open', function() {
@@ -61,6 +116,11 @@ JX.behavior('document-engine', function(config, statics) {
         // Highlight the current rendering engine.
         var is_selected = (engine.spec.viewKey == data.viewKey);
         engine.view.setSelected(is_selected);
+
+        if (is_selected) {
+          encode_item.setDisabled(!engine.spec.canEncode);
+          highlight_item.setDisabled(!engine.spec.canHighlight);
+        }
       }
     });
 
@@ -68,13 +128,38 @@ JX.behavior('document-engine', function(config, statics) {
     menu.open();
   }
 
+  function add_params(uri, data) {
+    uri = JX.$U(uri);
+
+    if (data.highlight.value) {
+      uri.setQueryParam('highlight', data.highlight.value);
+    }
+
+    if (data.encode.value) {
+      uri.setQueryParam('encode', data.encode.value);
+    }
+
+    return uri.toString();
+  }
+
   function onview(data, spec, immediate) {
+    if (!spec) {
+      for (var ii = 0; ii < data.views.length; ii++) {
+        if (data.views[ii].viewKey == data.viewKey) {
+          spec = data.views[ii];
+          break;
+        }
+      }
+    }
+
     data.sequence = (data.sequence || 0) + 1;
     var handler = JX.bind(null, onrender, data, data.sequence);
 
     data.viewKey = spec.viewKey;
 
-    new JX.Request(spec.engineURI, handler)
+    var uri = add_params(spec.engineURI, data);
+
+    new JX.Request(uri, handler)
       .send();
 
     if (data.loadingView) {
@@ -93,7 +178,9 @@ JX.behavior('document-engine', function(config, statics) {
 
       // Replace the URI with the URI for the specific rendering the user
       // has selected.
-      JX.History.replace(spec.viewURI);
+
+      var view_uri = add_params(spec.viewURI, data);
+      JX.History.replace(view_uri);
     }
   }
 
@@ -134,13 +221,7 @@ JX.behavior('document-engine', function(config, statics) {
   if (config && config.renderControlID) {
     var control = JX.$(config.renderControlID);
     var data = JX.Stratcom.getData(control);
-
-    for (var ii = 0; ii < data.views.length; ii++) {
-      if (data.views[ii].viewKey == data.viewKey) {
-        onview(data, data.views[ii], true);
-        break;
-      }
-    }
+    onview(data, null, true);
   }
 
 });
diff --git a/webroot/rsrc/js/phuix/PHUIXActionView.js b/webroot/rsrc/js/phuix/PHUIXActionView.js
index 7967fa7366..97e746c2c5 100644
--- a/webroot/rsrc/js/phuix/PHUIXActionView.js
+++ b/webroot/rsrc/js/phuix/PHUIXActionView.js
@@ -34,6 +34,10 @@ JX.install('PHUIXActionView', {
       return this;
     },
 
+    getDisabled: function() {
+      return this._disabled;
+    },
+
     setLabel: function(label) {
       this._label = label;
       JX.DOM.alterClass(

From 651f91cd544c7a9a89616db45d043216a02e6b29 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 2 Apr 2018 16:03:05 -0700
Subject: [PATCH 759/865] Fix YouTube remarkup rule being blocked by
 Content-Security-Policy header

Summary: Ref T13116. See PHI526. Currently, the YouTube remarkup rule writes an `<iframe ...>` but does not adjust the Content-Security-Policy appropriately.

Test Plan: Pasted a YouTube link; viewed it in Safari, Chrome and Firefox.

Maniphest Tasks: T13116

Differential Revision: https://secure.phabricator.com/D19277
---
 .../markup/rule/PhabricatorYoutubeRemarkupRule.php           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php b/src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php
index 25422b970d..cbf322b2d9 100644
--- a/src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php
+++ b/src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php
@@ -52,4 +52,9 @@ public function apply($text) {
     return $this->getEngine()->storeText($iframe);
   }
 
+  public function didMarkupText() {
+    CelerityAPI::getStaticResourceResponse()
+      ->addContentSecurityPolicyURI('frame-src', 'https://www.youtube.com/');
+  }
+
 }

From 95c9d403f4a3bc1b0cce8169d28f28bbd22d97c0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 04:39:48 -0700
Subject: [PATCH 760/865] Make objects implementing BuildableInterface produce
 a BuildableEngine

Summary:
Ref T13110. Currently, build status is published the same way for every Buildable by the BuildEngine.

I want to change this to delegate publishing to each Buildable, particularly so that Differential may use more detailed rules for handling builds and drafts.

Rather than add additional methods to the existing `BuildableInterface`, add an engine generator method instead. This is a pattern which has seen more use recently (e.g., in Ferret) and lets us pay a little more upfront to pull complex pieces of logic out of the main class and let them use inheritence more easily. If we had Traits that might cover this to some degree.

I'd expect to eventually reduce the size of `BuildableInterface` and move the `CircleCI` and `BuildKite` interfaces so that the `BuildableEngine` implements them instead of the main object.

Here, this new engine does nothing and is never instantiated. In upcoming changes, publishing logic will move into it so that Differential can handle publishing differently.

Test Plan: Ran `arc liberate`, loaded pages, grepped for `BuildableInterface`.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19278
---
 src/__phutil_library_map__.php                              | 6 ++++++
 .../harbormaster/DifferentialBuildableEngine.php            | 4 ++++
 src/applications/differential/storage/DifferentialDiff.php  | 4 ++++
 .../differential/storage/DifferentialRevision.php           | 4 ++++
 .../diffusion/harbormaster/DiffusionBuildableEngine.php     | 4 ++++
 .../harbormaster/engine/HarbormasterBuildableEngine.php     | 4 ++++
 .../interface/HarbormasterBuildableInterface.php            | 2 ++
 .../harbormaster/storage/HarbormasterBuildable.php          | 4 ++++
 .../repository/storage/PhabricatorRepositoryCommit.php      | 4 ++++
 9 files changed, 36 insertions(+)
 create mode 100644 src/applications/differential/harbormaster/DifferentialBuildableEngine.php
 create mode 100644 src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
 create mode 100644 src/applications/harbormaster/engine/HarbormasterBuildableEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 447d4a534e..32c80d75a1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -380,6 +380,7 @@
     'DifferentialBlockHeraldAction' => 'applications/differential/herald/DifferentialBlockHeraldAction.php',
     'DifferentialBlockingReviewerDatasource' => 'applications/differential/typeahead/DifferentialBlockingReviewerDatasource.php',
     'DifferentialBranchField' => 'applications/differential/customfield/DifferentialBranchField.php',
+    'DifferentialBuildableEngine' => 'applications/differential/harbormaster/DifferentialBuildableEngine.php',
     'DifferentialChangeDetailMailView' => 'applications/differential/mail/DifferentialChangeDetailMailView.php',
     'DifferentialChangeHeraldFieldGroup' => 'applications/differential/herald/DifferentialChangeHeraldFieldGroup.php',
     'DifferentialChangeType' => 'applications/differential/constants/DifferentialChangeType.php',
@@ -638,6 +639,7 @@
     'DiffusionBrowseQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php',
     'DiffusionBrowseResultSet' => 'applications/diffusion/data/DiffusionBrowseResultSet.php',
     'DiffusionBrowseTableView' => 'applications/diffusion/view/DiffusionBrowseTableView.php',
+    'DiffusionBuildableEngine' => 'applications/diffusion/harbormaster/DiffusionBuildableEngine.php',
     'DiffusionCacheEngineExtension' => 'applications/diffusion/engineextension/DiffusionCacheEngineExtension.php',
     'DiffusionCachedResolveRefsQuery' => 'applications/diffusion/query/DiffusionCachedResolveRefsQuery.php',
     'DiffusionChangeController' => 'applications/diffusion/controller/DiffusionChangeController.php',
@@ -1285,6 +1287,7 @@
     'HarbormasterBuildable' => 'applications/harbormaster/storage/HarbormasterBuildable.php',
     'HarbormasterBuildableActionController' => 'applications/harbormaster/controller/HarbormasterBuildableActionController.php',
     'HarbormasterBuildableAdapterInterface' => 'applications/harbormaster/herald/HarbormasterBuildableAdapterInterface.php',
+    'HarbormasterBuildableEngine' => 'applications/harbormaster/engine/HarbormasterBuildableEngine.php',
     'HarbormasterBuildableInterface' => 'applications/harbormaster/interface/HarbormasterBuildableInterface.php',
     'HarbormasterBuildableListController' => 'applications/harbormaster/controller/HarbormasterBuildableListController.php',
     'HarbormasterBuildablePHIDType' => 'applications/harbormaster/phid/HarbormasterBuildablePHIDType.php',
@@ -5586,6 +5589,7 @@
     'DifferentialBlockHeraldAction' => 'HeraldAction',
     'DifferentialBlockingReviewerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'DifferentialBranchField' => 'DifferentialCustomField',
+    'DifferentialBuildableEngine' => 'HarbormasterBuildableEngine',
     'DifferentialChangeDetailMailView' => 'DifferentialMailView',
     'DifferentialChangeHeraldFieldGroup' => 'HeraldFieldGroup',
     'DifferentialChangeType' => 'Phobject',
@@ -5883,6 +5887,7 @@
     'DiffusionBrowseQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
     'DiffusionBrowseResultSet' => 'Phobject',
     'DiffusionBrowseTableView' => 'DiffusionView',
+    'DiffusionBuildableEngine' => 'HarbormasterBuildableEngine',
     'DiffusionCacheEngineExtension' => 'PhabricatorCacheEngineExtension',
     'DiffusionCachedResolveRefsQuery' => 'DiffusionLowLevelQuery',
     'DiffusionChangeController' => 'DiffusionController',
@@ -6636,6 +6641,7 @@
       'PhabricatorDestructibleInterface',
     ),
     'HarbormasterBuildableActionController' => 'HarbormasterController',
+    'HarbormasterBuildableEngine' => 'Phobject',
     'HarbormasterBuildableListController' => 'HarbormasterController',
     'HarbormasterBuildablePHIDType' => 'PhabricatorPHIDType',
     'HarbormasterBuildableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
diff --git a/src/applications/differential/harbormaster/DifferentialBuildableEngine.php b/src/applications/differential/harbormaster/DifferentialBuildableEngine.php
new file mode 100644
index 0000000000..9ba44d9b81
--- /dev/null
+++ b/src/applications/differential/harbormaster/DifferentialBuildableEngine.php
@@ -0,0 +1,4 @@
+<?php
+
+final class DifferentialBuildableEngine
+  extends HarbormasterBuildableEngine {}
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
index 85ffccc4a3..9a352af48c 100644
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -557,6 +557,10 @@ public function getAvailableBuildVariables() {
     );
   }
 
+  public function newBuildableEngine() {
+    return new DifferentialBuildableEngine();
+  }
+
 
 /* -(  HarbormasterCircleCIBuildableInterface  )----------------------------- */
 
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 6813c124d7..45deef4616 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -800,6 +800,10 @@ public function getAvailableBuildVariables() {
     return array();
   }
 
+  public function newBuildableEngine() {
+    return new DifferentialBuildableEngine();
+  }
+
 
 /* -(  PhabricatorSubscribableInterface  )----------------------------------- */
 
diff --git a/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php b/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
new file mode 100644
index 0000000000..b0cb591b46
--- /dev/null
+++ b/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
@@ -0,0 +1,4 @@
+<?php
+
+final class DiffusionBuildableEngine
+  extends HarbormasterBuildableEngine {}
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
new file mode 100644
index 0000000000..5e35f6223e
--- /dev/null
+++ b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class HarbormasterBuildableEngine
+  extends Phobject {}
diff --git a/src/applications/harbormaster/interface/HarbormasterBuildableInterface.php b/src/applications/harbormaster/interface/HarbormasterBuildableInterface.php
index 598f2b61f0..9994baba21 100644
--- a/src/applications/harbormaster/interface/HarbormasterBuildableInterface.php
+++ b/src/applications/harbormaster/interface/HarbormasterBuildableInterface.php
@@ -36,4 +36,6 @@ public function getHarbormasterPublishablePHID();
   public function getBuildVariables();
   public function getAvailableBuildVariables();
 
+  public function newBuildableEngine();
+
 }
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
index 3a092900eb..91b24c7b7b 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -341,6 +341,10 @@ public function getAvailableBuildVariables() {
     return array();
   }
 
+  public function newBuildableEngine() {
+    return $this->getBuildableObject()->newBuildableEngine();
+  }
+
 
 /* -(  PhabricatorDestructibleInterface  )----------------------------------- */
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index b3b344312c..1bc0930e67 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -549,6 +549,10 @@ public function getAvailableBuildVariables() {
     );
   }
 
+  public function newBuildableEngine() {
+    return new DiffusionBuildableEngine();
+  }
+
 
 /* -(  HarbormasterCircleCIBuildableInterface  )----------------------------- */
 

From c20b4e365b765ee5c31e12066140451affe3141e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 05:48:40 -0700
Subject: [PATCH 761/865] Move structural build publishing logic to
 BuildEngine, provide "bin/harbormaster publish"

Summary:
Depends on D19278. Ref T13110. This moves most of the structural logic for publishing builds to BuildableEngine and provides a `bin/harbormaster publish` to make publishing easy to retry/debug.

This intentionally removes the bit which actually does anything when builds publish. Followup changes will implement application-specific versions of the publishing logic in Differential and Diffusion.

Test Plan: Ran `bin/harbormaster publish Bxxx`, saw it do nothing (but not crash).

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19279
---
 src/__phutil_library_map__.php                |  2 +
 .../engine/HarbormasterBuildEngine.php        | 83 +++++-----------
 .../engine/HarbormasterBuildableEngine.php    | 99 ++++++++++++++++++-
 .../HarbormasterManagementPublishWorkflow.php | 87 ++++++++++++++++
 4 files changed, 211 insertions(+), 60 deletions(-)
 create mode 100644 src/applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 32c80d75a1..7de5918a42 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1324,6 +1324,7 @@
     'HarbormasterLogWorker' => 'applications/harbormaster/worker/HarbormasterLogWorker.php',
     'HarbormasterManagementArchiveLogsWorkflow' => 'applications/harbormaster/management/HarbormasterManagementArchiveLogsWorkflow.php',
     'HarbormasterManagementBuildWorkflow' => 'applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php',
+    'HarbormasterManagementPublishWorkflow' => 'applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php',
     'HarbormasterManagementRebuildLogWorkflow' => 'applications/harbormaster/management/HarbormasterManagementRebuildLogWorkflow.php',
     'HarbormasterManagementRestartWorkflow' => 'applications/harbormaster/management/HarbormasterManagementRestartWorkflow.php',
     'HarbormasterManagementUpdateWorkflow' => 'applications/harbormaster/management/HarbormasterManagementUpdateWorkflow.php',
@@ -6675,6 +6676,7 @@
     'HarbormasterLogWorker' => 'HarbormasterWorker',
     'HarbormasterManagementArchiveLogsWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementBuildWorkflow' => 'HarbormasterManagementWorkflow',
+    'HarbormasterManagementPublishWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementRebuildLogWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementRestartWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementUpdateWorkflow' => 'HarbormasterManagementWorkflow',
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
index f3589bfc53..170e4c8a5c 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -489,6 +489,8 @@ public function updateBuildable(HarbormasterBuildable $buildable) {
       }
     }
 
+    $old = clone $buildable;
+
     // Don't update the buildable status if we're still preparing builds: more
     // builds may still be scheduled shortly, so even if every build we know
     // about so far has passed, that doesn't mean the buildable has actually
@@ -515,8 +517,7 @@ public function updateBuildable(HarbormasterBuildable $buildable) {
         $new_status = HarbormasterBuildableStatus::STATUS_BUILDING;
       }
 
-      $old_status = $buildable->getBuildableStatus();
-      $did_update = ($old_status != $new_status);
+      $did_update = ($old->getBuildableStatus() !== $new_status);
       if ($did_update) {
         $buildable->setBuildableStatus($new_status);
         $buildable->save();
@@ -530,81 +531,45 @@ public function updateBuildable(HarbormasterBuildable $buildable) {
       return;
     }
 
-    // If we changed the buildable status, try to post a transaction to the
-    // object about it. We can safely do this outside of the locked region.
+    $this->publishBuildable($old, $buildable);
+  }
 
-    // NOTE: We only post transactions for automatic buildables, not for
-    // manual ones: manual builds are test builds, whoever is doing tests
-    // can look at the results themselves, and other users generally don't
-    // care about the outcome.
+  public function publishBuildable(
+    HarbormasterBuildable $old,
+    HarbormasterBuildable $new) {
 
-    $should_publish =
-      ($did_update) &&
-      ($new_status != HarbormasterBuildableStatus::STATUS_BUILDING) &&
-      (!$buildable->getIsManualBuildable());
+    $viewer = $this->getViewer();
 
-    if (!$should_publish) {
-      return;
-    }
+    // Publish the buildable. We publish buildables even if they haven't
+    // changed status in Harbormaster because applications may care about
+    // different things than Harbormaster does. For example, Differential
+    // does not care about local lint and unit tests when deciding whether
+    // a revision should move out of draft or not.
+
+    // NOTE: We're publishing both automatic and manual buildables. Buildable
+    // objects should generally ignore manual buildables, but it's up to them
+    // to decide.
 
     $object = id(new PhabricatorObjectQuery())
       ->setViewer($viewer)
-      ->withPHIDs(array($buildable->getBuildablePHID()))
+      ->withPHIDs(array($new->getBuildablePHID()))
       ->executeOne();
     if (!$object) {
       return;
     }
 
-    $publish_phid = $object->getHarbormasterPublishablePHID();
-    if (!$publish_phid) {
-      return;
-    }
-
-    if ($publish_phid === $object->getPHID()) {
-      $publish = $object;
-    } else {
-      $publish = id(new PhabricatorObjectQuery())
-        ->setViewer($viewer)
-        ->withPHIDs(array($publish_phid))
-        ->executeOne();
-      if (!$publish) {
-        return;
-      }
-    }
+    $engine = HarbormasterBuildableEngine::newForObject($object, $viewer);
 
-    if (!($publish instanceof PhabricatorApplicationTransactionInterface)) {
-      return;
-    }
-
-    $template = $publish->getApplicationTransactionTemplate();
-    if (!$template) {
-      return;
-    }
-
-    $template
-      ->setTransactionType(PhabricatorTransactions::TYPE_BUILDABLE)
-      ->setMetadataValue(
-        'harbormaster:buildablePHID',
-        $buildable->getPHID())
-      ->setOldValue($old_status)
-      ->setNewValue($new_status);
+    $daemon_source = PhabricatorContentSource::newForSource(
+      PhabricatorDaemonContentSource::SOURCECONST);
 
     $harbormaster_phid = id(new PhabricatorHarbormasterApplication())
       ->getPHID();
 
-    $daemon_source = PhabricatorContentSource::newForSource(
-      PhabricatorDaemonContentSource::SOURCECONST);
-
-    $editor = $publish->getApplicationTransactionEditor()
-      ->setActor($viewer)
+    $engine
       ->setActingAsPHID($harbormaster_phid)
       ->setContentSource($daemon_source)
-      ->setContinueOnNoEffect(true)
-      ->setContinueOnMissingFields(true);
-
-    $editor->applyTransactions(
-      $publish->getApplicationTransactionObject(),
-      array($template));
+      ->publishBuildable($old, $new);
   }
 
   private function releaseAllArtifacts(HarbormasterBuild $build) {
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
index 5e35f6223e..993ca5fc6d 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
@@ -1,4 +1,101 @@
 <?php
 
 abstract class HarbormasterBuildableEngine
-  extends Phobject {}
+  extends Phobject {
+
+  private $viewer;
+  private $actingAsPHID;
+  private $contentSource;
+  private $object;
+
+  final public function setViewer(PhabricatorUser $viewer) {
+    $this->viewer = $viewer;
+    return $this;
+  }
+
+  final public function getViewer() {
+    return $this->viewer;
+  }
+
+  final public function setActingAsPHID($acting_as_phid) {
+    $this->actingAsPHID = $acting_as_phid;
+    return $this;
+  }
+
+  final public function getActingAsPHID() {
+    return $this->actingAsPHID;
+  }
+
+  final public function setContentSource(
+    PhabricatorContentSource $content_source) {
+    $this->contentSource = $content_source;
+    return $this;
+  }
+
+  final public function getContentSource() {
+    return $this->contentSource;
+  }
+
+  final public function setObject(HarbormasterBuildableInterface $object) {
+    $this->object = $object;
+    return $this;
+  }
+
+  final public function getObject() {
+    return $this->object;
+  }
+
+  final public function publishBuildable(
+    HarbormasterBuildable $old,
+    HarbormasterBuildable $new) {
+    return;
+  }
+
+  final public static function newForObject(
+    HarbormasterBuildableInterface $object,
+    PhabricatorUser $viewer) {
+    return $object->newBuildableEngine()
+      ->setViewer($viewer)
+      ->setObject($object);
+  }
+
+  final protected function newEditor() {
+    $publishable = $this->getObject();
+
+    $viewer = $this->getViewer();
+
+    $editor = $publishable->getApplicationTransactionEditor()
+      ->setActor($viewer)
+      ->setContinueOnNoEffect(true)
+      ->setContinueOnMissingFields(true);
+
+    $acting_as_phid = $this->getActingAsPHID();
+    if ($acting_as_phid !== null) {
+      $editor->setActingAsPHID($acting_as_phid);
+    }
+
+    $content_source = $this->getContentSource();
+    if ($content_source !== null) {
+      $editor->setContentSource($content_source);
+    }
+
+    return $editor;
+  }
+
+  final protected function newTransaction() {
+    $publishable = $this->getObject();
+
+    return $publishable->getApplicationTransactionTemplate();
+  }
+
+  final protected function applyTransactions(array $xactions) {
+    $publishable = $this->getObject();
+    $editor = $this->newEditor();
+
+    $editor->applyTransactions(
+      $publishable->getApplicationTransactionObject(),
+      $xactions);
+  }
+
+
+}
diff --git a/src/applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php
new file mode 100644
index 0000000000..df42d8632f
--- /dev/null
+++ b/src/applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php
@@ -0,0 +1,87 @@
+<?php
+
+final class HarbormasterManagementPublishWorkflow
+  extends HarbormasterManagementWorkflow {
+
+  protected function didConstruct() {
+    $this
+      ->setName('publish')
+      ->setExamples(pht('**publish** __buildable__ ...'))
+      ->setSynopsis(
+        pht(
+          'Publish a buildable. This is primarily useful for developing '.
+          'and debugging applications which have buildable objects.'))
+      ->setArguments(
+        array(
+          array(
+            'name' =>  'buildable',
+            'wildcard' => true,
+          ),
+        ));
+  }
+
+  public function execute(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+
+    $buildable_names = $args->getArg('buildable');
+    if (!$buildable_names) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Name one or more buildables to publish, like "B123".'));
+    }
+
+    $query = id(new PhabricatorObjectQuery())
+      ->setViewer($viewer)
+      ->withNames($buildable_names);
+
+    $query->execute();
+
+    $result_map = $query->getNamedResults();
+
+    foreach ($buildable_names as $name) {
+      if (!isset($result_map[$name])) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Argument "%s" does not name a buildable. Provide one or more '.
+            'valid buildable monograms or PHIDs.',
+            $name));
+      }
+    }
+
+    foreach ($result_map as $name => $result) {
+      if (!($result instanceof HarbormasterBuildable)) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Object "%s" is not a HarbormasterBuildable (it is a "%s"). '.
+            'Name one or more buildables to publish, like "B123".',
+            get_class($result)));
+      }
+    }
+
+    foreach ($result_map as $buildable) {
+      echo tsprintf(
+        "%s\n",
+        pht(
+          'Publishing "%s"...',
+        $buildable->getMonogram()));
+
+      // Reload the buildable to pick up builds.
+      $buildable = id(new HarbormasterBuildableQuery())
+        ->setViewer($viewer)
+        ->withIDs(array($buildable->getID()))
+        ->needBuilds(true)
+        ->executeOne();
+
+      $engine = id(new HarbormasterBuildEngine())
+        ->setViewer($viewer)
+        ->publishBuildable($buildable, $buildable);
+    }
+
+    echo tsprintf(
+      "%s\n",
+      pht('Done.'));
+
+    return 0;
+  }
+
+}

From ada0c9126cf0b57762c279ccc9674fed6bc3776d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 06:41:00 -0700
Subject: [PATCH 762/865] Provide a modular buildable transaction in Diffusion

Summary:
Depends on D19279. Ref T13110. This implements the existing publishing logic for buildables, but does so via ModularTransactions instead of a core transaction type.

Since each application is implementing build transactions independently, this removes the core type.

Next, Differential will get a similar treatment.

Test Plan: Used `bin/harbormaster publish` (with some commenting-out-guard-clauses) to publish a commit Buildable; saw unchanged feed behavior.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19280
---
 src/__phutil_library_map__.php                |  2 +
 .../harbormaster/DiffusionBuildableEngine.php | 35 ++++++-
 .../DiffusionCommitBuildableTransaction.php   | 89 +++++++++++++++++
 .../constants/HarbormasterBuildableStatus.php | 17 ++++
 .../engine/HarbormasterBuildableEngine.php    |  2 +-
 .../storage/HarbormasterBuildable.php         |  4 +
 .../constants/PhabricatorTransactions.php     |  1 -
 ...habricatorApplicationTransactionEditor.php |  7 --
 .../PhabricatorApplicationTransaction.php     | 95 -------------------
 .../storage/PhabricatorModularTransaction.php |  8 ++
 .../PhabricatorModularTransactionType.php     |  4 +
 11 files changed, 159 insertions(+), 105 deletions(-)
 create mode 100644 src/applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7de5918a42..010232a64c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -659,6 +659,7 @@
     'DiffusionCommitAutocloseHeraldField' => 'applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php',
     'DiffusionCommitBranchesController' => 'applications/diffusion/controller/DiffusionCommitBranchesController.php',
     'DiffusionCommitBranchesHeraldField' => 'applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php',
+    'DiffusionCommitBuildableTransaction' => 'applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php',
     'DiffusionCommitCommitterHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php',
     'DiffusionCommitCommitterProjectsHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php',
     'DiffusionCommitConcernTransaction' => 'applications/diffusion/xaction/DiffusionCommitConcernTransaction.php',
@@ -5908,6 +5909,7 @@
     'DiffusionCommitAutocloseHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitBranchesController' => 'DiffusionController',
     'DiffusionCommitBranchesHeraldField' => 'DiffusionCommitHeraldField',
+    'DiffusionCommitBuildableTransaction' => 'DiffusionCommitTransactionType',
     'DiffusionCommitCommitterHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitCommitterProjectsHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitConcernTransaction' => 'DiffusionCommitAuditTransaction',
diff --git a/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php b/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
index b0cb591b46..bb222df28e 100644
--- a/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
+++ b/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
@@ -1,4 +1,37 @@
 <?php
 
 final class DiffusionBuildableEngine
-  extends HarbormasterBuildableEngine {}
+  extends HarbormasterBuildableEngine {
+
+  public function publishBuildable(
+    HarbormasterBuildable $old,
+    HarbormasterBuildable $new) {
+
+    // Don't publish manual buildables.
+    if ($new->getIsManualBuildable()) {
+      return;
+    }
+
+    // Don't publish anything if the buildable status has not changed. At
+    // least for now, Diffusion handles buildable status exactly the same
+    // way that Harbormaster does.
+    $old_status = $old->getBuildableStatus();
+    $new_status = $new->getBuildableStatus();
+    if ($old_status === $new_status) {
+      return;
+    }
+
+    // Don't publish anything if the buildable is still building.
+    if ($new->isBuilding()) {
+      return;
+    }
+
+    $xaction = $this->newTransaction()
+      ->setMetadataValue('harbormaster:buildablePHID', $new->getPHID())
+      ->setTransactionType(DiffusionCommitBuildableTransaction::TRANSACTIONTYPE)
+      ->setNewValue($new->getBuildableStatus());
+
+    $this->applyTransactions(array($xaction));
+  }
+
+}
diff --git a/src/applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php
new file mode 100644
index 0000000000..91b69fa397
--- /dev/null
+++ b/src/applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php
@@ -0,0 +1,89 @@
+<?php
+
+final class DiffusionCommitBuildableTransaction
+  extends DiffusionCommitTransactionType {
+
+  // NOTE: This uses an older constant for compatibility. We should perhaps
+  // migrate these at some point.
+  const TRANSACTIONTYPE = 'harbormaster:buildable';
+
+  public function generateNewValue($object, $value) {
+    return $value;
+  }
+
+  public function generateOldValue($object) {
+    return null;
+  }
+
+  public function getIcon() {
+    return $this->newBuildableStatus()->getIcon();
+  }
+
+  public function getColor() {
+    return $this->newBuildableStatus()->getColor();
+  }
+
+  public function getActionName() {
+    return $this->newBuildableStatus()->getActionName();
+  }
+
+  public function shouldHideForFeed() {
+    return !$this->newBuildableStatus()->isFailed();
+  }
+
+  public function shouldHideForMail() {
+    return !$this->newBuildableStatus()->isFailed();
+  }
+
+  public function getTitle() {
+    $new = $this->getNewValue();
+    $buildable_phid = $this->getBuildablePHID();
+
+    switch ($new) {
+      case HarbormasterBuildableStatus::STATUS_PASSED:
+        return pht(
+          '%s completed building %s.',
+          $this->renderAuthor(),
+          $this->renderHandle($buildable_phid));
+      case HarbormasterBuildableStatus::STATUS_FAILED:
+        return pht(
+          '%s failed to build %s!',
+          $this->renderAuthor(),
+          $this->renderHandle($buildable_phid));
+    }
+
+    return null;
+  }
+
+  public function getTitleForFeed() {
+    $new = $this->getNewValue();
+    $buildable_phid = $this->getBuildablePHID();
+
+    switch ($new) {
+      case HarbormasterBuildableStatus::STATUS_PASSED:
+        return pht(
+          '%s completed building %s for %s.',
+          $this->renderAuthor(),
+          $this->renderHandle($buildable_phid),
+          $this->renderObject());
+      case HarbormasterBuildableStatus::STATUS_FAILED:
+        return pht(
+          '%s failed to build %s for %s!',
+          $this->renderAuthor(),
+          $this->renderHandle($buildable_phid),
+          $this->renderObject());
+    }
+
+    return null;
+  }
+
+  private function newBuildableStatus() {
+    $new = $this->getNewValue();
+    return HarbormasterBuildableStatus::newBuildableStatusObject($new);
+  }
+
+  private function getBuildablePHID() {
+    return $this->getMetadataValue('harbormaster:buildablePHID');
+  }
+
+}
diff --git a/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php b/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
index 7ba2379f30..d7e88ed297 100644
--- a/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
+++ b/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
@@ -39,6 +39,10 @@ public function getDisplayName() {
     return $this->getProperty('name');
   }
 
+  public function getActionName() {
+    return $this->getProperty('name.action');
+  }
+
   public function getColor() {
     return $this->getProperty('color');
   }
@@ -47,6 +51,14 @@ public function isPreparing() {
     return ($this->key === self::STATUS_PREPARING);
   }
 
+  public function isBuilding() {
+    return ($this->key === self::STATUS_BUILDING);
+  }
+
+  public function isFailed() {
+    return ($this->key === self::STATUS_FAILED);
+  }
+
   public static function getOptionMap() {
     return ipull(self::getSpecifications(), 'name');
   }
@@ -57,21 +69,25 @@ private static function getSpecifications() {
         'name' => pht('Preparing'),
         'color' => 'blue',
         'icon' => 'fa-hourglass-o',
+        'name.action' => pht('Build Preparing'),
       ),
       self::STATUS_BUILDING => array(
         'name' => pht('Building'),
         'color' => 'blue',
         'icon' => 'fa-chevron-circle-right',
+        'name.action' => pht('Build Started'),
       ),
       self::STATUS_PASSED => array(
         'name' => pht('Passed'),
         'color' => 'green',
         'icon' => 'fa-check-circle',
+        'name.action' => pht('Build Passed'),
       ),
       self::STATUS_FAILED => array(
         'name' => pht('Failed'),
         'color' => 'red',
         'icon' => 'fa-times-circle',
+        'name.action' => pht('Build Failed'),
       ),
     );
   }
@@ -86,6 +102,7 @@ private static function getSpecification($status) {
       'name' => pht('Unknown ("%s")', $status),
       'icon' => 'fa-question-circle',
       'color' => 'bluegrey',
+      'name.action' => pht('Build Status'),
     );
   }
 
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
index 993ca5fc6d..900839bb10 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
@@ -45,7 +45,7 @@ final public function getObject() {
     return $this->object;
   }
 
-  final public function publishBuildable(
+  public function publishBuildable(
     HarbormasterBuildable $old,
     HarbormasterBuildable $new) {
     return;
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
index 91b24c7b7b..b7d7281922 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -233,6 +233,10 @@ public function isPreparing() {
     return $this->getBuildableStatusObject()->isPreparing();
   }
 
+  public function isBuilding() {
+    return $this->getBuildableStatusObject()->isBuilding();
+  }
+
 
 /* -(  Messages  )----------------------------------------------------------- */
 
diff --git a/src/applications/transactions/constants/PhabricatorTransactions.php b/src/applications/transactions/constants/PhabricatorTransactions.php
index fa3941a618..4089187ca4 100644
--- a/src/applications/transactions/constants/PhabricatorTransactions.php
+++ b/src/applications/transactions/constants/PhabricatorTransactions.php
@@ -9,7 +9,6 @@ final class PhabricatorTransactions extends Phobject {
   const TYPE_JOIN_POLICY  = 'core:join-policy';
   const TYPE_EDGE         = 'core:edge';
   const TYPE_CUSTOMFIELD  = 'core:customfield';
-  const TYPE_BUILDABLE    = 'harbormaster:buildable';
   const TYPE_TOKEN        = 'token:give';
   const TYPE_INLINESTATE  = 'core:inlinestate';
   const TYPE_SPACE = 'core:space';
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index e4a13de54e..70644b1974 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -313,10 +313,6 @@ public function getTransactionTypes() {
       $types[] = PhabricatorTransactions::TYPE_CUSTOMFIELD;
     }
 
-    if ($this->object instanceof HarbormasterBuildableInterface) {
-      $types[] = PhabricatorTransactions::TYPE_BUILDABLE;
-    }
-
     if ($this->object instanceof PhabricatorTokenReceiverInterface) {
       $types[] = PhabricatorTransactions::TYPE_TOKEN;
     }
@@ -469,7 +465,6 @@ private function getTransactionNewValue(
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
-      case PhabricatorTransactions::TYPE_BUILDABLE:
       case PhabricatorTransactions::TYPE_TOKEN:
       case PhabricatorTransactions::TYPE_INLINESTATE:
       case PhabricatorTransactions::TYPE_SUBTYPE:
@@ -610,7 +605,6 @@ private function applyInternalEffects(
         return $field->applyApplicationTransactionInternalEffects($xaction);
       case PhabricatorTransactions::TYPE_CREATE:
       case PhabricatorTransactions::TYPE_SUBTYPE:
-      case PhabricatorTransactions::TYPE_BUILDABLE:
       case PhabricatorTransactions::TYPE_TOKEN:
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
@@ -673,7 +667,6 @@ private function applyExternalEffects(
       case PhabricatorTransactions::TYPE_CREATE:
       case PhabricatorTransactions::TYPE_SUBTYPE:
       case PhabricatorTransactions::TYPE_EDGE:
-      case PhabricatorTransactions::TYPE_BUILDABLE:
       case PhabricatorTransactions::TYPE_TOKEN:
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index 3a7eead5cf..69d11fe753 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -54,7 +54,6 @@ public function getIgnoreOnNoEffect() {
 
   public function shouldGenerateOldValue() {
     switch ($this->getTransactionType()) {
-      case PhabricatorTransactions::TYPE_BUILDABLE:
       case PhabricatorTransactions::TYPE_TOKEN:
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
       case PhabricatorTransactions::TYPE_INLINESTATE:
@@ -339,12 +338,6 @@ public function getRequiredHandlePHIDs() {
         break;
       case PhabricatorTransactions::TYPE_TOKEN:
         break;
-      case PhabricatorTransactions::TYPE_BUILDABLE:
-        $phid = $this->getMetadataValue('harbormaster:buildablePHID');
-        if ($phid) {
-          $phids[] = array($phid);
-        }
-        break;
     }
 
     if ($this->getComment()) {
@@ -470,8 +463,6 @@ public function getIcon() {
             return 'fa-ambulance';
         }
         return 'fa-link';
-      case PhabricatorTransactions::TYPE_BUILDABLE:
-        return 'fa-wrench';
       case PhabricatorTransactions::TYPE_TOKEN:
         return 'fa-trophy';
       case PhabricatorTransactions::TYPE_SPACE:
@@ -515,14 +506,6 @@ public function getColor() {
             return 'sky';
         }
         break;
-      case PhabricatorTransactions::TYPE_BUILDABLE:
-        switch ($this->getNewValue()) {
-          case HarbormasterBuildableStatus::STATUS_PASSED:
-            return 'green';
-          case HarbormasterBuildableStatus::STATUS_FAILED:
-            return 'red';
-        }
-        break;
     }
     return null;
   }
@@ -679,15 +662,6 @@ public function shouldHideForMail(array $xactions) {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_TOKEN:
         return true;
-      case PhabricatorTransactions::TYPE_BUILDABLE:
-        switch ($this->getNewValue()) {
-          case HarbormasterBuildableStatus::STATUS_FAILED:
-            // For now, only ever send mail when builds fail. We might let
-            // you customize this later, but in most cases this is probably
-            // completely uninteresting.
-            return false;
-        }
-        return true;
      case PhabricatorTransactions::TYPE_EDGE:
         $edge_type = $this->getMetadataValue('edge:type');
         switch ($edge_type) {
@@ -742,16 +716,6 @@ public function shouldHideForFeed() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_TOKEN:
         return true;
-      case PhabricatorTransactions::TYPE_BUILDABLE:
-        switch ($this->getNewValue()) {
-          case HarbormasterBuildableStatus::STATUS_FAILED:
-            // For now, don't notify on build passes either. These are pretty
-            // high volume and annoying, with very little present value. We
-            // might want to turn them back on in the specific case of
-            // build successes on the current document?
-            return false;
-        }
-        return true;
      case PhabricatorTransactions::TYPE_EDGE:
         $edge_type = $this->getMetadataValue('edge:type');
         switch ($edge_type) {
@@ -1027,30 +991,6 @@ public function getTitle() {
             $this->renderHandleLink($author_phid));
         }
 
-      case PhabricatorTransactions::TYPE_BUILDABLE:
-        switch ($this->getNewValue()) {
-          case HarbormasterBuildableStatus::STATUS_BUILDING:
-            return pht(
-              '%s started building %s.',
-              $this->renderHandleLink($author_phid),
-              $this->renderHandleLink(
-                $this->getMetadataValue('harbormaster:buildablePHID')));
-          case HarbormasterBuildableStatus::STATUS_PASSED:
-            return pht(
-              '%s completed building %s.',
-              $this->renderHandleLink($author_phid),
-              $this->renderHandleLink(
-                $this->getMetadataValue('harbormaster:buildablePHID')));
-          case HarbormasterBuildableStatus::STATUS_FAILED:
-            return pht(
-              '%s failed to build %s!',
-              $this->renderHandleLink($author_phid),
-              $this->renderHandleLink(
-                $this->getMetadataValue('harbormaster:buildablePHID')));
-          default:
-            return null;
-        }
-
       case PhabricatorTransactions::TYPE_INLINESTATE:
         $done = 0;
         $undone = 0;
@@ -1239,32 +1179,6 @@ public function getTitleForFeed() {
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid));
         }
-      case PhabricatorTransactions::TYPE_BUILDABLE:
-        switch ($this->getNewValue()) {
-          case HarbormasterBuildableStatus::STATUS_BUILDING:
-            return pht(
-              '%s started building %s for %s.',
-              $this->renderHandleLink($author_phid),
-              $this->renderHandleLink(
-                $this->getMetadataValue('harbormaster:buildablePHID')),
-              $this->renderHandleLink($object_phid));
-          case HarbormasterBuildableStatus::STATUS_PASSED:
-            return pht(
-              '%s completed building %s for %s.',
-              $this->renderHandleLink($author_phid),
-              $this->renderHandleLink(
-                $this->getMetadataValue('harbormaster:buildablePHID')),
-              $this->renderHandleLink($object_phid));
-          case HarbormasterBuildableStatus::STATUS_FAILED:
-            return pht(
-              '%s failed to build %s for %s.',
-              $this->renderHandleLink($author_phid),
-              $this->renderHandleLink(
-                $this->getMetadataValue('harbormaster:buildablePHID')),
-              $this->renderHandleLink($object_phid));
-          default:
-            return null;
-        }
 
       case PhabricatorTransactions::TYPE_COLUMNS:
         $moves = $this->getInterestingMoves($new);
@@ -1421,15 +1335,6 @@ public function getActionName() {
         return pht('Changed Policy');
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         return pht('Changed Subscribers');
-      case PhabricatorTransactions::TYPE_BUILDABLE:
-        switch ($this->getNewValue()) {
-          case HarbormasterBuildableStatus::STATUS_PASSED:
-            return pht('Build Passed');
-          case HarbormasterBuildableStatus::STATUS_FAILED:
-            return pht('Build Failed');
-          default:
-            return pht('Build Status');
-        }
       default:
         return pht('Updated');
     }
diff --git a/src/applications/transactions/storage/PhabricatorModularTransaction.php b/src/applications/transactions/storage/PhabricatorModularTransaction.php
index fff2b842d1..4546dbf1a3 100644
--- a/src/applications/transactions/storage/PhabricatorModularTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransaction.php
@@ -100,6 +100,14 @@ final public function shouldHideForFeed() {
     return parent::shouldHideForFeed();
   }
 
+  /* final */ public function shouldHideForMail(array $xactions) {
+    if ($this->getTransactionImplementation()->shouldHideForMail()) {
+      return true;
+    }
+
+    return parent::shouldHideForMail($xactions);
+  }
+
   /* final */ public function getIcon() {
     $icon = $this->getTransactionImplementation()->getIcon();
     if ($icon !== null) {
diff --git a/src/applications/transactions/storage/PhabricatorModularTransactionType.php b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
index d93831affc..eaf7d029ce 100644
--- a/src/applications/transactions/storage/PhabricatorModularTransactionType.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
@@ -51,6 +51,10 @@ public function shouldHideForFeed() {
     return false;
   }
 
+  public function shouldHideForMail() {
+    return false;
+  }
+
   public function getIcon() {
     return null;
   }

From 51461f18c15b8fdf53edbc903db63f4447976b5c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 07:25:10 -0700
Subject: [PATCH 763/865] When publishing buildables in Differential, ignore
 autobuilds (local lint and unit)

Summary:
Depends on D19280. Ref T13110. Although Harbormaster cares about all builds, Differential does not practically care about local lint and unit results in determining build status.

In Differential, orient publishing around "remote builds" instead of "builds".

This does not yet change any of the draft logic, it just makes the timeline story use newer logic.

Test Plan: Used `bin/harbormaster publish` (with some guard-clause removal) to publish some buildables to revisions without anything crashing.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19281
---
 src/__phutil_library_map__.php                |  2 +
 .../DifferentialBuildableEngine.php           | 55 ++++++++++-
 .../differential/storage/DifferentialDiff.php |  4 -
 .../storage/DifferentialRevision.php          | 77 ++++++++++++++-
 ...fferentialRevisionBuildableTransaction.php | 93 +++++++++++++++++++
 .../engine/HarbormasterBuildableEngine.php    | 10 +-
 .../HarbormasterBuildableInterface.php        | 15 ---
 .../storage/HarbormasterBuildable.php         |  4 -
 .../storage/PhabricatorRepositoryCommit.php   |  4 -
 9 files changed, 229 insertions(+), 35 deletions(-)
 create mode 100644 src/applications/differential/xaction/DifferentialRevisionBuildableTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 010232a64c..80279c40fc 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -530,6 +530,7 @@
     'DifferentialRevisionAffectedFilesHeraldField' => 'applications/differential/herald/DifferentialRevisionAffectedFilesHeraldField.php',
     'DifferentialRevisionAuthorHeraldField' => 'applications/differential/herald/DifferentialRevisionAuthorHeraldField.php',
     'DifferentialRevisionAuthorProjectsHeraldField' => 'applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php',
+    'DifferentialRevisionBuildableTransaction' => 'applications/differential/xaction/DifferentialRevisionBuildableTransaction.php',
     'DifferentialRevisionCloseDetailsController' => 'applications/differential/controller/DifferentialRevisionCloseDetailsController.php',
     'DifferentialRevisionCloseTransaction' => 'applications/differential/xaction/DifferentialRevisionCloseTransaction.php',
     'DifferentialRevisionClosedStatusDatasource' => 'applications/differential/typeahead/DifferentialRevisionClosedStatusDatasource.php',
@@ -5780,6 +5781,7 @@
     'DifferentialRevisionAffectedFilesHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionAuthorHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionAuthorProjectsHeraldField' => 'DifferentialRevisionHeraldField',
+    'DifferentialRevisionBuildableTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionCloseDetailsController' => 'DifferentialController',
     'DifferentialRevisionCloseTransaction' => 'DifferentialRevisionActionTransaction',
     'DifferentialRevisionClosedStatusDatasource' => 'PhabricatorTypeaheadDatasource',
diff --git a/src/applications/differential/harbormaster/DifferentialBuildableEngine.php b/src/applications/differential/harbormaster/DifferentialBuildableEngine.php
index 9ba44d9b81..df38885edf 100644
--- a/src/applications/differential/harbormaster/DifferentialBuildableEngine.php
+++ b/src/applications/differential/harbormaster/DifferentialBuildableEngine.php
@@ -1,4 +1,57 @@
 <?php
 
 final class DifferentialBuildableEngine
-  extends HarbormasterBuildableEngine {}
+  extends HarbormasterBuildableEngine {
+
+  protected function getPublishableObject() {
+    $object = $this->getObject();
+
+    if ($object instanceof DifferentialDiff) {
+      return $object->getRevision();
+    }
+
+    return $object;
+  }
+
+  public function publishBuildable(
+    HarbormasterBuildable $old,
+    HarbormasterBuildable $new) {
+
+    // If we're publishing to a diff that is not actually attached to a
+    // revision, we have nothing to publish to, so just bail out.
+    $revision = $this->getPublishableObject();
+    if (!$revision) {
+      return;
+    }
+
+    // Don't publish manual buildables.
+    if ($new->getIsManualBuildable()) {
+      return;
+    }
+
+    // Don't publish anything if the buildable is still building. Differential
+    // treats more buildables as "building" than Harbormaster does, but the
+    // Differential definition is a superset of the Harbormaster definition.
+    if ($new->isBuilding()) {
+      return;
+    }
+
+    $viewer = $this->getViewer();
+
+    $old_status = $revision->getBuildableStatus($new->getPHID());
+    $new_status = $revision->newBuildableStatus($viewer, $new->getPHID());
+    if ($old_status === $new_status) {
+      return;
+    }
+
+    $buildable_type = DifferentialRevisionBuildableTransaction::TRANSACTIONTYPE;
+
+    $xaction = $this->newTransaction()
+      ->setMetadataValue('harbormaster:buildablePHID', $new->getPHID())
+      ->setTransactionType($buildable_type)
+      ->setNewValue($new_status);
+
+    $this->applyTransactions(array($xaction));
+  }
+
+}
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
index 9a352af48c..728ec4b538 100644
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -509,10 +509,6 @@ public function getHarbormasterContainerPHID() {
     return null;
   }
 
-  public function getHarbormasterPublishablePHID() {
-    return $this->getHarbormasterContainerPHID();
-  }
-
   public function getBuildVariables() {
     $results = array();
 
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 45deef4616..446d180018 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -62,6 +62,7 @@ final class DifferentialRevision extends DifferentialDAO
   const PROPERTY_HAS_BROADCAST = 'draft.broadcast';
   const PROPERTY_LINES_ADDED = 'lines.added';
   const PROPERTY_LINES_REMOVED = 'lines.removed';
+  const PROPERTY_BUILDABLES = 'buildables';
 
   public static function initializeNewRevision(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
@@ -740,6 +741,78 @@ public function getRemovedLineCount() {
     return $this->getProperty(self::PROPERTY_LINES_REMOVED);
   }
 
+
+  public function getBuildableStatus($phid) {
+    $buildables = $this->getProperty(self::PROPERTY_BUILDABLES);
+    if (!is_array($buildables)) {
+      $buildables = array();
+    }
+
+    $buildable = idx($buildables, $phid);
+    if (!is_array($buildable)) {
+      $buildable = array();
+    }
+
+    return idx($buildable, 'status');
+  }
+
+  public function setBuildableStatus($phid, $status) {
+    $buildables = $this->getProperty(self::PROPERTY_BUILDABLES);
+    if (!is_array($buildables)) {
+      $buildables = array();
+    }
+
+    $buildable = idx($buildables, $phid);
+    if (!is_array($buildable)) {
+      $buildable = array();
+    }
+
+    $buildable['status'] = $status;
+
+    $buildables[$phid] = $buildable;
+
+    return $this->setProperty(self::PROPERTY_BUILDABLES, $buildables);
+  }
+
+  public function newBuildableStatus(PhabricatorUser $viewer, $phid) {
+    // For Differential, we're ignoring autobuilds (local lint and unit)
+    // when computing build status. Differential only cares about remote
+    // builds when making publishing and undrafting decisions.
+
+    $builds = id(new HarbormasterBuildQuery())
+      ->setViewer($viewer)
+      ->withBuildablePHIDs(array($phid))
+      ->withAutobuilds(false)
+      ->withBuildStatuses(
+        array(
+          HarbormasterBuildStatus::STATUS_INACTIVE,
+          HarbormasterBuildStatus::STATUS_PENDING,
+          HarbormasterBuildStatus::STATUS_BUILDING,
+          HarbormasterBuildStatus::STATUS_FAILED,
+          HarbormasterBuildStatus::STATUS_ABORTED,
+          HarbormasterBuildStatus::STATUS_ERROR,
+          HarbormasterBuildStatus::STATUS_PAUSED,
+          HarbormasterBuildStatus::STATUS_DEADLOCKED,
+        ))
+      ->execute();
+
+    // If we have nothing but passing builds, the buildable passes.
+    if (!$builds) {
+      return HarbormasterBuildableStatus::STATUS_PASSED;
+    }
+
+    // If we have any completed, non-passing builds, the buildable fails.
+    foreach ($builds as $build) {
+      $status = $build->getBuildStatusObject();
+      if ($status->isComplete()) {
+        return HarbormasterBuildableStatus::STATUS_FAILED;
+      }
+    }
+
+    // Otherwise, we're still waiting for the build to pass or fail.
+    return null;
+  }
+
   public function loadActiveBuilds(PhabricatorUser $viewer) {
     $diff = $this->getActiveDiff();
 
@@ -788,10 +861,6 @@ public function getHarbormasterContainerPHID() {
     return $this->getPHID();
   }
 
-  public function getHarbormasterPublishablePHID() {
-    return $this->getPHID();
-  }
-
   public function getBuildVariables() {
     return array();
   }
diff --git a/src/applications/differential/xaction/DifferentialRevisionBuildableTransaction.php b/src/applications/differential/xaction/DifferentialRevisionBuildableTransaction.php
new file mode 100644
index 0000000000..3c4eaff729
--- /dev/null
+++ b/src/applications/differential/xaction/DifferentialRevisionBuildableTransaction.php
@@ -0,0 +1,93 @@
+<?php
+
+final class DifferentialRevisionBuildableTransaction
+  extends DifferentialRevisionTransactionType {
+
+  // NOTE: This uses an older constant for compatibility. We should perhaps
+  // migrate these at some point.
+  const TRANSACTIONTYPE = 'harbormaster:buildable';
+
+  public function generateNewValue($object, $value) {
+    return $value;
+  }
+
+  public function generateOldValue($object) {
+    return $object->getBuildableStatus($this->getBuildablePHID());
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setBuildableStatus($this->getBuildablePHID(), $value);
+  }
+
+  public function getIcon() {
+    return $this->newBuildableStatus()->getIcon();
+  }
+
+  public function getColor() {
+    return $this->newBuildableStatus()->getColor();
+  }
+
+  public function getActionName() {
+    return $this->newBuildableStatus()->getActionName();
+  }
+
+  public function shouldHideForFeed() {
+    return !$this->newBuildableStatus()->isFailed();
+  }
+
+  public function shouldHideForMail() {
+    return !$this->newBuildableStatus()->isFailed();
+  }
+
+  public function getTitle() {
+    $new = $this->getNewValue();
+    $buildable_phid = $this->getBuildablePHID();
+
+    switch ($new) {
+      case HarbormasterBuildableStatus::STATUS_PASSED:
+        return pht(
+          '%s completed remote builds in %s.',
+          $this->renderAuthor(),
+          $this->renderHandle($buildable_phid));
+      case HarbormasterBuildableStatus::STATUS_FAILED:
+        return pht(
+          '%s failed remote builds in %s!',
+          $this->renderAuthor(),
+          $this->renderHandle($buildable_phid));
+    }
+
+    return null;
+  }
+
+  public function getTitleForFeed() {
+    $new = $this->getNewValue();
+    $buildable_phid = $this->getBuildablePHID();
+
+    switch ($new) {
+      case HarbormasterBuildableStatus::STATUS_PASSED:
+        return pht(
+          '%s completed remote builds in %s for %s.',
+          $this->renderAuthor(),
+          $this->renderHandle($buildable_phid),
+          $this->renderObject());
+      case HarbormasterBuildableStatus::STATUS_FAILED:
+        return pht(
+          '%s failed remote builds in %s for %s!',
+          $this->renderAuthor(),
+          $this->renderHandle($buildable_phid),
+          $this->renderObject());
+    }
+
+    return null;
+  }
+
+  private function newBuildableStatus() {
+    $new = $this->getNewValue();
+    return HarbormasterBuildableStatus::newBuildableStatusObject($new);
+  }
+
+  private function getBuildablePHID() {
+    return $this->getMetadataValue('harbormaster:buildablePHID');
+  }
+
+}
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
index 900839bb10..41d31673d1 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
@@ -45,6 +45,10 @@ final public function getObject() {
     return $this->object;
   }
 
+  protected function getPublishableObject() {
+    return $this->getObject();
+  }
+
   public function publishBuildable(
     HarbormasterBuildable $old,
     HarbormasterBuildable $new) {
@@ -60,7 +64,7 @@ final public static function newForObject(
   }
 
   final protected function newEditor() {
-    $publishable = $this->getObject();
+    $publishable = $this->getPublishableObject();
 
     $viewer = $this->getViewer();
 
@@ -83,13 +87,13 @@ final protected function newEditor() {
   }
 
   final protected function newTransaction() {
-    $publishable = $this->getObject();
+    $publishable = $this->getPublishableObject();
 
     return $publishable->getApplicationTransactionTemplate();
   }
 
   final protected function applyTransactions(array $xactions) {
-    $publishable = $this->getObject();
+    $publishable = $this->getPublishableObject();
     $editor = $this->newEditor();
 
     $editor->applyTransactions(
diff --git a/src/applications/harbormaster/interface/HarbormasterBuildableInterface.php b/src/applications/harbormaster/interface/HarbormasterBuildableInterface.php
index 9994baba21..72ddf6ac99 100644
--- a/src/applications/harbormaster/interface/HarbormasterBuildableInterface.php
+++ b/src/applications/harbormaster/interface/HarbormasterBuildableInterface.php
@@ -18,21 +18,6 @@ public function getHarbormasterBuildableDisplayPHID();
   public function getHarbormasterBuildablePHID();
   public function getHarbormasterContainerPHID();
 
-
-  /**
-   * Get the object PHID which build status should be published to.
-   *
-   * In some cases (like commits), this is the object itself. In other cases,
-   * it is a different object: for example, diffs publish builds to revisions.
-   *
-   * This method can return `null` to disable publishing.
-   *
-   * @return phid|null Build status updates will be published to this object's
-   *  transaction timeline.
-   */
-  public function getHarbormasterPublishablePHID();
-
-
   public function getBuildVariables();
   public function getAvailableBuildVariables();
 
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
index b7d7281922..7d4f2e7c83 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -333,10 +333,6 @@ public function getHarbormasterContainerPHID() {
     return $this->getContainerPHID();
   }
 
-  public function getHarbormasterPublishablePHID() {
-    return $this->getBuildableObject()->getHarbormasterPublishablePHID();
-  }
-
   public function getBuildVariables() {
     return array();
   }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 1bc0930e67..f6e6e22c3a 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -517,10 +517,6 @@ public function getHarbormasterContainerPHID() {
     return $this->getRepository()->getPHID();
   }
 
-  public function getHarbormasterPublishablePHID() {
-    return $this->getPHID();
-  }
-
   public function getBuildVariables() {
     $results = array();
 

From f350b9e4646bd13a79a63524f137e1609bea8177 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 07:54:27 -0700
Subject: [PATCH 764/865] Explicitly condition Differential draft promotion on
 only "impactful" builds

Summary:
Depends on D19281. This increases consistency between build timeline publishing and revision draft promotion.

There's no real behavioral change here (switching how publishing worked already changed the beahvior) but this sends more callsites down the same code paths.

Since the builds we're looking at include completed builds, change the term "active" to "impactful". This describes the same set of builds, but hopefully describes them more accurately.

Test Plan: Created a local revision, saw it plausibly interact with draft status and promote. There are a lot of moving parts here and some stuff may well have slipped through.

Differential Revision: https://secure.phabricator.com/D19282
---
 .../customfield/DifferentialDraftField.php    |  2 +-
 .../editor/DifferentialTransactionEditor.php  | 23 ++++++-----
 .../storage/DifferentialRevision.php          | 39 +++++++++----------
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/applications/differential/customfield/DifferentialDraftField.php b/src/applications/differential/customfield/DifferentialDraftField.php
index 8147708bca..70f7291148 100644
--- a/src/applications/differential/customfield/DifferentialDraftField.php
+++ b/src/applications/differential/customfield/DifferentialDraftField.php
@@ -58,7 +58,7 @@ public function getWarningsForRevisionHeader(array $handles) {
     );
     $blocking_map = array_fuse($blocking_map);
 
-    $builds = $revision->loadActiveBuilds($viewer);
+    $builds = $revision->loadImpactfulBuilds($viewer);
 
     $waiting = array();
     $blocking = array();
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 9882246608..ccd83892db 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1539,8 +1539,12 @@ protected function didApplyTransactions($object, array $xactions) {
     }
 
     if ($object->isDraft() && $auto_undraft) {
-      $active_builds = $this->hasActiveBuilds($object);
-      if (!$active_builds) {
+      $status = $this->loadCompletedBuildableStatus($object);
+
+      $is_passed = ($status === HarbormasterBuildableStatus::STATUS_PASSED);
+      $is_failed = ($status === HarbormasterBuildableStatus::STATUS_FAILED);
+
+      if ($is_passed) {
         // When Harbormaster moves a revision out of the draft state, we
         // attribute the action to the revision author since this is more
         // natural and more useful.
@@ -1572,6 +1576,9 @@ protected function didApplyTransactions($object, array $xactions) {
         // batch of transactions finishes so that Herald can fire on the new
         // revision state. See T13027 for discussion.
         $this->queueTransaction($xaction);
+      } else if ($is_failed) {
+        // TODO: Change to "Changes Planned + Draft", notify the author (only)
+        // of the build failure.
       }
     }
 
@@ -1604,15 +1611,11 @@ protected function didApplyTransactions($object, array $xactions) {
     return $xactions;
   }
 
-  private function hasActiveBuilds($object) {
+  private function loadCompletedBuildableStatus(
+    DifferentialRevision $revision) {
     $viewer = $this->requireActor();
-
-    $builds = $object->loadActiveBuilds($viewer);
-    if (!$builds) {
-      return false;
-    }
-
-    return true;
+    $builds = $revision->loadImpactfulBuilds($viewer);
+    return $revision->newBuildableStatusForBuilds($builds);
   }
 
   private function requireReviewers(DifferentialRevision $revision) {
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 446d180018..05b82ed089 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -779,23 +779,14 @@ public function newBuildableStatus(PhabricatorUser $viewer, $phid) {
     // when computing build status. Differential only cares about remote
     // builds when making publishing and undrafting decisions.
 
-    $builds = id(new HarbormasterBuildQuery())
-      ->setViewer($viewer)
-      ->withBuildablePHIDs(array($phid))
-      ->withAutobuilds(false)
-      ->withBuildStatuses(
-        array(
-          HarbormasterBuildStatus::STATUS_INACTIVE,
-          HarbormasterBuildStatus::STATUS_PENDING,
-          HarbormasterBuildStatus::STATUS_BUILDING,
-          HarbormasterBuildStatus::STATUS_FAILED,
-          HarbormasterBuildStatus::STATUS_ABORTED,
-          HarbormasterBuildStatus::STATUS_ERROR,
-          HarbormasterBuildStatus::STATUS_PAUSED,
-          HarbormasterBuildStatus::STATUS_DEADLOCKED,
-        ))
-      ->execute();
+    $builds = $this->loadImpactfulBuildsForBuildablePHIDs(
+      $viewer,
+      array($phid));
+
+    return $this->newBuildableStatusForBuilds($builds);
+  }
 
+  public function newBuildableStatusForBuilds(array $builds) {
     // If we have nothing but passing builds, the buildable passes.
     if (!$builds) {
       return HarbormasterBuildableStatus::STATUS_PASSED;
@@ -803,8 +794,7 @@ public function newBuildableStatus(PhabricatorUser $viewer, $phid) {
 
     // If we have any completed, non-passing builds, the buildable fails.
     foreach ($builds as $build) {
-      $status = $build->getBuildStatusObject();
-      if ($status->isComplete()) {
+      if ($build->isComplete()) {
         return HarbormasterBuildableStatus::STATUS_FAILED;
       }
     }
@@ -813,7 +803,7 @@ public function newBuildableStatus(PhabricatorUser $viewer, $phid) {
     return null;
   }
 
-  public function loadActiveBuilds(PhabricatorUser $viewer) {
+  public function loadImpactfulBuilds(PhabricatorUser $viewer) {
     $diff = $this->getActiveDiff();
 
     // NOTE: We can't use `withContainerPHIDs()` here because the container
@@ -827,9 +817,18 @@ public function loadActiveBuilds(PhabricatorUser $viewer) {
       return array();
     }
 
+    return $this->loadImpactfulBuildsForBuildablePHIDs(
+      $viewer,
+      mpull($buildables, 'getPHID'));
+  }
+
+  private function loadImpactfulBuildsForBuildablePHIDs(
+    PhabricatorUser $viewer,
+    array $phids) {
+
     return id(new HarbormasterBuildQuery())
       ->setViewer($viewer)
-      ->withBuildablePHIDs(mpull($buildables, 'getPHID'))
+      ->withBuildablePHIDs($phids)
       ->withAutobuilds(false)
       ->withBuildStatuses(
         array(

From 3b5a7d1c88c4bb297de68e694641c3da8a94a5e9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 08:09:02 -0700
Subject: [PATCH 765/865] Rename the Differential "hasBroadcast" flag to
 "shouldBroadcast"

Summary:
Depends on D19282. Ref T13110. I want to introduce "Changes Planned + Still A Draft" and "Abandoned + Still A Draft" states, at a minimum.

I think the "hasBroadcast" flag is effectively identical to a hypothetical "stillADraft" flag, so rename it to "shouldBroadcast" to better match its intended behavior.

This just changes labels, not any behavior.

Test Plan: Grepped for `hasBroadcast` and `HAS_BROADCAST`.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19283
---
 .../editor/DifferentialTransactionEditor.php         |  4 ++--
 .../differential/storage/DifferentialRevision.php    | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index ccd83892db..4c9b29c2ed 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1597,13 +1597,13 @@ protected function didApplyTransactions($object, array $xactions) {
     $was_draft = $this->wasDraft;
 
     if (!$object->isDraft() && ($was_draft || $is_new)) {
-      if (!$object->getHasBroadcast()) {
+      if (!$object->getShouldBroadcast()) {
         // Mark this as the first broadcast we're sending about the revision
         // so mail can generate specially.
         $this->firstBroadcast = true;
 
         $object
-          ->setHasBroadcast(true)
+          ->setShouldBroadcast(true)
           ->save();
       }
     }
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 05b82ed089..73d8def6d7 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -59,7 +59,7 @@ final class DifferentialRevision extends DifferentialDAO
 
   const PROPERTY_CLOSED_FROM_ACCEPTED = 'wasAcceptedBeforeClose';
   const PROPERTY_DRAFT_HOLD = 'draft.hold';
-  const PROPERTY_HAS_BROADCAST = 'draft.broadcast';
+  const PROPERTY_SHOULD_BROADCAST = 'draft.broadcast';
   const PROPERTY_LINES_ADDED = 'lines.added';
   const PROPERTY_LINES_REMOVED = 'lines.removed';
   const PROPERTY_BUILDABLES = 'buildables';
@@ -717,12 +717,14 @@ public function setHoldAsDraft($hold) {
     return $this->setProperty(self::PROPERTY_DRAFT_HOLD, $hold);
   }
 
-  public function getHasBroadcast() {
-    return $this->getProperty(self::PROPERTY_HAS_BROADCAST, false);
+  public function getShouldBroadcast() {
+    return $this->getProperty(self::PROPERTY_SHOULD_BROADCAST, false);
   }
 
-  public function setHasBroadcast($has_broadcast) {
-    return $this->setProperty(self::PROPERTY_HAS_BROADCAST, $has_broadcast);
+  public function setShouldBroadcast($should_broadcast) {
+    return $this->setProperty(
+      self::PROPERTY_SHOULD_BROADCAST,
+      $should_broadcast);
   }
 
   public function setAddedLineCount($count) {

From 38e788c99a788a3bafd1b0ed8c05eae0c3cd319d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 08:15:05 -0700
Subject: [PATCH 766/865] Partially decouple revision broadcasting from
 revision draft state

Summary:
Depends on D19283. Ref T13110. To enable "Changes Planned + But, Still A Draft" and "Abandoned + But, Never Promoted From Draft" states, decouple the "broadcast" flag from the "draft" state.

Broadcast behavior is now based only on the `shouldBroadcast` flag, and revisions in any state may have this flag.

Revisions gain this flag when created as a non-draft, or when they leave the draft state for the first time.

There are probably still some ways you can get the wrong result here -- maybe abandon + update -- but those can be cleaned up as they arise.

Test Plan: Kinda poked it a bit but I'll vet this more heavily at the end of this sequence.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19284
---
 .../editor/DifferentialTransactionEditor.php       | 14 +++++---------
 .../differential/storage/DifferentialRevision.php  |  5 ++++-
 ...ifferentialRevisionRequestReviewTransaction.php |  4 +++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 4c9b29c2ed..3bdbc11c7b 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -10,7 +10,7 @@ final class DifferentialTransactionEditor
   private $hasReviewTransaction = false;
   private $affectedPaths;
   private $firstBroadcast = false;
-  private $wasDraft = false;
+  private $wasBroadcasting;
 
   public function getEditorApplicationClass() {
     return 'PhabricatorDifferentialApplication';
@@ -137,7 +137,7 @@ protected function expandTransactions(
       }
     }
 
-    $this->wasDraft = $object->isDraft();
+    $this->wasBroadcasting = $object->getShouldBroadcast();
 
     return parent::expandTransactions($object, $xactions);
   }
@@ -1594,17 +1594,13 @@ protected function didApplyTransactions($object, array $xactions) {
     // email so the mail gets enriched with "SUMMARY" and "TEST PLAN".
 
     $is_new = $this->getIsNewObject();
-    $was_draft = $this->wasDraft;
+    $was_broadcasting = $this->wasBroadcasting;
 
-    if (!$object->isDraft() && ($was_draft || $is_new)) {
-      if (!$object->getShouldBroadcast()) {
+    if ($object->getShouldBroadcast()) {
+      if (!$was_broadcasting || $is_new) {
         // Mark this as the first broadcast we're sending about the revision
         // so mail can generate specially.
         $this->firstBroadcast = true;
-
-        $object
-          ->setShouldBroadcast(true)
-          ->save();
       }
     }
 
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 73d8def6d7..434b3222fa 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -75,8 +75,10 @@ public static function initializeNewRevision(PhabricatorUser $actor) {
 
     if (PhabricatorEnv::getEnvConfig('phabricator.show-prototypes')) {
       $initial_state = DifferentialRevisionStatus::DRAFT;
+      $should_broadcast = false;
     } else {
       $initial_state = DifferentialRevisionStatus::NEEDS_REVIEW;
+      $should_broadcast = true;
     }
 
     return id(new DifferentialRevision())
@@ -85,7 +87,8 @@ public static function initializeNewRevision(PhabricatorUser $actor) {
       ->attachRepository(null)
       ->attachActiveDiff(null)
       ->attachReviewers(array())
-      ->setModernRevisionStatus($initial_state);
+      ->setModernRevisionStatus($initial_state)
+      ->setShouldBroadcast($should_broadcast);
   }
 
   protected function getConfiguration() {
diff --git a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
index ed0d20a0b6..08c590a9ae 100644
--- a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
@@ -37,7 +37,9 @@ public function generateOldValue($object) {
 
   public function applyInternalEffects($object, $value) {
     $status_review = DifferentialRevisionStatus::NEEDS_REVIEW;
-    $object->setModernRevisionStatus($status_review);
+    $object
+      ->setModernRevisionStatus($status_review)
+      ->setShouldBroadcast(true);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {

From 615d27c8e97f80aee373298630d5423950421408 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 08:39:13 -0700
Subject: [PATCH 767/865] Show an additional "Draft" tag on non-broadcasting
 revisions in a non-draft state

Summary:
Depends on D19284. Ref T13110. It's now possible to get a revision into a "Abandoned + But, Never Promoted From Draft" state. Show this in the header and provide the draft hint above the comment area.

Also, remove `shouldBroadcast()`. The method `getShouldBroadcast()` now has the same meaning.

Finally, migrate existing drafts to `shouldBroadcast = false` and default `shouldBroadcast` to `true`. If we don't do this, every older revision becomes a non-broadcasting revision because this flag was not explicitly set on revision creation before, only on promotion out of draft.

Test Plan: Ran migration; abandoned draft revisions and ended up in a draft + abandoned state.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19285
---
 .../20180403.draft.01.broadcast.php           | 20 +++++++++++++++++++
 .../DifferentialRevisionViewController.php    | 18 ++++++++++++++++-
 .../customfield/DifferentialDraftField.php    |  2 +-
 .../editor/DifferentialTransactionEditor.php  |  6 +++---
 .../storage/DifferentialRevision.php          | 15 +++++---------
 5 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 resources/sql/autopatches/20180403.draft.01.broadcast.php

diff --git a/resources/sql/autopatches/20180403.draft.01.broadcast.php b/resources/sql/autopatches/20180403.draft.01.broadcast.php
new file mode 100644
index 0000000000..b237894c90
--- /dev/null
+++ b/resources/sql/autopatches/20180403.draft.01.broadcast.php
@@ -0,0 +1,20 @@
+<?php
+
+$table = new DifferentialRevision();
+$conn = $table->establishConnection('w');
+
+$drafts = $table->loadAllWhere(
+  'status = %s',
+  DifferentialRevisionStatus::DRAFT);
+foreach ($drafts as $draft) {
+  $properties = $draft->getProperties();
+
+  $properties[DifferentialRevision::PROPERTY_SHOULD_BROADCAST] = false;
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET properties = %s WHERE id = %d',
+    id(new DifferentialRevision())->getTableName(),
+    phutil_json_encode($properties),
+    $draft->getID());
+}
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index d7280cb0b6..b03c4e8c4f 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -525,11 +525,27 @@ private function buildHeader(DifferentialRevision $revision) {
     $status_tag = id(new PHUITagView())
       ->setName($revision->getStatusDisplayName())
       ->setIcon($revision->getStatusIcon())
-      ->setColor($revision->getStatusIconColor())
+      ->setColor($revision->getStatusTagColor())
       ->setType(PHUITagView::TYPE_SHADE);
 
     $view->addProperty(PHUIHeaderView::PROPERTY_STATUS, $status_tag);
 
+    // If the revision is in a status other than "Draft", but not broadcasting,
+    // add an additional "Draft" tag to the header to make it clear that this
+    // revision hasn't promoted yet.
+    if (!$revision->getShouldBroadcast() && !$revision->isDraft()) {
+      $draft_status = DifferentialRevisionStatus::newForStatus(
+        DifferentialRevisionStatus::DRAFT);
+
+      $draft_tag = id(new PHUITagView())
+        ->setName($draft_status->getDisplayName())
+        ->setIcon($draft_status->getIcon())
+        ->setColor($draft_status->getTagColor())
+        ->setType(PHUITagView::TYPE_SHADE);
+
+      $view->addTag($draft_tag);
+    }
+
     return $view;
   }
 
diff --git a/src/applications/differential/customfield/DifferentialDraftField.php b/src/applications/differential/customfield/DifferentialDraftField.php
index 70f7291148..f89007590f 100644
--- a/src/applications/differential/customfield/DifferentialDraftField.php
+++ b/src/applications/differential/customfield/DifferentialDraftField.php
@@ -101,7 +101,7 @@ public function getWarningsForRevisionHeader(array $handles) {
   public function getWarningsForDetailView() {
     $revision = $this->getObject();
 
-    if (!$revision->isDraft()) {
+    if ($revision->getShouldBroadcast()) {
       return array();
     }
 
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 3bdbc11c7b..81ba158d20 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -487,7 +487,7 @@ protected function shouldPublishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
-    if (!$object->shouldBroadcast()) {
+    if (!$object->getShouldBroadcast()) {
       return false;
     }
 
@@ -498,7 +498,7 @@ protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
-    if (!$object->shouldBroadcast()) {
+    if (!$object->getShouldBroadcast()) {
       return false;
     }
 
@@ -1152,7 +1152,7 @@ protected function buildHeraldAdapter(
 
     // If the object is still a draft, prevent "Send me an email" and other
     // similar rules from acting yet.
-    if (!$object->shouldBroadcast()) {
+    if (!$object->getShouldBroadcast()) {
       $adapter->setForbiddenAction(
         HeraldMailableState::STATECONST,
         DifferentialHeraldStateReasons::REASON_DRAFT);
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 434b3222fa..7b67dc27ef 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -679,6 +679,10 @@ public function getStatusIconColor() {
     return $this->getStatusObject()->getIconColor();
   }
 
+  public function getStatusTagColor() {
+    return $this->getStatusObject()->getTagColor();
+  }
+
   public function getStatusObject() {
     $status = $this->getStatus();
     return DifferentialRevisionStatus::newForStatus($status);
@@ -704,14 +708,6 @@ public function attachHasDraft(PhabricatorUser $viewer, $has_draft) {
     return $this;
   }
 
-  public function shouldBroadcast() {
-    if (!$this->isDraft()) {
-      return true;
-    }
-
-    return false;
-  }
-
   public function getHoldAsDraft() {
     return $this->getProperty(self::PROPERTY_DRAFT_HOLD, false);
   }
@@ -721,7 +717,7 @@ public function setHoldAsDraft($hold) {
   }
 
   public function getShouldBroadcast() {
-    return $this->getProperty(self::PROPERTY_SHOULD_BROADCAST, false);
+    return $this->getProperty(self::PROPERTY_SHOULD_BROADCAST, true);
   }
 
   public function setShouldBroadcast($should_broadcast) {
@@ -746,7 +742,6 @@ public function getRemovedLineCount() {
     return $this->getProperty(self::PROPERTY_LINES_REMOVED);
   }
 
-
   public function getBuildableStatus($phid) {
     $buildables = $this->getProperty(self::PROPERTY_BUILDABLES);
     if (!is_array($buildables)) {

From d9bd36039fd10062ef383d5ce118e4b73c09496a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 08:54:54 -0700
Subject: [PATCH 768/865] When a non-broadcasting revision is updated, put it
 in "Draft", not "Needs Review"

Summary: Depends on D19285. Ref T13110. When you update an "Abandoned + But, Never Promoted" revision or (in the future) a "Changes Planned + But, Never Promoted" revision, return it to the "Draft" state rather than promoting it.

Test Plan: Updated an "Abandoned + Draft" revision, saw it return to "Draft".

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19286
---
 .../xaction/DifferentialRevisionUpdateTransaction.php  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
index 189ed2f2ba..bf1e6de870 100644
--- a/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionUpdateTransaction.php
@@ -13,8 +13,14 @@ public function generateOldValue($object) {
   public function applyInternalEffects($object, $value) {
     $should_review = $this->shouldRequestReviewAfterUpdate($object);
     if ($should_review) {
-      $object->setModernRevisionStatus(
-        DifferentialRevisionStatus::NEEDS_REVIEW);
+      // If we're updating a non-broadcasting revision, put it back in draft
+      // rather than moving it directly to "Needs Review".
+      if ($object->getShouldBroadcast()) {
+        $new_status = DifferentialRevisionStatus::NEEDS_REVIEW;
+      } else {
+        $new_status = DifferentialRevisionStatus::DRAFT;
+      }
+      $object->setModernRevisionStatus($new_status);
     }
 
     $editor = $this->getEditor();

From adf8fdef0e892d4039049495268ce58c2b0b7356 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 09:12:08 -0700
Subject: [PATCH 769/865] When remote builds fail, demote revisions to "Changes
 Planned + But, Still A Draft"

Summary:
Depends on D19286. Ref T13110. After builds fail remote builds, put revisions back in the author's queue.

This doesn't actually notify the author quite yet.

Test Plan: Made a failing build plan run on revisions, created a revision, saw it demote after builds failed.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19287
---
 .../editor/DifferentialTransactionEditor.php  | 17 +++++++++++++--
 .../DifferentialRevisionActionTransaction.php | 21 +++++++++++++++----
 ...erentialRevisionPlanChangesTransaction.php | 17 ++++++++++++---
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 81ba158d20..9b1a4d75db 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1577,8 +1577,21 @@ protected function didApplyTransactions($object, array $xactions) {
         // revision state. See T13027 for discussion.
         $this->queueTransaction($xaction);
       } else if ($is_failed) {
-        // TODO: Change to "Changes Planned + Draft", notify the author (only)
-        // of the build failure.
+        // When demoting a revision, we act as "Harbormaster" instead of
+        // the author since this feels a little more natural.
+        $harbormaster_phid = id(new PhabricatorHarbormasterApplication())
+          ->getPHID();
+
+        $xaction = $object->getApplicationTransactionTemplate()
+          ->setAuthorPHID($harbormaster_phid)
+          ->setMetadataValue('draft.demote', true)
+          ->setTransactionType(
+            DifferentialRevisionPlanChangesTransaction::TRANSACTIONTYPE)
+          ->setNewValue(true);
+
+        $this->queueTransaction($xaction);
+
+        // TODO: Notify the author (only) that we did this.
       }
     }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
index 07809dca59..cf2b557764 100644
--- a/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionActionTransaction.php
@@ -147,10 +147,23 @@ public function validateTransactions($object, array $xactions) {
     $actor = $this->getActor();
 
     $action_exception = null;
-    try {
-      $this->validateAction($object, $actor);
-    } catch (Exception $ex) {
-      $action_exception = $ex;
+    foreach ($xactions as $xaction) {
+      // If this is a draft demotion action, let it skip all the normal
+      // validation. This is a little hacky and should perhaps move down
+      // into the actual action implementations, but currently we can not
+      // apply this rule in validateAction() because it doesn't operate on
+      // the actual transaction.
+      if ($xaction->getMetadataValue('draft.demote')) {
+        continue;
+      }
+
+      try {
+        $this->validateAction($object, $actor);
+      } catch (Exception $ex) {
+        $action_exception = $ex;
+      }
+
+      break;
     }
 
     foreach ($xactions as $xaction) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
index e53426c8ba..bdbe28d5cb 100644
--- a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
@@ -96,9 +96,16 @@ protected function validateAction($object, PhabricatorUser $viewer) {
   }
 
   public function getTitle() {
-    return pht(
-      '%s planned changes to this revision.',
-      $this->renderAuthor());
+    if ($this->isDraftDemotion()) {
+      return pht(
+        '%s returned this revision to the author for changes because remote '.
+        'builds failed.',
+        $this->renderAuthor());
+    } else {
+      return pht(
+        '%s planned changes to this revision.',
+        $this->renderAuthor());
+    }
   }
 
   public function getTitleForFeed() {
@@ -108,4 +115,8 @@ public function getTitleForFeed() {
       $this->renderObject());
   }
 
+  private function isDraftDemotion() {
+    return (bool)$this->getMetadataValue('draft.demote');
+  }
+
 }

From f4f33113124f00db28dba776d63f52f8b3c1a2dc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 09:38:31 -0700
Subject: [PATCH 770/865] When reclaiming an "Abandoned + Draft" revision,
 return it to "Draft", not "Needs Review"

Summary: Depends on D19287. Ref T13110. Currently, "Abandon" and then "Reclaim" moves you out of "Draft" without setting the "Should Broadcast" flag. Keep these revisions in draft instead.

Test Plan: Reclaimed an abandoned + draft revision, got a draft revision instead of a "needs review + nonbroadcast" revision (which isn't a meaningful state).

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19288
---
 .../xaction/DifferentialRevisionReclaimTransaction.php    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
index 4a4744e2e0..6d74589b64 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
@@ -48,8 +48,12 @@ public function generateOldValue($object) {
   }
 
   public function applyInternalEffects($object, $value) {
-    $status_review = DifferentialRevisionStatus::NEEDS_REVIEW;
-    $object->setModernRevisionStatus($status_review);
+    if ($object->getShouldBroadcast()) {
+      $new_status = DifferentialRevisionStatus::NEEDS_REVIEW;
+    } else {
+      $new_status = DifferentialRevisionStatus::DRAFT;
+    }
+    $object->setModernRevisionStatus($new_status);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {

From 804f9817c3e2ce1984cdb20eee40153fc31633a2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 09:51:01 -0700
Subject: [PATCH 771/865] When a draft's builds fail and it demotes to "Changes
 Planned + Draft", notify the author (only) via email

Summary:
Depends on D19288. Ref T13110. In addition to kicking revisions back to "Changes Planned" when builds fail, notify the author that they need to fix their awful garbage change.

(The actual email could be more useful than it currently is.)

Test Plan: Created a revision with failing remote builds, saw email about the problem generate.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19289
---
 .../editor/DifferentialTransactionEditor.php  | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 9b1a4d75db..b9f6665579 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -11,6 +11,7 @@ final class DifferentialTransactionEditor
   private $affectedPaths;
   private $firstBroadcast = false;
   private $wasBroadcasting;
+  private $isDraftDemotion;
 
   public function getEditorApplicationClass() {
     return 'PhabricatorDifferentialApplication';
@@ -134,6 +135,11 @@ protected function expandTransactions(
           // as "Commented" later. This should get cleaner after T10967.
           $this->hasReviewTransaction = true;
           break;
+        case DifferentialRevisionPlanChangesTransaction::TRANSACTIONTYPE:
+          if ($xaction->getMetadataValue('draft.demote')) {
+            $this->isDraftDemotion = true;
+          }
+          break;
       }
     }
 
@@ -497,27 +503,42 @@ protected function shouldPublishFeedStory(
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
-
-    if (!$object->getShouldBroadcast()) {
-      return false;
-    }
-
     return true;
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
-    $this->requireReviewers($object);
+    if ($object->getShouldBroadcast()) {
+      $this->requireReviewers($object);
 
-    $phids = array();
-    $phids[] = $object->getAuthorPHID();
-    foreach ($object->getReviewers() as $reviewer) {
-      if ($reviewer->isResigned()) {
-        continue;
+      $phids = array();
+      $phids[] = $object->getAuthorPHID();
+      foreach ($object->getReviewers() as $reviewer) {
+        if ($reviewer->isResigned()) {
+          continue;
+        }
+
+        $phids[] = $reviewer->getReviewerPHID();
       }
+      return $phids;
+    }
 
-      $phids[] = $reviewer->getReviewerPHID();
+    // If we're demoting a draft after a build failure, just notify the author.
+    if ($this->isDraftDemotion) {
+      $author_phid = $object->getAuthorPHID();
+      return array(
+        $author_phid,
+      );
     }
-    return $phids;
+
+    return array();
+  }
+
+  protected function getMailCC(PhabricatorLiskDAO $object) {
+    if (!$object->getShouldBroadcast()) {
+      return array();
+    }
+
+    return parent::getMailCC($object);
   }
 
   protected function newMailUnexpandablePHIDs(PhabricatorLiskDAO $object) {
@@ -1408,12 +1429,14 @@ protected function getCustomWorkerState() {
     return array(
       'changedPriorToCommitURI' => $this->changedPriorToCommitURI,
       'firstBroadcast' => $this->firstBroadcast,
+      'isDraftDemotion' => $this->isDraftDemotion,
     );
   }
 
   protected function loadCustomWorkerState(array $state) {
     $this->changedPriorToCommitURI = idx($state, 'changedPriorToCommitURI');
     $this->firstBroadcast = idx($state, 'firstBroadcast');
+    $this->isDraftDemotion = idx($state, 'isDraftDemotion');
     return $this;
   }
 

From 6f520e05346296039e20c63d8e9050d10e021cec Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 09:59:04 -0700
Subject: [PATCH 772/865] Clean up an old transaction state flag

Summary: Depends on D19289. Ref T13110. This flag has been obsolete for some time and has no callers.

Test Plan: Grepped for `hasReviewTransaction`, no hits.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19290
---
 .../differential/editor/DifferentialTransactionEditor.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index b9f6665579..a28d24abf5 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -7,7 +7,6 @@ final class DifferentialTransactionEditor
   private $isCloseByCommit;
   private $repositoryPHIDOverride = false;
   private $didExpandInlineState = false;
-  private $hasReviewTransaction = false;
   private $affectedPaths;
   private $firstBroadcast = false;
   private $wasBroadcasting;
@@ -128,13 +127,6 @@ protected function expandTransactions(
           // built it for us so we don't need to expand it again.
           $this->didExpandInlineState = true;
           break;
-        case DifferentialRevisionAcceptTransaction::TRANSACTIONTYPE:
-        case DifferentialRevisionRejectTransaction::TRANSACTIONTYPE:
-        case DifferentialRevisionResignTransaction::TRANSACTIONTYPE:
-          // If we have a review transaction, we'll skip marking the user
-          // as "Commented" later. This should get cleaner after T10967.
-          $this->hasReviewTransaction = true;
-          break;
         case DifferentialRevisionPlanChangesTransaction::TRANSACTIONTYPE:
           if ($xaction->getMetadataValue('draft.demote')) {
             $this->isDraftDemotion = true;

From 592d72e00688d9bc9dce6b9dfa0596a86a0374b5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 10:02:19 -0700
Subject: [PATCH 773/865] Move PhabricatorModularTransaction slightly closer to
 having "final" methods again

Summary: Depends on D19290. Ref T13110. Differential still has some hacks in place which require these methods to "very temporarily" be nonfinal, but the badness can be slightly reduced nowadays.

Test Plan: Loaded some pages, nothing fataled.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19291
---
 .../transactions/storage/PhabricatorModularTransaction.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/transactions/storage/PhabricatorModularTransaction.php b/src/applications/transactions/storage/PhabricatorModularTransaction.php
index 4546dbf1a3..eef4b8e5d9 100644
--- a/src/applications/transactions/storage/PhabricatorModularTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransaction.php
@@ -176,7 +176,7 @@ public function attachViewer(PhabricatorUser $viewer) {
     return parent::attachViewer($viewer);
   }
 
-  /* final */ public function hasChangeDetails() {
+  final public function hasChangeDetails() {
     if ($this->getTransactionImplementation()->hasChangeDetailView()) {
       return true;
     }
@@ -184,7 +184,7 @@ public function attachViewer(PhabricatorUser $viewer) {
     return parent::hasChangeDetails();
   }
 
-  /* final */ public function renderChangeDetails(PhabricatorUser $viewer) {
+  final public function renderChangeDetails(PhabricatorUser $viewer) {
     $impl = $this->getTransactionImplementation();
     $impl->setViewer($viewer);
     $view = $impl->newChangeDetailView();

From e40aec0210dc1f611b7a2346dab26502c2ab8d33 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 11:48:20 -0700
Subject: [PATCH 774/865] When a revision has more than 7 reviewers, render
 only the first 7 in the list view

Summary:
See PHI489. Ref T13110. At least for now, this just shows "..." at the end since you can click the revision to see the whole list anyway.

Also remove the older-style external Handle passing in favor of lazy construction via HandlePool.

Test Plan: Viewed revisions, fiddled with the 7 limit, got sensible-seeming "..." behavior.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19293
---
 .../DifferentialRevisionViewController.php    | 12 +--
 .../DifferentialRevisionSearchEngine.php      | 18 +---
 .../view/DifferentialRevisionListView.php     | 84 +++++++++++--------
 .../controller/DiffusionBrowseController.php  |  6 +-
 ...icatorPeopleProfileRevisionsController.php |  6 +-
 5 files changed, 57 insertions(+), 69 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index b03c4e8c4f..4ed773d784 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -869,17 +869,11 @@ private function renderOtherRevisions(array $revisions) {
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Recent Similar Revisions'));
 
-    $view = id(new DifferentialRevisionListView())
+    return id(new DifferentialRevisionListView())
+      ->setViewer($viewer)
       ->setRevisions($revisions)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setNoBox(true)
-      ->setUser($viewer);
-
-    $phids = $view->getRequiredHandlePHIDs();
-    $handles = $this->loadViewerHandles($phids);
-    $view->setHandles($handles);
-
-    return $view;
+      ->setNoBox(true);
   }
 
 
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
index e2f4bfc421..835291fba8 100644
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -148,7 +148,7 @@ protected function renderResultList(
 
     $viewer = $this->requireViewer();
     $template = id(new DifferentialRevisionListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setNoBox($this->isPanelContext());
 
     $bucket = $this->getResultBucket($query);
@@ -176,28 +176,16 @@ protected function renderResultList(
       }
     } else {
       $views[] = id(clone $template)
-        ->setRevisions($revisions)
-        ->setHandles(array());
+        ->setRevisions($revisions);
     }
 
     if (!$views) {
       $views[] = id(new DifferentialRevisionListView())
-        ->setUser($viewer)
-        ->setNoDataString(pht('No revisions found.'));
-    }
-
-    $phids = array_mergev(mpull($views, 'getRequiredHandlePHIDs'));
-    if ($phids) {
-      $handles = id(new PhabricatorHandleQuery())
         ->setViewer($viewer)
-        ->withPHIDs($phids)
-        ->execute();
-    } else {
-      $handles = array();
+        ->setNoDataString(pht('No revisions found.'));
     }
 
     foreach ($views as $view) {
-      $view->setHandles($handles);
       $view->setUnlandedDependencies($unlanded);
     }
 
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
index ed97435746..49f4c5b882 100644
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -6,7 +6,6 @@
 final class DifferentialRevisionListView extends AphrontView {
 
   private $revisions = array();
-  private $handles;
   private $header;
   private $noDataString;
   private $noBox;
@@ -48,32 +47,43 @@ public function setBackground($background) {
     return $this;
   }
 
-  public function getRequiredHandlePHIDs() {
-    $phids = array();
-    foreach ($this->revisions as $revision) {
-      $phids[] = array($revision->getAuthorPHID());
-      $phids[] = $revision->getReviewerPHIDs();
-    }
-    return array_mergev($phids);
-  }
-
-  public function setHandles(array $handles) {
-    assert_instances_of($handles, 'PhabricatorObjectHandle');
-    $this->handles = $handles;
-    return $this;
-  }
-
   public function render() {
     $viewer = $this->getViewer();
 
     $this->initBehavior('phabricator-tooltips', array());
     $this->requireResource('aphront-tooltip-css');
 
-    $list = new PHUIObjectItemListView();
+    $reviewer_limit = 7;
 
-    foreach ($this->revisions as $revision) {
+    $reviewer_phids = array();
+    $reviewer_more = array();
+    $handle_phids = array();
+    foreach ($this->revisions as $key => $revision) {
+      $reviewers = $revision->getReviewers();
+      if (count($reviewers) > $reviewer_limit) {
+        $reviewers = array_slice($reviewers, 0, $reviewer_limit);
+        $reviewer_more[$key] = true;
+      } else {
+        $reviewer_more[$key] = false;
+      }
+
+      $phids = mpull($reviewers, 'getReviewerPHID');
+
+      $reviewer_phids[$key] = $phids;
+      foreach ($phids as $phid) {
+        $handle_phids[$phid] = $phid;
+      }
+
+      $author_phid = $revision->getAuthorPHID();
+      $handle_phids[$author_phid] = $author_phid;
+    }
+
+    $handles = $viewer->loadHandles($handle_phids);
+
+    $list = new PHUIObjectItemListView();
+    foreach ($this->revisions as $key => $revision) {
       $item = id(new PHUIObjectItemView())
-        ->setUser($viewer);
+        ->setViewer($viewer);
 
       $icons = array();
 
@@ -89,21 +99,17 @@ public function render() {
           '');
       }
 
-      if ($revision->getHasDraft($viewer)) {
-        $icons['draft'] = true;
-      }
-
       $modified = $revision->getDateModified();
 
       if (isset($icons['flag'])) {
         $item->addHeadIcon($icons['flag']);
       }
 
-      $item->setObjectName('D'.$revision->getID());
+      $item->setObjectName($revision->getMonogram());
       $item->setHeader($revision->getTitle());
-      $item->setHref('/D'.$revision->getID());
+      $item->setHref($revision->getURI());
 
-      if (isset($icons['draft'])) {
+      if ($revision->getHasDraft($viewer)) {
         $draft = id(new PHUIIconView())
           ->setIcon('fa-comment yellow')
           ->addSigil('has-tooltip')
@@ -114,8 +120,7 @@ public function render() {
         $item->addAttribute($draft);
       }
 
-      // Author
-      $author_handle = $this->handles[$revision->getAuthorPHID()];
+      $author_handle = $handles[$revision->getAuthorPHID()];
       $item->addByline(pht('Author: %s', $author_handle->renderLink()));
 
       $unlanded = idx($this->unlandedDependencies, $phid);
@@ -128,17 +133,26 @@ public function render() {
           ));
       }
 
-      $reviewers = array();
-      foreach ($revision->getReviewerPHIDs() as $reviewer) {
-        $reviewers[] = $this->handles[$reviewer]->renderLink();
+      $more = null;
+      if ($reviewer_more[$key]) {
+        $more = pht(', ...');
+      } else {
+        $more = null;
       }
-      if (!$reviewers) {
-        $reviewers = phutil_tag('em', array(), pht('None'));
+
+      if ($reviewer_phids[$key]) {
+        $item->addAttribute(
+          array(
+            pht('Reviewers:'),
+            ' ',
+            $viewer->renderHandleList($reviewer_phids[$key])
+              ->setAsInline(true),
+            $more,
+          ));
       } else {
-        $reviewers = phutil_implode_html(', ', $reviewers);
+        $item->addAttribute(phutil_tag('em', array(), pht('No Reviewers')));
       }
 
-      $item->addAttribute(pht('Reviewers: %s', $reviewers));
       $item->setEpoch($revision->getDateModified());
 
       if ($revision->isClosed()) {
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index ada75f688a..a2380aab4a 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1754,14 +1754,10 @@ private function buildOpenRevisions() {
       ->setHeader(pht('Recently Open Revisions'));
 
     $list = id(new DifferentialRevisionListView())
+      ->setViewer($viewer)
       ->setRevisions($revisions)
-      ->setUser($viewer)
       ->setNoBox(true);
 
-    $phids = $list->getRequiredHandlePHIDs();
-    $handles = $this->loadViewerHandles($phids);
-    $list->setHandles($handles);
-
     $view = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileRevisionsController.php b/src/applications/people/controller/PhabricatorPeopleProfileRevisionsController.php
index adb2a60e5d..55baf0140f 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileRevisionsController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileRevisionsController.php
@@ -63,15 +63,11 @@ private function buildRevisionsView(PhabricatorUser $user) {
       ->execute();
 
     $list = id(new DifferentialRevisionListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setNoBox(true)
       ->setRevisions($revisions)
       ->setNoDataString(pht('No recent revisions.'));
 
-    $object_phids = $list->getRequiredHandlePHIDs();
-    $handles = $this->loadViewerHandles($object_phids);
-    $list->setHandles($handles);
-
     $view = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Recent Revisions'))
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)

From e70c9f72a48ea1a293cdab88d634ff61ae0a3e3d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 12:26:35 -0700
Subject: [PATCH 775/865] Show revision sizes using a perplexing, inexplicable
 symbol code

Summary: Ref T13110. See PHI230. Show revision sizes on a roughly logarithmic scale from 1-7 stars. See D16322 for theorycrafting on this element.

Test Plan: Looked at some revisions, saw plausible-looking size markers.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19294
---
 resources/celerity/map.php                    | 10 ++--
 .../editor/DifferentialTransactionEditor.php  |  2 +-
 .../storage/DifferentialRevision.php          | 44 +++++++++++++++
 .../view/DifferentialRevisionListView.php     | 53 +++++++++++++++++++
 .../phui/object-item/phui-oi-list-view.css    | 29 ++++++++++
 webroot/rsrc/css/phui/phui-icon.css           |  4 ++
 6 files changed, 136 insertions(+), 6 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 56ee3d5d45..e0bb41b8aa 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '1dd5fa4b',
+    'core.pkg.css' => '49b87886',
     'core.pkg.js' => '1ea38af8',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -132,7 +132,7 @@
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
     'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
-    'rsrc/css/phui/object-item/phui-oi-list-view.css' => '6ae18df0',
+    'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'ae1404ba',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
     'rsrc/css/phui/phui-action-list.css' => '0bcd9a45',
     'rsrc/css/phui/phui-action-panel.css' => 'b4798122',
@@ -158,7 +158,7 @@
     'rsrc/css/phui/phui-header-view.css' => '31dc6c72',
     'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf',
     'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
-    'rsrc/css/phui/phui-icon.css' => '5c4a5de6',
+    'rsrc/css/phui/phui-icon.css' => 'cf24ceec',
     'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
     'rsrc/css/phui/phui-info-view.css' => 'e929f98c',
     'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0',
@@ -833,7 +833,7 @@
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'f0592bcf',
     'phui-icon-set-selector-css' => '87db8fee',
-    'phui-icon-view-css' => '5c4a5de6',
+    'phui-icon-view-css' => 'cf24ceec',
     'phui-image-mask-css' => 'a8498f9c',
     'phui-info-view-css' => 'e929f98c',
     'phui-inline-comment-view-css' => '65ae3bc2',
@@ -846,7 +846,7 @@
     'phui-oi-color-css' => 'cd2b9b77',
     'phui-oi-drag-ui-css' => '08f4ccc3',
     'phui-oi-flush-ui-css' => '9d9685d6',
-    'phui-oi-list-view-css' => '6ae18df0',
+    'phui-oi-list-view-css' => 'ae1404ba',
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index a28d24abf5..24f0fe7a07 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -568,7 +568,7 @@ protected function getMailAction(
 
     if ($show_lines) {
       $count = new PhutilNumber($object->getLineCount());
-      $action = pht('%s, %s line(s)', $action, $count);
+      $action = pht('%s] [%s', $action, $object->getRevisionScaleGlyphs());
     }
 
     return $action;
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 7b67dc27ef..f11cbef7e0 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -742,6 +742,50 @@ public function getRemovedLineCount() {
     return $this->getProperty(self::PROPERTY_LINES_REMOVED);
   }
 
+  public function getRevisionScaleGlyphs() {
+    $add = $this->getAddedLineCount();
+    $rem = $this->getRemovedLineCount();
+    $all = ($add + $rem);
+
+    if (!$all) {
+      return '       ';
+    }
+
+    $map = array(
+      20 => 2,
+      50 => 3,
+      150 => 4,
+      375 => 5,
+      1000 => 6,
+      2500 => 7,
+    );
+
+    $n = 1;
+    foreach ($map as $size => $count) {
+      if ($size <= $all) {
+        $n = $count;
+      } else {
+        break;
+      }
+    }
+
+    $add_n = (int)ceil(($add / $all) * $n);
+    $rem_n = (int)ceil(($rem / $all) * $n);
+
+    while ($add_n + $rem_n > $n) {
+      if ($add_n > 1) {
+        $add_n--;
+      } else {
+        $rem_n--;
+      }
+    }
+
+    return
+      str_repeat('+', $add_n).
+      str_repeat('-', $rem_n).
+      str_repeat(' ', (7 - $n));
+  }
+
   public function getBuildableStatus($phid) {
     $buildables = $this->getProperty(self::PROPERTY_BUILDABLES);
     if (!is_array($buildables)) {
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
index 49f4c5b882..5f14a6b975 100644
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -109,6 +109,8 @@ public function render() {
       $item->setHeader($revision->getTitle());
       $item->setHref($revision->getURI());
 
+      $item->addAttribute($this->renderRevisionSize($revision));
+
       if ($revision->getHasDraft($viewer)) {
         $draft = id(new PHUIIconView())
           ->setIcon('fa-comment yellow')
@@ -190,4 +192,55 @@ public function render() {
     return $list;
   }
 
+  private function renderRevisionSize(DifferentialRevision $revision) {
+    $size = array();
+
+    $glyphs = $revision->getRevisionScaleGlyphs();
+    $plus_count = 0;
+    for ($ii = 0; $ii < 7; $ii++) {
+      $c = $glyphs[$ii];
+
+      switch ($c) {
+        case '+':
+          $size[] = id(new PHUIIconView())
+            ->setIcon('fa-plus');
+          $plus_count++;
+          break;
+        case '-':
+          $size[] = id(new PHUIIconView())
+            ->setIcon('fa-minus');
+          break;
+        default:
+          $size[] = id(new PHUIIconView())
+            ->setIcon('fa-square-o invisible');
+          break;
+      }
+    }
+
+    $n = $revision->getAddedLineCount() + $revision->getRemovedLineCount();
+
+    $classes = array();
+    $classes[] = 'differential-revision-size';
+
+    if ($plus_count <= 1) {
+      $classes[] = 'differential-revision-small';
+    }
+
+    if ($plus_count >= 4) {
+      $classes[] = 'differential-revision-large';
+    }
+
+    return javelin_tag(
+      'span',
+      array(
+        'class' => implode(' ', $classes),
+        'sigil' => 'has-tooltip',
+        'meta' => array(
+          'tip' => pht('%s Lines', new PhutilNumber($n)),
+          'align' => 'E',
+        ),
+      ),
+      $size);
+  }
+
 }
diff --git a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
index ff79a8d70b..9436d171df 100644
--- a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
+++ b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
@@ -687,3 +687,32 @@ ul.phui-oi-list-view .phui-oi-selectable
   .phui-oi-frame {
   border-color: {$blueborder};
 }
+
+.differential-revision-size {
+  padding: 0 4px;
+  border-radius: 4px;
+  background: {$lightgreybackground};
+  cursor: pointer;
+}
+
+.differential-revision-size .phui-icon-view {
+  margin: 0 1px 0 1px;
+  font-size: smaller;
+  color: {$blueborder};
+}
+
+.differential-revision-large {
+  background: {$sh-redbackground};
+}
+
+.differential-revision-large .phui-icon-view {
+  color: {$red};
+}
+
+.differential-revision-small {
+  background: {$sh-greenbackground};
+}
+
+.differential-revision-small .phui-icon-view {
+  color: {$green};
+}
diff --git a/webroot/rsrc/css/phui/phui-icon.css b/webroot/rsrc/css/phui/phui-icon.css
index acc7818765..4108074b08 100644
--- a/webroot/rsrc/css/phui/phui-icon.css
+++ b/webroot/rsrc/css/phui/phui-icon.css
@@ -49,6 +49,10 @@ img.phui-image-disabled {
   color: {$bluetext};
 }
 
+.phui-icon-view.invisible {
+  visibility: hidden;
+}
+
 /* - Icon in a Circle ------------------------------------------------------- */
 
 .phui-icon-circle {

From 3de002c8414af7294b9fc3d661f23b934bae6a16 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 5 Apr 2018 05:26:23 -0700
Subject: [PATCH 776/865] Fix a commit hook issue where pushing dangerous
 changes would fatal before hitting the dragon bureaucrats

Summary: See <https://discourse.phabricator-community.org/t/php-fatal-when-using-git-push-d/1317>. The behavioral changes for Herald on initial import from D19265 could leave `$all_updates` undefined if we throw early enough.

Test Plan: Pushed a dangerous change, saw dragon bureaucrats again.

Differential Revision: https://secure.phabricator.com/D19297
---
 src/applications/diffusion/engine/DiffusionCommitHookEngine.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index dd5777b2b0..3bbb7c082b 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -126,6 +126,7 @@ public function getMercurialHook() {
 
   public function execute() {
     $ref_updates = $this->findRefUpdates();
+    $all_updates = $ref_updates;
 
     $caught = null;
     try {

From 0fef964d86deba4a4a9238704671038370d0dc4f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 5 Apr 2018 05:26:23 -0700
Subject: [PATCH 777/865] (stable) Fix a commit hook issue where pushing
 dangerous changes would fatal before hitting the dragon bureaucrats

Summary: See <https://discourse.phabricator-community.org/t/php-fatal-when-using-git-push-d/1317>. The behavioral changes for Herald on initial import from D19265 could leave `$all_updates` undefined if we throw early enough.

Test Plan: Pushed a dangerous change, saw dragon bureaucrats again.

Differential Revision: https://secure.phabricator.com/D19297
---
 src/applications/diffusion/engine/DiffusionCommitHookEngine.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
index dd5777b2b0..3bbb7c082b 100644
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -126,6 +126,7 @@ public function getMercurialHook() {
 
   public function execute() {
     $ref_updates = $this->findRefUpdates();
+    $all_updates = $ref_updates;
 
     $caught = null;
     try {

From 8c8e7f07b575e89b2c0907f75f60e3014581bbe9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 3 Apr 2018 16:32:48 -0700
Subject: [PATCH 778/865] Add a standalone view for browsing changesets of very
 large revisions

Summary: Ref T13110. Installs have various reasons for sending unreviewable changes (changes where the text of the change will never be reviewed by a human) through Differential anyway. Prepare for accommodating this more gracefully by building a standalone changeset list page which paginates the changesets.

Test Plan: Clicked the new "Changeset List" button on a revision, was taken to a separate page.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19295
---
 src/__phutil_library_map__.php                |   4 +
 .../PhabricatorDifferentialApplication.php    |   8 +-
 .../DifferentialChangesetListController.php   |  51 +++++++
 .../DifferentialRevisionViewController.php    |  12 +-
 .../query/DifferentialChangesetQuery.php      |  29 ++--
 .../DifferentialChangesetSearchEngine.php     | 133 ++++++++++++++++++
 6 files changed, 216 insertions(+), 21 deletions(-)
 create mode 100644 src/applications/differential/controller/DifferentialChangesetListController.php
 create mode 100644 src/applications/differential/query/DifferentialChangesetSearchEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 80279c40fc..391b8fb1f2 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -389,6 +389,7 @@
     'DifferentialChangesetDetailView' => 'applications/differential/view/DifferentialChangesetDetailView.php',
     'DifferentialChangesetFileTreeSideNavBuilder' => 'applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php',
     'DifferentialChangesetHTMLRenderer' => 'applications/differential/render/DifferentialChangesetHTMLRenderer.php',
+    'DifferentialChangesetListController' => 'applications/differential/controller/DifferentialChangesetListController.php',
     'DifferentialChangesetListView' => 'applications/differential/view/DifferentialChangesetListView.php',
     'DifferentialChangesetOneUpMailRenderer' => 'applications/differential/render/DifferentialChangesetOneUpMailRenderer.php',
     'DifferentialChangesetOneUpRenderer' => 'applications/differential/render/DifferentialChangesetOneUpRenderer.php',
@@ -397,6 +398,7 @@
     'DifferentialChangesetParserTestCase' => 'applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php',
     'DifferentialChangesetQuery' => 'applications/differential/query/DifferentialChangesetQuery.php',
     'DifferentialChangesetRenderer' => 'applications/differential/render/DifferentialChangesetRenderer.php',
+    'DifferentialChangesetSearchEngine' => 'applications/differential/query/DifferentialChangesetSearchEngine.php',
     'DifferentialChangesetTestRenderer' => 'applications/differential/render/DifferentialChangesetTestRenderer.php',
     'DifferentialChangesetTwoUpRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpRenderer.php',
     'DifferentialChangesetTwoUpTestRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpTestRenderer.php',
@@ -5605,6 +5607,7 @@
     'DifferentialChangesetDetailView' => 'AphrontView',
     'DifferentialChangesetFileTreeSideNavBuilder' => 'Phobject',
     'DifferentialChangesetHTMLRenderer' => 'DifferentialChangesetRenderer',
+    'DifferentialChangesetListController' => 'DifferentialController',
     'DifferentialChangesetListView' => 'AphrontView',
     'DifferentialChangesetOneUpMailRenderer' => 'DifferentialChangesetRenderer',
     'DifferentialChangesetOneUpRenderer' => 'DifferentialChangesetHTMLRenderer',
@@ -5613,6 +5616,7 @@
     'DifferentialChangesetParserTestCase' => 'PhabricatorTestCase',
     'DifferentialChangesetQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'DifferentialChangesetRenderer' => 'Phobject',
+    'DifferentialChangesetSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'DifferentialChangesetTestRenderer' => 'DifferentialChangesetRenderer',
     'DifferentialChangesetTwoUpRenderer' => 'DifferentialChangesetHTMLRenderer',
     'DifferentialChangesetTwoUpTestRenderer' => 'DifferentialChangesetTestRenderer',
diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
index 4141cf8539..da40739579 100644
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -52,7 +52,13 @@ public function getRoutes() {
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'DifferentialRevisionListController',
         'diff/' => array(
-          '(?P<id>[1-9]\d*)/' => 'DifferentialDiffViewController',
+          '(?P<id>[1-9]\d*)/' => array(
+            '' => 'DifferentialDiffViewController',
+            'changesets/' => array(
+              $this->getQueryRoutePattern()
+                => 'DifferentialChangesetListController',
+            ),
+          ),
           'create/' => 'DifferentialDiffCreateController',
         ),
         'changeset/' => 'DifferentialChangesetViewController',
diff --git a/src/applications/differential/controller/DifferentialChangesetListController.php b/src/applications/differential/controller/DifferentialChangesetListController.php
new file mode 100644
index 0000000000..aa807da9e4
--- /dev/null
+++ b/src/applications/differential/controller/DifferentialChangesetListController.php
@@ -0,0 +1,51 @@
+<?php
+
+final class DifferentialChangesetListController
+  extends DifferentialController {
+
+  private $diff;
+
+  public function shouldAllowPublic() {
+    return true;
+  }
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $this->getViewer();
+
+    $diff = id(new DifferentialDiffQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($request->getURIData('id')))
+      ->executeOne();
+    if (!$diff) {
+      return new Aphront404Response();
+    }
+    $this->diff = $diff;
+
+    return id(new DifferentialChangesetSearchEngine())
+      ->setController($this)
+      ->setDiff($diff)
+      ->buildResponse();
+  }
+
+  protected function buildApplicationCrumbs() {
+    $crumbs = parent::buildApplicationCrumbs();
+
+    $diff = $this->diff;
+    if ($diff) {
+      $revision = $diff->getRevision();
+      if ($revision) {
+        $crumbs->addTextCrumb(
+          $revision->getMonogram(),
+          $revision->getURI());
+      }
+
+      $crumbs->addTextCrumb(
+        pht('Diff %d', $diff->getID()),
+        $diff->getURI());
+    }
+
+    return $crumbs;
+  }
+
+
+}
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 4ed773d784..b4f3799f7c 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -399,8 +399,18 @@ public function handleRequest(AphrontRequest $request) {
           ->appendChild($other_view));
     }
 
+    $view_button = id(new PHUIButtonView())
+      ->setTag('a')
+      ->setText(pht('Changeset List'))
+      ->setHref('/differential/diff/'.$target->getID().'/changesets/')
+      ->setIcon('fa-align-left');
+
+    $tab_header = id(new PHUIHeaderView())
+      ->setHeader(pht('Revision Contents'))
+      ->addActionLink($view_button);
+
     $tab_view = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Revision Contents'))
+      ->setHeader($tab_header)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->addTabGroup($tab_group);
 
diff --git a/src/applications/differential/query/DifferentialChangesetQuery.php b/src/applications/differential/query/DifferentialChangesetQuery.php
index 7b9f2e6d10..8f69c61a4e 100644
--- a/src/applications/differential/query/DifferentialChangesetQuery.php
+++ b/src/applications/differential/query/DifferentialChangesetQuery.php
@@ -41,19 +41,12 @@ protected function willExecute() {
     }
   }
 
+  public function newResultObject() {
+    return new DifferentialChangeset();
+  }
+
   protected function loadPage() {
-    $table = new DifferentialChangeset();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($data);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function willFilterPage(array $changesets) {
@@ -124,26 +117,24 @@ protected function didFilterPage(array $changesets) {
     return $changesets;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
     if ($this->diffs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'diffID IN (%Ld)',
         mpull($this->diffs, 'getID'));
     }
 
     if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'id IN (%Ld)',
         $this->ids);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {
diff --git a/src/applications/differential/query/DifferentialChangesetSearchEngine.php b/src/applications/differential/query/DifferentialChangesetSearchEngine.php
new file mode 100644
index 0000000000..0dfec94a53
--- /dev/null
+++ b/src/applications/differential/query/DifferentialChangesetSearchEngine.php
@@ -0,0 +1,133 @@
+<?php
+
+final class DifferentialChangesetSearchEngine
+  extends PhabricatorApplicationSearchEngine {
+
+  private $diff;
+
+  public function setDiff(DifferentialDiff $diff) {
+    $this->diff = $diff;
+    return $this;
+  }
+
+  public function getDiff() {
+    return $this->diff;
+  }
+
+  public function getResultTypeDescription() {
+    return pht('Differential Changesets');
+  }
+
+  public function getApplicationClassName() {
+    return 'PhabricatorDifferentialApplication';
+  }
+
+  public function newQuery() {
+    $query = id(new DifferentialChangesetQuery());
+
+    if ($this->diff) {
+      $query->withDiffs(array($this->diff));
+    }
+
+    return $query;
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+    return $query;
+  }
+
+  protected function buildCustomSearchFields() {
+    return array();
+  }
+
+  protected function getURI($path) {
+    $diff = $this->getDiff();
+    if ($diff) {
+      return '/differential/diff/'.$diff->getID().'/changesets/'.$path;
+    }
+
+    throw new PhutilMethodNotImplementedException();
+  }
+
+  protected function getBuiltinQueryNames() {
+    $names = array();
+    $names['all'] = pht('All Changesets');
+    return $names;
+  }
+
+  public function buildSavedQueryFromBuiltin($query_key) {
+    $query = $this->newSavedQuery();
+    $query->setQueryKey($query_key);
+
+    $viewer = $this->requireViewer();
+
+    switch ($query_key) {
+      case 'all':
+        return $query->setParameter('order', 'oldest');
+    }
+
+    return parent::buildSavedQueryFromBuiltin($query_key);
+  }
+
+  protected function renderResultList(
+    array $changesets,
+    PhabricatorSavedQuery $query,
+    array $handles) {
+
+    assert_instances_of($changesets, 'DifferentialChangeset');
+    $viewer = $this->requireViewer();
+
+    $rows = array();
+    foreach ($changesets as $changeset) {
+      $link = phutil_tag(
+        'a',
+        array(
+          'href' => '/differential/changeset/?ref='.$changeset->getID(),
+        ),
+        $changeset->getDisplayFilename());
+
+      $type = $changeset->getChangeType();
+
+      $title = DifferentialChangeType::getFullNameForChangeType($type);
+
+      $add_lines = $changeset->getAddLines();
+      if (!$add_lines) {
+        $add_lines = null;
+      } else {
+        $add_lines = '+'.$add_lines;
+      }
+
+      $rem_lines = $changeset->getDelLines();
+      if (!$rem_lines) {
+        $rem_lines = null;
+      } else {
+        $rem_lines = '-'.$rem_lines;
+      }
+
+      $rows[] = array(
+        $changeset->newFileTreeIcon(),
+        $title,
+        $link,
+      );
+    }
+
+    $table = id(new AphrontTableView($rows))
+      ->setHeaders(
+        array(
+          null,
+          pht('Change'),
+          pht('Path'),
+        ))
+      ->setColumnClasses(
+        array(
+          null,
+          null,
+          'pri wide',
+        ));
+
+    return id(new PhabricatorApplicationSearchResultView())
+      ->setTable($table);
+  }
+
+}

From 1b363a831e7cedde1475429b4361d184bfd7bf82 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 4 Apr 2018 06:42:20 -0700
Subject: [PATCH 779/865] When a revision changes more than 1,000 files, don't
 show the changes on the main page

Summary: Depends on D19295. Ref T13110. Degrade the review UX when users try to interact with changes which are too large to receive human review.

Test Plan: Reduced the "very large" limit, browsed some changes, saw various elements degrade.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19296
---
 .../DifferentialRevisionViewController.php    | 110 ++++++++++++------
 1 file changed, 75 insertions(+), 35 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index b4f3799f7c..60ed08a8d2 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -3,11 +3,20 @@
 final class DifferentialRevisionViewController extends DifferentialController {
 
   private $revisionID;
+  private $veryLargeDiff;
 
   public function shouldAllowPublic() {
     return true;
   }
 
+  public function isVeryLargeDiff() {
+    return $this->veryLargeDiff;
+  }
+
+  public function getVeryLargeDiffLimit() {
+    return 1000;
+  }
+
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
     $this->revisionID = $request->getURIData('id');
@@ -73,6 +82,10 @@ public function handleRequest(AphrontRequest $request) {
         idx($diffs, $diff_vs),
         $repository);
 
+    if (count($rendering_references) > $this->getVeryLargeDiffLimit()) {
+      $this->veryLargeDiff = true;
+    }
+
     if ($request->getExists('download')) {
       return $this->buildRawDiffResponse(
         $revision,
@@ -150,7 +163,7 @@ public function handleRequest(AphrontRequest $request) {
       $warning->appendChild(hsprintf(
         '%s <strong>%s</strong>',
         pht(
-          'This diff is very large and affects %s files. '.
+          'This diff is large and affects %s files. '.
           'You may load each file individually or ',
           new PhutilNumber($count)),
         phutil_tag(
@@ -265,35 +278,53 @@ public function handleRequest(AphrontRequest $request) {
 
     $timeline->setQuoteRef($revision->getMonogram());
 
-    $changeset_view = id(new DifferentialChangesetListView())
-      ->setChangesets($changesets)
-      ->setVisibleChangesets($visible_changesets)
-      ->setStandaloneURI('/differential/changeset/')
-      ->setRawFileURIs(
-        '/differential/changeset/?view=old',
-        '/differential/changeset/?view=new')
-      ->setUser($viewer)
-      ->setDiff($target)
-      ->setRenderingReferences($rendering_references)
-      ->setVsMap($vs_map)
-      ->setWhitespace($whitespace)
-      ->setSymbolIndexes($symbol_indexes)
-      ->setTitle(pht('Diff %s', $target->getID()))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
+    if ($this->isVeryLargeDiff()) {
+      $messages = array();
 
+      $messages[] = pht(
+        'This very large diff affects more than %s files. Use the %s to '.
+        'browse changes.',
+        new PhutilNumber($this->getVeryLargeDiffLimit()),
+        phutil_tag(
+          'a',
+          array(
+            'href' => '/differential/diff/'.$target->getID().'/changesets/',
+          ),
+          phutil_tag('strong', array(), pht('Changeset List'))));
 
-    $revision_id = $revision->getID();
-    $inline_list_uri = "/revision/inlines/{$revision_id}/";
-    $inline_list_uri = $this->getApplicationURI($inline_list_uri);
-    $changeset_view->setInlineListURI($inline_list_uri);
+      $changeset_view = id(new PHUIInfoView())
+        ->setErrors($messages);
+    } else {
+      $changeset_view = id(new DifferentialChangesetListView())
+        ->setChangesets($changesets)
+        ->setVisibleChangesets($visible_changesets)
+        ->setStandaloneURI('/differential/changeset/')
+        ->setRawFileURIs(
+          '/differential/changeset/?view=old',
+          '/differential/changeset/?view=new')
+        ->setUser($viewer)
+        ->setDiff($target)
+        ->setRenderingReferences($rendering_references)
+        ->setVsMap($vs_map)
+        ->setWhitespace($whitespace)
+        ->setSymbolIndexes($symbol_indexes)
+        ->setTitle(pht('Diff %s', $target->getID()))
+        ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
 
-    if ($repository) {
-      $changeset_view->setRepository($repository);
-    }
 
-    if (!$viewer_is_anonymous) {
-      $changeset_view->setInlineCommentControllerURI(
-        '/differential/comment/inline/edit/'.$revision->getID().'/');
+      $revision_id = $revision->getID();
+      $inline_list_uri = "/revision/inlines/{$revision_id}/";
+      $inline_list_uri = $this->getApplicationURI($inline_list_uri);
+      $changeset_view->setInlineListURI($inline_list_uri);
+
+      if ($repository) {
+        $changeset_view->setRepository($repository);
+      }
+
+      if (!$viewer_is_anonymous) {
+        $changeset_view->setInlineCommentControllerURI(
+          '/differential/comment/inline/edit/'.$revision->getID().'/');
+      }
     }
 
     $broken_diffs = $this->loadHistoryDiffStatus($diffs);
@@ -312,7 +343,7 @@ public function handleRequest(AphrontRequest $request) {
       ->setLocalCommits(idx($props, 'local:commits'))
       ->setCommitsForLinks($commits_for_links);
 
-    if ($repository) {
+    if ($repository && !$this->isVeryLargeDiff()) {
       $other_revisions = $this->loadOtherRevisions(
         $changesets,
         $target,
@@ -328,10 +359,14 @@ public function handleRequest(AphrontRequest $request) {
 
     $this->buildPackageMaps($changesets);
 
-    $toc_view = $this->buildTableOfContents(
-      $changesets,
-      $visible_changesets,
-      $target->loadCoverageMap($viewer));
+    if ($this->isVeryLargeDiff()) {
+      $toc_view = null;
+    } else {
+      $toc_view = $this->buildTableOfContents(
+        $changesets,
+        $visible_changesets,
+        $target->loadCoverageMap($viewer));
+    }
 
     // Attach changesets to each reviewer so we can show which Owners package
     // reviewers own no files.
@@ -341,12 +376,17 @@ public function handleRequest(AphrontRequest $request) {
       $reviewer->attachChangesets($reviewer_changesets);
     }
 
-    $tab_group = id(new PHUITabGroupView())
-      ->addTab(
+    $tab_group = id(new PHUITabGroupView());
+
+    if ($toc_view) {
+      $tab_group->addTab(
         id(new PHUITabView())
           ->setName(pht('Files'))
           ->setKey('files')
-          ->appendChild($toc_view))
+          ->appendChild($toc_view));
+    }
+
+    $tab_group
       ->addTab(
         id(new PHUITabView())
           ->setName(pht('History'))
@@ -479,7 +519,7 @@ public function handleRequest(AphrontRequest $request) {
       PhabricatorShowFiletreeSetting::VALUE_ENABLE_FILETREE);
 
     $nav = null;
-    if ($filetree_on) {
+    if ($filetree_on && !$this->isVeryLargeDiff()) {
       $collapsed_key = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
       $collapsed_value = $viewer->getUserSetting($collapsed_key);
 

From f01c2e36948b0378eda726158ec86808cac2a9fd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 5 Apr 2018 05:26:18 -0700
Subject: [PATCH 780/865] Remove "Large Changes" documentation and make some
 minor behavioral improvements

Summary:
Depends on D19296. Ref T13110.

  - Remove the "Large Changesets" documentation since we now degrade very large changesets and I don't have any evidence that anyone has ever tried to follow any of the recommendations in this document.
  - Remove references to it.
  - When an older revision doesn't have denormalized size information on the Revision object itself, don't render a scale element (instead of rendering a bogus one).
  - Try to improve terminology consistency around "Large Change" (100-1000 files) vs "Very Large Change" (1000+ files) vs "Enormous Change" (too large to hold in memory).

Test Plan: Viewed revisions; grepped for documentation.

Maniphest Tasks: T13110

Differential Revision: https://secure.phabricator.com/D19298
---
 ...ferentialCreateRawDiffConduitAPIMethod.php |  5 +-
 .../DifferentialRevisionViewController.php    |  2 +-
 .../storage/DifferentialRevision.php          |  6 +++
 .../view/DifferentialRevisionListView.php     |  9 +++-
 .../flavor/writing_reviewable_code.diviner    |  3 --
 src/docs/user/userguide/differential.diviner  |  2 -
 .../differential_large_changes.diviner        | 54 -------------------
 7 files changed, 16 insertions(+), 65 deletions(-)
 delete mode 100644 src/docs/user/userguide/differential_large_changes.diviner

diff --git a/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php
index 6f8c2e8640..ae55135e92 100644
--- a/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php
@@ -56,10 +56,7 @@ protected function execute(ConduitAPIRequest $request) {
       throw new Exception(
         pht(
           'The raw diff you have submitted is too large to parse (it affects '.
-          'more than %s paths and hunks). Differential should only be used '.
-          'for changes which are small enough to receive detailed human '.
-          'review. See "Differential User Guide: Large Changes" in the '.
-          'documentation for more information.',
+          'more than %s paths and hunks).',
           new PhutilNumber($raw_limit)));
     }
 
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 60ed08a8d2..9b015887a6 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -158,7 +158,7 @@ public function handleRequest(AphrontRequest $request) {
     if (count($changesets) > $limit && !$large) {
       $count = count($changesets);
       $warning = new PHUIInfoView();
-      $warning->setTitle(pht('Very Large Diff'));
+      $warning->setTitle(pht('Large Diff'));
       $warning->setSeverity(PHUIInfoView::SEVERITY_WARNING);
       $warning->appendChild(hsprintf(
         '%s <strong>%s</strong>',
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index f11cbef7e0..2f7cee110f 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -742,6 +742,12 @@ public function getRemovedLineCount() {
     return $this->getProperty(self::PROPERTY_LINES_REMOVED);
   }
 
+  public function hasLineCounts() {
+    // This data was not populated on older revisions, so it may not be
+    // present on all revisions.
+    return isset($this->properties[self::PROPERTY_LINES_ADDED]);
+  }
+
   public function getRevisionScaleGlyphs() {
     $add = $this->getAddedLineCount();
     $rem = $this->getRemovedLineCount();
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
index 5f14a6b975..4c69d76274 100644
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -109,7 +109,10 @@ public function render() {
       $item->setHeader($revision->getTitle());
       $item->setHref($revision->getURI());
 
-      $item->addAttribute($this->renderRevisionSize($revision));
+      $size = $this->renderRevisionSize($revision);
+      if ($size !== null) {
+        $item->addAttribute($size);
+      }
 
       if ($revision->getHasDraft($viewer)) {
         $draft = id(new PHUIIconView())
@@ -193,6 +196,10 @@ public function render() {
   }
 
   private function renderRevisionSize(DifferentialRevision $revision) {
+    if (!$revision->hasLineCounts()) {
+      return null;
+    }
+
     $size = array();
 
     $glyphs = $revision->getRevisionScaleGlyphs();
diff --git a/src/docs/flavor/writing_reviewable_code.diviner b/src/docs/flavor/writing_reviewable_code.diviner
index 955fe65905..edff09f7d0 100644
--- a/src/docs/flavor/writing_reviewable_code.diviner
+++ b/src/docs/flavor/writing_reviewable_code.diviner
@@ -74,9 +74,6 @@ often well-correlated with complexity.
 We generally follow these practices in Phabricator. The median change size for
 Phabricator is 35 lines.
 
-See @{article:Differential User Guide: Large Changes} for information about
-reviewing big checkins.
-
 = Write Sensible Commit Messages =
 
 There are lots of resources for this on the internet. All of them say pretty
diff --git a/src/docs/user/userguide/differential.diviner b/src/docs/user/userguide/differential.diviner
index 414ad87a4f..496fba6388 100644
--- a/src/docs/user/userguide/differential.diviner
+++ b/src/docs/user/userguide/differential.diviner
@@ -66,8 +66,6 @@ Continue by:
   - diving into the details of inline comments in
     @{article:Differential User Guide: Inline Comments}; or
   - reading the FAQ at @{article:Differential User Guide: FAQ}; or
-  - learning about handling large changesets in
-    @{article:Differential User Guide: Large Changes}; or
   - learning about test plans in
     @{article:Differential User Guide: Test Plans}; or
   - learning more about Herald in @{article:Herald User Guide}.
diff --git a/src/docs/user/userguide/differential_large_changes.diviner b/src/docs/user/userguide/differential_large_changes.diviner
deleted file mode 100644
index 5d9f478297..0000000000
--- a/src/docs/user/userguide/differential_large_changes.diviner
+++ /dev/null
@@ -1,54 +0,0 @@
-@title Differential User Guide: Large Changes
-@group userguide
-
-Dealing with huge changesets, and when **not** to use Differential.
-
-= Overview =
-
-When you want code review for a given changeset, Differential is not always the
-right tool to use. The rule of thumb is that you should only send changes to
-Differential if you expect humans to review the actual differences in the source
-code from the web interface. This should cover the vast majority of changes but,
-for example, you usually should //not// submit changes like these through
-Differential:
-
-  - Committing an entire open source project to a private repo somewhere so
-    you can fork it or link against it.
-  - Committing an enormous text datafile, like a list of every English word or a
-    dump of a database.
-  - Making a trivial (e.g., find/replace or codemod) edit to 10,000 files.
-
-You can still try submitting these kinds of changes, but you may encounter
-problems getting them to work (database or connection timeouts, for example).
-Differential is pretty fast and scalable, but at some point either it or the
-browser will break down: you simply can't show nine million files on a webpage.
-
-More importantly, in all these cases, the text of the changes won't be reviewed
-by a human. The metadata associated with the change is what needs review (e.g.,
-what are you checking in, where are you putting it, and why? Does the change
-make sense? In the case of automated transformations, what script did you use?).
-To get review for these types of changes, one of these strategies will usually
-work better than trying to get the entire change into Differential:
-
-  - Send an email/AIM/IRC to your reviewer(s) like "Hey, I'm going to check in
-    the source for MySQL 9.3.1 to /full/path/to/whatever. The change is staged
-    in /home/whatever/path/somewhere if you want to take a look. Can I put your
-    name on the review?". This is best for straightforward changes. The reviewer
-    is not going to review MySQL's source itself, instead they are reviewing the
-    change metadata: which version are you checking in, why are you checking it
-    in, and where are you putting it? You won't be able to use "arc commit" or
-    "arc amend" to actually push the change. Just use "svn" or "git" and
-    manually edit the commit message instead. (It is normally sufficient to add
-    a "Reviewed By: <username>" field.)
-  - Create a Differential revision with only the metadata, like the script you
-    used to make automated changes or a text file explaining what you're doing,
-    and maybe a sample of some of the changes if they were automated. Include a
-    link to where the changes are staged so reviewers can look at the actual
-    changeset if they want to. This is best for more complicated changes, since
-    Differential can still be used for discussion and provide a permanent record
-    others can refer to. Once the revision is accepted, amend your local commit
-    (e.g. by `git commit --amend`) with the real change and push as usual.
-
-These kinds of changes are generally rare and don't have much in common, which
-is why there's no explicit support for them in Differential. If you frequently
-run into cases which Differential doesn't handle, let us know what they are.

From fc103f71e96b9e206c0d9016dadee91553334433 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Apr 2018 06:05:05 -0700
Subject: [PATCH 781/865] Fix very odd wrapping / linebreaking for Remarkup
 code block headers in Safari

Summary: Fixes T13118. Ref T13120. This construction is a little odd; I'm not entirely sure why Safari is doing what it's doing, but this appears to fix it.

Test Plan: Viewed blocks like those in T13118 in Safari. Before the patch, weird last-letter wrapping. After the patch, sensible behavior.

Maniphest Tasks: T13118, T13120

Differential Revision: https://secure.phabricator.com/D19303
---
 resources/celerity/map.php         | 6 +++---
 webroot/rsrc/css/core/remarkup.css | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index e0bb41b8aa..79e645a927 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '49b87886',
+    'core.pkg.css' => '29452b31',
     'core.pkg.js' => '1ea38af8',
     'differential.pkg.css' => '113e692c',
     'differential.pkg.js' => 'f6d809c0',
@@ -112,7 +112,7 @@
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '62fa3ace',
-    'rsrc/css/core/remarkup.css' => '1828e2ad',
+    'rsrc/css/core/remarkup.css' => '924fc97d',
     'rsrc/css/core/syntax.css' => 'cae95e89',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
@@ -780,7 +780,7 @@
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '77b0ae28',
-    'phabricator-remarkup-css' => '1828e2ad',
+    'phabricator-remarkup-css' => '924fc97d',
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index 990c6f0bab..dad202a9c8 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -34,6 +34,7 @@
   display: inline-block;
   border-top-left-radius: 3px;
   border-top-right-radius: 3px;
+  overflow: hidden;
 }
 
 .phabricator-remarkup .code-block-counterexample .remarkup-code-header {

From af87f414e8339f1a6cc9a163ce01507aa6ca16dc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Apr 2018 06:10:05 -0700
Subject: [PATCH 782/865] Stop the debugging view for typeahead datasources
 from fataling

Summary: Fixes T13119. Ref T13120. This isn't the world's most elegant patch, but restores the debugging version of this view to service.

Test Plan: Viewed debugging phage (at `/typeahead/class/`). Used the actual proxy (by changing a datasource custom field from the comment area).

Maniphest Tasks: T13120, T13119

Differential Revision: https://secure.phabricator.com/D19304
---
 ...PhabricatorTypeaheadModularDatasourceController.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
index e0ba9a763b..9e905f8cce 100644
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
@@ -276,10 +276,20 @@ public function handleRequest(AphrontRequest $request) {
     // format to make it easier to debug typeahead output.
 
     foreach ($sources as $key => $source) {
+      // See T13119. Exclude proxy datasources from the dropdown since they
+      // fatal if built like this without actually being configured with an
+      // underlying datasource. This is a bit hacky but this is just a
+      // debugging/development UI anyway.
+      if ($source instanceof PhabricatorTypeaheadProxyDatasource) {
+        unset($sources[$key]);
+        continue;
+      }
+
       // This can happen with composite or generic sources.
       if (!$source->getDatasourceApplicationClass()) {
         continue;
       }
+
       if (!PhabricatorApplication::isClassInstalledForViewer(
         $source->getDatasourceApplicationClass(),
         $viewer)) {

From 9bb338c0384ec4876a0c171b98888fdb074e195e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Apr 2018 10:10:34 -0700
Subject: [PATCH 783/865] Revert the alternate menu names for applications

Summary: This reverts D18524. See that revision for discussion.

Test Plan: Viewed home menu, saw application names as menu items.

Differential Revision: https://secure.phabricator.com/D19308
---
 src/applications/base/PhabricatorApplication.php              | 4 ----
 .../application/PhabricatorDifferentialApplication.php        | 4 ----
 .../diffusion/application/PhabricatorDiffusionApplication.php | 4 ----
 .../maniphest/application/PhabricatorManiphestApplication.php | 4 ----
 .../phame/application/PhabricatorPhameApplication.php         | 4 ----
 .../pholio/application/PhabricatorPholioApplication.php       | 4 ----
 .../phriction/application/PhabricatorPhrictionApplication.php | 4 ----
 .../search/menuitem/PhabricatorApplicationProfileMenuItem.php | 2 +-
 8 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index 420d126507..e276e035e4 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -57,10 +57,6 @@ final public function save() {
 
   abstract public function getName();
 
-  public function getMenuName() {
-    return $this->getName();
-  }
-
   public function getShortDescription() {
     return pht('%s Application', $this->getName());
   }
diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
index da40739579..eaa4948eee 100644
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -10,10 +10,6 @@ public function getName() {
     return pht('Differential');
   }
 
-  public function getMenuName() {
-    return pht('Code Review');
-  }
-
   public function getShortDescription() {
     return pht('Pre-Commit Review');
   }
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index d42e58b747..90956077fd 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -6,10 +6,6 @@ public function getName() {
     return pht('Diffusion');
   }
 
-  public function getMenuName() {
-    return pht('Repositories');
-  }
-
   public function getShortDescription() {
     return pht('Host and Browse Repositories');
   }
diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
index 0075770863..e57b9b545e 100644
--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
@@ -6,10 +6,6 @@ public function getName() {
     return pht('Maniphest');
   }
 
-  public function getMenuName() {
-    return pht('Tasks');
-  }
-
   public function getShortDescription() {
     return pht('Tasks and Bugs');
   }
diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php
index f9ee2831b2..9342076ddd 100644
--- a/src/applications/phame/application/PhabricatorPhameApplication.php
+++ b/src/applications/phame/application/PhabricatorPhameApplication.php
@@ -6,10 +6,6 @@ public function getName() {
     return pht('Phame');
   }
 
-  public function getMenuName() {
-    return pht('Blogs');
-  }
-
   public function getBaseURI() {
     return '/phame/';
   }
diff --git a/src/applications/pholio/application/PhabricatorPholioApplication.php b/src/applications/pholio/application/PhabricatorPholioApplication.php
index 4afaeba263..4d80dd12ae 100644
--- a/src/applications/pholio/application/PhabricatorPholioApplication.php
+++ b/src/applications/pholio/application/PhabricatorPholioApplication.php
@@ -6,10 +6,6 @@ public function getName() {
     return pht('Pholio');
   }
 
-  public function getMenuName() {
-    return pht('Design Review');
-  }
-
   public function getBaseURI() {
     return '/pholio/';
   }
diff --git a/src/applications/phriction/application/PhabricatorPhrictionApplication.php b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
index 1b06fd197c..ea91727c76 100644
--- a/src/applications/phriction/application/PhabricatorPhrictionApplication.php
+++ b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
@@ -6,10 +6,6 @@ public function getName() {
     return pht('Phriction');
   }
 
-  public function getMenuName() {
-    return pht('Wiki');
-  }
-
   public function getShortDescription() {
     return pht('Wiki Documents');
   }
diff --git a/src/applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php
index 40275a8d7a..aa42d56cfb 100644
--- a/src/applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorApplicationProfileMenuItem.php
@@ -31,7 +31,7 @@ public function getDisplayName(
       return $name;
     }
 
-    return $application->getMenuName();
+    return $application->getName();
   }
 
   public function buildEditEngineFields(

From 7d4e25614d001e26557203da12194366f1ef750a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 5 Apr 2018 07:31:47 -0700
Subject: [PATCH 784/865] Remove the ability to disable blame in Diffusion

Summary: Ref T13105. Given that we now load blame with AJAX, it's not clear that there's any benefit to disabling it. This would also interact oddly with the document engine.

Test Plan: Viewed files in Diffusion, no longer saw blame-related options.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19300
---
 .../controller/DiffusionBrowseController.php  | 126 +++++-------------
 1 file changed, 30 insertions(+), 96 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index a2380aab4a..8c0c2c19c4 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -111,41 +111,18 @@ private function browseFile() {
 
     $path = $drequest->getPath();
 
-    $blame_key = PhabricatorDiffusionBlameSetting::SETTINGKEY;
-    $show_blame = $request->getBool(
-      'blame',
-      $viewer->getUserSetting($blame_key));
-
-    $view = $request->getStr('view');
-    if ($request->isFormPost() && $view != 'raw' && $viewer->isLoggedIn()) {
-      $preferences = PhabricatorUserPreferences::loadUserPreferences($viewer);
-
-      $editor = id(new PhabricatorUserPreferencesEditor())
-        ->setActor($viewer)
-        ->setContentSourceFromRequest($request)
-        ->setContinueOnNoEffect(true)
-        ->setContinueOnMissingFields(true);
-
-      $xactions = array();
-      $xactions[] = $preferences->newTransaction($blame_key, $show_blame);
-      $editor->applyTransactions($preferences, $xactions);
-
-      $uri = $request->getRequestURI()
-        ->alter('blame', null);
-
-      return id(new AphrontRedirectResponse())->setURI($uri);
-    }
-
     // We need the blame information if blame is on and this is an Ajax request.
     // If blame is on and this is a colorized request, we don't show blame at
     // first (we ajax it in afterward) so we don't need to query for it.
-    $needs_blame = ($show_blame && $request->isAjax());
+    $needs_blame = $request->isAjax();
 
     $params = array(
       'commit' => $drequest->getCommit(),
       'path' => $drequest->getPath(),
     );
 
+    $view = $request->getStr('view');
+
     $byte_limit = null;
     if ($view !== 'raw') {
       $byte_limit = PhabricatorFileStorageEngine::getChunkThreshold();
@@ -225,7 +202,6 @@ private function browseFile() {
 
         // Build the content of the file.
         $corpus = $this->buildCorpus(
-          $show_blame,
           $data,
           $needs_blame,
           $drequest,
@@ -240,8 +216,7 @@ private function browseFile() {
 
     require_celerity_resource('diffusion-source-css');
 
-    // Render the page.
-    $bar = $this->buildButtonBar($drequest, $show_blame, $show_editor);
+    $bar = $this->buildButtonBar($drequest, $show_editor);
     $header = $this->buildHeaderView($drequest);
     $header->setHeaderIcon('fa-file-code-o');
 
@@ -540,7 +515,6 @@ private function loadLintMessages() {
   }
 
   private function buildCorpus(
-    $show_blame,
     $file_corpus,
     $needs_blame,
     DiffusionRequest $drequest,
@@ -585,8 +559,7 @@ private function buildCorpus(
     $rows = $this->buildDisplayRows(
       $lines,
       $blame_list,
-      $blame_commits,
-      $show_blame);
+      $blame_commits);
 
     $corpus_table = javelin_tag(
       'table',
@@ -677,7 +650,7 @@ private function buildCorpus(
         phutil_format_bytes($highlight_limit));
     }
 
-    if ($show_blame && !$can_blame) {
+    if (!$can_blame) {
       $messages[] = pht(
         'This file is larger than %s, so blame is disabled.',
         phutil_format_bytes($blame_limit));
@@ -701,7 +674,6 @@ private function buildCorpus(
 
   private function buildButtonBar(
     DiffusionRequest $drequest,
-    $show_blame,
     $show_editor) {
 
     $viewer = $this->getViewer();
@@ -728,38 +700,6 @@ private function buildButtonBar(
             )))
         ->setIcon('fa-backward');
 
-    if ($show_blame) {
-      $blame_text = pht('Disable Blame');
-      $blame_icon = 'fa-exclamation-circle lightgreytext';
-      $blame_value = 0;
-    } else {
-      $blame_text = pht('Enable Blame');
-      $blame_icon = 'fa-exclamation-circle';
-      $blame_value = 1;
-    }
-
-    $blame = id(new PHUIButtonView())
-      ->setText($blame_text)
-      ->setIcon($blame_icon)
-      ->setUser($viewer)
-      ->setSelected(!$blame_value)
-      ->setColor(PHUIButtonView::GREY);
-
-    if ($viewer->isLoggedIn()) {
-      $blame = phabricator_form(
-        $viewer,
-        array(
-          'action' => $base_uri->alter('blame', $blame_value),
-          'method' => 'POST',
-          'style' => 'display: inline-block;',
-        ),
-        $blame);
-    } else {
-      $blame->setTag('a');
-      $blame->setHref($base_uri->alter('blame', $blame_value));
-    }
-    $buttons[] = $blame;
-
     if ($editor_link) {
       $buttons[] =
         id(new PHUIButtonView())
@@ -931,8 +871,7 @@ private function renderGitLFSButton() {
   private function buildDisplayRows(
     array $lines,
     array $blame_list,
-    array $blame_commits,
-    $show_blame) {
+    array $blame_commits) {
 
     $request = $this->getRequest();
     $viewer = $this->getViewer();
@@ -1123,7 +1062,6 @@ private function buildDisplayRows(
 
     $rows = $this->renderInlines(
       idx($inlines, 0, array()),
-      $show_blame,
       (bool)$this->coverage,
       $engine);
 
@@ -1157,7 +1095,7 @@ private function buildDisplayRows(
 
     $skip_text = pht('Skip Past This Commit');
     $skip_icon = id(new PHUIIconView())
-      ->setIcon('fa-caret-square-o-left');
+      ->setIcon('fa-backward');
 
     foreach ($display as $line_index => $line) {
       $row = array();
@@ -1191,7 +1129,7 @@ private function buildDisplayRows(
           }
         }
 
-        $skip_href = $line_href.'?before='.$identifier.'&view=blame';
+        $skip_href = $line_href.'?before='.$identifier;
         $before_link = javelin_tag(
           'a',
           array(
@@ -1206,30 +1144,28 @@ private function buildDisplayRows(
           $skip_icon);
       }
 
-      if ($show_blame) {
-        $row[] = phutil_tag(
-          'th',
-          array(
-            'class' => 'diffusion-blame-link',
-          ),
-          $before_link);
-
-        $object_links = array();
-        $object_links[] = $author_link;
-        $object_links[] = $commit_link;
-        if ($revision_link) {
-          $object_links[] = phutil_tag('span', array(), '/');
-          $object_links[] = $revision_link;
-        }
-
-        $row[] = phutil_tag(
-          'th',
-          array(
-            'class' => 'diffusion-rev-link',
-          ),
-          $object_links);
+      $row[] = phutil_tag(
+        'th',
+        array(
+          'class' => 'diffusion-blame-link',
+        ),
+        $before_link);
+
+      $object_links = array();
+      $object_links[] = $author_link;
+      $object_links[] = $commit_link;
+      if ($revision_link) {
+        $object_links[] = phutil_tag('span', array(), '/');
+        $object_links[] = $revision_link;
       }
 
+      $row[] = phutil_tag(
+        'th',
+        array(
+          'class' => 'diffusion-rev-link',
+        ),
+        $object_links);
+
       $line_link = phutil_tag(
         'a',
         array(
@@ -1305,7 +1241,6 @@ private function buildDisplayRows(
 
       $cur_inlines = $this->renderInlines(
         idx($inlines, $line_number, array()),
-        $show_blame,
         $this->coverage,
         $engine);
       foreach ($cur_inlines as $cur_inline) {
@@ -1318,7 +1253,6 @@ private function buildDisplayRows(
 
   private function renderInlines(
     array $inlines,
-    $show_blame,
     $has_coverage,
     $engine) {
 
@@ -1333,7 +1267,7 @@ private function renderInlines(
         ->setInlineComment($inline)
         ->render();
 
-      $row = array_fill(0, ($show_blame ? 3 : 1), phutil_tag('th'));
+      $row = array_fill(0, 3, phutil_tag('th'));
 
       $row[] = phutil_tag('td', array(), $inline_view);
 

From 245132a0b22e9f572acda9b7b90b96475845d4b9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 5 Apr 2018 08:21:12 -0700
Subject: [PATCH 785/865] Pull file Document Engine rendering out of "Files"
 application controllers

Summary:
Ref T13105. This separates document rendering from the Controllers which trigger it so it can be reused elsewhere (notably, in Diffusion).

This shouldn't cause any application behavior to change, it just pulls the rendering logic out so it can be reused elsewhere.

Test Plan: Viewed various types of files in Files; toggled rendering, highlighting, and encoding.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19301
---
 src/__phutil_library_map__.php                |   4 +
 .../PhabricatorFilesApplication.php           |   2 +-
 .../PhabricatorFileDocumentController.php     | 100 +-----
 .../PhabricatorFileViewController.php         | 113 +------
 .../document/PhabricatorDocumentEngine.php    |  12 -
 .../PhabricatorDocumentRenderingEngine.php    | 285 ++++++++++++++++++
 ...PhabricatorFileDocumentRenderingEngine.php |  47 +++
 7 files changed, 344 insertions(+), 219 deletions(-)
 create mode 100644 src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
 create mode 100644 src/applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 391b8fb1f2..95f8ed45b2 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2819,6 +2819,7 @@
     'PhabricatorDivinerApplication' => 'applications/diviner/application/PhabricatorDivinerApplication.php',
     'PhabricatorDocumentEngine' => 'applications/files/document/PhabricatorDocumentEngine.php',
     'PhabricatorDocumentRef' => 'applications/files/document/PhabricatorDocumentRef.php',
+    'PhabricatorDocumentRenderingEngine' => 'applications/files/document/render/PhabricatorDocumentRenderingEngine.php',
     'PhabricatorDoorkeeperApplication' => 'applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php',
     'PhabricatorDraft' => 'applications/draft/storage/PhabricatorDraft.php',
     'PhabricatorDraftDAO' => 'applications/draft/storage/PhabricatorDraftDAO.php',
@@ -3010,6 +3011,7 @@
     'PhabricatorFileDeleteController' => 'applications/files/controller/PhabricatorFileDeleteController.php',
     'PhabricatorFileDeleteTransaction' => 'applications/files/xaction/PhabricatorFileDeleteTransaction.php',
     'PhabricatorFileDocumentController' => 'applications/files/controller/PhabricatorFileDocumentController.php',
+    'PhabricatorFileDocumentRenderingEngine' => 'applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php',
     'PhabricatorFileDropUploadController' => 'applications/files/controller/PhabricatorFileDropUploadController.php',
     'PhabricatorFileEditController' => 'applications/files/controller/PhabricatorFileEditController.php',
     'PhabricatorFileEditEngine' => 'applications/files/editor/PhabricatorFileEditEngine.php',
@@ -8401,6 +8403,7 @@
     'PhabricatorDivinerApplication' => 'PhabricatorApplication',
     'PhabricatorDocumentEngine' => 'Phobject',
     'PhabricatorDocumentRef' => 'Phobject',
+    'PhabricatorDocumentRenderingEngine' => 'Phobject',
     'PhabricatorDoorkeeperApplication' => 'PhabricatorApplication',
     'PhabricatorDraft' => 'PhabricatorDraftDAO',
     'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
@@ -8624,6 +8627,7 @@
     'PhabricatorFileDeleteController' => 'PhabricatorFileController',
     'PhabricatorFileDeleteTransaction' => 'PhabricatorFileTransactionType',
     'PhabricatorFileDocumentController' => 'PhabricatorFileController',
+    'PhabricatorFileDocumentRenderingEngine' => 'PhabricatorDocumentRenderingEngine',
     'PhabricatorFileDropUploadController' => 'PhabricatorFileController',
     'PhabricatorFileEditController' => 'PhabricatorFileController',
     'PhabricatorFileEditEngine' => 'PhabricatorEditEngine',
diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
index 5bf1ebccc4..14bbd83e78 100644
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -73,7 +73,7 @@ public function getRoutes() {
         => 'PhabricatorFileViewController',
       '/file/' => array(
         '(query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorFileListController',
-        'view/(?P<id>[^/]+)/'.
+        'view/(?P<id>[1-9]\d*)/'.
           '(?:(?P<engineKey>[^/]+)/)?'.
           '(?:\$(?P<lines>\d+(?:-\d+)?))?'
           => 'PhabricatorFileViewController',
diff --git a/src/applications/files/controller/PhabricatorFileDocumentController.php b/src/applications/files/controller/PhabricatorFileDocumentController.php
index 15fadaa289..e74b0bc6eb 100644
--- a/src/applications/files/controller/PhabricatorFileDocumentController.php
+++ b/src/applications/files/controller/PhabricatorFileDocumentController.php
@@ -3,10 +3,6 @@
 final class PhabricatorFileDocumentController
   extends PhabricatorFileController {
 
-  private $file;
-  private $engine;
-  private $ref;
-
   public function shouldAllowPublic() {
     return true;
   }
@@ -26,102 +22,14 @@ public function handleRequest(AphrontRequest $request) {
           'This file ("%s") does not exist or could not be loaded.',
           $file_phid));
     }
-    $this->file = $file;
 
     $ref = id(new PhabricatorDocumentRef())
       ->setFile($file);
-    $this->ref = $ref;
-
-    $engines = PhabricatorDocumentEngine::getEnginesForRef($viewer, $ref);
-    $engine_key = $request->getURIData('engineKey');
-    if (!isset($engines[$engine_key])) {
-      return $this->newErrorResponse(
-        pht(
-          'The engine ("%s") is unknown, or unable to render this document.',
-          $engine_key));
-    }
-    $engine = $engines[$engine_key];
-    $this->engine = $engine;
-
-    $encode_setting = $request->getStr('encode');
-    if (strlen($encode_setting)) {
-      $engine->setEncodingConfiguration($encode_setting);
-    }
-
-    $highlight_setting = $request->getStr('highlight');
-    if (strlen($highlight_setting)) {
-      $engine->setHighlightingConfiguration($highlight_setting);
-    }
-
-    try {
-      $content = $engine->newDocument($ref);
-    } catch (Exception $ex) {
-      return $this->newErrorResponse($ex->getMessage());
-    }
-
-    return $this->newContentResponse($content);
-  }
-
-  private function newErrorResponse($message) {
-    $container = phutil_tag(
-      'div',
-      array(
-        'class' => 'document-engine-error',
-      ),
-      array(
-        id(new PHUIIconView())
-          ->setIcon('fa-exclamation-triangle red'),
-        ' ',
-        $message,
-      ));
-
-    return $this->newContentResponse($container);
-  }
-
-
-  private function newContentResponse($content) {
-    $viewer = $this->getViewer();
-    $request = $this->getRequest();
-
-    $file = $this->file;
-    $engine = $this->engine;
-    $ref = $this->ref;
-
-    if ($request->isAjax()) {
-      return id(new AphrontAjaxResponse())
-        ->setContent(
-          array(
-            'markup' => hsprintf('%s', $content),
-          ));
-    }
-
-    $crumbs = $this->buildApplicationCrumbs();
-    if ($file) {
-      $crumbs->addTextCrumb($file->getMonogram(), $file->getInfoURI());
-    }
-
-    $label = $engine->getViewAsLabel($ref);
-    if ($label) {
-      $crumbs->addTextCrumb($label);
-    }
-
-    $crumbs->setBorder(true);
-
-    $content_frame = id(new PHUIObjectBoxView())
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->appendChild($content);
-
-    $page_frame = id(new PHUITwoColumnView())
-      ->setFooter($content_frame);
 
-    return $this->newPage()
-      ->setCrumbs($crumbs)
-      ->setTitle(
-        array(
-          $ref->getName(),
-          pht('Standalone'),
-        ))
-      ->appendChild($page_frame);
+    return id(new PhabricatorFileDocumentRenderingEngine())
+      ->setRequest($request)
+      ->setController($this)
+      ->newRenderResponse($ref);
   }
 
 }
diff --git a/src/applications/files/controller/PhabricatorFileViewController.php b/src/applications/files/controller/PhabricatorFileViewController.php
index 9d32ff6fb1..42a632424d 100644
--- a/src/applications/files/controller/PhabricatorFileViewController.php
+++ b/src/applications/files/controller/PhabricatorFileViewController.php
@@ -403,122 +403,15 @@ private function loadStorageEngine(PhabricatorFile $file) {
   }
 
   private function newFileContent(PhabricatorFile $file) {
-    $viewer = $this->getViewer();
     $request = $this->getRequest();
 
     $ref = id(new PhabricatorDocumentRef())
       ->setFile($file);
 
-    $engines = PhabricatorDocumentEngine::getEnginesForRef($viewer, $ref);
-
-    $engine_key = $request->getURIData('engineKey');
-    if (!isset($engines[$engine_key])) {
-      $engine_key = head_key($engines);
-    }
-    $engine = $engines[$engine_key];
-
-    $lines = $request->getURILineRange('lines', 1000);
-    if ($lines) {
-      $engine->setHighlightedLines(range($lines[0], $lines[1]));
-    }
-
-    $encode_setting = $request->getStr('encode');
-    if (strlen($encode_setting)) {
-      $engine->setEncodingConfiguration($encode_setting);
-    }
-
-    $highlight_setting = $request->getStr('highlight');
-    if (strlen($highlight_setting)) {
-      $engine->setHighlightingConfiguration($highlight_setting);
-    }
+    $engine = id(new PhabricatorFileDocumentRenderingEngine())
+      ->setRequest($request);
 
-    $views = array();
-    foreach ($engines as $candidate_key => $candidate_engine) {
-      $label = $candidate_engine->getViewAsLabel($ref);
-      if ($label === null) {
-        continue;
-      }
-
-      $view_uri = '/file/view/'.$file->getID().'/'.$candidate_key.'/';
-
-      $view_icon = $candidate_engine->getViewAsIconIcon($ref);
-      $view_color = $candidate_engine->getViewAsIconColor($ref);
-      $loading = $candidate_engine->newLoadingContent($ref);
-
-      $views[] = array(
-        'viewKey' => $candidate_engine->getDocumentEngineKey(),
-        'icon' => $view_icon,
-        'color' => $view_color,
-        'name' => $label,
-        'engineURI' => $candidate_engine->getRenderURI($ref),
-        'viewURI' => $view_uri,
-        'loadingMarkup' => hsprintf('%s', $loading),
-        'canEncode' => $candidate_engine->canConfigureEncoding($ref),
-        'canHighlight' => $candidate_engine->CanConfigureHighlighting($ref),
-      );
-    }
-
-    $viewport_id = celerity_generate_unique_node_id();
-    $control_id = celerity_generate_unique_node_id();
-    $icon = $engine->newDocumentIcon($ref);
-
-    if ($engine->shouldRenderAsync($ref)) {
-      $content = $engine->newLoadingContent($ref);
-      $config = array(
-        'renderControlID' => $control_id,
-      );
-    } else {
-      $content = $engine->newDocument($ref);
-      $config = array();
-    }
-
-    Javelin::initBehavior('document-engine', $config);
-
-    $viewport = phutil_tag(
-      'div',
-      array(
-        'id' => $viewport_id,
-      ),
-      $content);
-
-    $meta = array(
-      'viewportID' => $viewport_id,
-      'viewKey' => $engine->getDocumentEngineKey(),
-      'views' => $views,
-      'standaloneURI' => $engine->getRenderURI($ref),
-      'encode' => array(
-        'icon' => 'fa-font',
-        'name' => pht('Change Text Encoding...'),
-        'uri' => '/services/encoding/',
-        'value' => $encode_setting,
-      ),
-      'highlight' => array(
-        'icon' => 'fa-lightbulb-o',
-        'name' => pht('Highlight As...'),
-        'uri' => '/services/highlight/',
-        'value' => $highlight_setting,
-      ),
-    );
-
-    $view_button = id(new PHUIButtonView())
-      ->setTag('a')
-      ->setText(pht('View Options'))
-      ->setIcon('fa-file-image-o')
-      ->setColor(PHUIButtonView::GREY)
-      ->setID($control_id)
-      ->setMetadata($meta)
-      ->setDropdown(true)
-      ->addSigil('document-engine-view-dropdown');
-
-    $header = id(new PHUIHeaderView())
-      ->setHeaderIcon($icon)
-      ->setHeader($ref->getName())
-      ->addActionLink($view_button);
-
-    return id(new PHUIObjectBoxView())
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setHeader($header)
-      ->appendChild($viewport);
+    return $engine->newDocumentView($ref);
   }
 
 }
diff --git a/src/applications/files/document/PhabricatorDocumentEngine.php b/src/applications/files/document/PhabricatorDocumentEngine.php
index c3a1a7317a..17feed1c3e 100644
--- a/src/applications/files/document/PhabricatorDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorDocumentEngine.php
@@ -152,18 +152,6 @@ public function getViewAsIconColor(PhabricatorDocumentRef $ref) {
     return null;
   }
 
-  public function getRenderURI(PhabricatorDocumentRef $ref) {
-    $file = $ref->getFile();
-    if (!$file) {
-      throw new PhutilMethodNotImplementedException();
-    }
-
-    $engine_key = $this->getDocumentEngineKey();
-    $file_phid = $file->getPHID();
-
-    return "/file/document/{$engine_key}/{$file_phid}/";
-  }
-
   final public static function getEnginesForRef(
     PhabricatorUser $viewer,
     PhabricatorDocumentRef $ref) {
diff --git a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
new file mode 100644
index 0000000000..37b0917a65
--- /dev/null
+++ b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
@@ -0,0 +1,285 @@
+<?php
+
+abstract class PhabricatorDocumentRenderingEngine
+  extends Phobject {
+
+  private $request;
+  private $controller;
+  private $activeEngine;
+
+  final public function setRequest(AphrontRequest $request) {
+    $this->request = $request;
+    return $this;
+  }
+
+  final public function getRequest() {
+    if (!$this->request) {
+      throw new PhutilInvalidStateException('setRequest');
+    }
+
+    return $this->request;
+  }
+
+  final public function setController(PhabricatorController $controller) {
+    $this->controller = $controller;
+    return $this;
+  }
+
+  final public function getController() {
+    if (!$this->controller) {
+      throw new PhutilInvalidStateException('setController');
+    }
+
+    return $this->controller;
+  }
+
+  final protected function getActiveEngine() {
+    if (!$this->activeEngine) {
+      throw new PhutilInvalidStateException('setActiveEngine');
+    }
+
+    return $this->activeEngine;
+  }
+
+  final public function newDocumentView(PhabricatorDocumentRef $ref) {
+    $request = $this->getRequest();
+    $viewer = $request->getViewer();
+
+    $engines = PhabricatorDocumentEngine::getEnginesForRef($viewer, $ref);
+
+    $engine_key = $this->getSelectedDocumentEngineKey();
+    if (!isset($engines[$engine_key])) {
+      $engine_key = head_key($engines);
+    }
+    $engine = $engines[$engine_key];
+
+    $lines = $request->getURILineRange('lines', 1000);
+    if ($lines) {
+      $engine->setHighlightedLines(range($lines[0], $lines[1]));
+    }
+
+    $encode_setting = $request->getStr('encode');
+    if (strlen($encode_setting)) {
+      $engine->setEncodingConfiguration($encode_setting);
+    }
+
+    $highlight_setting = $request->getStr('highlight');
+    if (strlen($highlight_setting)) {
+      $engine->setHighlightingConfiguration($highlight_setting);
+    }
+
+    $views = array();
+    foreach ($engines as $candidate_key => $candidate_engine) {
+      $label = $candidate_engine->getViewAsLabel($ref);
+      if ($label === null) {
+        continue;
+      }
+
+      $view_uri = $this->newRefViewURI($ref, $candidate_engine);
+
+      $view_icon = $candidate_engine->getViewAsIconIcon($ref);
+      $view_color = $candidate_engine->getViewAsIconColor($ref);
+      $loading = $candidate_engine->newLoadingContent($ref);
+
+      $views[] = array(
+        'viewKey' => $candidate_engine->getDocumentEngineKey(),
+        'icon' => $view_icon,
+        'color' => $view_color,
+        'name' => $label,
+        'engineURI' => $this->newRefRenderURI($ref, $candidate_engine),
+        'viewURI' => $view_uri,
+        'loadingMarkup' => hsprintf('%s', $loading),
+        'canEncode' => $candidate_engine->canConfigureEncoding($ref),
+        'canHighlight' => $candidate_engine->CanConfigureHighlighting($ref),
+      );
+    }
+
+    $viewport_id = celerity_generate_unique_node_id();
+    $control_id = celerity_generate_unique_node_id();
+    $icon = $engine->newDocumentIcon($ref);
+
+    if ($engine->shouldRenderAsync($ref)) {
+      $content = $engine->newLoadingContent($ref);
+      $config = array(
+        'renderControlID' => $control_id,
+      );
+    } else {
+      $content = $engine->newDocument($ref);
+      $config = array();
+    }
+
+    Javelin::initBehavior('document-engine', $config);
+
+    $viewport = phutil_tag(
+      'div',
+      array(
+        'id' => $viewport_id,
+      ),
+      $content);
+
+    $meta = array(
+      'viewportID' => $viewport_id,
+      'viewKey' => $engine->getDocumentEngineKey(),
+      'views' => $views,
+      'encode' => array(
+        'icon' => 'fa-font',
+        'name' => pht('Change Text Encoding...'),
+        'uri' => '/services/encoding/',
+        'value' => $encode_setting,
+      ),
+      'highlight' => array(
+        'icon' => 'fa-lightbulb-o',
+        'name' => pht('Highlight As...'),
+        'uri' => '/services/highlight/',
+        'value' => $highlight_setting,
+      ),
+    );
+
+    $view_button = id(new PHUIButtonView())
+      ->setTag('a')
+      ->setText(pht('View Options'))
+      ->setIcon('fa-file-image-o')
+      ->setColor(PHUIButtonView::GREY)
+      ->setID($control_id)
+      ->setMetadata($meta)
+      ->setDropdown(true)
+      ->addSigil('document-engine-view-dropdown');
+
+    $header = id(new PHUIHeaderView())
+      ->setHeaderIcon($icon)
+      ->setHeader($ref->getName())
+      ->addActionLink($view_button);
+
+    return id(new PHUIObjectBoxView())
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setHeader($header)
+      ->appendChild($viewport);
+  }
+
+  abstract protected function newRefViewURI(
+    PhabricatorDocumentRef $ref,
+    PhabricatorDocumentEngine $engine);
+
+  abstract protected function newRefRenderURI(
+    PhabricatorDocumentRef $ref,
+    PhabricatorDocumentEngine $engine);
+
+  protected function getSelectedDocumentEngineKey() {
+    return $this->getRequest()->getURIData('engineKey');
+  }
+
+  final public function newRenderResponse(PhabricatorDocumentRef $ref) {
+    $request = $this->getRequest();
+    $viewer = $request->getViewer();
+
+    $engines = PhabricatorDocumentEngine::getEnginesForRef($viewer, $ref);
+    $engine_key = $request->getURIData('engineKey');
+    if (!isset($engines[$engine_key])) {
+      return $this->newErrorResponse(
+        $ref,
+        pht(
+          'The engine ("%s") is unknown, or unable to render this document.',
+          $engine_key));
+    }
+    $engine = $engines[$engine_key];
+
+    $this->activeEngine = $engine;
+
+    $encode_setting = $request->getStr('encode');
+    if (strlen($encode_setting)) {
+      $engine->setEncodingConfiguration($encode_setting);
+    }
+
+    $highlight_setting = $request->getStr('highlight');
+    if (strlen($highlight_setting)) {
+      $engine->setHighlightingConfiguration($highlight_setting);
+    }
+
+    try {
+      $content = $engine->newDocument($ref);
+    } catch (Exception $ex) {
+      return $this->newErrorResponse($ref, $ex->getMessage());
+    }
+
+    return $this->newContentResponse($ref, $content);
+  }
+
+  private function newErrorResponse(
+    PhabricatorDocumentRef $ref,
+    $message) {
+
+    $container = phutil_tag(
+      'div',
+      array(
+        'class' => 'document-engine-error',
+      ),
+      array(
+        id(new PHUIIconView())
+          ->setIcon('fa-exclamation-triangle red'),
+        ' ',
+        $message,
+      ));
+
+    return $this->newContentResponse($ref, $container);
+  }
+
+  private function newContentResponse(
+    PhabricatorDocumentRef $ref,
+    $content) {
+
+    $request = $this->getRequest();
+    $viewer = $request->getViewer();
+    $controller = $this->getController();
+
+    if ($request->isAjax()) {
+      return id(new AphrontAjaxResponse())
+        ->setContent(
+          array(
+            'markup' => hsprintf('%s', $content),
+          ));
+    }
+
+    $crumbs = $this->newCrumbs($ref);
+    if ($crumbs) {
+      $crumbs->setBorder(true);
+    }
+
+    $content_frame = id(new PHUIObjectBoxView())
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->appendChild($content);
+
+    $page_frame = id(new PHUITwoColumnView())
+      ->setFooter($content_frame);
+
+    return $controller->newPage()
+      ->setCrumbs($crumbs)
+      ->setTitle(
+        array(
+          $ref->getName(),
+          pht('Standalone'),
+        ))
+      ->appendChild($page_frame);
+  }
+
+  protected function newCrumbs(PhabricatorDocumentRef $ref) {
+    $controller = $this->getController();
+    $crumbs = $controller->buildApplicationCrumbsForEditEngine();
+
+    $this->addApplicationCrumbs($ref, $crumbs);
+
+    $engine = $this->getActiveEngine();
+    $label = $engine->getViewAsLabel($ref);
+    if ($label) {
+      $crumbs->addTextCrumb($label);
+    }
+
+    return $crumbs;
+  }
+
+  protected function addApplicationCrumbs(
+    PhabricatorDocumentRef $ref,
+    PHUICrumbsView $crumbs) {
+    return;
+  }
+
+}
diff --git a/src/applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php b/src/applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php
new file mode 100644
index 0000000000..f48336bea3
--- /dev/null
+++ b/src/applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php
@@ -0,0 +1,47 @@
+<?php
+
+final class PhabricatorFileDocumentRenderingEngine
+  extends PhabricatorDocumentRenderingEngine {
+
+  protected function newRefViewURI(
+    PhabricatorDocumentRef $ref,
+    PhabricatorDocumentEngine $engine) {
+
+    $file = $ref->getFile();
+    $engine_key = $engine->getDocumentEngineKey();
+
+    return urisprintf(
+      '/file/view/%d/%s/',
+      $file->getID(),
+      $engine_key);
+  }
+
+  protected function newRefRenderURI(
+    PhabricatorDocumentRef $ref,
+    PhabricatorDocumentEngine $engine) {
+    $file = $ref->getFile();
+    if (!$file) {
+      throw new PhutilMethodNotImplementedException();
+    }
+
+    $engine_key = $engine->getDocumentEngineKey();
+    $file_phid = $file->getPHID();
+
+    return urisprintf(
+      '/file/document/%s/%s/',
+      $engine_key,
+      $file_phid);
+  }
+
+  protected function addApplicationCrumbs(
+    PhabricatorDocumentRef $ref,
+    PHUICrumbsView $crumbs) {
+
+    $file = $ref->getFile();
+    if ($file) {
+      $crumbs->addTextCrumb($file->getMonogram(), $file->getInfoURI());
+    }
+
+  }
+
+}

From 1fde4a9450610586e76c9e536c88f556cc52683c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 5 Apr 2018 10:21:48 -0700
Subject: [PATCH 786/865] Move Diffusion browse rendering to DocumentEngine,
 breaking almost all features

Summary:
Ref T13105. This breaks about 9,000 features but moves Diffusion to DocumentEngine for rendering. See T13105 for a more complete list of all the broken stuff.

But you can't bake a software without breaking all the features every time you make a change, right?

Test Plan: Viewed various files in Diffusion, used DocumentEngine features like highlighting and rendering engine selection.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Subscribers: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19302
---
 src/__phutil_library_map__.php                |   4 +
 .../PhabricatorDiffusionApplication.php       |   2 +
 .../controller/DiffusionBrowseController.php  | 625 +-----------------
 .../DiffusionDocumentController.php           |  45 ++
 .../DiffusionDocumentRenderingEngine.php      |  67 ++
 .../PhabricatorFileDocumentController.php     |  11 +-
 .../PhabricatorDocumentRenderingEngine.php    |  72 +-
 ...PhabricatorFileDocumentRenderingEngine.php |  14 +-
 .../storage/PhabricatorRepository.php         |   2 +
 9 files changed, 188 insertions(+), 654 deletions(-)
 create mode 100644 src/applications/diffusion/controller/DiffusionDocumentController.php
 create mode 100644 src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 95f8ed45b2..8e2eb24b15 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -732,6 +732,8 @@
     'DiffusionDiffController' => 'applications/diffusion/controller/DiffusionDiffController.php',
     'DiffusionDiffInlineCommentQuery' => 'applications/diffusion/query/DiffusionDiffInlineCommentQuery.php',
     'DiffusionDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php',
+    'DiffusionDocumentController' => 'applications/diffusion/controller/DiffusionDocumentController.php',
+    'DiffusionDocumentRenderingEngine' => 'applications/diffusion/document/DiffusionDocumentRenderingEngine.php',
     'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php',
     'DiffusionEmptyResultView' => 'applications/diffusion/view/DiffusionEmptyResultView.php',
     'DiffusionExistsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php',
@@ -5987,6 +5989,8 @@
     'DiffusionDiffController' => 'DiffusionController',
     'DiffusionDiffInlineCommentQuery' => 'PhabricatorDiffInlineCommentQuery',
     'DiffusionDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
+    'DiffusionDocumentController' => 'DiffusionController',
+    'DiffusionDocumentRenderingEngine' => 'PhabricatorDocumentRenderingEngine',
     'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
     'DiffusionEmptyResultView' => 'DiffusionView',
     'DiffusionExistsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index 90956077fd..4a1c2fdd95 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -53,6 +53,8 @@ public function getRoutes() {
         'history/(?P<dblob>.*)' => 'DiffusionHistoryController',
         'graph/(?P<dblob>.*)' => 'DiffusionGraphController',
         'browse/(?P<dblob>.*)' => 'DiffusionBrowseController',
+        'document/(?P<dblob>.*)'
+          => 'DiffusionDocumentController',
         'lastmodified/(?P<dblob>.*)' => 'DiffusionLastModifiedController',
         'diff/' => 'DiffusionDiffController',
         'tags/(?P<dblob>.*)' => 'DiffusionTagListController',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 8c0c2c19c4..2c2a2f46b9 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -45,13 +45,13 @@ public function handleRequest(AphrontRequest $request) {
 
     if ($is_file) {
       return $this->browseFile();
-    } else {
-      $paths = $results->getPaths();
-      $paths = $pager->sliceResults($paths);
-      $results->setPaths($paths);
-
-      return $this->browseDirectory($results, $pager);
     }
+
+    $paths = $results->getPaths();
+    $paths = $pager->sliceResults($paths);
+    $results->setPaths($paths);
+
+    return $this->browseDirectory($results, $pager);
   }
 
   private function browseSearch() {
@@ -187,26 +187,21 @@ private function browseFile() {
         } else {
           $corpus = $this->buildGitLFSCorpus($lfs_ref);
         }
-      } else if (ArcanistDiffUtils::isHeuristicBinaryFile($data)) {
-        $file_uri = $file->getBestURI();
-
-        if ($file->isViewableImage()) {
-          $corpus = $this->buildImageCorpus($file_uri);
-        } else {
-          $corpus = $this->buildBinaryCorpus($file_uri, $data);
-        }
       } else {
         $this->loadLintMessages();
         $this->coverage = $drequest->loadCoverage();
         $show_editor = true;
 
-        // Build the content of the file.
-        $corpus = $this->buildCorpus(
-          $data,
-          $needs_blame,
-          $drequest,
-          $path,
-          $data);
+        $ref = id(new PhabricatorDocumentRef())
+          ->setFile($file);
+
+        $engine = id(new DiffusionDocumentRenderingEngine())
+          ->setRequest($request)
+          ->setDiffusionRequest($drequest);
+
+        $corpus = $engine->newDocumentView($ref);
+
+        $this->corpusButtons[] = $this->renderFileButton();
       }
     }
 
@@ -514,164 +509,6 @@ private function loadLintMessages() {
       '/'.$drequest->getPath());
   }
 
-  private function buildCorpus(
-    $file_corpus,
-    $needs_blame,
-    DiffusionRequest $drequest,
-    $path,
-    $data) {
-
-    $viewer = $this->getViewer();
-    $blame_timeout = 15;
-    $blame_failed = false;
-
-    $highlight_limit = DifferentialChangesetParser::HIGHLIGHT_BYTE_LIMIT;
-    $blame_limit = DifferentialChangesetParser::HIGHLIGHT_BYTE_LIMIT;
-    $can_highlight = (strlen($file_corpus) <= $highlight_limit);
-    $can_blame = (strlen($file_corpus) <= $blame_limit);
-
-    if ($needs_blame && $can_blame) {
-      $blame = $this->loadBlame($path, $drequest->getCommit(), $blame_timeout);
-      list($blame_list, $blame_commits) = $blame;
-      if ($blame_list === null) {
-        $blame_failed = true;
-        $blame_list = array();
-      }
-    } else {
-      $blame_list = array();
-      $blame_commits = array();
-    }
-
-    require_celerity_resource('syntax-highlighting-css');
-    if ($can_highlight) {
-      $highlighted = PhabricatorSyntaxHighlighter::highlightWithFilename(
-        $path,
-        $file_corpus);
-    } else {
-      // Highlight as plain text to escape the content properly.
-      $highlighted = PhabricatorSyntaxHighlighter::highlightWithLanguage(
-        'txt',
-        $file_corpus);
-    }
-
-    $lines = phutil_split_lines($highlighted);
-
-    $rows = $this->buildDisplayRows(
-      $lines,
-      $blame_list,
-      $blame_commits);
-
-    $corpus_table = javelin_tag(
-      'table',
-      array(
-        'class' => 'diffusion-source remarkup-code PhabricatorMonospaced',
-        'sigil' => 'phabricator-source',
-        'meta' => array(
-          'uri' => $this->getLineNumberBaseURI(),
-        ),
-      ),
-      $rows);
-
-    $corpus_table = phutil_tag_div('diffusion-source-wrap', $corpus_table);
-
-    if ($this->getRequest()->isAjax()) {
-      return $corpus_table;
-    }
-
-    $id = celerity_generate_unique_node_id();
-
-    $repo = $drequest->getRepository();
-    $symbol_repos = nonempty($repo->getSymbolSources(), array());
-    $symbol_repos[] = $repo->getPHID();
-
-    $lang = last(explode('.', $drequest->getPath()));
-    $repo_languages = $repo->getSymbolLanguages();
-    $repo_languages = nonempty($repo_languages, array());
-    $repo_languages = array_fill_keys($repo_languages, true);
-
-    $needs_symbols = true;
-    if ($repo_languages && $symbol_repos) {
-      $have_symbols = id(new DiffusionSymbolQuery())
-          ->existsSymbolsInRepository($repo->getPHID());
-      if (!$have_symbols) {
-        $needs_symbols = false;
-      }
-    }
-
-    if ($needs_symbols && $repo_languages) {
-      $needs_symbols = isset($repo_languages[$lang]);
-    }
-
-    if ($needs_symbols) {
-      Javelin::initBehavior(
-        'repository-crossreference',
-        array(
-          'container' => $id,
-          'lang' => $lang,
-          'repositories' => $symbol_repos,
-        ));
-    }
-
-    $corpus = phutil_tag(
-      'div',
-      array(
-        'id' => $id,
-      ),
-      $corpus_table);
-
-    Javelin::initBehavior('load-blame', array('id' => $id));
-
-    $this->corpusButtons[] = $this->renderFileButton();
-    $title = basename($this->getDiffusionRequest()->getPath());
-    $icon = 'fa-file-code-o';
-    $drequest = $this->getDiffusionRequest();
-    $this->buildActionButtons($drequest);
-
-    $header = $this->buildPanelHeaderView($title, $icon);
-
-    $corpus = id(new PHUIObjectBoxView())
-      ->setHeader($header)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->appendChild($corpus)
-      ->addClass('diffusion-mobile-view')
-      ->addSigil('diffusion-file-content-view')
-      ->setMetadata(
-        array(
-          'path' => $this->getDiffusionRequest()->getPath(),
-        ))
-      ->setCollapsed(true);
-
-    $messages = array();
-
-    if (!$can_highlight) {
-      $messages[] = pht(
-        'This file is larger than %s, so syntax highlighting is disabled '.
-        'by default.',
-        phutil_format_bytes($highlight_limit));
-    }
-
-    if (!$can_blame) {
-      $messages[] = pht(
-        'This file is larger than %s, so blame is disabled.',
-        phutil_format_bytes($blame_limit));
-    }
-
-    if ($blame_failed) {
-      $messages[] = pht(
-        'Failed to load blame information for this file in %s second(s).',
-        new PhutilNumber($blame_timeout));
-    }
-
-    if ($messages) {
-      $corpus->setInfoView(
-        id(new PHUIInfoView())
-          ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
-          ->setErrors($messages));
-    }
-
-    return $corpus;
-  }
-
   private function buildButtonBar(
     DiffusionRequest $drequest,
     $show_editor) {
@@ -868,389 +705,6 @@ private function renderGitLFSButton() {
       ->setColor(PHUIButtonView::GREY);
   }
 
-  private function buildDisplayRows(
-    array $lines,
-    array $blame_list,
-    array $blame_commits) {
-
-    $request = $this->getRequest();
-    $viewer = $this->getViewer();
-    $drequest = $this->getDiffusionRequest();
-    $repository = $drequest->getRepository();
-
-    $revision_map = array();
-    $revisions = array();
-    if ($blame_commits) {
-      $commit_map = mpull($blame_commits, 'getCommitIdentifier', 'getPHID');
-
-      $revision_ids = id(new DifferentialRevision())
-        ->loadIDsByCommitPHIDs(array_keys($commit_map));
-      if ($revision_ids) {
-        $revisions = id(new DifferentialRevisionQuery())
-          ->setViewer($viewer)
-          ->withIDs($revision_ids)
-          ->execute();
-        $revisions = mpull($revisions, null, 'getID');
-      }
-
-      foreach ($revision_ids as $commit_phid => $revision_id) {
-        // If the viewer can't actually see this revision, skip it.
-        if (!isset($revisions[$revision_id])) {
-          continue;
-        }
-        $revision_map[$commit_map[$commit_phid]] = $revision_id;
-      }
-    }
-
-    $phids = array();
-    foreach ($blame_commits as $commit) {
-      $author_phid = $commit->getAuthorPHID();
-      if ($author_phid === null) {
-        continue;
-      }
-      $phids[$author_phid] = $author_phid;
-    }
-
-    foreach ($revisions as $revision) {
-      $author_phid = $revision->getAuthorPHID();
-      if ($author_phid === null) {
-        continue;
-      }
-      $phids[$author_phid] = $author_phid;
-    }
-
-    $handles = $viewer->loadHandles($phids);
-
-    $author_phids = array();
-    $author_map = array();
-    foreach ($blame_commits as $commit) {
-      $commit_identifier = $commit->getCommitIdentifier();
-
-      $author_phid = '';
-      if (isset($revision_map[$commit_identifier])) {
-        $revision_id = $revision_map[$commit_identifier];
-        $revision = $revisions[$revision_id];
-        $author_phid = $revision->getAuthorPHID();
-      } else {
-        $author_phid = $commit->getAuthorPHID();
-      }
-
-      $author_map[$commit_identifier] = $author_phid;
-      $author_phids[$author_phid] = $author_phid;
-    }
-
-    $colors = array();
-    if ($blame_commits) {
-      $epochs = array();
-
-      foreach ($blame_commits as $identifier => $commit) {
-        $epochs[$identifier] = $commit->getEpoch();
-      }
-
-      $epoch_list = array_filter($epochs);
-      $epoch_list = array_unique($epoch_list);
-      $epoch_list = array_values($epoch_list);
-
-      $epoch_min   = min($epoch_list);
-      $epoch_max   = max($epoch_list);
-      $epoch_range = ($epoch_max - $epoch_min) + 1;
-
-      foreach ($blame_commits as $identifier => $commit) {
-        $epoch = $epochs[$identifier];
-        if (!$epoch) {
-          $color = '#ffffdd'; // Warning color, missing data.
-        } else {
-          $color_ratio = ($epoch - $epoch_min) / $epoch_range;
-          $color_value = 0xE6 * (1.0 - $color_ratio);
-          $color = sprintf(
-            '#%02x%02x%02x',
-            $color_value,
-            0xF6,
-            $color_value);
-        }
-
-        $colors[$identifier] = $color;
-      }
-    }
-
-    $display = array();
-    $last_identifier = null;
-    $last_color = null;
-    foreach ($lines as $line_index => $line) {
-      $color = '#f6f6f6';
-      $duplicate = false;
-      if (isset($blame_list[$line_index])) {
-        $identifier = $blame_list[$line_index];
-        if (isset($colors[$identifier])) {
-          $color = $colors[$identifier];
-        }
-
-        if ($identifier === $last_identifier) {
-          $duplicate = true;
-        } else {
-          $last_identifier = $identifier;
-        }
-      }
-
-      $display[$line_index] = array(
-        'data' => $line,
-        'target' => false,
-        'highlighted' => false,
-        'color' => $color,
-        'duplicate' => $duplicate,
-      );
-    }
-
-    $line_arr = array();
-    $line_str = $drequest->getLine();
-    $ranges = explode(',', $line_str);
-    foreach ($ranges as $range) {
-      if (strpos($range, '-') !== false) {
-        list($min, $max) = explode('-', $range, 2);
-        $line_arr[] = array(
-          'min' => min($min, $max),
-          'max' => max($min, $max),
-        );
-      } else if (strlen($range)) {
-        $line_arr[] = array(
-          'min' => $range,
-          'max' => $range,
-        );
-      }
-    }
-
-    // Mark the first highlighted line as the target line.
-    if ($line_arr) {
-      $target_line = $line_arr[0]['min'];
-      if (isset($display[$target_line - 1])) {
-        $display[$target_line - 1]['target'] = true;
-      }
-    }
-
-    // Mark all other highlighted lines as highlighted.
-    foreach ($line_arr as $range) {
-      for ($ii = $range['min']; $ii <= $range['max']; $ii++) {
-        if (isset($display[$ii - 1])) {
-          $display[$ii - 1]['highlighted'] = true;
-        }
-      }
-    }
-
-    $engine = null;
-    $inlines = array();
-    if ($this->getRequest()->getStr('lint') !== null && $this->lintMessages) {
-      $engine = new PhabricatorMarkupEngine();
-      $engine->setViewer($viewer);
-
-      foreach ($this->lintMessages as $message) {
-        $inline = id(new PhabricatorAuditInlineComment())
-          ->setSyntheticAuthor(
-            ArcanistLintSeverity::getStringForSeverity($message['severity']).
-            ' '.$message['code'].' ('.$message['name'].')')
-          ->setLineNumber($message['line'])
-          ->setContent($message['description']);
-        $inlines[$message['line']][] = $inline;
-
-        $engine->addObject(
-          $inline,
-          PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
-      }
-
-      $engine->process();
-      require_celerity_resource('differential-changeset-view-css');
-    }
-
-    $rows = $this->renderInlines(
-      idx($inlines, 0, array()),
-      (bool)$this->coverage,
-      $engine);
-
-    // NOTE: We're doing this manually because rendering is otherwise
-    // dominated by URI generation for very large files.
-    $line_base = $this->getLineNumberBaseURI();
-
-    require_celerity_resource('aphront-tooltip-css');
-    Javelin::initBehavior('phabricator-oncopy');
-    Javelin::initBehavior('phabricator-tooltips');
-    Javelin::initBehavior('phabricator-line-linker');
-
-    // Render these once, since they tend to get repeated many times in large
-    // blame outputs.
-    $commit_links = $this->renderCommitLinks($blame_commits, $handles);
-    $revision_links = $this->renderRevisionLinks($revisions, $handles);
-    $author_links = $this->renderAuthorLinks($author_map, $handles);
-
-    if ($this->coverage) {
-      require_celerity_resource('differential-changeset-view-css');
-      Javelin::initBehavior(
-        'diffusion-browse-file',
-        array(
-          'labels' => array(
-            'cov-C' => pht('Covered'),
-            'cov-N' => pht('Not Covered'),
-            'cov-U' => pht('Not Executable'),
-          ),
-        ));
-    }
-
-    $skip_text = pht('Skip Past This Commit');
-    $skip_icon = id(new PHUIIconView())
-      ->setIcon('fa-backward');
-
-    foreach ($display as $line_index => $line) {
-      $row = array();
-
-      $line_number = $line_index + 1;
-      $line_href = $line_base.'$'.$line_number;
-
-      if (isset($blame_list[$line_index])) {
-        $identifier = $blame_list[$line_index];
-      } else {
-        $identifier = null;
-      }
-
-      $revision_link = null;
-      $commit_link = null;
-      $author_link = null;
-      $before_link = null;
-
-      $style = 'background: '.$line['color'].';';
-
-      if ($identifier && !$line['duplicate']) {
-        if (isset($commit_links[$identifier])) {
-          $commit_link = $commit_links[$identifier];
-          $author_link = $author_links[$author_map[$identifier]];
-        }
-
-        if (isset($revision_map[$identifier])) {
-          $revision_id = $revision_map[$identifier];
-          if (isset($revision_links[$revision_id])) {
-            $revision_link = $revision_links[$revision_id];
-          }
-        }
-
-        $skip_href = $line_href.'?before='.$identifier;
-        $before_link = javelin_tag(
-          'a',
-          array(
-            'href'  => $skip_href,
-            'sigil' => 'has-tooltip',
-            'meta'  => array(
-              'tip'     => $skip_text,
-              'align'   => 'E',
-              'size'    => 300,
-            ),
-          ),
-          $skip_icon);
-      }
-
-      $row[] = phutil_tag(
-        'th',
-        array(
-          'class' => 'diffusion-blame-link',
-        ),
-        $before_link);
-
-      $object_links = array();
-      $object_links[] = $author_link;
-      $object_links[] = $commit_link;
-      if ($revision_link) {
-        $object_links[] = phutil_tag('span', array(), '/');
-        $object_links[] = $revision_link;
-      }
-
-      $row[] = phutil_tag(
-        'th',
-        array(
-          'class' => 'diffusion-rev-link',
-        ),
-        $object_links);
-
-      $line_link = phutil_tag(
-        'a',
-        array(
-          'href' => $line_href,
-          'style' => $style,
-        ),
-        $line_number);
-
-      $row[] = javelin_tag(
-        'th',
-        array(
-          'class' => 'diffusion-line-link',
-          'sigil' => 'phabricator-source-line',
-          'style' => $style,
-        ),
-        $line_link);
-
-      if ($line['target']) {
-        Javelin::initBehavior(
-          'diffusion-jump-to',
-          array(
-            'target' => 'scroll_target',
-          ));
-        $anchor_text = phutil_tag(
-          'a',
-          array(
-            'id' => 'scroll_target',
-          ),
-          '');
-      } else {
-        $anchor_text = null;
-      }
-
-      $row[] = phutil_tag(
-        'td',
-        array(
-        ),
-        array(
-          $anchor_text,
-
-          // NOTE: See phabricator-oncopy behavior.
-          "\xE2\x80\x8B",
-
-          // TODO: [HTML] Not ideal.
-          phutil_safe_html(str_replace("\t", '  ', $line['data'])),
-        ));
-
-      if ($this->coverage) {
-        $cov_index = $line_index;
-
-        if (isset($this->coverage[$cov_index])) {
-          $cov_class = $this->coverage[$cov_index];
-        } else {
-          $cov_class = 'N';
-        }
-
-        $row[] = phutil_tag(
-          'td',
-          array(
-            'class' => 'cov cov-'.$cov_class,
-          ),
-          '');
-      }
-
-      $rows[] = phutil_tag(
-        'tr',
-        array(
-          'class' => ($line['highlighted'] ?
-                      'phabricator-source-highlight' :
-                      null),
-        ),
-        $row);
-
-      $cur_inlines = $this->renderInlines(
-        idx($inlines, $line_number, array()),
-        $this->coverage,
-        $engine);
-      foreach ($cur_inlines as $cur_inline) {
-        $rows[] = $cur_inline;
-      }
-    }
-
-    return $rows;
-  }
-
   private function renderInlines(
     array $inlines,
     $has_coverage,
@@ -1285,53 +739,6 @@ private function renderInlines(
     return $rows;
   }
 
-  private function buildImageCorpus($file_uri) {
-    $properties = new PHUIPropertyListView();
-
-    $properties->addImageContent(
-      phutil_tag(
-        'img',
-        array(
-          'src' => $file_uri,
-        )));
-
-    $this->corpusButtons[] = $this->renderFileButton($file_uri);
-    $title = basename($this->getDiffusionRequest()->getPath());
-    $icon = 'fa-file-image-o';
-    $drequest = $this->getDiffusionRequest();
-    $this->buildActionButtons($drequest);
-    $header = $this->buildPanelHeaderView($title, $icon);
-
-    return id(new PHUIObjectBoxView())
-      ->setHeader($header)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->addClass('diffusion-mobile-view')
-      ->addPropertyList($properties);
-  }
-
-  private function buildBinaryCorpus($file_uri, $data) {
-    $size = new PhutilNumber(strlen($data));
-    $text = pht('This is a binary file. It is %s byte(s) in length.', $size);
-    $text = id(new PHUIBoxView())
-      ->addPadding(PHUI::PADDING_LARGE)
-      ->appendChild($text);
-
-    $this->corpusButtons[] = $this->renderFileButton($file_uri);
-    $title = basename($this->getDiffusionRequest()->getPath());
-    $icon = 'fa-file';
-    $drequest = $this->getDiffusionRequest();
-    $this->buildActionButtons($drequest);
-    $header = $this->buildPanelHeaderView($title, $icon);
-
-    $box = id(new PHUIObjectBoxView())
-      ->setHeader($header)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->addClass('diffusion-mobile-view')
-      ->appendChild($text);
-
-    return $box;
-  }
-
   private function buildErrorCorpus($message) {
     $text = id(new PHUIBoxView())
       ->addPadding(PHUI::PADDING_LARGE)
diff --git a/src/applications/diffusion/controller/DiffusionDocumentController.php b/src/applications/diffusion/controller/DiffusionDocumentController.php
new file mode 100644
index 0000000000..c8956fc84c
--- /dev/null
+++ b/src/applications/diffusion/controller/DiffusionDocumentController.php
@@ -0,0 +1,45 @@
+<?php
+
+final class DiffusionDocumentController extends DiffusionController {
+
+  public function shouldAllowPublic() {
+    return true;
+  }
+
+  public function handleRequest(AphrontRequest $request) {
+    $response = $this->loadDiffusionContext();
+    if ($response) {
+      return $response;
+    }
+
+    $drequest = $this->getDiffusionRequest();
+
+    $engine = id(new DiffusionDocumentRenderingEngine())
+      ->setRequest($request)
+      ->setDiffusionRequest($drequest)
+      ->setController($this);
+
+    $viewer = $this->getViewer();
+    $request = $this->getRequest();
+    $repository = $drequest->getRepository();
+
+    $file_phid = $request->getStr('filePHID');
+
+    $file = id(new PhabricatorFileQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($file_phid))
+      ->executeOne();
+    if (!$file) {
+      return $engine->newErrorResponse(
+        pht(
+          'This file ("%s") does not exist or could not be loaded.',
+          $file_phid));
+    }
+
+    $ref = id(new PhabricatorDocumentRef())
+      ->setFile($file);
+
+    return $engine->newRenderResponse($ref);
+  }
+
+}
diff --git a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
new file mode 100644
index 0000000000..d0b5a4b33a
--- /dev/null
+++ b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
@@ -0,0 +1,67 @@
+<?php
+
+final class DiffusionDocumentRenderingEngine
+  extends PhabricatorDocumentRenderingEngine {
+
+  private $diffusionRequest;
+
+  public function setDiffusionRequest(DiffusionRequest $drequest) {
+    $this->diffusionRequest = $drequest;
+    return $this;
+  }
+
+  public function getDiffusionRequest() {
+    return $this->diffusionRequest;
+  }
+
+  protected function getSelectedDocumentEngineKey() {
+    return $this->getRequest()->getStr('as');
+  }
+
+  protected function newRefViewURI(
+    PhabricatorDocumentRef $ref,
+    PhabricatorDocumentEngine $engine) {
+
+    $file = $ref->getFile();
+    $engine_key = $engine->getDocumentEngineKey();
+    $drequest = $this->getDiffusionRequest();
+
+    return (string)$drequest->generateURI(
+      array(
+        'action' => 'browse',
+        'stable' => true,
+        'params' => array(
+          'as' => $engine_key,
+        ),
+      ));
+  }
+
+  protected function newRefRenderURI(
+    PhabricatorDocumentRef $ref,
+    PhabricatorDocumentEngine $engine) {
+
+    $engine_key = $engine->getDocumentEngineKey();
+
+    $file = $ref->getFile();
+    $file_phid = $file->getPHID();
+
+    $drequest = $this->getDiffusionRequest();
+
+    return (string)$drequest->generateURI(
+      array(
+        'action' => 'document',
+        'stable' => true,
+        'params' => array(
+          'as' => $engine_key,
+          'filePHID' => $file_phid,
+        ),
+      ));
+  }
+
+  protected function addApplicationCrumbs(
+    PHUICrumbsView $crumbs,
+    PhabricatorDocumentRef $ref = null) {
+    return;
+  }
+
+}
diff --git a/src/applications/files/controller/PhabricatorFileDocumentController.php b/src/applications/files/controller/PhabricatorFileDocumentController.php
index e74b0bc6eb..645b0e8e92 100644
--- a/src/applications/files/controller/PhabricatorFileDocumentController.php
+++ b/src/applications/files/controller/PhabricatorFileDocumentController.php
@@ -8,6 +8,10 @@ public function shouldAllowPublic() {
   }
 
   public function handleRequest(AphrontRequest $request) {
+    $engine = id(new PhabricatorFileDocumentRenderingEngine())
+      ->setRequest($request)
+      ->setController($this);
+
     $viewer = $request->getViewer();
 
     $file_phid = $request->getURIData('phid');
@@ -17,7 +21,7 @@ public function handleRequest(AphrontRequest $request) {
       ->withPHIDs(array($file_phid))
       ->executeOne();
     if (!$file) {
-      return $this->newErrorResponse(
+      return $engine->newErrorResponse(
         pht(
           'This file ("%s") does not exist or could not be loaded.',
           $file_phid));
@@ -26,10 +30,7 @@ public function handleRequest(AphrontRequest $request) {
     $ref = id(new PhabricatorDocumentRef())
       ->setFile($file);
 
-    return id(new PhabricatorFileDocumentRenderingEngine())
-      ->setRequest($request)
-      ->setController($this)
-      ->newRenderResponse($ref);
+    return $engine->newRenderResponse($ref);
   }
 
 }
diff --git a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
index 37b0917a65..fb6fe67e62 100644
--- a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
+++ b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
@@ -6,6 +6,7 @@ abstract class PhabricatorDocumentRenderingEngine
   private $request;
   private $controller;
   private $activeEngine;
+  private $ref;
 
   final public function setRequest(AphrontRequest $request) {
     $this->request = $request;
@@ -34,13 +35,13 @@ final public function getController() {
   }
 
   final protected function getActiveEngine() {
-    if (!$this->activeEngine) {
-      throw new PhutilInvalidStateException('setActiveEngine');
-    }
-
     return $this->activeEngine;
   }
 
+  final protected function getRef() {
+    return $this->ref;
+  }
+
   final public function newDocumentView(PhabricatorDocumentRef $ref) {
     $request = $this->getRequest();
     $viewer = $request->getViewer();
@@ -173,10 +174,9 @@ final public function newRenderResponse(PhabricatorDocumentRef $ref) {
     $viewer = $request->getViewer();
 
     $engines = PhabricatorDocumentEngine::getEnginesForRef($viewer, $ref);
-    $engine_key = $request->getURIData('engineKey');
+    $engine_key = $this->getSelectedDocumentEngineKey();
     if (!isset($engines[$engine_key])) {
       return $this->newErrorResponse(
-        $ref,
         pht(
           'The engine ("%s") is unknown, or unable to render this document.',
           $engine_key));
@@ -198,16 +198,13 @@ final public function newRenderResponse(PhabricatorDocumentRef $ref) {
     try {
       $content = $engine->newDocument($ref);
     } catch (Exception $ex) {
-      return $this->newErrorResponse($ref, $ex->getMessage());
+      return $this->newErrorResponse($ex->getMessage());
     }
 
-    return $this->newContentResponse($ref, $content);
+    return $this->newContentResponse($content);
   }
 
-  private function newErrorResponse(
-    PhabricatorDocumentRef $ref,
-    $message) {
-
+  public function newErrorResponse($message) {
     $container = phutil_tag(
       'div',
       array(
@@ -220,13 +217,10 @@ private function newErrorResponse(
         $message,
       ));
 
-    return $this->newContentResponse($ref, $container);
+    return $this->newContentResponse($container);
   }
 
-  private function newContentResponse(
-    PhabricatorDocumentRef $ref,
-    $content) {
-
+  private function newContentResponse($content) {
     $request = $this->getRequest();
     $viewer = $request->getViewer();
     $controller = $this->getController();
@@ -239,10 +233,8 @@ private function newContentResponse(
           ));
     }
 
-    $crumbs = $this->newCrumbs($ref);
-    if ($crumbs) {
-      $crumbs->setBorder(true);
-    }
+    $crumbs = $this->newCrumbs();
+    $crumbs->setBorder(true);
 
     $content_frame = id(new PHUIObjectBoxView())
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
@@ -251,34 +243,46 @@ private function newContentResponse(
     $page_frame = id(new PHUITwoColumnView())
       ->setFooter($content_frame);
 
+    $title = array();
+    $ref = $this->getRef();
+    if ($ref) {
+      $title = array(
+        $ref->getName(),
+        pht('Standalone'),
+      );
+    } else {
+      $title = pht('Document');
+    }
+
     return $controller->newPage()
       ->setCrumbs($crumbs)
-      ->setTitle(
-        array(
-          $ref->getName(),
-          pht('Standalone'),
-        ))
+      ->setTitle($title)
       ->appendChild($page_frame);
   }
 
-  protected function newCrumbs(PhabricatorDocumentRef $ref) {
+  protected function newCrumbs() {
+    $engine = $this->getActiveEngine();
     $controller = $this->getController();
+
     $crumbs = $controller->buildApplicationCrumbsForEditEngine();
 
-    $this->addApplicationCrumbs($ref, $crumbs);
+    $ref = $this->getRef();
 
-    $engine = $this->getActiveEngine();
-    $label = $engine->getViewAsLabel($ref);
-    if ($label) {
-      $crumbs->addTextCrumb($label);
+    $this->addApplicationCrumbs($crumbs, $ref);
+
+    if ($ref) {
+      $label = $engine->getViewAsLabel($ref);
+      if ($label) {
+        $crumbs->addTextCrumb($label);
+      }
     }
 
     return $crumbs;
   }
 
   protected function addApplicationCrumbs(
-    PhabricatorDocumentRef $ref,
-    PHUICrumbsView $crumbs) {
+    PHUICrumbsView $crumbs,
+    PhabricatorDocumentRef $ref = null) {
     return;
   }
 
diff --git a/src/applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php b/src/applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php
index f48336bea3..65e9a49681 100644
--- a/src/applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php
+++ b/src/applications/files/document/render/PhabricatorFileDocumentRenderingEngine.php
@@ -34,12 +34,14 @@ protected function newRefRenderURI(
   }
 
   protected function addApplicationCrumbs(
-    PhabricatorDocumentRef $ref,
-    PHUICrumbsView $crumbs) {
-
-    $file = $ref->getFile();
-    if ($file) {
-      $crumbs->addTextCrumb($file->getMonogram(), $file->getInfoURI());
+    PHUICrumbsView $crumbs,
+    PhabricatorDocumentRef $ref = null) {
+
+    if ($ref) {
+      $file = $ref->getFile();
+      if ($file) {
+        $crumbs->addTextCrumb($file->getMonogram(), $file->getInfoURI());
+      }
     }
 
   }
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 435e5749e6..1dfbceead0 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -704,6 +704,7 @@ public function generateURI(array $params) {
       case 'graph':
       case 'clone':
       case 'browse':
+      case 'document':
       case 'change':
       case 'lastmodified':
       case 'tags':
@@ -782,6 +783,7 @@ public function generateURI(array $params) {
       case 'history':
       case 'graph':
       case 'browse':
+      case 'document':
       case 'lastmodified':
       case 'tags':
       case 'branches':

From 6dea2ba3b37f0590efb607ea5e27c623ba19bca7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Apr 2018 06:29:29 -0700
Subject: [PATCH 787/865] Fix DocumentEngine line behaviors in Diffusion

Summary:
Ref T13105. Fixes some issues with line linking and highlighting under DocumentEngine:

  - Adding `$1-3` to the URI didn't work correctly with query parameters.
  - Reading `$1-3` from the URI didn't work correctly because Diffusion parses them slightly abnormally.

Test Plan: Clicked/dragged lines to select them. Observed URI. Reloaded page, got the right selection.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19305
---
 resources/celerity/map.php                    | 16 +++++-----
 src/aphront/AphrontRequest.php                |  4 +++
 .../DiffusionDocumentRenderingEngine.php      | 13 +++++---
 .../PhabricatorDocumentRenderingEngine.php    | 30 +++++++++++--------
 webroot/rsrc/js/core/behavior-line-linker.js  | 13 ++++++--
 5 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 79e645a927..ca75f4ee09 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -473,7 +473,7 @@
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
     'rsrc/js/core/behavior-lightbox-attachments.js' => '6b31879a',
-    'rsrc/js/core/behavior-line-linker.js' => '13e39479',
+    'rsrc/js/core/behavior-line-linker.js' => 'febf4ae7',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
@@ -638,7 +638,7 @@
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
-    'javelin-behavior-phabricator-line-linker' => '13e39479',
+    'javelin-behavior-phabricator-line-linker' => 'febf4ae7',
     'javelin-behavior-phabricator-nav' => '836f966d',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
@@ -964,12 +964,6 @@
       'javelin-install',
       'javelin-util',
     ),
-    '13e39479' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-history',
-    ),
     '15d5ff71' => array(
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
@@ -2174,6 +2168,12 @@
       'javelin-view-visitor',
       'javelin-util',
     ),
+    'febf4ae7' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-history',
+    ),
   ),
   'packages' => array(
     'conpherence.pkg.css' => array(
diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
index c1dc0d1305..78e6dac9d3 100644
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -61,6 +61,10 @@ public function getURIData($key, $default = null) {
    */
   public function getURILineRange($key, $limit) {
     $range = $this->getURIData($key);
+    return self::parseURILineRange($range, $limit);
+  }
+
+  public static function parseURILineRange($range, $limit) {
     if (!strlen($range)) {
       return null;
     }
diff --git a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
index d0b5a4b33a..b3b77c9301 100644
--- a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
+++ b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
@@ -14,10 +14,6 @@ public function getDiffusionRequest() {
     return $this->diffusionRequest;
   }
 
-  protected function getSelectedDocumentEngineKey() {
-    return $this->getRequest()->getStr('as');
-  }
-
   protected function newRefViewURI(
     PhabricatorDocumentRef $ref,
     PhabricatorDocumentEngine $engine) {
@@ -58,6 +54,15 @@ protected function newRefRenderURI(
       ));
   }
 
+  protected function getSelectedDocumentEngineKey() {
+    return $this->getRequest()->getStr('as');
+  }
+
+  protected function getSelectedLineRange() {
+    $range = $this->getDiffusionRequest()->getLine();
+    return AphrontRequest::parseURILineRange($range, 1000);
+  }
+
   protected function addApplicationCrumbs(
     PHUICrumbsView $crumbs,
     PhabricatorDocumentRef $ref = null) {
diff --git a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
index fb6fe67e62..d95d93f74a 100644
--- a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
+++ b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
@@ -54,7 +54,7 @@ final public function newDocumentView(PhabricatorDocumentRef $ref) {
     }
     $engine = $engines[$engine_key];
 
-    $lines = $request->getURILineRange('lines', 1000);
+    $lines = $this->getSelectedLineRange();
     if ($lines) {
       $engine->setHighlightedLines(range($lines[0], $lines[1]));
     }
@@ -157,18 +157,6 @@ final public function newDocumentView(PhabricatorDocumentRef $ref) {
       ->appendChild($viewport);
   }
 
-  abstract protected function newRefViewURI(
-    PhabricatorDocumentRef $ref,
-    PhabricatorDocumentEngine $engine);
-
-  abstract protected function newRefRenderURI(
-    PhabricatorDocumentRef $ref,
-    PhabricatorDocumentEngine $engine);
-
-  protected function getSelectedDocumentEngineKey() {
-    return $this->getRequest()->getURIData('engineKey');
-  }
-
   final public function newRenderResponse(PhabricatorDocumentRef $ref) {
     $request = $this->getRequest();
     $viewer = $request->getViewer();
@@ -280,6 +268,22 @@ protected function newCrumbs() {
     return $crumbs;
   }
 
+  abstract protected function newRefViewURI(
+    PhabricatorDocumentRef $ref,
+    PhabricatorDocumentEngine $engine);
+
+  abstract protected function newRefRenderURI(
+    PhabricatorDocumentRef $ref,
+    PhabricatorDocumentEngine $engine);
+
+  protected function getSelectedDocumentEngineKey() {
+    return $this->getRequest()->getURIData('engineKey');
+  }
+
+  protected function getSelectedLineRange() {
+    return $this->getRequest()->getURILineRange('lines', 1000);
+  }
+
   protected function addApplicationCrumbs(
     PHUICrumbsView $crumbs,
     PhabricatorDocumentRef $ref = null) {
diff --git a/webroot/rsrc/js/core/behavior-line-linker.js b/webroot/rsrc/js/core/behavior-line-linker.js
index 8a68cec842..6130bdd859 100644
--- a/webroot/rsrc/js/core/behavior-line-linker.js
+++ b/webroot/rsrc/js/core/behavior-line-linker.js
@@ -144,9 +144,14 @@ JX.behavior('phabricator-line-linker', function() {
       var o = getRowNumber(origin);
       var t = getRowNumber(target);
       var uri = JX.Stratcom.getData(root).uri;
+      var path;
 
       if (!uri) {
-        uri = ('' + window.location).split('$')[0];
+        uri = JX.$U(window.location);
+        path = uri.getPath();
+        path = path.replace(/\$[\d-]+$/, '');
+        uri.setPath(path);
+        uri = uri.toString();
       }
 
       origin = null;
@@ -154,7 +159,11 @@ JX.behavior('phabricator-line-linker', function() {
       root = null;
 
       var lines = (o == t ? o : Math.min(o, t) + '-' + Math.max(o, t));
-      uri = uri + '$' + lines;
+
+      uri = JX.$U(uri);
+      path = uri.getPath();
+      path = path + '$' + lines;
+      uri = uri.setPath(path).toString();
 
       JX.History.replace(uri);
 

From 0363febeb2c6990e0d06c2f0772ca4f8370228aa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Apr 2018 08:12:07 -0700
Subject: [PATCH 788/865] Disable default syntax highlighting for large files
 in DocumentEngine

Summary: Ref T13105. See also T7895. When users render very large files as source via DocumentEngine, skip highlighting.

Test Plan: Fiddled with the limit, viewed files, saw highlighting degrade.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19306
---
 .../PhabricatorSourceDocumentEngine.php       | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/applications/files/document/PhabricatorSourceDocumentEngine.php b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
index cd7c2af92b..5a4b7f0be7 100644
--- a/src/applications/files/document/PhabricatorSourceDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
@@ -24,18 +24,31 @@ protected function getContentScore(PhabricatorDocumentRef $ref) {
   protected function newDocumentContent(PhabricatorDocumentRef $ref) {
     $content = $this->loadTextData($ref);
 
+    $messages = array();
+
     $highlighting = $this->getHighlightingConfiguration();
     if ($highlighting !== null) {
       $content = PhabricatorSyntaxHighlighter::highlightWithLanguage(
         $highlighting,
         $content);
     } else {
-      $content = PhabricatorSyntaxHighlighter::highlightWithFilename(
-        $ref->getName(),
-        $content);
+      $highlight_limit = DifferentialChangesetParser::HIGHLIGHT_BYTE_LIMIT;
+      if (strlen($content) > $highlight_limit) {
+        $messages[] = $this->newMessage(
+          pht(
+            'This file is larger than %s, so syntax highlighting was skipped.',
+            phutil_format_bytes($highlight_limit)));
+      } else {
+        $content = PhabricatorSyntaxHighlighter::highlightWithFilename(
+          $ref->getName(),
+          $content);
+      }
     }
 
-    return $this->newTextDocumentContent($content);
+    return array(
+      $messages,
+      $this->newTextDocumentContent($content),
+    );
   }
 
 }

From 90a614778c0768e18084744e007eeccd7d7f4c8c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Apr 2018 09:10:03 -0700
Subject: [PATCH 789/865] Make repository symbol references work with
 DocumentEngine

Summary: Ref T13105. Ref T13047. This makes symbol indexes work with DocumentEngine in Files, and restores support in Diffusion.

Test Plan: Command-clicked stuff, got taken to the symbol index with reasonable metadata in Diffusion, Differential and Files.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105, T13047

Differential Revision: https://secure.phabricator.com/D19307
---
 resources/celerity/map.php                    |  34 ++--
 .../DiffusionDocumentRenderingEngine.php      |  20 +++
 .../files/document/PhabricatorDocumentRef.php |  12 ++
 .../PhabricatorJSONDocumentEngine.php         |   2 +-
 .../PhabricatorSourceDocumentEngine.php       |   2 +-
 .../PhabricatorTextDocumentEngine.php         |   7 +-
 .../PhabricatorDocumentRenderingEngine.php    |   7 +
 src/view/layout/PhabricatorSourceCodeView.php |  21 ++-
 webroot/rsrc/css/core/syntax.css              |  13 +-
 .../layout/phabricator-source-code-view.css   |   1 -
 .../repository/repository-crossreference.js   | 150 ++++++++++++++----
 11 files changed, 201 insertions(+), 68 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index ca75f4ee09..b4381dea5c 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,10 +9,10 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '29452b31',
+    'core.pkg.css' => '4a83e174',
     'core.pkg.js' => '1ea38af8',
     'differential.pkg.css' => '113e692c',
-    'differential.pkg.js' => 'f6d809c0',
+    'differential.pkg.js' => '3da2650a',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'maniphest.pkg.css' => '4845691a',
@@ -113,14 +113,14 @@
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '62fa3ace',
     'rsrc/css/core/remarkup.css' => '924fc97d',
-    'rsrc/css/core/syntax.css' => 'cae95e89',
+    'rsrc/css/core/syntax.css' => 'e9c95dd4',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
     'rsrc/css/font/font-awesome.css' => 'e838e088',
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => '31ee3c83',
+    'rsrc/css/layout/phabricator-source-code-view.css' => 'c6fc6834',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -423,7 +423,7 @@
     'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf',
     'rsrc/js/application/releeph/releeph-request-state-change.js' => 'a0b57eb8',
     'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'de2e896f',
-    'rsrc/js/application/repository/repository-crossreference.js' => '2ab10a76',
+    'rsrc/js/application/repository/repository-crossreference.js' => '9a860428',
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
     'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
@@ -676,7 +676,7 @@
     'javelin-behavior-reorder-applications' => '76b9fc3e',
     'javelin-behavior-reorder-columns' => 'e1d25dfb',
     'javelin-behavior-reorder-profile-menu-items' => 'e2e0a072',
-    'javelin-behavior-repository-crossreference' => '2ab10a76',
+    'javelin-behavior-repository-crossreference' => '9a860428',
     'javelin-behavior-scrollbar' => '834a1173',
     'javelin-behavior-search-reorder-queries' => 'e9581f08',
     'javelin-behavior-select-content' => 'bf5374ef',
@@ -784,7 +784,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => '31ee3c83',
+    'phabricator-source-code-view-css' => 'c6fc6834',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
@@ -884,7 +884,7 @@
     'sprite-login-css' => '396f3c3a',
     'sprite-tokens-css' => '9cdfd599',
     'syntax-default-css' => '9923583c',
-    'syntax-highlighting-css' => 'cae95e89',
+    'syntax-highlighting-css' => 'e9c95dd4',
     'tokens-css' => '3d0f239e',
     'typeahead-browse-css' => 'f2818435',
     'unhandled-exception-css' => '4c96257a',
@@ -1050,12 +1050,6 @@
       'javelin-install',
       'javelin-util',
     ),
-    '2ab10a76' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-uri',
-    ),
     '2ae077e1' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1683,6 +1677,12 @@
       'phuix-icon-view',
       'javelin-behavior-phabricator-gesture',
     ),
+    '9a860428' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-uri',
+    ),
     '9bbf3762' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1972,9 +1972,6 @@
       'phabricator-title',
       'phabricator-favicon',
     ),
-    'cae95e89' => array(
-      'syntax-default-css',
-    ),
     'cd2b9b77' => array(
       'phui-oi-list-view-css',
     ),
@@ -2103,6 +2100,9 @@
       'javelin-dom',
       'phabricator-draggable-list',
     ),
+    'e9c95dd4' => array(
+      'syntax-default-css',
+    ),
     'ec1f3669' => array(
       'javelin-behavior',
       'javelin-util',
diff --git a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
index b3b77c9301..2ca23473ca 100644
--- a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
+++ b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
@@ -69,4 +69,24 @@ protected function addApplicationCrumbs(
     return;
   }
 
+  protected function willRenderRef(PhabricatorDocumentRef $ref) {
+    $ref->setSymbolMetadata($this->getSymbolMetadata());
+  }
+
+  private function getSymbolMetadata() {
+    $drequest = $this->getDiffusionRequest();
+
+    $repo = $drequest->getRepository();
+    $symbol_repos = nonempty($repo->getSymbolSources(), array());
+    $symbol_repos[] = $repo->getPHID();
+
+    $lang = last(explode('.', $drequest->getPath()));
+
+    return array(
+      'repositories' => $symbol_repos,
+      'lang' => $lang,
+      'path' => $drequest->getPath(),
+    );
+  }
+
 }
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
index cca0c102e2..50230cc91d 100644
--- a/src/applications/files/document/PhabricatorDocumentRef.php
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -8,6 +8,7 @@ final class PhabricatorDocumentRef
   private $file;
   private $byteLength;
   private $snippet;
+  private $symbolMetadata = array();
 
   public function setFile(PhabricatorFile $file) {
     $this->file = $file;
@@ -131,4 +132,15 @@ public function getSnippet() {
     return $this->snippet;
   }
 
+  public function setSymbolMetadata(array $metadata) {
+    $this->symbolMetadata = $metadata;
+    return $this;
+  }
+
+  public function getSymbolMetadata() {
+    return $this->symbolMetadata;
+  }
+
+
+
 }
diff --git a/src/applications/files/document/PhabricatorJSONDocumentEngine.php b/src/applications/files/document/PhabricatorJSONDocumentEngine.php
index 331a7e6820..683f1746e6 100644
--- a/src/applications/files/document/PhabricatorJSONDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorJSONDocumentEngine.php
@@ -52,7 +52,7 @@ protected function newDocumentContent(PhabricatorDocumentRef $ref) {
 
     return array(
       $message,
-      $this->newTextDocumentContent($content),
+      $this->newTextDocumentContent($ref, $content),
     );
   }
 
diff --git a/src/applications/files/document/PhabricatorSourceDocumentEngine.php b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
index 5a4b7f0be7..21898ef636 100644
--- a/src/applications/files/document/PhabricatorSourceDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
@@ -47,7 +47,7 @@ protected function newDocumentContent(PhabricatorDocumentRef $ref) {
 
     return array(
       $messages,
-      $this->newTextDocumentContent($content),
+      $this->newTextDocumentContent($ref, $content),
     );
   }
 
diff --git a/src/applications/files/document/PhabricatorTextDocumentEngine.php b/src/applications/files/document/PhabricatorTextDocumentEngine.php
index 08a5cabe54..c53b9edd58 100644
--- a/src/applications/files/document/PhabricatorTextDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorTextDocumentEngine.php
@@ -13,12 +13,15 @@ public function canConfigureEncoding(PhabricatorDocumentRef $ref) {
     return true;
   }
 
-  protected function newTextDocumentContent($content) {
+  protected function newTextDocumentContent(
+    PhabricatorDocumentRef $ref,
+    $content) {
     $lines = phutil_split_lines($content);
 
     $view = id(new PhabricatorSourceCodeView())
       ->setHighlights($this->getHighlightedLines())
-      ->setLines($lines);
+      ->setLines($lines)
+      ->setSymbolMetadata($ref->getSymbolMetadata());
 
     $message = null;
     if ($this->encodingMessage !== null) {
diff --git a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
index d95d93f74a..f412cb2869 100644
--- a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
+++ b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
@@ -105,6 +105,7 @@ final public function newDocumentView(PhabricatorDocumentRef $ref) {
         'renderControlID' => $control_id,
       );
     } else {
+      $this->willRenderRef($ref);
       $content = $engine->newDocument($ref);
       $config = array();
     }
@@ -158,6 +159,8 @@ final public function newDocumentView(PhabricatorDocumentRef $ref) {
   }
 
   final public function newRenderResponse(PhabricatorDocumentRef $ref) {
+    $this->willRenderRef($ref);
+
     $request = $this->getRequest();
     $viewer = $request->getViewer();
 
@@ -290,4 +293,8 @@ protected function addApplicationCrumbs(
     return;
   }
 
+  protected function willRenderRef(PhabricatorDocumentRef $ref) {
+    return;
+  }
+
 }
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index ce26fa3df7..6a51e1843d 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -8,6 +8,7 @@ final class PhabricatorSourceCodeView extends AphrontView {
   private $canClickHighlight = true;
   private $truncatedFirstBytes = false;
   private $truncatedFirstLines = false;
+  private $symbolMetadata;
 
   public function setLines(array $lines) {
     $this->lines = $lines;
@@ -39,6 +40,15 @@ public function setTruncatedFirstLines($truncated_first_lines) {
     return $this;
   }
 
+  public function setSymbolMetadata(array $symbol_metadata) {
+    $this->symbolMetadata = $symbol_metadata;
+    return $this;
+  }
+
+  public function getSymbolMetadata() {
+    return $this->symbolMetadata;
+  }
+
   public function render() {
     require_celerity_resource('phabricator-source-code-view-css');
     require_celerity_resource('syntax-highlighting-css');
@@ -130,15 +140,24 @@ public function render() {
     $classes[] = 'remarkup-code';
     $classes[] = 'PhabricatorMonospaced';
 
+    $symbol_metadata = $this->getSymbolMetadata();
+
+    $sigils = array();
+    $sigils[] = 'phabricator-source';
+    $sigils[] = 'has-symbols';
+
+    Javelin::initBehavior('repository-crossreference');
+
     return phutil_tag_div(
       'phabricator-source-code-container',
       javelin_tag(
         'table',
         array(
           'class' => implode(' ', $classes),
-          'sigil' => 'phabricator-source',
+          'sigil' => implode(' ', $sigils),
           'meta' => array(
             'uri' => (string)$this->uri,
+            'symbols' => $symbol_metadata,
           ),
         ),
         phutil_implode_html('', $rows)));
diff --git a/webroot/rsrc/css/core/syntax.css b/webroot/rsrc/css/core/syntax.css
index a0b84ea2b3..cfc82da09b 100644
--- a/webroot/rsrc/css/core/syntax.css
+++ b/webroot/rsrc/css/core/syntax.css
@@ -6,11 +6,6 @@
   color: #aa0066;
 }
 
-.remarkup-code .over-the-line {
-  color: #aa0066;
-  margin-right: 1px;
-}
-
 .remarkup-code td > span {
   display: inline;
   word-break: break-all;
@@ -24,11 +19,9 @@
 .remarkup-code .rbw_i { color: indigo; }
 .remarkup-code .rbw_v { color: violet; }
 
-.repository-crossreference .remarkup-code .crossreference-item {
-  background: lightyellow;
-  border-bottom: 1px dotted #bbddbb;
-}
-.crossreference-cursor {
+span.crossreference-item {
+  background: {$lightyellow};
+  border-bottom: 1px solid {$yellow};
   cursor: help;
 }
 
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index 1836d321a5..3c6e85f71e 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -7,7 +7,6 @@
   overflow-y: hidden;
   border: 1px solid {$paste.border};
   border-radius: 3px;
-  background-color: {$paste.content};
 }
 
 .phui-oi .phabricator-source-code-container {
diff --git a/webroot/rsrc/js/application/repository/repository-crossreference.js b/webroot/rsrc/js/application/repository/repository-crossreference.js
index 5f2f8306bf..548ef6173b 100644
--- a/webroot/rsrc/js/application/repository/repository-crossreference.js
+++ b/webroot/rsrc/js/application/repository/repository-crossreference.js
@@ -11,12 +11,29 @@ JX.behavior('repository-crossreference', function(config, statics) {
   var highlighted;
   var linked = [];
 
-  var isMac = navigator.platform.indexOf('Mac') > -1;
-  var signalKey = isMac ? 91 /*COMMAND*/ : 17 /*CTRL*/;
-  function isSignalkey(event) {
-    return isMac ?
-      event.getRawEvent().metaKey :
-      event.getRawEvent().ctrlKey;
+  function isMacOS() {
+    return (navigator.platform.indexOf('Mac') > -1);
+  }
+
+  function isHighlightModifierKey(e) {
+    var signal_key;
+    if (isMacOS()) {
+      // On macOS, use the "Command" key.
+      signal_key = 91;
+    } else {
+      // On other platforms, use the "Control" key.
+      signal_key = 17;
+    }
+
+    return (e.getRawEvent().keyCode === signal_key);
+  }
+
+  function hasHighlightModifierKey(e) {
+    if (isMacOS()) {
+      return e.getRawEvent().metaKey;
+    } else {
+      return e.getRawEvent().ctrlKey;
+    }
   }
 
   var classHighlight = 'crossreference-item';
@@ -43,7 +60,7 @@ JX.behavior('repository-crossreference', function(config, statics) {
           unhighlight();
           return;
         }
-        if (!isSignalkey(e)) {
+        if (!hasHighlightModifierKey(e)) {
           return;
         }
 
@@ -76,7 +93,7 @@ JX.behavior('repository-crossreference', function(config, statics) {
             target = target.parentNode;
           }
         } else if (e.getType() === 'click') {
-          openSearch(target, lang);
+          openSearch(target, {lang: lang});
         }
       });
   }
@@ -85,13 +102,24 @@ JX.behavior('repository-crossreference', function(config, statics) {
     highlighted = null;
   }
 
-  function openSearch(target, lang) {
+  function openSearch(target, context) {
     var symbol = target.textContent || target.innerText;
-    var query = {
-      lang : lang,
-      repositories : config.repositories.join(','),
-      jump : true
-    };
+
+    context = context || {};
+    context.lang = context.lang || null;
+    context.repositories =
+      context.repositories ||
+      (config && config.repositories) ||
+      [];
+
+    var query = JX.copy({}, context);
+    if (query.repositories.length) {
+      query.repositories = query.repositories.join(',');
+    } else {
+      delete query.repositories;
+    }
+    query.jump = true;
+
     var c = target.className;
     c = c.replace(classHighlight, '').trim();
 
@@ -112,9 +140,11 @@ JX.behavior('repository-crossreference', function(config, statics) {
       query.line = line;
     }
 
-    var path = getPath(target);
-    if (path !== null) {
-      query.path = path;
+    if (!query.hasOwnProperty('path')) {
+      var path = getPath(target);
+      if (path !== null) {
+        query.path = path;
+      }
     }
 
     var char = getChar(target);
@@ -124,7 +154,8 @@ JX.behavior('repository-crossreference', function(config, statics) {
 
     var uri = JX.$U('/diffusion/symbol/' + symbol + '/');
     uri.addQueryParams(query);
-    window.open(uri);
+
+    window.open(uri.toString());
   }
 
   function linkAll() {
@@ -188,16 +219,6 @@ JX.behavior('repository-crossreference', function(config, statics) {
       // Ignore.
     }
 
-    // This method works in Diffusion, when viewing the content of a file at
-    // a particular commit.
-    var file;
-    try {
-      file = JX.DOM.findAbove(target, 'div', 'diffusion-file-content-view');
-      return JX.Stratcom.getData(file).path;
-    } catch (ex) {
-      // Ignore.
-    }
-
     return null;
   }
 
@@ -227,12 +248,6 @@ JX.behavior('repository-crossreference', function(config, statics) {
     return null;
   }
 
-  if (config.container) {
-    link(JX.$(config.container), config.lang);
-  } else if (config.section) {
-    linkAll(JX.$(config.section));
-  }
-
   JX.Stratcom.listen(
     'differential-preview-update',
     null,
@@ -245,9 +260,10 @@ JX.behavior('repository-crossreference', function(config, statics) {
     ['keydown', 'keyup'],
     null,
     function(e) {
-      if (e.getRawEvent().keyCode !== signalKey) {
+      if (!isHighlightModifierKey(e)) {
         return;
       }
+
       setCursorMode(e.getType() === 'keydown');
 
       if (!statics.active) {
@@ -272,4 +288,68 @@ JX.behavior('repository-crossreference', function(config, statics) {
       JX.DOM.alterClass(element, classMouseCursor, statics.active);
     });
   }
+
+
+  if (config && config.container) {
+    link(JX.$(config.container), config.lang);
+  }
+
+  JX.Stratcom.listen(
+    ['mouseover', 'mouseout', 'click'],
+    ['has-symbols', 'tag:span'],
+    function(e) {
+      var type = e.getType();
+
+      if (type === 'mouseout') {
+        unhighlight();
+        return;
+      }
+
+      if (!hasHighlightModifierKey(e)) {
+        return;
+      }
+
+      var target = e.getTarget();
+
+      try {
+        // If we're in an inline comment, don't link symbols.
+        if (JX.DOM.findAbove(target, 'div', 'differential-inline-comment')) {
+          return;
+        }
+      } catch (ex) {
+        // Continue if we're not inside an inline comment.
+      }
+
+      // If only part of the symbol was edited, the symbol name itself will
+      // have another "<span />" inside of it which highlights only the
+      // edited part. Skip over it.
+      if (JX.DOM.isNode(target, 'span') && (target.className === 'bright')) {
+        target = target.parentNode;
+      }
+
+      if (type === 'click') {
+        openSearch(target, e.getNodeData('has-symbols').symbols);
+        e.kill();
+        return;
+      }
+
+      if (e.getType() === 'mouseover') {
+        while (target && target !== document.body) {
+          if (!JX.DOM.isNode(target, 'span')) {
+            target = target.parentNode;
+            continue;
+          }
+
+          if (!class_map.hasOwnProperty(target.className)) {
+            target = target.parentNode;
+            continue;
+          }
+
+          highlighted = target;
+          JX.DOM.alterClass(highlighted, classHighlight, true);
+          break;
+        }
+      }
+    });
+
 });

From 09c6d42b95999ec7f2cb74eba7a2721aaaba0365 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 8 Apr 2018 11:38:19 -0700
Subject: [PATCH 790/865] Mostly make blame work with DocumentEngine

Summary: Ref T13105. This needs refinement but blame sort of works again, now.

Test Plan: Viewed files in Diffusion and Files; saw blame in Diffusion when viewing in source mode.

Reviewers: mydeveloperday

Reviewed By: mydeveloperday

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19309
---
 resources/celerity/map.php                    |  42 ++-
 resources/celerity/packages.php               |   1 -
 src/__phutil_library_map__.php                |   2 +
 .../PhabricatorDiffusionApplication.php       |   2 +
 .../controller/DiffusionBlameController.php   | 254 +++++++++++++++++
 .../controller/DiffusionBrowseController.php  | 264 +-----------------
 .../DiffusionDocumentRenderingEngine.php      |  12 +-
 .../document/PhabricatorDocumentEngine.php    |   4 +
 .../files/document/PhabricatorDocumentRef.php |   8 +
 .../PhabricatorSourceDocumentEngine.php       |  14 +-
 .../PhabricatorTextDocumentEngine.php         |  21 +-
 .../PhabricatorDocumentRenderingEngine.php    |  20 +-
 .../storage/PhabricatorRepository.php         |   2 +
 .../storage/PhabricatorRepositoryCommit.php   |  22 --
 src/view/layout/PhabricatorSourceCodeView.php |  44 ++-
 .../differential/changeset-view.css           |   4 -
 .../diffusion/diffusion-source.css            | 102 -------
 .../layout/phabricator-source-code-view.css   |  43 +++
 .../diffusion/behavior-load-blame.js          |  14 -
 .../files/behavior-document-engine.js         |  84 +++++-
 20 files changed, 513 insertions(+), 446 deletions(-)
 create mode 100644 src/applications/diffusion/controller/DiffusionBlameController.php
 delete mode 100644 webroot/rsrc/css/application/diffusion/diffusion-source.css
 delete mode 100644 webroot/rsrc/js/application/diffusion/behavior-load-blame.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index b4381dea5c..4f4356cc63 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -11,8 +11,8 @@
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '4a83e174',
     'core.pkg.js' => '1ea38af8',
-    'differential.pkg.css' => '113e692c',
-    'differential.pkg.js' => '3da2650a',
+    'differential.pkg.css' => '06dc617c',
+    'differential.pkg.js' => 'c2ca903a',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'maniphest.pkg.css' => '4845691a',
@@ -61,7 +61,7 @@
     'rsrc/css/application/dashboard/dashboard.css' => 'fe5b1869',
     'rsrc/css/application/diff/inline-comment-summary.css' => 'f23d4e8f',
     'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
-    'rsrc/css/application/differential/changeset-view.css' => 'bf84345b',
+    'rsrc/css/application/differential/changeset-view.css' => 'db34a142',
     'rsrc/css/application/differential/core.css' => '5b7b8ff4',
     'rsrc/css/application/differential/phui-inline-comment.css' => '65ae3bc2',
     'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
@@ -71,7 +71,6 @@
     'rsrc/css/application/diffusion/diffusion-icons.css' => '0c15255e',
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
-    'rsrc/css/application/diffusion/diffusion-source.css' => '5f35a3bd',
     'rsrc/css/application/diffusion/diffusion.css' => '45727264',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
@@ -120,7 +119,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => 'c6fc6834',
+    'rsrc/css/layout/phabricator-source-code-view.css' => 'af54e277',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -387,12 +386,11 @@
     'rsrc/js/application/diffusion/behavior-commit-graph.js' => '75b83cbb',
     'rsrc/js/application/diffusion/behavior-diffusion-browse-file.js' => '054a0f0b',
     'rsrc/js/application/diffusion/behavior-jump-to.js' => '73d09eef',
-    'rsrc/js/application/diffusion/behavior-load-blame.js' => '42126667',
     'rsrc/js/application/diffusion/behavior-locate-file.js' => '6d3e1947',
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => '9108ee1a',
+    'rsrc/js/application/files/behavior-document-engine.js' => 'ac52a3be',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -543,7 +541,7 @@
     'conpherence-thread-manager' => '4d863052',
     'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
-    'differential-changeset-view-css' => 'bf84345b',
+    'differential-changeset-view-css' => 'db34a142',
     'differential-core-view-css' => '5b7b8ff4',
     'differential-revision-add-comment-css' => 'c47f8c40',
     'differential-revision-comment-css' => '14b8565a',
@@ -554,7 +552,6 @@
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
-    'diffusion-source-css' => '5f35a3bd',
     'diviner-shared-css' => '896f1d43',
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
@@ -607,7 +604,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => '9108ee1a',
+    'javelin-behavior-document-engine' => 'ac52a3be',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -624,7 +621,6 @@
     'javelin-behavior-launch-icon-composer' => '48086888',
     'javelin-behavior-lightbox-attachments' => '6b31879a',
     'javelin-behavior-line-chart' => 'e4232876',
-    'javelin-behavior-load-blame' => '42126667',
     'javelin-behavior-maniphest-batch-selector' => 'ad54037e',
     'javelin-behavior-maniphest-list-editor' => 'a9f88de2',
     'javelin-behavior-maniphest-subpriority-editor' => '71237763',
@@ -784,7 +780,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => 'c6fc6834',
+    'phabricator-source-code-view-css' => 'af54e277',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
@@ -1153,11 +1149,6 @@
       'phabricator-diff-changeset-list',
       'phabricator-diff-changeset',
     ),
-    42126667 => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-request',
-    ),
     '4250a34e' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1632,11 +1623,6 @@
       'javelin-stratcom',
       'javelin-vector',
     ),
-    '9108ee1a' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     '92b9ec77' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1772,6 +1758,11 @@
       'javelin-dom',
       'javelin-typeahead-normalizer',
     ),
+    'ac52a3be' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     'acd29eee' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1902,9 +1893,6 @@
       'javelin-stratcom',
       'javelin-dom',
     ),
-    'bf84345b' => array(
-      'phui-inline-comment-view-css',
-    ),
     'bff6884b' => array(
       'javelin-install',
       'javelin-dom',
@@ -2021,6 +2009,9 @@
       'javelin-util',
       'phabricator-shaped-request',
     ),
+    'db34a142' => array(
+      'phui-inline-comment-view-css',
+    ),
     'dca75c0e' => array(
       'multirow-row-manager',
       'javelin-install',
@@ -2367,7 +2358,6 @@
       'javelin-behavior-aphront-drag-and-drop-textarea',
       'javelin-behavior-phabricator-object-selector',
       'javelin-behavior-repository-crossreference',
-      'javelin-behavior-load-blame',
       'javelin-behavior-differential-user-select',
       'javelin-behavior-aphront-more',
       'phabricator-diff-inline',
diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php
index 3cec508678..958b1d6afa 100644
--- a/resources/celerity/packages.php
+++ b/resources/celerity/packages.php
@@ -199,7 +199,6 @@
     'javelin-behavior-aphront-drag-and-drop-textarea',
     'javelin-behavior-phabricator-object-selector',
     'javelin-behavior-repository-crossreference',
-    'javelin-behavior-load-blame',
 
     'javelin-behavior-differential-user-select',
     'javelin-behavior-aphront-more',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 8e2eb24b15..4663aed50d 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -632,6 +632,7 @@
     'DiffusionAuditorsAddSelfHeraldAction' => 'applications/diffusion/herald/DiffusionAuditorsAddSelfHeraldAction.php',
     'DiffusionAuditorsHeraldAction' => 'applications/diffusion/herald/DiffusionAuditorsHeraldAction.php',
     'DiffusionBlameConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBlameConduitAPIMethod.php',
+    'DiffusionBlameController' => 'applications/diffusion/controller/DiffusionBlameController.php',
     'DiffusionBlameQuery' => 'applications/diffusion/query/blame/DiffusionBlameQuery.php',
     'DiffusionBlockHeraldAction' => 'applications/diffusion/herald/DiffusionBlockHeraldAction.php',
     'DiffusionBranchListView' => 'applications/diffusion/view/DiffusionBranchListView.php',
@@ -5889,6 +5890,7 @@
     'DiffusionAuditorsAddSelfHeraldAction' => 'DiffusionAuditorsHeraldAction',
     'DiffusionAuditorsHeraldAction' => 'HeraldAction',
     'DiffusionBlameConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
+    'DiffusionBlameController' => 'DiffusionController',
     'DiffusionBlameQuery' => 'DiffusionQuery',
     'DiffusionBlockHeraldAction' => 'HeraldAction',
     'DiffusionBranchListView' => 'DiffusionView',
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index 4a1c2fdd95..70990bfe3c 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -55,6 +55,8 @@ public function getRoutes() {
         'browse/(?P<dblob>.*)' => 'DiffusionBrowseController',
         'document/(?P<dblob>.*)'
           => 'DiffusionDocumentController',
+        'blame/(?P<dblob>.*)'
+          => 'DiffusionBlameController',
         'lastmodified/(?P<dblob>.*)' => 'DiffusionLastModifiedController',
         'diff/' => 'DiffusionDiffController',
         'tags/(?P<dblob>.*)' => 'DiffusionTagListController',
diff --git a/src/applications/diffusion/controller/DiffusionBlameController.php b/src/applications/diffusion/controller/DiffusionBlameController.php
new file mode 100644
index 0000000000..758a865e0a
--- /dev/null
+++ b/src/applications/diffusion/controller/DiffusionBlameController.php
@@ -0,0 +1,254 @@
+<?php
+
+final class DiffusionBlameController extends DiffusionController {
+
+  public function shouldAllowPublic() {
+    return true;
+  }
+
+  public function handleRequest(AphrontRequest $request) {
+    $response = $this->loadDiffusionContext();
+    if ($response) {
+      return $response;
+    }
+
+    $viewer = $this->getViewer();
+    $drequest = $this->getDiffusionRequest();
+    $repository = $drequest->getRepository();
+
+    $blame = $this->loadBlame();
+
+    $identifiers = array_fuse($blame);
+    if ($identifiers) {
+      $commits = id(new DiffusionCommitQuery())
+        ->setViewer($viewer)
+        ->withRepository($repository)
+        ->withIdentifiers($identifiers)
+        ->execute();
+      $commits = mpull($commits, null, 'getCommitIdentifier');
+    } else {
+      $commits = array();
+    }
+
+    $commit_map = mpull($commits, 'getCommitIdentifier', 'getPHID');
+
+    $revisions = array();
+    $revision_map = array();
+    if ($commits) {
+      $revision_ids = id(new DifferentialRevision())
+        ->loadIDsByCommitPHIDs(array_keys($commit_map));
+      if ($revision_ids) {
+        $revisions = id(new DifferentialRevisionQuery())
+          ->setViewer($viewer)
+          ->withIDs($revision_ids)
+          ->execute();
+        $revisions = mpull($revisions, null, 'getID');
+      }
+
+      foreach ($revision_ids as $commit_phid => $revision_id) {
+        // If the viewer can't actually see this revision, skip it.
+        if (!isset($revisions[$revision_id])) {
+          continue;
+        }
+        $revision_map[$commit_map[$commit_phid]] = $revision_id;
+      }
+    }
+
+    $base_href = (string)$drequest->generateURI(
+      array(
+        'action' => 'browse',
+        'stable' => true,
+      ));
+
+    $skip_text = pht('Skip Past This Commit');
+    $skip_icon = id(new PHUIIconView())
+      ->setIcon('fa-backward');
+
+    Javelin::initBehavior('phabricator-tooltips');
+
+    $handle_phids = array();
+    foreach ($commits as $commit) {
+      $author_phid = $commit->getAuthorPHID();
+      if ($author_phid) {
+        $handle_phids[] = $author_phid;
+      }
+    }
+
+    foreach ($revisions as $revision) {
+      $handle_phids[] = $revision->getAuthorPHID();
+    }
+
+    $handles = $viewer->loadHandles($handle_phids);
+
+    $map = array();
+    foreach ($identifiers as $identifier) {
+      $revision_id = idx($revision_map, $identifier);
+      if ($revision_id) {
+        $revision = idx($revisions, $revision_id);
+      } else {
+        $revision = null;
+      }
+
+      $skip_href = $base_href.'?before='.$identifier;
+
+      $skip_link = javelin_tag(
+        'a',
+        array(
+          'href'  => $skip_href,
+          'sigil' => 'has-tooltip',
+          'meta'  => array(
+            'tip'     => $skip_text,
+            'align'   => 'E',
+            'size'    => 300,
+          ),
+        ),
+        $skip_icon);
+
+      $commit = $commits[$identifier];
+
+      $author_phid = $commit->getAuthorPHID();
+      if (!$author_phid && $revision) {
+        $author_phid = $revision->getAuthorPHID();
+      }
+
+      if (!$author_phid) {
+        // This means we couldn't identify an author for the commit or the
+        // revision. We just render a blank for alignment.
+        $author_style = null;
+        $author_href = null;
+        $author_sigil = null;
+        $author_meta = null;
+      } else {
+        $author_src = $handles[$author_phid]->getImageURI();
+        $author_style = 'background-image: url('http://github.com/.$author_src.');';
+        $author_href = $handles[$author_phid]->getURI();
+        $author_sigil = 'has-tooltip';
+        $author_meta = array(
+          'tip' => $handles[$author_phid]->getName(),
+          'align' => 'E',
+        );
+      }
+
+      $author_link = javelin_tag(
+        $author_href ? 'a' : 'span',
+        array(
+          'class' => 'phabricator-source-blame-author',
+          'style' => $author_style,
+          'href' => $author_href,
+          'sigil' => $author_sigil,
+          'meta' => $author_meta,
+        ));
+
+      $commit_link = javelin_tag(
+        'a',
+        array(
+          'href' => $commit->getURI(),
+          'sigil' => 'has-tooltip',
+          'meta'  => array(
+            'tip'   => $this->renderCommitTooltip($commit, $handles),
+            'align' => 'E',
+            'size'  => 600,
+          ),
+        ),
+        $commit->getLocalName());
+
+      $info = array(
+        $author_link,
+        $commit_link,
+      );
+
+      if ($revision) {
+        $revision_link = phutil_tag(
+          'a',
+          array(
+            'href' => $revision->getURI(),
+            'sigil' => 'has-tooltip',
+            'meta'  => array(
+              'tip'   => $this->renderRevisionTooltip($revision, $handles),
+              'align' => 'E',
+              'size'  => 600,
+            ),
+          ),
+          $revision->getMonogram());
+
+
+        $info = array(
+          $info,
+          ' / ',
+          $revision_link,
+        );
+      }
+
+      $data = array(
+        'skip' => $skip_link,
+        'info' => hsprintf('%s', $info),
+      );
+
+      $map[$identifier] = $data;
+    }
+
+    return id(new AphrontAjaxResponse())->setContent(
+      array(
+        'blame' => $blame,
+        'map' => $map,
+      ));
+  }
+
+  private function loadBlame() {
+    $drequest = $this->getDiffusionRequest();
+
+    $commit = $drequest->getCommit();
+    $path = $drequest->getPath();
+
+    $blame_timeout = 15;
+
+    $blame = $this->callConduitWithDiffusionRequest(
+      'diffusion.blame',
+      array(
+        'commit' => $commit,
+        'paths' => array($path),
+        'timeout' => $blame_timeout,
+      ));
+
+    return idx($blame, $path, array());
+  }
+
+  private function renderRevisionTooltip(
+    DifferentialRevision $revision,
+    $handles) {
+    $viewer = $this->getViewer();
+
+    $date = phabricator_date($revision->getDateModified(), $viewer);
+    $monogram = $revision->getMonogram();
+    $title = $revision->getTitle();
+    $header = "{$monogram} {$title}";
+
+    $author = $handles[$revision->getAuthorPHID()]->getName();
+
+    return "{$header}\n{$date} \xC2\xB7 {$author}";
+  }
+
+  private function renderCommitTooltip(
+    PhabricatorRepositoryCommit $commit,
+    $handles) {
+
+    $viewer = $this->getViewer();
+
+    $date = phabricator_date($commit->getEpoch(), $viewer);
+    $summary = trim($commit->getSummary());
+
+    $author_phid = $commit->getAuthorPHID();
+    if ($author_phid && isset($handles[$author_phid])) {
+      $author_name = $handles[$author_phid]->getName();
+    } else {
+      $author_name = null;
+    }
+
+    if ($author_name) {
+      return "{$summary}\n{$date} \xC2\xB7 {$author_name}";
+    } else {
+      return "{$summary}\n{$date}";
+    }
+  }
+
+}
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 2c2a2f46b9..1053ef477c 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -110,12 +110,6 @@ private function browseFile() {
     }
 
     $path = $drequest->getPath();
-
-    // We need the blame information if blame is on and this is an Ajax request.
-    // If blame is on and this is a colorized request, we don't show blame at
-    // first (we ajax it in afterward) so we don't need to query for it.
-    $needs_blame = $request->isAjax();
-
     $params = array(
       'commit' => $drequest->getCommit(),
       'path' => $drequest->getPath(),
@@ -184,11 +178,10 @@ private function browseFile() {
           $file->setName($basename);
 
           return $file->getRedirectResponse();
-        } else {
-          $corpus = $this->buildGitLFSCorpus($lfs_ref);
         }
+
+        $corpus = $this->buildGitLFSCorpus($lfs_ref);
       } else {
-        $this->loadLintMessages();
         $this->coverage = $drequest->loadCoverage();
         $show_editor = true;
 
@@ -205,12 +198,6 @@ private function browseFile() {
       }
     }
 
-    if ($request->isAjax()) {
-      return id(new AphrontAjaxResponse())->setContent($corpus);
-    }
-
-    require_celerity_resource('diffusion-source-css');
-
     $bar = $this->buildButtonBar($drequest, $show_editor);
     $header = $this->buildHeaderView($drequest);
     $header->setHeaderIcon('fa-file-code-o');
@@ -480,35 +467,6 @@ private function renderGrepResults(array $results, $pattern) {
     return $view;
   }
 
-  private function loadLintMessages() {
-    $drequest = $this->getDiffusionRequest();
-    $branch = $drequest->loadBranch();
-
-    if (!$branch || !$branch->getLintCommit()) {
-      return;
-    }
-
-    $this->lintCommit = $branch->getLintCommit();
-
-    $conn = id(new PhabricatorRepository())->establishConnection('r');
-
-    $where = '';
-    if ($drequest->getLint()) {
-      $where = qsprintf(
-        $conn,
-        'AND code = %s',
-        $drequest->getLint());
-    }
-
-    $this->lintMessages = queryfx_all(
-      $conn,
-      'SELECT * FROM %T WHERE branchID = %d %Q AND path = %s',
-      PhabricatorRepository::TABLE_LINTMESSAGE,
-      $branch->getID(),
-      $where,
-      '/'.$drequest->getPath());
-  }
-
   private function buildButtonBar(
     DiffusionRequest $drequest,
     $show_editor) {
@@ -550,33 +508,6 @@ private function buildButtonBar(
           ->setColor(PHUIButtonView::GREY);
     }
 
-    $href = null;
-    $show_lint = true;
-    if ($this->getRequest()->getStr('lint') !== null) {
-      $lint_text = pht('Hide Lint');
-      $href = $base_uri->alter('lint', null);
-
-    } else if ($this->lintCommit === null) {
-      $show_lint = false;
-    } else {
-      $lint_text = pht('Show Lint');
-      $href = $this->getDiffusionRequest()->generateURI(array(
-        'action' => 'browse',
-        'commit' => $this->lintCommit,
-      ))->alter('lint', '');
-    }
-
-    if ($show_lint) {
-      $buttons[] =
-        id(new PHUIButtonView())
-          ->setTag('a')
-          ->setText($lint_text)
-          ->setHref($href)
-          ->setIcon('fa-exclamation-triangle')
-          ->setDisabled(!$href)
-          ->setColor(PHUIButtonView::GREY);
-    }
-
     $bar = id(new PHUILeftRightView())
       ->setLeft($buttons)
       ->addClass('diffusion-action-bar full-mobile-buttons');
@@ -705,40 +636,6 @@ private function renderGitLFSButton() {
       ->setColor(PHUIButtonView::GREY);
   }
 
-  private function renderInlines(
-    array $inlines,
-    $has_coverage,
-    $engine) {
-
-    $rows = array();
-    foreach ($inlines as $inline) {
-
-      // TODO: This should use modern scaffolding code.
-
-      $inline_view = id(new PHUIDiffInlineCommentDetailView())
-        ->setUser($this->getViewer())
-        ->setMarkupEngine($engine)
-        ->setInlineComment($inline)
-        ->render();
-
-      $row = array_fill(0, 3, phutil_tag('th'));
-
-      $row[] = phutil_tag('td', array(), $inline_view);
-
-      if ($has_coverage) {
-        $row[] = phutil_tag(
-          'td',
-          array(
-            'class' => 'cov cov-I',
-          ));
-      }
-
-      $rows[] = phutil_tag('tr', array('class' => 'inline'), $row);
-    }
-
-    return $rows;
-  }
-
   private function buildErrorCorpus($message) {
     $text = id(new PHUIBoxView())
       ->addPadding(PHUI::PADDING_LARGE)
@@ -898,33 +795,6 @@ private function loadParentCommitOf($commit) {
     return head($parents);
   }
 
-  private function renderRevisionTooltip(
-    DifferentialRevision $revision,
-    $handles) {
-    $viewer = $this->getRequest()->getUser();
-
-    $date = phabricator_date($revision->getDateModified(), $viewer);
-    $id = $revision->getID();
-    $title = $revision->getTitle();
-    $header = "D{$id} {$title}";
-
-    $author = $handles[$revision->getAuthorPHID()]->getName();
-
-    return "{$header}\n{$date} \xC2\xB7 {$author}";
-  }
-
-  private function renderCommitTooltip(
-    PhabricatorRepositoryCommit $commit,
-    $author) {
-
-    $viewer = $this->getRequest()->getUser();
-
-    $date = phabricator_date($commit->getEpoch(), $viewer);
-    $summary = trim($commit->getSummary());
-
-    return "{$summary}\n{$date} \xC2\xB7 {$author}";
-  }
-
   protected function markupText($text) {
     $engine = PhabricatorMarkupEngine::newDiffusionMarkupEngine();
     $engine->setConfig('viewer', $this->getRequest()->getUser());
@@ -1108,127 +978,6 @@ private function buildOpenRevisions() {
     return $view;
   }
 
-  private function loadBlame($path, $commit, $timeout) {
-    $blame = $this->callConduitWithDiffusionRequest(
-      'diffusion.blame',
-      array(
-        'commit' => $commit,
-        'paths' => array($path),
-        'timeout' => $timeout,
-      ));
-
-    $identifiers = idx($blame, $path, null);
-
-    if ($identifiers) {
-      $viewer = $this->getViewer();
-      $drequest = $this->getDiffusionRequest();
-      $repository = $drequest->getRepository();
-
-      $commits = id(new DiffusionCommitQuery())
-        ->setViewer($viewer)
-        ->withRepository($repository)
-        ->withIdentifiers($identifiers)
-        // TODO: We only fetch this to improve author display behavior, but
-        // shouldn't really need to?
-        ->needCommitData(true)
-        ->execute();
-      $commits = mpull($commits, null, 'getCommitIdentifier');
-    } else {
-      $commits = array();
-    }
-
-    return array($identifiers, $commits);
-  }
-
-  private function renderAuthorLinks(array $authors, $handles) {
-    $links = array();
-
-    foreach ($authors as $phid) {
-      if (!strlen($phid)) {
-        // This means we couldn't identify an author for the commit or the
-        // revision. We just render a blank for alignment.
-        $style = null;
-        $href = null;
-        $sigil = null;
-        $meta = null;
-      } else {
-        $src = $handles[$phid]->getImageURI();
-        $style = 'background-image: url('http://github.com/.$src.');';
-        $href = $handles[$phid]->getURI();
-        $sigil = 'has-tooltip';
-        $meta = array(
-          'tip' => $handles[$phid]->getName(),
-          'align' => 'E',
-        );
-      }
-
-      $links[$phid] = javelin_tag(
-        $href ? 'a' : 'span',
-        array(
-          'class' => 'diffusion-author-link',
-          'style' => $style,
-          'href' => $href,
-          'sigil' => $sigil,
-          'meta' => $meta,
-        ));
-    }
-
-    return $links;
-  }
-
-  private function renderCommitLinks(array $commits, $handles) {
-    $links = array();
-    foreach ($commits as $identifier => $commit) {
-      $tooltip = $this->renderCommitTooltip(
-        $commit,
-        $commit->renderAuthorShortName($handles));
-
-      $commit_link = javelin_tag(
-        'a',
-        array(
-          'href' => $commit->getURI(),
-          'sigil' => 'has-tooltip',
-          'meta'  => array(
-            'tip'   => $tooltip,
-            'align' => 'E',
-            'size'  => 600,
-          ),
-        ),
-        $commit->getLocalName());
-
-      $links[$identifier] = $commit_link;
-    }
-
-    return $links;
-  }
-
-  private function renderRevisionLinks(array $revisions, $handles) {
-    $links = array();
-
-    foreach ($revisions as $revision) {
-      $revision_id = $revision->getID();
-
-      $tooltip = $this->renderRevisionTooltip($revision, $handles);
-
-      $revision_link = javelin_tag(
-        'a',
-        array(
-          'href' => '/'.$revision->getMonogram(),
-          'sigil' => 'has-tooltip',
-          'meta'  => array(
-            'tip'   => $tooltip,
-            'align' => 'E',
-            'size'  => 600,
-          ),
-        ),
-        $revision->getMonogram());
-
-      $links[$revision_id] = $revision_link;
-    }
-
-    return $links;
-  }
-
   private function getGitLFSRef(PhabricatorRepository $repository, $data) {
     if (!$repository->canUseGitLFS()) {
       return null;
@@ -1375,13 +1124,4 @@ private function buildBranchTable() {
       ->setTable($history_table);
   }
 
-  private function getLineNumberBaseURI() {
-    $drequest = $this->getDiffusionRequest();
-
-    return (string)$drequest->generateURI(
-      array(
-        'action'  => 'browse',
-        'stable'  => true,
-      ));
-  }
 }
diff --git a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
index 2ca23473ca..17abba5c4f 100644
--- a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
+++ b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
@@ -70,7 +70,17 @@ protected function addApplicationCrumbs(
   }
 
   protected function willRenderRef(PhabricatorDocumentRef $ref) {
-    $ref->setSymbolMetadata($this->getSymbolMetadata());
+    $drequest = $this->getDiffusionRequest();
+
+    $blame_uri = (string)$drequest->generateURI(
+      array(
+        'action' => 'blame',
+        'stable' => true,
+      ));
+
+    $ref
+      ->setSymbolMetadata($this->getSymbolMetadata())
+      ->setBlameURI($blame_uri);
   }
 
   private function getSymbolMetadata() {
diff --git a/src/applications/files/document/PhabricatorDocumentEngine.php b/src/applications/files/document/PhabricatorDocumentEngine.php
index 17feed1c3e..85219b904c 100644
--- a/src/applications/files/document/PhabricatorDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorDocumentEngine.php
@@ -38,6 +38,10 @@ public function canConfigureHighlighting(PhabricatorDocumentRef $ref) {
     return false;
   }
 
+  public function canBlame(PhabricatorDocumentRef $ref) {
+    return false;
+  }
+
   final public function setEncodingConfiguration($config) {
     $this->encodingConfiguration = $config;
     return $this;
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
index 50230cc91d..953ac7df5d 100644
--- a/src/applications/files/document/PhabricatorDocumentRef.php
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -9,6 +9,7 @@ final class PhabricatorDocumentRef
   private $byteLength;
   private $snippet;
   private $symbolMetadata = array();
+  private $blameURI;
 
   public function setFile(PhabricatorFile $file) {
     $this->file = $file;
@@ -141,6 +142,13 @@ public function getSymbolMetadata() {
     return $this->symbolMetadata;
   }
 
+  public function setBlameURI($blame_uri) {
+    $this->blameURI = $blame_uri;
+    return $this;
+  }
 
+  public function getBlameURI() {
+    return $this->blameURI;
+  }
 
 }
diff --git a/src/applications/files/document/PhabricatorSourceDocumentEngine.php b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
index 21898ef636..20a1c94a95 100644
--- a/src/applications/files/document/PhabricatorSourceDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
@@ -13,6 +13,10 @@ public function canConfigureHighlighting(PhabricatorDocumentRef $ref) {
     return true;
   }
 
+  public function canBlame(PhabricatorDocumentRef $ref) {
+    return true;
+  }
+
   protected function getDocumentIconIcon(PhabricatorDocumentRef $ref) {
     return 'fa-code';
   }
@@ -45,9 +49,17 @@ protected function newDocumentContent(PhabricatorDocumentRef $ref) {
       }
     }
 
+    $options = array();
+    if ($ref->getBlameURI()) {
+      $content = phutil_split_lines($content);
+      $blame = range(1, count($content));
+      $blame = array_fuse($blame);
+      $options['blame'] = $blame;
+    }
+
     return array(
       $messages,
-      $this->newTextDocumentContent($ref, $content),
+      $this->newTextDocumentContent($ref, $content, $options),
     );
   }
 
diff --git a/src/applications/files/document/PhabricatorTextDocumentEngine.php b/src/applications/files/document/PhabricatorTextDocumentEngine.php
index c53b9edd58..0377a24353 100644
--- a/src/applications/files/document/PhabricatorTextDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorTextDocumentEngine.php
@@ -15,14 +15,31 @@ public function canConfigureEncoding(PhabricatorDocumentRef $ref) {
 
   protected function newTextDocumentContent(
     PhabricatorDocumentRef $ref,
-    $content) {
-    $lines = phutil_split_lines($content);
+    $content,
+    array $options = array()) {
+
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'blame' => 'optional wild',
+      ));
+
+    if (is_array($content)) {
+      $lines = $content;
+    } else {
+      $lines = phutil_split_lines($content);
+    }
 
     $view = id(new PhabricatorSourceCodeView())
       ->setHighlights($this->getHighlightedLines())
       ->setLines($lines)
       ->setSymbolMetadata($ref->getSymbolMetadata());
 
+    $blame = idx($options, 'blame');
+    if ($blame !== null) {
+      $view->setBlameMap($blame);
+    }
+
     $message = null;
     if ($this->encodingMessage !== null) {
       $message = $this->newMessage($this->encodingMessage);
diff --git a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
index f412cb2869..4a16f53fdf 100644
--- a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
+++ b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
@@ -91,7 +91,8 @@ final public function newDocumentView(PhabricatorDocumentRef $ref) {
         'viewURI' => $view_uri,
         'loadingMarkup' => hsprintf('%s', $loading),
         'canEncode' => $candidate_engine->canConfigureEncoding($ref),
-        'canHighlight' => $candidate_engine->CanConfigureHighlighting($ref),
+        'canHighlight' => $candidate_engine->canConfigureHighlighting($ref),
+        'canBlame' => $candidate_engine->canBlame($ref),
       );
     }
 
@@ -99,15 +100,20 @@ final public function newDocumentView(PhabricatorDocumentRef $ref) {
     $control_id = celerity_generate_unique_node_id();
     $icon = $engine->newDocumentIcon($ref);
 
+    $config = array(
+      'controlID' => $control_id,
+    );
+
     if ($engine->shouldRenderAsync($ref)) {
       $content = $engine->newLoadingContent($ref);
-      $config = array(
-        'renderControlID' => $control_id,
-      );
+      $config['next'] = 'render';
     } else {
       $this->willRenderRef($ref);
       $content = $engine->newDocument($ref);
-      $config = array();
+
+      if ($engine->canBlame($ref)) {
+        $config['next'] = 'blame';
+      }
     }
 
     Javelin::initBehavior('document-engine', $config);
@@ -135,6 +141,10 @@ final public function newDocumentView(PhabricatorDocumentRef $ref) {
         'uri' => '/services/highlight/',
         'value' => $highlight_setting,
       ),
+      'blame' => array(
+        'uri' => $ref->getBlameURI(),
+        'value' => null,
+      ),
     );
 
     $view_button = id(new PHUIButtonView())
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 1dfbceead0..334867cc85 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -703,6 +703,7 @@ public function generateURI(array $params) {
       case 'history':
       case 'graph':
       case 'clone':
+      case 'blame':
       case 'browse':
       case 'document':
       case 'change':
@@ -782,6 +783,7 @@ public function generateURI(array $params) {
       case 'change':
       case 'history':
       case 'graph':
+      case 'blame':
       case 'browse':
       case 'document':
       case 'lastmodified':
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index f6e6e22c3a..01088522e7 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -416,28 +416,6 @@ public function getLocalName() {
     return $repository->formatCommitName($identifier, $local = true);
   }
 
-  public function renderAuthorLink($handles) {
-    $author_phid = $this->getAuthorPHID();
-    if ($author_phid && isset($handles[$author_phid])) {
-      return $handles[$author_phid]->renderLink();
-    }
-
-    return $this->renderAuthorShortName($handles);
-  }
-
-  public function renderAuthorShortName($handles) {
-    $author_phid = $this->getAuthorPHID();
-    if ($author_phid && isset($handles[$author_phid])) {
-      return $handles[$author_phid]->getName();
-    }
-
-    $data = $this->getCommitData();
-    $name = $data->getAuthorName();
-
-    $parsed = new PhutilEmailAddress($name);
-    return nonempty($parsed->getDisplayName(), $parsed->getAddress());
-  }
-
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index 6a51e1843d..19fa17c582 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -9,6 +9,7 @@ final class PhabricatorSourceCodeView extends AphrontView {
   private $truncatedFirstBytes = false;
   private $truncatedFirstLines = false;
   private $symbolMetadata;
+  private $blameMap;
 
   public function setLines(array $lines) {
     $this->lines = $lines;
@@ -49,7 +50,19 @@ public function getSymbolMetadata() {
     return $this->symbolMetadata;
   }
 
+  public function setBlameMap(array $map) {
+    $this->blameMap = $map;
+    return $this;
+  }
+
+  public function getBlameMap() {
+    return $this->blameMap;
+  }
+
   public function render() {
+    $blame_map = $this->getBlameMap();
+    $has_blame = ($blame_map !== null);
+
     require_celerity_resource('phabricator-source-code-view-css');
     require_celerity_resource('syntax-highlighting-css');
 
@@ -85,7 +98,6 @@ public function render() {
 
     $base_uri = (string)$this->uri;
     foreach ($lines as $line) {
-
       // NOTE: See phabricator-oncopy behavior.
       $content_line = hsprintf("\xE2\x80\x8B%s", $line);
 
@@ -114,10 +126,40 @@ public function render() {
           $line_number);
       }
 
+      if ($has_blame) {
+        $lines = idx($blame_map, $line_number);
+
+        if ($lines) {
+          $skip_blame = 'skip;'.$lines;
+          $info_blame = 'info;'.$lines;
+        } else {
+          $skip_blame = null;
+          $info_blame = null;
+        }
+
+        $blame_cells = array(
+          phutil_tag(
+            'th',
+            array(
+              'class' => 'phabricator-source-blame-skip',
+              'data-blame' => $skip_blame,
+            )),
+          phutil_tag(
+            'th',
+            array(
+              'class' => 'phabricator-source-blame-info',
+              'data-blame' => $info_blame,
+            )),
+        );
+      } else {
+        $blame_cells = null;
+      }
+
       $rows[] = phutil_tag(
         'tr',
         $row_attributes,
         array(
+          $blame_cells,
           phutil_tag(
             'th',
             array(
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
index 194561aa7a..b9683dc7c6 100644
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -165,10 +165,6 @@
   padding: 0;
 }
 
-.diffusion-source td.cov {
-  padding: 0 8px;
-}
-
 td.cov-U {
   background: #dd8866;
 }
diff --git a/webroot/rsrc/css/application/diffusion/diffusion-source.css b/webroot/rsrc/css/application/diffusion/diffusion-source.css
deleted file mode 100644
index a2c67cf16d..0000000000
--- a/webroot/rsrc/css/application/diffusion/diffusion-source.css
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * @provides diffusion-source-css
- */
-
-.diffusion-source {
-  width: 100%;
-  background: {$page.content};
-  overflow: hidden;
-}
-
-.device-phone .diffusion-source-wrap {
-  overflow: scroll;
-  -webkit-overflow-scrolling: touch;
-}
-
-.diffusion-source tr.phabricator-source-highlight {
-  background: {$sh-yellowbackground};
-}
-
-.diffusion-source th {
-  text-align: right;
-  vertical-align: top;
-  background: {$lightgreybackground};
-  color: {$bluetext};
-  border-right: 1px solid {$thinblueborder};
-}
-
-.diffusion-source td {
-  vertical-align: top;
-  white-space: pre-wrap;
-  padding-top: 1px;
-  padding-bottom: 1px;
-  padding-left: 8px;
-  width: 100%;
-  word-break: break-all;
-}
-
-.device .diffusion-source td {
-  word-break: normal;
-  white-space: nowrap;
-}
-
-.diffusion-browse-type-form {
-  float: right;
-}
-
-.diffusion-blame-link,
-.diffusion-rev-link {
-  white-space: nowrap;
-}
-
-.diffusion-blame-link {
-  min-width: 28px;
-}
-
-.diffusion-source th.diffusion-rev-link {
-  text-align: left;
-  min-width: 130px;
-}
-
-.diffusion-blame-link a,
-.diffusion-rev-link a,
-.diffusion-line-link a {
-  color: {$darkbluetext};
-}
-
-.diffusion-rev-link a {
-  margin: 0 8px 0 0;
-  display: inline-block;
-}
-
-.diffusion-rev-link span {
-  display: inline-block;
-  margin-right: 4px;
-  margin-left: -4px;
-  color: {$lightgreytext};
-}
-
-.diffusion-blame-link a,
-.diffusion-line-link a {
-  /* Give the user a larger click target. */
-  display: block;
-  padding: 2px 8px;
-}
-
-.diffusion-line-link {
-  -moz-user-select: -moz-none;
-  -khtml-user-select: none;
-  -webkit-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.diffusion-rev-link .diffusion-author-link {
-  display: inline-block;
-  padding: 0;
-  margin: 2px 6px -4px 8px;
-  width: 16px;
-  height: 16px;
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index 3c6e85f71e..ae9793c56f 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -68,3 +68,46 @@ th.phabricator-source-line a:hover {
 .phabricator-source-code-summary .phabricator-source-code {
   white-space: nowrap;
 }
+
+
+.phabricator-source-blame-skip,
+.phabricator-source-blame-info {
+  -moz-user-select: -moz-none;
+  -khtml-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.phabricator-source-blame-skip {
+  min-width: 28px;
+  border-right: 1px solid {$thinblueborder};
+}
+
+.phabricator-source-blame-info {
+  color: {$lightgreytext};
+  white-space: nowrap;
+  min-width: 130px;
+  border-right: 1px solid {$paste.border};
+  padding-right: 8px;
+}
+
+.phabricator-source-blame-skip a {
+  /* Give the user a larger click target. */
+  display: block;
+  padding: 2px 8px;
+}
+
+.device-desktop .phabricator-source-blame-skip a:hover {
+  background: {$bluebackground};
+}
+
+.phabricator-source-blame-author {
+  display: inline-block;
+  padding: 0;
+  margin: 2px 6px -4px 8px;
+  width: 16px;
+  height: 16px;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
diff --git a/webroot/rsrc/js/application/diffusion/behavior-load-blame.js b/webroot/rsrc/js/application/diffusion/behavior-load-blame.js
deleted file mode 100644
index bebafc8886..0000000000
--- a/webroot/rsrc/js/application/diffusion/behavior-load-blame.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @provides javelin-behavior-load-blame
- * @requires javelin-behavior
- *           javelin-dom
- *           javelin-request
- */
-
-JX.behavior('load-blame', function(config) {
-
-  new JX.Request(location.href, function (response) {
-    JX.DOM.setContent(JX.$(config.id), JX.$H(response));
-  }).send();
-
-});
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index ccbd41ca92..fa5ed8f860 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -7,8 +7,6 @@
 
 JX.behavior('document-engine', function(config, statics) {
 
-
-
   function onmenu(e) {
     var node = e.getNode('document-engine-view-dropdown');
     var data = JX.Stratcom.getData(node);
@@ -213,15 +211,91 @@ JX.behavior('document-engine', function(config, statics) {
     JX.DOM.setContent(viewport, JX.$H(r.markup));
   }
 
+  function blame(data) {
+    if (!data.blame.uri) {
+      return;
+    }
+
+    if (!data.blame.value) {
+      new JX.Request(data.blame.uri, JX.bind(null, onblame, data))
+        .send();
+      return;
+    }
+
+    var viewport = JX.$(data.viewportID);
+
+    var cells = JX.DOM.scry(viewport, 'th');
+
+    for (var ii = 0; ii < cells.length; ii++) {
+      var cell = cells[ii];
+
+      var spec = cell.getAttribute('data-blame');
+      if (!spec) {
+        continue;
+      }
+
+      spec = spec.split(';');
+      var type = spec[0];
+      var lines = spec[1];
+
+      var content = null;
+      switch (type) {
+        case 'skip':
+          content = renderSkip(data.blame.value, lines);
+          break;
+        case 'info':
+          content = renderInfo(data.blame.value, lines);
+          break;
+      }
+
+      JX.DOM.setContent(cell, content);
+    }
+  }
+
+  function onblame(data, r) {
+    data.blame.value = r;
+    blame(data);
+  }
+
+  function renderSkip(blame, lines) {
+    var commit = blame.blame[lines - 1];
+    if (!commit) {
+      return null;
+    }
+
+    var spec = blame.map[commit];
+
+    return JX.$H(spec.skip);
+  }
+
+  function renderInfo(blame, lines) {
+    var commit = blame.blame[lines - 1];
+    if (!commit) {
+      return null;
+    }
+
+    var spec = blame.map[commit];
+
+    return JX.$H(spec.info);
+  }
+
   if (!statics.initialized) {
     JX.Stratcom.listen('click', 'document-engine-view-dropdown', onmenu);
     statics.initialized = true;
   }
 
-  if (config && config.renderControlID) {
-    var control = JX.$(config.renderControlID);
+  if (config && config.controlID) {
+    var control = JX.$(config.controlID);
     var data = JX.Stratcom.getData(control);
-    onview(data, null, true);
+
+    switch (config.next) {
+      case 'render':
+        onview(data, null, true);
+        break;
+      case 'blame':
+        blame(data);
+        break;
+    }
   }
 
 });

From 11664277b33dfc6cda281e683eb89efae515b6e7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 05:08:49 -0700
Subject: [PATCH 791/865] Make DocumentEngine source line linking behavior
 better when blame is shown

Summary: Ref T13105. The line linker behavior currently has trouble identifying the line number when blame is active. Improve this, albeit not the most cleanly.

Test Plan: Selected lines with blame on.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19310
---
 resources/celerity/map.php                   | 16 ++++++++--------
 webroot/rsrc/js/core/behavior-line-linker.js | 17 ++++++++++++++++-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 4f4356cc63..d99e55fa06 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -471,7 +471,7 @@
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
     'rsrc/js/core/behavior-lightbox-attachments.js' => '6b31879a',
-    'rsrc/js/core/behavior-line-linker.js' => 'febf4ae7',
+    'rsrc/js/core/behavior-line-linker.js' => '1e017314',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
@@ -634,7 +634,7 @@
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
-    'javelin-behavior-phabricator-line-linker' => 'febf4ae7',
+    'javelin-behavior-phabricator-line-linker' => '1e017314',
     'javelin-behavior-phabricator-nav' => '836f966d',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
@@ -998,6 +998,12 @@
       'javelin-workflow',
       'javelin-magical-init',
     ),
+    '1e017314' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-history',
+    ),
     '1f6794f6' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2159,12 +2165,6 @@
       'javelin-view-visitor',
       'javelin-util',
     ),
-    'febf4ae7' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-history',
-    ),
   ),
   'packages' => array(
     'conpherence.pkg.css' => array(
diff --git a/webroot/rsrc/js/core/behavior-line-linker.js b/webroot/rsrc/js/core/behavior-line-linker.js
index 6130bdd859..2506e205b8 100644
--- a/webroot/rsrc/js/core/behavior-line-linker.js
+++ b/webroot/rsrc/js/core/behavior-line-linker.js
@@ -20,7 +20,22 @@ JX.behavior('phabricator-line-linker', function() {
   }
 
   function getRowNumber(tr) {
-    var th = tr.firstChild;
+    // Starting from the left, find the rightmost "<th />" tag among all
+    // "<th />" tags at the start of the row. Our goal here is to skip over
+    // blame information in Diffusion. This could probably be significantly
+    // more graceful.
+    var th = null;
+    for (var ii = 0; ii < tr.childNodes.length; ii++) {
+      if (JX.DOM.isType(tr.childNodes[ii], 'th')) {
+        th = tr.childNodes[ii];
+        continue;
+      }
+      break;
+    }
+
+    if (!th) {
+      return null;
+    }
 
     // If the "<th />" tag contains an "<a />" with "data-n" that we're using
     // to prevent copy/paste of line numbers, use that.

From eca7dc25f20be9ff20df46f13dda721849369082 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 05:18:58 -0700
Subject: [PATCH 792/865] Use javelin_tag(), not phutil_tag(), to render
 revision blame tooltips properly

Summary: Depends on D19310. Ref T13105. The "meta" value was not populating correctly because this used `phutil_tag()`.

Test Plan: Will verify on `secure`.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19311
---
 .../diffusion/controller/DiffusionBlameController.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBlameController.php b/src/applications/diffusion/controller/DiffusionBlameController.php
index 758a865e0a..6d922c6322 100644
--- a/src/applications/diffusion/controller/DiffusionBlameController.php
+++ b/src/applications/diffusion/controller/DiffusionBlameController.php
@@ -145,9 +145,9 @@ public function handleRequest(AphrontRequest $request) {
           'href' => $commit->getURI(),
           'sigil' => 'has-tooltip',
           'meta'  => array(
-            'tip'   => $this->renderCommitTooltip($commit, $handles),
+            'tip' => $this->renderCommitTooltip($commit, $handles),
             'align' => 'E',
-            'size'  => 600,
+            'size' => 600,
           ),
         ),
         $commit->getLocalName());
@@ -158,20 +158,19 @@ public function handleRequest(AphrontRequest $request) {
       );
 
       if ($revision) {
-        $revision_link = phutil_tag(
+        $revision_link = javelin_tag(
           'a',
           array(
             'href' => $revision->getURI(),
             'sigil' => 'has-tooltip',
             'meta'  => array(
-              'tip'   => $this->renderRevisionTooltip($revision, $handles),
+              'tip' => $this->renderRevisionTooltip($revision, $handles),
               'align' => 'E',
-              'size'  => 600,
+              'size' => 600,
             ),
           ),
           $revision->getMonogram());
 
-
         $info = array(
           $info,
           ' / ',

From eb80f0a2d95d99057e4e5ab72e427c1aeb362d85 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 05:25:35 -0700
Subject: [PATCH 793/865] When you swap between document rendering engines,
 populate or redraw blame if appropriate

Summary: Depends on D19311. Ref T13105. Currently, blame only renders on the initial request. Instead, redraw blame after swapping views.

Test Plan: Swapped from "Source -> Hexdump -> Source" and "Hexdump -> Source". Saw blame on source in all cases.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19312
---
 resources/celerity/map.php                    | 14 +++++------
 .../files/behavior-document-engine.js         | 24 +++++++++++++++----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d99e55fa06..e58c5a8158 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -390,7 +390,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => 'ac52a3be',
+    'rsrc/js/application/files/behavior-document-engine.js' => 'ed539253',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -604,7 +604,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => 'ac52a3be',
+    'javelin-behavior-document-engine' => 'ed539253',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -1764,11 +1764,6 @@
       'javelin-dom',
       'javelin-typeahead-normalizer',
     ),
-    'ac52a3be' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     'acd29eee' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2121,6 +2116,11 @@
       'javelin-stratcom',
       'javelin-vector',
     ),
+    'ed539253' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     'edf8a145' => array(
       'javelin-behavior',
       'javelin-uri',
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index fa5ed8f860..ea01ba3aca 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -151,7 +151,7 @@ JX.behavior('document-engine', function(config, statics) {
     }
 
     data.sequence = (data.sequence || 0) + 1;
-    var handler = JX.bind(null, onrender, data, data.sequence);
+    var handler = JX.bind(null, onrender, data, data.sequence, spec);
 
     data.viewKey = spec.viewKey;
 
@@ -190,7 +190,7 @@ JX.behavior('document-engine', function(config, statics) {
     JX.DOM.setContent(viewport, JX.$H(spec.loadingMarkup));
   }
 
-  function onrender(data, sequence, r) {
+  function onrender(data, sequence, spec, r) {
     // If this isn't the most recent request we sent, throw it away. This can
     // happen if the user makes multiple selections from the menu while we are
     // still rendering the first view.
@@ -209,19 +209,34 @@ JX.behavior('document-engine', function(config, statics) {
     data.loadingView = false;
 
     JX.DOM.setContent(viewport, JX.$H(r.markup));
+
+    // If this engine supports rendering blame, populate or draw it.
+    if (spec.canBlame) {
+      blame(data);
+    }
   }
 
   function blame(data) {
+    // If the rendering engine can't handle blame, bail.
     if (!data.blame.uri) {
       return;
     }
 
+    // If we already have an outstanding request for blame data, bail.
+    if (data.blame.request) {
+      return;
+    }
+
+    // If we don't have blame data yet, request it and then try rendering
+    // again later.
     if (!data.blame.value) {
-      new JX.Request(data.blame.uri, JX.bind(null, onblame, data))
-        .send();
+      var req = new JX.Request(data.blame.uri, JX.bind(null, onblame, data));
+      data.blame.request = req;
+      req.send();
       return;
     }
 
+    // We're ready to render.
     var viewport = JX.$(data.viewportID);
 
     var cells = JX.DOM.scry(viewport, 'th');
@@ -253,6 +268,7 @@ JX.behavior('document-engine', function(config, statics) {
   }
 
   function onblame(data, r) {
+    data.blame.request = null;
     data.blame.value = r;
     blame(data);
   }

From cf75d63b49a7181d6c6eb8dd5de78c77784db340 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 05:38:06 -0700
Subject: [PATCH 794/865] When lines 12, 13, 14, etc all blame to the same
 change, only show it once

Summary:
Depends on D19312. Ref T13105. For readability, render only one link for each contiguous block of changes.

Also make the actual rendering logic a little more defensible.

Test Plan: Viewed some files with blame, saw one render per chunk instead of one per line.

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19313
---
 resources/celerity/map.php                    | 14 ++--
 src/view/layout/PhabricatorSourceCodeView.php |  5 +-
 .../files/behavior-document-engine.js         | 82 +++++++++++--------
 3 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index e58c5a8158..00e394851c 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -390,7 +390,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => 'ed539253',
+    'rsrc/js/application/files/behavior-document-engine.js' => '6760beb4',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -604,7 +604,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => 'ed539253',
+    'javelin-behavior-document-engine' => '6760beb4',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -1398,6 +1398,11 @@
       'javelin-json',
       'phuix-form-control-view',
     ),
+    '6760beb4' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     '680ea2c8' => array(
       'javelin-install',
       'javelin-dom',
@@ -2116,11 +2121,6 @@
       'javelin-stratcom',
       'javelin-vector',
     ),
-    'ed539253' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     'edf8a145' => array(
       'javelin-behavior',
       'javelin-uri',
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index 19fa17c582..e6fb1803bc 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -130,8 +130,8 @@ public function render() {
         $lines = idx($blame_map, $line_number);
 
         if ($lines) {
-          $skip_blame = 'skip;'.$lines;
-          $info_blame = 'info;'.$lines;
+          $skip_blame = 'skip';
+          $info_blame = 'info';
         } else {
           $skip_blame = null;
           $info_blame = null;
@@ -149,6 +149,7 @@ public function render() {
             array(
               'class' => 'phabricator-source-blame-info',
               'data-blame' => $info_blame,
+              'data-blame-lines' => $lines,
             )),
         );
       } else {
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index ea01ba3aca..eb4216ee15 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -239,31 +239,48 @@ JX.behavior('document-engine', function(config, statics) {
     // We're ready to render.
     var viewport = JX.$(data.viewportID);
 
-    var cells = JX.DOM.scry(viewport, 'th');
+    var row_nodes = JX.DOM.scry(viewport, 'tr');
+    var row_list = [];
+    var ii;
 
-    for (var ii = 0; ii < cells.length; ii++) {
-      var cell = cells[ii];
+    for (ii = 0; ii < row_nodes.length; ii++) {
+      var row = {};
+      var keep = false;
+      var node = row_nodes[ii];
 
-      var spec = cell.getAttribute('data-blame');
-      if (!spec) {
-        continue;
-      }
+      for (var jj = 0; jj < node.childNodes.length; jj++) {
+        var child = node.childNodes[jj];
 
-      spec = spec.split(';');
-      var type = spec[0];
-      var lines = spec[1];
+        if (!JX.DOM.isType(child, 'th')) {
+          continue;
+        }
 
-      var content = null;
-      switch (type) {
-        case 'skip':
-          content = renderSkip(data.blame.value, lines);
-          break;
-        case 'info':
-          content = renderInfo(data.blame.value, lines);
-          break;
+        var spec = child.getAttribute('data-blame');
+        if (spec) {
+          row[spec] = child;
+          keep = true;
+        }
+
+        if (spec === 'info') {
+          row.lines = child.getAttribute('data-blame-lines');
+        }
+      }
+
+      if (keep) {
+        row_list.push(row);
       }
+    }
+
+    var last = null;
+    for (ii = 0; ii < row_list.length; ii++) {
+      var commit = data.blame.value.blame[row_list[ii].lines - 1];
+      row_list[ii].commit = commit;
+      row_list[ii].last = last;
+      last = commit;
+    }
 
-      JX.DOM.setContent(cell, content);
+    for (ii = 0; ii < row_list.length; ii++) {
+      renderBlame(row_list[ii], data.blame.value);
     }
   }
 
@@ -273,26 +290,25 @@ JX.behavior('document-engine', function(config, statics) {
     blame(data);
   }
 
-  function renderSkip(blame, lines) {
-    var commit = blame.blame[lines - 1];
-    if (!commit) {
-      return null;
-    }
+  function renderBlame(row, blame) {
+    var spec = blame.map[row.commit];
 
-    var spec = blame.map[commit];
 
-    return JX.$H(spec.skip);
-  }
+    var info = null;
+    var skip = null;
 
-  function renderInfo(blame, lines) {
-    var commit = blame.blame[lines - 1];
-    if (!commit) {
-      return null;
+    if (spec && (row.commit != row.last)) {
+      skip = JX.$H(spec.skip);
+      info = JX.$H(spec.info);
     }
 
-    var spec = blame.map[commit];
+    if (row.skip) {
+      JX.DOM.setContent(row.skip, skip);
+    }
 
-    return JX.$H(spec.info);
+    if (row.info) {
+      JX.DOM.setContent(row.info, info);
+    }
   }
 
   if (!statics.initialized) {

From 472bc3d90a595f38dceb5d77d7e70595bfa174dd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 06:05:40 -0700
Subject: [PATCH 795/865] Colorize lines in blame under DocumentEngine, to show
 relative age of changes

Summary:
Depends on D19313. Ref T13105. Fixes T13015. We lost the coloration for ages in the switch to Document Engine.

Restore it, and use a wider range of colors to make the information more clear.

Test Plan: Viewed some blame, saw a nice explosion of bright colors. This is a cornerstone of good design.

Maniphest Tasks: T13105, T13015

Differential Revision: https://secure.phabricator.com/D19314
---
 resources/celerity/map.php                    | 18 +++----
 .../controller/DiffusionBlameController.php   | 15 +++++-
 .../layout/phabricator-source-code-view.css   | 16 ++++++-
 .../files/behavior-document-engine.js         | 48 ++++++++++++++++++-
 4 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 00e394851c..6c1f2c0236 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -119,7 +119,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => 'af54e277',
+    'rsrc/css/layout/phabricator-source-code-view.css' => 'a526a787',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -390,7 +390,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => '6760beb4',
+    'rsrc/js/application/files/behavior-document-engine.js' => '0333c0b6',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -604,7 +604,7 @@
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => '6760beb4',
+    'javelin-behavior-document-engine' => '0333c0b6',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -780,7 +780,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => 'af54e277',
+    'phabricator-source-code-view-css' => 'a526a787',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
@@ -909,6 +909,11 @@
       'javelin-behavior',
       'javelin-uri',
     ),
+    '0333c0b6' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     '040fce04' => array(
       'javelin-behavior',
       'javelin-request',
@@ -1398,11 +1403,6 @@
       'javelin-json',
       'phuix-form-control-view',
     ),
-    '6760beb4' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     '680ea2c8' => array(
       'javelin-install',
       'javelin-dom',
diff --git a/src/applications/diffusion/controller/DiffusionBlameController.php b/src/applications/diffusion/controller/DiffusionBlameController.php
index 6d922c6322..66403a8af9 100644
--- a/src/applications/diffusion/controller/DiffusionBlameController.php
+++ b/src/applications/diffusion/controller/DiffusionBlameController.php
@@ -80,7 +80,9 @@ public function handleRequest(AphrontRequest $request) {
 
     $handles = $viewer->loadHandles($handle_phids);
 
+
     $map = array();
+    $epochs = array();
     foreach ($identifiers as $identifier) {
       $revision_id = idx($revision_map, $identifier);
       if ($revision_id) {
@@ -173,23 +175,34 @@ public function handleRequest(AphrontRequest $request) {
 
         $info = array(
           $info,
-          ' / ',
+          " \xC2\xB7 ",
           $revision_link,
         );
       }
 
+      $epoch = $commit->getEpoch();
+      $epochs[] = $epoch;
+
       $data = array(
         'skip' => $skip_link,
         'info' => hsprintf('%s', $info),
+        'epoch' => $epoch,
       );
 
       $map[$identifier] = $data;
     }
 
+    $epoch_min = min($epochs);
+    $epoch_max = max($epochs);
+
     return id(new AphrontAjaxResponse())->setContent(
       array(
         'blame' => $blame,
         'map' => $map,
+        'epoch' => array(
+          'min' => $epoch_min,
+          'max' => $epoch_max,
+        ),
       ));
   }
 
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index ae9793c56f..5eb2b36c8e 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -85,11 +85,18 @@ th.phabricator-source-line a:hover {
 }
 
 .phabricator-source-blame-info {
-  color: {$lightgreytext};
   white-space: nowrap;
   min-width: 130px;
   border-right: 1px solid {$paste.border};
   padding-right: 8px;
+
+  vertical-align: middle;
+  color: #ffffff;
+}
+
+.phabricator-source-blame-info a {
+  color: {$darkbluetext};
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.111);
 }
 
 .phabricator-source-blame-skip a {
@@ -98,14 +105,19 @@ th.phabricator-source-line a:hover {
   padding: 2px 8px;
 }
 
+.phabricator-source-blame-skip a .phui-icon-view {
+  color: {$darkbluetext};
+}
+
 .device-desktop .phabricator-source-blame-skip a:hover {
   background: {$bluebackground};
 }
 
 .phabricator-source-blame-author {
   display: inline-block;
+  vertical-align: middle;
   padding: 0;
-  margin: 2px 6px -4px 8px;
+  margin: 0 6px 0 8px;
   width: 16px;
   height: 16px;
   background-size: 100% 100%;
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index eb4216ee15..2fc4887408 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -293,7 +293,6 @@ JX.behavior('document-engine', function(config, statics) {
   function renderBlame(row, blame) {
     var spec = blame.map[row.commit];
 
-
     var info = null;
     var skip = null;
 
@@ -309,6 +308,53 @@ JX.behavior('document-engine', function(config, statics) {
     if (row.info) {
       JX.DOM.setContent(row.info, info);
     }
+
+    var epoch_range = (blame.epoch.max - blame.epoch.min);
+
+    var epoch_value;
+    if (!epoch_range) {
+      epoch_value = 1;
+    } else {
+      epoch_value = (spec.epoch - blame.epoch.min) / epoch_range;
+    }
+
+    var h_min = 0.04;
+    var h_max = 0.44;
+    var h = h_min + ((h_max - h_min) * epoch_value);
+
+    var s = 0.44;
+
+    var v_min = 0.92;
+    var v_max = 1.00;
+    var v = v_min + ((v_max - v_min) * epoch_value);
+
+    row.info.style.background = getHSV(h, s, v);
+  }
+
+  function getHSV(h, s, v) {
+    var r, g, b, i, f, p, q, t;
+
+    i = Math.floor(h * 6);
+    f = h * 6 - i;
+    p = v * (1 - s);
+    q = v * (1 - f * s);
+    t = v * (1 - (1 - f) * s);
+
+    switch (i % 6) {
+      case 0: r = v, g = t, b = p; break;
+      case 1: r = q, g = v, b = p; break;
+      case 2: r = p, g = v, b = t; break;
+      case 3: r = p, g = q, b = v; break;
+      case 4: r = t, g = p, b = v; break;
+      case 5: r = v, g = p, b = q; break;
+    }
+
+    r = Math.round(r * 255);
+    g = Math.round(g * 255);
+    b = Math.round(b * 255);
+
+
+    return 'rgb(' + r + ', ' + g + ', ' + b + ')';
   }
 
   if (!statics.initialized) {

From 72ab8640c5d19f4e9eb8745f7501ff3e26aa6ac3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 09:54:57 -0700
Subject: [PATCH 796/865] Narrowly fix web UI fatal for "almanac.service.edit"
 Conduit API method

Summary:
See T13120. See T12414. See PHI145. See PHI473. Almanac services require a type before they can do anything, and EditEngine currently builds one with no type. We then fatal when trying to do mundane things like generate documentation.

Instead, build a generic but complete Service for documentation generation in the web UI. This is similar to the previous Drydock Blueprint change from D18849 (or some earlier diff in that series).

(You still probably can't use this method to //create// a service; I'll fix that in the next change.)

Test Plan:
  - Viewed "almanac.service.edit" in the web UI.
    - Before: immediate fatal ("No Almanac service type "" exists!").
    - After: Page works. No claims about the method doing anything useful.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19315
---
 .../almanac/editor/AlmanacServiceEditEngine.php             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/almanac/editor/AlmanacServiceEditEngine.php b/src/applications/almanac/editor/AlmanacServiceEditEngine.php
index e64cfce3a2..7f5ad698fd 100644
--- a/src/applications/almanac/editor/AlmanacServiceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacServiceEditEngine.php
@@ -41,6 +41,12 @@ protected function newEditableObject() {
     return AlmanacService::initializeNewService($service_type);
   }
 
+  protected function newEditableObjectForDocumentation() {
+    $service_type = new AlmanacCustomServiceType();
+    $this->setServiceType($service_type->getServiceTypeConstant());
+    return $this->newEditableObject();
+  }
+
   protected function newObjectQuery() {
     return new AlmanacServiceQuery();
   }

From 16802117021816a7b40df8a5e0ef9ad483fc72ad Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 10:06:42 -0700
Subject: [PATCH 797/865] Remove dead "Service Lock" code from Almanac

Summary:
Depends on D19315. Ref T13120. Ref T12414. See PHI145. See PHI473. I want to move Almanac services to ModularTransactions but ran into this old piece of dead/unused code along the way.

Long ago, Almanac services could be individually "locked", but this didn't really work out very well. It was replaced by "Can Manage Cluster Services" in D15339 and prior changes, but not all of the old "Lock" code got cleaned up.

I don't expect to restore this feature, so clean it up now.

Test Plan:
  - Grepped for `AlmanacServiceTransaction::TYPE_LOCK`, `TYPE_LOCK`, etc.
  - Grepped for `updateServiceLock()`, no callsites.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19316
---
 .../management/AlmanacManagementWorkflow.php     | 16 ----------------
 .../storage/AlmanacServiceTransaction.php        | 12 ------------
 2 files changed, 28 deletions(-)

diff --git a/src/applications/almanac/management/AlmanacManagementWorkflow.php b/src/applications/almanac/management/AlmanacManagementWorkflow.php
index 0f1dd6d773..5d466293c4 100644
--- a/src/applications/almanac/management/AlmanacManagementWorkflow.php
+++ b/src/applications/almanac/management/AlmanacManagementWorkflow.php
@@ -26,20 +26,4 @@ protected function loadServices(array $names) {
     return $services;
   }
 
-  protected function updateServiceLock(AlmanacService $service, $lock) {
-    $almanac_phid = id(new PhabricatorAlmanacApplication())->getPHID();
-
-    $xaction = id(new AlmanacServiceTransaction())
-      ->setTransactionType(AlmanacServiceTransaction::TYPE_LOCK)
-      ->setNewValue((int)$lock);
-
-    $editor = id(new AlmanacServiceEditor())
-      ->setActor($this->getViewer())
-      ->setActingAsPHID($almanac_phid)
-      ->setContentSource($this->newContentSource())
-      ->setContinueOnMissingFields(true);
-
-    $editor->applyTransactions($service, array($xaction));
-  }
-
 }
diff --git a/src/applications/almanac/storage/AlmanacServiceTransaction.php b/src/applications/almanac/storage/AlmanacServiceTransaction.php
index a668f860fa..d357641cb6 100644
--- a/src/applications/almanac/storage/AlmanacServiceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacServiceTransaction.php
@@ -4,7 +4,6 @@ final class AlmanacServiceTransaction
   extends AlmanacTransaction {
 
   const TYPE_NAME = 'almanac:service:name';
-  const TYPE_LOCK = 'almanac:service:lock';
 
   public function getApplicationTransactionType() {
     return AlmanacServicePHIDType::TYPECONST;
@@ -30,17 +29,6 @@ public function getTitle() {
             $new);
         }
         break;
-      case self::TYPE_LOCK:
-        if ($new) {
-          return pht(
-            '%s locked this service.',
-            $this->renderHandleLink($author_phid));
-        } else {
-          return pht(
-            '%s unlocked this service.',
-            $this->renderHandleLink($author_phid));
-        }
-        break;
     }
 
     return parent::getTitle();

From 4c4a5a7656e16aa34845567b83e1251355c505b4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 16:00:46 -0700
Subject: [PATCH 798/865] Fix the wrapping/padding behavior of Remarkup code
 block headers more thoroughly?

Summary: Ref T13118. The first fix there fixed Safari, but made Chrome weird. Try this?

Test Plan: Viewed a code block with `name=...` in Safari, Firefox and Chrome and saw consistent display without weird wrappping.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13118

Differential Revision: https://secure.phabricator.com/D19319
---
 resources/celerity/map.php         | 6 +++---
 webroot/rsrc/css/core/remarkup.css | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 6c1f2c0236..bb1dcfc5cd 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '4a83e174',
+    'core.pkg.css' => '3ced0b1d',
     'core.pkg.js' => '1ea38af8',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c2ca903a',
@@ -111,7 +111,7 @@
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '62fa3ace',
-    'rsrc/css/core/remarkup.css' => '924fc97d',
+    'rsrc/css/core/remarkup.css' => 'bff43c81',
     'rsrc/css/core/syntax.css' => 'e9c95dd4',
     'rsrc/css/core/z-index.css' => '9d8f7c4b',
     'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
@@ -776,7 +776,7 @@
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '77b0ae28',
-    'phabricator-remarkup-css' => '924fc97d',
+    'phabricator-remarkup-css' => 'bff43c81',
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index dad202a9c8..686ec632dc 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -31,7 +31,7 @@
   font-size: 13px;
   font-weight: bold;
   background: rgba({$alphablue},0.08);
-  display: inline-block;
+  display: table-cell;
   border-top-left-radius: 3px;
   border-top-right-radius: 3px;
   overflow: hidden;

From d398bcd67c76e7786f2d3cc238a8555275e77458 Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Tue, 10 Apr 2018 09:57:13 -0700
Subject: [PATCH 799/865] Fix argument ordering in error message

Summary:
Before:
```
$ ./config set phabricator.base-uri local.phacility.com:8080
Usage Exception: Config option 'http://' is invalid. The URI must start with https://' or 'phabricator.base-uri'.
```
After:
```
$ ./config set phabricator.base-uri local.phacility.com:8080
Usage Exception: Config option 'phabricator.base-uri' is invalid. The URI must start with http://' or 'https://'.
```

Test Plan: See above

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19330
---
 .../option/PhabricatorCoreConfigOptions.php    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
index 0c9e69ebf2..08266217ea 100644
--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -268,24 +268,24 @@ protected function didValidateOption(
       if ($protocol !== 'http' && $protocol !== 'https') {
         throw new PhabricatorConfigValidationException(
           pht(
-            "Config option '%s' is invalid. The URI must start with ".
-            "%s' or '%s'.",
+            'Config option "%s" is invalid. The URI must start with '.
+            '"%s" or "%s".',
+            $key,
             'http://',
-            'https://',
-            $key));
+            'https://'));
       }
 
       $domain = $uri->getDomain();
       if (strpos($domain, '.') === false) {
         throw new PhabricatorConfigValidationException(
           pht(
-            "Config option '%s' is invalid. The URI must contain a dot ".
-            "('%s'), like '%s', not just a bare name like '%s'. Some web ".
-            "browsers will not set cookies on domains with no TLD.",
+            'Config option "%s" is invalid. The URI must contain a dot '.
+            '("%s"), like "%s", not just a bare name like "%s". Some web '.
+            'browsers will not set cookies on domains with no TLD.',
+            $key,
             '.',
             'http://example.com/',
-            'http://example/',
-            $key));
+            'http://example/'));
       }
 
       $path = $uri->getPath();

From 0755482bf07be95f4e91b1841c82da0aa978eedf Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Wed, 11 Apr 2018 08:46:38 -0700
Subject: [PATCH 800/865] Add transactions for installing/uninstalling
 applications

Summary: Fixes T11476.

Test Plan:
 - Installed/uninstalled the Conpherence application
 - Observed correct timeline stories
 - Observed correct config in database
 - Observed 404 for application page

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T11476

Differential Revision: https://secure.phabricator.com/D19339
---
 src/__phutil_library_map__.php                |  2 +
 ...bricatorApplicationUninstallController.php | 75 +++++++++---------
 ...atorApplicationPolicyChangeTransaction.php |  2 +-
 ...ricatorApplicationUninstallTransaction.php | 79 +++++++++++++++++++
 4 files changed, 120 insertions(+), 38 deletions(-)
 create mode 100644 src/applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4663aed50d..e634bb9a88 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2069,6 +2069,7 @@
     'PhabricatorApplicationTransactionWarningException' => 'applications/transactions/exception/PhabricatorApplicationTransactionWarningException.php',
     'PhabricatorApplicationTransactionWarningResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionWarningResponse.php',
     'PhabricatorApplicationUninstallController' => 'applications/meta/controller/PhabricatorApplicationUninstallController.php',
+    'PhabricatorApplicationUninstallTransaction' => 'applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php',
     'PhabricatorApplicationsApplication' => 'applications/meta/application/PhabricatorApplicationsApplication.php',
     'PhabricatorApplicationsController' => 'applications/meta/controller/PhabricatorApplicationsController.php',
     'PhabricatorApplicationsListController' => 'applications/meta/controller/PhabricatorApplicationsListController.php',
@@ -7533,6 +7534,7 @@
     'PhabricatorApplicationTransactionWarningException' => 'Exception',
     'PhabricatorApplicationTransactionWarningResponse' => 'AphrontProxyResponse',
     'PhabricatorApplicationUninstallController' => 'PhabricatorApplicationsController',
+    'PhabricatorApplicationUninstallTransaction' => 'PhabricatorApplicationTransactionType',
     'PhabricatorApplicationsApplication' => 'PhabricatorApplication',
     'PhabricatorApplicationsController' => 'PhabricatorController',
     'PhabricatorApplicationsListController' => 'PhabricatorApplicationsController',
diff --git a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
index 68518413bf..09f3e92ee5 100644
--- a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
@@ -3,17 +3,15 @@
 final class PhabricatorApplicationUninstallController
   extends PhabricatorApplicationsController {
 
-  private $application;
-  private $action;
-
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
-    $this->action = $request->getURIData('action');
-    $this->application = $request->getURIData('application');
+    $user = $request->getUser();
+    $action = $request->getURIData('action');
+    $application_name = $request->getURIData('application');
 
-    $selected = id(new PhabricatorApplicationQuery())
+    $application = id(new PhabricatorApplicationQuery())
       ->setViewer($viewer)
-      ->withClasses(array($this->application))
+      ->withClasses(array($application_name))
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
@@ -21,11 +19,11 @@ public function handleRequest(AphrontRequest $request) {
         ))
       ->executeOne();
 
-    if (!$selected) {
+    if (!$application) {
       return new Aphront404Response();
     }
 
-    $view_uri = $this->getApplicationURI('view/'.$this->application);
+    $view_uri = $this->getApplicationURI('view/'.$application_name);
 
     $prototypes_enabled = PhabricatorEnv::getEnvConfig(
       'phabricator.show-prototypes');
@@ -34,7 +32,7 @@ public function handleRequest(AphrontRequest $request) {
       ->setUser($viewer)
       ->addCancelButton($view_uri);
 
-    if ($selected->isPrototype() && !$prototypes_enabled) {
+    if ($application->isPrototype() && !$prototypes_enabled) {
       $dialog
         ->setTitle(pht('Prototypes Not Enabled'))
         ->appendChild(
@@ -46,18 +44,40 @@ public function handleRequest(AphrontRequest $request) {
     }
 
     if ($request->isDialogFormPost()) {
-      $this->manageApplication();
-      return id(new AphrontRedirectResponse())->setURI($view_uri);
+      $xactions = array();
+      $template = $application->getApplicationTransactionTemplate();
+      $xactions[] = id(clone $template)
+        ->setTransactionType(
+            PhabricatorApplicationUninstallTransaction::TRANSACTIONTYPE)
+        ->setNewValue($action);
+
+      $editor = id(new PhabricatorApplicationEditor())
+        ->setActor($user)
+        ->setContentSourceFromRequest($request)
+        ->setContinueOnNoEffect(true)
+        ->setContinueOnMissingFields(true);
+
+      try {
+        $editor->applyTransactions($application, $xactions);
+        return id(new AphrontRedirectResponse())->setURI($view_uri);
+      } catch (PhabricatorApplicationTransactionValidationException $ex) {
+        $validation_exception = $ex;
+      }
+
+      return $this->newDialog()
+        ->setTitle(pht('Validation Failed'))
+        ->setValidationException($validation_exception)
+        ->addCancelButton($view_uri);
     }
 
-    if ($this->action == 'install') {
-      if ($selected->canUninstall()) {
+    if ($action == 'install') {
+      if ($application->canUninstall()) {
         $dialog
           ->setTitle(pht('Confirmation'))
           ->appendChild(
             pht(
               'Install %s application?',
-              $selected->getName()))
+              $application->getName()))
           ->addSubmitButton(pht('Install'));
 
       } else {
@@ -66,10 +86,10 @@ public function handleRequest(AphrontRequest $request) {
           ->appendChild(pht('You cannot install an installed application.'));
       }
     } else {
-      if ($selected->canUninstall()) {
+      if ($application->canUninstall()) {
         $dialog->setTitle(pht('Really Uninstall Application?'));
 
-        if ($selected instanceof PhabricatorHomeApplication) {
+        if ($application instanceof PhabricatorHomeApplication) {
           $dialog
             ->appendParagraph(
               pht(
@@ -86,7 +106,7 @@ public function handleRequest(AphrontRequest $request) {
             ->appendParagraph(
               pht(
                 'Really uninstall the %s application?',
-                $selected->getName()))
+                $application->getName()))
             ->addSubmitButton(pht('Uninstall'));
         }
       } else {
@@ -101,23 +121,4 @@ public function handleRequest(AphrontRequest $request) {
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
-  public function manageApplication() {
-    $key = 'phabricator.uninstalled-applications';
-    $config_entry = PhabricatorConfigEntry::loadConfigEntry($key);
-    $list = $config_entry->getValue();
-    $uninstalled = PhabricatorEnv::getEnvConfig($key);
-
-    if (isset($uninstalled[$this->application])) {
-      unset($list[$this->application]);
-    } else {
-      $list[$this->application] = true;
-    }
-
-    PhabricatorConfigEditor::storeNewValue(
-      $this->getViewer(),
-      $config_entry,
-      $list,
-      PhabricatorContentSource::newFromRequest($this->getRequest()));
-  }
-
 }
diff --git a/src/applications/meta/xactions/PhabricatorApplicationPolicyChangeTransaction.php b/src/applications/meta/xactions/PhabricatorApplicationPolicyChangeTransaction.php
index dca2f5a795..91b5c73249 100644
--- a/src/applications/meta/xactions/PhabricatorApplicationPolicyChangeTransaction.php
+++ b/src/applications/meta/xactions/PhabricatorApplicationPolicyChangeTransaction.php
@@ -14,7 +14,7 @@ public function generateOldValue($object) {
     return $application->getPolicy($capability);
   }
 
-  public function applyInternalEffects($object, $value) {
+  public function applyExternalEffects($object, $value) {
     $application = $object;
     $user = $this->getActor();
 
diff --git a/src/applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php b/src/applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php
new file mode 100644
index 0000000000..12fbc8ebd4
--- /dev/null
+++ b/src/applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php
@@ -0,0 +1,79 @@
+<?php
+
+final class PhabricatorApplicationUninstallTransaction
+  extends PhabricatorApplicationTransactionType {
+
+  const TRANSACTIONTYPE = 'application.uninstall';
+
+  public function generateOldValue($object) {
+    $key = 'phabricator.uninstalled-applications';
+    $config_entry = PhabricatorConfigEntry::loadConfigEntry($key);
+    $list = $config_entry->getValue();
+    $uninstalled = PhabricatorEnv::getEnvConfig($key);
+
+    if (isset($uninstalled[get_class($object)])) {
+      return 'uninstalled';
+    } else {
+      return 'installed';
+    }
+  }
+
+  public function generateNewValue($object, $value) {
+    if ($value === 'uninstall') {
+      return 'uninstalled';
+    } else {
+      return 'installed';
+    }
+  }
+
+  public function applyExternalEffects($object, $value) {
+    $application = $object;
+    $user = $this->getActor();
+
+    $key = 'phabricator.uninstalled-applications';
+    $config_entry = PhabricatorConfigEntry::loadConfigEntry($key);
+    $list = $config_entry->getValue();
+    $uninstalled = PhabricatorEnv::getEnvConfig($key);
+
+    if (isset($uninstalled[get_class($application)])) {
+      unset($list[get_class($application)]);
+    } else {
+      $list[get_class($application)] = true;
+    }
+
+    $editor = $this->getEditor();
+    $content_source = $editor->getContentSource();
+    PhabricatorConfigEditor::storeNewValue(
+      $user,
+      $config_entry,
+      $list,
+      $content_source);
+  }
+
+  public function getTitle() {
+    if ($this->getNewValue() === 'uninstalled') {
+      return pht(
+        '%s uninstalled this application.',
+        $this->renderAuthor());
+    } else {
+      return pht(
+        '%s installed this application.',
+        $this->renderAuthor());
+    }
+  }
+
+  public function getTitleForFeed() {
+    if ($this->getNewValue() === 'uninstalled') {
+      return pht(
+        '%s uninstalled %s.',
+        $this->renderAuthor(),
+        $this->renderObject());
+    } else {
+      return pht(
+        '%s installed %s.',
+        $this->renderAuthor(),
+        $this->renderObject());
+    }
+  }
+
+}

From c428f60a97f2fb8558fc1fcdf1ffcc9f2262d33f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 10:05:39 -0700
Subject: [PATCH 801/865] Partially modularize AlmanacService transactions

Summary:
Ref T13120. Ref T12414. See PHI145. See PHI473. This partially modernizes AlmanacService transactions by moving them to ModularTransactions.

This isn't complete because the "update property" and "remove property" transactions aren't modularized. They still //work//, since the parent Editor implements them, but they no longer render properly on the timeline since the `Transaction` object no longer has rendering logic for them.

Tentatively, I'm going to try to convert the rest of the Almanac objects and then modularize those transactions. (Currently, all of Binding, Device, Namespace and Service support properties, although they can only actually be edited on Service, Device and Binding.)

If that turns out to be really tricky for some reason I can just copy/paste the timeline rendering for now, but I think it won't be too hard.

Test Plan:
  - Created and edited Services.
  - Tried to create a service with: a bad name, no name, a name which put it in a namespace I can't edit (got errors in all cases).
  - Edited and removed properties. The edits worked, the timeline just renders a generic story now ('X edited this object (transaction type "almanac:property:update").').

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19317
---
 src/__phutil_library_map__.php                |   8 +-
 .../editor/AlmanacServiceEditEngine.php       |   2 +-
 .../almanac/editor/AlmanacServiceEditor.php   | 145 +-----------------
 .../storage/AlmanacServiceTransaction.php     |  35 ++---
 .../xaction/AlmanacServiceNameTransaction.php |  87 +++++++++++
 .../xaction/AlmanacServiceTransactionType.php |   4 +
 .../xaction/AlmanacTransactionType.php        |   4 +
 7 files changed, 121 insertions(+), 164 deletions(-)
 create mode 100644 src/applications/almanac/xaction/AlmanacServiceNameTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacServiceTransactionType.php
 create mode 100644 src/applications/almanac/xaction/AlmanacTransactionType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e634bb9a88..fe8e000041 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -114,6 +114,7 @@
     'AlmanacServiceEditor' => 'applications/almanac/editor/AlmanacServiceEditor.php',
     'AlmanacServiceListController' => 'applications/almanac/controller/AlmanacServiceListController.php',
     'AlmanacServiceNameNgrams' => 'applications/almanac/storage/AlmanacServiceNameNgrams.php',
+    'AlmanacServiceNameTransaction' => 'applications/almanac/xaction/AlmanacServiceNameTransaction.php',
     'AlmanacServicePHIDType' => 'applications/almanac/phid/AlmanacServicePHIDType.php',
     'AlmanacServicePropertyEditEngine' => 'applications/almanac/editor/AlmanacServicePropertyEditEngine.php',
     'AlmanacServiceQuery' => 'applications/almanac/query/AlmanacServiceQuery.php',
@@ -121,11 +122,13 @@
     'AlmanacServiceSearchEngine' => 'applications/almanac/query/AlmanacServiceSearchEngine.php',
     'AlmanacServiceTransaction' => 'applications/almanac/storage/AlmanacServiceTransaction.php',
     'AlmanacServiceTransactionQuery' => 'applications/almanac/query/AlmanacServiceTransactionQuery.php',
+    'AlmanacServiceTransactionType' => 'applications/almanac/xaction/AlmanacServiceTransactionType.php',
     'AlmanacServiceType' => 'applications/almanac/servicetype/AlmanacServiceType.php',
     'AlmanacServiceTypeDatasource' => 'applications/almanac/typeahead/AlmanacServiceTypeDatasource.php',
     'AlmanacServiceTypeTestCase' => 'applications/almanac/servicetype/__tests__/AlmanacServiceTypeTestCase.php',
     'AlmanacServiceViewController' => 'applications/almanac/controller/AlmanacServiceViewController.php',
     'AlmanacTransaction' => 'applications/almanac/storage/AlmanacTransaction.php',
+    'AlmanacTransactionType' => 'applications/almanac/xaction/AlmanacTransactionType.php',
     'AphlictDropdownDataQuery' => 'applications/aphlict/query/AphlictDropdownDataQuery.php',
     'Aphront304Response' => 'aphront/response/Aphront304Response.php',
     'Aphront400Response' => 'aphront/response/Aphront400Response.php',
@@ -5316,18 +5319,21 @@
     'AlmanacServiceEditor' => 'AlmanacEditor',
     'AlmanacServiceListController' => 'AlmanacServiceController',
     'AlmanacServiceNameNgrams' => 'PhabricatorSearchNgrams',
+    'AlmanacServiceNameTransaction' => 'AlmanacServiceTransactionType',
     'AlmanacServicePHIDType' => 'PhabricatorPHIDType',
     'AlmanacServicePropertyEditEngine' => 'AlmanacPropertyEditEngine',
     'AlmanacServiceQuery' => 'AlmanacQuery',
     'AlmanacServiceSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'AlmanacServiceSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'AlmanacServiceTransaction' => 'AlmanacTransaction',
+    'AlmanacServiceTransaction' => 'PhabricatorModularTransaction',
     'AlmanacServiceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'AlmanacServiceTransactionType' => 'AlmanacTransactionType',
     'AlmanacServiceType' => 'Phobject',
     'AlmanacServiceTypeDatasource' => 'PhabricatorTypeaheadDatasource',
     'AlmanacServiceTypeTestCase' => 'PhabricatorTestCase',
     'AlmanacServiceViewController' => 'AlmanacServiceController',
     'AlmanacTransaction' => 'PhabricatorApplicationTransaction',
+    'AlmanacTransactionType' => 'PhabricatorModularTransactionType',
     'AphlictDropdownDataQuery' => 'Phobject',
     'Aphront304Response' => 'AphrontResponse',
     'Aphront400Response' => 'AphrontResponse',
diff --git a/src/applications/almanac/editor/AlmanacServiceEditEngine.php b/src/applications/almanac/editor/AlmanacServiceEditEngine.php
index 7f5ad698fd..8cf7b97991 100644
--- a/src/applications/almanac/editor/AlmanacServiceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacServiceEditEngine.php
@@ -98,7 +98,7 @@ protected function buildCustomEditFields($object) {
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setDescription(pht('Name of the service.'))
-        ->setTransactionType(AlmanacServiceTransaction::TYPE_NAME)
+        ->setTransactionType(AlmanacServiceNameTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getName()),
     );
diff --git a/src/applications/almanac/editor/AlmanacServiceEditor.php b/src/applications/almanac/editor/AlmanacServiceEditor.php
index 8b0326f749..ba509dae34 100644
--- a/src/applications/almanac/editor/AlmanacServiceEditor.php
+++ b/src/applications/almanac/editor/AlmanacServiceEditor.php
@@ -7,152 +7,23 @@ public function getEditorObjectsDescription() {
     return pht('Almanac Service');
   }
 
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this service.', $author);
+  }
+
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
+  }
+
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
-    $types[] = AlmanacServiceTransaction::TYPE_NAME;
-
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
     return $types;
   }
 
-  protected function getCustomTransactionOldValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-    switch ($xaction->getTransactionType()) {
-      case AlmanacServiceTransaction::TYPE_NAME:
-        return $object->getName();
-    }
-
-    return parent::getCustomTransactionOldValue($object, $xaction);
-  }
-
-  protected function getCustomTransactionNewValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacServiceTransaction::TYPE_NAME:
-        return $xaction->getNewValue();
-    }
-
-    return parent::getCustomTransactionNewValue($object, $xaction);
-  }
-
-  protected function applyCustomInternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacServiceTransaction::TYPE_NAME:
-        $object->setName($xaction->getNewValue());
-        return;
-    }
-
-    return parent::applyCustomInternalTransaction($object, $xaction);
-  }
-
-  protected function applyCustomExternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacServiceTransaction::TYPE_NAME:
-        return;
-    }
-
-    return parent::applyCustomExternalTransaction($object, $xaction);
-  }
-
-  protected function validateTransaction(
-    PhabricatorLiskDAO $object,
-    $type,
-    array $xactions) {
-
-    $errors = parent::validateTransaction($object, $type, $xactions);
-
-    switch ($type) {
-      case AlmanacServiceTransaction::TYPE_NAME:
-        $missing = $this->validateIsEmptyTextField(
-          $object->getName(),
-          $xactions);
-
-        if ($missing) {
-          $error = new PhabricatorApplicationTransactionValidationError(
-            $type,
-            pht('Required'),
-            pht('Service name is required.'),
-            nonempty(last($xactions), null));
-
-          $error->setIsMissingFieldError(true);
-          $errors[] = $error;
-        } else {
-          foreach ($xactions as $xaction) {
-            $message = null;
-
-            $name = $xaction->getNewValue();
-
-            try {
-              AlmanacNames::validateName($name);
-            } catch (Exception $ex) {
-              $message = $ex->getMessage();
-            }
-
-            if ($message !== null) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                $message,
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-
-            $other = id(new AlmanacServiceQuery())
-              ->setViewer(PhabricatorUser::getOmnipotentUser())
-              ->withNames(array($name))
-              ->executeOne();
-            if ($other && ($other->getID() != $object->getID())) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Not Unique'),
-                pht('Almanac services must have unique names.'),
-                last($xactions));
-              $errors[] = $error;
-              continue;
-            }
-
-            if ($name === $object->getName()) {
-              continue;
-            }
-
-            $namespace = AlmanacNamespace::loadRestrictedNamespace(
-              $this->getActor(),
-              $name);
-            if ($namespace) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Restricted'),
-                pht(
-                  'You do not have permission to create Almanac services '.
-                  'within the "%s" namespace.',
-                  $namespace->getName()),
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-          }
-        }
-
-        break;
-    }
-
-    return $errors;
-  }
-
-
   protected function validateAllTransactions(
     PhabricatorLiskDAO $object,
     array $xactions) {
diff --git a/src/applications/almanac/storage/AlmanacServiceTransaction.php b/src/applications/almanac/storage/AlmanacServiceTransaction.php
index d357641cb6..692cc2997e 100644
--- a/src/applications/almanac/storage/AlmanacServiceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacServiceTransaction.php
@@ -1,37 +1,22 @@
 <?php
 
 final class AlmanacServiceTransaction
-  extends AlmanacTransaction {
+  extends PhabricatorModularTransaction {
 
-  const TYPE_NAME = 'almanac:service:name';
+  public function getApplicationName() {
+    return 'almanac';
+  }
+
+  public function getApplicationTransactionCommentObject() {
+    return null;
+  }
 
   public function getApplicationTransactionType() {
     return AlmanacServicePHIDType::TYPECONST;
   }
 
-  public function getTitle() {
-    $author_phid = $this->getAuthorPHID();
-
-    $old = $this->getOldValue();
-    $new = $this->getNewValue();
-
-    switch ($this->getTransactionType()) {
-      case self::TYPE_NAME:
-        if ($old === null) {
-          return pht(
-            '%s created this service.',
-            $this->renderHandleLink($author_phid));
-        } else {
-          return pht(
-            '%s renamed this service from "%s" to "%s".',
-            $this->renderHandleLink($author_phid),
-            $old,
-            $new);
-        }
-        break;
-    }
-
-    return parent::getTitle();
+  public function getBaseTransactionClass() {
+    return 'AlmanacServiceTransactionType';
   }
 
 }
diff --git a/src/applications/almanac/xaction/AlmanacServiceNameTransaction.php b/src/applications/almanac/xaction/AlmanacServiceNameTransaction.php
new file mode 100644
index 0000000000..24d9857bfa
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacServiceNameTransaction.php
@@ -0,0 +1,87 @@
+<?php
+
+final class AlmanacServiceNameTransaction
+  extends AlmanacServiceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:service:name';
+
+  public function generateOldValue($object) {
+    return $object->getName();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setName($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s renamed this service from %s to %s.',
+      $this->renderAuthorLink(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s renamed %s from %s to %s.',
+      $this->renderAuthorLink(),
+      $this->renderObject(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($this->isEmptyTextTransaction($object->getName(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Almanac services must have a name.'));
+    }
+
+    foreach ($xactions as $xaction) {
+      $name = $xaction->getNewValue();
+
+      $message = null;
+      try {
+        AlmanacNames::validateName($name);
+      } catch (Exception $ex) {
+        $message = $ex->getMessage();
+      }
+
+      if ($message !== null) {
+        $errors[] = $this->newInvalidError($message, $xaction);
+        continue;
+      }
+
+      if ($name === $object->getName()) {
+        continue;
+      }
+
+      $other = id(new AlmanacServiceQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withNames(array($name))
+        ->executeOne();
+      if ($other && ($other->getID() != $object->getID())) {
+        $errors[] = $this->newInvalidError(
+          pht('Almanac services must have unique names.'),
+          $xaction);
+        continue;
+      }
+
+      $namespace = AlmanacNamespace::loadRestrictedNamespace(
+        $this->getActor(),
+        $name);
+      if ($namespace) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You do not have permission to create Almanac services '.
+            'within the "%s" namespace.',
+            $namespace->getName()),
+          $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+}
diff --git a/src/applications/almanac/xaction/AlmanacServiceTransactionType.php b/src/applications/almanac/xaction/AlmanacServiceTransactionType.php
new file mode 100644
index 0000000000..0e062806fd
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacServiceTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class AlmanacServiceTransactionType
+  extends AlmanacTransactionType {}
diff --git a/src/applications/almanac/xaction/AlmanacTransactionType.php b/src/applications/almanac/xaction/AlmanacTransactionType.php
new file mode 100644
index 0000000000..69ba5b61c4
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class AlmanacTransactionType
+  extends PhabricatorModularTransactionType {}

From 6983479e4f60d31fc16e10d25ea26c4027b872a3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 9 Apr 2018 10:00:13 -0700
Subject: [PATCH 802/865] Allow "almanac.service.edit" to create services

Summary:
Depends on D19317. Ref T13120. Ref T12414. See PHI145. See PHI473.

This adds a Conduit-only "type" transaction for Almanac services. This is very similar to the approach in D18849 for Drydock blueprints.

Test Plan:
  - Tried to create an empty service via "almanac.service.edit", was told to pick a type.
  - Tried to pick a bad type, was told to pick a good type.
  - Created a new Almanac service via "almanac.service.edit".
  - Tried to edit the service to change the type, wasn't allowed to.
  - Created and edited via the web UI, nothing changed from before.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19318
---
 src/__phutil_library_map__.php                |  2 +
 .../editor/AlmanacServiceEditEngine.php       | 41 ++++++++++++++
 .../xaction/AlmanacServiceNameTransaction.php |  4 +-
 .../xaction/AlmanacServiceTypeTransaction.php | 55 +++++++++++++++++++
 4 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/almanac/xaction/AlmanacServiceTypeTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index fe8e000041..5d68c3b0c6 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -126,6 +126,7 @@
     'AlmanacServiceType' => 'applications/almanac/servicetype/AlmanacServiceType.php',
     'AlmanacServiceTypeDatasource' => 'applications/almanac/typeahead/AlmanacServiceTypeDatasource.php',
     'AlmanacServiceTypeTestCase' => 'applications/almanac/servicetype/__tests__/AlmanacServiceTypeTestCase.php',
+    'AlmanacServiceTypeTransaction' => 'applications/almanac/xaction/AlmanacServiceTypeTransaction.php',
     'AlmanacServiceViewController' => 'applications/almanac/controller/AlmanacServiceViewController.php',
     'AlmanacTransaction' => 'applications/almanac/storage/AlmanacTransaction.php',
     'AlmanacTransactionType' => 'applications/almanac/xaction/AlmanacTransactionType.php',
@@ -5331,6 +5332,7 @@
     'AlmanacServiceType' => 'Phobject',
     'AlmanacServiceTypeDatasource' => 'PhabricatorTypeaheadDatasource',
     'AlmanacServiceTypeTestCase' => 'PhabricatorTestCase',
+    'AlmanacServiceTypeTransaction' => 'AlmanacServiceTransactionType',
     'AlmanacServiceViewController' => 'AlmanacServiceController',
     'AlmanacTransaction' => 'PhabricatorApplicationTransaction',
     'AlmanacTransactionType' => 'PhabricatorModularTransactionType',
diff --git a/src/applications/almanac/editor/AlmanacServiceEditEngine.php b/src/applications/almanac/editor/AlmanacServiceEditEngine.php
index 8cf7b97991..93912fad8b 100644
--- a/src/applications/almanac/editor/AlmanacServiceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacServiceEditEngine.php
@@ -41,6 +41,37 @@ protected function newEditableObject() {
     return AlmanacService::initializeNewService($service_type);
   }
 
+  protected function newEditableObjectFromConduit(array $raw_xactions) {
+    $type = null;
+    foreach ($raw_xactions as $raw_xaction) {
+      if ($raw_xaction['type'] !== 'type') {
+        continue;
+      }
+
+      $type = $raw_xaction['value'];
+    }
+
+    if ($type === null) {
+      throw new Exception(
+        pht(
+          'When creating a new Almanac service via the Conduit API, you '.
+          'must provide a "type" transaction to select a type.'));
+    }
+
+    $map = AlmanacServiceType::getAllServiceTypes();
+    if (!isset($map[$type])) {
+      throw new Exception(
+        pht(
+          'Service type "%s" is unrecognized. Valid types are: %s.',
+          $type,
+          implode(', ', array_keys($map))));
+    }
+
+    $this->setServiceType($type);
+
+    return $this->newEditableObject();
+  }
+
   protected function newEditableObjectForDocumentation() {
     $service_type = new AlmanacCustomServiceType();
     $this->setServiceType($service_type->getServiceTypeConstant());
@@ -101,6 +132,16 @@ protected function buildCustomEditFields($object) {
         ->setTransactionType(AlmanacServiceNameTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getName()),
+      id(new PhabricatorTextEditField())
+        ->setKey('type')
+        ->setLabel(pht('Type'))
+        ->setIsConduitOnly(true)
+        ->setTransactionType(
+          AlmanacServiceTypeTransaction::TRANSACTIONTYPE)
+        ->setDescription(pht('When creating a service, set the type.'))
+        ->setConduitDescription(pht('Set the service type.'))
+        ->setConduitTypeDescription(pht('Service type.'))
+        ->setValue($object->getServiceType()),
     );
   }
 
diff --git a/src/applications/almanac/xaction/AlmanacServiceNameTransaction.php b/src/applications/almanac/xaction/AlmanacServiceNameTransaction.php
index 24d9857bfa..ea1ccb8faa 100644
--- a/src/applications/almanac/xaction/AlmanacServiceNameTransaction.php
+++ b/src/applications/almanac/xaction/AlmanacServiceNameTransaction.php
@@ -16,7 +16,7 @@ public function applyInternalEffects($object, $value) {
   public function getTitle() {
     return pht(
       '%s renamed this service from %s to %s.',
-      $this->renderAuthorLink(),
+      $this->renderAuthor(),
       $this->renderOldValue(),
       $this->renderNewValue());
   }
@@ -24,7 +24,7 @@ public function getTitle() {
   public function getTitleForFeed() {
     return pht(
       '%s renamed %s from %s to %s.',
-      $this->renderAuthorLink(),
+      $this->renderAuthor(),
       $this->renderObject(),
       $this->renderOldValue(),
       $this->renderNewValue());
diff --git a/src/applications/almanac/xaction/AlmanacServiceTypeTransaction.php b/src/applications/almanac/xaction/AlmanacServiceTypeTransaction.php
new file mode 100644
index 0000000000..1b1c63d040
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacServiceTypeTransaction.php
@@ -0,0 +1,55 @@
+<?php
+
+final class AlmanacServiceTypeTransaction
+  extends AlmanacServiceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:service:type';
+
+  public function generateOldValue($object) {
+    return $object->getServiceType();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setServiceType($value);
+  }
+
+  public function getTitle() {
+    // This transaction can only be applied during object creation via
+    // Conduit and never generates a timeline event.
+    return null;
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($this->isEmptyTextTransaction($object->getServiceType(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('You must select a service type when creating a service.'));
+    }
+
+    $map = AlmanacServiceType::getAllServiceTypes();
+
+    foreach ($xactions as $xaction) {
+      if (!$this->isNewObject()) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'The type of a service can not be changed once it has '.
+            'been created.'),
+          $xaction);
+        continue;
+      }
+
+      $new = $xaction->getNewValue();
+      if (!isset($map[$new])) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Service type "%s" is not valid. Valid types are: %s.',
+            $new,
+            implode(', ', array_keys($map))));
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+}

From 5ada1211cdeb978a9c2e3689241382fc5fefc730 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 04:43:51 -0700
Subject: [PATCH 803/865] Modularize Almanac Namespace transactions

Summary: Depends on D19318. Ref T13120. Ref T12414. Move transactions for Almanac Namespaces ("name" is the only meaningful one) to ModularTransactions.

Test Plan:
  - Created a new namespace.
  - Edited a namespace.
  - Tried to choose no name, an invalid name, a duplicate name, and a name in a namespace I can't edit; got appropriate errors.
  - Grepped for `AlmanacNamespaceTransaction::TYPE_NAME`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19320
---
 src/__phutil_library_map__.php                |   6 +-
 .../editor/AlmanacNamespaceEditEngine.php     |   2 +-
 .../almanac/editor/AlmanacNamespaceEditor.php | 145 +-----------------
 .../storage/AlmanacNamespaceTransaction.php   |  27 +---
 .../AlmanacNamespaceNameTransaction.php       |  91 +++++++++++
 .../AlmanacNamespaceTransactionType.php       |   4 +
 6 files changed, 112 insertions(+), 163 deletions(-)
 create mode 100644 src/applications/almanac/xaction/AlmanacNamespaceNameTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacNamespaceTransactionType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 5d68c3b0c6..57e58ac74e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -75,11 +75,13 @@
     'AlmanacNamespaceEditor' => 'applications/almanac/editor/AlmanacNamespaceEditor.php',
     'AlmanacNamespaceListController' => 'applications/almanac/controller/AlmanacNamespaceListController.php',
     'AlmanacNamespaceNameNgrams' => 'applications/almanac/storage/AlmanacNamespaceNameNgrams.php',
+    'AlmanacNamespaceNameTransaction' => 'applications/almanac/xaction/AlmanacNamespaceNameTransaction.php',
     'AlmanacNamespacePHIDType' => 'applications/almanac/phid/AlmanacNamespacePHIDType.php',
     'AlmanacNamespaceQuery' => 'applications/almanac/query/AlmanacNamespaceQuery.php',
     'AlmanacNamespaceSearchEngine' => 'applications/almanac/query/AlmanacNamespaceSearchEngine.php',
     'AlmanacNamespaceTransaction' => 'applications/almanac/storage/AlmanacNamespaceTransaction.php',
     'AlmanacNamespaceTransactionQuery' => 'applications/almanac/query/AlmanacNamespaceTransactionQuery.php',
+    'AlmanacNamespaceTransactionType' => 'applications/almanac/xaction/AlmanacNamespaceTransactionType.php',
     'AlmanacNamespaceViewController' => 'applications/almanac/controller/AlmanacNamespaceViewController.php',
     'AlmanacNetwork' => 'applications/almanac/storage/AlmanacNetwork.php',
     'AlmanacNetworkController' => 'applications/almanac/controller/AlmanacNetworkController.php',
@@ -5263,11 +5265,13 @@
     'AlmanacNamespaceEditor' => 'PhabricatorApplicationTransactionEditor',
     'AlmanacNamespaceListController' => 'AlmanacNamespaceController',
     'AlmanacNamespaceNameNgrams' => 'PhabricatorSearchNgrams',
+    'AlmanacNamespaceNameTransaction' => 'AlmanacNamespaceTransactionType',
     'AlmanacNamespacePHIDType' => 'PhabricatorPHIDType',
     'AlmanacNamespaceQuery' => 'AlmanacQuery',
     'AlmanacNamespaceSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'AlmanacNamespaceTransaction' => 'PhabricatorApplicationTransaction',
+    'AlmanacNamespaceTransaction' => 'PhabricatorModularTransaction',
     'AlmanacNamespaceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'AlmanacNamespaceTransactionType' => 'AlmanacTransactionType',
     'AlmanacNamespaceViewController' => 'AlmanacNamespaceController',
     'AlmanacNetwork' => array(
       'AlmanacDAO',
diff --git a/src/applications/almanac/editor/AlmanacNamespaceEditEngine.php b/src/applications/almanac/editor/AlmanacNamespaceEditEngine.php
index 3b8c4ba2a6..cf6ad36c00 100644
--- a/src/applications/almanac/editor/AlmanacNamespaceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacNamespaceEditEngine.php
@@ -81,7 +81,7 @@ protected function buildCustomEditFields($object) {
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setDescription(pht('Name of the namespace.'))
-        ->setTransactionType(AlmanacNamespaceTransaction::TYPE_NAME)
+        ->setTransactionType(AlmanacNamespaceNameTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getName()),
     );
diff --git a/src/applications/almanac/editor/AlmanacNamespaceEditor.php b/src/applications/almanac/editor/AlmanacNamespaceEditor.php
index 5243d3c935..93d65e62b1 100644
--- a/src/applications/almanac/editor/AlmanacNamespaceEditor.php
+++ b/src/applications/almanac/editor/AlmanacNamespaceEditor.php
@@ -11,6 +11,14 @@ public function getEditorObjectsDescription() {
     return pht('Almanac Namespace');
   }
 
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this namespace.', $author);
+  }
+
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
+  }
+
   protected function supportsSearch() {
     return true;
   }
@@ -18,149 +26,12 @@ protected function supportsSearch() {
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
-    $types[] = AlmanacNamespaceTransaction::TYPE_NAME;
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
     return $types;
   }
 
-  protected function getCustomTransactionOldValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-    switch ($xaction->getTransactionType()) {
-      case AlmanacNamespaceTransaction::TYPE_NAME:
-        return $object->getName();
-    }
-
-    return parent::getCustomTransactionOldValue($object, $xaction);
-  }
-
-  protected function getCustomTransactionNewValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacNamespaceTransaction::TYPE_NAME:
-        return $xaction->getNewValue();
-    }
-
-    return parent::getCustomTransactionNewValue($object, $xaction);
-  }
-
-  protected function applyCustomInternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacNamespaceTransaction::TYPE_NAME:
-        $object->setName($xaction->getNewValue());
-        return;
-    }
-
-    return parent::applyCustomInternalTransaction($object, $xaction);
-  }
-
-  protected function applyCustomExternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacNamespaceTransaction::TYPE_NAME:
-        return;
-    }
-
-    return parent::applyCustomExternalTransaction($object, $xaction);
-  }
-
-  protected function validateTransaction(
-    PhabricatorLiskDAO $object,
-    $type,
-    array $xactions) {
-
-    $errors = parent::validateTransaction($object, $type, $xactions);
-
-    switch ($type) {
-      case AlmanacNamespaceTransaction::TYPE_NAME:
-        $missing = $this->validateIsEmptyTextField(
-          $object->getName(),
-          $xactions);
-
-        if ($missing) {
-          $error = new PhabricatorApplicationTransactionValidationError(
-            $type,
-            pht('Required'),
-            pht('Namespace name is required.'),
-            nonempty(last($xactions), null));
-
-          $error->setIsMissingFieldError(true);
-          $errors[] = $error;
-        } else {
-          foreach ($xactions as $xaction) {
-            $name = $xaction->getNewValue();
-
-            $message = null;
-            try {
-              AlmanacNames::validateName($name);
-            } catch (Exception $ex) {
-              $message = $ex->getMessage();
-            }
-
-            if ($message !== null) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                $message,
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-
-            $other = id(new AlmanacNamespaceQuery())
-              ->setViewer(PhabricatorUser::getOmnipotentUser())
-              ->withNames(array($name))
-              ->executeOne();
-            if ($other && ($other->getID() != $object->getID())) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Not Unique'),
-                pht(
-                  'The namespace name "%s" is already in use by another '.
-                  'namespace. Each namespace must have a unique name.',
-                  $name),
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-
-            if ($name === $object->getName()) {
-              continue;
-            }
-
-            $namespace = AlmanacNamespace::loadRestrictedNamespace(
-              $this->getActor(),
-              $name);
-            if ($namespace) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Restricted'),
-                pht(
-                  'You do not have permission to create Almanac namespaces '.
-                  'within the "%s" namespace.',
-                  $namespace->getName()),
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-          }
-        }
-
-        break;
-    }
-
-    return $errors;
-  }
-
   protected function didCatchDuplicateKeyException(
     PhabricatorLiskDAO $object,
     array $xactions,
diff --git a/src/applications/almanac/storage/AlmanacNamespaceTransaction.php b/src/applications/almanac/storage/AlmanacNamespaceTransaction.php
index 9461fa5f13..9a6f10e1de 100644
--- a/src/applications/almanac/storage/AlmanacNamespaceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacNamespaceTransaction.php
@@ -1,9 +1,7 @@
 <?php
 
 final class AlmanacNamespaceTransaction
-  extends PhabricatorApplicationTransaction {
-
-  const TYPE_NAME = 'almanac:namespace:name';
+  extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'almanac';
@@ -17,27 +15,8 @@ public function getApplicationTransactionCommentObject() {
     return null;
   }
 
-  public function getTitle() {
-    $author_phid = $this->getAuthorPHID();
-
-    $old = $this->getOldValue();
-    $new = $this->getNewValue();
-
-    switch ($this->getTransactionType()) {
-      case PhabricatorTransactions::TYPE_CREATE:
-        return pht(
-          '%s created this namespace.',
-          $this->renderHandleLink($author_phid));
-        break;
-      case self::TYPE_NAME:
-        return pht(
-          '%s renamed this namespace from "%s" to "%s".',
-          $this->renderHandleLink($author_phid),
-          $old,
-          $new);
-    }
-
-    return parent::getTitle();
+  public function getBaseTransactionClass() {
+    return 'AlmanacNamespaceTransactionType';
   }
 
 }
diff --git a/src/applications/almanac/xaction/AlmanacNamespaceNameTransaction.php b/src/applications/almanac/xaction/AlmanacNamespaceNameTransaction.php
new file mode 100644
index 0000000000..dfb187db89
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacNamespaceNameTransaction.php
@@ -0,0 +1,91 @@
+<?php
+
+final class AlmanacNamespaceNameTransaction
+  extends AlmanacNamespaceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:namespace:name';
+
+  public function generateOldValue($object) {
+    return $object->getName();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setName($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s renamed this namespace from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s renamed %s from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderObject(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($this->isEmptyTextTransaction($object->getName(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Namespace name is required.'));
+    }
+
+    foreach ($xactions as $xaction) {
+      $name = $xaction->getNewValue();
+
+      $message = null;
+      try {
+        AlmanacNames::validateName($name);
+      } catch (Exception $ex) {
+        $message = $ex->getMessage();
+      }
+
+      if ($message !== null) {
+        $errors[] = $this->newInvalidError($message, $xaction);
+        continue;
+      }
+
+      if ($name === $object->getName()) {
+        continue;
+      }
+
+      $other = id(new AlmanacNamespaceQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withNames(array($name))
+        ->executeOne();
+      if ($other && ($other->getID() != $object->getID())) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'The namespace name "%s" is already in use by another '.
+            'namespace. Each namespace must have a unique name.',
+            $name),
+          $xaction);
+        continue;
+      }
+
+      $namespace = AlmanacNamespace::loadRestrictedNamespace(
+        $this->getActor(),
+        $name);
+      if ($namespace) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You do not have permission to create Almanac namespaces '.
+            'within the "%s" namespace.',
+            $namespace->getName()),
+          $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacNamespaceTransactionType.php b/src/applications/almanac/xaction/AlmanacNamespaceTransactionType.php
new file mode 100644
index 0000000000..fee3d6d1eb
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacNamespaceTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class AlmanacNamespaceTransactionType
+  extends AlmanacTransactionType {}

From f62494355daf5e825670a11939fa9fdf0a13f0e4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 05:08:02 -0700
Subject: [PATCH 804/865] Modularize Almanac Binding transactions

Summary: Depends on D19320. Ref T13120. Ref T12414. Move transactions for Almanac Bindings to ModularTransactions.

Test Plan:
  - Created a new binding.
  - Tried to create a duplicate binding, got an error.
  - Edited a binding to rebind it to a different device.
  - Disabled and enabled bindings.
  - Grepped for `AlmanacBindingTransaction::` constants.

When a binding is created, it currently renders a bad "changed the interface from ??? to X" transaction. This is because creation isn't currently using EditEngine. I plan to swap it shortly, which will turn this into a real "Create" transaction and fix the issue.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19321
---
 src/__phutil_library_map__.php                |   8 +-
 .../AlmanacBindingDisableController.php       |   2 +-
 .../AlmanacBindingEditController.php          |   2 +-
 .../almanac/editor/AlmanacBindingEditor.php   | 165 +-----------------
 .../storage/AlmanacBindingTransaction.php     |  61 +------
 .../AlmanacBindingDisableTransaction.php      |  28 +++
 .../AlmanacBindingInterfaceTransaction.php    | 111 ++++++++++++
 .../xaction/AlmanacBindingTransactionType.php |   4 +
 8 files changed, 159 insertions(+), 222 deletions(-)
 create mode 100644 src/applications/almanac/xaction/AlmanacBindingDisableTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacBindingInterfaceTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacBindingTransactionType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 57e58ac74e..cfa091f048 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -13,14 +13,17 @@
     'AlmanacAddress' => 'applications/almanac/util/AlmanacAddress.php',
     'AlmanacBinding' => 'applications/almanac/storage/AlmanacBinding.php',
     'AlmanacBindingDisableController' => 'applications/almanac/controller/AlmanacBindingDisableController.php',
+    'AlmanacBindingDisableTransaction' => 'applications/almanac/xaction/AlmanacBindingDisableTransaction.php',
     'AlmanacBindingEditController' => 'applications/almanac/controller/AlmanacBindingEditController.php',
     'AlmanacBindingEditor' => 'applications/almanac/editor/AlmanacBindingEditor.php',
+    'AlmanacBindingInterfaceTransaction' => 'applications/almanac/xaction/AlmanacBindingInterfaceTransaction.php',
     'AlmanacBindingPHIDType' => 'applications/almanac/phid/AlmanacBindingPHIDType.php',
     'AlmanacBindingPropertyEditEngine' => 'applications/almanac/editor/AlmanacBindingPropertyEditEngine.php',
     'AlmanacBindingQuery' => 'applications/almanac/query/AlmanacBindingQuery.php',
     'AlmanacBindingTableView' => 'applications/almanac/view/AlmanacBindingTableView.php',
     'AlmanacBindingTransaction' => 'applications/almanac/storage/AlmanacBindingTransaction.php',
     'AlmanacBindingTransactionQuery' => 'applications/almanac/query/AlmanacBindingTransactionQuery.php',
+    'AlmanacBindingTransactionType' => 'applications/almanac/xaction/AlmanacBindingTransactionType.php',
     'AlmanacBindingViewController' => 'applications/almanac/controller/AlmanacBindingViewController.php',
     'AlmanacBindingsSearchEngineAttachment' => 'applications/almanac/engineextension/AlmanacBindingsSearchEngineAttachment.php',
     'AlmanacCacheEngineExtension' => 'applications/almanac/engineextension/AlmanacCacheEngineExtension.php',
@@ -5179,14 +5182,17 @@
       'PhabricatorExtendedPolicyInterface',
     ),
     'AlmanacBindingDisableController' => 'AlmanacServiceController',
+    'AlmanacBindingDisableTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingEditController' => 'AlmanacServiceController',
     'AlmanacBindingEditor' => 'AlmanacEditor',
+    'AlmanacBindingInterfaceTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingPHIDType' => 'PhabricatorPHIDType',
     'AlmanacBindingPropertyEditEngine' => 'AlmanacPropertyEditEngine',
     'AlmanacBindingQuery' => 'AlmanacQuery',
     'AlmanacBindingTableView' => 'AphrontView',
-    'AlmanacBindingTransaction' => 'AlmanacTransaction',
+    'AlmanacBindingTransaction' => 'PhabricatorModularTransaction',
     'AlmanacBindingTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'AlmanacBindingTransactionType' => 'AlmanacTransactionType',
     'AlmanacBindingViewController' => 'AlmanacServiceController',
     'AlmanacBindingsSearchEngineAttachment' => 'AlmanacSearchEngineAttachment',
     'AlmanacCacheEngineExtension' => 'PhabricatorCacheEngineExtension',
diff --git a/src/applications/almanac/controller/AlmanacBindingDisableController.php b/src/applications/almanac/controller/AlmanacBindingDisableController.php
index eb1f093125..d709db3e82 100644
--- a/src/applications/almanac/controller/AlmanacBindingDisableController.php
+++ b/src/applications/almanac/controller/AlmanacBindingDisableController.php
@@ -40,7 +40,7 @@ public function handleRequest(AphrontRequest $request) {
 
 
     if ($request->isFormPost()) {
-      $type_disable = AlmanacBindingTransaction::TYPE_DISABLE;
+      $type_disable = AlmanacBindingDisableTransaction::TRANSACTIONTYPE;
 
       $xactions = array();
 
diff --git a/src/applications/almanac/controller/AlmanacBindingEditController.php b/src/applications/almanac/controller/AlmanacBindingEditController.php
index 5f1fe30043..f33bf73ccb 100644
--- a/src/applications/almanac/controller/AlmanacBindingEditController.php
+++ b/src/applications/almanac/controller/AlmanacBindingEditController.php
@@ -58,7 +58,7 @@ public function handleRequest(AphrontRequest $request) {
     if ($request->isFormPost()) {
       $v_interface = $request->getArr('interfacePHIDs');
 
-      $type_interface = AlmanacBindingTransaction::TYPE_INTERFACE;
+      $type_interface = AlmanacBindingInterfaceTransaction::TRANSACTIONTYPE;
 
       $xactions = array();
 
diff --git a/src/applications/almanac/editor/AlmanacBindingEditor.php b/src/applications/almanac/editor/AlmanacBindingEditor.php
index 6532bf671f..d84845722c 100644
--- a/src/applications/almanac/editor/AlmanacBindingEditor.php
+++ b/src/applications/almanac/editor/AlmanacBindingEditor.php
@@ -3,173 +3,16 @@
 final class AlmanacBindingEditor
   extends AlmanacEditor {
 
-  private $devicePHID;
-
   public function getEditorObjectsDescription() {
     return pht('Almanac Binding');
   }
 
-  public function getTransactionTypes() {
-    $types = parent::getTransactionTypes();
-
-    $types[] = AlmanacBindingTransaction::TYPE_INTERFACE;
-    $types[] = AlmanacBindingTransaction::TYPE_DISABLE;
-
-    return $types;
-  }
-
-  protected function getCustomTransactionOldValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-    switch ($xaction->getTransactionType()) {
-      case AlmanacBindingTransaction::TYPE_INTERFACE:
-        return $object->getInterfacePHID();
-      case AlmanacBindingTransaction::TYPE_DISABLE:
-        return $object->getIsDisabled();
-    }
-
-    return parent::getCustomTransactionOldValue($object, $xaction);
-  }
-
-  protected function getCustomTransactionNewValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacBindingTransaction::TYPE_INTERFACE:
-        return $xaction->getNewValue();
-      case AlmanacBindingTransaction::TYPE_DISABLE:
-        return (int)$xaction->getNewValue();
-    }
-
-    return parent::getCustomTransactionNewValue($object, $xaction);
-  }
-
-  protected function applyCustomInternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacBindingTransaction::TYPE_INTERFACE:
-        $interface = id(new AlmanacInterfaceQuery())
-          ->setViewer($this->requireActor())
-          ->withPHIDs(array($xaction->getNewValue()))
-          ->executeOne();
-        $object->setDevicePHID($interface->getDevicePHID());
-        $object->setInterfacePHID($interface->getPHID());
-        return;
-      case AlmanacBindingTransaction::TYPE_DISABLE:
-        $object->setIsDisabled($xaction->getNewValue());
-        return;
-    }
-
-    return parent::applyCustomInternalTransaction($object, $xaction);
-  }
-
-  protected function applyCustomExternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacBindingTransaction::TYPE_DISABLE:
-        return;
-      case AlmanacBindingTransaction::TYPE_INTERFACE:
-        $interface_phids = array();
-
-        $interface_phids[] = $xaction->getOldValue();
-        $interface_phids[] = $xaction->getNewValue();
-
-        $interface_phids = array_filter($interface_phids);
-        $interface_phids = array_unique($interface_phids);
-
-        $interfaces = id(new AlmanacInterfaceQuery())
-          ->setViewer(PhabricatorUser::getOmnipotentUser())
-          ->withPHIDs($interface_phids)
-          ->execute();
-
-        $device_phids = array();
-        foreach ($interfaces as $interface) {
-          $device_phids[] = $interface->getDevicePHID();
-        }
-
-        $device_phids = array_unique($device_phids);
-
-        $devices = id(new AlmanacDeviceQuery())
-          ->setViewer(PhabricatorUser::getOmnipotentUser())
-          ->withPHIDs($device_phids)
-          ->execute();
-
-        foreach ($devices as $device) {
-          $device->rebuildClusterBindingStatus();
-        }
-        return;
-    }
-
-    return parent::applyCustomExternalTransaction($object, $xaction);
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this binding.', $author);
   }
 
-  protected function validateTransaction(
-    PhabricatorLiskDAO $object,
-    $type,
-    array $xactions) {
-
-    $errors = parent::validateTransaction($object, $type, $xactions);
-
-    switch ($type) {
-      case AlmanacBindingTransaction::TYPE_INTERFACE:
-        $missing = $this->validateIsEmptyTextField(
-          $object->getInterfacePHID(),
-          $xactions);
-        if ($missing) {
-          $error = new PhabricatorApplicationTransactionValidationError(
-            $type,
-            pht('Required'),
-            pht('Bindings must specify an interface.'),
-            nonempty(last($xactions), null));
-          $error->setIsMissingFieldError(true);
-          $errors[] = $error;
-        } else if ($xactions) {
-          foreach ($xactions as $xaction) {
-            $interfaces = id(new AlmanacInterfaceQuery())
-              ->setViewer($this->requireActor())
-              ->withPHIDs(array($xaction->getNewValue()))
-              ->execute();
-            if (!$interfaces) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                pht(
-                  'You can not bind a service to an invalid or restricted '.
-                  'interface.'),
-                $xaction);
-              $errors[] = $error;
-            }
-          }
-
-          $final_value = last($xactions)->getNewValue();
-
-          $binding = id(new AlmanacBindingQuery())
-            ->setViewer(PhabricatorUser::getOmnipotentUser())
-            ->withServicePHIDs(array($object->getServicePHID()))
-            ->withInterfacePHIDs(array($final_value))
-            ->executeOne();
-          if ($binding && ($binding->getID() != $object->getID())) {
-            $error = new PhabricatorApplicationTransactionValidationError(
-              $type,
-              pht('Already Bound'),
-              pht(
-                'You can not bind a service to the same interface multiple '.
-                'times.'),
-              last($xactions));
-            $errors[] = $error;
-          }
-        }
-        break;
-    }
-
-    return $errors;
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
   }
 
-
-
 }
diff --git a/src/applications/almanac/storage/AlmanacBindingTransaction.php b/src/applications/almanac/storage/AlmanacBindingTransaction.php
index 11120f9827..24b606639f 100644
--- a/src/applications/almanac/storage/AlmanacBindingTransaction.php
+++ b/src/applications/almanac/storage/AlmanacBindingTransaction.php
@@ -1,10 +1,7 @@
 <?php
 
 final class AlmanacBindingTransaction
-  extends AlmanacTransaction {
-
-  const TYPE_INTERFACE = 'almanac:binding:interface';
-  const TYPE_DISABLE = 'almanac:binding:disable';
+  extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'almanac';
@@ -18,60 +15,8 @@ public function getApplicationTransactionCommentObject() {
     return null;
   }
 
-  public function getRequiredHandlePHIDs() {
-    $phids = parent::getRequiredHandlePHIDs();
-
-    $old = $this->getOldValue();
-    $new = $this->getNewValue();
-
-    switch ($this->getTransactionType()) {
-      case self::TYPE_INTERFACE:
-        if ($old) {
-          $phids[] = $old;
-        }
-        if ($new) {
-          $phids[] = $new;
-        }
-        break;
-    }
-
-    return $phids;
-  }
-
-  public function getTitle() {
-    $author_phid = $this->getAuthorPHID();
-
-    $old = $this->getOldValue();
-    $new = $this->getNewValue();
-
-    switch ($this->getTransactionType()) {
-      case self::TYPE_INTERFACE:
-        if ($old === null) {
-          return pht(
-            '%s created this binding.',
-            $this->renderHandleLink($author_phid));
-        } else {
-          return pht(
-            '%s changed this binding from %s to %s.',
-            $this->renderHandleLink($author_phid),
-            $this->renderHandleLink($old),
-            $this->renderHandleLink($new));
-        }
-        break;
-      case self::TYPE_DISABLE:
-        if ($new) {
-          return pht(
-            '%s disabled this binding.',
-            $this->renderHandleLink($author_phid));
-        } else {
-          return pht(
-            '%s enabled this binding.',
-            $this->renderHandleLink($author_phid));
-        }
-        break;
-    }
-
-    return parent::getTitle();
+  public function getBaseTransactionClass() {
+    return 'AlmanacBindingTransactionType';
   }
 
 }
diff --git a/src/applications/almanac/xaction/AlmanacBindingDisableTransaction.php b/src/applications/almanac/xaction/AlmanacBindingDisableTransaction.php
new file mode 100644
index 0000000000..1592686835
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacBindingDisableTransaction.php
@@ -0,0 +1,28 @@
+<?php
+
+final class AlmanacBindingDisableTransaction
+  extends AlmanacBindingTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:binding:disable';
+
+  public function generateOldValue($object) {
+    return (bool)$object->getIsDisabled();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setIsDisabled((int)$value);
+  }
+
+  public function getTitle() {
+    if ($this->getNewValue()) {
+      return pht(
+        '%s disabled this binding.',
+        $this->renderAuthor());
+    } else {
+      return pht(
+        '%s enabled this binding.',
+        $this->renderAuthor());
+    }
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacBindingInterfaceTransaction.php b/src/applications/almanac/xaction/AlmanacBindingInterfaceTransaction.php
new file mode 100644
index 0000000000..f43fcdfa86
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacBindingInterfaceTransaction.php
@@ -0,0 +1,111 @@
+<?php
+
+final class AlmanacBindingInterfaceTransaction
+  extends AlmanacBindingTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:binding:interface';
+
+  public function generateOldValue($object) {
+    return $object->getInterfacePHID();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $interface = $this->loadInterface($value);
+
+    $object
+      ->setDevicePHID($interface->getDevicePHID())
+      ->setInterfacePHID($interface->getPHID());
+  }
+
+  public function applyExternalEffects($object, $value) {
+
+    // When we change which services a device is bound to, we need to
+    // recalculate whether it is a cluster device or not so we can tell if
+    // the "Can Manage Cluster Services" permission applies to it.
+
+    $viewer = PhabricatorUser::getOmnipotentUser();
+    $interface_phids = array();
+
+    $interface_phids[] = $this->getOldValue();
+    $interface_phids[] = $this->getNewValue();
+
+    $interface_phids = array_filter($interface_phids);
+    $interface_phids = array_unique($interface_phids);
+
+    $interfaces = id(new AlmanacInterfaceQuery())
+      ->setViewer($viewer)
+      ->withPHIDs($interface_phids)
+      ->execute();
+
+    $device_phids = array();
+    foreach ($interfaces as $interface) {
+      $device_phids[] = $interface->getDevicePHID();
+    }
+
+    $device_phids = array_unique($device_phids);
+
+    $devices = id(new AlmanacDeviceQuery())
+      ->setViewer($viewer)
+      ->withPHIDs($device_phids)
+      ->execute();
+
+    foreach ($devices as $device) {
+      $device->rebuildClusterBindingStatus();
+    }
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s changed the interface for this binding from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldHandle(),
+      $this->renderNewHandle());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    $interface_phid = $object->getInterfacePHID();
+    if ($this->isEmptyTextTransaction($interface_phid, $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Bindings must specify an interface.'));
+    }
+
+    foreach ($xactions as $xaction) {
+      $interface_phid = $xaction->getNewValue();
+
+      $interface = $this->loadInterface($interface_phid);
+      if (!$interface) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You can not bind a service to an invalid or restricted '.
+            'interface.'),
+          $xaction);
+        continue;
+      }
+
+      $binding = id(new AlmanacBindingQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withServicePHIDs(array($object->getServicePHID()))
+        ->withInterfacePHIDs(array($interface_phid))
+        ->executeOne();
+      if ($binding && ($binding->getID() != $object->getID())) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You can not bind a service to the same interface multiple '.
+            'times.'),
+          $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+  private function loadInterface($phid) {
+    return id(new AlmanacInterfaceQuery())
+      ->setViewer($this->getActor())
+      ->withPHIDs(array($phid))
+      ->executeOne();
+  }
+}
diff --git a/src/applications/almanac/xaction/AlmanacBindingTransactionType.php b/src/applications/almanac/xaction/AlmanacBindingTransactionType.php
new file mode 100644
index 0000000000..3a3d9408b5
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacBindingTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class AlmanacBindingTransactionType
+  extends AlmanacTransactionType {}

From 580409b5628d6d3255b994f6d765df8a738ca39a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 05:19:47 -0700
Subject: [PATCH 805/865] Modularize Almanac Network transactions

Summary: Depends on D19321. Ref T13120. Ref T12414. Move transactions for Almanac Networks (just "name") to ModularTransactions.

Test Plan:
  - Created a new network.
  - Renamed a network.
  - Tried to create a network with no name (got an error).
  - Grepped for `AlmanacNetworkTransaction::`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19322
---
 src/__phutil_library_map__.php                |  6 +-
 .../editor/AlmanacNetworkEditEngine.php       |  2 +-
 .../almanac/editor/AlmanacNetworkEditor.php   | 88 ++-----------------
 .../storage/AlmanacNetworkTransaction.php     | 26 +-----
 .../xaction/AlmanacNetworkNameTransaction.php | 44 ++++++++++
 .../xaction/AlmanacNetworkTransactionType.php |  4 +
 6 files changed, 65 insertions(+), 105 deletions(-)
 create mode 100644 src/applications/almanac/xaction/AlmanacNetworkNameTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacNetworkTransactionType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index cfa091f048..7cf2cbbf12 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -93,11 +93,13 @@
     'AlmanacNetworkEditor' => 'applications/almanac/editor/AlmanacNetworkEditor.php',
     'AlmanacNetworkListController' => 'applications/almanac/controller/AlmanacNetworkListController.php',
     'AlmanacNetworkNameNgrams' => 'applications/almanac/storage/AlmanacNetworkNameNgrams.php',
+    'AlmanacNetworkNameTransaction' => 'applications/almanac/xaction/AlmanacNetworkNameTransaction.php',
     'AlmanacNetworkPHIDType' => 'applications/almanac/phid/AlmanacNetworkPHIDType.php',
     'AlmanacNetworkQuery' => 'applications/almanac/query/AlmanacNetworkQuery.php',
     'AlmanacNetworkSearchEngine' => 'applications/almanac/query/AlmanacNetworkSearchEngine.php',
     'AlmanacNetworkTransaction' => 'applications/almanac/storage/AlmanacNetworkTransaction.php',
     'AlmanacNetworkTransactionQuery' => 'applications/almanac/query/AlmanacNetworkTransactionQuery.php',
+    'AlmanacNetworkTransactionType' => 'applications/almanac/xaction/AlmanacNetworkTransactionType.php',
     'AlmanacNetworkViewController' => 'applications/almanac/controller/AlmanacNetworkViewController.php',
     'AlmanacPropertiesDestructionEngineExtension' => 'applications/almanac/engineextension/AlmanacPropertiesDestructionEngineExtension.php',
     'AlmanacPropertiesSearchEngineAttachment' => 'applications/almanac/engineextension/AlmanacPropertiesSearchEngineAttachment.php',
@@ -5292,11 +5294,13 @@
     'AlmanacNetworkEditor' => 'PhabricatorApplicationTransactionEditor',
     'AlmanacNetworkListController' => 'AlmanacNetworkController',
     'AlmanacNetworkNameNgrams' => 'PhabricatorSearchNgrams',
+    'AlmanacNetworkNameTransaction' => 'AlmanacNetworkTransactionType',
     'AlmanacNetworkPHIDType' => 'PhabricatorPHIDType',
     'AlmanacNetworkQuery' => 'AlmanacQuery',
     'AlmanacNetworkSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'AlmanacNetworkTransaction' => 'PhabricatorApplicationTransaction',
+    'AlmanacNetworkTransaction' => 'PhabricatorModularTransaction',
     'AlmanacNetworkTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'AlmanacNetworkTransactionType' => 'AlmanacTransactionType',
     'AlmanacNetworkViewController' => 'AlmanacNetworkController',
     'AlmanacPropertiesDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
     'AlmanacPropertiesSearchEngineAttachment' => 'AlmanacSearchEngineAttachment',
diff --git a/src/applications/almanac/editor/AlmanacNetworkEditEngine.php b/src/applications/almanac/editor/AlmanacNetworkEditEngine.php
index e474e81291..027b2a9aa0 100644
--- a/src/applications/almanac/editor/AlmanacNetworkEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacNetworkEditEngine.php
@@ -81,7 +81,7 @@ protected function buildCustomEditFields($object) {
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setDescription(pht('Name of the network.'))
-        ->setTransactionType(AlmanacNetworkTransaction::TYPE_NAME)
+        ->setTransactionType(AlmanacNetworkNameTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getName()),
     );
diff --git a/src/applications/almanac/editor/AlmanacNetworkEditor.php b/src/applications/almanac/editor/AlmanacNetworkEditor.php
index f32b58219e..f5a74e2095 100644
--- a/src/applications/almanac/editor/AlmanacNetworkEditor.php
+++ b/src/applications/almanac/editor/AlmanacNetworkEditor.php
@@ -15,93 +15,21 @@ protected function supportsSearch() {
     return true;
   }
 
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this network.', $author);
+  }
+
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
+  }
+
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
-    $types[] = AlmanacNetworkTransaction::TYPE_NAME;
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
     return $types;
   }
 
-  protected function getCustomTransactionOldValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-    switch ($xaction->getTransactionType()) {
-      case AlmanacNetworkTransaction::TYPE_NAME:
-        return $object->getName();
-    }
-
-    return parent::getCustomTransactionOldValue($object, $xaction);
-  }
-
-  protected function getCustomTransactionNewValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacNetworkTransaction::TYPE_NAME:
-        return $xaction->getNewValue();
-    }
-
-    return parent::getCustomTransactionNewValue($object, $xaction);
-  }
-
-  protected function applyCustomInternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacNetworkTransaction::TYPE_NAME:
-        $object->setName($xaction->getNewValue());
-        return;
-    }
-
-    return parent::applyCustomInternalTransaction($object, $xaction);
-  }
-
-  protected function applyCustomExternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacNetworkTransaction::TYPE_NAME:
-        return;
-    }
-
-    return parent::applyCustomExternalTransaction($object, $xaction);
-  }
-
-  protected function validateTransaction(
-    PhabricatorLiskDAO $object,
-    $type,
-    array $xactions) {
-
-    $errors = parent::validateTransaction($object, $type, $xactions);
-
-    switch ($type) {
-      case AlmanacNetworkTransaction::TYPE_NAME:
-        $missing = $this->validateIsEmptyTextField(
-          $object->getName(),
-          $xactions);
-
-        if ($missing) {
-          $error = new PhabricatorApplicationTransactionValidationError(
-            $type,
-            pht('Required'),
-            pht('Network name is required.'),
-            nonempty(last($xactions), null));
-
-          $error->setIsMissingFieldError(true);
-          $errors[] = $error;
-        }
-        break;
-    }
-
-    return $errors;
-  }
-
-
-
 }
diff --git a/src/applications/almanac/storage/AlmanacNetworkTransaction.php b/src/applications/almanac/storage/AlmanacNetworkTransaction.php
index f8c2b43b0b..0717631403 100644
--- a/src/applications/almanac/storage/AlmanacNetworkTransaction.php
+++ b/src/applications/almanac/storage/AlmanacNetworkTransaction.php
@@ -1,9 +1,7 @@
 <?php
 
 final class AlmanacNetworkTransaction
-  extends PhabricatorApplicationTransaction {
-
-  const TYPE_NAME = 'almanac:network:name';
+  extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'almanac';
@@ -17,26 +15,8 @@ public function getApplicationTransactionCommentObject() {
     return null;
   }
 
-  public function getTitle() {
-    $author_phid = $this->getAuthorPHID();
-
-    $old = $this->getOldValue();
-    $new = $this->getNewValue();
-
-    switch ($this->getTransactionType()) {
-      case PhabricatorTransactions::TYPE_CREATE:
-        return pht(
-          '%s created this network.',
-          $this->renderHandleLink($author_phid));
-      case self::TYPE_NAME:
-        return pht(
-          '%s renamed this network from "%s" to "%s".',
-          $this->renderHandleLink($author_phid),
-          $old,
-          $new);
-    }
-
-    return parent::getTitle();
+  public function getBaseTransactionClass() {
+    return 'AlmanacNetworkTransactionType';
   }
 
 }
diff --git a/src/applications/almanac/xaction/AlmanacNetworkNameTransaction.php b/src/applications/almanac/xaction/AlmanacNetworkNameTransaction.php
new file mode 100644
index 0000000000..140c1a9661
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacNetworkNameTransaction.php
@@ -0,0 +1,44 @@
+<?php
+
+final class AlmanacNetworkNameTransaction
+  extends AlmanacNetworkTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:network:name';
+
+  public function generateOldValue($object) {
+    return $object->getName();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setName($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s renamed this network from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s renamed %s from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderObject(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($this->isEmptyTextTransaction($object->getName(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Network name is required.'));
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacNetworkTransactionType.php b/src/applications/almanac/xaction/AlmanacNetworkTransactionType.php
new file mode 100644
index 0000000000..9f822ab09f
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacNetworkTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class AlmanacNetworkTransactionType
+  extends AlmanacTransactionType {}

From f9c6a69d9cc4068c048cb1f6e2614221704c9161 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 05:50:49 -0700
Subject: [PATCH 806/865] Add skeleton code for Almanac Interfaces to have real
 transactions

Summary:
Depends on D19322. Ref T13120. Ref T12414.

Currently, `AlmanacDevice` has a bit of a beast of a `TYPE_INTERFACE` transaction that fully creates a complex Interface object. This isn't very flexible or consistent, and Interfaces are complex enough to reasonably have their own object behaviors (for example, they have their own PHIDs).

The complexity of this transaction makes modularizing `AlmanacDevice` transactions tricky. To simplify this, move Interface toward having its own set of normal transactions.

This change just adds some reasonable-looking transactions; it doesn't actually hook them up in the UI or make them reachable. I'll test that they actually work as I swap the UI over.

We may also have some code using the `TYPE_INTERFACE` transaction in Phacility support stuff, so that may need to wait a week to actually phase out.

Test Plan: Ran `bin/storage upgrade` and `arc liberate`. This code isn't reachable yet.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19323
---
 .../20180410.almanac.01.iface.xaction.sql     | 19 ++++++
 src/__phutil_library_map__.php                | 15 +++++
 .../almanac/editor/AlmanacInterfaceEditor.php | 22 +++++++
 .../almanac/storage/AlmanacInterface.php      | 25 +++++++-
 .../storage/AlmanacInterfaceTransaction.php   | 22 +++++++
 .../AlmanacInterfaceAddressTransaction.php    | 44 ++++++++++++++
 .../AlmanacInterfaceDeviceTransaction.php     | 60 +++++++++++++++++++
 .../AlmanacInterfaceNetworkTransaction.php    | 53 ++++++++++++++++
 .../AlmanacInterfacePortTransaction.php       | 53 ++++++++++++++++
 .../AlmanacInterfaceTransactionType.php       |  4 ++
 10 files changed, 316 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20180410.almanac.01.iface.xaction.sql
 create mode 100644 src/applications/almanac/editor/AlmanacInterfaceEditor.php
 create mode 100644 src/applications/almanac/storage/AlmanacInterfaceTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacInterfacePortTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacInterfaceTransactionType.php

diff --git a/resources/sql/autopatches/20180410.almanac.01.iface.xaction.sql b/resources/sql/autopatches/20180410.almanac.01.iface.xaction.sql
new file mode 100644
index 0000000000..5f0dec18aa
--- /dev/null
+++ b/resources/sql/autopatches/20180410.almanac.01.iface.xaction.sql
@@ -0,0 +1,19 @@
+CREATE TABLE {$NAMESPACE}_almanac.almanac_interfacetransaction (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  phid VARBINARY(64) NOT NULL,
+  authorPHID VARBINARY(64) NOT NULL,
+  objectPHID VARBINARY(64) NOT NULL,
+  viewPolicy VARBINARY(64) NOT NULL,
+  editPolicy VARBINARY(64) NOT NULL,
+  commentPHID VARBINARY(64) DEFAULT NULL,
+  commentVersion INT UNSIGNED NOT NULL,
+  transactionType VARCHAR(32) COLLATE {$COLLATE_TEXT} NOT NULL,
+  oldValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  newValue LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  contentSource LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  metadata LONGTEXT COLLATE {$COLLATE_TEXT} NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_phid` (`phid`),
+  KEY `key_object` (`objectPHID`)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 7cf2cbbf12..08806ab1b9 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -57,12 +57,19 @@
     'AlmanacDrydockPoolServiceType' => 'applications/almanac/servicetype/AlmanacDrydockPoolServiceType.php',
     'AlmanacEditor' => 'applications/almanac/editor/AlmanacEditor.php',
     'AlmanacInterface' => 'applications/almanac/storage/AlmanacInterface.php',
+    'AlmanacInterfaceAddressTransaction' => 'applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php',
     'AlmanacInterfaceDatasource' => 'applications/almanac/typeahead/AlmanacInterfaceDatasource.php',
     'AlmanacInterfaceDeleteController' => 'applications/almanac/controller/AlmanacInterfaceDeleteController.php',
+    'AlmanacInterfaceDeviceTransaction' => 'applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php',
     'AlmanacInterfaceEditController' => 'applications/almanac/controller/AlmanacInterfaceEditController.php',
+    'AlmanacInterfaceEditor' => 'applications/almanac/editor/AlmanacInterfaceEditor.php',
+    'AlmanacInterfaceNetworkTransaction' => 'applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php',
     'AlmanacInterfacePHIDType' => 'applications/almanac/phid/AlmanacInterfacePHIDType.php',
+    'AlmanacInterfacePortTransaction' => 'applications/almanac/xaction/AlmanacInterfacePortTransaction.php',
     'AlmanacInterfaceQuery' => 'applications/almanac/query/AlmanacInterfaceQuery.php',
     'AlmanacInterfaceTableView' => 'applications/almanac/view/AlmanacInterfaceTableView.php',
+    'AlmanacInterfaceTransaction' => 'applications/almanac/storage/AlmanacInterfaceTransaction.php',
+    'AlmanacInterfaceTransactionType' => 'applications/almanac/xaction/AlmanacInterfaceTransactionType.php',
     'AlmanacKeys' => 'applications/almanac/util/AlmanacKeys.php',
     'AlmanacManageClusterServicesCapability' => 'applications/almanac/capability/AlmanacManageClusterServicesCapability.php',
     'AlmanacManagementRegisterWorkflow' => 'applications/almanac/management/AlmanacManagementRegisterWorkflow.php',
@@ -5243,13 +5250,21 @@
       'PhabricatorPolicyInterface',
       'PhabricatorDestructibleInterface',
       'PhabricatorExtendedPolicyInterface',
+      'PhabricatorApplicationTransactionInterface',
     ),
+    'AlmanacInterfaceAddressTransaction' => 'AlmanacNetworkTransactionType',
     'AlmanacInterfaceDatasource' => 'PhabricatorTypeaheadDatasource',
     'AlmanacInterfaceDeleteController' => 'AlmanacDeviceController',
+    'AlmanacInterfaceDeviceTransaction' => 'AlmanacNetworkTransactionType',
     'AlmanacInterfaceEditController' => 'AlmanacDeviceController',
+    'AlmanacInterfaceEditor' => 'PhabricatorApplicationTransactionEditor',
+    'AlmanacInterfaceNetworkTransaction' => 'AlmanacNetworkTransactionType',
     'AlmanacInterfacePHIDType' => 'PhabricatorPHIDType',
+    'AlmanacInterfacePortTransaction' => 'AlmanacNetworkTransactionType',
     'AlmanacInterfaceQuery' => 'AlmanacQuery',
     'AlmanacInterfaceTableView' => 'AphrontView',
+    'AlmanacInterfaceTransaction' => 'PhabricatorModularTransaction',
+    'AlmanacInterfaceTransactionType' => 'AlmanacTransactionType',
     'AlmanacKeys' => 'Phobject',
     'AlmanacManageClusterServicesCapability' => 'PhabricatorPolicyCapability',
     'AlmanacManagementRegisterWorkflow' => 'AlmanacManagementWorkflow',
diff --git a/src/applications/almanac/editor/AlmanacInterfaceEditor.php b/src/applications/almanac/editor/AlmanacInterfaceEditor.php
new file mode 100644
index 0000000000..066b026dbd
--- /dev/null
+++ b/src/applications/almanac/editor/AlmanacInterfaceEditor.php
@@ -0,0 +1,22 @@
+<?php
+
+final class AlmanacInterfaceEditor
+  extends PhabricatorApplicationTransactionEditor {
+
+  public function getEditorApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
+  public function getEditorObjectsDescription() {
+    return pht('Almanac Interface');
+  }
+
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this interface.', $author);
+  }
+
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
+  }
+
+}
diff --git a/src/applications/almanac/storage/AlmanacInterface.php b/src/applications/almanac/storage/AlmanacInterface.php
index d55c88b791..98d1c3be52 100644
--- a/src/applications/almanac/storage/AlmanacInterface.php
+++ b/src/applications/almanac/storage/AlmanacInterface.php
@@ -5,7 +5,8 @@ final class AlmanacInterface
   implements
     PhabricatorPolicyInterface,
     PhabricatorDestructibleInterface,
-    PhabricatorExtendedPolicyInterface {
+    PhabricatorExtendedPolicyInterface,
+    PhabricatorApplicationTransactionInterface {
 
   protected $devicePHID;
   protected $networkPHID;
@@ -154,4 +155,26 @@ public function destroyObjectPermanently(
     $this->delete();
   }
 
+
+/* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
+
+
+  public function getApplicationTransactionEditor() {
+    return new AlmanacInterfaceEditor();
+  }
+
+  public function getApplicationTransactionObject() {
+    return $this;
+  }
+
+  public function getApplicationTransactionTemplate() {
+    return new AlmanacInterfaceTransaction();
+  }
+
+  public function willRenderTimeline(
+    PhabricatorApplicationTransactionView $timeline,
+    AphrontRequest $request) {
+    return $timeline;
+  }
+
 }
diff --git a/src/applications/almanac/storage/AlmanacInterfaceTransaction.php b/src/applications/almanac/storage/AlmanacInterfaceTransaction.php
new file mode 100644
index 0000000000..f469f926f7
--- /dev/null
+++ b/src/applications/almanac/storage/AlmanacInterfaceTransaction.php
@@ -0,0 +1,22 @@
+<?php
+
+final class AlmanacInterfaceTransaction
+  extends PhabricatorModularTransaction {
+
+  public function getApplicationName() {
+    return 'almanac';
+  }
+
+  public function getApplicationTransactionType() {
+    return AlmanacInterfacePHIDType::TYPECONST;
+  }
+
+  public function getApplicationTransactionCommentObject() {
+    return null;
+  }
+
+  public function getBaseTransactionClass() {
+    return 'AlmanacInterfaceTransactionType';
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php b/src/applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php
new file mode 100644
index 0000000000..47eab92c16
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php
@@ -0,0 +1,44 @@
+<?php
+
+final class AlmanacInterfaceAddressTransaction
+  extends AlmanacNetworkTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:interface:address';
+
+  public function generateOldValue($object) {
+    return $object->getAddress();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setAddress($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s changed the address for this interface from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($this->isEmptyTextTransaction($object->getAddress(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Interfaces must have an address.'));
+    }
+
+    foreach ($xactions as $xaction) {
+
+      // NOTE: For now, we don't validate addresses. We generally expect users
+      // to provide IPv4 addresses, but it's reasonable for them to provide
+      // IPv6 addresses, and some installs currently use DNS names. This is
+      // off-label but works today.
+
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php b/src/applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php
new file mode 100644
index 0000000000..3c4bf6045b
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php
@@ -0,0 +1,60 @@
+<?php
+
+final class AlmanacInterfaceDeviceTransaction
+  extends AlmanacNetworkTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:interface:device';
+
+  public function generateOldValue($object) {
+    return $object->getDevicePHID();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setDevicePHID($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s changed the device for this interface from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldHandle(),
+      $this->renderNewHandle());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($this->isEmptyTextTransaction($object->getAddress(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Interfaces must have a device.'));
+    }
+
+    foreach ($xactions as $xaction) {
+      if (!$this->isNewObject()) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'The device for an interface can not be changed once it has '.
+            'been created.'),
+          $xaction);
+        continue;
+      }
+
+      $device_phid = $xaction->getNewValue();
+      $devices = id(new AlmanacDeviceQuery())
+        ->setViewer($this->getActor())
+        ->withPHIDs(array($device_phid))
+        ->execute();
+      if (!$devices) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You can not attach an interface to a nonexistent or restricted '.
+            'device.'),
+          $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php b/src/applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php
new file mode 100644
index 0000000000..50353d904d
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php
@@ -0,0 +1,53 @@
+<?php
+
+final class AlmanacInterfaceNetworkTransaction
+  extends AlmanacNetworkTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:interface:network';
+
+  public function generateOldValue($object) {
+    return $object->getNetworkPHID();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setNetworkPHID($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s changed the network for this interface from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldHandle(),
+      $this->renderNewHandle());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    $network_phid = $object->getNetworkPHID();
+    if ($this->isEmptyTextTransaction($network_phid, $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Interfaces must have a network.'));
+    }
+
+    foreach ($xactions as $xaction) {
+      $network_phid = $xaction->getNewValue();
+
+      $networks = id(new AlmanacNetworkQuery())
+        ->setViewer($this->getActor())
+        ->withPHIDs(array($network_phid))
+        ->execute();
+      if (!$networks) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You can not put an interface on a nonexistent or restricted '.
+            'network.'),
+          $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacInterfacePortTransaction.php b/src/applications/almanac/xaction/AlmanacInterfacePortTransaction.php
new file mode 100644
index 0000000000..c6a60dee61
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacInterfacePortTransaction.php
@@ -0,0 +1,53 @@
+<?php
+
+final class AlmanacInterfacePortTransaction
+  extends AlmanacNetworkTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:interface:port';
+
+  public function generateOldValue($object) {
+    $port = $object->getPort();
+
+    if ($port !== null) {
+      $port = (int)$port;
+    }
+
+    return $port;
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setPort((int)$value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s changed the port for this interface from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($this->isEmptyTextTransaction($object->getName(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Interfaces must have a port number.'));
+    }
+
+    foreach ($xactions as $xaction) {
+      $port = $xaction->getNewValue();
+
+      $port = (int)$port;
+      if ($port < 1 || $port > 65535) {
+        $errors[] = $this->newInvalidError(
+          pht('Port numbers must be between 1 and 65535, inclusive.'),
+          $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacInterfaceTransactionType.php b/src/applications/almanac/xaction/AlmanacInterfaceTransactionType.php
new file mode 100644
index 0000000000..cf13663a18
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacInterfaceTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class AlmanacInterfaceTransactionType
+  extends AlmanacTransactionType {}

From 6ccf35f9a256bcefcb8be032ec29b35a2b4dfbb1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 06:09:51 -0700
Subject: [PATCH 807/865] Edit Interfaces in Almanac with EditEngine

Summary:
Depends on D19323. Ref T13120. Ref T12414.

Move editing to modern stuff and fix some implementation errors from D19323 (mostly copy/paste stuff).

Test Plan:
  - Created and edited interfaces.
  - Tried to create/edit an interface with a bogus/empty address/port, got errors.
  - Tried to create an interface on a bogus device, got an error.
  - Tried to create an interface on a device I could not edit, got an error.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19324
---
 src/__phutil_library_map__.php                |  10 +-
 .../AlmanacInterfaceEditController.php        | 151 ++----------------
 .../editor/AlmanacInterfaceEditEngine.php     | 139 ++++++++++++++++
 .../AlmanacInterfaceAddressTransaction.php    |   2 +-
 .../AlmanacInterfaceDeviceTransaction.php     |  18 ++-
 .../AlmanacInterfaceNetworkTransaction.php    |   2 +-
 .../AlmanacInterfacePortTransaction.php       |   4 +-
 7 files changed, 175 insertions(+), 151 deletions(-)
 create mode 100644 src/applications/almanac/editor/AlmanacInterfaceEditEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 08806ab1b9..b3def5acde 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -62,6 +62,7 @@
     'AlmanacInterfaceDeleteController' => 'applications/almanac/controller/AlmanacInterfaceDeleteController.php',
     'AlmanacInterfaceDeviceTransaction' => 'applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php',
     'AlmanacInterfaceEditController' => 'applications/almanac/controller/AlmanacInterfaceEditController.php',
+    'AlmanacInterfaceEditEngine' => 'applications/almanac/editor/AlmanacInterfaceEditEngine.php',
     'AlmanacInterfaceEditor' => 'applications/almanac/editor/AlmanacInterfaceEditor.php',
     'AlmanacInterfaceNetworkTransaction' => 'applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php',
     'AlmanacInterfacePHIDType' => 'applications/almanac/phid/AlmanacInterfacePHIDType.php',
@@ -5252,15 +5253,16 @@
       'PhabricatorExtendedPolicyInterface',
       'PhabricatorApplicationTransactionInterface',
     ),
-    'AlmanacInterfaceAddressTransaction' => 'AlmanacNetworkTransactionType',
+    'AlmanacInterfaceAddressTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceDatasource' => 'PhabricatorTypeaheadDatasource',
     'AlmanacInterfaceDeleteController' => 'AlmanacDeviceController',
-    'AlmanacInterfaceDeviceTransaction' => 'AlmanacNetworkTransactionType',
+    'AlmanacInterfaceDeviceTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceEditController' => 'AlmanacDeviceController',
+    'AlmanacInterfaceEditEngine' => 'PhabricatorEditEngine',
     'AlmanacInterfaceEditor' => 'PhabricatorApplicationTransactionEditor',
-    'AlmanacInterfaceNetworkTransaction' => 'AlmanacNetworkTransactionType',
+    'AlmanacInterfaceNetworkTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfacePHIDType' => 'PhabricatorPHIDType',
-    'AlmanacInterfacePortTransaction' => 'AlmanacNetworkTransactionType',
+    'AlmanacInterfacePortTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceQuery' => 'AlmanacQuery',
     'AlmanacInterfaceTableView' => 'AphrontView',
     'AlmanacInterfaceTransaction' => 'PhabricatorModularTransaction',
diff --git a/src/applications/almanac/controller/AlmanacInterfaceEditController.php b/src/applications/almanac/controller/AlmanacInterfaceEditController.php
index d223360003..017dad00ce 100644
--- a/src/applications/almanac/controller/AlmanacInterfaceEditController.php
+++ b/src/applications/almanac/controller/AlmanacInterfaceEditController.php
@@ -4,32 +4,16 @@ final class AlmanacInterfaceEditController
   extends AlmanacDeviceController {
 
   public function handleRequest(AphrontRequest $request) {
-    $viewer = $request->getViewer();
+    $viewer = $this->getViewer();
 
-    $id = $request->getURIData('id');
-    if ($id) {
-      $interface = id(new AlmanacInterfaceQuery())
-        ->setViewer($viewer)
-        ->withIDs(array($id))
-        ->requireCapabilities(
-          array(
-            PhabricatorPolicyCapability::CAN_VIEW,
-            PhabricatorPolicyCapability::CAN_EDIT,
-          ))
-        ->executeOne();
-      if (!$interface) {
-        return new Aphront404Response();
-      }
+    $engine = id(new AlmanacInterfaceEditEngine())
+      ->setController($this);
 
-      $device = $interface->getDevice();
-
-      $is_new = false;
-      $title = pht('Edit Interface');
-      $save_button = pht('Save Changes');
-    } else {
+    $id = $request->getURIData('id');
+    if (!$id) {
       $device = id(new AlmanacDeviceQuery())
         ->setViewer($viewer)
-        ->withIDs(array($request->getStr('deviceID')))
+        ->withIDs(array($request->getInt('deviceID')))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
@@ -40,127 +24,12 @@ public function handleRequest(AphrontRequest $request) {
         return new Aphront404Response();
       }
 
-      $interface = AlmanacInterface::initializeNewInterface();
-      $is_new = true;
-
-      $title = pht('Create Interface');
-      $save_button = pht('Create Interface');
+      $engine
+        ->addContextParameter('deviceID', $device->getID())
+        ->setDevice($device);
     }
 
-    $device_uri = $device->getURI();
-    $cancel_uri = $device_uri;
-
-    $v_network = $interface->getNetworkPHID();
-
-    $v_address = $interface->getAddress();
-    $e_address = true;
-
-    $v_port = $interface->getPort();
-
-    $validation_exception = null;
-
-    if ($request->isFormPost()) {
-      $v_network = $request->getStr('networkPHID');
-      $v_address = $request->getStr('address');
-      $v_port = $request->getStr('port');
-
-      $type_interface = AlmanacDeviceTransaction::TYPE_INTERFACE;
-
-      $address = AlmanacAddress::newFromParts($v_network, $v_address, $v_port);
-
-      $xaction = id(new AlmanacDeviceTransaction())
-        ->setTransactionType($type_interface)
-        ->setNewValue($address->toDictionary());
-
-      if ($interface->getID()) {
-        $xaction->setOldValue(array(
-          'id' => $interface->getID(),
-        ) + $interface->toAddress()->toDictionary());
-      } else {
-        $xaction->setOldValue(array());
-      }
-
-      $xactions = array();
-      $xactions[] = $xaction;
-
-      $editor = id(new AlmanacDeviceEditor())
-        ->setActor($viewer)
-        ->setContentSourceFromRequest($request)
-        ->setContinueOnNoEffect(true)
-        ->setContinueOnMissingFields(true);
-
-      try {
-        $editor->applyTransactions($device, $xactions);
-
-        $device_uri = $device->getURI();
-        return id(new AphrontRedirectResponse())->setURI($device_uri);
-      } catch (PhabricatorApplicationTransactionValidationException $ex) {
-        $validation_exception = $ex;
-        $e_address = $ex->getShortMessage($type_interface);
-      }
-    }
-
-    $networks = id(new AlmanacNetworkQuery())
-      ->setViewer($viewer)
-      ->execute();
-
-    $form = id(new AphrontFormView())
-      ->setUser($viewer)
-      ->appendChild(
-        id(new AphrontFormSelectControl())
-          ->setLabel(pht('Network'))
-          ->setName('networkPHID')
-          ->setValue($v_network)
-          ->setOptions(mpull($networks, 'getName', 'getPHID')))
-      ->appendChild(
-        id(new AphrontFormTextControl())
-          ->setLabel(pht('Address'))
-          ->setName('address')
-          ->setValue($v_address)
-          ->setError($e_address))
-      ->appendChild(
-        id(new AphrontFormTextControl())
-          ->setLabel(pht('Port'))
-          ->setName('port')
-          ->setValue($v_port)
-          ->setError($e_address))
-      ->appendChild(
-        id(new AphrontFormSubmitControl())
-          ->addCancelButton($cancel_uri)
-          ->setValue($save_button));
-
-    $box = id(new PHUIObjectBoxView())
-      ->setValidationException($validation_exception)
-      ->setHeaderText(pht('Interface'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setForm($form);
-
-    $crumbs = $this->buildApplicationCrumbs();
-    $crumbs->addTextCrumb($device->getName(), $device_uri);
-    if ($is_new) {
-      $crumbs->addTextCrumb(pht('Create Interface'));
-      $header = id(new PHUIHeaderView())
-        ->setHeader(pht('Create Interface'))
-        ->setHeaderIcon('fa-plus-square');
-    } else {
-      $crumbs->addTextCrumb(pht('Edit Interface'));
-      $header = id(new PHUIHeaderView())
-        ->setHeader(pht('Edit Interface'))
-        ->setHeaderIcon('fa-pencil');
-    }
-    $crumbs->setBorder(true);
-
-    $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
-      ->setFooter(array(
-        $box,
-      ));
-
-    return $this->newPage()
-      ->setTitle($title)
-      ->setCrumbs($crumbs)
-      ->appendChild($view);
-
+    return $engine->buildResponse();
   }
 
 }
diff --git a/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php b/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php
new file mode 100644
index 0000000000..c7e7992743
--- /dev/null
+++ b/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php
@@ -0,0 +1,139 @@
+<?php
+
+final class AlmanacInterfaceEditEngine
+  extends PhabricatorEditEngine {
+
+  const ENGINECONST = 'almanac.interface';
+
+  private $device;
+
+  public function setDevice(AlmanacDevice $device) {
+    $this->device = $device;
+    return $this;
+  }
+
+  public function getDevice() {
+    if (!$this->device) {
+      throw new PhutilInvalidStateException('setDevice');
+    }
+    return $this->device;
+  }
+
+  public function isEngineConfigurable() {
+    return false;
+  }
+
+  public function getEngineName() {
+    return pht('Almanac Interfaces');
+  }
+
+  public function getSummaryHeader() {
+    return pht('Edit Almanac Interface Configurations');
+  }
+
+  public function getSummaryText() {
+    return pht('This engine is used to edit Almanac interfaces.');
+  }
+
+  public function getEngineApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
+  protected function newEditableObject() {
+    $interface = AlmanacInterface::initializeNewInterface();
+
+    $device = $this->getDevice();
+    $interface
+      ->setDevicePHID($device->getPHID())
+      ->attachDevice($device);
+
+    return $interface;
+  }
+
+  protected function newObjectQuery() {
+    return new AlmanacInterfaceQuery();
+  }
+
+  protected function getObjectCreateTitleText($object) {
+    return pht('Create Interface');
+  }
+
+  protected function getObjectCreateButtonText($object) {
+    return pht('Create Interface');
+  }
+
+  protected function getObjectEditTitleText($object) {
+    return pht('Edit Interface');
+  }
+
+  protected function getObjectEditShortText($object) {
+    return pht('Edit Interface');
+  }
+
+  protected function getObjectCreateShortText() {
+    return pht('Create Interface');
+  }
+
+  protected function getObjectName() {
+    return pht('Interface');
+  }
+
+  protected function getEditorURI() {
+    return '/almanac/interface/edit/';
+  }
+
+  protected function getObjectCreateCancelURI($object) {
+    return '/almanac/interface/';
+  }
+
+  protected function getObjectViewURI($object) {
+    return $object->getDevice()->getURI();
+  }
+
+  protected function buildCustomEditFields($object) {
+    $viewer = $this->getViewer();
+
+    // TODO: Some day, this should be a datasource.
+    $networks = id(new AlmanacNetworkQuery())
+      ->setViewer($viewer)
+      ->execute();
+    $network_map = mpull($networks, 'getName', 'getPHID');
+
+    return array(
+      id(new PhabricatorTextEditField())
+        ->setKey('device')
+        ->setLabel(pht('Device'))
+        ->setIsConduitOnly(true)
+        ->setTransactionType(
+          AlmanacInterfaceDeviceTransaction::TRANSACTIONTYPE)
+        ->setDescription(pht('When creating an interface, set the device.'))
+        ->setConduitDescription(pht('Set the device.'))
+        ->setConduitTypeDescription(pht('Device PHID.'))
+        ->setValue($object->getDevicePHID()),
+      id(new PhabricatorSelectEditField())
+        ->setKey('network')
+        ->setLabel(pht('Network'))
+        ->setDescription(pht('Network for the interface.'))
+        ->setTransactionType(
+          AlmanacInterfaceNetworkTransaction::TRANSACTIONTYPE)
+        ->setValue($object->getNetworkPHID())
+        ->setOptions($network_map),
+      id(new PhabricatorTextEditField())
+        ->setKey('address')
+        ->setLabel(pht('Address'))
+        ->setDescription(pht('Address of the service.'))
+        ->setTransactionType(
+          AlmanacInterfaceAddressTransaction::TRANSACTIONTYPE)
+        ->setIsRequired(true)
+        ->setValue($object->getAddress()),
+      id(new PhabricatorTextEditField())
+        ->setKey('port')
+        ->setLabel(pht('Port'))
+        ->setDescription(pht('Port of the service.'))
+        ->setTransactionType(AlmanacInterfacePortTransaction::TRANSACTIONTYPE)
+        ->setIsRequired(true)
+        ->setValue($object->getPort()),
+    );
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php b/src/applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php
index 47eab92c16..7eb8e0a567 100644
--- a/src/applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php
+++ b/src/applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class AlmanacInterfaceAddressTransaction
-  extends AlmanacNetworkTransactionType {
+  extends AlmanacInterfaceTransactionType {
 
   const TRANSACTIONTYPE = 'almanac:interface:address';
 
diff --git a/src/applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php b/src/applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php
index 3c4bf6045b..ed2c7b77de 100644
--- a/src/applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php
+++ b/src/applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class AlmanacInterfaceDeviceTransaction
-  extends AlmanacNetworkTransactionType {
+  extends AlmanacInterfaceTransactionType {
 
   const TRANSACTIONTYPE = 'almanac:interface:device';
 
@@ -24,7 +24,8 @@ public function getTitle() {
   public function validateTransactions($object, array $xactions) {
     $errors = array();
 
-    if ($this->isEmptyTextTransaction($object->getAddress(), $xactions)) {
+    $device_phid = $object->getDevicePHID();
+    if ($this->isEmptyTextTransaction($device_phid, $xactions)) {
       $errors[] = $this->newRequiredError(
         pht('Interfaces must have a device.'));
     }
@@ -52,6 +53,19 @@ public function validateTransactions($object, array $xactions) {
           $xaction);
         continue;
       }
+
+      $device = head($devices);
+      $can_edit = PhabricatorPolicyFilter::hasCapability(
+        $this->getActor(),
+        $device,
+        PhabricatorPolicyCapability::CAN_EDIT);
+      if (!$can_edit) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You can not attach an interface to a device which you do not '.
+            'have permission to edit.'));
+        continue;
+      }
     }
 
     return $errors;
diff --git a/src/applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php b/src/applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php
index 50353d904d..def85c08e2 100644
--- a/src/applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php
+++ b/src/applications/almanac/xaction/AlmanacInterfaceNetworkTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class AlmanacInterfaceNetworkTransaction
-  extends AlmanacNetworkTransactionType {
+  extends AlmanacInterfaceTransactionType {
 
   const TRANSACTIONTYPE = 'almanac:interface:network';
 
diff --git a/src/applications/almanac/xaction/AlmanacInterfacePortTransaction.php b/src/applications/almanac/xaction/AlmanacInterfacePortTransaction.php
index c6a60dee61..5e8e11b805 100644
--- a/src/applications/almanac/xaction/AlmanacInterfacePortTransaction.php
+++ b/src/applications/almanac/xaction/AlmanacInterfacePortTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class AlmanacInterfacePortTransaction
-  extends AlmanacNetworkTransactionType {
+  extends AlmanacInterfaceTransactionType {
 
   const TRANSACTIONTYPE = 'almanac:interface:port';
 
@@ -30,7 +30,7 @@ public function getTitle() {
   public function validateTransactions($object, array $xactions) {
     $errors = array();
 
-    if ($this->isEmptyTextTransaction($object->getName(), $xactions)) {
+    if ($this->isEmptyTextTransaction($object->getPort(), $xactions)) {
       $errors[] = $this->newRequiredError(
         pht('Interfaces must have a port number.'));
     }

From d240969e4705533cd1d2f20608e495ad6fa672d3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 06:22:39 -0700
Subject: [PATCH 808/865] Use Interface transactions, not Device transactions,
 to destroy Interfaces

Summary:
Depends on D19324. Ref T13120. Ref T12414.

This moves "Destroy Interface" to use Interface transactions instead of Device transactions, so we can ultimately get rid of the complex and difficult-to-modernize `AlmanacDeviceTransaction::TYPE_INTERFACE`.

This transaction is a bit weird since it makes the interface delete itself, but this should work OK for now. At some point in the future I'd probably want to change this into more of a "disable" action, but I don't think we face any immediate peril by retaining this behavior for now.

Test Plan:
  - Destroyed interfaces on devices using the web UI, saw them vanish.
  - Ran daemons, nothing fataled/exploded even though the transaction is weird and destroys the object it affects.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19325
---
 src/__phutil_library_map__.php                |  2 ++
 .../AlmanacInterfaceDeleteController.php      | 17 ++++------
 .../AlmanacInterfaceDestroyTransaction.php    | 32 +++++++++++++++++++
 3 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 src/applications/almanac/xaction/AlmanacInterfaceDestroyTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b3def5acde..955405f30c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -60,6 +60,7 @@
     'AlmanacInterfaceAddressTransaction' => 'applications/almanac/xaction/AlmanacInterfaceAddressTransaction.php',
     'AlmanacInterfaceDatasource' => 'applications/almanac/typeahead/AlmanacInterfaceDatasource.php',
     'AlmanacInterfaceDeleteController' => 'applications/almanac/controller/AlmanacInterfaceDeleteController.php',
+    'AlmanacInterfaceDestroyTransaction' => 'applications/almanac/xaction/AlmanacInterfaceDestroyTransaction.php',
     'AlmanacInterfaceDeviceTransaction' => 'applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php',
     'AlmanacInterfaceEditController' => 'applications/almanac/controller/AlmanacInterfaceEditController.php',
     'AlmanacInterfaceEditEngine' => 'applications/almanac/editor/AlmanacInterfaceEditEngine.php',
@@ -5256,6 +5257,7 @@
     'AlmanacInterfaceAddressTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceDatasource' => 'PhabricatorTypeaheadDatasource',
     'AlmanacInterfaceDeleteController' => 'AlmanacDeviceController',
+    'AlmanacInterfaceDestroyTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceDeviceTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceEditController' => 'AlmanacDeviceController',
     'AlmanacInterfaceEditEngine' => 'PhabricatorEditEngine',
diff --git a/src/applications/almanac/controller/AlmanacInterfaceDeleteController.php b/src/applications/almanac/controller/AlmanacInterfaceDeleteController.php
index ddbe979af6..4d40031b93 100644
--- a/src/applications/almanac/controller/AlmanacInterfaceDeleteController.php
+++ b/src/applications/almanac/controller/AlmanacInterfaceDeleteController.php
@@ -34,26 +34,21 @@ public function handleRequest(AphrontRequest $request) {
     }
 
     if ($request->isFormPost()) {
-      $type_interface = AlmanacDeviceTransaction::TYPE_INTERFACE;
+      $type_destroy = AlmanacInterfaceDestroyTransaction::TRANSACTIONTYPE;
 
       $xactions = array();
 
-      $v_old = array(
-        'id' => $interface->getID(),
-      ) + $interface->toAddress()->toDictionary();
+      $xactions[] = $interface->getApplicationTransactionTemplate()
+        ->setTransactionType($type_destroy)
+        ->setNewValue(true);
 
-      $xactions[] = id(new AlmanacDeviceTransaction())
-        ->setTransactionType($type_interface)
-        ->setOldValue($v_old)
-        ->setNewValue(null);
-
-      $editor = id(new AlmanacDeviceEditor())
+      $editor = id(new AlmanacInterfaceEditor())
         ->setActor($viewer)
         ->setContentSourceFromRequest($request)
         ->setContinueOnNoEffect(true)
         ->setContinueOnMissingFields(true);
 
-      $editor->applyTransactions($device, $xactions);
+      $editor->applyTransactions($interface, $xactions);
 
       return id(new AphrontRedirectResponse())->setURI($device_uri);
     }
diff --git a/src/applications/almanac/xaction/AlmanacInterfaceDestroyTransaction.php b/src/applications/almanac/xaction/AlmanacInterfaceDestroyTransaction.php
new file mode 100644
index 0000000000..5e829ff311
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacInterfaceDestroyTransaction.php
@@ -0,0 +1,32 @@
+<?php
+
+final class AlmanacInterfaceDestroyTransaction
+  extends AlmanacInterfaceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:interface:destroy';
+
+  public function generateOldValue($object) {
+    return false;
+  }
+
+  public function applyExternalEffects($object, $value) {
+    id(new PhabricatorDestructionEngine())
+      ->destroyObject($object);
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($xactions) {
+      if ($object->loadIsInUse()) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You can not delete this interface because it is currently in '.
+            'use. One or more services are bound to it.'));
+      }
+    }
+
+    return $errors;
+  }
+
+}

From 4e156a0385093662aa69457b0befac50d7ea7262 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 08:23:52 -0700
Subject: [PATCH 809/865] Remove TYPE_INTERFACE transaction from Almanac Device

Summary:
Depends on D19325. Ref T13120. Ref T12414.

This no longer has any callers in the upstream or in Phacility support libraries, so get rid of it.

This will make modularizing Device transactions significantly easier, since the other transactions are reasonable, normal sorts of transactions.

For existing devices, this leaves some "author edited this object." transactions in the log. I might just leave those since they aren't really hurting anything, or maybe I'll clean them up or hide them later once I have more confidence that these changes are stable.

Test Plan: Grepped for `TYPE_INTERFACE` and `AlmanacDeviceTransaction`, found no callsites.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19328
---
 .../almanac/editor/AlmanacDeviceEditor.php    | 183 +-----------------
 .../storage/AlmanacDeviceTransaction.php      |  55 ------
 2 files changed, 1 insertion(+), 237 deletions(-)

diff --git a/src/applications/almanac/editor/AlmanacDeviceEditor.php b/src/applications/almanac/editor/AlmanacDeviceEditor.php
index 8e110954a3..5a4246231e 100644
--- a/src/applications/almanac/editor/AlmanacDeviceEditor.php
+++ b/src/applications/almanac/editor/AlmanacDeviceEditor.php
@@ -11,7 +11,7 @@ public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = AlmanacDeviceTransaction::TYPE_NAME;
-    $types[] = AlmanacDeviceTransaction::TYPE_INTERFACE;
+
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
@@ -35,7 +35,6 @@ protected function getCustomTransactionNewValue(
 
     switch ($xaction->getTransactionType()) {
       case AlmanacDeviceTransaction::TYPE_NAME:
-      case AlmanacDeviceTransaction::TYPE_INTERFACE:
         return $xaction->getNewValue();
     }
 
@@ -50,8 +49,6 @@ protected function applyCustomInternalTransaction(
       case AlmanacDeviceTransaction::TYPE_NAME:
         $object->setName($xaction->getNewValue());
         return;
-      case AlmanacDeviceTransaction::TYPE_INTERFACE:
-        return;
     }
 
     return parent::applyCustomInternalTransaction($object, $xaction);
@@ -64,37 +61,6 @@ protected function applyCustomExternalTransaction(
     switch ($xaction->getTransactionType()) {
       case AlmanacDeviceTransaction::TYPE_NAME:
         return;
-      case AlmanacDeviceTransaction::TYPE_INTERFACE:
-        $old = $xaction->getOldValue();
-        if ($old) {
-          $interface = id(new AlmanacInterfaceQuery())
-            ->setViewer($this->requireActor())
-            ->withIDs(array($old['id']))
-            ->executeOne();
-          if (!$interface) {
-            throw new Exception(pht('Unable to load interface!'));
-          }
-        } else {
-          $interface = AlmanacInterface::initializeNewInterface()
-            ->setDevicePHID($object->getPHID());
-        }
-
-        $new = $xaction->getNewValue();
-        if ($new) {
-          $interface
-            ->setNetworkPHID($new['networkPHID'])
-            ->setAddress($new['address'])
-            ->setPort((int)$new['port']);
-
-          if (idx($new, 'phid')) {
-            $interface->setPHID($new['phid']);
-          }
-
-          $interface->save();
-        } else {
-          $interface->delete();
-        }
-        return;
     }
 
     return parent::applyCustomExternalTransaction($object, $xaction);
@@ -180,153 +146,6 @@ protected function validateTransaction(
         }
 
         break;
-      case AlmanacDeviceTransaction::TYPE_INTERFACE:
-        // We want to make sure that all the affected networks are visible to
-        // the actor, any edited interfaces exist, and that the actual address
-        // components are valid.
-
-        $network_phids = array();
-        foreach ($xactions as $xaction) {
-          $old = $xaction->getOldValue();
-          $new = $xaction->getNewValue();
-          if ($old) {
-            $network_phids[] = $old['networkPHID'];
-          }
-          if ($new) {
-            $network_phids[] = $new['networkPHID'];
-
-            $address = $new['address'];
-            if (!strlen($address)) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                pht('Interfaces must have an address.'),
-                $xaction);
-              $errors[] = $error;
-            } else {
-              // TODO: Validate addresses, but IPv6 addresses are not trivial
-              // to validate.
-            }
-
-            $port = $new['port'];
-            if (!strlen($port)) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                pht('Interfaces must have a port.'),
-                $xaction);
-              $errors[] = $error;
-            } else if ((int)$port < 1 || (int)$port > 65535) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                pht(
-                  'Port numbers must be between 1 and 65535, inclusive.'),
-                $xaction);
-              $errors[] = $error;
-            }
-
-            $phid = idx($new, 'phid');
-            if ($phid) {
-              $interface_phid_type = AlmanacInterfacePHIDType::TYPECONST;
-              if (phid_get_type($phid) !== $interface_phid_type) {
-                $error = new PhabricatorApplicationTransactionValidationError(
-                  $type,
-                  pht('Invalid'),
-                  pht(
-                    'Precomputed interface PHIDs must be of type '.
-                    'AlmanacInterfacePHIDType.'),
-                  $xaction);
-                $errors[] = $error;
-              }
-            }
-          }
-        }
-
-        if ($network_phids) {
-          $networks = id(new AlmanacNetworkQuery())
-            ->setViewer($this->requireActor())
-            ->withPHIDs($network_phids)
-            ->execute();
-          $networks = mpull($networks, null, 'getPHID');
-        } else {
-          $networks = array();
-        }
-
-        $addresses = array();
-        foreach ($xactions as $xaction) {
-          $old = $xaction->getOldValue();
-          if ($old) {
-            $network = idx($networks, $old['networkPHID']);
-            if (!$network) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                pht(
-                  'You can not edit an interface which belongs to a '.
-                  'nonexistent or restricted network.'),
-                $xaction);
-              $errors[] = $error;
-            }
-
-            $addresses[] = $old['id'];
-          }
-
-          $new = $xaction->getNewValue();
-          if ($new) {
-            $network = idx($networks, $new['networkPHID']);
-            if (!$network) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                pht(
-                  'You can not add an interface on a nonexistent or '.
-                  'restricted network.'),
-                $xaction);
-              $errors[] = $error;
-            }
-          }
-        }
-
-        if ($addresses) {
-          $interfaces = id(new AlmanacInterfaceQuery())
-            ->setViewer($this->requireActor())
-            ->withDevicePHIDs(array($object->getPHID()))
-            ->withIDs($addresses)
-            ->execute();
-          $interfaces = mpull($interfaces, null, 'getID');
-        } else {
-          $interfaces = array();
-        }
-
-        foreach ($xactions as $xaction) {
-          $old = $xaction->getOldValue();
-          if ($old) {
-            $interface = idx($interfaces, $old['id']);
-            if (!$interface) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                pht('You can not edit an invalid or restricted interface.'),
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-
-            $new = $xaction->getNewValue();
-            if (!$new) {
-              if ($interface->loadIsInUse()) {
-                $error = new PhabricatorApplicationTransactionValidationError(
-                  $type,
-                  pht('In Use'),
-                  pht('You can not delete an interface which is still in use.'),
-                  $xaction);
-                $errors[] = $error;
-              }
-            }
-          }
-        }
-      break;
     }
 
     return $errors;
diff --git a/src/applications/almanac/storage/AlmanacDeviceTransaction.php b/src/applications/almanac/storage/AlmanacDeviceTransaction.php
index fd1a21f782..b70ffbe008 100644
--- a/src/applications/almanac/storage/AlmanacDeviceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacDeviceTransaction.php
@@ -4,7 +4,6 @@ final class AlmanacDeviceTransaction
   extends AlmanacTransaction {
 
   const TYPE_NAME = 'almanac:device:name';
-  const TYPE_INTERFACE = 'almanac:device:interface';
 
   public function getApplicationName() {
     return 'almanac';
@@ -18,26 +17,6 @@ public function getApplicationTransactionCommentObject() {
     return null;
   }
 
-  public function getRequiredHandlePHIDs() {
-    $phids = parent::getRequiredHandlePHIDs();
-
-    $old = $this->getOldValue();
-    $new = $this->getNewValue();
-
-    switch ($this->getTransactionType()) {
-      case self::TYPE_INTERFACE:
-        if ($old) {
-          $phids[] = $old['networkPHID'];
-        }
-        if ($new) {
-          $phids[] = $new['networkPHID'];
-        }
-        break;
-    }
-
-    return $phids;
-  }
-
   public function getTitle() {
     $author_phid = $this->getAuthorPHID();
 
@@ -58,43 +37,9 @@ public function getTitle() {
             $new);
         }
         break;
-      case self::TYPE_INTERFACE:
-        if ($old && $new) {
-          return pht(
-            '%s changed interface %s on this device to %s.',
-            $this->renderHandleLink($author_phid),
-            $this->describeInterface($old),
-            $this->describeInterface($new));
-        } else if ($old) {
-          return pht(
-            '%s removed the interface %s from this device.',
-            $this->renderHandleLink($author_phid),
-            $this->describeInterface($old));
-        } else if ($new) {
-          return pht(
-            '%s added the interface %s to this device.',
-            $this->renderHandleLink($author_phid),
-            $this->describeInterface($new));
-        }
     }
 
     return parent::getTitle();
   }
 
-  public function shouldGenerateOldValue() {
-    switch ($this->getTransactionType()) {
-      case self::TYPE_INTERFACE:
-        return false;
-    }
-    return parent::shouldGenerateOldValue();
-  }
-
-  private function describeInterface(array $info) {
-    return pht(
-      '%s:%s (%s)',
-      $info['address'],
-      $info['port'],
-      $this->renderHandleLink($info['networkPHID']));
-  }
-
 }

From 71c77fcc3a153801fa6ec464e4038e2a54d6bfeb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 08:39:10 -0700
Subject: [PATCH 810/865] Modularize transactions for Almanac Device

Summary:
Depends on D19328. Ref T13120. Ref T12414.

Prior work has left us with just a NAME transaction here, which is straightforward to modularize.

Test Plan:
  - Created and renamed devices.
  - Tried to set no name, a bad name, a duplicate name (got errors).
  - Tried to create/rename into a namespace I could not edit (got an error).
  - Grepped for `AlmanacDeviceTransaction::`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19329
---
 src/__phutil_library_map__.php                |   6 +-
 .../editor/AlmanacDeviceEditEngine.php        |   2 +-
 .../almanac/editor/AlmanacDeviceEditor.php    | 135 ------------------
 .../storage/AlmanacDeviceTransaction.php      |  29 +---
 .../xaction/AlmanacDeviceNameTransaction.php  |  79 ++++++++++
 .../xaction/AlmanacDeviceTransactionType.php  |   4 +
 6 files changed, 92 insertions(+), 163 deletions(-)
 create mode 100644 src/applications/almanac/xaction/AlmanacDeviceNameTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacDeviceTransactionType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 955405f30c..6900238d6f 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -46,6 +46,7 @@
     'AlmanacDeviceEditor' => 'applications/almanac/editor/AlmanacDeviceEditor.php',
     'AlmanacDeviceListController' => 'applications/almanac/controller/AlmanacDeviceListController.php',
     'AlmanacDeviceNameNgrams' => 'applications/almanac/storage/AlmanacDeviceNameNgrams.php',
+    'AlmanacDeviceNameTransaction' => 'applications/almanac/xaction/AlmanacDeviceNameTransaction.php',
     'AlmanacDevicePHIDType' => 'applications/almanac/phid/AlmanacDevicePHIDType.php',
     'AlmanacDevicePropertyEditEngine' => 'applications/almanac/editor/AlmanacDevicePropertyEditEngine.php',
     'AlmanacDeviceQuery' => 'applications/almanac/query/AlmanacDeviceQuery.php',
@@ -53,6 +54,7 @@
     'AlmanacDeviceSearchEngine' => 'applications/almanac/query/AlmanacDeviceSearchEngine.php',
     'AlmanacDeviceTransaction' => 'applications/almanac/storage/AlmanacDeviceTransaction.php',
     'AlmanacDeviceTransactionQuery' => 'applications/almanac/query/AlmanacDeviceTransactionQuery.php',
+    'AlmanacDeviceTransactionType' => 'applications/almanac/xaction/AlmanacDeviceTransactionType.php',
     'AlmanacDeviceViewController' => 'applications/almanac/controller/AlmanacDeviceViewController.php',
     'AlmanacDrydockPoolServiceType' => 'applications/almanac/servicetype/AlmanacDrydockPoolServiceType.php',
     'AlmanacEditor' => 'applications/almanac/editor/AlmanacEditor.php',
@@ -5237,13 +5239,15 @@
     'AlmanacDeviceEditor' => 'AlmanacEditor',
     'AlmanacDeviceListController' => 'AlmanacDeviceController',
     'AlmanacDeviceNameNgrams' => 'PhabricatorSearchNgrams',
+    'AlmanacDeviceNameTransaction' => 'AlmanacDeviceTransactionType',
     'AlmanacDevicePHIDType' => 'PhabricatorPHIDType',
     'AlmanacDevicePropertyEditEngine' => 'AlmanacPropertyEditEngine',
     'AlmanacDeviceQuery' => 'AlmanacQuery',
     'AlmanacDeviceSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'AlmanacDeviceSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'AlmanacDeviceTransaction' => 'AlmanacTransaction',
+    'AlmanacDeviceTransaction' => 'PhabricatorModularTransaction',
     'AlmanacDeviceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
+    'AlmanacDeviceTransactionType' => 'AlmanacTransactionType',
     'AlmanacDeviceViewController' => 'AlmanacDeviceController',
     'AlmanacDrydockPoolServiceType' => 'AlmanacServiceType',
     'AlmanacEditor' => 'PhabricatorApplicationTransactionEditor',
diff --git a/src/applications/almanac/editor/AlmanacDeviceEditEngine.php b/src/applications/almanac/editor/AlmanacDeviceEditEngine.php
index 1d325e403b..84ca59d310 100644
--- a/src/applications/almanac/editor/AlmanacDeviceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacDeviceEditEngine.php
@@ -80,7 +80,7 @@ protected function buildCustomEditFields($object) {
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setDescription(pht('Name of the device.'))
-        ->setTransactionType(AlmanacDeviceTransaction::TYPE_NAME)
+        ->setTransactionType(AlmanacDeviceNameTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getName()),
     );
diff --git a/src/applications/almanac/editor/AlmanacDeviceEditor.php b/src/applications/almanac/editor/AlmanacDeviceEditor.php
index 5a4246231e..ea04bffc07 100644
--- a/src/applications/almanac/editor/AlmanacDeviceEditor.php
+++ b/src/applications/almanac/editor/AlmanacDeviceEditor.php
@@ -10,145 +10,10 @@ public function getEditorObjectsDescription() {
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
-    $types[] = AlmanacDeviceTransaction::TYPE_NAME;
-
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
     return $types;
   }
 
-  protected function getCustomTransactionOldValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-    switch ($xaction->getTransactionType()) {
-      case AlmanacDeviceTransaction::TYPE_NAME:
-        return $object->getName();
-    }
-
-    return parent::getCustomTransactionOldValue($object, $xaction);
-  }
-
-  protected function getCustomTransactionNewValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacDeviceTransaction::TYPE_NAME:
-        return $xaction->getNewValue();
-    }
-
-    return parent::getCustomTransactionNewValue($object, $xaction);
-  }
-
-  protected function applyCustomInternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacDeviceTransaction::TYPE_NAME:
-        $object->setName($xaction->getNewValue());
-        return;
-    }
-
-    return parent::applyCustomInternalTransaction($object, $xaction);
-  }
-
-  protected function applyCustomExternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacDeviceTransaction::TYPE_NAME:
-        return;
-    }
-
-    return parent::applyCustomExternalTransaction($object, $xaction);
-  }
-
-  protected function validateTransaction(
-    PhabricatorLiskDAO $object,
-    $type,
-    array $xactions) {
-
-    $errors = parent::validateTransaction($object, $type, $xactions);
-
-    switch ($type) {
-      case AlmanacDeviceTransaction::TYPE_NAME:
-        $missing = $this->validateIsEmptyTextField(
-          $object->getName(),
-          $xactions);
-
-        if ($missing) {
-          $error = new PhabricatorApplicationTransactionValidationError(
-            $type,
-            pht('Required'),
-            pht('Device name is required.'),
-            nonempty(last($xactions), null));
-
-          $error->setIsMissingFieldError(true);
-          $errors[] = $error;
-        } else {
-          foreach ($xactions as $xaction) {
-            $message = null;
-            $name = $xaction->getNewValue();
-
-            try {
-              AlmanacNames::validateName($name);
-            } catch (Exception $ex) {
-              $message = $ex->getMessage();
-            }
-
-            if ($message !== null) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Invalid'),
-                $message,
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-
-            $other = id(new AlmanacDeviceQuery())
-              ->setViewer(PhabricatorUser::getOmnipotentUser())
-              ->withNames(array($name))
-              ->executeOne();
-            if ($other && ($other->getID() != $object->getID())) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Not Unique'),
-                pht('Almanac devices must have unique names.'),
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-
-            if ($name === $object->getName()) {
-              continue;
-            }
-
-            $namespace = AlmanacNamespace::loadRestrictedNamespace(
-              $this->getActor(),
-              $name);
-            if ($namespace) {
-              $error = new PhabricatorApplicationTransactionValidationError(
-                $type,
-                pht('Restricted'),
-                pht(
-                  'You do not have permission to create Almanac devices '.
-                  'within the "%s" namespace.',
-                  $namespace->getName()),
-                $xaction);
-              $errors[] = $error;
-              continue;
-            }
-          }
-        }
-
-        break;
-    }
-
-    return $errors;
-  }
-
 }
diff --git a/src/applications/almanac/storage/AlmanacDeviceTransaction.php b/src/applications/almanac/storage/AlmanacDeviceTransaction.php
index b70ffbe008..e74def1a9b 100644
--- a/src/applications/almanac/storage/AlmanacDeviceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacDeviceTransaction.php
@@ -1,9 +1,7 @@
 <?php
 
 final class AlmanacDeviceTransaction
-  extends AlmanacTransaction {
-
-  const TYPE_NAME = 'almanac:device:name';
+  extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'almanac';
@@ -17,29 +15,8 @@ public function getApplicationTransactionCommentObject() {
     return null;
   }
 
-  public function getTitle() {
-    $author_phid = $this->getAuthorPHID();
-
-    $old = $this->getOldValue();
-    $new = $this->getNewValue();
-
-    switch ($this->getTransactionType()) {
-      case self::TYPE_NAME:
-        if ($old === null) {
-          return pht(
-            '%s created this device.',
-            $this->renderHandleLink($author_phid));
-        } else {
-          return pht(
-            '%s renamed this device from "%s" to "%s".',
-            $this->renderHandleLink($author_phid),
-            $old,
-            $new);
-        }
-        break;
-    }
-
-    return parent::getTitle();
+  public function getBaseTransactionClass() {
+    return 'AlmanacDeviceTransactionType';
   }
 
 }
diff --git a/src/applications/almanac/xaction/AlmanacDeviceNameTransaction.php b/src/applications/almanac/xaction/AlmanacDeviceNameTransaction.php
new file mode 100644
index 0000000000..d72b380472
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacDeviceNameTransaction.php
@@ -0,0 +1,79 @@
+<?php
+
+final class AlmanacDeviceNameTransaction
+  extends AlmanacDeviceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:device:name';
+
+  public function generateOldValue($object) {
+    return $object->getName();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setName($value);
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s renamed this device from %s to %s.',
+      $this->renderAuthor(),
+      $this->renderOldValue(),
+      $this->renderNewValue());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    if ($this->isEmptyTextTransaction($object->getName(), $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Device name is required.'));
+    }
+
+    foreach ($xactions as $xaction) {
+      $name = $xaction->getNewValue();
+
+      $message = null;
+      try {
+        AlmanacNames::validateName($name);
+      } catch (Exception $ex) {
+        $message = $ex->getMessage();
+      }
+
+      if ($message !== null) {
+        $errors[] = $this->newInvalidError($message, $xaction);
+        continue;
+      }
+
+      if ($name === $object->getName()) {
+        continue;
+      }
+
+      $other = id(new AlmanacDeviceQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withNames(array($name))
+        ->executeOne();
+      if ($other && ($other->getID() != $object->getID())) {
+        $errors[] = $this->newInvalidError(
+          pht('Almanac devices must have unique names.'),
+          $xaction);
+        continue;
+      }
+
+      $namespace = AlmanacNamespace::loadRestrictedNamespace(
+        $this->getActor(),
+        $name);
+      if ($namespace) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You do not have permission to create Almanac devices '.
+            'within the "%s" namespace.',
+            $namespace->getName()),
+          $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacDeviceTransactionType.php b/src/applications/almanac/xaction/AlmanacDeviceTransactionType.php
new file mode 100644
index 0000000000..cf3b239ab2
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacDeviceTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class AlmanacDeviceTransactionType
+  extends AlmanacTransactionType {}

From 4bce3fc8e6880932411a97f7a7b386f658073ead Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 10:37:47 -0700
Subject: [PATCH 811/865] Modularize Almanac property transactions

Summary:
Depends on D19329. Ref T13120. Ref T12414. Recent changes have mostly modularized Almanac transactions, but the "property" transactions remained written in an older style with the logic on the Editor/Transaction classes.

This moves them to modern modular transactions. These end up being a little bit copy-pastey, but it doesn't feel too terribly bad.

Test Plan: Created, edited, and deleted properties on services, devices and bindings. Grepped for removed constants.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19334
---
 src/__phutil_library_map__.php                |  34 ++--
 .../AlmanacPropertyDeleteController.php       |   4 +-
 .../almanac/editor/AlmanacBindingEditor.php   |   4 +
 .../almanac/editor/AlmanacDeviceEditor.php    |  12 ++
 .../almanac/editor/AlmanacEditor.php          | 146 ------------------
 .../almanac/editor/AlmanacInterfaceEditor.php |   6 +-
 .../almanac/editor/AlmanacNamespaceEditor.php |   6 +-
 .../almanac/editor/AlmanacNetworkEditor.php   |  14 +-
 .../editor/AlmanacPropertyEditEngine.php      |   2 +-
 .../property/AlmanacPropertyInterface.php     |   2 +
 .../almanac/storage/AlmanacBinding.php        |   8 +
 .../storage/AlmanacBindingTransaction.php     |  10 +-
 .../almanac/storage/AlmanacDevice.php         |   8 +
 .../storage/AlmanacDeviceTransaction.php      |  10 +-
 .../storage/AlmanacInterfaceTransaction.php   |  10 +-
 .../storage/AlmanacModularTransaction.php     |  14 ++
 .../almanac/storage/AlmanacNamespace.php      |   8 +
 .../storage/AlmanacNamespaceTransaction.php   |  10 +-
 .../storage/AlmanacNetworkTransaction.php     |  10 +-
 .../almanac/storage/AlmanacProperty.php       |   4 +-
 .../almanac/storage/AlmanacService.php        |   8 +
 .../storage/AlmanacServiceTransaction.php     |  10 +-
 .../almanac/storage/AlmanacTransaction.php    |  38 -----
 ...lmanacBindingDeletePropertyTransaction.php |  20 +++
 .../AlmanacBindingSetPropertyTransaction.php  |  24 +++
 ...AlmanacDeviceDeletePropertyTransaction.php |  20 +++
 .../AlmanacDeviceSetPropertyTransaction.php   |  24 +++
 ...lmanacServiceDeletePropertyTransaction.php |  20 +++
 .../AlmanacServiceSetPropertyTransaction.php  |  24 +++
 .../xaction/AlmanacTransactionType.php        |  95 +++++++++++-
 30 files changed, 332 insertions(+), 273 deletions(-)
 create mode 100644 src/applications/almanac/storage/AlmanacModularTransaction.php
 delete mode 100644 src/applications/almanac/storage/AlmanacTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacBindingDeletePropertyTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacBindingSetPropertyTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacDeviceDeletePropertyTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacDeviceSetPropertyTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacServiceDeletePropertyTransaction.php
 create mode 100644 src/applications/almanac/xaction/AlmanacServiceSetPropertyTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 6900238d6f..118196a5d7 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -12,6 +12,7 @@
     'AlamancServiceEditConduitAPIMethod' => 'applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php',
     'AlmanacAddress' => 'applications/almanac/util/AlmanacAddress.php',
     'AlmanacBinding' => 'applications/almanac/storage/AlmanacBinding.php',
+    'AlmanacBindingDeletePropertyTransaction' => 'applications/almanac/xaction/AlmanacBindingDeletePropertyTransaction.php',
     'AlmanacBindingDisableController' => 'applications/almanac/controller/AlmanacBindingDisableController.php',
     'AlmanacBindingDisableTransaction' => 'applications/almanac/xaction/AlmanacBindingDisableTransaction.php',
     'AlmanacBindingEditController' => 'applications/almanac/controller/AlmanacBindingEditController.php',
@@ -20,6 +21,7 @@
     'AlmanacBindingPHIDType' => 'applications/almanac/phid/AlmanacBindingPHIDType.php',
     'AlmanacBindingPropertyEditEngine' => 'applications/almanac/editor/AlmanacBindingPropertyEditEngine.php',
     'AlmanacBindingQuery' => 'applications/almanac/query/AlmanacBindingQuery.php',
+    'AlmanacBindingSetPropertyTransaction' => 'applications/almanac/xaction/AlmanacBindingSetPropertyTransaction.php',
     'AlmanacBindingTableView' => 'applications/almanac/view/AlmanacBindingTableView.php',
     'AlmanacBindingTransaction' => 'applications/almanac/storage/AlmanacBindingTransaction.php',
     'AlmanacBindingTransactionQuery' => 'applications/almanac/query/AlmanacBindingTransactionQuery.php',
@@ -40,6 +42,7 @@
     'AlmanacDAO' => 'applications/almanac/storage/AlmanacDAO.php',
     'AlmanacDevice' => 'applications/almanac/storage/AlmanacDevice.php',
     'AlmanacDeviceController' => 'applications/almanac/controller/AlmanacDeviceController.php',
+    'AlmanacDeviceDeletePropertyTransaction' => 'applications/almanac/xaction/AlmanacDeviceDeletePropertyTransaction.php',
     'AlmanacDeviceEditConduitAPIMethod' => 'applications/almanac/conduit/AlmanacDeviceEditConduitAPIMethod.php',
     'AlmanacDeviceEditController' => 'applications/almanac/controller/AlmanacDeviceEditController.php',
     'AlmanacDeviceEditEngine' => 'applications/almanac/editor/AlmanacDeviceEditEngine.php',
@@ -52,6 +55,7 @@
     'AlmanacDeviceQuery' => 'applications/almanac/query/AlmanacDeviceQuery.php',
     'AlmanacDeviceSearchConduitAPIMethod' => 'applications/almanac/conduit/AlmanacDeviceSearchConduitAPIMethod.php',
     'AlmanacDeviceSearchEngine' => 'applications/almanac/query/AlmanacDeviceSearchEngine.php',
+    'AlmanacDeviceSetPropertyTransaction' => 'applications/almanac/xaction/AlmanacDeviceSetPropertyTransaction.php',
     'AlmanacDeviceTransaction' => 'applications/almanac/storage/AlmanacDeviceTransaction.php',
     'AlmanacDeviceTransactionQuery' => 'applications/almanac/query/AlmanacDeviceTransactionQuery.php',
     'AlmanacDeviceTransactionType' => 'applications/almanac/xaction/AlmanacDeviceTransactionType.php',
@@ -80,6 +84,7 @@
     'AlmanacManagementTrustKeyWorkflow' => 'applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php',
     'AlmanacManagementUntrustKeyWorkflow' => 'applications/almanac/management/AlmanacManagementUntrustKeyWorkflow.php',
     'AlmanacManagementWorkflow' => 'applications/almanac/management/AlmanacManagementWorkflow.php',
+    'AlmanacModularTransaction' => 'applications/almanac/storage/AlmanacModularTransaction.php',
     'AlmanacNames' => 'applications/almanac/util/AlmanacNames.php',
     'AlmanacNamesTestCase' => 'applications/almanac/util/__tests__/AlmanacNamesTestCase.php',
     'AlmanacNamespace' => 'applications/almanac/storage/AlmanacNamespace.php',
@@ -127,6 +132,7 @@
     'AlmanacService' => 'applications/almanac/storage/AlmanacService.php',
     'AlmanacServiceController' => 'applications/almanac/controller/AlmanacServiceController.php',
     'AlmanacServiceDatasource' => 'applications/almanac/typeahead/AlmanacServiceDatasource.php',
+    'AlmanacServiceDeletePropertyTransaction' => 'applications/almanac/xaction/AlmanacServiceDeletePropertyTransaction.php',
     'AlmanacServiceEditController' => 'applications/almanac/controller/AlmanacServiceEditController.php',
     'AlmanacServiceEditEngine' => 'applications/almanac/editor/AlmanacServiceEditEngine.php',
     'AlmanacServiceEditor' => 'applications/almanac/editor/AlmanacServiceEditor.php',
@@ -138,6 +144,7 @@
     'AlmanacServiceQuery' => 'applications/almanac/query/AlmanacServiceQuery.php',
     'AlmanacServiceSearchConduitAPIMethod' => 'applications/almanac/conduit/AlmanacServiceSearchConduitAPIMethod.php',
     'AlmanacServiceSearchEngine' => 'applications/almanac/query/AlmanacServiceSearchEngine.php',
+    'AlmanacServiceSetPropertyTransaction' => 'applications/almanac/xaction/AlmanacServiceSetPropertyTransaction.php',
     'AlmanacServiceTransaction' => 'applications/almanac/storage/AlmanacServiceTransaction.php',
     'AlmanacServiceTransactionQuery' => 'applications/almanac/query/AlmanacServiceTransactionQuery.php',
     'AlmanacServiceTransactionType' => 'applications/almanac/xaction/AlmanacServiceTransactionType.php',
@@ -146,7 +153,6 @@
     'AlmanacServiceTypeTestCase' => 'applications/almanac/servicetype/__tests__/AlmanacServiceTypeTestCase.php',
     'AlmanacServiceTypeTransaction' => 'applications/almanac/xaction/AlmanacServiceTypeTransaction.php',
     'AlmanacServiceViewController' => 'applications/almanac/controller/AlmanacServiceViewController.php',
-    'AlmanacTransaction' => 'applications/almanac/storage/AlmanacTransaction.php',
     'AlmanacTransactionType' => 'applications/almanac/xaction/AlmanacTransactionType.php',
     'AphlictDropdownDataQuery' => 'applications/aphlict/query/AphlictDropdownDataQuery.php',
     'Aphront304Response' => 'aphront/response/Aphront304Response.php',
@@ -5194,6 +5200,7 @@
       'PhabricatorDestructibleInterface',
       'PhabricatorExtendedPolicyInterface',
     ),
+    'AlmanacBindingDeletePropertyTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingDisableController' => 'AlmanacServiceController',
     'AlmanacBindingDisableTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingEditController' => 'AlmanacServiceController',
@@ -5202,8 +5209,9 @@
     'AlmanacBindingPHIDType' => 'PhabricatorPHIDType',
     'AlmanacBindingPropertyEditEngine' => 'AlmanacPropertyEditEngine',
     'AlmanacBindingQuery' => 'AlmanacQuery',
+    'AlmanacBindingSetPropertyTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingTableView' => 'AphrontView',
-    'AlmanacBindingTransaction' => 'PhabricatorModularTransaction',
+    'AlmanacBindingTransaction' => 'AlmanacModularTransaction',
     'AlmanacBindingTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'AlmanacBindingTransactionType' => 'AlmanacTransactionType',
     'AlmanacBindingViewController' => 'AlmanacServiceController',
@@ -5233,6 +5241,7 @@
       'PhabricatorExtendedPolicyInterface',
     ),
     'AlmanacDeviceController' => 'AlmanacController',
+    'AlmanacDeviceDeletePropertyTransaction' => 'AlmanacDeviceTransactionType',
     'AlmanacDeviceEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacDeviceEditController' => 'AlmanacDeviceController',
     'AlmanacDeviceEditEngine' => 'PhabricatorEditEngine',
@@ -5245,7 +5254,8 @@
     'AlmanacDeviceQuery' => 'AlmanacQuery',
     'AlmanacDeviceSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'AlmanacDeviceSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'AlmanacDeviceTransaction' => 'PhabricatorModularTransaction',
+    'AlmanacDeviceSetPropertyTransaction' => 'AlmanacDeviceTransactionType',
+    'AlmanacDeviceTransaction' => 'AlmanacModularTransaction',
     'AlmanacDeviceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'AlmanacDeviceTransactionType' => 'AlmanacTransactionType',
     'AlmanacDeviceViewController' => 'AlmanacDeviceController',
@@ -5265,13 +5275,13 @@
     'AlmanacInterfaceDeviceTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceEditController' => 'AlmanacDeviceController',
     'AlmanacInterfaceEditEngine' => 'PhabricatorEditEngine',
-    'AlmanacInterfaceEditor' => 'PhabricatorApplicationTransactionEditor',
+    'AlmanacInterfaceEditor' => 'AlmanacEditor',
     'AlmanacInterfaceNetworkTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfacePHIDType' => 'PhabricatorPHIDType',
     'AlmanacInterfacePortTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceQuery' => 'AlmanacQuery',
     'AlmanacInterfaceTableView' => 'AphrontView',
-    'AlmanacInterfaceTransaction' => 'PhabricatorModularTransaction',
+    'AlmanacInterfaceTransaction' => 'AlmanacModularTransaction',
     'AlmanacInterfaceTransactionType' => 'AlmanacTransactionType',
     'AlmanacKeys' => 'Phobject',
     'AlmanacManageClusterServicesCapability' => 'PhabricatorPolicyCapability',
@@ -5279,6 +5289,7 @@
     'AlmanacManagementTrustKeyWorkflow' => 'AlmanacManagementWorkflow',
     'AlmanacManagementUntrustKeyWorkflow' => 'AlmanacManagementWorkflow',
     'AlmanacManagementWorkflow' => 'PhabricatorManagementWorkflow',
+    'AlmanacModularTransaction' => 'PhabricatorModularTransaction',
     'AlmanacNames' => 'Phobject',
     'AlmanacNamesTestCase' => 'PhabricatorTestCase',
     'AlmanacNamespace' => array(
@@ -5293,14 +5304,14 @@
     'AlmanacNamespaceController' => 'AlmanacController',
     'AlmanacNamespaceEditController' => 'AlmanacNamespaceController',
     'AlmanacNamespaceEditEngine' => 'PhabricatorEditEngine',
-    'AlmanacNamespaceEditor' => 'PhabricatorApplicationTransactionEditor',
+    'AlmanacNamespaceEditor' => 'AlmanacEditor',
     'AlmanacNamespaceListController' => 'AlmanacNamespaceController',
     'AlmanacNamespaceNameNgrams' => 'PhabricatorSearchNgrams',
     'AlmanacNamespaceNameTransaction' => 'AlmanacNamespaceTransactionType',
     'AlmanacNamespacePHIDType' => 'PhabricatorPHIDType',
     'AlmanacNamespaceQuery' => 'AlmanacQuery',
     'AlmanacNamespaceSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'AlmanacNamespaceTransaction' => 'PhabricatorModularTransaction',
+    'AlmanacNamespaceTransaction' => 'AlmanacModularTransaction',
     'AlmanacNamespaceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'AlmanacNamespaceTransactionType' => 'AlmanacTransactionType',
     'AlmanacNamespaceViewController' => 'AlmanacNamespaceController',
@@ -5314,14 +5325,14 @@
     'AlmanacNetworkController' => 'AlmanacController',
     'AlmanacNetworkEditController' => 'AlmanacNetworkController',
     'AlmanacNetworkEditEngine' => 'PhabricatorEditEngine',
-    'AlmanacNetworkEditor' => 'PhabricatorApplicationTransactionEditor',
+    'AlmanacNetworkEditor' => 'AlmanacEditor',
     'AlmanacNetworkListController' => 'AlmanacNetworkController',
     'AlmanacNetworkNameNgrams' => 'PhabricatorSearchNgrams',
     'AlmanacNetworkNameTransaction' => 'AlmanacNetworkTransactionType',
     'AlmanacNetworkPHIDType' => 'PhabricatorPHIDType',
     'AlmanacNetworkQuery' => 'AlmanacQuery',
     'AlmanacNetworkSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'AlmanacNetworkTransaction' => 'PhabricatorModularTransaction',
+    'AlmanacNetworkTransaction' => 'AlmanacModularTransaction',
     'AlmanacNetworkTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'AlmanacNetworkTransactionType' => 'AlmanacTransactionType',
     'AlmanacNetworkViewController' => 'AlmanacNetworkController',
@@ -5352,6 +5363,7 @@
     ),
     'AlmanacServiceController' => 'AlmanacController',
     'AlmanacServiceDatasource' => 'PhabricatorTypeaheadDatasource',
+    'AlmanacServiceDeletePropertyTransaction' => 'AlmanacServiceTransactionType',
     'AlmanacServiceEditController' => 'AlmanacServiceController',
     'AlmanacServiceEditEngine' => 'PhabricatorEditEngine',
     'AlmanacServiceEditor' => 'AlmanacEditor',
@@ -5363,7 +5375,8 @@
     'AlmanacServiceQuery' => 'AlmanacQuery',
     'AlmanacServiceSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'AlmanacServiceSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'AlmanacServiceTransaction' => 'PhabricatorModularTransaction',
+    'AlmanacServiceSetPropertyTransaction' => 'AlmanacServiceTransactionType',
+    'AlmanacServiceTransaction' => 'AlmanacModularTransaction',
     'AlmanacServiceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'AlmanacServiceTransactionType' => 'AlmanacTransactionType',
     'AlmanacServiceType' => 'Phobject',
@@ -5371,7 +5384,6 @@
     'AlmanacServiceTypeTestCase' => 'PhabricatorTestCase',
     'AlmanacServiceTypeTransaction' => 'AlmanacServiceTransactionType',
     'AlmanacServiceViewController' => 'AlmanacServiceController',
-    'AlmanacTransaction' => 'PhabricatorApplicationTransaction',
     'AlmanacTransactionType' => 'PhabricatorModularTransactionType',
     'AphlictDropdownDataQuery' => 'Phobject',
     'Aphront304Response' => 'AphrontResponse',
diff --git a/src/applications/almanac/controller/AlmanacPropertyDeleteController.php b/src/applications/almanac/controller/AlmanacPropertyDeleteController.php
index 93ec4ced64..f38670041b 100644
--- a/src/applications/almanac/controller/AlmanacPropertyDeleteController.php
+++ b/src/applications/almanac/controller/AlmanacPropertyDeleteController.php
@@ -39,8 +39,10 @@ public function handleRequest(AphrontRequest $request) {
 
     $validation_exception = null;
     if ($request->isFormPost()) {
+      $xaction_type = $object->getAlmanacPropertyDeleteTransactionType();
+
       $xaction = $object->getApplicationTransactionTemplate()
-        ->setTransactionType(AlmanacTransaction::TYPE_PROPERTY_REMOVE)
+        ->setTransactionType($xaction_type)
         ->setMetadataValue('almanac.property', $key);
 
       $editor = $object->getApplicationTransactionEditor()
diff --git a/src/applications/almanac/editor/AlmanacBindingEditor.php b/src/applications/almanac/editor/AlmanacBindingEditor.php
index d84845722c..f0d164317a 100644
--- a/src/applications/almanac/editor/AlmanacBindingEditor.php
+++ b/src/applications/almanac/editor/AlmanacBindingEditor.php
@@ -15,4 +15,8 @@ public function getCreateObjectTitleForFeed($author, $object) {
     return pht('%s created %s.', $author, $object);
   }
 
+  protected function supportsSearch() {
+    return true;
+  }
+
 }
diff --git a/src/applications/almanac/editor/AlmanacDeviceEditor.php b/src/applications/almanac/editor/AlmanacDeviceEditor.php
index ea04bffc07..71032f1482 100644
--- a/src/applications/almanac/editor/AlmanacDeviceEditor.php
+++ b/src/applications/almanac/editor/AlmanacDeviceEditor.php
@@ -7,6 +7,18 @@ public function getEditorObjectsDescription() {
     return pht('Almanac Device');
   }
 
+  public function getCreateObjectTitle($author, $object) {
+    return pht('%s created this device.', $author);
+  }
+
+  public function getCreateObjectTitleForFeed($author, $object) {
+    return pht('%s created %s.', $author, $object);
+  }
+
+  protected function supportsSearch() {
+    return true;
+  }
+
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
diff --git a/src/applications/almanac/editor/AlmanacEditor.php b/src/applications/almanac/editor/AlmanacEditor.php
index a628606dbc..54c32c79cd 100644
--- a/src/applications/almanac/editor/AlmanacEditor.php
+++ b/src/applications/almanac/editor/AlmanacEditor.php
@@ -7,150 +7,4 @@ public function getEditorApplicationClass() {
     return 'PhabricatorAlmanacApplication';
   }
 
-  protected function supportsSearch() {
-    return true;
-  }
-
-  public function getTransactionTypes() {
-    $types = parent::getTransactionTypes();
-
-    $types[] = AlmanacTransaction::TYPE_PROPERTY_UPDATE;
-    $types[] = AlmanacTransaction::TYPE_PROPERTY_REMOVE;
-
-    return $types;
-  }
-
-  protected function getCustomTransactionOldValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-    switch ($xaction->getTransactionType()) {
-      case AlmanacTransaction::TYPE_PROPERTY_UPDATE:
-      case AlmanacTransaction::TYPE_PROPERTY_REMOVE:
-        $property_key = $xaction->getMetadataValue('almanac.property');
-        $exists = $object->hasAlmanacProperty($property_key);
-        $value = $object->getAlmanacPropertyValue($property_key);
-        return array(
-          'existed' => $exists,
-          'value' => $value,
-        );
-    }
-
-    return parent::getCustomTransactionOldValue($object, $xaction);
-  }
-
-  protected function getCustomTransactionNewValue(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacTransaction::TYPE_PROPERTY_UPDATE:
-      case AlmanacTransaction::TYPE_PROPERTY_REMOVE:
-        return $xaction->getNewValue();
-    }
-
-    return parent::getCustomTransactionNewValue($object, $xaction);
-  }
-
-  protected function applyCustomInternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacTransaction::TYPE_PROPERTY_UPDATE:
-      case AlmanacTransaction::TYPE_PROPERTY_REMOVE:
-        return;
-    }
-
-    return parent::applyCustomInternalTransaction($object, $xaction);
-  }
-
-  protected function applyCustomExternalTransaction(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case AlmanacTransaction::TYPE_PROPERTY_UPDATE:
-        $property_key = $xaction->getMetadataValue('almanac.property');
-        if ($object->hasAlmanacProperty($property_key)) {
-          $property = $object->getAlmanacProperty($property_key);
-        } else {
-          $property = id(new AlmanacProperty())
-            ->setObjectPHID($object->getPHID())
-            ->setFieldName($property_key);
-        }
-        $property
-          ->setFieldValue($xaction->getNewValue())
-          ->save();
-        return;
-      case AlmanacTransaction::TYPE_PROPERTY_REMOVE:
-        $property_key = $xaction->getMetadataValue('almanac.property');
-        if ($object->hasAlmanacProperty($property_key)) {
-          $property = $object->getAlmanacProperty($property_key);
-          $property->delete();
-        }
-        return;
-    }
-
-    return parent::applyCustomExternalTransaction($object, $xaction);
-  }
-
-  protected function validateTransaction(
-    PhabricatorLiskDAO $object,
-    $type,
-    array $xactions) {
-
-    $errors = parent::validateTransaction($object, $type, $xactions);
-
-    switch ($type) {
-      case AlmanacTransaction::TYPE_PROPERTY_UPDATE:
-        foreach ($xactions as $xaction) {
-          $property_key = $xaction->getMetadataValue('almanac.property');
-
-          $message = null;
-          try {
-            AlmanacNames::validateName($property_key);
-          } catch (Exception $ex) {
-            $message = $ex->getMessage();
-          }
-
-          if ($message !== null) {
-            $error = new PhabricatorApplicationTransactionValidationError(
-              $type,
-              pht('Invalid'),
-              $message,
-              $xaction);
-            $errors[] = $error;
-            continue;
-          }
-
-          $new_value = $xaction->getNewValue();
-          try {
-            phutil_json_encode($new_value);
-          } catch (Exception $ex) {
-            $message = pht(
-              'Almanac property values must be representable in JSON. %s',
-              $ex->getMessage());
-          }
-
-          if ($message !== null) {
-            $error = new PhabricatorApplicationTransactionValidationError(
-              $type,
-              pht('Invalid'),
-              $message,
-              $xaction);
-            $errors[] = $error;
-            continue;
-          }
-        }
-        break;
-
-      case AlmanacTransaction::TYPE_PROPERTY_REMOVE:
-        // NOTE: No name validation on removals since it's OK to delete
-        // an invalid property that somehow came into existence.
-        break;
-    }
-
-    return $errors;
-  }
-
 }
diff --git a/src/applications/almanac/editor/AlmanacInterfaceEditor.php b/src/applications/almanac/editor/AlmanacInterfaceEditor.php
index 066b026dbd..865402db36 100644
--- a/src/applications/almanac/editor/AlmanacInterfaceEditor.php
+++ b/src/applications/almanac/editor/AlmanacInterfaceEditor.php
@@ -1,11 +1,7 @@
 <?php
 
 final class AlmanacInterfaceEditor
-  extends PhabricatorApplicationTransactionEditor {
-
-  public function getEditorApplicationClass() {
-    return 'PhabricatorAlmanacApplication';
-  }
+  extends AlmanacEditor {
 
   public function getEditorObjectsDescription() {
     return pht('Almanac Interface');
diff --git a/src/applications/almanac/editor/AlmanacNamespaceEditor.php b/src/applications/almanac/editor/AlmanacNamespaceEditor.php
index 93d65e62b1..5da034b388 100644
--- a/src/applications/almanac/editor/AlmanacNamespaceEditor.php
+++ b/src/applications/almanac/editor/AlmanacNamespaceEditor.php
@@ -1,11 +1,7 @@
 <?php
 
 final class AlmanacNamespaceEditor
-  extends PhabricatorApplicationTransactionEditor {
-
-  public function getEditorApplicationClass() {
-    return 'PhabricatorAlmanacApplication';
-  }
+  extends AlmanacEditor {
 
   public function getEditorObjectsDescription() {
     return pht('Almanac Namespace');
diff --git a/src/applications/almanac/editor/AlmanacNetworkEditor.php b/src/applications/almanac/editor/AlmanacNetworkEditor.php
index f5a74e2095..0ea5778621 100644
--- a/src/applications/almanac/editor/AlmanacNetworkEditor.php
+++ b/src/applications/almanac/editor/AlmanacNetworkEditor.php
@@ -1,20 +1,12 @@
 <?php
 
 final class AlmanacNetworkEditor
-  extends PhabricatorApplicationTransactionEditor {
-
-  public function getEditorApplicationClass() {
-    return 'PhabricatorAlmanacApplication';
-  }
+  extends AlmanacEditor {
 
   public function getEditorObjectsDescription() {
     return pht('Almanac Network');
   }
 
-  protected function supportsSearch() {
-    return true;
-  }
-
   public function getCreateObjectTitle($author, $object) {
     return pht('%s created this network.', $author);
   }
@@ -23,6 +15,10 @@ public function getCreateObjectTitleForFeed($author, $object) {
     return pht('%s created %s.', $author, $object);
   }
 
+  protected function supportsSearch() {
+    return true;
+  }
+
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
diff --git a/src/applications/almanac/editor/AlmanacPropertyEditEngine.php b/src/applications/almanac/editor/AlmanacPropertyEditEngine.php
index c22a3ab869..e5bfd2822a 100644
--- a/src/applications/almanac/editor/AlmanacPropertyEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacPropertyEditEngine.php
@@ -64,7 +64,7 @@ protected function getObjectCreateShortText() {
 
   protected function buildCustomEditFields($object) {
     $property_key = $this->getPropertyKey();
-    $xaction_type = AlmanacTransaction::TYPE_PROPERTY_UPDATE;
+    $xaction_type = $object->getAlmanacPropertySetTransactionType();
 
     return array(
       id(new PhabricatorTextEditField())
diff --git a/src/applications/almanac/property/AlmanacPropertyInterface.php b/src/applications/almanac/property/AlmanacPropertyInterface.php
index b50b4089a8..6f3224ddee 100644
--- a/src/applications/almanac/property/AlmanacPropertyInterface.php
+++ b/src/applications/almanac/property/AlmanacPropertyInterface.php
@@ -9,5 +9,7 @@ public function getAlmanacProperty($key);
   public function getAlmanacPropertyValue($key, $default = null);
   public function getAlmanacPropertyFieldSpecifications();
   public function newAlmanacPropertyEditEngine();
+  public function getAlmanacPropertySetTransactionType();
+  public function getAlmanacPropertyDeleteTransactionType();
 
 }
diff --git a/src/applications/almanac/storage/AlmanacBinding.php b/src/applications/almanac/storage/AlmanacBinding.php
index 9d0fbc1622..59a7666f8c 100644
--- a/src/applications/almanac/storage/AlmanacBinding.php
+++ b/src/applications/almanac/storage/AlmanacBinding.php
@@ -134,6 +134,14 @@ public function newAlmanacPropertyEditEngine() {
     return new AlmanacBindingPropertyEditEngine();
   }
 
+  public function getAlmanacPropertySetTransactionType() {
+    return AlmanacBindingSetPropertyTransaction::TRANSACTIONTYPE;
+  }
+
+  public function getAlmanacPropertyDeleteTransactionType() {
+    return AlmanacBindingDeletePropertyTransaction::TRANSACTIONTYPE;
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/almanac/storage/AlmanacBindingTransaction.php b/src/applications/almanac/storage/AlmanacBindingTransaction.php
index 24b606639f..d17eb59000 100644
--- a/src/applications/almanac/storage/AlmanacBindingTransaction.php
+++ b/src/applications/almanac/storage/AlmanacBindingTransaction.php
@@ -1,20 +1,12 @@
 <?php
 
 final class AlmanacBindingTransaction
-  extends PhabricatorModularTransaction {
-
-  public function getApplicationName() {
-    return 'almanac';
-  }
+  extends AlmanacModularTransaction {
 
   public function getApplicationTransactionType() {
     return AlmanacBindingPHIDType::TYPECONST;
   }
 
-  public function getApplicationTransactionCommentObject() {
-    return null;
-  }
-
   public function getBaseTransactionClass() {
     return 'AlmanacBindingTransactionType';
   }
diff --git a/src/applications/almanac/storage/AlmanacDevice.php b/src/applications/almanac/storage/AlmanacDevice.php
index 2f89e6c2b6..a1ebdfffae 100644
--- a/src/applications/almanac/storage/AlmanacDevice.php
+++ b/src/applications/almanac/storage/AlmanacDevice.php
@@ -143,6 +143,14 @@ public function newAlmanacPropertyEditEngine() {
     return new AlmanacDevicePropertyEditEngine();
   }
 
+  public function getAlmanacPropertySetTransactionType() {
+    return AlmanacDeviceSetPropertyTransaction::TRANSACTIONTYPE;
+  }
+
+  public function getAlmanacPropertyDeleteTransactionType() {
+    return AlmanacDeviceDeletePropertyTransaction::TRANSACTIONTYPE;
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/almanac/storage/AlmanacDeviceTransaction.php b/src/applications/almanac/storage/AlmanacDeviceTransaction.php
index e74def1a9b..2b921525ac 100644
--- a/src/applications/almanac/storage/AlmanacDeviceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacDeviceTransaction.php
@@ -1,20 +1,12 @@
 <?php
 
 final class AlmanacDeviceTransaction
-  extends PhabricatorModularTransaction {
-
-  public function getApplicationName() {
-    return 'almanac';
-  }
+  extends AlmanacModularTransaction {
 
   public function getApplicationTransactionType() {
     return AlmanacDevicePHIDType::TYPECONST;
   }
 
-  public function getApplicationTransactionCommentObject() {
-    return null;
-  }
-
   public function getBaseTransactionClass() {
     return 'AlmanacDeviceTransactionType';
   }
diff --git a/src/applications/almanac/storage/AlmanacInterfaceTransaction.php b/src/applications/almanac/storage/AlmanacInterfaceTransaction.php
index f469f926f7..02263f13c2 100644
--- a/src/applications/almanac/storage/AlmanacInterfaceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacInterfaceTransaction.php
@@ -1,20 +1,12 @@
 <?php
 
 final class AlmanacInterfaceTransaction
-  extends PhabricatorModularTransaction {
-
-  public function getApplicationName() {
-    return 'almanac';
-  }
+  extends AlmanacModularTransaction {
 
   public function getApplicationTransactionType() {
     return AlmanacInterfacePHIDType::TYPECONST;
   }
 
-  public function getApplicationTransactionCommentObject() {
-    return null;
-  }
-
   public function getBaseTransactionClass() {
     return 'AlmanacInterfaceTransactionType';
   }
diff --git a/src/applications/almanac/storage/AlmanacModularTransaction.php b/src/applications/almanac/storage/AlmanacModularTransaction.php
new file mode 100644
index 0000000000..6497069241
--- /dev/null
+++ b/src/applications/almanac/storage/AlmanacModularTransaction.php
@@ -0,0 +1,14 @@
+<?php
+
+abstract class AlmanacModularTransaction
+  extends PhabricatorModularTransaction {
+
+  public function getApplicationName() {
+    return 'almanac';
+  }
+
+  public function getApplicationTransactionCommentObject() {
+    return null;
+  }
+
+}
diff --git a/src/applications/almanac/storage/AlmanacNamespace.php b/src/applications/almanac/storage/AlmanacNamespace.php
index 7a8a4a20f0..19ed40a87e 100644
--- a/src/applications/almanac/storage/AlmanacNamespace.php
+++ b/src/applications/almanac/storage/AlmanacNamespace.php
@@ -150,6 +150,14 @@ public function newAlmanacPropertyEditEngine() {
     throw new PhutilMethodNotImplementedException();
   }
 
+  public function getAlmanacPropertySetTransactionType() {
+    throw new PhutilMethodNotImplementedException();
+  }
+
+  public function getAlmanacPropertyDeleteTransactionType() {
+    throw new PhutilMethodNotImplementedException();
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/almanac/storage/AlmanacNamespaceTransaction.php b/src/applications/almanac/storage/AlmanacNamespaceTransaction.php
index 9a6f10e1de..7b859832b8 100644
--- a/src/applications/almanac/storage/AlmanacNamespaceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacNamespaceTransaction.php
@@ -1,20 +1,12 @@
 <?php
 
 final class AlmanacNamespaceTransaction
-  extends PhabricatorModularTransaction {
-
-  public function getApplicationName() {
-    return 'almanac';
-  }
+  extends AlmanacModularTransaction {
 
   public function getApplicationTransactionType() {
     return AlmanacNamespacePHIDType::TYPECONST;
   }
 
-  public function getApplicationTransactionCommentObject() {
-    return null;
-  }
-
   public function getBaseTransactionClass() {
     return 'AlmanacNamespaceTransactionType';
   }
diff --git a/src/applications/almanac/storage/AlmanacNetworkTransaction.php b/src/applications/almanac/storage/AlmanacNetworkTransaction.php
index 0717631403..e487ffda3d 100644
--- a/src/applications/almanac/storage/AlmanacNetworkTransaction.php
+++ b/src/applications/almanac/storage/AlmanacNetworkTransaction.php
@@ -1,20 +1,12 @@
 <?php
 
 final class AlmanacNetworkTransaction
-  extends PhabricatorModularTransaction {
-
-  public function getApplicationName() {
-    return 'almanac';
-  }
+  extends AlmanacModularTransaction {
 
   public function getApplicationTransactionType() {
     return AlmanacNetworkPHIDType::TYPECONST;
   }
 
-  public function getApplicationTransactionCommentObject() {
-    return null;
-  }
-
   public function getBaseTransactionClass() {
     return 'AlmanacNetworkTransactionType';
   }
diff --git a/src/applications/almanac/storage/AlmanacProperty.php b/src/applications/almanac/storage/AlmanacProperty.php
index 0d317f8c8e..bd3fe83347 100644
--- a/src/applications/almanac/storage/AlmanacProperty.php
+++ b/src/applications/almanac/storage/AlmanacProperty.php
@@ -54,7 +54,7 @@ public static function newPropertyUpdateTransactions(
       }
 
       $xactions[] = id(clone $template)
-        ->setTransactionType(AlmanacTransaction::TYPE_PROPERTY_UPDATE)
+        ->setTransactionType($object->getAlmanacPropertySetTransactionType())
         ->setMetadataValue('almanac.property', $name)
         ->setNewValue($property);
     }
@@ -71,7 +71,7 @@ public static function newPropertyRemoveTransactions(
     $xactions = array();
     foreach ($properties as $property) {
       $xactions[] = id(clone $template)
-        ->setTransactionType(AlmanacTransaction::TYPE_PROPERTY_REMOVE)
+        ->setTransactionType($object->getAlmanacPropertyDeleteTransactionType())
         ->setMetadataValue('almanac.property', $property)
         ->setNewValue(null);
     }
diff --git a/src/applications/almanac/storage/AlmanacService.php b/src/applications/almanac/storage/AlmanacService.php
index 9ef42d6407..361eabca2a 100644
--- a/src/applications/almanac/storage/AlmanacService.php
+++ b/src/applications/almanac/storage/AlmanacService.php
@@ -160,6 +160,14 @@ public function newAlmanacPropertyEditEngine() {
     return new AlmanacServicePropertyEditEngine();
   }
 
+  public function getAlmanacPropertySetTransactionType() {
+    return AlmanacServiceSetPropertyTransaction::TRANSACTIONTYPE;
+  }
+
+  public function getAlmanacPropertyDeleteTransactionType() {
+    return AlmanacServiceDeletePropertyTransaction::TRANSACTIONTYPE;
+  }
+
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/almanac/storage/AlmanacServiceTransaction.php b/src/applications/almanac/storage/AlmanacServiceTransaction.php
index 692cc2997e..62b4137e7b 100644
--- a/src/applications/almanac/storage/AlmanacServiceTransaction.php
+++ b/src/applications/almanac/storage/AlmanacServiceTransaction.php
@@ -1,15 +1,7 @@
 <?php
 
 final class AlmanacServiceTransaction
-  extends PhabricatorModularTransaction {
-
-  public function getApplicationName() {
-    return 'almanac';
-  }
-
-  public function getApplicationTransactionCommentObject() {
-    return null;
-  }
+  extends AlmanacModularTransaction {
 
   public function getApplicationTransactionType() {
     return AlmanacServicePHIDType::TYPECONST;
diff --git a/src/applications/almanac/storage/AlmanacTransaction.php b/src/applications/almanac/storage/AlmanacTransaction.php
deleted file mode 100644
index 18bd776335..0000000000
--- a/src/applications/almanac/storage/AlmanacTransaction.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-abstract class AlmanacTransaction
-  extends PhabricatorApplicationTransaction {
-
-  const TYPE_PROPERTY_UPDATE = 'almanac:property:update';
-  const TYPE_PROPERTY_REMOVE = 'almanac:property:remove';
-
-  public function getApplicationName() {
-    return 'almanac';
-  }
-
-  public function getApplicationTransactionCommentObject() {
-    return null;
-  }
-
-  public function getTitle() {
-    $author_phid = $this->getAuthorPHID();
-
-    switch ($this->getTransactionType()) {
-      case self::TYPE_PROPERTY_UPDATE:
-        $property_key = $this->getMetadataValue('almanac.property');
-        return pht(
-          '%s updated the property "%s".',
-          $this->renderHandleLink($author_phid),
-          $property_key);
-      case self::TYPE_PROPERTY_REMOVE:
-        $property_key = $this->getMetadataValue('almanac.property');
-        return pht(
-          '%s deleted the property "%s".',
-          $this->renderHandleLink($author_phid),
-          $property_key);
-    }
-
-    return parent::getTitle();
-  }
-
-}
diff --git a/src/applications/almanac/xaction/AlmanacBindingDeletePropertyTransaction.php b/src/applications/almanac/xaction/AlmanacBindingDeletePropertyTransaction.php
new file mode 100644
index 0000000000..aece12c9bf
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacBindingDeletePropertyTransaction.php
@@ -0,0 +1,20 @@
+<?php
+
+final class AlmanacBindingDeletePropertyTransaction
+  extends AlmanacBindingTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:property:remove';
+
+  public function generateOldValue($object) {
+    return $this->getAlmanacPropertyOldValue($object);
+  }
+
+  public function applyInternalEffects($object, $value) {
+    return $this->deleteAlmanacProperty($object);
+  }
+
+  public function getTitle() {
+    return $this->getAlmanacDeletePropertyTitle();
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacBindingSetPropertyTransaction.php b/src/applications/almanac/xaction/AlmanacBindingSetPropertyTransaction.php
new file mode 100644
index 0000000000..cb1a7f9fa1
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacBindingSetPropertyTransaction.php
@@ -0,0 +1,24 @@
+<?php
+
+final class AlmanacBindingSetPropertyTransaction
+  extends AlmanacBindingTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:property:update';
+
+  public function generateOldValue($object) {
+    return $this->getAlmanacPropertyOldValue($object);
+  }
+
+  public function applyExternalEffects($object, $value) {
+    return $this->setAlmanacProperty($object, $value);
+  }
+
+  public function getTitle() {
+    return $this->getAlmanacSetPropertyTitle();
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    return $this->validateAlmanacSetPropertyTransactions($object, $xactions);
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacDeviceDeletePropertyTransaction.php b/src/applications/almanac/xaction/AlmanacDeviceDeletePropertyTransaction.php
new file mode 100644
index 0000000000..bbe5c3bc05
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacDeviceDeletePropertyTransaction.php
@@ -0,0 +1,20 @@
+<?php
+
+final class AlmanacDeviceDeletePropertyTransaction
+  extends AlmanacDeviceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:property:remove';
+
+  public function generateOldValue($object) {
+    return $this->getAlmanacPropertyOldValue($object);
+  }
+
+  public function applyInternalEffects($object, $value) {
+    return $this->deleteAlmanacProperty($object);
+  }
+
+  public function getTitle() {
+    return $this->getAlmanacDeletePropertyTitle();
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacDeviceSetPropertyTransaction.php b/src/applications/almanac/xaction/AlmanacDeviceSetPropertyTransaction.php
new file mode 100644
index 0000000000..5170ec8ed9
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacDeviceSetPropertyTransaction.php
@@ -0,0 +1,24 @@
+<?php
+
+final class AlmanacDeviceSetPropertyTransaction
+  extends AlmanacDeviceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:property:update';
+
+  public function generateOldValue($object) {
+    return $this->getAlmanacPropertyOldValue($object);
+  }
+
+  public function applyExternalEffects($object, $value) {
+    return $this->setAlmanacProperty($object, $value);
+  }
+
+  public function getTitle() {
+    return $this->getAlmanacSetPropertyTitle();
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    return $this->validateAlmanacSetPropertyTransactions($object, $xactions);
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacServiceDeletePropertyTransaction.php b/src/applications/almanac/xaction/AlmanacServiceDeletePropertyTransaction.php
new file mode 100644
index 0000000000..5824670576
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacServiceDeletePropertyTransaction.php
@@ -0,0 +1,20 @@
+<?php
+
+final class AlmanacServiceDeletePropertyTransaction
+  extends AlmanacServiceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:property:remove';
+
+  public function generateOldValue($object) {
+    return $this->getAlmanacPropertyOldValue($object);
+  }
+
+  public function applyInternalEffects($object, $value) {
+    return $this->deleteAlmanacProperty($object);
+  }
+
+  public function getTitle() {
+    return $this->getAlmanacDeletePropertyTitle();
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacServiceSetPropertyTransaction.php b/src/applications/almanac/xaction/AlmanacServiceSetPropertyTransaction.php
new file mode 100644
index 0000000000..bd4863a986
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacServiceSetPropertyTransaction.php
@@ -0,0 +1,24 @@
+<?php
+
+final class AlmanacServiceSetPropertyTransaction
+  extends AlmanacServiceTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:property:update';
+
+  public function generateOldValue($object) {
+    return $this->getAlmanacPropertyOldValue($object);
+  }
+
+  public function applyExternalEffects($object, $value) {
+    return $this->setAlmanacProperty($object, $value);
+  }
+
+  public function getTitle() {
+    return $this->getAlmanacSetPropertyTitle();
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    return $this->validateAlmanacSetPropertyTransactions($object, $xactions);
+  }
+
+}
diff --git a/src/applications/almanac/xaction/AlmanacTransactionType.php b/src/applications/almanac/xaction/AlmanacTransactionType.php
index 69ba5b61c4..c7f58ec7bb 100644
--- a/src/applications/almanac/xaction/AlmanacTransactionType.php
+++ b/src/applications/almanac/xaction/AlmanacTransactionType.php
@@ -1,4 +1,97 @@
 <?php
 
 abstract class AlmanacTransactionType
-  extends PhabricatorModularTransactionType {}
+  extends PhabricatorModularTransactionType {
+
+  protected function getAlmanacPropertyOldValue($object) {
+    $property_key = $this->getMetadataValue('almanac.property');
+    $exists = $object->hasAlmanacProperty($property_key);
+    $value = $object->getAlmanacPropertyValue($property_key);
+
+    return array(
+      'existed' => $exists,
+      'value' => $value,
+    );
+  }
+
+  protected function setAlmanacProperty($object, $value) {
+    $property_key = $this->getMetadataValue('almanac.property');
+
+    if ($object->hasAlmanacProperty($property_key)) {
+      $property = $object->getAlmanacProperty($property_key);
+    } else {
+      $property = id(new AlmanacProperty())
+        ->setObjectPHID($object->getPHID())
+        ->setFieldName($property_key);
+    }
+
+    $property
+      ->setFieldValue($value)
+      ->save();
+  }
+
+  protected function deleteAlmanacProperty($object) {
+    $property_key = $this->getMetadataValue('almanac.property');
+    if ($object->hasAlmanacProperty($property_key)) {
+      $property = $object->getAlmanacProperty($property_key);
+      $property->delete();
+    }
+  }
+
+  protected function getAlmanacSetPropertyTitle() {
+    $property_key = $this->getMetadataValue('almanac.property');
+
+    return pht(
+      '%s updated the property %s.',
+      $this->renderAuthor(),
+      $this->renderValue($property_key));
+  }
+
+  protected function getAlmanacDeletePropertyTitle() {
+    $property_key = $this->getMetadataValue('almanac.property');
+
+    return pht(
+      '%s removed the property %s.',
+      $this->renderAuthor(),
+      $this->renderValue($property_key));
+  }
+
+  protected function validateAlmanacSetPropertyTransactions(
+    $object,
+    array $xactions) {
+    $errors = array();
+
+    foreach ($xactions as $xaction) {
+      $property_key = $xaction->getMetadataValue('almanac.property');
+
+      $message = null;
+      try {
+        AlmanacNames::validateName($property_key);
+      } catch (Exception $ex) {
+        $message = $ex->getMessage();
+      }
+
+      if ($message !== null) {
+        $errors[] = $this->newInvalidError($message, $xaction);
+        continue;
+      }
+
+      $new_value = $xaction->getNewValue();
+      try {
+        phutil_json_encode($new_value);
+      } catch (Exception $ex) {
+        $message = pht(
+          'Almanac property values must be representable in JSON. %s',
+          $ex->getMessage());
+      }
+
+      if ($message !== null) {
+        $errors[] = $this->newInvalidError($message, $xaction);
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}

From a8c4da13c0be09838da4d1ab1e149c3fd12e5f35 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 11:08:42 -0700
Subject: [PATCH 812/865] Add "almanac.network.edit" and
 "almanac.network.search" API methods

Summary: Depends on D19334. Ref T13120. Ref T12414. These are pretty straightforward, but no one really has a use case for them anyway today so they're primarily just for completeness.

Test Plan:
  - Queried networks with `almanac.network.search`.
  - Created and edited networks with `almanac.network.edit`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19335
---
 src/__phutil_library_map__.php                |  5 ++++
 .../AlmanacNetworkEditConduitAPIMethod.php    | 19 ++++++++++++++
 .../AlmanacNetworkSearchConduitAPIMethod.php  | 18 +++++++++++++
 .../almanac/storage/AlmanacNetwork.php        | 26 ++++++++++++++++++-
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/almanac/conduit/AlmanacNetworkEditConduitAPIMethod.php
 create mode 100644 src/applications/almanac/conduit/AlmanacNetworkSearchConduitAPIMethod.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 118196a5d7..df0110d332 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -104,6 +104,7 @@
     'AlmanacNamespaceViewController' => 'applications/almanac/controller/AlmanacNamespaceViewController.php',
     'AlmanacNetwork' => 'applications/almanac/storage/AlmanacNetwork.php',
     'AlmanacNetworkController' => 'applications/almanac/controller/AlmanacNetworkController.php',
+    'AlmanacNetworkEditConduitAPIMethod' => 'applications/almanac/conduit/AlmanacNetworkEditConduitAPIMethod.php',
     'AlmanacNetworkEditController' => 'applications/almanac/controller/AlmanacNetworkEditController.php',
     'AlmanacNetworkEditEngine' => 'applications/almanac/editor/AlmanacNetworkEditEngine.php',
     'AlmanacNetworkEditor' => 'applications/almanac/editor/AlmanacNetworkEditor.php',
@@ -112,6 +113,7 @@
     'AlmanacNetworkNameTransaction' => 'applications/almanac/xaction/AlmanacNetworkNameTransaction.php',
     'AlmanacNetworkPHIDType' => 'applications/almanac/phid/AlmanacNetworkPHIDType.php',
     'AlmanacNetworkQuery' => 'applications/almanac/query/AlmanacNetworkQuery.php',
+    'AlmanacNetworkSearchConduitAPIMethod' => 'applications/almanac/conduit/AlmanacNetworkSearchConduitAPIMethod.php',
     'AlmanacNetworkSearchEngine' => 'applications/almanac/query/AlmanacNetworkSearchEngine.php',
     'AlmanacNetworkTransaction' => 'applications/almanac/storage/AlmanacNetworkTransaction.php',
     'AlmanacNetworkTransactionQuery' => 'applications/almanac/query/AlmanacNetworkTransactionQuery.php',
@@ -5321,8 +5323,10 @@
       'PhabricatorPolicyInterface',
       'PhabricatorDestructibleInterface',
       'PhabricatorNgramsInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'AlmanacNetworkController' => 'AlmanacController',
+    'AlmanacNetworkEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacNetworkEditController' => 'AlmanacNetworkController',
     'AlmanacNetworkEditEngine' => 'PhabricatorEditEngine',
     'AlmanacNetworkEditor' => 'AlmanacEditor',
@@ -5331,6 +5335,7 @@
     'AlmanacNetworkNameTransaction' => 'AlmanacNetworkTransactionType',
     'AlmanacNetworkPHIDType' => 'PhabricatorPHIDType',
     'AlmanacNetworkQuery' => 'AlmanacQuery',
+    'AlmanacNetworkSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'AlmanacNetworkSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'AlmanacNetworkTransaction' => 'AlmanacModularTransaction',
     'AlmanacNetworkTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
diff --git a/src/applications/almanac/conduit/AlmanacNetworkEditConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacNetworkEditConduitAPIMethod.php
new file mode 100644
index 0000000000..b2acdf2572
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacNetworkEditConduitAPIMethod.php
@@ -0,0 +1,19 @@
+<?php
+
+final class AlmanacNetworkEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.network.edit';
+  }
+
+  public function newEditEngine() {
+    return new AlmanacNetworkEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'Apply transactions to create a new network or edit an existing one.');
+  }
+
+}
diff --git a/src/applications/almanac/conduit/AlmanacNetworkSearchConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacNetworkSearchConduitAPIMethod.php
new file mode 100644
index 0000000000..13b05c0424
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacNetworkSearchConduitAPIMethod.php
@@ -0,0 +1,18 @@
+<?php
+
+final class AlmanacNetworkSearchConduitAPIMethod
+  extends PhabricatorSearchEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.network.search';
+  }
+
+  public function newSearchEngine() {
+    return new AlmanacNetworkSearchEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht('Read information about Almanac networks.');
+  }
+
+}
diff --git a/src/applications/almanac/storage/AlmanacNetwork.php b/src/applications/almanac/storage/AlmanacNetwork.php
index 737f38faec..6a530b4cb3 100644
--- a/src/applications/almanac/storage/AlmanacNetwork.php
+++ b/src/applications/almanac/storage/AlmanacNetwork.php
@@ -6,7 +6,8 @@ final class AlmanacNetwork
     PhabricatorApplicationTransactionInterface,
     PhabricatorPolicyInterface,
     PhabricatorDestructibleInterface,
-    PhabricatorNgramsInterface {
+    PhabricatorNgramsInterface,
+    PhabricatorConduitResultInterface {
 
   protected $name;
   protected $mailKey;
@@ -122,4 +123,27 @@ public function newNgrams() {
     );
   }
 
+
+/* -(  PhabricatorConduitResultInterface  )---------------------------------- */
+
+
+  public function getFieldSpecificationsForConduit() {
+    return array(
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('name')
+        ->setType('string')
+        ->setDescription(pht('The name of the network.')),
+    );
+  }
+
+  public function getFieldValuesForConduit() {
+    return array(
+      'name' => $this->getName(),
+    );
+  }
+
+  public function getConduitSearchAttachments() {
+    return array();
+  }
+
 }

From 9022e140821e45d8182155c0040fd0b0119a6900 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 11:21:12 -0700
Subject: [PATCH 813/865] Use a more conventional spelling of "Almanac" for
 "almanac.service.edit" class

Summary: Depends on D19335. Ref T13120. Ref T12414. There are many good ways to spell "almanac", but stick with convention here.

Test Plan: (O_O)

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19336
---
 src/__phutil_library_map__.php                                | 4 ++--
 ...itAPIMethod.php => AlmanacServiceEditConduitAPIMethod.php} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/applications/almanac/conduit/{AlamancServiceEditConduitAPIMethod.php => AlmanacServiceEditConduitAPIMethod.php} (88%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index df0110d332..e00296b8cc 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -9,7 +9,6 @@
 phutil_register_library_map(array(
   '__library_version__' => 2,
   'class' => array(
-    'AlamancServiceEditConduitAPIMethod' => 'applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php',
     'AlmanacAddress' => 'applications/almanac/util/AlmanacAddress.php',
     'AlmanacBinding' => 'applications/almanac/storage/AlmanacBinding.php',
     'AlmanacBindingDeletePropertyTransaction' => 'applications/almanac/xaction/AlmanacBindingDeletePropertyTransaction.php',
@@ -135,6 +134,7 @@
     'AlmanacServiceController' => 'applications/almanac/controller/AlmanacServiceController.php',
     'AlmanacServiceDatasource' => 'applications/almanac/typeahead/AlmanacServiceDatasource.php',
     'AlmanacServiceDeletePropertyTransaction' => 'applications/almanac/xaction/AlmanacServiceDeletePropertyTransaction.php',
+    'AlmanacServiceEditConduitAPIMethod' => 'applications/almanac/conduit/AlmanacServiceEditConduitAPIMethod.php',
     'AlmanacServiceEditController' => 'applications/almanac/controller/AlmanacServiceEditController.php',
     'AlmanacServiceEditEngine' => 'applications/almanac/editor/AlmanacServiceEditEngine.php',
     'AlmanacServiceEditor' => 'applications/almanac/editor/AlmanacServiceEditor.php',
@@ -5192,7 +5192,6 @@
     'require_celerity_resource' => 'applications/celerity/api.php',
   ),
   'xmap' => array(
-    'AlamancServiceEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacAddress' => 'Phobject',
     'AlmanacBinding' => array(
       'AlmanacDAO',
@@ -5369,6 +5368,7 @@
     'AlmanacServiceController' => 'AlmanacController',
     'AlmanacServiceDatasource' => 'PhabricatorTypeaheadDatasource',
     'AlmanacServiceDeletePropertyTransaction' => 'AlmanacServiceTransactionType',
+    'AlmanacServiceEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacServiceEditController' => 'AlmanacServiceController',
     'AlmanacServiceEditEngine' => 'PhabricatorEditEngine',
     'AlmanacServiceEditor' => 'AlmanacEditor',
diff --git a/src/applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacServiceEditConduitAPIMethod.php
similarity index 88%
rename from src/applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php
rename to src/applications/almanac/conduit/AlmanacServiceEditConduitAPIMethod.php
index d56b07a21d..3e1c07f7ea 100644
--- a/src/applications/almanac/conduit/AlamancServiceEditConduitAPIMethod.php
+++ b/src/applications/almanac/conduit/AlmanacServiceEditConduitAPIMethod.php
@@ -1,6 +1,6 @@
 <?php
 
-final class AlamancServiceEditConduitAPIMethod
+final class AlmanacServiceEditConduitAPIMethod
   extends PhabricatorEditEngineAPIMethod {
 
   public function getAPIMethodName() {

From 10947c868433005f40476476d2ccf320f516c9e0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 11:24:34 -0700
Subject: [PATCH 814/865] Add "almanac.namespace.edit" and
 "almanac.namespace.search" API methods

Summary: Depends on D19336. Ref T13120. Ref T12414. These are simple, straightforward, and uninteresting.

Test Plan:
  - Searched for namespaces with "almanac.namespace.search".
  - Created and edited namespaces with "almanac.namespace.edit".

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19337
---
 src/__phutil_library_map__.php                |  5 ++++
 .../AlmanacNamespaceEditConduitAPIMethod.php  | 19 +++++++++++++
 ...AlmanacNamespaceSearchConduitAPIMethod.php | 18 +++++++++++++
 .../almanac/storage/AlmanacNamespace.php      | 27 ++++++++++++++++++-
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/almanac/conduit/AlmanacNamespaceEditConduitAPIMethod.php
 create mode 100644 src/applications/almanac/conduit/AlmanacNamespaceSearchConduitAPIMethod.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e00296b8cc..08c07e7083 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -88,6 +88,7 @@
     'AlmanacNamesTestCase' => 'applications/almanac/util/__tests__/AlmanacNamesTestCase.php',
     'AlmanacNamespace' => 'applications/almanac/storage/AlmanacNamespace.php',
     'AlmanacNamespaceController' => 'applications/almanac/controller/AlmanacNamespaceController.php',
+    'AlmanacNamespaceEditConduitAPIMethod' => 'applications/almanac/conduit/AlmanacNamespaceEditConduitAPIMethod.php',
     'AlmanacNamespaceEditController' => 'applications/almanac/controller/AlmanacNamespaceEditController.php',
     'AlmanacNamespaceEditEngine' => 'applications/almanac/editor/AlmanacNamespaceEditEngine.php',
     'AlmanacNamespaceEditor' => 'applications/almanac/editor/AlmanacNamespaceEditor.php',
@@ -96,6 +97,7 @@
     'AlmanacNamespaceNameTransaction' => 'applications/almanac/xaction/AlmanacNamespaceNameTransaction.php',
     'AlmanacNamespacePHIDType' => 'applications/almanac/phid/AlmanacNamespacePHIDType.php',
     'AlmanacNamespaceQuery' => 'applications/almanac/query/AlmanacNamespaceQuery.php',
+    'AlmanacNamespaceSearchConduitAPIMethod' => 'applications/almanac/conduit/AlmanacNamespaceSearchConduitAPIMethod.php',
     'AlmanacNamespaceSearchEngine' => 'applications/almanac/query/AlmanacNamespaceSearchEngine.php',
     'AlmanacNamespaceTransaction' => 'applications/almanac/storage/AlmanacNamespaceTransaction.php',
     'AlmanacNamespaceTransactionQuery' => 'applications/almanac/query/AlmanacNamespaceTransactionQuery.php',
@@ -5301,8 +5303,10 @@
       'AlmanacPropertyInterface',
       'PhabricatorDestructibleInterface',
       'PhabricatorNgramsInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'AlmanacNamespaceController' => 'AlmanacController',
+    'AlmanacNamespaceEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacNamespaceEditController' => 'AlmanacNamespaceController',
     'AlmanacNamespaceEditEngine' => 'PhabricatorEditEngine',
     'AlmanacNamespaceEditor' => 'AlmanacEditor',
@@ -5311,6 +5315,7 @@
     'AlmanacNamespaceNameTransaction' => 'AlmanacNamespaceTransactionType',
     'AlmanacNamespacePHIDType' => 'PhabricatorPHIDType',
     'AlmanacNamespaceQuery' => 'AlmanacQuery',
+    'AlmanacNamespaceSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'AlmanacNamespaceSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'AlmanacNamespaceTransaction' => 'AlmanacModularTransaction',
     'AlmanacNamespaceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
diff --git a/src/applications/almanac/conduit/AlmanacNamespaceEditConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacNamespaceEditConduitAPIMethod.php
new file mode 100644
index 0000000000..e739cd6bb7
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacNamespaceEditConduitAPIMethod.php
@@ -0,0 +1,19 @@
+<?php
+
+final class AlmanacNamespaceEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.namespace.edit';
+  }
+
+  public function newEditEngine() {
+    return new AlmanacNamespaceEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'Apply transactions to create a new namespace or edit an existing one.');
+  }
+
+}
diff --git a/src/applications/almanac/conduit/AlmanacNamespaceSearchConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacNamespaceSearchConduitAPIMethod.php
new file mode 100644
index 0000000000..8b41326ef2
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacNamespaceSearchConduitAPIMethod.php
@@ -0,0 +1,18 @@
+<?php
+
+final class AlmanacNamespaceSearchConduitAPIMethod
+  extends PhabricatorSearchEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.namespace.search';
+  }
+
+  public function newSearchEngine() {
+    return new AlmanacNamespaceSearchEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht('Read information about Almanac namespaces.');
+  }
+
+}
diff --git a/src/applications/almanac/storage/AlmanacNamespace.php b/src/applications/almanac/storage/AlmanacNamespace.php
index 19ed40a87e..238a7b628b 100644
--- a/src/applications/almanac/storage/AlmanacNamespace.php
+++ b/src/applications/almanac/storage/AlmanacNamespace.php
@@ -8,7 +8,8 @@ final class AlmanacNamespace
     PhabricatorProjectInterface,
     AlmanacPropertyInterface,
     PhabricatorDestructibleInterface,
-    PhabricatorNgramsInterface {
+    PhabricatorNgramsInterface,
+    PhabricatorConduitResultInterface {
 
   protected $name;
   protected $nameIndex;
@@ -224,4 +225,28 @@ public function newNgrams() {
     );
   }
 
+
+/* -(  PhabricatorConduitResultInterface  )---------------------------------- */
+
+
+  public function getFieldSpecificationsForConduit() {
+    return array(
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('name')
+        ->setType('string')
+        ->setDescription(pht('The name of the namespace.')),
+    );
+  }
+
+  public function getFieldValuesForConduit() {
+    return array(
+      'name' => $this->getName(),
+    );
+  }
+
+  public function getConduitSearchAttachments() {
+    return array();
+  }
+
+
 }

From e502df509d5f8dd3106be50d7d83ac244ff96cb4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 10 Apr 2018 11:49:03 -0700
Subject: [PATCH 815/865] Implement "almanac.interface.search" and
 "almanac.interface.edit"

Summary: Depends on D19337. Ref T13120. Ref T12414. These are slightly more substantive than namespace/network, but pretty much standard fare.

Test Plan:
  - Searched for interfaces with "almanac.interface.search".
  - Created and edited interfaces with "almanac.interface.edit".
  - Created and edited interfaces with web UI since some stuff got tweaked.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19338
---
 src/__phutil_library_map__.php                |  9 +++
 .../AlmanacInterfaceEditConduitAPIMethod.php  | 19 +++++
 ...AlmanacInterfaceSearchConduitAPIMethod.php | 18 +++++
 .../editor/AlmanacInterfaceEditEngine.php     | 46 +++++++++++-
 .../query/AlmanacInterfaceSearchEngine.php    | 71 +++++++++++++++++++
 .../almanac/storage/AlmanacInterface.php      | 41 ++++++++++-
 .../editfield/PhabricatorIntEditField.php     | 14 ++++
 7 files changed, 216 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/almanac/conduit/AlmanacInterfaceEditConduitAPIMethod.php
 create mode 100644 src/applications/almanac/conduit/AlmanacInterfaceSearchConduitAPIMethod.php
 create mode 100644 src/applications/almanac/query/AlmanacInterfaceSearchEngine.php
 create mode 100644 src/applications/transactions/editfield/PhabricatorIntEditField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 08c07e7083..a45149a4b9 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -67,6 +67,7 @@
     'AlmanacInterfaceDeleteController' => 'applications/almanac/controller/AlmanacInterfaceDeleteController.php',
     'AlmanacInterfaceDestroyTransaction' => 'applications/almanac/xaction/AlmanacInterfaceDestroyTransaction.php',
     'AlmanacInterfaceDeviceTransaction' => 'applications/almanac/xaction/AlmanacInterfaceDeviceTransaction.php',
+    'AlmanacInterfaceEditConduitAPIMethod' => 'applications/almanac/conduit/AlmanacInterfaceEditConduitAPIMethod.php',
     'AlmanacInterfaceEditController' => 'applications/almanac/controller/AlmanacInterfaceEditController.php',
     'AlmanacInterfaceEditEngine' => 'applications/almanac/editor/AlmanacInterfaceEditEngine.php',
     'AlmanacInterfaceEditor' => 'applications/almanac/editor/AlmanacInterfaceEditor.php',
@@ -74,6 +75,8 @@
     'AlmanacInterfacePHIDType' => 'applications/almanac/phid/AlmanacInterfacePHIDType.php',
     'AlmanacInterfacePortTransaction' => 'applications/almanac/xaction/AlmanacInterfacePortTransaction.php',
     'AlmanacInterfaceQuery' => 'applications/almanac/query/AlmanacInterfaceQuery.php',
+    'AlmanacInterfaceSearchConduitAPIMethod' => 'applications/almanac/conduit/AlmanacInterfaceSearchConduitAPIMethod.php',
+    'AlmanacInterfaceSearchEngine' => 'applications/almanac/query/AlmanacInterfaceSearchEngine.php',
     'AlmanacInterfaceTableView' => 'applications/almanac/view/AlmanacInterfaceTableView.php',
     'AlmanacInterfaceTransaction' => 'applications/almanac/storage/AlmanacInterfaceTransaction.php',
     'AlmanacInterfaceTransactionType' => 'applications/almanac/xaction/AlmanacInterfaceTransactionType.php',
@@ -3223,6 +3226,7 @@
     'PhabricatorInlineSummaryView' => 'infrastructure/diff/view/PhabricatorInlineSummaryView.php',
     'PhabricatorInstructionsEditField' => 'applications/transactions/editfield/PhabricatorInstructionsEditField.php',
     'PhabricatorIntConfigType' => 'applications/config/type/PhabricatorIntConfigType.php',
+    'PhabricatorIntEditField' => 'applications/transactions/editfield/PhabricatorIntEditField.php',
     'PhabricatorIntExportField' => 'infrastructure/export/field/PhabricatorIntExportField.php',
     'PhabricatorInternalSetting' => 'applications/settings/setting/PhabricatorInternalSetting.php',
     'PhabricatorInternationalizationManagementExtractWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php',
@@ -5270,12 +5274,14 @@
       'PhabricatorDestructibleInterface',
       'PhabricatorExtendedPolicyInterface',
       'PhabricatorApplicationTransactionInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'AlmanacInterfaceAddressTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceDatasource' => 'PhabricatorTypeaheadDatasource',
     'AlmanacInterfaceDeleteController' => 'AlmanacDeviceController',
     'AlmanacInterfaceDestroyTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceDeviceTransaction' => 'AlmanacInterfaceTransactionType',
+    'AlmanacInterfaceEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacInterfaceEditController' => 'AlmanacDeviceController',
     'AlmanacInterfaceEditEngine' => 'PhabricatorEditEngine',
     'AlmanacInterfaceEditor' => 'AlmanacEditor',
@@ -5283,6 +5289,8 @@
     'AlmanacInterfacePHIDType' => 'PhabricatorPHIDType',
     'AlmanacInterfacePortTransaction' => 'AlmanacInterfaceTransactionType',
     'AlmanacInterfaceQuery' => 'AlmanacQuery',
+    'AlmanacInterfaceSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
+    'AlmanacInterfaceSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'AlmanacInterfaceTableView' => 'AphrontView',
     'AlmanacInterfaceTransaction' => 'AlmanacModularTransaction',
     'AlmanacInterfaceTransactionType' => 'AlmanacTransactionType',
@@ -8895,6 +8903,7 @@
     'PhabricatorInlineSummaryView' => 'AphrontView',
     'PhabricatorInstructionsEditField' => 'PhabricatorEditField',
     'PhabricatorIntConfigType' => 'PhabricatorTextConfigType',
+    'PhabricatorIntEditField' => 'PhabricatorEditField',
     'PhabricatorIntExportField' => 'PhabricatorExportField',
     'PhabricatorInternalSetting' => 'PhabricatorSetting',
     'PhabricatorInternationalizationManagementExtractWorkflow' => 'PhabricatorInternationalizationManagementWorkflow',
diff --git a/src/applications/almanac/conduit/AlmanacInterfaceEditConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacInterfaceEditConduitAPIMethod.php
new file mode 100644
index 0000000000..8f28b009ff
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacInterfaceEditConduitAPIMethod.php
@@ -0,0 +1,19 @@
+<?php
+
+final class AlmanacInterfaceEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.interface.edit';
+  }
+
+  public function newEditEngine() {
+    return new AlmanacInterfaceEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'Apply transactions to create a new interface or edit an existing one.');
+  }
+
+}
diff --git a/src/applications/almanac/conduit/AlmanacInterfaceSearchConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacInterfaceSearchConduitAPIMethod.php
new file mode 100644
index 0000000000..289fd3104b
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacInterfaceSearchConduitAPIMethod.php
@@ -0,0 +1,18 @@
+<?php
+
+final class AlmanacInterfaceSearchConduitAPIMethod
+  extends PhabricatorSearchEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.interface.search';
+  }
+
+  public function newSearchEngine() {
+    return new AlmanacInterfaceSearchEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht('Read information about Almanac interfaces.');
+  }
+
+}
diff --git a/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php b/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php
index c7e7992743..2c68ed0374 100644
--- a/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php
@@ -50,6 +50,50 @@ protected function newEditableObject() {
     return $interface;
   }
 
+  protected function newEditableObjectForDocumentation() {
+    $this->setDevice(new AlmanacDevice());
+    return $this->newEditableObject();
+  }
+
+  protected function newEditableObjectFromConduit(array $raw_xactions) {
+    $device_phid = null;
+    foreach ($raw_xactions as $raw_xaction) {
+      if ($raw_xaction['type'] !== 'device') {
+        continue;
+      }
+
+      $device_phid = $raw_xaction['value'];
+    }
+
+    if ($device_phid === null) {
+      throw new Exception(
+        pht(
+          'When creating a new Almanac interface via the Conduit API, you '.
+          'must provide a "device" transaction to select a device.'));
+    }
+
+    $device = id(new AlmanacDeviceQuery())
+      ->setViewer($this->getViewer())
+      ->withPHIDs(array($device_phid))
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->executeOne();
+    if (!$device) {
+      throw new Exception(
+        pht(
+          'Device "%s" is unrecognized, restricted, or you do not have '.
+          'permission to edit it.',
+          $device_phid));
+    }
+
+    $this->setDevice($device);
+
+    return $this->newEditableObject();
+  }
+
   protected function newObjectQuery() {
     return new AlmanacInterfaceQuery();
   }
@@ -126,7 +170,7 @@ protected function buildCustomEditFields($object) {
           AlmanacInterfaceAddressTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getAddress()),
-      id(new PhabricatorTextEditField())
+      id(new PhabricatorIntEditField())
         ->setKey('port')
         ->setLabel(pht('Port'))
         ->setDescription(pht('Port of the service.'))
diff --git a/src/applications/almanac/query/AlmanacInterfaceSearchEngine.php b/src/applications/almanac/query/AlmanacInterfaceSearchEngine.php
new file mode 100644
index 0000000000..9a3c5bc8f0
--- /dev/null
+++ b/src/applications/almanac/query/AlmanacInterfaceSearchEngine.php
@@ -0,0 +1,71 @@
+<?php
+
+final class AlmanacInterfaceSearchEngine
+  extends PhabricatorApplicationSearchEngine {
+
+  public function getResultTypeDescription() {
+    return pht('Almanac Interfaces');
+  }
+
+  public function getApplicationClassName() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
+  public function newQuery() {
+    return new AlmanacInterfaceQuery();
+  }
+
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorPHIDsSearchField())
+        ->setLabel(pht('Devices'))
+        ->setKey('devicePHIDs')
+        ->setAliases(array('device', 'devicePHID', 'devices'))
+        ->setDescription(pht('Search for interfaces on particular devices.')),
+    );
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+
+    if ($map['devicePHIDs']) {
+      $query->withDevicePHIDs($map['devicePHIDs']);
+    }
+
+    return $query;
+  }
+
+  protected function getURI($path) {
+    return '/almanac/interface/'.$path;
+  }
+
+  protected function getBuiltinQueryNames() {
+    $names = array(
+      'all' => pht('All Interfaces'),
+    );
+
+    return $names;
+  }
+
+  public function buildSavedQueryFromBuiltin($query_key) {
+    $query = $this->newSavedQuery();
+    $query->setQueryKey($query_key);
+
+    switch ($query_key) {
+      case 'all':
+        return $query;
+    }
+
+    return parent::buildSavedQueryFromBuiltin($query_key);
+  }
+
+  protected function renderResultList(
+    array $devices,
+    PhabricatorSavedQuery $query,
+    array $handles) {
+
+    // For now, this SearchEngine just supports API access via Conduit.
+    throw new PhutilMethodNotImplementedException();
+  }
+
+}
diff --git a/src/applications/almanac/storage/AlmanacInterface.php b/src/applications/almanac/storage/AlmanacInterface.php
index 98d1c3be52..4002651d08 100644
--- a/src/applications/almanac/storage/AlmanacInterface.php
+++ b/src/applications/almanac/storage/AlmanacInterface.php
@@ -6,7 +6,8 @@ final class AlmanacInterface
     PhabricatorPolicyInterface,
     PhabricatorDestructibleInterface,
     PhabricatorExtendedPolicyInterface,
-    PhabricatorApplicationTransactionInterface {
+    PhabricatorApplicationTransactionInterface,
+    PhabricatorConduitResultInterface {
 
   protected $devicePHID;
   protected $networkPHID;
@@ -177,4 +178,42 @@ public function willRenderTimeline(
     return $timeline;
   }
 
+
+/* -(  PhabricatorConduitResultInterface  )---------------------------------- */
+
+
+  public function getFieldSpecificationsForConduit() {
+    return array(
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('devicePHID')
+        ->setType('phid')
+        ->setDescription(pht('The device the interface is on.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('networkPHID')
+        ->setType('phid')
+        ->setDescription(pht('The network the interface is part of.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('address')
+        ->setType('string')
+        ->setDescription(pht('The address of the interface.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('port')
+        ->setType('int')
+        ->setDescription(pht('The port number of the interface.')),
+    );
+  }
+
+  public function getFieldValuesForConduit() {
+    return array(
+      'devicePHID' => $this->getDevicePHID(),
+      'networkPHID' => $this->getNetworkPHID(),
+      'address' => (string)$this->getAddress(),
+      'port' => (int)$this->getPort(),
+    );
+  }
+
+  public function getConduitSearchAttachments() {
+    return array();
+  }
+
 }
diff --git a/src/applications/transactions/editfield/PhabricatorIntEditField.php b/src/applications/transactions/editfield/PhabricatorIntEditField.php
new file mode 100644
index 0000000000..690b4c0b17
--- /dev/null
+++ b/src/applications/transactions/editfield/PhabricatorIntEditField.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PhabricatorIntEditField
+  extends PhabricatorEditField {
+
+  protected function newControl() {
+    return new AphrontFormTextControl();
+  }
+
+  protected function newConduitParameterType() {
+    return new ConduitIntParameterType();
+  }
+
+}

From 208504a5e363fe57e65533bd033ca90953e57e5b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 06:24:10 -0700
Subject: [PATCH 816/865] Provide "almanac.binding.search" and
 "almanac.binding.edit"

Summary:
Depends on D19338. Ref T13120. Ref T12414. These are the last of the new API methods.

This stuff still doesn't work:

  - You can't actually enable/disable bindings yet. I want to take a look at the use cases and consider changing "disabled" to "status", or providing a different way to solve the problem.
  - You can't edit properties via the API. I expect to enable this for all `AlmanacPropertyInterface` objects with an extension in a future change.

Test Plan:
  - Searched for bindings via API.
  - Viewed binding web UI for API methods.
  - Created bindings via API.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19340
---
 src/__phutil_library_map__.php                |  11 ++
 .../AlmanacBindingEditConduitAPIMethod.php    |  19 +++
 .../AlmanacBindingSearchConduitAPIMethod.php  |  18 ++
 .../editor/AlmanacBindingEditEngine.php       | 158 ++++++++++++++++++
 .../query/AlmanacBindingSearchEngine.php      |  80 +++++++++
 .../almanac/storage/AlmanacBinding.php        |  36 +++-
 .../AlmanacBindingServiceTransaction.php      |  64 +++++++
 7 files changed, 385 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/almanac/conduit/AlmanacBindingEditConduitAPIMethod.php
 create mode 100644 src/applications/almanac/conduit/AlmanacBindingSearchConduitAPIMethod.php
 create mode 100644 src/applications/almanac/editor/AlmanacBindingEditEngine.php
 create mode 100644 src/applications/almanac/query/AlmanacBindingSearchEngine.php
 create mode 100644 src/applications/almanac/xaction/AlmanacBindingServiceTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index a45149a4b9..2e5a384ac8 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -14,12 +14,17 @@
     'AlmanacBindingDeletePropertyTransaction' => 'applications/almanac/xaction/AlmanacBindingDeletePropertyTransaction.php',
     'AlmanacBindingDisableController' => 'applications/almanac/controller/AlmanacBindingDisableController.php',
     'AlmanacBindingDisableTransaction' => 'applications/almanac/xaction/AlmanacBindingDisableTransaction.php',
+    'AlmanacBindingEditConduitAPIMethod' => 'applications/almanac/conduit/AlmanacBindingEditConduitAPIMethod.php',
     'AlmanacBindingEditController' => 'applications/almanac/controller/AlmanacBindingEditController.php',
+    'AlmanacBindingEditEngine' => 'applications/almanac/editor/AlmanacBindingEditEngine.php',
     'AlmanacBindingEditor' => 'applications/almanac/editor/AlmanacBindingEditor.php',
     'AlmanacBindingInterfaceTransaction' => 'applications/almanac/xaction/AlmanacBindingInterfaceTransaction.php',
     'AlmanacBindingPHIDType' => 'applications/almanac/phid/AlmanacBindingPHIDType.php',
     'AlmanacBindingPropertyEditEngine' => 'applications/almanac/editor/AlmanacBindingPropertyEditEngine.php',
     'AlmanacBindingQuery' => 'applications/almanac/query/AlmanacBindingQuery.php',
+    'AlmanacBindingSearchConduitAPIMethod' => 'applications/almanac/conduit/AlmanacBindingSearchConduitAPIMethod.php',
+    'AlmanacBindingSearchEngine' => 'applications/almanac/query/AlmanacBindingSearchEngine.php',
+    'AlmanacBindingServiceTransaction' => 'applications/almanac/xaction/AlmanacBindingServiceTransaction.php',
     'AlmanacBindingSetPropertyTransaction' => 'applications/almanac/xaction/AlmanacBindingSetPropertyTransaction.php',
     'AlmanacBindingTableView' => 'applications/almanac/view/AlmanacBindingTableView.php',
     'AlmanacBindingTransaction' => 'applications/almanac/storage/AlmanacBindingTransaction.php',
@@ -5206,16 +5211,22 @@
       'AlmanacPropertyInterface',
       'PhabricatorDestructibleInterface',
       'PhabricatorExtendedPolicyInterface',
+      'PhabricatorConduitResultInterface',
     ),
     'AlmanacBindingDeletePropertyTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingDisableController' => 'AlmanacServiceController',
     'AlmanacBindingDisableTransaction' => 'AlmanacBindingTransactionType',
+    'AlmanacBindingEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'AlmanacBindingEditController' => 'AlmanacServiceController',
+    'AlmanacBindingEditEngine' => 'PhabricatorEditEngine',
     'AlmanacBindingEditor' => 'AlmanacEditor',
     'AlmanacBindingInterfaceTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingPHIDType' => 'PhabricatorPHIDType',
     'AlmanacBindingPropertyEditEngine' => 'AlmanacPropertyEditEngine',
     'AlmanacBindingQuery' => 'AlmanacQuery',
+    'AlmanacBindingSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
+    'AlmanacBindingSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'AlmanacBindingServiceTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingSetPropertyTransaction' => 'AlmanacBindingTransactionType',
     'AlmanacBindingTableView' => 'AphrontView',
     'AlmanacBindingTransaction' => 'AlmanacModularTransaction',
diff --git a/src/applications/almanac/conduit/AlmanacBindingEditConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacBindingEditConduitAPIMethod.php
new file mode 100644
index 0000000000..e36d9e0ded
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacBindingEditConduitAPIMethod.php
@@ -0,0 +1,19 @@
+<?php
+
+final class AlmanacBindingEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.binding.edit';
+  }
+
+  public function newEditEngine() {
+    return new AlmanacBindingEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'Apply transactions to create a new binding or edit an existing one.');
+  }
+
+}
diff --git a/src/applications/almanac/conduit/AlmanacBindingSearchConduitAPIMethod.php b/src/applications/almanac/conduit/AlmanacBindingSearchConduitAPIMethod.php
new file mode 100644
index 0000000000..f61cc58405
--- /dev/null
+++ b/src/applications/almanac/conduit/AlmanacBindingSearchConduitAPIMethod.php
@@ -0,0 +1,18 @@
+<?php
+
+final class AlmanacBindingSearchConduitAPIMethod
+  extends PhabricatorSearchEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'almanac.binding.search';
+  }
+
+  public function newSearchEngine() {
+    return new AlmanacBindingSearchEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht('Read information about Almanac bindings.');
+  }
+
+}
diff --git a/src/applications/almanac/editor/AlmanacBindingEditEngine.php b/src/applications/almanac/editor/AlmanacBindingEditEngine.php
new file mode 100644
index 0000000000..dfcd9dedcd
--- /dev/null
+++ b/src/applications/almanac/editor/AlmanacBindingEditEngine.php
@@ -0,0 +1,158 @@
+<?php
+
+final class AlmanacBindingEditEngine
+  extends PhabricatorEditEngine {
+
+  const ENGINECONST = 'almanac.binding';
+
+  private $service;
+
+  public function setService(AlmanacService $service) {
+    $this->service = $service;
+    return $this;
+  }
+
+  public function getService() {
+    if (!$this->service) {
+      throw new PhutilInvalidStateException('setService');
+    }
+    return $this->service;
+  }
+
+  public function isEngineConfigurable() {
+    return false;
+  }
+
+  public function getEngineName() {
+    return pht('Almanac Bindings');
+  }
+
+  public function getSummaryHeader() {
+    return pht('Edit Almanac Binding Configurations');
+  }
+
+  public function getSummaryText() {
+    return pht('This engine is used to edit Almanac bindings.');
+  }
+
+  public function getEngineApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
+  protected function newEditableObject() {
+    $service = $this->getService();
+    return AlmanacBinding::initializeNewBinding($service);
+  }
+
+  protected function newEditableObjectForDocumentation() {
+    $service_type = AlmanacCustomServiceType::SERVICETYPE;
+    $service = AlmanacService::initializeNewService($service_type);
+    $this->setService($service);
+    return $this->newEditableObject();
+  }
+
+  protected function newEditableObjectFromConduit(array $raw_xactions) {
+    $service_phid = null;
+    foreach ($raw_xactions as $raw_xaction) {
+      if ($raw_xaction['type'] !== 'service') {
+        continue;
+      }
+
+      $service_phid = $raw_xaction['value'];
+    }
+
+    if ($service_phid === null) {
+      throw new Exception(
+        pht(
+          'When creating a new Almanac binding via the Conduit API, you '.
+          'must provide a "service" transaction to select a service to bind.'));
+    }
+
+    $service = id(new AlmanacServiceQuery())
+      ->setViewer($this->getViewer())
+      ->withPHIDs(array($service_phid))
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->executeOne();
+    if (!$service) {
+      throw new Exception(
+        pht(
+          'Service "%s" is unrecognized, restricted, or you do not have '.
+          'permission to edit it.',
+          $service_phid));
+    }
+
+    $this->setService($service);
+
+    return $this->newEditableObject();
+  }
+
+  protected function newObjectQuery() {
+    return new AlmanacBindingQuery();
+  }
+
+  protected function getObjectCreateTitleText($object) {
+    return pht('Create Binding');
+  }
+
+  protected function getObjectCreateButtonText($object) {
+    return pht('Create Binding');
+  }
+
+  protected function getObjectEditTitleText($object) {
+    return pht('Edit Binding');
+  }
+
+  protected function getObjectEditShortText($object) {
+    return pht('Edit Binding');
+  }
+
+  protected function getObjectCreateShortText() {
+    return pht('Create Binding');
+  }
+
+  protected function getObjectName() {
+    return pht('Binding');
+  }
+
+  protected function getEditorURI() {
+    return '/almanac/binding/edit/';
+  }
+
+  protected function getObjectCreateCancelURI($object) {
+    return '/almanac/binding/';
+  }
+
+  protected function getObjectViewURI($object) {
+    return $object->getURI();
+  }
+
+  protected function buildCustomEditFields($object) {
+    return array(
+      id(new PhabricatorTextEditField())
+        ->setKey('service')
+        ->setLabel(pht('Service'))
+        ->setIsConduitOnly(true)
+        ->setTransactionType(
+          AlmanacBindingServiceTransaction::TRANSACTIONTYPE)
+        ->setDescription(pht('Service to create a binding for.'))
+        ->setConduitDescription(pht('Select the service to bind.'))
+        ->setConduitTypeDescription(pht('Service PHID.'))
+        ->setValue($object->getServicePHID()),
+      id(new PhabricatorTextEditField())
+        ->setKey('interface')
+        ->setLabel(pht('Interface'))
+        ->setIsConduitOnly(true)
+        ->setTransactionType(
+          AlmanacBindingInterfaceTransaction::TRANSACTIONTYPE)
+        ->setDescription(pht('Interface to bind the service to.'))
+        ->setConduitDescription(pht('Set the interface to bind.'))
+        ->setConduitTypeDescription(pht('Interface PHID.'))
+        ->setValue($object->getInterfacePHID()),
+    );
+  }
+
+}
diff --git a/src/applications/almanac/query/AlmanacBindingSearchEngine.php b/src/applications/almanac/query/AlmanacBindingSearchEngine.php
new file mode 100644
index 0000000000..fbeb7644b9
--- /dev/null
+++ b/src/applications/almanac/query/AlmanacBindingSearchEngine.php
@@ -0,0 +1,80 @@
+<?php
+
+final class AlmanacBindingSearchEngine
+  extends PhabricatorApplicationSearchEngine {
+
+  public function getResultTypeDescription() {
+    return pht('Almanac Bindings');
+  }
+
+  public function getApplicationClassName() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
+  public function newQuery() {
+    return new AlmanacBindingQuery();
+  }
+
+  protected function buildCustomSearchFields() {
+    return array(
+      id(new PhabricatorPHIDsSearchField())
+        ->setLabel(pht('Services'))
+        ->setKey('servicePHIDs')
+        ->setAliases(array('service', 'servicePHID', 'services'))
+        ->setDescription(pht('Search for bindings on particular services.')),
+      id(new PhabricatorPHIDsSearchField())
+        ->setLabel(pht('Devices'))
+        ->setKey('devicePHIDs')
+        ->setAliases(array('device', 'devicePHID', 'devices'))
+        ->setDescription(pht('Search for bindings on particular devices.')),
+    );
+  }
+
+  protected function buildQueryFromParameters(array $map) {
+    $query = $this->newQuery();
+
+    if ($map['servicePHIDs']) {
+      $query->withServicePHIDs($map['servicePHIDs']);
+    }
+
+    if ($map['devicePHIDs']) {
+      $query->withDevicePHIDs($map['devicePHIDs']);
+    }
+
+    return $query;
+  }
+
+  protected function getURI($path) {
+    return '/almanac/binding/'.$path;
+  }
+
+  protected function getBuiltinQueryNames() {
+    $names = array(
+      'all' => pht('All Bindings'),
+    );
+
+    return $names;
+  }
+
+  public function buildSavedQueryFromBuiltin($query_key) {
+    $query = $this->newSavedQuery();
+    $query->setQueryKey($query_key);
+
+    switch ($query_key) {
+      case 'all':
+        return $query;
+    }
+
+    return parent::buildSavedQueryFromBuiltin($query_key);
+  }
+
+  protected function renderResultList(
+    array $devices,
+    PhabricatorSavedQuery $query,
+    array $handles) {
+
+    // For now, this SearchEngine just supports API access via Conduit.
+    throw new PhutilMethodNotImplementedException();
+  }
+
+}
diff --git a/src/applications/almanac/storage/AlmanacBinding.php b/src/applications/almanac/storage/AlmanacBinding.php
index 59a7666f8c..1641120900 100644
--- a/src/applications/almanac/storage/AlmanacBinding.php
+++ b/src/applications/almanac/storage/AlmanacBinding.php
@@ -7,7 +7,8 @@ final class AlmanacBinding
     PhabricatorApplicationTransactionInterface,
     AlmanacPropertyInterface,
     PhabricatorDestructibleInterface,
-    PhabricatorExtendedPolicyInterface {
+    PhabricatorExtendedPolicyInterface,
+    PhabricatorConduitResultInterface {
 
   protected $servicePHID;
   protected $devicePHID;
@@ -23,6 +24,7 @@ final class AlmanacBinding
   public static function initializeNewBinding(AlmanacService $service) {
     return id(new AlmanacBinding())
       ->setServicePHID($service->getPHID())
+      ->attachService($service)
       ->attachAlmanacProperties(array())
       ->setIsDisabled(0);
   }
@@ -225,4 +227,36 @@ public function destroyObjectPermanently(
   }
 
 
+/* -(  PhabricatorConduitResultInterface  )---------------------------------- */
+
+
+  public function getFieldSpecificationsForConduit() {
+    return array(
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('servicePHID')
+        ->setType('phid')
+        ->setDescription(pht('The bound service.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('devicePHID')
+        ->setType('phid')
+        ->setDescription(pht('The device the service is bound to.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('interfacePHID')
+        ->setType('phid')
+        ->setDescription(pht('The interface the service is bound to.')),
+    );
+  }
+
+  public function getFieldValuesForConduit() {
+    return array(
+      'servicePHID' => $this->getServicePHID(),
+      'devicePHID' => $this->getDevicePHID(),
+      'interfacePHID' => $this->getInterfacePHID(),
+    );
+  }
+
+  public function getConduitSearchAttachments() {
+    return array();
+  }
+
 }
diff --git a/src/applications/almanac/xaction/AlmanacBindingServiceTransaction.php b/src/applications/almanac/xaction/AlmanacBindingServiceTransaction.php
new file mode 100644
index 0000000000..4b9f802b27
--- /dev/null
+++ b/src/applications/almanac/xaction/AlmanacBindingServiceTransaction.php
@@ -0,0 +1,64 @@
+<?php
+
+final class AlmanacBindingServiceTransaction
+  extends AlmanacBindingTransactionType {
+
+  const TRANSACTIONTYPE = 'almanac:binding:service';
+
+  public function generateOldValue($object) {
+    return $object->getServicePHID();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setServicePHID($value);
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    $service_phid = $object->getServicePHID();
+    if ($this->isEmptyTextTransaction($service_phid, $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Bindings must have a service.'));
+    }
+
+    foreach ($xactions as $xaction) {
+      if (!$this->isNewObject()) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'The service for a binding can not be changed once it has '.
+            'been created.'),
+          $xaction);
+        continue;
+      }
+
+      $service_phid = $xaction->getNewValue();
+      $services = id(new AlmanacServiceQuery())
+        ->setViewer($this->getActor())
+        ->withPHIDs(array($service_phid))
+        ->execute();
+      if (!$services) {
+        $errors[] = $this->newInvalidError(
+          pht('You can not bind a nonexistent or restricted service.'),
+          $xaction);
+        continue;
+      }
+
+      $service = head($services);
+      $can_edit = PhabricatorPolicyFilter::hasCapability(
+        $this->getActor(),
+        $service,
+        PhabricatorPolicyCapability::CAN_EDIT);
+      if (!$can_edit) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'You can not bind a service which you do not have permission '.
+            'to edit.'));
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}

From d56a37b636739d467bfc65112db7d9de2f97d0ab Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 07:11:28 -0700
Subject: [PATCH 817/865] Allow Almanac Bindings to be enabled/disabled via API
 and support the "properties" attachment

Summary:
Depends on D19340. Ref T12414. Ref T13120. See T12414 for some discussion about direction here.

Since I think retaining "enabled/disabled" as a simple flag is reasonable, expose it via the API for readers and writers.

Also expose binding properties.

Test Plan:
  - Searched for bindings and properties with "alamanc.binding.search".
  - Enabled and disabled bindings with "almanac.binding.edit".

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19341
---
 .../almanac/editor/AlmanacBindingEditEngine.php     | 13 +++++++++++++
 src/applications/almanac/storage/AlmanacBinding.php | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/applications/almanac/editor/AlmanacBindingEditEngine.php b/src/applications/almanac/editor/AlmanacBindingEditEngine.php
index dfcd9dedcd..07a9e36e9e 100644
--- a/src/applications/almanac/editor/AlmanacBindingEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacBindingEditEngine.php
@@ -152,6 +152,19 @@ protected function buildCustomEditFields($object) {
         ->setConduitDescription(pht('Set the interface to bind.'))
         ->setConduitTypeDescription(pht('Interface PHID.'))
         ->setValue($object->getInterfacePHID()),
+      id(new PhabricatorBoolEditField())
+        ->setKey('disabled')
+        ->setLabel(pht('Disabled'))
+        ->setIsConduitOnly(true)
+        ->setTransactionType(
+          AlmanacBindingDisableTransaction::TRANSACTIONTYPE)
+        ->setDescription(pht('Disable or enable the binding.'))
+        ->setConduitDescription(pht('Disable or enable the binding.'))
+        ->setConduitTypeDescription(pht('True to disable the binding.'))
+        ->setValue($object->getIsDisabled())
+        ->setOptions(
+          pht('Enable Binding'),
+          pht('Disable Binding')),
     );
   }
 
diff --git a/src/applications/almanac/storage/AlmanacBinding.php b/src/applications/almanac/storage/AlmanacBinding.php
index 1641120900..be70a5ecdc 100644
--- a/src/applications/almanac/storage/AlmanacBinding.php
+++ b/src/applications/almanac/storage/AlmanacBinding.php
@@ -244,6 +244,10 @@ public function getFieldSpecificationsForConduit() {
         ->setKey('interfacePHID')
         ->setType('phid')
         ->setDescription(pht('The interface the service is bound to.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('disabled')
+        ->setType('bool')
+        ->setDescription(pht('Interface status.')),
     );
   }
 
@@ -252,11 +256,15 @@ public function getFieldValuesForConduit() {
       'servicePHID' => $this->getServicePHID(),
       'devicePHID' => $this->getDevicePHID(),
       'interfacePHID' => $this->getInterfacePHID(),
+      'disabled' => (bool)$this->getIsDisabled(),
     );
   }
 
   public function getConduitSearchAttachments() {
-    return array();
+    return array(
+      id(new AlmanacPropertiesSearchEngineAttachment())
+        ->setAttachmentKey('properties'),
+    );
   }
 
 }

From c1558031c29063d0195f78b0838522dac221e8fb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 08:36:05 -0700
Subject: [PATCH 818/865] Make various small quality-of-life improvements for
 Almanac properties

Summary:
Depends on D19341. Ref T12414. Ref T13120.

  - Fix a bug where default-valued properties didn't get rendered in grey as they're supposed to (as a hint that the value isn't customized).
  - When resetting a builtin property won't do anything, visually disable the button as a hint.
  - Allow Services to specify properties on their Bindings.
  - Specify that repository bindings have a "protocol" property, so it becomes an explicit thing in the UI. Previously, you had to read the documentation to figure this out.
  - When editing bindings, use the EditField and its configuration if possible. This turns the "Protocol" property into a dropdown in the UI where you select between "http", "https" and "ssh".
  - Give the "protocol" binding a smart default based on the port number of the corresponding interface.

Test Plan:
  - Viewed properties on Services, Devices and Bindings.
  - Saw them render sensibly, and grey out + grey button when a builtin value has a default setting.
  - Saw "Protocol" appear as a default property on repository cluster bindings and get a smart value.
  - Edited "protocol", got a nice dropdown.

{F5518791}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19342
---
 .../almanac/controller/AlmanacController.php  |  5 +--
 .../editor/AlmanacPropertyEditEngine.php      |  9 +++++-
 .../almanac/query/AlmanacQuery.php            |  4 ++-
 .../AlmanacClusterRepositoryServiceType.php   | 32 +++++++++++++++++++
 .../servicetype/AlmanacServiceType.php        |  4 +++
 .../almanac/storage/AlmanacBinding.php        |  6 +++-
 .../almanac/storage/AlmanacService.php        |  5 +++
 7 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php
index d6d7188511..24a8986766 100644
--- a/src/applications/almanac/controller/AlmanacController.php
+++ b/src/applications/almanac/controller/AlmanacController.php
@@ -38,7 +38,7 @@ protected function buildAlmanacPropertiesTable(
         ));
 
     $builtins = $object->getAlmanacPropertyFieldSpecifications();
-    $defaults = mpull($builtins, null, 'getValueForTransaction');
+    $defaults = mpull($builtins, 'getValueForTransaction');
 
     // Sort fields so builtin fields appear first, then fields are ordered
     // alphabetically.
@@ -65,6 +65,7 @@ protected function buildAlmanacPropertiesTable(
       $value = $property->getFieldValue();
 
       $is_builtin = isset($builtins[$key]);
+      $is_persistent = (bool)$property->getID();
 
       $delete_uri = id(new PhutilURI($delete_base))
         ->setQueryParams(
@@ -83,7 +84,7 @@ protected function buildAlmanacPropertiesTable(
       $delete = javelin_tag(
         'a',
         array(
-          'class' => ($can_edit
+          'class' => (($can_edit && $is_persistent)
             ? 'button button-grey small'
             : 'button button-grey small disabled'),
           'sigil' => 'workflow',
diff --git a/src/applications/almanac/editor/AlmanacPropertyEditEngine.php b/src/applications/almanac/editor/AlmanacPropertyEditEngine.php
index e5bfd2822a..38139f79fa 100644
--- a/src/applications/almanac/editor/AlmanacPropertyEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacPropertyEditEngine.php
@@ -66,8 +66,15 @@ protected function buildCustomEditFields($object) {
     $property_key = $this->getPropertyKey();
     $xaction_type = $object->getAlmanacPropertySetTransactionType();
 
+    $specs = $object->getAlmanacPropertyFieldSpecifications();
+    if (isset($specs[$property_key])) {
+      $field_template = clone $specs[$property_key];
+    } else {
+      $field_template = new PhabricatorTextEditField();
+    }
+
     return array(
-      id(new PhabricatorTextEditField())
+      $field_template
         ->setKey('value')
         ->setMetadataValue('almanac.property', $property_key)
         ->setLabel($property_key)
diff --git a/src/applications/almanac/query/AlmanacQuery.php b/src/applications/almanac/query/AlmanacQuery.php
index b046171d32..b5b6146c7f 100644
--- a/src/applications/almanac/query/AlmanacQuery.php
+++ b/src/applications/almanac/query/AlmanacQuery.php
@@ -34,10 +34,12 @@ protected function didFilterPage(array $objects) {
         $specs = $object->getAlmanacPropertyFieldSpecifications();
         foreach ($specs as $key => $spec) {
           if (empty($object_properties[$key])) {
+            $default_value = $spec->getValueForTransaction();
+
             $object_properties[$key] = id(new AlmanacProperty())
               ->setObjectPHID($object->getPHID())
               ->setFieldName($key)
-              ->setFieldValue($spec->getValueForTransaction());
+              ->setFieldValue($default_value);
           }
         }
 
diff --git a/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php b/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
index 259092b5b1..fffe94997a 100644
--- a/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
+++ b/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
@@ -24,4 +24,36 @@ public function getFieldSpecifications() {
     );
   }
 
+  public function getBindingFieldSpecifications(AlmanacBinding $binding) {
+    $protocols = array(
+      array(
+        'value' => 'http',
+        'port' => 80,
+      ),
+      array(
+        'value' => 'https',
+        'port' => 443,
+      ),
+      array(
+        'value' => 'ssh',
+        'port' => 22,
+      ),
+    );
+
+    $default_value = 'http';
+    if ($binding->hasInterface()) {
+      $interface = $binding->getInterface();
+      $port = $interface->getPort();
+
+      $default_ports = ipull($protocols, 'value', 'port');
+      $default_value = idx($default_ports, $port, $default_value);
+    }
+
+    return array(
+      'protocol' => id(new PhabricatorSelectEditField())
+        ->setOptions(ipull($protocols, 'value', 'value'))
+        ->setValue($default_value),
+    );
+  }
+
 }
diff --git a/src/applications/almanac/servicetype/AlmanacServiceType.php b/src/applications/almanac/servicetype/AlmanacServiceType.php
index 2eb56dc8c4..2f7f503fe8 100644
--- a/src/applications/almanac/servicetype/AlmanacServiceType.php
+++ b/src/applications/almanac/servicetype/AlmanacServiceType.php
@@ -60,6 +60,10 @@ public function getFieldSpecifications() {
     return array();
   }
 
+  public function getBindingFieldSpecifications(AlmanacBinding $binding) {
+    return array();
+  }
+
   /**
    * List all available service type implementations.
    *
diff --git a/src/applications/almanac/storage/AlmanacBinding.php b/src/applications/almanac/storage/AlmanacBinding.php
index be70a5ecdc..c593e40fa7 100644
--- a/src/applications/almanac/storage/AlmanacBinding.php
+++ b/src/applications/almanac/storage/AlmanacBinding.php
@@ -88,6 +88,10 @@ public function attachDevice(AlmanacDevice $device) {
     return $this;
   }
 
+  public function hasInterface() {
+    return ($this->interface !== self::ATTACHABLE);
+  }
+
   public function getInterface() {
     return $this->assertAttached($this->interface);
   }
@@ -129,7 +133,7 @@ public function getAlmanacPropertyValue($key, $default = null) {
   }
 
   public function getAlmanacPropertyFieldSpecifications() {
-    return array();
+    return $this->getService()->getBindingFieldSpecifications($this);
   }
 
   public function newAlmanacPropertyEditEngine() {
diff --git a/src/applications/almanac/storage/AlmanacService.php b/src/applications/almanac/storage/AlmanacService.php
index 361eabca2a..ee40d83400 100644
--- a/src/applications/almanac/storage/AlmanacService.php
+++ b/src/applications/almanac/storage/AlmanacService.php
@@ -156,6 +156,11 @@ public function getAlmanacPropertyFieldSpecifications() {
     return $this->getServiceImplementation()->getFieldSpecifications();
   }
 
+  public function getBindingFieldSpecifications(AlmanacBinding $binding) {
+    $impl = $this->getServiceImplementation();
+    return $impl->getBindingFieldSpecifications($binding);
+  }
+
   public function newAlmanacPropertyEditEngine() {
     return new AlmanacServicePropertyEditEngine();
   }

From ea9187ea92ecdee9a28612c83205cb8c7ddde259 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 09:02:11 -0700
Subject: [PATCH 819/865] Allow Almanac properties to be set and deleted via
 Conduit

Summary:
Depends on D19342. Ref T12414. Ref T13120. This adds an EditEngine extension for editing Almanac properties.

The actual wire format is a little weird. Normally, we'd have a transaction for each property, but since you can pick any property names you want we can't really do that (we'd have to generate infinite transactions).

The transaction wire format anticipates that transactions may eventually get some kind of metadata -- each transaction looks like this:

```
{
  "type": "title",
  "value": "Example title"
}
```

...and we can add more keys there. For example, I could have made this transaction look like this:

```
{
  "type": "property.set",
  "almanac.property.key": "some-key",
  "value": "some-value"
}
```

However, I don't want to just accept any possible key freely, and it might be a decent chunk of work to formalize this better. It also doesn't feel great.

I just built special transaction types intead, so you:

```
{
  "type": "property.set",
  "value": {
   "some-key": "some-value",
   ...
  }
}
```

Internally, we may generate more than one transaction as a result (if the "value" has more than one key).

This feels a bit more natural and is probably easier for clients to use anyway.

Test Plan: Set and deleted Service, Device and Binding properties via the API.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T12414

Differential Revision: https://secure.phabricator.com/D19343
---
 src/__phutil_library_map__.php                | 10 +++++
 .../editor/AlmanacBindingEditEngine.php       |  3 +-
 .../editor/AlmanacDeviceEditEngine.php        |  3 +-
 .../editor/AlmanacServiceEditEngine.php       |  3 +-
 .../AlmanacDeletePropertyEditField.php        | 22 ++++++++++
 .../AlmanacDeletePropertyEditType.php         | 36 +++++++++++++++
 .../AlmanacPropertiesEditEngineExtension.php  | 44 +++++++++++++++++++
 .../AlmanacSetPropertyEditField.php           | 22 ++++++++++
 .../AlmanacSetPropertyEditType.php            | 28 ++++++++++++
 9 files changed, 168 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/almanac/engineextension/AlmanacDeletePropertyEditField.php
 create mode 100644 src/applications/almanac/engineextension/AlmanacDeletePropertyEditType.php
 create mode 100644 src/applications/almanac/engineextension/AlmanacPropertiesEditEngineExtension.php
 create mode 100644 src/applications/almanac/engineextension/AlmanacSetPropertyEditField.php
 create mode 100644 src/applications/almanac/engineextension/AlmanacSetPropertyEditType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2e5a384ac8..da5674cbbd 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -44,6 +44,8 @@
     'AlmanacCreateServicesCapability' => 'applications/almanac/capability/AlmanacCreateServicesCapability.php',
     'AlmanacCustomServiceType' => 'applications/almanac/servicetype/AlmanacCustomServiceType.php',
     'AlmanacDAO' => 'applications/almanac/storage/AlmanacDAO.php',
+    'AlmanacDeletePropertyEditField' => 'applications/almanac/engineextension/AlmanacDeletePropertyEditField.php',
+    'AlmanacDeletePropertyEditType' => 'applications/almanac/engineextension/AlmanacDeletePropertyEditType.php',
     'AlmanacDevice' => 'applications/almanac/storage/AlmanacDevice.php',
     'AlmanacDeviceController' => 'applications/almanac/controller/AlmanacDeviceController.php',
     'AlmanacDeviceDeletePropertyTransaction' => 'applications/almanac/xaction/AlmanacDeviceDeletePropertyTransaction.php',
@@ -129,6 +131,7 @@
     'AlmanacNetworkTransactionType' => 'applications/almanac/xaction/AlmanacNetworkTransactionType.php',
     'AlmanacNetworkViewController' => 'applications/almanac/controller/AlmanacNetworkViewController.php',
     'AlmanacPropertiesDestructionEngineExtension' => 'applications/almanac/engineextension/AlmanacPropertiesDestructionEngineExtension.php',
+    'AlmanacPropertiesEditEngineExtension' => 'applications/almanac/engineextension/AlmanacPropertiesEditEngineExtension.php',
     'AlmanacPropertiesSearchEngineAttachment' => 'applications/almanac/engineextension/AlmanacPropertiesSearchEngineAttachment.php',
     'AlmanacProperty' => 'applications/almanac/storage/AlmanacProperty.php',
     'AlmanacPropertyController' => 'applications/almanac/controller/AlmanacPropertyController.php',
@@ -165,6 +168,8 @@
     'AlmanacServiceTypeTestCase' => 'applications/almanac/servicetype/__tests__/AlmanacServiceTypeTestCase.php',
     'AlmanacServiceTypeTransaction' => 'applications/almanac/xaction/AlmanacServiceTypeTransaction.php',
     'AlmanacServiceViewController' => 'applications/almanac/controller/AlmanacServiceViewController.php',
+    'AlmanacSetPropertyEditField' => 'applications/almanac/engineextension/AlmanacSetPropertyEditField.php',
+    'AlmanacSetPropertyEditType' => 'applications/almanac/engineextension/AlmanacSetPropertyEditType.php',
     'AlmanacTransactionType' => 'applications/almanac/xaction/AlmanacTransactionType.php',
     'AphlictDropdownDataQuery' => 'applications/aphlict/query/AphlictDropdownDataQuery.php',
     'Aphront304Response' => 'aphront/response/Aphront304Response.php',
@@ -5246,6 +5251,8 @@
     'AlmanacCreateServicesCapability' => 'PhabricatorPolicyCapability',
     'AlmanacCustomServiceType' => 'AlmanacServiceType',
     'AlmanacDAO' => 'PhabricatorLiskDAO',
+    'AlmanacDeletePropertyEditField' => 'PhabricatorEditField',
+    'AlmanacDeletePropertyEditType' => 'PhabricatorEditType',
     'AlmanacDevice' => array(
       'AlmanacDAO',
       'PhabricatorPolicyInterface',
@@ -5365,6 +5372,7 @@
     'AlmanacNetworkTransactionType' => 'AlmanacTransactionType',
     'AlmanacNetworkViewController' => 'AlmanacNetworkController',
     'AlmanacPropertiesDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
+    'AlmanacPropertiesEditEngineExtension' => 'PhabricatorEditEngineExtension',
     'AlmanacPropertiesSearchEngineAttachment' => 'AlmanacSearchEngineAttachment',
     'AlmanacProperty' => array(
       'AlmanacDAO',
@@ -5413,6 +5421,8 @@
     'AlmanacServiceTypeTestCase' => 'PhabricatorTestCase',
     'AlmanacServiceTypeTransaction' => 'AlmanacServiceTransactionType',
     'AlmanacServiceViewController' => 'AlmanacServiceController',
+    'AlmanacSetPropertyEditField' => 'PhabricatorEditField',
+    'AlmanacSetPropertyEditType' => 'PhabricatorEditType',
     'AlmanacTransactionType' => 'PhabricatorModularTransactionType',
     'AphlictDropdownDataQuery' => 'Phobject',
     'Aphront304Response' => 'AphrontResponse',
diff --git a/src/applications/almanac/editor/AlmanacBindingEditEngine.php b/src/applications/almanac/editor/AlmanacBindingEditEngine.php
index 07a9e36e9e..5146578fff 100644
--- a/src/applications/almanac/editor/AlmanacBindingEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacBindingEditEngine.php
@@ -91,7 +91,8 @@ protected function newEditableObjectFromConduit(array $raw_xactions) {
   }
 
   protected function newObjectQuery() {
-    return new AlmanacBindingQuery();
+    return id(new AlmanacBindingQuery())
+      ->needProperties(true);
   }
 
   protected function getObjectCreateTitleText($object) {
diff --git a/src/applications/almanac/editor/AlmanacDeviceEditEngine.php b/src/applications/almanac/editor/AlmanacDeviceEditEngine.php
index 84ca59d310..fa0625e6ed 100644
--- a/src/applications/almanac/editor/AlmanacDeviceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacDeviceEditEngine.php
@@ -30,7 +30,8 @@ protected function newEditableObject() {
   }
 
   protected function newObjectQuery() {
-    return new AlmanacDeviceQuery();
+    return id(new AlmanacDeviceQuery())
+      ->needProperties(true);
   }
 
   protected function getObjectCreateTitleText($object) {
diff --git a/src/applications/almanac/editor/AlmanacServiceEditEngine.php b/src/applications/almanac/editor/AlmanacServiceEditEngine.php
index 93912fad8b..00e54962b3 100644
--- a/src/applications/almanac/editor/AlmanacServiceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacServiceEditEngine.php
@@ -79,7 +79,8 @@ protected function newEditableObjectForDocumentation() {
   }
 
   protected function newObjectQuery() {
-    return new AlmanacServiceQuery();
+    return id(new AlmanacServiceQuery())
+      ->needProperties(true);
   }
 
   protected function getObjectCreateTitleText($object) {
diff --git a/src/applications/almanac/engineextension/AlmanacDeletePropertyEditField.php b/src/applications/almanac/engineextension/AlmanacDeletePropertyEditField.php
new file mode 100644
index 0000000000..82aa4b82b5
--- /dev/null
+++ b/src/applications/almanac/engineextension/AlmanacDeletePropertyEditField.php
@@ -0,0 +1,22 @@
+<?php
+
+final class AlmanacDeletePropertyEditField
+  extends PhabricatorEditField {
+
+  protected function newControl() {
+    return null;
+  }
+
+  protected function newHTTPParameterType() {
+    return null;
+  }
+
+  protected function newConduitParameterType() {
+    return new ConduitStringListParameterType();
+  }
+
+  protected function newEditType() {
+    return new AlmanacDeletePropertyEditType();
+  }
+
+}
diff --git a/src/applications/almanac/engineextension/AlmanacDeletePropertyEditType.php b/src/applications/almanac/engineextension/AlmanacDeletePropertyEditType.php
new file mode 100644
index 0000000000..d9d95c355a
--- /dev/null
+++ b/src/applications/almanac/engineextension/AlmanacDeletePropertyEditType.php
@@ -0,0 +1,36 @@
+<?php
+
+final class AlmanacDeletePropertyEditType
+  extends PhabricatorEditType {
+
+  public function generateTransactions(
+    PhabricatorApplicationTransaction $template,
+    array $spec) {
+
+    $value = idx($spec, 'value');
+    if (!is_array($value)) {
+      throw new Exception(
+        pht(
+          'Transaction value when deleting Almanac properties must be a list '.
+          'of property names.'));
+    }
+
+    $xactions = array();
+    foreach ($value as $idx => $property_key) {
+      if (!is_string($property_key)) {
+        throw new Exception(
+          pht(
+            'When deleting Almanac properties, each property name must '.
+            'be a string. The value at index "%s" is not a string.',
+            $idx));
+      }
+
+      $xactions[] = $this->newTransaction($template)
+        ->setMetadataValue('almanac.property', $property_key)
+        ->setNewValue(true);
+    }
+
+    return $xactions;
+  }
+
+}
diff --git a/src/applications/almanac/engineextension/AlmanacPropertiesEditEngineExtension.php b/src/applications/almanac/engineextension/AlmanacPropertiesEditEngineExtension.php
new file mode 100644
index 0000000000..965c193f40
--- /dev/null
+++ b/src/applications/almanac/engineextension/AlmanacPropertiesEditEngineExtension.php
@@ -0,0 +1,44 @@
+<?php
+
+final class AlmanacPropertiesEditEngineExtension
+  extends PhabricatorEditEngineExtension {
+
+  const EXTENSIONKEY = 'almanac.properties';
+
+  public function isExtensionEnabled() {
+    return true;
+  }
+
+  public function getExtensionName() {
+    return pht('Almanac Properties');
+  }
+
+  public function supportsObject(
+    PhabricatorEditEngine $engine,
+    PhabricatorApplicationTransactionInterface $object) {
+    return ($object instanceof AlmanacPropertyInterface);
+  }
+
+  public function buildCustomEditFields(
+    PhabricatorEditEngine $engine,
+    PhabricatorApplicationTransactionInterface $object) {
+
+    return array(
+      id(new AlmanacSetPropertyEditField())
+        ->setKey('property.set')
+        ->setTransactionType($object->getAlmanacPropertySetTransactionType())
+        ->setConduitDescription(
+          pht('Pass a map of values to set one or more properties.'))
+        ->setConduitTypeDescription(pht('Map of property names to values.'))
+        ->setIsConduitOnly(true),
+      id(new AlmanacDeletePropertyEditField())
+        ->setKey('property.delete')
+        ->setTransactionType($object->getAlmanacPropertyDeleteTransactionType())
+        ->setConduitDescription(
+          pht('Pass a list of property names to delete properties.'))
+        ->setConduitTypeDescription(pht('List of property names.'))
+        ->setIsConduitOnly(true),
+    );
+  }
+
+}
diff --git a/src/applications/almanac/engineextension/AlmanacSetPropertyEditField.php b/src/applications/almanac/engineextension/AlmanacSetPropertyEditField.php
new file mode 100644
index 0000000000..aec3ea6c9f
--- /dev/null
+++ b/src/applications/almanac/engineextension/AlmanacSetPropertyEditField.php
@@ -0,0 +1,22 @@
+<?php
+
+final class AlmanacSetPropertyEditField
+  extends PhabricatorEditField {
+
+  protected function newControl() {
+    return null;
+  }
+
+  protected function newHTTPParameterType() {
+    return null;
+  }
+
+  protected function newConduitParameterType() {
+    return new ConduitWildParameterType();
+  }
+
+  protected function newEditType() {
+    return new AlmanacSetPropertyEditType();
+  }
+
+}
diff --git a/src/applications/almanac/engineextension/AlmanacSetPropertyEditType.php b/src/applications/almanac/engineextension/AlmanacSetPropertyEditType.php
new file mode 100644
index 0000000000..8a654382c6
--- /dev/null
+++ b/src/applications/almanac/engineextension/AlmanacSetPropertyEditType.php
@@ -0,0 +1,28 @@
+<?php
+
+final class AlmanacSetPropertyEditType
+  extends PhabricatorEditType {
+
+  public function generateTransactions(
+    PhabricatorApplicationTransaction $template,
+    array $spec) {
+
+    $value = idx($spec, 'value');
+    if (!is_array($value)) {
+      throw new Exception(
+        pht(
+          'Transaction value when setting Almanac properties must be a map '.
+          'with property names as keys.'));
+    }
+
+    $xactions = array();
+    foreach ($value as $property_key => $property_value) {
+      $xactions[] = $this->newTransaction($template)
+        ->setMetadataValue('almanac.property', $property_key)
+        ->setNewValue($property_value);
+    }
+
+    return $xactions;
+  }
+
+}

From d6ef32a7b7546639626b4903473eec56687524e0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 09:40:05 -0700
Subject: [PATCH 820/865] Give the "Filetree" UI element an explicit background
 color

Summary:
See PHI568. If you make the file tree UI very wide so that the page generates a horizontal scrollbar and then scroll the page, the page content can paint underneath the menu.

The menu already has a z-index to make it render above the content, but doesn't actually have a background. Give it a background.

The "transparent" rule was added in D16346 but I don't see any reason why we actually need it there, so I think this probably won't break anything.

Test Plan: {F5518822}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120

Differential Revision: https://secure.phabricator.com/D19344
---
 resources/celerity/map.php                        | 6 +++---
 webroot/rsrc/css/aphront/phabricator-nav-view.css | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index bb1dcfc5cd..9ca473d8b0 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '3ced0b1d',
+    'core.pkg.css' => '39061f68',
     'core.pkg.js' => '1ea38af8',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c2ca903a',
@@ -29,7 +29,7 @@
     'rsrc/css/aphront/multi-column.css' => '84cc6640',
     'rsrc/css/aphront/notification.css' => '457861ec',
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
-    'rsrc/css/aphront/phabricator-nav-view.css' => 'a9e3e6d5',
+    'rsrc/css/aphront/phabricator-nav-view.css' => '694d7723',
     'rsrc/css/aphront/table-view.css' => '8c9bbafe',
     'rsrc/css/aphront/tokenizer.css' => '15d5ff71',
     'rsrc/css/aphront/tooltip.css' => '173b9431',
@@ -769,7 +769,7 @@
     'phabricator-keyboard-shortcut' => '1ae869f2',
     'phabricator-keyboard-shortcut-manager' => 'c19dd9b9',
     'phabricator-main-menu-view' => '1802a242',
-    'phabricator-nav-view-css' => 'a9e3e6d5',
+    'phabricator-nav-view-css' => '694d7723',
     'phabricator-notification' => '4f774dac',
     'phabricator-notification-css' => '457861ec',
     'phabricator-notification-menu-css' => '10685bd4',
diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css
index 6dbd0931a6..ce9fffa101 100644
--- a/webroot/rsrc/css/aphront/phabricator-nav-view.css
+++ b/webroot/rsrc/css/aphront/phabricator-nav-view.css
@@ -83,7 +83,10 @@
 .device-desktop .phui-navigation-shell .has-drag-nav .phabricator-nav-local {
   width: 310px;
   padding: 0;
-  background: transparent;
+
+  /* See PHI568. If we don't paint the background explicitly, the content can
+     render underneath it when scrolled horizontally. */
+  background: {$page.background};
 }
 
 .device-phone .phabricator-side-menu-home .phabricator-nav-content {

From 55619e89642be727f2ff1d6e763d1b9469e614d2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 13:41:25 -0700
Subject: [PATCH 821/865] Restore an explicit white background color to files
 in Paste

Summary:
Ref T13105. Previously, the "source code" view in Paste rendered on a brown/orange-ish background. I've been using this element in more contexts (Files, Diffusion) and removed the colored background to make text (particularly syntax-highlighted text) easier to read and reduce visual noise with the new blame colors.

In Diffusion the view is in a box with a white background so removing the background left us with white, but in Paste it's just directly on the page so the background was bleeding through. Instead, set it to white explicitly.

Test Plan: Viewed source files in Files, Diffusion and Paste; saw text on a white background.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19346
---
 resources/celerity/map.php                               | 4 ++--
 webroot/rsrc/css/layout/phabricator-source-code-view.css | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 9ca473d8b0..0cc1216ecd 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -119,7 +119,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => 'a526a787',
+    'rsrc/css/layout/phabricator-source-code-view.css' => '326df52d',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -780,7 +780,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => 'a526a787',
+    'phabricator-source-code-view-css' => '326df52d',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index 5eb2b36c8e..36b6c88d34 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -17,6 +17,7 @@
   white-space: pre-wrap;
   padding: 2px 8px 1px;
   width: 100%;
+  background: #ffffff;
 }
 
 .phabricator-source-line {

From ac570fd4bc4eb454bcaab203ef46eb8c54061cc2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 13:51:18 -0700
Subject: [PATCH 822/865] When you make the file tree huge, scroll to the
 right, and then toggle it, stop it from growing

Summary: Depends on D19346. Ref PHI568. I love Javascript.

Test Plan:
  - Viewed a revision.
  - Dragged file tree view really wide.
  - Scrolled document to the right.
  - Toggled file tree off and on by pressing "f" twice.
    - Before patch: file tree grew wider and wider after it was toggled.
    - After patch: file tree stayed the same size after it was toggled.
  - Dragged to various widths and reloaded to make sure the "sticky across reloads" behavior still works.
  - Scrolled right, dragged the tree a bit, then reloaded and didn't see it flip out.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19347
---
 resources/celerity/map.php                    | 26 +++++++++----------
 .../rsrc/js/core/behavior-phabricator-nav.js  | 15 ++++++++---
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 0cc1216ecd..a1fcc25086 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => '39061f68',
-    'core.pkg.js' => '1ea38af8',
+    'core.pkg.js' => 'e1f0f7bd',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c2ca903a',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -475,7 +475,7 @@
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
-    'rsrc/js/core/behavior-phabricator-nav.js' => '836f966d',
+    'rsrc/js/core/behavior-phabricator-nav.js' => '94b7c320',
     'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'acd29eee',
     'rsrc/js/core/behavior-read-only-warning.js' => 'ba158207',
     'rsrc/js/core/behavior-redirect.js' => '0213259f',
@@ -635,7 +635,7 @@
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
     'javelin-behavior-phabricator-line-linker' => '1e017314',
-    'javelin-behavior-phabricator-nav' => '836f966d',
+    'javelin-behavior-phabricator-nav' => '94b7c320',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
     'javelin-behavior-phabricator-oncopy' => '2926fff2',
@@ -1547,16 +1547,6 @@
       'javelin-behavior',
       'javelin-scrollbar',
     ),
-    '836f966d' => array(
-      'javelin-behavior',
-      'javelin-behavior-device',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-magical-init',
-      'javelin-vector',
-      'javelin-request',
-      'javelin-util',
-    ),
     '8499b6ab' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1658,6 +1648,16 @@
       'javelin-resource',
       'javelin-routable',
     ),
+    '94b7c320' => array(
+      'javelin-behavior',
+      'javelin-behavior-device',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-magical-init',
+      'javelin-vector',
+      'javelin-request',
+      'javelin-util',
+    ),
     '960f6a39' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/webroot/rsrc/js/core/behavior-phabricator-nav.js b/webroot/rsrc/js/core/behavior-phabricator-nav.js
index 50d8e1c820..cf6dc880bc 100644
--- a/webroot/rsrc/js/core/behavior-phabricator-nav.js
+++ b/webroot/rsrc/js/core/behavior-phabricator-nav.js
@@ -49,7 +49,7 @@ JX.behavior('phabricator-nav', function(config) {
       {
         element: drag,
         parameter: 'left',
-        start: JX.$V(drag).x
+        start: get_width()
       },
       {
         element: content,
@@ -102,15 +102,24 @@ JX.behavior('phabricator-nav', function(config) {
       .setData(
         {
           key: 'filetree.width',
-          value: JX.$V(drag).x
+          value: get_width()
         })
       .send();
   });
 
+  function get_width() {
+    // See PHI568. If the document has scrolled horizontally, the "x" position
+    // of the bar will be the actual width of the menu plus the horizontal
+    // scroll position (because the element is "position: fixed"). Subtract the
+    // document scroll position when saving the element width so that scrolling
+    // to the right and then toggling the filetree UI does not make it grow
+    // any wider.
+    return (JX.$V(drag).x - JX.Vector.getScroll().x);
+  }
 
   var saved_width = config.width;
   function savedrag() {
-    saved_width = JX.$V(drag).x;
+    saved_width = get_width();
 
     local.style.width = '';
     drag.style.left = '';

From c5c53e277a28c80e2c9cd8432d8acb750e48a8ed Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 14:12:40 -0700
Subject: [PATCH 823/865] Make line selection in source code views less fragile
 and more consistent

Summary:
Depends on D19347. Ref T13105. See PHI565. The "highlight lines" behavior is interacting poorly with the new blame element in Diffusion.

Make the behavior a little simpler and hopefully more robust.

Test Plan:
  - Clicked commit/revision links in Diffusion, saw the links get followed instead of the lines highlighted.
  - Highlighted lines in Diffusion, saw just the line/code highlight instead of the whole thing.
  - Highlighted lines in Paste and new-style Harbormaster build logs, saw consistent behavior.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19348
---
 resources/celerity/map.php                    | 20 +++++------
 .../layout/phabricator-source-code-view.css   |  6 +++-
 webroot/rsrc/js/core/behavior-line-linker.js  | 34 ++++++-------------
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index a1fcc25086..82d56b8c04 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -119,7 +119,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => '326df52d',
+    'rsrc/css/layout/phabricator-source-code-view.css' => 'c5edc888',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -471,7 +471,7 @@
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
     'rsrc/js/core/behavior-lightbox-attachments.js' => '6b31879a',
-    'rsrc/js/core/behavior-line-linker.js' => '1e017314',
+    'rsrc/js/core/behavior-line-linker.js' => '69837bed',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
@@ -634,7 +634,7 @@
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
-    'javelin-behavior-phabricator-line-linker' => '1e017314',
+    'javelin-behavior-phabricator-line-linker' => '69837bed',
     'javelin-behavior-phabricator-nav' => '94b7c320',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
@@ -780,7 +780,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => '326df52d',
+    'phabricator-source-code-view-css' => 'c5edc888',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
@@ -1003,12 +1003,6 @@
       'javelin-workflow',
       'javelin-magical-init',
     ),
-    '1e017314' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-history',
-    ),
     '1f6794f6' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1413,6 +1407,12 @@
       'javelin-dom',
       'phuix-button-view',
     ),
+    '69837bed' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-history',
+    ),
     '69adf288' => array(
       'javelin-install',
     ),
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index 36b6c88d34..07448c9c63 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -52,10 +52,14 @@ th.phabricator-source-line a:hover {
   text-decoration: none;
 }
 
-.phabricator-source-highlight {
+.phabricator-source-highlight .phabricator-source-code {
   background: {$paste.highlight};
 }
 
+.phabricator-source-highlight .phabricator-source-line {
+  background: {$paste.border};
+}
+
 .phabricator-source-code-summary {
   padding-bottom: 8px;
 }
diff --git a/webroot/rsrc/js/core/behavior-line-linker.js b/webroot/rsrc/js/core/behavior-line-linker.js
index 2506e205b8..e3eedfd50f 100644
--- a/webroot/rsrc/js/core/behavior-line-linker.js
+++ b/webroot/rsrc/js/core/behavior-line-linker.js
@@ -19,24 +19,7 @@ JX.behavior('phabricator-line-linker', function() {
     // Ignore.
   }
 
-  function getRowNumber(tr) {
-    // Starting from the left, find the rightmost "<th />" tag among all
-    // "<th />" tags at the start of the row. Our goal here is to skip over
-    // blame information in Diffusion. This could probably be significantly
-    // more graceful.
-    var th = null;
-    for (var ii = 0; ii < tr.childNodes.length; ii++) {
-      if (JX.DOM.isType(tr.childNodes[ii], 'th')) {
-        th = tr.childNodes[ii];
-        continue;
-      }
-      break;
-    }
-
-    if (!th) {
-      return null;
-    }
-
+  function getRowNumber(th) {
     // If the "<th />" tag contains an "<a />" with "data-n" that we're using
     // to prevent copy/paste of line numbers, use that.
     if (th.firstChild) {
@@ -51,7 +34,7 @@ JX.behavior('phabricator-line-linker', function() {
 
   JX.Stratcom.listen(
     ['click', 'mousedown'],
-    ['phabricator-source', 'tag:tr', 'tag:th', 'tag:a'],
+    ['phabricator-source', 'tag:th', 'tag:a'],
     function(e) {
       if (!e.isNormalMouseEvent()) {
         return;
@@ -62,13 +45,13 @@ JX.behavior('phabricator-line-linker', function() {
       // table. The row's immediate ancestor table needs to be the table with
       // the "phabricator-source" sigil.
 
-      var row = e.getNode('tag:tr');
+      var cell = e.getNode('tag:th');
       var table = e.getNode('phabricator-source');
-      if (JX.DOM.findAbove(row, 'table') !== table) {
+      if (JX.DOM.findAbove(cell, 'table') !== table) {
         return;
       }
 
-      var number = getRowNumber(row);
+      var number = getRowNumber(cell);
       if (!number) {
         return;
       }
@@ -81,7 +64,7 @@ JX.behavior('phabricator-line-linker', function() {
         return;
       }
 
-      origin = row;
+      origin = cell;
       target = origin;
 
       root = table;
@@ -95,7 +78,7 @@ JX.behavior('phabricator-line-linker', function() {
     if (e.getNode('phabricator-source') !== root) {
       return;
     }
-    target = e.getNode('tag:tr');
+    target = e.getNode('tag:th');
 
     var min;
     var max;
@@ -130,6 +113,9 @@ JX.behavior('phabricator-line-linker', function() {
     highlighted = [];
 
     // Highlight the newly selected rows.
+    min = JX.DOM.findAbove(min, 'tr');
+    max = JX.DOM.findAbove(max, 'tr');
+
     var cursor = min;
     while (true) {
       JX.DOM.alterClass(cursor, 'phabricator-source-highlight', true);

From 5b3a351852a7fabde4c40d342a70ae6142bec57f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 14:23:25 -0700
Subject: [PATCH 824/865] Use pseudoelements, not Zero Width Space, to
 implement copy/paste behavior in Paste/Diffusion

Summary:
Depends on D19348. Ref T13105. When copying text from Paste or Diffusion, we'd like to copy only source, not line numbers.

We currently accomplish this with zero-width spaces plus a trigger that fires on "copy" in Paste and Diffusion. This is quite gross.

In the new-style Harbormaster logs, we use an approach that seems slightly better: CSS psuedoelements.

This isn't a complete solution (see also PHI504 / T5032) but puts us in a slightly better place.

Use it in Paste/Files/Diffusion too.

This gives us good behavior in all browsers in Files and Paste.

This gives us good behavior in Chrome and Firefox in Diffusion. Safari will copy (but not visually select) blame information in Diffusion. I think we can live with that for now.

Test Plan: Selected and copy/pasted stuff in Diffusion, Files, and Paste. Got good behavior everywhere except Safari + Diffusion.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19349
---
 resources/celerity/map.php                    | 20 +++++++++----------
 src/view/layout/PhabricatorSourceCodeView.php | 20 ++++++++-----------
 .../layout/phabricator-source-code-view.css   | 13 ++++--------
 webroot/rsrc/js/core/behavior-line-linker.js  |  2 +-
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 82d56b8c04..9853c35217 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -119,7 +119,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => 'c5edc888',
+    'rsrc/css/layout/phabricator-source-code-view.css' => '09368218',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -471,7 +471,7 @@
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
     'rsrc/js/core/behavior-lightbox-attachments.js' => '6b31879a',
-    'rsrc/js/core/behavior-line-linker.js' => '69837bed',
+    'rsrc/js/core/behavior-line-linker.js' => '36165eb1',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
@@ -634,7 +634,7 @@
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
-    'javelin-behavior-phabricator-line-linker' => '69837bed',
+    'javelin-behavior-phabricator-line-linker' => '36165eb1',
     'javelin-behavior-phabricator-nav' => '94b7c320',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
@@ -780,7 +780,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => 'c5edc888',
+    'phabricator-source-code-view-css' => '09368218',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
@@ -1098,6 +1098,12 @@
       'javelin-dom',
       'javelin-vector',
     ),
+    '36165eb1' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-history',
+    ),
     '3ab51e2c' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1407,12 +1413,6 @@
       'javelin-dom',
       'phuix-button-view',
     ),
-    '69837bed' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-history',
-    ),
     '69adf288' => array(
       'javelin-install',
     ),
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index e6fb1803bc..eec571e5f3 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -66,7 +66,6 @@ public function render() {
     require_celerity_resource('phabricator-source-code-view-css');
     require_celerity_resource('syntax-highlighting-css');
 
-    Javelin::initBehavior('phabricator-oncopy', array());
     if ($this->canClickHighlight) {
       Javelin::initBehavior('phabricator-line-linker');
     }
@@ -78,11 +77,11 @@ public function render() {
     $lines = $this->lines;
     if ($this->truncatedFirstLines) {
       $lines[] = phutil_tag(
-          'span',
-          array(
-            'class' => 'c',
-          ),
-          pht('...'));
+        'span',
+        array(
+          'class' => 'c',
+        ),
+        pht('...'));
     } else if ($this->truncatedFirstBytes) {
       $last_key = last_key($lines);
       $lines[$last_key] = hsprintf(
@@ -98,9 +97,6 @@ public function render() {
 
     $base_uri = (string)$this->uri;
     foreach ($lines as $line) {
-      // NOTE: See phabricator-oncopy behavior.
-      $content_line = hsprintf("\xE2\x80\x8B%s", $line);
-
       $row_attributes = array();
       if (isset($this->highlights[$line_number])) {
         $row_attributes['class'] = 'phabricator-source-highlight';
@@ -117,8 +113,8 @@ public function render() {
           'a',
           array(
             'href' => $line_href,
-          ),
-          $line_number);
+            'data-n' => $line_number,
+          ));
       } else {
         $tag_number = phutil_tag(
           'span',
@@ -172,7 +168,7 @@ public function render() {
             array(
               'class' => 'phabricator-source-code',
             ),
-            $content_line),
+            $line),
           ));
 
       $line_number++;
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index 07448c9c63..6f2864d067 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -25,16 +25,11 @@
   text-align: right;
   border-right: 1px solid {$paste.border};
   color: {$sh-yellowtext};
+}
 
-  /* When the user selects rows of source, don't visibly select the line
-     numbers beside them. We use JS to strip the line numbers out when the user
-     copies the text. */
-  -moz-user-select: -moz-none;
-  -khtml-user-select: none;
-  -webkit-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  white-space: nowrap;
+.phabricator-source-line > a::before {
+  /* Render the line numbers as a pseudo-element so they don't get copied. */
+  content: attr(data-n);
 }
 
 th.phabricator-source-line a,
diff --git a/webroot/rsrc/js/core/behavior-line-linker.js b/webroot/rsrc/js/core/behavior-line-linker.js
index e3eedfd50f..c2aec18d8b 100644
--- a/webroot/rsrc/js/core/behavior-line-linker.js
+++ b/webroot/rsrc/js/core/behavior-line-linker.js
@@ -29,7 +29,7 @@ JX.behavior('phabricator-line-linker', function() {
       }
     }
 
-    return +(th.textContent || th.innerText);
+    return null;
   }
 
   JX.Stratcom.listen(

From 37a03402bc44bfcfa95d67f766be390dfc701daf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 11 Apr 2018 14:44:06 -0700
Subject: [PATCH 825/865] When following a link to a particular line
 ("/example.txt$12"), scroll to that line

Summary:
Depends on D19349. Ref T13105. This was the behavior in Diffusion before with a little hard-coded snippet.

Remove that snippet ("diffusion-jump-to") and add a more general-purpose snippet to SourceView.

This is a tiny bit hacky still (and probably doesn't work quite right with Quicksand) but gets things working again and works in all of Files, Paste, and Diffusion.

Test Plan: Followed links to particular lines in Paste, Files and Diffusion; got scrolled to the right place.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19350
---
 resources/celerity/map.php                    | 23 +++++++------------
 src/view/layout/PhabricatorSourceCodeView.php |  5 ++++
 .../application/diffusion/behavior-jump-to.js | 15 ------------
 webroot/rsrc/js/core/behavior-line-linker.js  | 12 ++++++++++
 4 files changed, 25 insertions(+), 30 deletions(-)
 delete mode 100644 webroot/rsrc/js/application/diffusion/behavior-jump-to.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 9853c35217..6c1240fea0 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -385,7 +385,6 @@
     'rsrc/js/application/diffusion/behavior-commit-branches.js' => 'bdaf4d04',
     'rsrc/js/application/diffusion/behavior-commit-graph.js' => '75b83cbb',
     'rsrc/js/application/diffusion/behavior-diffusion-browse-file.js' => '054a0f0b',
-    'rsrc/js/application/diffusion/behavior-jump-to.js' => '73d09eef',
     'rsrc/js/application/diffusion/behavior-locate-file.js' => '6d3e1947',
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
@@ -471,7 +470,7 @@
     'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
     'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
     'rsrc/js/core/behavior-lightbox-attachments.js' => '6b31879a',
-    'rsrc/js/core/behavior-line-linker.js' => '36165eb1',
+    'rsrc/js/core/behavior-line-linker.js' => '66a62306',
     'rsrc/js/core/behavior-more.js' => 'a80d0378',
     'rsrc/js/core/behavior-object-selector.js' => '77c1f0b0',
     'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
@@ -601,7 +600,6 @@
     'javelin-behavior-diffusion-browse-file' => '054a0f0b',
     'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
     'javelin-behavior-diffusion-commit-graph' => '75b83cbb',
-    'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
     'javelin-behavior-document-engine' => '0333c0b6',
@@ -634,7 +632,7 @@
     'javelin-behavior-phabricator-gesture-example' => '558829c2',
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
-    'javelin-behavior-phabricator-line-linker' => '36165eb1',
+    'javelin-behavior-phabricator-line-linker' => '66a62306',
     'javelin-behavior-phabricator-nav' => '94b7c320',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
@@ -1098,12 +1096,6 @@
       'javelin-dom',
       'javelin-vector',
     ),
-    '36165eb1' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-history',
-    ),
     '3ab51e2c' => array(
       'javelin-behavior',
       'javelin-behavior-device',
@@ -1395,6 +1387,12 @@
       'phabricator-darklog',
       'phabricator-darkmessage',
     ),
+    '66a62306' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-history',
+    ),
     '66a6def1' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1471,11 +1469,6 @@
       'javelin-behavior',
       'javelin-dom',
     ),
-    '73d09eef' => array(
-      'javelin-behavior',
-      'javelin-vector',
-      'javelin-dom',
-    ),
     '758b4758' => array(
       'javelin-install',
       'javelin-workboard-card',
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index eec571e5f3..19126d1c6a 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -96,10 +96,15 @@ public function render() {
     }
 
     $base_uri = (string)$this->uri;
+    $wrote_anchor = false;
     foreach ($lines as $line) {
       $row_attributes = array();
       if (isset($this->highlights[$line_number])) {
         $row_attributes['class'] = 'phabricator-source-highlight';
+        if (!$wrote_anchor) {
+          $row_attributes['id'] = 'phabricator-line-linker-anchor';
+          $wrote_anchor = true;
+        }
       }
 
       if ($this->canClickHighlight) {
diff --git a/webroot/rsrc/js/application/diffusion/behavior-jump-to.js b/webroot/rsrc/js/application/diffusion/behavior-jump-to.js
deleted file mode 100644
index 96b4947e02..0000000000
--- a/webroot/rsrc/js/application/diffusion/behavior-jump-to.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @provides javelin-behavior-diffusion-jump-to
- * @requires javelin-behavior
- *           javelin-vector
- *           javelin-dom
- */
-
-JX.behavior('diffusion-jump-to', function(config) {
-
-  setTimeout(function() {
-    var pos = JX.Vector.getPosWithScroll(JX.$(config.target));
-    JX.DOM.scrollToPosition(0, pos.y - 100);
-  }, 0);
-
-});
diff --git a/webroot/rsrc/js/core/behavior-line-linker.js b/webroot/rsrc/js/core/behavior-line-linker.js
index c2aec18d8b..8cb3d0c615 100644
--- a/webroot/rsrc/js/core/behavior-line-linker.js
+++ b/webroot/rsrc/js/core/behavior-line-linker.js
@@ -176,4 +176,16 @@ JX.behavior('phabricator-line-linker', function() {
       }
     });
 
+
+  // Try to jump to the highlighted lines if we don't have an explicit anchor
+  // in the URI.
+  if (!window.location.hash.length) {
+    try {
+      var anchor = JX.$('phabricator-line-linker-anchor');
+      JX.DOM.scrollToPosition(0, JX.$V(anchor).y - 60);
+    } catch (ex) {
+      // If we didn't hit an element on the page, just move on.
+    }
+  }
+
 });

From 70056a9072d328d952e19a9735a00fd292ccbdb7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 12 Apr 2018 11:02:07 -0700
Subject: [PATCH 826/865] When creating a file by downloading a URI, truncate
 the length of the default name

Summary:
See <https://discourse.phabricator-community.org/t/embedding-external-images-url-show-error-for-long-urls/1339>.

When we download a file from a URI, we provide a default name based on the URI. However, if the URI is something like `http://example.com/very-very-very-....-long.jpg` with more than 255 characters, we may suggest a name which won't fit into the `name` column of `PhabricatorFile`.

Instead, suggest a default name no longer than 64 bytes.

Test Plan:
  - Used the `{image ...}` example from the Discourse report locally; got an image with a truncated name.
  - Used a normal `{image ...}`, got an image file with a normal name.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19353
---
 src/applications/files/storage/PhabricatorFile.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index a8d16b7651..b795678cd2 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -648,10 +648,17 @@ public static function newFromFileDownload($uri, array $params = array()) {
           // just bail out.
           throw $status;
         } else {
-          // This is HTTP 2XX, so use the response body to save the
-          // file data.
+          // This is HTTP 2XX, so use the response body to save the file data.
+          // Provide a default name based on the URI, truncating it if the URI
+          // is exceptionally long.
+
+          $default_name = basename($uri);
+          $default_name = id(new PhutilUTF8StringTruncator())
+            ->setMaximumBytes(64)
+            ->truncateString($default_name);
+
           $params = $params + array(
-            'name' => basename($uri),
+            'name' => $default_name,
           );
 
           return self::newFromFileData($body, $params);

From c52e10d1ecf06b7077a190eab8dd05d5f9107d4a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 12 Apr 2018 14:58:57 -0700
Subject: [PATCH 827/865] Respect external unmentionable PHIDs in Differential
 revision editor

Summary:
See PHI574. Ref T13120. When you `Ref Txx` or `Fixes Txxx`, we mark it "unmentionable" to prevent the task from generating both a reference and a mention.

If you add a reference to an object (like a commit hash) to a custom remarkup field, there's currently no real way to prevent it from generating a mention, except that you can explicitly mark the PHID as unmentionable on the Editor.

This isn't exactly a first-class feature, but we technically do it in `PhabricatorRepositoryCommitMessageParserWorker`, and it probably doesn't hurt or interfere with anything to support it slightly better.

In Differential, respect any existing value and append new values to it rather than overwriting the value.

Test Plan: Edited a revision summary to include `Ref Txxx`, saw only a reference (not a mention) generate.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120

Differential Revision: https://secure.phabricator.com/D19361
---
 .../editor/DifferentialTransactionEditor.php         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 24f0fe7a07..50094b02f4 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -850,11 +850,13 @@ protected function expandCustomRemarkupBlockTransactions(
       $revert_phids = array();
     }
 
-    $this->setUnmentionablePHIDMap(
-      array_merge(
-        $task_phids,
-        $rev_phids,
-        $revert_phids));
+    // See PHI574. Respect any unmentionable PHIDs which were set on the
+    // Editor by the caller.
+    $unmentionable_map = $this->getUnmentionablePHIDMap();
+    $unmentionable_map += $task_phids;
+    $unmentionable_map += $rev_phids;
+    $unmentionable_map += $revert_phids;
+    $this->setUnmentionablePHIDMap($unmentionable_map);
 
     $result = array();
     foreach ($edges as $type => $specs) {

From 4068aaef61a07c6c990151a631c392fd388d00e4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 12 Apr 2018 14:46:21 -0700
Subject: [PATCH 828/865] Toggle revision "shouldBroadcast" correctly when
 "--draft" is used with prototypes off

Summary:
See PHI573. Ref T13120. Drafts were recently changed so that "draft" and "broadcast" are separate flags, and you can have non-broadcasting revisions in states other than "draft" if builds fail on a draft or you abandon a draft.

However, when draft mode is entered with `arc diff --draft` and you have prototypes off, this flag wasn't being set correctly.

Test Plan: Disabled prototypes, created a revision with `arc diff --draft`, observed that `draft.broadcast` is now correctly `false`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120

Differential Revision: https://secure.phabricator.com/D19360
---
 .../xaction/DifferentialRevisionHoldDraftTransaction.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php b/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
index 2562f18209..4d31f39f02 100644
--- a/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
@@ -22,7 +22,9 @@ public function applyInternalEffects($object, $value) {
     // TODO: This can probably be removed once Draft is the universal default.
     if ($this->isNewObject()) {
       if ($object->isNeedsReview()) {
-        $object->setModernRevisionStatus(DifferentialRevisionStatus::DRAFT);
+        $object
+          ->setModernRevisionStatus(DifferentialRevisionStatus::DRAFT)
+          ->setShouldBroadcast(false);
       }
     }
   }

From 7e0bdbe00796a6678648d50da7b671a1bce264af Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 12 Apr 2018 14:46:21 -0700
Subject: [PATCH 829/865] (stable) Toggle revision "shouldBroadcast" correctly
 when "--draft" is used with prototypes off

Summary:
See PHI573. Ref T13120. Drafts were recently changed so that "draft" and "broadcast" are separate flags, and you can have non-broadcasting revisions in states other than "draft" if builds fail on a draft or you abandon a draft.

However, when draft mode is entered with `arc diff --draft` and you have prototypes off, this flag wasn't being set correctly.

Test Plan: Disabled prototypes, created a revision with `arc diff --draft`, observed that `draft.broadcast` is now correctly `false`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120

Differential Revision: https://secure.phabricator.com/D19360
---
 .../xaction/DifferentialRevisionHoldDraftTransaction.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php b/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
index 2562f18209..4d31f39f02 100644
--- a/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionHoldDraftTransaction.php
@@ -22,7 +22,9 @@ public function applyInternalEffects($object, $value) {
     // TODO: This can probably be removed once Draft is the universal default.
     if ($this->isNewObject()) {
       if ($object->isNeedsReview()) {
-        $object->setModernRevisionStatus(DifferentialRevisionStatus::DRAFT);
+        $object
+          ->setModernRevisionStatus(DifferentialRevisionStatus::DRAFT)
+          ->setShouldBroadcast(false);
       }
     }
   }

From 6f810d7813081ae83d9eeb26ab7464486017c379 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 12 Apr 2018 06:10:21 -0700
Subject: [PATCH 830/865] Turn the "closed" property on cluster repositories
 into a nice boolean

Summary:
Ref T10883. Ref T13120. There's an existing "closed" property on repository services that stops new repositories from being allocated there.

Turn it into a nice boolean.

Test Plan: Toggled the value on/off using a nice `<select />` with helpful labels instead of a text area.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T10883

Differential Revision: https://secure.phabricator.com/D19355
---
 .../servicetype/AlmanacClusterRepositoryServiceType.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php b/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
index fffe94997a..ae3dff9995 100644
--- a/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
+++ b/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
@@ -20,7 +20,11 @@ public function getServiceTypeDescription() {
 
   public function getFieldSpecifications() {
     return array(
-      'closed' => id(new PhabricatorTextEditField()),
+      'closed' => id(new PhabricatorBoolEditField())
+        ->setOptions(
+          pht('Allow New Repositories'),
+          pht('Prevent New Repositories'))
+        ->setValue(false),
     );
   }
 

From 7c7e6d555b3fe82159b066b7d2541249529a1371 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 12 Apr 2018 06:10:32 -0700
Subject: [PATCH 831/865] Give getAlmanacServiceURI() an "options" parameter to
 prepare for read-only devices

Summary:
Depends on D19355. Ref T10883. Ref T13120. Rather than adding a million parameters here, wrap the selector-parameters in an `$options`.

The next change adds a new "writable" option to support forcing selection of writable hosts.

Test Plan: Pulled and pushed via HTTP and SSH, viewed repositories via Diffusion.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T10883

Differential Revision: https://secure.phabricator.com/D19356
---
 .../controller/DiffusionServeController.php   |  8 ++++---
 .../diffusion/ssh/DiffusionSSHWorkflow.php    |  6 +++--
 .../storage/PhabricatorRepository.php         | 24 +++++++++++++------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index ac0b993b2f..6b9c5c6802 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -431,10 +431,12 @@ private function serveVCSRequest(
 
     $uri = $repository->getAlmanacServiceURI(
       $viewer,
-      $is_cluster_request,
       array(
-        'http',
-        'https',
+        'neverProxy' => $is_cluster_request,
+        'protocols' => array(
+          'http',
+          'https',
+        ),
       ));
     if ($uri) {
       $future = $this->getRequest()->newClusterProxyFuture($uri);
diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
index baf1749252..2a3841892f 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
@@ -151,9 +151,11 @@ final public function execute(PhutilArgumentParser $args) {
     $is_cluster_request = $this->getIsClusterRequest();
     $uri = $repository->getAlmanacServiceURI(
       $viewer,
-      $is_cluster_request,
       array(
-        'ssh',
+        'neverProxy' => $is_cluster_request,
+        'protocols' => array(
+          'ssh',
+        ),
       ));
 
     if ($uri) {
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 334867cc85..37dd5f1ec5 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1897,14 +1897,22 @@ public function loadUpdateInterval($minimum = 15) {
    * services, returning raw URIs.
    *
    * @param PhabricatorUser Viewing user.
-   * @param bool `true` to throw if a remote URI would be returned.
-   * @param list<string> List of allowable protocols.
+   * @param map<string, wild> Constraints on selectable services.
    * @return string|null URI, or `null` for local repositories.
    */
   public function getAlmanacServiceURI(
     PhabricatorUser $viewer,
-    $never_proxy,
-    array $protocols) {
+    array $options) {
+
+    PhutilTypeSpec::checkMap(
+      $options,
+      array(
+        'neverProxy' => 'bool',
+        'protocols' => 'list<string>',
+      ));
+
+    $never_proxy = $options['neverProxy'];
+    $protocols = $options['protocols'];
 
     $cache_key = $this->getAlmanacServiceCacheKey();
     if (!$cache_key) {
@@ -2077,10 +2085,12 @@ public function newConduitClient(
 
     $uri = $this->getAlmanacServiceURI(
       $viewer,
-      $never_proxy,
       array(
-        'http',
-        'https',
+        'neverProxy' => $never_proxy,
+        'protocols' => array(
+          'http',
+          'https',
+        ),
       ));
     if ($uri === null) {
       return null;

From 6556536d0615b0f127bd19ff1c36b060d5d58a76 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 12 Apr 2018 06:39:23 -0700
Subject: [PATCH 832/865] Allow repository cluster bindings to be marked as not
 "writable", making them read-only

Summary:
Depends on D19356. Fixes T10883. Ref T13120.

  - Add a "writable" property to the bindings, defaulting to "true" with a nice dropdown.
  - When selecting hosts, allow callers to request a writable host.
  - If the caller wants a writable host, only return hosts if they're writable.
  - In SVN and Mercurial, we sometimes return only writable hosts when we //could// return read-only hosts, but figuring out if these request are read-only or read-write is currently tricky. Since these repositories can't really cluster yet, this shouldn't matter too much today.

Test Plan:
  - Without any config changes, viewed repositories via web UI and pushed/pulled via SSH and HTTP.
  - Made all nodes in the cluster read-only by disabling "writable", pulled and hit the web UI (worked), tried to push via SSH and HTTP (got errors about read-only).
  - Put everything back, pulled and pushed.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T10883

Differential Revision: https://secure.phabricator.com/D19357
---
 .../AlmanacClusterRepositoryServiceType.php   |  5 ++
 .../controller/DiffusionServeController.php   |  1 +
 .../DiffusionGitReceivePackSSHWorkflow.php    |  2 +-
 .../ssh/DiffusionGitUploadPackSSHWorkflow.php |  2 +-
 .../DiffusionMercurialServeSSHWorkflow.php    |  5 +-
 .../diffusion/ssh/DiffusionSSHWorkflow.php    | 50 +++++++++++++------
 .../DiffusionSubversionServeSSHWorkflow.php   |  5 +-
 .../storage/PhabricatorRepository.php         | 41 +++++++++++++--
 .../user/cluster/cluster_repositories.diviner | 28 +++++++++--
 9 files changed, 114 insertions(+), 25 deletions(-)

diff --git a/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php b/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
index ae3dff9995..98947f56c1 100644
--- a/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
+++ b/src/applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php
@@ -57,6 +57,11 @@ public function getBindingFieldSpecifications(AlmanacBinding $binding) {
       'protocol' => id(new PhabricatorSelectEditField())
         ->setOptions(ipull($protocols, 'value', 'value'))
         ->setValue($default_value),
+      'writable' => id(new PhabricatorBoolEditField())
+        ->setOptions(
+          pht('Prevent Writes'),
+          pht('Allow Writes'))
+        ->setValue(true),
     );
   }
 
diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
index 6b9c5c6802..5a5c446a29 100644
--- a/src/applications/diffusion/controller/DiffusionServeController.php
+++ b/src/applications/diffusion/controller/DiffusionServeController.php
@@ -437,6 +437,7 @@ private function serveVCSRequest(
           'http',
           'https',
         ),
+        'writable' => !$this->isReadOnlyRequest($repository),
       ));
     if ($uri) {
       $future = $this->getRequest()->newClusterProxyFuture($uri);
diff --git a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
index 400340abeb..d48abc159e 100644
--- a/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
@@ -29,7 +29,7 @@ protected function executeRepositoryOperations() {
       ->setLog($this);
 
     if ($this->shouldProxy()) {
-      $command = $this->getProxyCommand();
+      $command = $this->getProxyCommand(true);
       $did_synchronize = false;
 
       if ($device) {
diff --git a/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
index 5ed42ba79d..e96030f577 100644
--- a/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
@@ -22,7 +22,7 @@ protected function executeRepositoryOperations() {
     $is_proxy = $this->shouldProxy();
 
     if ($is_proxy) {
-      $command = $this->getProxyCommand();
+      $command = $this->getProxyCommand(false);
 
       if ($device) {
         $this->writeClusterEngineLogMessage(
diff --git a/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
index 5701a4bac1..221d1696b2 100644
--- a/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
@@ -45,7 +45,10 @@ protected function executeRepositoryOperations() {
     }
 
     if ($this->shouldProxy()) {
-      $command = $this->getProxyCommand();
+      // NOTE: For now, we're always requesting a writable node. The request
+      // may not actually need one, but we can't currently determine whether
+      // it is read-only or not at this phase of evaluation.
+      $command = $this->getProxyCommand(true);
     } else {
       $command = csprintf(
         'hg -R %s serve --stdio',
diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
index 2a3841892f..02cacbfe94 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
@@ -5,7 +5,7 @@ abstract class DiffusionSSHWorkflow extends PhabricatorSSHWorkflow {
   private $args;
   private $repository;
   private $hasWriteAccess;
-  private $proxyURI;
+  private $shouldProxy;
   private $baseRequestPath;
 
   public function getRepository() {
@@ -69,18 +69,34 @@ protected function getCurrentDeviceName() {
     return php_uname('n');
   }
 
-  protected function getTargetDeviceName() {
-    // TODO: This should use the correct device identity.
-    $uri = new PhutilURI($this->proxyURI);
-    return $uri->getDomain();
-  }
-
   protected function shouldProxy() {
-    return (bool)$this->proxyURI;
+    return $this->shouldProxy;
   }
 
-  protected function getProxyCommand() {
-    $uri = new PhutilURI($this->proxyURI);
+  protected function getProxyCommand($for_write) {
+    $viewer = $this->getSSHUser();
+    $repository = $this->getRepository();
+
+    $is_cluster_request = $this->getIsClusterRequest();
+
+    $uri = $repository->getAlmanacServiceURI(
+      $viewer,
+      array(
+        'neverProxy' => $is_cluster_request,
+        'protocols' => array(
+          'ssh',
+        ),
+        'writable' => $for_write,
+      ));
+
+    if (!$uri) {
+      throw new Exception(
+        pht(
+          'Failed to generate an intracluster proxy URI even though this '.
+          'request was routed as a proxy request.'));
+    }
+
+    $uri = new PhutilURI($uri);
 
     $username = AlmanacKeys::getClusterSSHUser();
     if ($username === null) {
@@ -148,6 +164,15 @@ final public function execute(PhutilArgumentParser $args) {
     $repository = $this->identifyRepository();
     $this->setRepository($repository);
 
+    // NOTE: Here, we're just figuring out if this is a proxyable request to
+    // a clusterized repository or not. We don't (and can't) use the URI we get
+    // back directly.
+
+    // For example, we may get a read-only URI here but be handling a write
+    // request. We only care if we get back `null` (which means we should
+    // handle the request locally) or anything else (which means we should
+    // proxy it to an appropriate device).
+
     $is_cluster_request = $this->getIsClusterRequest();
     $uri = $repository->getAlmanacServiceURI(
       $viewer,
@@ -157,10 +182,7 @@ final public function execute(PhutilArgumentParser $args) {
           'ssh',
         ),
       ));
-
-    if ($uri) {
-      $this->proxyURI = $uri;
-    }
+    $this->shouldProxy = (bool)$uri;
 
     try {
       return $this->executeRepositoryOperations();
diff --git a/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
index 0df4aa17fe..76dae05971 100644
--- a/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
@@ -148,7 +148,10 @@ protected function executeRepositoryOperations() {
     }
 
     if ($this->shouldProxy()) {
-      $command = $this->getProxyCommand();
+      // NOTE: We're always requesting a writable device here. The request
+      // might be read-only, but we can't currently tell, and SVN requests
+      // can mix reads and writes.
+      $command = $this->getProxyCommand(true);
       $this->isProxying = true;
       $cwd = null;
     } else {
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 37dd5f1ec5..0a09503ee9 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1909,10 +1909,12 @@ public function getAlmanacServiceURI(
       array(
         'neverProxy' => 'bool',
         'protocols' => 'list<string>',
+        'writable' => 'optional bool',
       ));
 
     $never_proxy = $options['neverProxy'];
     $protocols = $options['protocols'];
+    $writable = idx($options, 'writable', false);
 
     $cache_key = $this->getAlmanacServiceCacheKey();
     if (!$cache_key) {
@@ -1958,7 +1960,7 @@ public function getAlmanacServiceURI(
       }
 
       if (isset($protocol_map[$uri['protocol']])) {
-        $results[] = new PhutilURI($uri['uri']);
+        $results[] = $uri;
       }
     }
 
@@ -1989,8 +1991,29 @@ public function getAlmanacServiceURI(
       }
     }
 
+    // If we require a writable device, remove URIs which aren't writable.
+    if ($writable) {
+      foreach ($results as $key => $uri) {
+        if (!$uri['writable']) {
+          unset($results[$key]);
+        }
+      }
+
+      if (!$results) {
+        throw new Exception(
+          pht(
+            'This repository ("%s") is not writable with the given '.
+            'protocols (%s). The Almanac service for this repository has no '.
+            'writable bindings that support these protocols.',
+            $this->getDisplayName(),
+            implode(', ', $protocols)));
+      }
+    }
+
     shuffle($results);
-    return head($results);
+
+    $result = head($results);
+    return $result['uri'];
   }
 
   public function supportsSynchronization() {
@@ -2009,7 +2032,14 @@ public function getAlmanacServiceCacheKey() {
     }
 
     $repository_phid = $this->getPHID();
-    return "diffusion.repository({$repository_phid}).service({$service_phid})";
+
+    $parts = array(
+      "repo({$repository_phid})",
+      "serv({$service_phid})",
+      'v2',
+    );
+
+    return implode('.', $parts);
   }
 
   private function buildAlmanacServiceURIs() {
@@ -2038,6 +2068,7 @@ private function buildAlmanacServiceURIs() {
         'protocol' => $protocol,
         'uri' => (string)$uri,
         'device' => $device_name,
+        'writable' => (bool)$binding->getAlmanacPropertyValue('writable'),
       );
     }
 
@@ -2091,6 +2122,10 @@ public function newConduitClient(
           'http',
           'https',
         ),
+
+        // At least today, no Conduit call can ever write to a repository,
+        // so it's fine to send anything to a read-only node.
+        'writable' => false,
       ));
     if ($uri === null) {
       return null;
diff --git a/src/docs/user/cluster/cluster_repositories.diviner b/src/docs/user/cluster/cluster_repositories.diviner
index 44003679af..8d764c2e3e 100644
--- a/src/docs/user/cluster/cluster_repositories.diviner
+++ b/src/docs/user/cluster/cluster_repositories.diviner
@@ -221,13 +221,33 @@ synchronized.
 Contracting a Cluster
 =====================
 
-To reduce the size of an existing cluster, follow these general steps:
+If you want to remove working devices from a cluster (for example, to take
+hosts down for maintenance), first do this for each device:
 
-  - Disable the bindings from the service to the dead device in Almanac.
+  - Change the `writable` property on the bindings to "Prevent Writes".
+  - Wait a few moments until the cluster synchronizes (see
+    "Monitoring Services" below).
+
+This will ensure that the device you're about to remove is not the only cluster
+leader, even if the cluster is receiving a high write volume. You can skip this
+step if the device isn't working property to start with.
+
+Once you've stopped writes and waited for synchronization (or if the hosts are
+not working in the first place) do this for each device:
+
+  - Disable the bindings from the service to the device in Almanac.
 
 If you are removing a device because it failed abruptly (or removing several
-devices at once) it is possible that some repositories will have lost all their
-leaders. See "Loss of Leaders" below to understand and resolve this.
+devices at once; or you skip the "Prevent Writes" step), it is possible that
+some repositories will have lost all their leaders. See "Loss of Leaders" below
+to understand and resolve this.
+
+If you want to put the hosts back in service later:
+
+  - Enable the bindings again.
+  - Change `writable` back to "Allow Writes".
+
+This will restore the cluster to the original state.
 
 
 Monitoring Services

From ca49fffc1bad400c2fbfbff23400b543ab1b1d1e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 13 Apr 2018 06:45:46 -0700
Subject: [PATCH 833/865] Fix the legacy "25, 50, 100, unlimited" Harbormaster
 log links to respect generation selection

Summary:
See PHI565. Ref T13120. Although this older log is on the chopping block (see T13088), there's some migration guidance and other complexity around just replacing it.

Until it gets replaced, make clicking the "number of lines" elements respect the current "Build Generation" setting. Prior to this change, clicking the links would lose the generation information and jump you to the most recent build generation.

Also fix some collateral damage from T13105 where we ended up with white text on a white background in some cases.

Test Plan:
  - Restarted a build to get multiple generations.
  - On each generation, clicked the various "25", "50", etc., links.
  - Saw generation and log window sizes both respected by the links.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13120

Differential Revision: https://secure.phabricator.com/D19367
---
 .../HarbormasterBuildViewController.php       | 82 +++++++++++--------
 .../harbormaster/view/ShellLogView.php        |  3 -
 2 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
index 0646bd9309..ac3a7101fd 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -77,7 +77,6 @@ public function handleRequest(AphrontRequest $request) {
           pht('View Current Build')));
     }
 
-
     $curtain = $this->buildCurtainView($build);
     $properties = $this->buildPropertyList($build);
     $history = $this->buildHistoryTable(
@@ -292,7 +291,7 @@ public function handleRequest(AphrontRequest $request) {
 
       $targets[] = $target_box;
 
-      $targets[] = $this->buildLog($build, $build_target);
+      $targets[] = $this->buildLog($build, $build_target, $generation);
     }
 
     $timeline = $this->buildTransactionTimeline(
@@ -371,7 +370,8 @@ private function buildArtifacts(
 
   private function buildLog(
     HarbormasterBuild $build,
-    HarbormasterBuildTarget $build_target) {
+    HarbormasterBuildTarget $build_target,
+    $generation) {
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
@@ -410,6 +410,8 @@ private function buildLog(
       $log_view->setLines($lines);
       $log_view->setStart($start);
 
+      $subheader = $this->createLogHeader($build, $log, $limit, $generation);
+
       $prototype_view = id(new PHUIButtonView())
         ->setTag('a')
         ->setHref($log->getURI())
@@ -423,7 +425,7 @@ private function buildLog(
           $log->getLogSource(),
           $log->getLogType()))
         ->addActionLink($prototype_view)
-        ->setSubheader($this->createLogHeader($build, $log))
+        ->setSubheader($subheader)
         ->setUser($viewer);
 
       $log_box = id(new PHUIObjectBoxView())
@@ -479,43 +481,53 @@ private function buildLog(
     return $log_boxes;
   }
 
-  private function createLogHeader($build, $log) {
-    $request = $this->getRequest();
-    $limit = $request->getInt('l', 25);
-
-    $lines_25 = $this->getApplicationURI('/build/'.$build->getID().'/?l=25');
-    $lines_50 = $this->getApplicationURI('/build/'.$build->getID().'/?l=50');
-    $lines_100 =
-      $this->getApplicationURI('/build/'.$build->getID().'/?l=100');
-    $lines_0 = $this->getApplicationURI('/build/'.$build->getID().'/?l=0');
-
-    $link_25 = phutil_tag('a', array('href' => $lines_25), pht('25'));
-    $link_50 = phutil_tag('a', array('href' => $lines_50), pht('50'));
-    $link_100 = phutil_tag('a', array('href' => $lines_100), pht('100'));
-    $link_0 = phutil_tag('a', array('href' => $lines_0), pht('Unlimited'));
-
-    if ($limit === 25) {
-      $link_25 = phutil_tag('strong', array(), $link_25);
-    } else if ($limit === 50) {
-      $link_50 = phutil_tag('strong', array(), $link_50);
-    } else if ($limit === 100) {
-      $link_100 = phutil_tag('strong', array(), $link_100);
-    } else if ($limit === 0) {
-      $link_0 = phutil_tag('strong', array(), $link_0);
+  private function createLogHeader($build, $log, $limit, $generation) {
+    $options = array(
+      array(
+        'n' => 25,
+      ),
+      array(
+        'n' => 50,
+      ),
+      array(
+        'n' => 100,
+      ),
+      array(
+        'n' => 0,
+        'label' => pht('Unlimited'),
+      ),
+    );
+
+    $base_uri = id(new PhutilURI($build->getURI().$generation.'/'));
+
+    $links = array();
+    foreach ($options as $option) {
+      $n = $option['n'];
+      $label = idx($option, 'label', $n);
+
+      $is_selected = ($limit == $n);
+      if ($is_selected) {
+        $links[] = phutil_tag(
+          'strong',
+          array(),
+          $label);
+      } else {
+        $links[] = phutil_tag(
+          'a',
+          array(
+            'href' => (string)$base_uri->alter('l', $n),
+          ),
+          $label);
+      }
     }
 
     return phutil_tag(
       'span',
       array(),
       array(
-        $link_25,
-        ' - ',
-        $link_50,
-        ' - ',
-        $link_100,
-        ' - ',
-        $link_0,
-        ' Lines',
+        phutil_implode_html(' -  ', $links),
+        ' ',
+        pht('Lines'),
       ));
   }
 
diff --git a/src/applications/harbormaster/view/ShellLogView.php b/src/applications/harbormaster/view/ShellLogView.php
index a78840741c..c61237db10 100644
--- a/src/applications/harbormaster/view/ShellLogView.php
+++ b/src/applications/harbormaster/view/ShellLogView.php
@@ -65,7 +65,6 @@ public function render() {
         'th',
         array(
           'class' => 'phabricator-source-line',
-          'style' => 'background-color: #fff;',
         ),
         $content_number);
 
@@ -95,13 +94,11 @@ public function render() {
       'div',
       array(
         'class' => 'phabricator-source-code-container',
-        'style' => 'background-color: black; color: white;',
       ),
       phutil_tag(
         'table',
         array(
           'class' => implode(' ', $classes),
-          'style' => 'background-color: black',
         ),
         phutil_implode_html('', $rows)));
   }

From c46be2a70b4db72d61e76690ef095384de2c3f91 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 13 Apr 2018 06:20:09 -0700
Subject: [PATCH 834/865] Allow Maniphest tasks to be queried by workboard
 Column PHID via SearchEngine

Summary:
Ref T13120. See PHI571. Fixes T5024. This adds a "View as Query" action to workboard columns, which builds a query in Maniphest that has the current query constraints plus an additional constraint to select only tasks in the specified column.

This is a normal query and can be turned into a dashboard panel, added to a menu, edited, saved as a link, etc.

Much of the complexity here is that finding tasks in a given column isn't entirely straightforward because of how board layout works: when you create a task, it isn't immediately placed in columns. It's only actually added to the "Backlog" column on any boards when someone looks at the board.

To get the right behavior, we must do "board layout" for any queried columns before we can constrain results. This isn't enormously efficient, but should be OK for reasonable boards.

Test Plan:
  - Used "View as Query" for normal columns and milestome columns, got appropriate queries in Maniphest.
  - Applied filters to the board (e.g., "Priorities: wishlist"), then used "View As Query" and had my custom filters respected.
  - Queried some large boards/columns with more than a thousand tasks, got results back within a second or so.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120, T5024

Differential Revision: https://secure.phabricator.com/D19366
---
 .../maniphest/query/ManiphestTaskQuery.php    | 91 +++++++++++++++++++
 .../query/ManiphestTaskSearchEngine.php       |  8 ++
 .../PhabricatorProjectBoardViewController.php | 53 ++++++++++-
 3 files changed, 149 insertions(+), 3 deletions(-)

diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php
index f7c1551be7..edb780b724 100644
--- a/src/applications/maniphest/query/ManiphestTaskQuery.php
+++ b/src/applications/maniphest/query/ManiphestTaskQuery.php
@@ -26,6 +26,7 @@ final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery {
   private $closedEpochMin;
   private $closedEpochMax;
   private $closerPHIDs;
+  private $columnPHIDs;
 
   private $status           = 'status-any';
   const STATUS_ANY          = 'status-any';
@@ -213,6 +214,11 @@ public function withSubtypes(array $subtypes) {
     return $this;
   }
 
+  public function withColumnPHIDs(array $column_phids) {
+    $this->columnPHIDs = $column_phids;
+    return $this;
+  }
+
   public function newResultObject() {
     return new ManiphestTask();
   }
@@ -442,6 +448,91 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->subtypes);
     }
 
+
+    if ($this->columnPHIDs !== null) {
+      $viewer = $this->getViewer();
+
+      $columns = id(new PhabricatorProjectColumnQuery())
+        ->setParentQuery($this)
+        ->setViewer($viewer)
+        ->withPHIDs($this->columnPHIDs)
+        ->execute();
+      if (!$columns) {
+        throw new PhabricatorEmptyQueryException();
+      }
+
+      // We must do board layout before we move forward because the column
+      // positions may not yet exist otherwise. An example is that newly
+      // created tasks may not yet be positioned in the backlog column.
+
+      $projects = mpull($columns, 'getProject');
+      $projects = mpull($projects, null, 'getPHID');
+
+      // The board layout engine needs to know about every object that it's
+      // going to be asked to do layout for. For now, we're just doing layout
+      // on every object on the boards. In the future, we could do layout on a
+      // smaller set of objects by using the constraints on this Query. For
+      // example, if the caller is only asking for open tasks, we only need
+      // to do layout on open tasks.
+
+      // This fetches too many objects (every type of object tagged with the
+      // project, not just tasks). We could narrow it by querying the edge
+      // table on the Maniphest side, but there's currently no way to build
+      // that query with EdgeQuery.
+      $edge_query = id(new PhabricatorEdgeQuery())
+        ->withSourcePHIDs(array_keys($projects))
+        ->withEdgeTypes(
+          array(
+            PhabricatorProjectProjectHasObjectEdgeType::EDGECONST,
+          ));
+
+      $edge_query->execute();
+      $all_phids = $edge_query->getDestinationPHIDs();
+
+      // Since we overfetched PHIDs, filter out any non-tasks we got back.
+      foreach ($all_phids as $key => $phid) {
+        if (phid_get_type($phid) !== ManiphestTaskPHIDType::TYPECONST) {
+          unset($all_phids[$key]);
+        }
+      }
+
+      // If there are no tasks on the relevant boards, this query can't
+      // possibly hit anything so we're all done.
+      $task_phids = array_fuse($all_phids);
+      if (!$task_phids) {
+        throw new PhabricatorEmptyQueryException();
+      }
+
+      // We know everything we need to know, so perform board layout.
+      $engine = id(new PhabricatorBoardLayoutEngine())
+        ->setViewer($viewer)
+        ->setFetchAllBoards(true)
+        ->setBoardPHIDs(array_keys($projects))
+        ->setObjectPHIDs($task_phids)
+        ->executeLayout();
+
+      // Find the tasks that are in the constraint columns after board layout
+      // completes.
+      $select_phids = array();
+      foreach ($columns as $column) {
+        $in_column = $engine->getColumnObjectPHIDs(
+          $column->getProjectPHID(),
+          $column->getPHID());
+        foreach ($in_column as $phid) {
+          $select_phids[$phid] = $phid;
+        }
+      }
+
+      if (!$select_phids) {
+        throw new PhabricatorEmptyQueryException();
+      }
+
+      $where[] = qsprintf(
+        $conn,
+        'task.phid IN (%Ls)',
+        $select_phids);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index 565bc7a8f4..f85c79621c 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -86,6 +86,10 @@ protected function buildCustomSearchFields() {
           pht('Search for tasks with given subtypes.'))
         ->setDatasource(new ManiphestTaskSubtypeDatasource())
         ->setIsHidden($hide_subtypes),
+      id(new PhabricatorPHIDsSearchField())
+        ->setLabel(pht('Columns'))
+        ->setKey('columnPHIDs')
+        ->setAliases(array('column', 'columnPHID', 'columns')),
       id(new PhabricatorSearchThreeStateField())
         ->setLabel(pht('Open Parents'))
         ->setKey('hasParents')
@@ -246,6 +250,10 @@ protected function buildQueryFromParameters(array $map) {
       $query->withSubtaskIDs($map['subtaskIDs']);
     }
 
+    if ($map['columnPHIDs']) {
+      $query->withColumnPHIDs($map['columnPHIDs']);
+    }
+
     $group = idx($map, 'group');
     $group = idx($this->getGroupValues(), $group);
     if ($group) {
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 9396d1873e..bb048f22ea 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -36,7 +36,8 @@ public function handleRequest(AphrontRequest $request) {
 
     if ($request->isFormPost()
       && !$request->getBool('initialize')
-      && !$request->getStr('move')) {
+      && !$request->getStr('move')
+      && !$request->getStr('queryColumnID')) {
       $saved = $search_engine->buildSavedQueryFromRequest($request);
       $search_engine->saveQuery($saved);
       $filter_form = id(new AphrontFormView())
@@ -188,6 +189,46 @@ public function handleRequest(AphrontRequest $request) {
         ->appendChild($content);
     }
 
+    // If the user wants to turn a particular column into a query, build an
+    // apropriate filter and redirect them to the query results page.
+    $query_column_id = $request->getInt('queryColumnID');
+    if ($query_column_id) {
+      $column_id_map = mpull($columns, null, 'getID');
+      $query_column = idx($column_id_map, $query_column_id);
+      if (!$query_column) {
+        return new Aphront404Response();
+      }
+
+      // Create a saved query to combine the active filter on the workboard
+      // with the column filter. If the user currently has constraints on the
+      // board, we want to add a new column or project constraint, not
+      // completely replace the constraints.
+      $saved_query = clone $saved;
+
+      if ($query_column->getProxyPHID()) {
+        $project_phids = $saved_query->getParameter('projectPHIDs');
+        if (!$project_phids) {
+          $project_phids = array();
+        }
+        $project_phids[] = $query_column->getProxyPHID();
+        $saved_query->setParameter('projectPHIDs', $project_phids);
+      } else {
+        $saved_query->setParameter(
+          'columnPHIDs',
+          array($query_column->getPHID()));
+      }
+
+      $search_engine = id(new ManiphestTaskSearchEngine())
+        ->setViewer($viewer);
+      $search_engine->saveQuery($saved_query);
+
+      $query_key = $saved_query->getQueryKey();
+      $query_uri = new PhutilURI("/maniphest/query/{$query_key}/#R");
+
+      return id(new AphrontRedirectResponse())
+        ->setURI($query_uri);
+    }
+
     $task_can_edit_map = id(new PhabricatorPolicyFilter())
       ->setViewer($viewer)
       ->requireCapabilities(array(PhabricatorPolicyCapability::CAN_EDIT))
@@ -1069,8 +1110,14 @@ private function buildColumnMenu(
       ->setHref($batch_move_uri)
       ->setWorkflow(true);
 
-    // Column Related Actions Below
-    //
+    $query_uri = $request->getRequestURI();
+    $query_uri->setQueryParam('queryColumnID', $column->getID());
+
+    $column_items[] = id(new PhabricatorActionView())
+      ->setName(pht('View as Query'))
+      ->setIcon('fa-search')
+      ->setHref($query_uri);
+
     $edit_uri = 'board/'.$this->id.'/edit/'.$column->getID().'/';
     $column_items[] = id(new PhabricatorActionView())
       ->setName(pht('Edit Column'))

From 0bf0718fad275dd8fb3a00a454f4e75b076a8b0c Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Fri, 13 Apr 2018 11:25:41 -0700
Subject: [PATCH 835/865] Add isClusterDevice to Almanac query

Summary: Ref T13076. This will be used by the metric collection system to iterate over the cluster devices.

Test Plan: Created some cluster and non-cluster devices, searched and saw expected results.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T13076

Differential Revision: https://secure.phabricator.com/D19368
---
 .../almanac/query/AlmanacDeviceQuery.php            | 13 +++++++++++++
 .../almanac/query/AlmanacDeviceSearchEngine.php     | 11 +++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/applications/almanac/query/AlmanacDeviceQuery.php b/src/applications/almanac/query/AlmanacDeviceQuery.php
index 29461bfbfd..0d38070e0b 100644
--- a/src/applications/almanac/query/AlmanacDeviceQuery.php
+++ b/src/applications/almanac/query/AlmanacDeviceQuery.php
@@ -8,6 +8,7 @@ final class AlmanacDeviceQuery
   private $names;
   private $namePrefix;
   private $nameSuffix;
+  private $isClusterDevice;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -40,6 +41,11 @@ public function withNameNgrams($ngrams) {
       $ngrams);
   }
 
+  public function withIsClusterDevice($is_cluster_device) {
+    $this->isClusterDevice = $is_cluster_device;
+    return $this;
+  }
+
   public function newResultObject() {
     return new AlmanacDevice();
   }
@@ -90,6 +96,13 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->nameSuffix);
     }
 
+    if ($this->isClusterDevice !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'device.isBoundToClusterService = %d',
+        (int)$this->isClusterDevice);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/almanac/query/AlmanacDeviceSearchEngine.php b/src/applications/almanac/query/AlmanacDeviceSearchEngine.php
index 6e28d7e5b8..1d0a1d8475 100644
--- a/src/applications/almanac/query/AlmanacDeviceSearchEngine.php
+++ b/src/applications/almanac/query/AlmanacDeviceSearchEngine.php
@@ -25,6 +25,13 @@ protected function buildCustomSearchFields() {
         ->setLabel(pht('Exact Names'))
         ->setKey('names')
         ->setDescription(pht('Search for devices with specific names.')),
+      id(new PhabricatorSearchThreeStateField())
+        ->setLabel(pht('Cluster Device'))
+        ->setKey('isClusterDevice')
+        ->setOptions(
+          pht('Both Cluster and Non-cluster Devices'),
+          pht('Cluster Devices Only'),
+          pht('Non-cluster Devices Only')),
     );
   }
 
@@ -39,6 +46,10 @@ protected function buildQueryFromParameters(array $map) {
       $query->withNames($map['names']);
     }
 
+    if ($map['isClusterDevice'] !== null) {
+      $query->withIsClusterDevice($map['isClusterDevice']);
+    }
+
     return $query;
   }
 

From 6d1e00707680cbe596e7f2a8c2a66400d1ddddd1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 13 Apr 2018 12:39:49 -0700
Subject: [PATCH 836/865] Try a more conventional spelling of "Convereted"

Summary: This is a good spelling, but maybe a better spelling is possible.

Test Plan: hmmm

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19369
---
 .../management/PhabricatorDifferentialMigrateHunkWorkflow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
index 99125645e7..0e76bd5ab3 100644
--- a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
+++ b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
@@ -48,13 +48,13 @@ public function execute(PhutilArgumentParser $args) {
         $hunk->saveAsText();
         $this->logOkay(
           pht('TEXT'),
-          pht('Convereted hunk to text storage.'));
+          pht('Converted hunk to text storage.'));
         break;
       case DifferentialHunk::DATATYPE_FILE:
         $hunk->saveAsFile();
         $this->logOkay(
           pht('FILE'),
-          pht('Convereted hunk to file storage.'));
+          pht('Converted hunk to file storage.'));
         break;
     }
 

From e3de7d09c0d8c0a4c1fdd96b005b87746f9a357a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 13 Apr 2018 13:15:46 -0700
Subject: [PATCH 837/865] Add an "--all" flag to "bin/differential
 migrate-hunk"

Summary:
Depends on D19369. Ref T13120. Add a flag to migrate every hunk.

This isn't terribly useful on its own, but I'm going to add an `--auto` flag next so that you can run `--auto --all` to migrate hunks to the preferred hunk format.

Test Plan: Ran `bin/differential migrate-hunk --all --to text`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13120

Differential Revision: https://secure.phabricator.com/D19370
---
 ...ricatorDifferentialMigrateHunkWorkflow.php | 82 ++++++++++++++-----
 1 file changed, 62 insertions(+), 20 deletions(-)

diff --git a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
index 0e76bd5ab3..18afd3f359 100644
--- a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
+++ b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
@@ -6,7 +6,9 @@ final class PhabricatorDifferentialMigrateHunkWorkflow
   protected function didConstruct() {
     $this
       ->setName('migrate-hunk')
-      ->setExamples('**migrate-hunk** --id __hunk__ --to __storage__')
+      ->setExamples(
+        "**migrate-hunk** --id __hunk__ --to __storage__\n".
+        "**migrate-hunk** --all")
       ->setSynopsis(pht('Migrate storage engines for a hunk.'))
       ->setArguments(
         array(
@@ -20,14 +22,27 @@ protected function didConstruct() {
             'param' => 'storage',
             'help' => pht('Storage engine to migrate to.'),
           ),
+          array(
+            'name' => 'all',
+            'help' => pht('Migrate all hunks.'),
+          ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
     $id = $args->getArg('id');
-    if (!$id) {
+    $is_all = $args->getArg('all');
+
+    if ($is_all && $id) {
       throw new PhutilArgumentUsageException(
-        pht('Specify a hunk to migrate with --id.'));
+        pht(
+          'Options "--all" (to migrate all hunks) and "--id" (to migrate a '.
+          'specific hunk) are mutually exclusive.'));
+    } else if (!$is_all && !$id) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Specify a hunk to migrate with "--id", or migrate all hunks '.
+          'with "--all".'));
     }
 
     $storage = $args->getArg('to');
@@ -40,10 +55,51 @@ public function execute(PhutilArgumentParser $args) {
           pht('Specify a hunk storage engine with --to.'));
     }
 
-    $hunk = $this->loadHunk($id);
+    if ($id) {
+      $hunk = $this->loadHunk($id);
+      $hunks = array($hunk);
+    } else {
+      $hunks = new LiskMigrationIterator(new DifferentialHunk());
+    }
+
+    foreach ($hunks as $hunk) {
+      try {
+        $this->migrateHunk($hunk, $storage);
+      } catch (Exception $ex) {
+        // If we're migrating a single hunk, just throw the exception. If
+        // we're migrating multiple hunks, warn but continue.
+        if ($id) {
+          throw $ex;
+        }
+
+        $this->logWarn(
+          pht('WARN'),
+          pht(
+            'Failed to migrate hunk %d: %s',
+            $hunk->getID(),
+            $ex->getMessage()));
+      }
+    }
+
+    return 0;
+  }
+
+  private function loadHunk($id) {
+    $hunk = id(new DifferentialHunk())->load($id);
+    if (!$hunk) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'No hunk exists with ID "%s".',
+          $id));
+    }
+
+    return $hunk;
+  }
+
+  private function migrateHunk(DifferentialHunk $hunk, $format) {
     $old_data = $hunk->getChanges();
 
-    switch ($storage) {
+    switch ($format) {
       case DifferentialHunk::DATATYPE_TEXT:
         $hunk->saveAsText();
         $this->logOkay(
@@ -58,7 +114,7 @@ public function execute(PhutilArgumentParser $args) {
         break;
     }
 
-    $hunk = $this->loadHunk($id);
+    $hunk = $this->loadHunk($hunk->getID());
     $new_data = $hunk->getChanges();
 
     if ($old_data !== $new_data) {
@@ -66,20 +122,6 @@ public function execute(PhutilArgumentParser $args) {
         pht(
           'Integrity check failed: new file data differs fom old data!'));
     }
-
-    return 0;
-  }
-
-  private function loadHunk($id) {
-    $hunk = id(new DifferentialHunk())->load($id);
-    if (!$hunk) {
-      throw new PhutilArgumentUsageException(
-        pht(
-          'No hunk exists with ID "%s".',
-          $id));
-    }
-
-    return $hunk;
   }
 
 

From b5f23b023e3c3a055e1d446a3a7a60341a3590cc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 16 Apr 2018 06:38:14 -0700
Subject: [PATCH 838/865] Add an "--auto" flag to "bin/differential
 migrate-hunk"

Summary:
Depends on D19370. See T13124. See PHI549. The particular install in PHI549 migrated a large amount of data via the fallback hunk migration script, which does not compress hunks.

Add a mode to `bin/differential migrate-hunk` that amounts to "compress all the hunks which would benefit from compression".

Test Plan: Ran `bin/differential migrate-hunk` with `--auto`, `--all`, `--to`, `--id`, and `--dry-run` in various mixtures. Forced a bunch of hunks to raw ("byte") format, saw it cleanly upgrade them to compressed ("gzde") format.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19371
---
 ...ricatorDifferentialMigrateHunkWorkflow.php | 116 +++++++++++++++---
 .../differential/storage/DifferentialHunk.php |  22 ++--
 2 files changed, 114 insertions(+), 24 deletions(-)

diff --git a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
index 18afd3f359..0db158e171 100644
--- a/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
+++ b/src/applications/differential/management/PhabricatorDifferentialMigrateHunkWorkflow.php
@@ -26,10 +26,20 @@ protected function didConstruct() {
             'name' => 'all',
             'help' => pht('Migrate all hunks.'),
           ),
+          array(
+            'name' => 'auto',
+            'help' => pht('Select storage format automatically.'),
+          ),
+          array(
+            'name' => 'dry-run',
+            'help' => pht('Show planned writes but do not perform them.'),
+          ),
         ));
   }
 
   public function execute(PhutilArgumentParser $args) {
+    $is_dry_run = $args->getArg('dry-run');
+
     $id = $args->getArg('id');
     $is_all = $args->getArg('all');
 
@@ -45,14 +55,34 @@ public function execute(PhutilArgumentParser $args) {
           'with "--all".'));
     }
 
+    $is_auto = $args->getArg('auto');
     $storage = $args->getArg('to');
-    switch ($storage) {
-      case DifferentialHunk::DATATYPE_TEXT:
-      case DifferentialHunk::DATATYPE_FILE:
-        break;
-      default:
+    if ($is_auto && $storage) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Options "--to" (to choose a specific storage format) and "--auto" '.
+          '(to select a storage format automatically) are mutually '.
+          'exclusive.'));
+    } else if (!$is_auto && !$storage) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Use "--to" to choose a storage format, or "--auto" to select a '.
+          'format automatically.'));
+    }
+
+    $types = array(
+      DifferentialHunk::DATATYPE_TEXT,
+      DifferentialHunk::DATATYPE_FILE,
+    );
+    $types = array_fuse($types);
+    if (strlen($storage)) {
+      if (!isset($types[$storage])) {
         throw new PhutilArgumentUsageException(
-          pht('Specify a hunk storage engine with --to.'));
+          pht(
+            'Storage type "%s" is unknown. Supported types are: %s.',
+            $storage,
+            implode(', ', array_keys($types))));
+      }
     }
 
     if ($id) {
@@ -64,7 +94,7 @@ public function execute(PhutilArgumentParser $args) {
 
     foreach ($hunks as $hunk) {
       try {
-        $this->migrateHunk($hunk, $storage);
+        $this->migrateHunk($hunk, $storage, $is_auto, $is_dry_run);
       } catch (Exception $ex) {
         // If we're migrating a single hunk, just throw the exception. If
         // we're migrating multiple hunks, warn but continue.
@@ -96,31 +126,85 @@ private function loadHunk($id) {
     return $hunk;
   }
 
-  private function migrateHunk(DifferentialHunk $hunk, $format) {
+  private function migrateHunk(
+    DifferentialHunk $hunk,
+    $type,
+    $is_auto,
+    $is_dry_run) {
+
+    $old_type = $hunk->getDataType();
+
+    if ($is_auto) {
+      // By default, we're just going to keep hunks in the same storage
+      // engine. In the future, we could perhaps select large hunks stored in
+      // text engine and move them into file storage.
+      $new_type = $old_type;
+    } else {
+      $new_type = $type;
+    }
+
+    // Figure out if the storage format (e.g., plain text vs compressed)
+    // would change if we wrote this hunk anew today.
+    $old_format = $hunk->getDataFormat();
+    $new_format = $hunk->getAutomaticDataFormat();
+
+    $same_type = ($old_type === $new_type);
+    $same_format = ($old_format === $new_format);
+
+    // If we aren't going to change the storage engine and aren't going to
+    // change the storage format, just bail out.
+    if ($same_type && $same_format) {
+      $this->logInfo(
+        pht('SKIP'),
+        pht(
+          'Hunk %d is already stored in the preferred engine ("%s") '.
+          'with the preferred format ("%s").',
+          $hunk->getID(),
+          $new_type,
+          $new_format));
+      return;
+    }
+
+    if ($is_dry_run) {
+      $this->logOkay(
+        pht('DRY RUN'),
+        pht(
+          'Hunk %d would be rewritten (storage: "%s" -> "%s"; '.
+          'format: "%s" -> "%s").',
+          $hunk->getID(),
+          $old_type,
+          $new_type,
+          $old_format,
+          $new_format));
+      return;
+    }
+
     $old_data = $hunk->getChanges();
 
-    switch ($format) {
+    switch ($new_type) {
       case DifferentialHunk::DATATYPE_TEXT:
         $hunk->saveAsText();
-        $this->logOkay(
-          pht('TEXT'),
-          pht('Converted hunk to text storage.'));
         break;
       case DifferentialHunk::DATATYPE_FILE:
         $hunk->saveAsFile();
-        $this->logOkay(
-          pht('FILE'),
-          pht('Converted hunk to file storage.'));
         break;
     }
 
+    $this->logOkay(
+      pht('MIGRATE'),
+      pht(
+        'Converted hunk %d to "%s" storage (with format "%s").',
+        $hunk->getID(),
+        $new_type,
+        $hunk->getDataFormat()));
+
     $hunk = $this->loadHunk($hunk->getID());
     $new_data = $hunk->getChanges();
 
     if ($old_data !== $new_data) {
       throw new Exception(
         pht(
-          'Integrity check failed: new file data differs fom old data!'));
+          'Integrity check failed: new file data differs from old data!'));
     }
   }
 
diff --git a/src/applications/differential/storage/DifferentialHunk.php b/src/applications/differential/storage/DifferentialHunk.php
index 3defb3566b..6bfb38b789 100644
--- a/src/applications/differential/storage/DifferentialHunk.php
+++ b/src/applications/differential/storage/DifferentialHunk.php
@@ -290,14 +290,24 @@ private function formatDataForStorage($data) {
     return array(self::DATAFORMAT_RAW, $data);
   }
 
+  public function getAutomaticDataFormat() {
+    // If the hunk is already stored deflated, just keep it deflated. This is
+    // mostly a performance improvement for "bin/differential migrate-hunk" so
+    // that we don't have to recompress all the stored hunks when looking for
+    // stray uncompressed hunks.
+    if ($this->dataFormat === self::DATAFORMAT_DEFLATED) {
+      return self::DATAFORMAT_DEFLATED;
+    }
+
+    list($format) = $this->formatDataForStorage($this->getRawData());
+
+    return $format;
+  }
+
   public function saveAsText() {
     $old_type = $this->getDataType();
     $old_data = $this->getData();
 
-    if ($old_type == self::DATATYPE_TEXT) {
-      return $this;
-    }
-
     $raw_data = $this->getRawData();
 
     $this->setDataType(self::DATATYPE_TEXT);
@@ -317,10 +327,6 @@ public function saveAsFile() {
     $old_type = $this->getDataType();
     $old_data = $this->getData();
 
-    if ($old_type == self::DATATYPE_FILE) {
-      return $this;
-    }
-
     $raw_data = $this->getRawData();
 
     list($format, $data) = $this->formatDataForStorage($raw_data);

From 25965260c43189043ebddde2b118c326759f27b4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 16 Apr 2018 07:09:44 -0700
Subject: [PATCH 839/865] Add a rough "!history" email command to get an entire
 object history via email

Summary:
See PHI505. Ref T13124. If you're an agent of a hostile state trying to exfiltrate corporate secrets, you might find yourself foiled if Phabricator is secured behind a VPN.

To assist users in this situation, provide a "!history" command which will dump the entire history of an object in a nice text format and get through the troublesome VPN.

Some issues with this:

  - You currently get all the "X added a comment." up top, and then all the comments below. This isn't terribly useful.
  - This goes through the "Must Encrypt" flag, but possibly should not? (On the other hand, this is a pretty willful way to bypass it the flag.)

Test Plan: Used `bin/mail receive-test ...` to send `!history` commands, got somewhat-useful response mail.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13124

Differential Revision: https://secure.phabricator.com/D19372
---
 .../constants/PhabricatorTransactions.php     |  1 +
 ...habricatorApplicationTransactionEditor.php | 67 ++++++++++++++++++-
 .../PhabricatorApplicationTransaction.php     | 11 ++-
 3 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/src/applications/transactions/constants/PhabricatorTransactions.php b/src/applications/transactions/constants/PhabricatorTransactions.php
index 4089187ca4..7a606fe65c 100644
--- a/src/applications/transactions/constants/PhabricatorTransactions.php
+++ b/src/applications/transactions/constants/PhabricatorTransactions.php
@@ -15,6 +15,7 @@ final class PhabricatorTransactions extends Phobject {
   const TYPE_CREATE = 'core:create';
   const TYPE_COLUMNS = 'core:columns';
   const TYPE_SUBTYPE = 'core:subtype';
+  const TYPE_HISTORY = 'core:history';
 
   const COLOR_RED         = 'red';
   const COLOR_ORANGE      = 'orange';
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 70644b1974..685f760b15 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -83,6 +83,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $webhookMap = array();
 
   private $transactionQueue = array();
+  private $sendHistory = false;
 
   const STORAGE_ENCODING_BINARY = 'binary';
 
@@ -300,6 +301,7 @@ public function getTransactionTypes() {
     $types = array();
 
     $types[] = PhabricatorTransactions::TYPE_CREATE;
+    $types[] = PhabricatorTransactions::TYPE_HISTORY;
 
     if ($this->object instanceof PhabricatorEditEngineSubtypeInterface) {
       $types[] = PhabricatorTransactions::TYPE_SUBTYPE;
@@ -377,6 +379,7 @@ private function getTransactionOldValue(
 
     switch ($type) {
       case PhabricatorTransactions::TYPE_CREATE:
+      case PhabricatorTransactions::TYPE_HISTORY:
         return null;
       case PhabricatorTransactions::TYPE_SUBTYPE:
         return $object->getEditEngineSubtype();
@@ -468,6 +471,7 @@ private function getTransactionNewValue(
       case PhabricatorTransactions::TYPE_TOKEN:
       case PhabricatorTransactions::TYPE_INLINESTATE:
       case PhabricatorTransactions::TYPE_SUBTYPE:
+      case PhabricatorTransactions::TYPE_HISTORY:
         return $xaction->getNewValue();
       case PhabricatorTransactions::TYPE_SPACE:
         $space_phid = $xaction->getNewValue();
@@ -520,6 +524,7 @@ protected function transactionHasEffect(
 
     switch ($xaction->getTransactionType()) {
       case PhabricatorTransactions::TYPE_CREATE:
+      case PhabricatorTransactions::TYPE_HISTORY:
         return true;
       case PhabricatorTransactions::TYPE_CUSTOMFIELD:
         $field = $this->getCustomFieldForTransaction($object, $xaction);
@@ -604,6 +609,7 @@ private function applyInternalEffects(
         $field = $this->getCustomFieldForTransaction($object, $xaction);
         return $field->applyApplicationTransactionInternalEffects($xaction);
       case PhabricatorTransactions::TYPE_CREATE:
+      case PhabricatorTransactions::TYPE_HISTORY:
       case PhabricatorTransactions::TYPE_SUBTYPE:
       case PhabricatorTransactions::TYPE_TOKEN:
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
@@ -665,6 +671,7 @@ private function applyExternalEffects(
         $field = $this->getCustomFieldForTransaction($object, $xaction);
         return $field->applyApplicationTransactionExternalEffects($xaction);
       case PhabricatorTransactions::TYPE_CREATE:
+      case PhabricatorTransactions::TYPE_HISTORY:
       case PhabricatorTransactions::TYPE_SUBTYPE:
       case PhabricatorTransactions::TYPE_EDGE:
       case PhabricatorTransactions::TYPE_TOKEN:
@@ -800,6 +807,9 @@ protected function applyBuiltinExternalTransaction(
       case PhabricatorTransactions::TYPE_SPACE:
         $this->scrambleFileSecrets($object);
         break;
+      case PhabricatorTransactions::TYPE_HISTORY:
+        $this->sendHistory = true;
+        break;
     }
   }
 
@@ -1317,6 +1327,13 @@ public function publishTransactions(
       $this->publishFeedStory($object, $xactions, $mailed);
     }
 
+    if ($this->sendHistory) {
+      $history_mail = $this->buildHistoryMail($object);
+      if ($history_mail) {
+        $messages[] = $history_mail;
+      }
+    }
+
     // NOTE: This actually sends the mail. We do this last to reduce the chance
     // that we send some mail, hit an exception, then send the mail again when
     // retrying.
@@ -2557,6 +2574,25 @@ private function buildMail(
       $unexpandable = array();
     }
 
+    $messages = $this->buildMailWithRecipients(
+      $object,
+      $xactions,
+      $email_to,
+      $email_cc,
+      $unexpandable);
+
+    $this->runHeraldMailRules($messages);
+
+    return $messages;
+  }
+
+  private function buildMailWithRecipients(
+    PhabricatorLiskDAO $object,
+    array $xactions,
+    array $email_to,
+    array $email_cc,
+    array $unexpandable) {
+
     $targets = $this->buildReplyHandler($object)
       ->setUnexpandablePHIDs($unexpandable)
       ->getMailTargets($email_to, $email_cc);
@@ -2603,8 +2639,6 @@ private function buildMail(
       }
     }
 
-    $this->runHeraldMailRules($messages);
-
     return $messages;
   }
 
@@ -3671,6 +3705,7 @@ private function getAutomaticStateProperties() {
       'mailMutedPHIDs',
       'webhookMap',
       'silent',
+      'sendHistory',
     );
   }
 
@@ -4328,4 +4363,32 @@ private function hasWarnings($object, $xaction) {
     return true;
   }
 
+  private function buildHistoryMail(PhabricatorLiskDAO $object) {
+    $viewer = $this->requireActor();
+    $recipient_phid = $this->getActingAsPHID();
+
+    // Load every transaction so we can build a mail message with a complete
+    // history for the object.
+    $query = PhabricatorApplicationTransactionQuery::newQueryForObject($object);
+    $xactions = $query
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object->getPHID()))
+      ->execute();
+    $xactions = array_reverse($xactions);
+
+    $mail_messages = $this->buildMailWithRecipients(
+      $object,
+      $xactions,
+      array($recipient_phid),
+      array(),
+      array());
+    $mail = head($mail_messages);
+
+    // Since the user explicitly requested "!history", force delivery of this
+    // message regardless of their other mail settings.
+    $mail->setForceDelivery(true);
+
+    return $mail;
+  }
+
 }
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index 69d11fe753..ed88ac98db 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -545,11 +545,18 @@ public function shouldHide() {
       return false;
     }
 
+    $xaction_type = $this->getTransactionType();
+
+    // Always hide requests for object history.
+    if ($xaction_type === PhabricatorTransactions::TYPE_HISTORY) {
+      return true;
+    }
+
     // Hide creation transactions if the old value is empty. These are
-    // transactions like "alice set the task tile to: ...", which are
+    // transactions like "alice set the task title to: ...", which are
     // essentially never interesting.
     if ($this->getIsCreateTransaction()) {
-      switch ($this->getTransactionType()) {
+      switch ($xaction_type) {
         case PhabricatorTransactions::TYPE_CREATE:
         case PhabricatorTransactions::TYPE_VIEW_POLICY:
         case PhabricatorTransactions::TYPE_EDIT_POLICY:

From f9b3673fbbe114beb46989df3173d867c816cc5f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 16 Apr 2018 07:49:47 -0700
Subject: [PATCH 840/865] When mail (like "!history" mail) has multiple
 comments, label them separately

Summary:
Depends on D19372. Ref T13124. See PHI505. Currently, if you `!history` a task with a lot of comments, you get output like this:

> alice added a comment.
> bailey added a comment.
> alice added a comment.
> alice added a comment.
>
> AAAA
>
> BBBB
>
> AAAA
>
> AAAA

This is impossible to read. Put the "alice added a comment." headers above the actual comments for comments after the first.

These types of mail messages are unusual, but occur in several cases:

  - The new `!history` command.
  - Multiple comments on a draft revision before it promotes out of draft.
  - (Probably?) Conduit API updates which submit multiple comment transactions for some reason.

Test Plan: Used `bin/mail receive-test` to send a `!history` command to a task, saw a much more readable rendering of the transaction log in the resulting email.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13124

Differential Revision: https://secure.phabricator.com/D19373
---
 ...habricatorApplicationTransactionEditor.php | 75 +++++++++++++++----
 1 file changed, 60 insertions(+), 15 deletions(-)

diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 685f760b15..f76f66df66 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -2969,34 +2969,62 @@ protected function addHeadersAndCommentsToMailBody(
     $object_label = null,
     $object_href = null) {
 
+    // First, remove transactions which shouldn't be rendered in mail.
+    foreach ($xactions as $key => $xaction) {
+      if ($xaction->shouldHideForMail($xactions)) {
+        unset($xactions[$key]);
+      }
+    }
+
     $headers = array();
     $headers_html = array();
     $comments = array();
     $details = array();
 
+    $seen_comment = false;
     foreach ($xactions as $xaction) {
-      if ($xaction->shouldHideForMail($xactions)) {
-        continue;
-      }
 
-      $header = $xaction->getTitleForMail();
-      if ($header !== null) {
-        $headers[] = $header;
-      }
+      // Most mail has zero or one comments. In these cases, we render the
+      // "alice added a comment." transaction in the header, like a normal
+      // transaction.
 
-      $header_html = $xaction->getTitleForHTMLMail();
-      if ($header_html !== null) {
-        $headers_html[] = $header_html;
-      }
+      // Some mail, like Differential undraft mail or "!history" mail, may
+      // have two or more comments. In these cases, we'll put the first
+      // "alice added a comment." transaction in the header normally, but
+      // move the other transactions down so they provide context above the
+      // actual comment.
 
       $comment = $xaction->getBodyForMail();
       if ($comment !== null) {
-        $comments[] = $comment;
+        $is_comment = true;
+        $comments[] = array(
+          'xaction' => $xaction,
+          'comment' => $comment,
+          'initial' => !$seen_comment,
+        );
+      } else {
+        $is_comment = false;
+      }
+
+      if (!$is_comment || !$seen_comment) {
+        $header = $xaction->getTitleForMail();
+        if ($header !== null) {
+          $headers[] = $header;
+        }
+
+        $header_html = $xaction->getTitleForHTMLMail();
+        if ($header_html !== null) {
+          $headers_html[] = $header_html;
+        }
       }
 
       if ($xaction->hasChangeDetailsForMail()) {
         $details[] = $xaction;
       }
+
+      if ($is_comment) {
+        $seen_comment = true;
+      }
     }
 
     $headers_text = implode("\n", $headers);
@@ -3029,8 +3057,7 @@ protected function addHeadersAndCommentsToMailBody(
         $object_label);
     }
 
-    $xactions_style = array(
-    );
+    $xactions_style = array();
 
     $header_action = phutil_tag(
       'td',
@@ -3057,7 +3084,25 @@ protected function addHeadersAndCommentsToMailBody(
 
     $body->addRawHTMLSection($headers_html);
 
-    foreach ($comments as $comment) {
+    foreach ($comments as $spec) {
+      $xaction = $spec['xaction'];
+      $comment = $spec['comment'];
+      $is_initial = $spec['initial'];
+
+      // If this is not the first comment in the mail, add the header showing
+      // who wrote the comment immediately above the comment.
+      if (!$is_initial) {
+        $header = $xaction->getTitleForMail();
+        if ($header !== null) {
+          $body->addRawPlaintextSection($header);
+        }
+
+        $header_html = $xaction->getTitleForHTMLMail();
+        if ($header_html !== null) {
+          $body->addRawHTMLSection($header_html);
+        }
+      }
+
       $body->addRemarkupSection(null, $comment);
     }
 

From 21bb0215dbc77ef58045ca45f1b0b1f9259326b2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 17 Apr 2018 05:53:31 -0700
Subject: [PATCH 841/865] Remove obsoleted "diffusion-browse-file" behavior for
 coverage

Summary: Ref T13105. After moving Diffusion to DocumnentEngine, this no longer has callers. It will become part of the document behavior.

Test Plan: Grepped for calls to the `diffusion-browse-file` behavior, found none.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13105

Differential Revision: https://secure.phabricator.com/D19377
---
 resources/celerity/map.php                    |  8 ----
 .../behavior-diffusion-browse-file.js         | 47 -------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 webroot/rsrc/js/application/diffusion/behavior-diffusion-browse-file.js

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 6c1240fea0..49a4f233f7 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -384,7 +384,6 @@
     'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
     'rsrc/js/application/diffusion/behavior-commit-branches.js' => 'bdaf4d04',
     'rsrc/js/application/diffusion/behavior-commit-graph.js' => '75b83cbb',
-    'rsrc/js/application/diffusion/behavior-diffusion-browse-file.js' => '054a0f0b',
     'rsrc/js/application/diffusion/behavior-locate-file.js' => '6d3e1947',
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
@@ -597,7 +596,6 @@
     'javelin-behavior-differential-feedback-preview' => '51c5ad07',
     'javelin-behavior-differential-populate' => '419998ab',
     'javelin-behavior-differential-user-select' => 'a8d8459d',
-    'javelin-behavior-diffusion-browse-file' => '054a0f0b',
     'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
     'javelin-behavior-diffusion-commit-graph' => '75b83cbb',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
@@ -932,12 +930,6 @@
       'javelin-util',
       'javelin-magical-init',
     ),
-    '054a0f0b' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'phabricator-tooltip',
-    ),
     '065227cc' => array(
       'javelin-behavior',
       'javelin-dom',
diff --git a/webroot/rsrc/js/application/diffusion/behavior-diffusion-browse-file.js b/webroot/rsrc/js/application/diffusion/behavior-diffusion-browse-file.js
deleted file mode 100644
index 41ff0cfcc3..0000000000
--- a/webroot/rsrc/js/application/diffusion/behavior-diffusion-browse-file.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @provides javelin-behavior-diffusion-browse-file
- * @requires javelin-behavior
- *           javelin-dom
- *           javelin-util
- *           phabricator-tooltip
- */
-
-JX.behavior('diffusion-browse-file', function(config, statics) {
-  if (statics.installed) {
-    return;
-  }
-  statics.installed = true;
-
-  var map = config.labels;
-
-  JX.Stratcom.listen(
-    ['mouseover', 'mouseout'],
-    ['phabricator-source', 'tag:td'],
-    function(e) {
-      var target = e.getTarget();
-
-      // NOTE: We're using raw classnames instead of sigils and metadata here
-      // because these elements are unusual: there are a lot of them on the
-      // page, and rendering all the extra metadata to do this in a normal way
-      // would be needlessly expensive. This is an unusual case.
-
-      if (!target.className.match(/cov-/)) {
-        return;
-      }
-
-      if (e.getType() == 'mouseout') {
-        JX.Tooltip.hide();
-        return;
-      }
-
-      for (var k in map) {
-        if (!target.className.match(k)) {
-          continue;
-        }
-
-        var label = map[k];
-        JX.Tooltip.show(target, 300, 'E', label);
-        break;
-      }
-    });
-});

From 665529ab60a15a17574fc64865fe0764638938a6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 17 Apr 2018 06:40:41 -0700
Subject: [PATCH 842/865] Restore coverage reporting to Diffusion browse UI

Summary:
Depends on D19377. Ref T13125. Ref T13124. Ref T13105. Coverage reporting in Diffusion didn't initially survive the transition to Document Engine; restore it.

This adds some tentative/theoretical support for multiple columns of coverage, but no way to actually produce them in the UI. For now, the labels, codes, and colors are hard coded.

Test Plan:
Added coverage with `diffusion.updatecoverage`, saw coverage in the UI:

{F5525542}

Hovered over coverage, got labels and highlighting.

Double-checked labels for "N" (Not Executable) and "U" (Uncovered). See PHI577.

Faked some multi-column coverage, but you can't currently get this yourself today:

{F5525544}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13125, T13124, T13105

Differential Revision: https://secure.phabricator.com/D19378
---
 resources/celerity/map.php                    | 18 +++---
 .../controller/DiffusionBrowseController.php  |  2 -
 .../DiffusionDocumentRenderingEngine.php      |  5 ++
 .../files/document/PhabricatorDocumentRef.php | 12 ++++
 .../PhabricatorSourceDocumentEngine.php       |  4 ++
 .../PhabricatorTextDocumentEngine.php         |  6 ++
 .../PhabricatorDocumentRenderingEngine.php    | 11 ++++
 src/view/layout/PhabricatorSourceCodeView.php | 45 +++++++++++++-
 .../layout/phabricator-source-code-view.css   | 12 +++-
 .../files/behavior-document-engine.js         | 59 ++++++++++++++++++-
 10 files changed, 159 insertions(+), 15 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 49a4f233f7..6053b0846e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -119,7 +119,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => '09368218',
+    'rsrc/css/layout/phabricator-source-code-view.css' => 'fdbefca0',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -388,7 +388,7 @@
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '1db13e70',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
-    'rsrc/js/application/files/behavior-document-engine.js' => '0333c0b6',
+    'rsrc/js/application/files/behavior-document-engine.js' => 'ee0deff8',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
@@ -600,7 +600,7 @@
     'javelin-behavior-diffusion-commit-graph' => '75b83cbb',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
-    'javelin-behavior-document-engine' => '0333c0b6',
+    'javelin-behavior-document-engine' => 'ee0deff8',
     'javelin-behavior-doorkeeper-tag' => '1db13e70',
     'javelin-behavior-drydock-live-operation-status' => '901935ef',
     'javelin-behavior-durable-column' => '2ae077e1',
@@ -776,7 +776,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => '09368218',
+    'phabricator-source-code-view-css' => 'fdbefca0',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
@@ -905,11 +905,6 @@
       'javelin-behavior',
       'javelin-uri',
     ),
-    '0333c0b6' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-    ),
     '040fce04' => array(
       'javelin-behavior',
       'javelin-request',
@@ -2110,6 +2105,11 @@
       'javelin-behavior',
       'javelin-uri',
     ),
+    'ee0deff8' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+    ),
     'efe49472' => array(
       'javelin-install',
       'javelin-util',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 1053ef477c..54be7dd7f1 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -4,7 +4,6 @@ final class DiffusionBrowseController extends DiffusionController {
 
   private $lintCommit;
   private $lintMessages;
-  private $coverage;
   private $corpusButtons = array();
 
   public function shouldAllowPublic() {
@@ -182,7 +181,6 @@ private function browseFile() {
 
         $corpus = $this->buildGitLFSCorpus($lfs_ref);
       } else {
-        $this->coverage = $drequest->loadCoverage();
         $show_editor = true;
 
         $ref = id(new PhabricatorDocumentRef())
diff --git a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
index 17abba5c4f..9615b35799 100644
--- a/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
+++ b/src/applications/diffusion/document/DiffusionDocumentRenderingEngine.php
@@ -81,6 +81,11 @@ protected function willRenderRef(PhabricatorDocumentRef $ref) {
     $ref
       ->setSymbolMetadata($this->getSymbolMetadata())
       ->setBlameURI($blame_uri);
+
+    $coverage = $drequest->loadCoverage();
+    if (strlen($coverage)) {
+      $ref->addCoverage($coverage);
+    }
   }
 
   private function getSymbolMetadata() {
diff --git a/src/applications/files/document/PhabricatorDocumentRef.php b/src/applications/files/document/PhabricatorDocumentRef.php
index 953ac7df5d..38e4491615 100644
--- a/src/applications/files/document/PhabricatorDocumentRef.php
+++ b/src/applications/files/document/PhabricatorDocumentRef.php
@@ -10,6 +10,7 @@ final class PhabricatorDocumentRef
   private $snippet;
   private $symbolMetadata = array();
   private $blameURI;
+  private $coverage = array();
 
   public function setFile(PhabricatorFile $file) {
     $this->file = $file;
@@ -151,4 +152,15 @@ public function getBlameURI() {
     return $this->blameURI;
   }
 
+  public function addCoverage($coverage) {
+    $this->coverage[] = array(
+      'data' => $coverage,
+    );
+    return $this;
+  }
+
+  public function getCoverage() {
+    return $this->coverage;
+  }
+
 }
diff --git a/src/applications/files/document/PhabricatorSourceDocumentEngine.php b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
index 20a1c94a95..c88d979b4e 100644
--- a/src/applications/files/document/PhabricatorSourceDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorSourceDocumentEngine.php
@@ -57,6 +57,10 @@ protected function newDocumentContent(PhabricatorDocumentRef $ref) {
       $options['blame'] = $blame;
     }
 
+    if ($ref->getCoverage()) {
+      $options['coverage'] = $ref->getCoverage();
+    }
+
     return array(
       $messages,
       $this->newTextDocumentContent($ref, $content, $options),
diff --git a/src/applications/files/document/PhabricatorTextDocumentEngine.php b/src/applications/files/document/PhabricatorTextDocumentEngine.php
index 0377a24353..2fce98baf1 100644
--- a/src/applications/files/document/PhabricatorTextDocumentEngine.php
+++ b/src/applications/files/document/PhabricatorTextDocumentEngine.php
@@ -22,6 +22,7 @@ protected function newTextDocumentContent(
       $options,
       array(
         'blame' => 'optional wild',
+        'coverage' => 'optional list<wild>',
       ));
 
     if (is_array($content)) {
@@ -40,6 +41,11 @@ protected function newTextDocumentContent(
       $view->setBlameMap($blame);
     }
 
+    $coverage = idx($options, 'coverage');
+    if ($coverage !== null) {
+      $view->setCoverage($coverage);
+    }
+
     $message = null;
     if ($this->encodingMessage !== null) {
       $message = $this->newMessage($this->encodingMessage);
diff --git a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
index 4a16f53fdf..155ed28dfa 100644
--- a/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
+++ b/src/applications/files/document/render/PhabricatorDocumentRenderingEngine.php
@@ -145,6 +145,17 @@ final public function newDocumentView(PhabricatorDocumentRef $ref) {
         'uri' => $ref->getBlameURI(),
         'value' => null,
       ),
+      'coverage' => array(
+        'labels' => array(
+          // TODO: Modularize this properly, see T13125.
+          array(
+            'C' => pht('Covered'),
+            'U' => pht('Not Covered'),
+            'N' => pht('Not Executable'),
+            'X' => pht('Not Reachable'),
+          ),
+        ),
+      ),
     );
 
     $view_button = id(new PHUIButtonView())
diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
index 19126d1c6a..ae20fe2501 100644
--- a/src/view/layout/PhabricatorSourceCodeView.php
+++ b/src/view/layout/PhabricatorSourceCodeView.php
@@ -10,6 +10,7 @@ final class PhabricatorSourceCodeView extends AphrontView {
   private $truncatedFirstLines = false;
   private $symbolMetadata;
   private $blameMap;
+  private $coverage = array();
 
   public function setLines(array $lines) {
     $this->lines = $lines;
@@ -59,6 +60,15 @@ public function getBlameMap() {
     return $this->blameMap;
   }
 
+  public function setCoverage(array $coverage) {
+    $this->coverage = $coverage;
+    return $this;
+  }
+
+  public function getCoverage() {
+    return $this->coverage;
+  }
+
   public function render() {
     $blame_map = $this->getBlameMap();
     $has_blame = ($blame_map !== null);
@@ -97,6 +107,19 @@ public function render() {
 
     $base_uri = (string)$this->uri;
     $wrote_anchor = false;
+
+    $coverage = $this->getCoverage();
+    $coverage_count = count($coverage);
+    $coverage_data = ipull($coverage, 'data');
+
+    // TODO: Modularize this properly, see T13125.
+    $coverage_map = array(
+      'C' => 'background: #66bbff;',
+      'U' => 'background: #dd8866;',
+      'N' => 'background: #ddeeff;',
+      'X' => 'background: #aa00aa;',
+    );
+
     foreach ($lines as $line) {
       $row_attributes = array();
       if (isset($this->highlights[$line_number])) {
@@ -157,6 +180,25 @@ public function render() {
         $blame_cells = null;
       }
 
+      $coverage_cells = array();
+      foreach ($coverage as $coverage_idx => $coverage_spec) {
+        if (isset($coverage_spec['data'][$line_number - 1])) {
+          $coverage_char = $coverage_spec['data'][$line_number - 1];
+        } else {
+          $coverage_char = null;
+        }
+
+        $coverage_style = idx($coverage_map, $coverage_char, null);
+
+        $coverage_cells[] = phutil_tag(
+          'th',
+          array(
+            'class' => 'phabricator-source-coverage',
+            'style' => $coverage_style,
+            'data-coverage' => $coverage_idx.'/'.$coverage_char,
+          ));
+      }
+
       $rows[] = phutil_tag(
         'tr',
         $row_attributes,
@@ -174,7 +216,8 @@ public function render() {
               'class' => 'phabricator-source-code',
             ),
             $line),
-          ));
+          $coverage_cells,
+        ));
 
       $line_number++;
     }
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index 6f2864d067..b0c334da26 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -6,7 +6,6 @@
   overflow-x: auto;
   overflow-y: hidden;
   border: 1px solid {$paste.border};
-  border-radius: 3px;
 }
 
 .phui-oi .phabricator-source-code-container {
@@ -47,10 +46,12 @@ th.phabricator-source-line a:hover {
   text-decoration: none;
 }
 
+.phabricator-source-coverage-highlight .phabricator-source-code,
 .phabricator-source-highlight .phabricator-source-code {
   background: {$paste.highlight};
 }
 
+.phabricator-source-coverage-highlight .phabricator-source-line,
 .phabricator-source-highlight .phabricator-source-line {
   background: {$paste.border};
 }
@@ -96,7 +97,7 @@ th.phabricator-source-line a:hover {
 
 .phabricator-source-blame-info a {
   color: {$darkbluetext};
-  text-shadow: 1px 1px rgba(0, 0, 0, 0.111);
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.05);
 }
 
 .phabricator-source-blame-skip a {
@@ -123,3 +124,10 @@ th.phabricator-source-line a:hover {
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
+
+th.phabricator-source-coverage {
+  padding: 0 8px;
+  border-left: 1px solid {$thinblueborder};
+  background: {$lightgreybackground};
+  cursor: w-resize;
+}
diff --git a/webroot/rsrc/js/application/files/behavior-document-engine.js b/webroot/rsrc/js/application/files/behavior-document-engine.js
index 2fc4887408..8b957e0ea0 100644
--- a/webroot/rsrc/js/application/files/behavior-document-engine.js
+++ b/webroot/rsrc/js/application/files/behavior-document-engine.js
@@ -322,7 +322,7 @@ JX.behavior('document-engine', function(config, statics) {
     var h_max = 0.44;
     var h = h_min + ((h_max - h_min) * epoch_value);
 
-    var s = 0.44;
+    var s = 0.25;
 
     var v_min = 0.92;
     var v_max = 1.00;
@@ -357,6 +357,57 @@ JX.behavior('document-engine', function(config, statics) {
     return 'rgb(' + r + ', ' + g + ', ' + b + ')';
   }
 
+  function onhovercoverage(data, e) {
+    if (e.getType() === 'mouseout') {
+      redraw_coverage(data, null);
+      return;
+    }
+
+    var target = e.getNode('tag:th');
+    var coverage = target.getAttribute('data-coverage');
+    if (!coverage) {
+      return;
+    }
+
+    redraw_coverage(data, target);
+  }
+
+  var coverage_row = null;
+  function redraw_coverage(data, node) {
+    if (coverage_row) {
+      JX.DOM.alterClass(
+        coverage_row,
+        'phabricator-source-coverage-highlight',
+        false);
+      coverage_row = null;
+    }
+
+    if (!node) {
+      JX.Tooltip.hide();
+      return;
+    }
+
+    var coverage = node.getAttribute('data-coverage');
+    coverage = coverage.split('/');
+
+    var idx = parseInt(coverage[0], 10);
+    var chr = coverage[1];
+
+    var map = data.coverage.labels[idx];
+    if (map) {
+      var label = map[chr];
+      if (label) {
+        JX.Tooltip.show(node, 300, 'W', label);
+
+        coverage_row = JX.DOM.findAbove(node, 'tr');
+        JX.DOM.alterClass(
+          coverage_row,
+          'phabricator-source-coverage-highlight',
+          true);
+      }
+    }
+  }
+
   if (!statics.initialized) {
     JX.Stratcom.listen('click', 'document-engine-view-dropdown', onmenu);
     statics.initialized = true;
@@ -374,6 +425,12 @@ JX.behavior('document-engine', function(config, statics) {
         blame(data);
         break;
     }
+
+    JX.DOM.listen(
+      JX.$(data.viewportID),
+      ['mouseover', 'mouseout'],
+      'tag:th',
+      JX.bind(null, onhovercoverage, data));
   }
 
 });

From a817aa6c71716d0603d1ae2ab3a1a59d7b77c87f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 16 Apr 2018 09:18:36 -0700
Subject: [PATCH 843/865] Add an "Abort Older Builds" build step to
 Harbormaster

Summary:
Ref T13124. See PHI531. When a revision is updated, builds against the older diff tend to stop being relevant. Add an option to abort outstanding older builds automatically.

At least for now, I'm adding this as a build step instead of some kind of special checkbox. An alternate implementation would be some kind of "Edit Options" action on plans with a checkbox like `[X] When this build starts, abort older builds.`

I think adding it as a build step is a bit simpler, and likely to lead to greater consistency and flexibility down the road, make it easier to add options, etc., and since we don't really have any other current use cases for "a bunch of checkboxes". This might change eventually if we add a bunch of checkboxes for some other reason.

The actual step activates //before// the build queues, so it doesn't need to wait in queue before it can actually act. T13088 discusses some plans here if this sticks.

Test Plan:
  - Created a "Sleep for 120 seconds" build plan and triggered it with Herald.
  - Added an "Abort Older Builds" step.
  - Updated a revision several times in a row, saw older builds abort.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13124

Differential Revision: https://secure.phabricator.com/D19376
---
 src/__phutil_library_map__.php                |   4 +
 .../constants/HarbormasterBuildStatus.php     |  13 ++
 .../HarbormasterBuildActionController.php     |  13 +-
 .../query/HarbormasterBuildStepQuery.php      |  37 ++---
 ...bortOlderBuildsBuildStepImplementation.php | 135 ++++++++++++++++++
 .../HarbormasterBuildStepImplementation.php   |   9 ++
 .../HarbormasterControlBuildStepGroup.php     |  20 +++
 .../storage/HarbormasterBuildable.php         |   9 ++
 .../storage/build/HarbormasterBuild.php       |  29 ++++
 .../configuration/HarbormasterBuildStep.php   |  13 ++
 10 files changed, 247 insertions(+), 35 deletions(-)
 create mode 100644 src/applications/harbormaster/step/HarbormasterAbortOlderBuildsBuildStepImplementation.php
 create mode 100644 src/applications/harbormaster/stepgroup/HarbormasterControlBuildStepGroup.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index da5674cbbd..9eda923457 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1263,6 +1263,7 @@
     'FundInitiativeTransactionType' => 'applications/fund/xaction/FundInitiativeTransactionType.php',
     'FundInitiativeViewController' => 'applications/fund/controller/FundInitiativeViewController.php',
     'FundSchemaSpec' => 'applications/fund/storage/FundSchemaSpec.php',
+    'HarbormasterAbortOlderBuildsBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterAbortOlderBuildsBuildStepImplementation.php',
     'HarbormasterArcLintBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterArcLintBuildStepImplementation.php',
     'HarbormasterArcUnitBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterArcUnitBuildStepImplementation.php',
     'HarbormasterArtifact' => 'applications/harbormaster/artifact/HarbormasterArtifact.php',
@@ -1358,6 +1359,7 @@
     'HarbormasterCircleCIBuildableInterface' => 'applications/harbormaster/interface/HarbormasterCircleCIBuildableInterface.php',
     'HarbormasterCircleCIHookController' => 'applications/harbormaster/controller/HarbormasterCircleCIHookController.php',
     'HarbormasterConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterConduitAPIMethod.php',
+    'HarbormasterControlBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterControlBuildStepGroup.php',
     'HarbormasterController' => 'applications/harbormaster/controller/HarbormasterController.php',
     'HarbormasterCreateArtifactConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterCreateArtifactConduitAPIMethod.php',
     'HarbormasterCreatePlansCapability' => 'applications/harbormaster/capability/HarbormasterCreatePlansCapability.php',
@@ -6636,6 +6638,7 @@
     'FundInitiativeTransactionType' => 'PhabricatorModularTransactionType',
     'FundInitiativeViewController' => 'FundController',
     'FundSchemaSpec' => 'PhabricatorConfigSchemaSpec',
+    'HarbormasterAbortOlderBuildsBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterArcLintBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterArcUnitBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterArtifact' => 'Phobject',
@@ -6771,6 +6774,7 @@
     'HarbormasterCircleCIBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterCircleCIHookController' => 'HarbormasterController',
     'HarbormasterConduitAPIMethod' => 'ConduitAPIMethod',
+    'HarbormasterControlBuildStepGroup' => 'HarbormasterBuildStepGroup',
     'HarbormasterController' => 'PhabricatorController',
     'HarbormasterCreateArtifactConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
     'HarbormasterCreatePlansCapability' => 'PhabricatorPolicyCapability',
diff --git a/src/applications/harbormaster/constants/HarbormasterBuildStatus.php b/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
index dc63b5fd95..7437e48f6c 100644
--- a/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
+++ b/src/applications/harbormaster/constants/HarbormasterBuildStatus.php
@@ -98,6 +98,19 @@ public static function getActiveStatusConstants() {
     );
   }
 
+  public static function getIncompleteStatusConstants() {
+    $map = self::getBuildStatusSpecMap();
+
+    $constants = array();
+    foreach ($map as $constant => $spec) {
+      if (!$spec['isComplete']) {
+        $constants[] = $constant;
+      }
+    }
+
+    return $constants;
+  }
+
   public static function getCompletedStatusConstants() {
     return array(
       self::STATUS_PASSED,
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildActionController.php b/src/applications/harbormaster/controller/HarbormasterBuildActionController.php
index ddab677faf..843ffd4702 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildActionController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildActionController.php
@@ -51,18 +51,7 @@ public function handleRequest(AphrontRequest $request) {
     }
 
     if ($request->isDialogFormPost() && $can_issue) {
-      $editor = id(new HarbormasterBuildTransactionEditor())
-        ->setActor($viewer)
-        ->setContentSourceFromRequest($request)
-        ->setContinueOnNoEffect(true)
-        ->setContinueOnMissingFields(true);
-
-      $xaction = id(new HarbormasterBuildTransaction())
-        ->setTransactionType(HarbormasterBuildTransaction::TYPE_COMMAND)
-        ->setNewValue($action);
-
-      $editor->applyTransactions($build, array($xaction));
-
+      $build->sendMessage($viewer, $action);
       return id(new AphrontRedirectResponse())->setURI($return_uri);
     }
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
index c14185116c..992dd4fad1 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
@@ -22,48 +22,39 @@ public function withBuildPlanPHIDs(array $phids) {
     return $this;
   }
 
+  public function newResultObject() {
+    return new HarbormasterBuildStep();
+  }
+
   protected function loadPage() {
-    $table = new HarbormasterBuildStep();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($data);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
-    if ($this->ids) {
+    if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'id IN (%Ld)',
         $this->ids);
     }
 
-    if ($this->phids) {
+    if ($this->phids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'phid in (%Ls)',
         $this->phids);
     }
 
-    if ($this->buildPlanPHIDs) {
+    if ($this->buildPlanPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'buildPlanPHID in (%Ls)',
         $this->buildPlanPHIDs);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   protected function willFilterPage(array $page) {
diff --git a/src/applications/harbormaster/step/HarbormasterAbortOlderBuildsBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterAbortOlderBuildsBuildStepImplementation.php
new file mode 100644
index 0000000000..d6c2a46734
--- /dev/null
+++ b/src/applications/harbormaster/step/HarbormasterAbortOlderBuildsBuildStepImplementation.php
@@ -0,0 +1,135 @@
+<?php
+
+final class HarbormasterAbortOlderBuildsBuildStepImplementation
+  extends HarbormasterBuildStepImplementation {
+
+  public function getName() {
+    return pht('Abort Older Builds');
+  }
+
+  public function getGenericDescription() {
+    return pht(
+      'When building a revision, abort copies of this build plan which are '.
+      'currently running against older diffs.');
+  }
+
+  public function getBuildStepGroupKey() {
+    return HarbormasterControlBuildStepGroup::GROUPKEY;
+  }
+
+  public function getEditInstructions() {
+    return pht(<<<EOTEXT
+When run against a revision, this build step will abort any older copies of
+the same build plan which are currently running against older diffs.
+
+There are some nuances to the behavior:
+
+  - if this build step is triggered manually, it won't abort anything;
+  - this build step won't abort manual builds;
+  - this build step won't abort anything if the diff it is building isn't
+    the active diff when it runs.
+
+Build results on outdated diffs often aren't very important, so this may
+reduce build queue load without any substantial cost.
+EOTEXT
+      );
+  }
+
+  public function willStartBuild(
+    PhabricatorUser $viewer,
+    HarbormasterBuildable $buildable,
+    HarbormasterBuild $build,
+    HarbormasterBuildPlan $plan,
+    HarbormasterBuildStep $step) {
+
+    if ($buildable->getIsManualBuildable()) {
+      // Don't abort anything if this is a manual buildable.
+      return;
+    }
+
+    $object_phid = $buildable->getBuildablePHID();
+    if (phid_get_type($object_phid) !== DifferentialDiffPHIDType::TYPECONST) {
+      // If this buildable isn't building a diff, bail out. For example, we
+      // might be building a commit. In this case, this step has no effect.
+      return;
+    }
+
+    $diff = id(new DifferentialDiffQuery())
+      ->setViewer($viewer)
+      ->withPHIDs(array($object_phid))
+      ->executeOne();
+    if (!$diff) {
+      return;
+    }
+
+    $revision_id = $diff->getRevisionID();
+
+    $revision = id(new DifferentialRevisionQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($revision_id))
+      ->executeOne();
+    if (!$revision) {
+      return;
+    }
+
+    $active_phid = $revision->getActiveDiffPHID();
+    if ($active_phid !== $object_phid) {
+      // If we aren't building the active diff, bail out.
+      return;
+    }
+
+    $diffs = id(new DifferentialDiffQuery())
+      ->setViewer($viewer)
+      ->withRevisionIDs(array($revision_id))
+      ->execute();
+    $abort_diff_phids = array();
+    foreach ($diffs as $diff) {
+      if ($diff->getPHID() !== $active_phid) {
+        $abort_diff_phids[] = $diff->getPHID();
+      }
+    }
+
+    if (!$abort_diff_phids) {
+      return;
+    }
+
+    // We're fetching buildables even if they have "passed" or "failed"
+    // because they may still have ongoing builds. At the time of writing
+    // only "failed" buildables may still be ongoing, but it seems likely that
+    // "passed" buildables may be ongoing in the future.
+
+    $abort_buildables = id(new HarbormasterBuildableQuery())
+      ->setViewer($viewer)
+      ->withBuildablePHIDs($abort_diff_phids)
+      ->withManualBuildables(false)
+      ->execute();
+    if (!$abort_buildables) {
+      return;
+    }
+
+    $statuses = HarbormasterBuildStatus::getIncompleteStatusConstants();
+
+    $abort_builds = id(new HarbormasterBuildQuery())
+      ->setViewer($viewer)
+      ->withBuildablePHIDs(mpull($abort_buildables, 'getPHID'))
+      ->withBuildPlanPHIDs(array($plan->getPHID()))
+      ->withBuildStatuses($statuses)
+      ->execute();
+    if (!$abort_builds) {
+      return;
+    }
+
+    foreach ($abort_builds as $abort_build) {
+      $abort_build->sendMessage(
+        $viewer,
+        HarbormasterBuildCommand::COMMAND_ABORT);
+    }
+  }
+
+  public function execute(
+    HarbormasterBuild $build,
+    HarbormasterBuildTarget $build_target) {
+    return;
+  }
+
+}
diff --git a/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
index 47af992630..ccf97451b7 100644
--- a/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
@@ -308,6 +308,15 @@ protected function logSilencedCall(
           'enabled in configuration.'));
   }
 
+  public function willStartBuild(
+    PhabricatorUser $viewer,
+    HarbormasterBuildable $buildable,
+    HarbormasterBuild $build,
+    HarbormasterBuildPlan $plan,
+    HarbormasterBuildStep $step) {
+    return;
+  }
+
 
 /* -(  Automatic Targets  )-------------------------------------------------- */
 
diff --git a/src/applications/harbormaster/stepgroup/HarbormasterControlBuildStepGroup.php b/src/applications/harbormaster/stepgroup/HarbormasterControlBuildStepGroup.php
new file mode 100644
index 0000000000..f49fd0b127
--- /dev/null
+++ b/src/applications/harbormaster/stepgroup/HarbormasterControlBuildStepGroup.php
@@ -0,0 +1,20 @@
+<?php
+
+final class HarbormasterControlBuildStepGroup
+  extends HarbormasterBuildStepGroup {
+
+  const GROUPKEY = 'harbormaster.control';
+
+  public function getGroupName() {
+    return pht('Flow Control');
+  }
+
+  public function getGroupOrder() {
+    return 5000;
+  }
+
+  public function shouldShowIfEmpty() {
+    return false;
+  }
+
+}
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
index 7d4f2e7c83..b24c4805e2 100644
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -141,6 +141,15 @@ public function applyPlan(
 
     $build->save();
 
+    $steps = id(new HarbormasterBuildStepQuery())
+      ->setViewer($viewer)
+      ->withBuildPlanPHIDs(array($plan->getPHID()))
+      ->execute();
+
+    foreach ($steps as $step) {
+      $step->willStartBuild($viewer, $this, $build, $plan);
+    }
+
     PhabricatorWorker::scheduleTask(
       'HarbormasterBuildWorker',
       array(
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
index ae0f6b13f3..6acbac6468 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
@@ -356,6 +356,35 @@ public function assertCanIssueCommand(PhabricatorUser $viewer, $command) {
     }
   }
 
+  public function sendMessage(PhabricatorUser $viewer, $command) {
+    // TODO: This should not be an editor transaction, but there are plans to
+    // merge BuildCommand into BuildMessage which should moot this. As this
+    // exists today, it can race against BuildEngine.
+
+    // This is a bogus content source, but this whole flow should be obsolete
+    // soon.
+    $content_source = PhabricatorContentSource::newForSource(
+      PhabricatorConsoleContentSource::SOURCECONST);
+
+    $editor = id(new HarbormasterBuildTransactionEditor())
+      ->setActor($viewer)
+      ->setContentSource($content_source)
+      ->setContinueOnNoEffect(true)
+      ->setContinueOnMissingFields(true);
+
+    $viewer_phid = $viewer->getPHID();
+    if (!$viewer_phid) {
+      $acting_phid = id(new PhabricatorHarbormasterApplication())->getPHID();
+      $editor->setActingAsPHID($acting_phid);
+    }
+
+    $xaction = id(new HarbormasterBuildTransaction())
+      ->setTransactionType(HarbormasterBuildTransaction::TYPE_COMMAND)
+      ->setNewValue($command);
+
+    $editor->applyTransactions($this, array($xaction));
+  }
+
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
index b29958882c..54c069e97d 100644
--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
@@ -100,6 +100,19 @@ public function isAutostep() {
     return ($this->getStepAutoKey() !== null);
   }
 
+  public function willStartBuild(
+    PhabricatorUser $viewer,
+    HarbormasterBuildable $buildable,
+    HarbormasterBuild $build,
+    HarbormasterBuildPlan $plan) {
+    return $this->getStepImplementation()->willStartBuild(
+      $viewer,
+      $buildable,
+      $build,
+      $plan,
+      $this);
+  }
+
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 

From 0a83f253ed03829826a2e69e891358e80a3c3ba7 Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Wed, 18 Apr 2018 11:45:50 -0700
Subject: [PATCH 844/865] Add unique constraint for Almanac network names

Summary:
The name of networks should be unique.

Also adds support for exact-name queries for AlamanacNetworks.

Test Plan: Applied migration with existing duplicates, saw networks renamed, attempted to add duplicates, got a nice error message.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D19379
---
 .../20180418.almanac.network.unique.php       | 46 +++++++++++++++++++
 .../almanac/query/AlmanacNetworkQuery.php     | 13 ++++++
 .../almanac/storage/AlmanacNetwork.php        |  9 +++-
 .../almanac/util/AlmanacNames.php             | 33 ++++++-------
 .../xaction/AlmanacNetworkNameTransaction.php | 31 +++++++++++++
 5 files changed, 115 insertions(+), 17 deletions(-)
 create mode 100644 resources/sql/autopatches/20180418.almanac.network.unique.php

diff --git a/resources/sql/autopatches/20180418.almanac.network.unique.php b/resources/sql/autopatches/20180418.almanac.network.unique.php
new file mode 100644
index 0000000000..c81c59823e
--- /dev/null
+++ b/resources/sql/autopatches/20180418.almanac.network.unique.php
@@ -0,0 +1,46 @@
+<?php
+
+$table = new AlmanacNetwork();
+$conn = $table->establishConnection('w');
+
+queryfx(
+  $conn,
+  'LOCK TABLES %T WRITE',
+  $table->getTableName());
+
+$seen = array();
+foreach (new LiskMigrationIterator($table) as $network) {
+  $name = $network->getName();
+
+  // If this is the first copy of this row we've seen, mark it as seen and
+  // move on.
+  if (empty($seen[$name])) {
+    $seen[$name] = 1;
+    continue;
+  }
+
+  // Otherwise, rename this row.
+  while (true) {
+    $new_name = $name.'-'.$seen[$name];
+    if (empty($seen[$new_name])) {
+      $network->setName($new_name);
+      try {
+        $network->save();
+        break;
+      } catch (AphrontDuplicateKeyQueryException $ex) {
+        // New name is a dupe of a network we haven't seen yet.
+      }
+    }
+    $seen[$name]++;
+  }
+  $seen[$new_name] = 1;
+}
+
+queryfx(
+  $conn,
+  'ALTER TABLE %T ADD UNIQUE KEY `key_name` (name)',
+  $table->getTableName());
+
+queryfx(
+  $conn,
+  'UNLOCK TABLES');
diff --git a/src/applications/almanac/query/AlmanacNetworkQuery.php b/src/applications/almanac/query/AlmanacNetworkQuery.php
index a09da0093b..13176f7de1 100644
--- a/src/applications/almanac/query/AlmanacNetworkQuery.php
+++ b/src/applications/almanac/query/AlmanacNetworkQuery.php
@@ -5,6 +5,7 @@ final class AlmanacNetworkQuery
 
   private $ids;
   private $phids;
+  private $names;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -20,6 +21,11 @@ public function newResultObject() {
     return new AlmanacNetwork();
   }
 
+  public function withNames(array $names) {
+    $this->names = $names;
+    return $this;
+  }
+
   public function withNameNgrams($ngrams) {
     return $this->withNgramsConstraint(
       new AlmanacNetworkNameNgrams(),
@@ -47,6 +53,13 @@ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
         $this->phids);
     }
 
+    if ($this->names !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'network.name IN (%Ls)',
+        $this->names);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/almanac/storage/AlmanacNetwork.php b/src/applications/almanac/storage/AlmanacNetwork.php
index 6a530b4cb3..6d2f23032e 100644
--- a/src/applications/almanac/storage/AlmanacNetwork.php
+++ b/src/applications/almanac/storage/AlmanacNetwork.php
@@ -24,8 +24,15 @@ protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_COLUMN_SCHEMA => array(
-        'name' => 'text128',
+        'name' => 'sort128',
         'mailKey' => 'bytes20',
+
+      ),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_name' => array(
+            'columns' => array('name'),
+            'unique' => true,
+          ),
       ),
     ) + parent::getConfiguration();
   }
diff --git a/src/applications/almanac/util/AlmanacNames.php b/src/applications/almanac/util/AlmanacNames.php
index 68a387cb9b..cee3c81151 100644
--- a/src/applications/almanac/util/AlmanacNames.php
+++ b/src/applications/almanac/util/AlmanacNames.php
@@ -6,57 +6,58 @@ public static function validateName($name) {
     if (strlen($name) < 3) {
       throw new Exception(
         pht(
-          'Almanac service, device, property and namespace names must be '.
-          'at least 3 characters long.'));
+          'Almanac service, device, property, network and namespace names '.
+          'must be at least 3 characters long.'));
     }
 
     if (strlen($name) > 100) {
       throw new Exception(
         pht(
-          'Almanac service, device, property and namespace names may not '.
-          'be more than 100 characters long.'));
+          'Almanac service, device, property, network and namespace names '.
+          'may not be more than 100 characters long.'));
     }
 
     if (!preg_match('/^[a-z0-9.-]+\z/', $name)) {
       throw new Exception(
         pht(
-          'Almanac service, device, property and namespace names may only '.
-          'contain lowercase letters, numbers, hyphens, and periods.'));
+          'Almanac service, device, property, network and namespace names '.
+          'may only contain lowercase letters, numbers, hyphens, and '.
+          'periods.'));
     }
 
     if (preg_match('/(^|\\.)\d+(\z|\\.)/', $name)) {
       throw new Exception(
         pht(
-          'Almanac service, device, property and namespace names may not '.
-          'have any segments containing only digits.'));
+          'Almanac service, device, network, property and namespace names '.
+          'may not have any segments containing only digits.'));
     }
 
     if (preg_match('/\.\./', $name)) {
       throw new Exception(
         pht(
-          'Almanac service, device, property and namespace names may not '.
-          'contain multiple consecutive periods.'));
+          'Almanac service, device, property, network and namespace names '.
+          'may not contain multiple consecutive periods.'));
     }
 
     if (preg_match('/\\.-|-\\./', $name)) {
       throw new Exception(
         pht(
-          'Almanac service, device, property and namespace names may not '.
-          'contain hyphens adjacent to periods.'));
+          'Almanac service, device, property, network and namespace names '.
+          'may not contain hyphens adjacent to periods.'));
     }
 
     if (preg_match('/--/', $name)) {
       throw new Exception(
         pht(
-          'Almanac service, device, property and namespace names may not '.
-          'contain multiple consecutive hyphens.'));
+          'Almanac service, device, property, network and namespace names '.
+          'may not contain multiple consecutive hyphens.'));
     }
 
     if (!preg_match('/^[a-z0-9].*[a-z0-9]\z/', $name)) {
       throw new Exception(
         pht(
-          'Almanac service, device, property and namespace names must begin '.
-          'and end with a letter or number.'));
+          'Almanac service, device, property, network and namespace names '.
+          'must begin and end with a letter or number.'));
     }
   }
 
diff --git a/src/applications/almanac/xaction/AlmanacNetworkNameTransaction.php b/src/applications/almanac/xaction/AlmanacNetworkNameTransaction.php
index 140c1a9661..f049587b26 100644
--- a/src/applications/almanac/xaction/AlmanacNetworkNameTransaction.php
+++ b/src/applications/almanac/xaction/AlmanacNetworkNameTransaction.php
@@ -38,6 +38,37 @@ public function validateTransactions($object, array $xactions) {
         pht('Network name is required.'));
     }
 
+    foreach ($xactions as $xaction) {
+      $name = $xaction->getNewValue();
+
+      $message = null;
+      try {
+        AlmanacNames::validateName($name);
+      } catch (Exception $ex) {
+        $message = $ex->getMessage();
+      }
+
+      if ($message !== null) {
+        $errors[] = $this->newInvalidError($message, $xaction);
+        continue;
+      }
+
+      if ($name === $object->getName()) {
+        continue;
+      }
+
+      $other = id(new AlmanacNetworkQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withNames(array($name))
+        ->executeOne();
+      if ($other && ($other->getID() != $object->getID())) {
+        $errors[] = $this->newInvalidError(
+          pht('Almanac networks must have unique names.'),
+          $xaction);
+        continue;
+      }
+    }
+
     return $errors;
   }
 

From e81b2173ad08b7035e5e1a92247c11cca5721ccc Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Thu, 19 Apr 2018 13:38:37 -0700
Subject: [PATCH 845/865] Add edge tables for Phlux

Summary: Fixes T13129. This at least makes the existing UI work again before we banish Phlux to the shadow realm.

Test Plan: Edited the visibility for a Phlux variable, didn't get an error. Nothing showed up in the edge tables when I made those changes, but at least it doesn't error out anymore.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13129

Differential Revision: https://secure.phabricator.com/D19387
---
 .../sql/autopatches/20180419.phlux.edges.sql     | 16 ++++++++++++++++
 src/__phutil_library_map__.php                   |  2 ++
 .../phlux/storage/PhluxSchemaSpec.php            | 10 ++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 resources/sql/autopatches/20180419.phlux.edges.sql
 create mode 100644 src/applications/phlux/storage/PhluxSchemaSpec.php

diff --git a/resources/sql/autopatches/20180419.phlux.edges.sql b/resources/sql/autopatches/20180419.phlux.edges.sql
new file mode 100644
index 0000000000..1a63aa4d1f
--- /dev/null
+++ b/resources/sql/autopatches/20180419.phlux.edges.sql
@@ -0,0 +1,16 @@
+CREATE TABLE {$NAMESPACE}_phlux.edge (
+  src VARBINARY(64) NOT NULL,
+  type INT UNSIGNED NOT NULL,
+  dst VARBINARY(64) NOT NULL,
+  dateCreated INT UNSIGNED NOT NULL,
+  seq INT UNSIGNED NOT NULL,
+  dataID INT UNSIGNED,
+  PRIMARY KEY (src, type, dst),
+  KEY `src` (src, type, dateCreated, seq),
+  UNIQUE KEY `key_dst` (dst, type, src)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
+
+CREATE TABLE {$NAMESPACE}_phlux.edgedata (
+  id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  data LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 9eda923457..5f1543aa91 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4716,6 +4716,7 @@
     'PhluxDAO' => 'applications/phlux/storage/PhluxDAO.php',
     'PhluxEditController' => 'applications/phlux/controller/PhluxEditController.php',
     'PhluxListController' => 'applications/phlux/controller/PhluxListController.php',
+    'PhluxSchemaSpec' => 'applications/phlux/storage/PhluxSchemaSpec.php',
     'PhluxTransaction' => 'applications/phlux/storage/PhluxTransaction.php',
     'PhluxTransactionQuery' => 'applications/phlux/query/PhluxTransactionQuery.php',
     'PhluxVariable' => 'applications/phlux/storage/PhluxVariable.php',
@@ -10693,6 +10694,7 @@
     'PhluxDAO' => 'PhabricatorLiskDAO',
     'PhluxEditController' => 'PhluxController',
     'PhluxListController' => 'PhluxController',
+    'PhluxSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'PhluxTransaction' => 'PhabricatorApplicationTransaction',
     'PhluxTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhluxVariable' => array(
diff --git a/src/applications/phlux/storage/PhluxSchemaSpec.php b/src/applications/phlux/storage/PhluxSchemaSpec.php
new file mode 100644
index 0000000000..ee8a38b6f5
--- /dev/null
+++ b/src/applications/phlux/storage/PhluxSchemaSpec.php
@@ -0,0 +1,10 @@
+<?php
+
+final class PhluxSchemaSpec
+  extends PhabricatorConfigSchemaSpec {
+
+  public function buildSchemata() {
+    $this->buildEdgeSchemata(new PhluxVariable());
+  }
+
+}

From 70d67a3908b8dc32ec122bbc22a3629882957f5a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 19 Apr 2018 10:49:30 -0700
Subject: [PATCH 846/865] Fix the most significant "phantom notification"
 badness

Summary:
Ref T13124. Ref T13131. Fixes T8953. See PHI512.

When you receieve a notification about an object and then someone hides that object from you (or deletes it), you get a phantom notification which is very difficult to clear.

For now, test that notifications are visible when you open the menu and clear any that are not.

This could be a little more elegant than it is, but the current behavior is very clearly broken. This unbreaks it, at least.

Test Plan:
  - As Alice, configured task stuff to notify me (instead of sending email).
  - As Bailey, added Alice as a subscriber to a task, then commented on it.
  - As Alice, loaded home and saw a notification count. Didn't click it yet.
  - As Bailey, set the task to private.
  - As Alice, clicked the notification bell menu icon.
    - Before change: no unread notifications, bell menu is semi-stuck in a phantom state which you can't clear.
    - After change: bad notifications automatically cleared.

{F5530005}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13131, T13124, T8953

Differential Revision: https://secure.phabricator.com/D19384
---
 resources/celerity/map.php                    |  6 +-
 ...PhabricatorNotificationPanelController.php | 86 ++++++++++++++++++-
 .../query/PhabricatorNotificationQuery.php    | 12 +--
 .../PhabricatorUSEnglishTranslation.php       |  8 ++
 .../application/base/notification-menu.css    |  6 +-
 5 files changed, 105 insertions(+), 13 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 6053b0846e..dc018326bf 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => '39061f68',
+    'core.pkg.css' => 'c30f6eaa',
     'core.pkg.js' => 'e1f0f7bd',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c2ca903a',
@@ -38,7 +38,7 @@
     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
     'rsrc/css/application/auth/auth.css' => '0877ed6e',
     'rsrc/css/application/base/main-menu-view.css' => '1802a242',
-    'rsrc/css/application/base/notification-menu.css' => '10685bd4',
+    'rsrc/css/application/base/notification-menu.css' => 'ef480927',
     'rsrc/css/application/base/phui-theme.css' => '9f261c6b',
     'rsrc/css/application/base/standard-page-view.css' => '34ee718b',
     'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
@@ -768,7 +768,7 @@
     'phabricator-nav-view-css' => '694d7723',
     'phabricator-notification' => '4f774dac',
     'phabricator-notification-css' => '457861ec',
-    'phabricator-notification-menu-css' => '10685bd4',
+    'phabricator-notification-menu-css' => 'ef480927',
     'phabricator-object-selector-css' => '85ee8ce6',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '77b0ae28',
diff --git a/src/applications/notification/controller/PhabricatorNotificationPanelController.php b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
index 3e30ead9e7..1e956a60ea 100644
--- a/src/applications/notification/controller/PhabricatorNotificationPanelController.php
+++ b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
@@ -6,6 +6,10 @@ final class PhabricatorNotificationPanelController
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
 
+    $unread_count = $viewer->getUnreadNotificationCount();
+
+    $warning = $this->prunePhantomNotifications($unread_count);
+
     $query = id(new PhabricatorNotificationQuery())
       ->setViewer($viewer)
       ->withUserPHIDs(array($viewer->getPHID()))
@@ -66,13 +70,12 @@ public function handleRequest(AphrontRequest $request) {
       ));
 
     $content = hsprintf(
-      '%s%s%s',
+      '%s%s%s%s',
       $header,
+      $warning,
       $content,
       $connection_ui);
 
-    $unread_count = $viewer->getUnreadNotificationCount();
-
     $json = array(
       'content' => $content,
       'number'  => (int)$unread_count,
@@ -80,4 +83,81 @@ public function handleRequest(AphrontRequest $request) {
 
     return id(new AphrontAjaxResponse())->setContent($json);
   }
+
+  private function prunePhantomNotifications($unread_count) {
+    // See T8953. If you have an unread notification about an object you
+    // do not have permission to view, it isn't possible to clear it by
+    // visiting the object. Identify these notifications and mark them as
+    // read.
+
+    $viewer = $this->getViewer();
+
+    if (!$unread_count) {
+      return null;
+    }
+
+    $table = new PhabricatorFeedStoryNotification();
+    $conn = $table->establishConnection('r');
+
+    $rows = queryfx_all(
+      $conn,
+      'SELECT chronologicalKey, primaryObjectPHID FROM %T
+        WHERE userPHID = %s AND hasViewed = 0',
+      $table->getTableName(),
+      $viewer->getPHID());
+    if (!$rows) {
+      return null;
+    }
+
+    $map = array();
+    foreach ($rows as $row) {
+      $map[$row['primaryObjectPHID']][] = $row['chronologicalKey'];
+    }
+
+    $handles = $viewer->loadHandles(array_keys($map));
+    $purge_keys = array();
+    foreach ($handles as $handle) {
+      $phid = $handle->getPHID();
+      if ($handle->isComplete()) {
+        continue;
+      }
+
+      foreach ($map[$phid] as $chronological_key) {
+        $purge_keys[] = $chronological_key;
+      }
+    }
+
+    if (!$purge_keys) {
+      return null;
+    }
+
+    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+
+    $conn = $table->establishConnection('w');
+    queryfx(
+      $conn,
+      'UPDATE %T SET hasViewed = 1
+        WHERE userPHID = %s AND chronologicalKey IN (%Ls)',
+      $table->getTableName(),
+      $viewer->getPHID(),
+      $purge_keys);
+
+    PhabricatorUserCache::clearCache(
+      PhabricatorUserNotificationCountCacheType::KEY_COUNT,
+      $viewer->getPHID());
+
+    unset($unguarded);
+
+    return phutil_tag(
+      'div',
+      array(
+        'class' => 'phabricator-notification phabricator-notification-warning',
+      ),
+      pht(
+        '%s notification(s) about objects which no longer exist or which '.
+        'you can no longer see were discarded.',
+        phutil_count($purge_keys)));
+  }
+
+
 }
diff --git a/src/applications/notification/query/PhabricatorNotificationQuery.php b/src/applications/notification/query/PhabricatorNotificationQuery.php
index aa430a2518..b40bdee066 100644
--- a/src/applications/notification/query/PhabricatorNotificationQuery.php
+++ b/src/applications/notification/query/PhabricatorNotificationQuery.php
@@ -76,31 +76,31 @@ protected function loadPage() {
     return $stories;
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
 
     if ($this->userPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'notif.userPHID IN (%Ls)',
         $this->userPHIDs);
     }
 
     if ($this->unread !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'notif.hasViewed = %d',
         (int)!$this->unread);
     }
 
     if ($this->keys) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'notif.chronologicalKey IN (%Ls)',
         $this->keys);
     }
 
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   protected function getResultCursor($item) {
diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
index eb74f8debf..d33f042d0b 100644
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -1651,6 +1651,14 @@ protected function getTranslations() {
         'Destroyed %s credentials of type "%s".',
       ),
 
+      '%s notification(s) about objects which no longer exist or which '.
+      'you can no longer see were discarded.' => array(
+        'One notification about an object which no longer exists or which '.
+        'you can no longer see was discarded.',
+        '%s notifications about objects which no longer exist or which '.
+        'you can no longer see were discarded.',
+      ),
+
     );
   }
 
diff --git a/webroot/rsrc/css/application/base/notification-menu.css b/webroot/rsrc/css/application/base/notification-menu.css
index 8e2391d57c..8db2436891 100644
--- a/webroot/rsrc/css/application/base/notification-menu.css
+++ b/webroot/rsrc/css/application/base/notification-menu.css
@@ -68,6 +68,10 @@
   color: {$lightgreytext};
 }
 
+.phabricator-notification-warning {
+  background: {$sh-yellowbackground};
+}
+
 .phabricator-notification-list .phabricator-notification-unread,
 .phabricator-notification-menu .phabricator-notification-unread {
   background: {$hoverblue};
@@ -95,7 +99,7 @@
 .phabricator-notification-unread .phabricator-notification-foot
   .phabricator-notification-status {
     font-size: 7px;
-    color: {$lightgreytext};
+    color: {$lightbluetext};
     position: absolute;
     display: inline-block;
     top: 6px;

From 19403fdb8e2939101d5bfbbb1d7ee5cf10b4a90a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 19 Apr 2018 11:28:24 -0700
Subject: [PATCH 847/865] Improve color use in "[+++-   ]" element for
 colorblind users

Summary:
Ref T13127. Users with red/green colorblindness may have difficulty using this element in its current incarnation.

We could give it different behavior if the "Accessibility" option is set for red/green colorblind users, but try a one-size-fits-all approach since the red/green aren't wholly clear anwyay.

Test Plan: {F5530050}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13127

Differential Revision: https://secure.phabricator.com/D19385
---
 resources/celerity/map.php                       |  6 +++---
 .../view/DifferentialRevisionListView.php        | 10 +++++++++-
 .../css/phui/object-item/phui-oi-list-view.css   | 16 ++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index dc018326bf..e41220b8b5 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'c30f6eaa',
+    'core.pkg.css' => 'cb8ae4dc',
     'core.pkg.js' => 'e1f0f7bd',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c2ca903a',
@@ -131,7 +131,7 @@
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'cd2b9b77',
     'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => '08f4ccc3',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '9d9685d6',
-    'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'ae1404ba',
+    'rsrc/css/phui/object-item/phui-oi-list-view.css' => '7c5c1291',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => 'a8beebea',
     'rsrc/css/phui/phui-action-list.css' => '0bcd9a45',
     'rsrc/css/phui/phui-action-panel.css' => 'b4798122',
@@ -838,7 +838,7 @@
     'phui-oi-color-css' => 'cd2b9b77',
     'phui-oi-drag-ui-css' => '08f4ccc3',
     'phui-oi-flush-ui-css' => '9d9685d6',
-    'phui-oi-list-view-css' => 'ae1404ba',
+    'phui-oi-list-view-css' => '7c5c1291',
     'phui-oi-simple-ui-css' => 'a8beebea',
     'phui-pager-css' => 'edcbc226',
     'phui-pinboard-view-css' => '2495140e',
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
index 4c69d76274..e53bccb892 100644
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -229,22 +229,30 @@ private function renderRevisionSize(DifferentialRevision $revision) {
     $classes = array();
     $classes[] = 'differential-revision-size';
 
+    $tip = array();
+    $tip[] = pht('%s Lines', new PhutilNumber($n));
+
     if ($plus_count <= 1) {
       $classes[] = 'differential-revision-small';
+      $tip[] = pht('Smaller Change');
     }
 
     if ($plus_count >= 4) {
       $classes[] = 'differential-revision-large';
+      $tip[] = pht('Larger Change');
     }
 
+    $tip = phutil_implode_html(" \xC2\xB7 ", $tip);
+
     return javelin_tag(
       'span',
       array(
         'class' => implode(' ', $classes),
         'sigil' => 'has-tooltip',
         'meta' => array(
-          'tip' => pht('%s Lines', new PhutilNumber($n)),
+          'tip' => $tip,
           'align' => 'E',
+          'size' => 400,
         ),
       ),
       $size);
diff --git a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
index 9436d171df..6f2421ca2f 100644
--- a/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
+++ b/webroot/rsrc/css/phui/object-item/phui-oi-list-view.css
@@ -697,22 +697,26 @@ ul.phui-oi-list-view .phui-oi-selectable
 
 .differential-revision-size .phui-icon-view {
   margin: 0 1px 0 1px;
-  font-size: smaller;
-  color: {$blueborder};
+  font-size: 7px;
+  position: relative;
+  top: -2px;
+  color: {$lightbluetext};
 }
 
 .differential-revision-large {
-  background: {$sh-redbackground};
+  background: {$sh-orangebackground};
 }
 
+/* NOTE: These are intentionally using nonstandard colors, see T13127. */
+
 .differential-revision-large .phui-icon-view {
-  color: {$red};
+  color: #e5ae7e;
 }
 
 .differential-revision-small {
-  background: {$sh-greenbackground};
+  background: #f2f7ff;
 }
 
 .differential-revision-small .phui-icon-view {
-  color: {$green};
+  color: #6699ba;
 }

From 843bfb4fd8ac72457691d0583330807d74671c97 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 19 Apr 2018 11:39:11 -0700
Subject: [PATCH 848/865] Add a "commits" attachment to
 "differential.diff.search" for retrieving local commit information

Summary:
Ref T13124. See PHI593.

When you `arc diff` in a Git or Mercurial repository, we upload some information about the local commits in your working copy which the change was generated from.

In the future (for example, with T1508) we may increase the prominence of this feature.

Provide a stable way to read this information back via the API. This roughly mirrors the information we provide about commits in "diffusion.commit.search", although the latter is less fleshed-out today.

Test Plan: Used `differential.diff.search` to retrieve commit information about Git, Mercurial, and Subversion diffs. (There's no info for Subversion, but it doesn't crash or anything.)

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13124

Differential Revision: https://secure.phabricator.com/D19386
---
 src/__phutil_library_map__.php                |  2 +
 ...ferentialCommitsSearchEngineAttachment.php | 77 +++++++++++++++++++
 .../differential/storage/DifferentialDiff.php |  5 +-
 .../storage/PhabricatorRepositoryCommit.php   |  4 +
 4 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/differential/engineextension/DifferentialCommitsSearchEngineAttachment.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 5f1543aa91..beec5058a6 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -455,6 +455,7 @@
     'DifferentialCommitMessageParser' => 'applications/differential/parser/DifferentialCommitMessageParser.php',
     'DifferentialCommitMessageParserTestCase' => 'applications/differential/parser/__tests__/DifferentialCommitMessageParserTestCase.php',
     'DifferentialCommitsField' => 'applications/differential/customfield/DifferentialCommitsField.php',
+    'DifferentialCommitsSearchEngineAttachment' => 'applications/differential/engineextension/DifferentialCommitsSearchEngineAttachment.php',
     'DifferentialConduitAPIMethod' => 'applications/differential/conduit/DifferentialConduitAPIMethod.php',
     'DifferentialConflictsCommitMessageField' => 'applications/differential/field/DifferentialConflictsCommitMessageField.php',
     'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
@@ -5733,6 +5734,7 @@
     'DifferentialCommitMessageParser' => 'Phobject',
     'DifferentialCommitMessageParserTestCase' => 'PhabricatorTestCase',
     'DifferentialCommitsField' => 'DifferentialCustomField',
+    'DifferentialCommitsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
     'DifferentialConduitAPIMethod' => 'ConduitAPIMethod',
     'DifferentialConflictsCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialController' => 'PhabricatorController',
diff --git a/src/applications/differential/engineextension/DifferentialCommitsSearchEngineAttachment.php b/src/applications/differential/engineextension/DifferentialCommitsSearchEngineAttachment.php
new file mode 100644
index 0000000000..395541c9f9
--- /dev/null
+++ b/src/applications/differential/engineextension/DifferentialCommitsSearchEngineAttachment.php
@@ -0,0 +1,77 @@
+<?php
+
+final class DifferentialCommitsSearchEngineAttachment
+  extends PhabricatorSearchEngineAttachment {
+
+  public function getAttachmentName() {
+    return pht('Diff Commits');
+  }
+
+  public function getAttachmentDescription() {
+    return pht('Get the local commits (if any) for each diff.');
+  }
+
+  public function loadAttachmentData(array $objects, $spec) {
+    $properties = id(new DifferentialDiffProperty())->loadAllWhere(
+      'diffID IN (%Ld) AND name = %s',
+      mpull($objects, 'getID'),
+      'local:commits');
+
+    $map = array();
+    foreach ($properties as $property) {
+      $map[$property->getDiffID()] = $property->getData();
+    }
+
+    return $map;
+  }
+
+  public function getAttachmentForObject($object, $data, $spec) {
+    $diff_id = $object->getID();
+    $info = idx($data, $diff_id, array());
+
+    // NOTE: This should be similar to the information returned about commits
+    // by "diffusion.commit.search".
+
+    $list = array();
+    foreach ($info as $commit) {
+      $author_epoch = idx($commit, 'time');
+      if ($author_epoch) {
+        $author_epoch = (int)$author_epoch;
+      }
+
+      // TODO: Currently, we don't upload the raw author string from "arc".
+      // Reconstruct a plausible version of it until we begin uploading this
+      // information.
+
+      $author_name = idx($commit, 'author');
+      $author_email = idx($commit, 'authorEmail');
+      if (strlen($author_name) && strlen($author_email)) {
+        $author_raw = (string)id(new PhutilEmailAddress())
+          ->setDisplayName($author_name)
+          ->setAddress($author_email);
+      } else if (strlen($author_email)) {
+        $author_raw = $author_email;
+      } else {
+        $author_raw = $author_name;
+      }
+
+      $list[] = array(
+        'identifier' => $commit['commit'],
+        'tree' => idx($commit, 'tree'),
+        'parents' => idx($commit, 'parents', array()),
+        'author' => array(
+          'name' => $author_name,
+          'email' => $author_email,
+          'raw' => $author_raw,
+          'epoch' => $author_epoch,
+        ),
+        'message' => idx($commit, 'message'),
+      );
+    }
+
+    return array(
+      'commits' => $list,
+    );
+  }
+
+}
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
index 728ec4b538..cb392c4306 100644
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -815,7 +815,10 @@ public function getFieldValuesForConduit() {
   }
 
   public function getConduitSearchAttachments() {
-    return array();
+    return array(
+      id(new DifferentialCommitsSearchEngineAttachment())
+        ->setAttachmentKey('commits'),
+    );
   }
 
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 01088522e7..98f78e63e6 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -716,6 +716,10 @@ public function getFieldSpecificationsForConduit() {
   }
 
   public function getFieldValuesForConduit() {
+
+    // NOTE: This data should be similar to the information returned about
+    // commmits by "differential.diff.search" with the "commits" attachment.
+
     return array(
       'identifier' => $this->getCommitIdentifier(),
     );

From 4dc8e2de564f48365da1ec9e1bab38f99cb34d3a Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Wed, 18 Apr 2018 10:49:22 -0700
Subject: [PATCH 849/865] Add unique constraint to AlmanacInterfaces

Summary: See discussion in D19379. The 4-tuple of (device, network, address, port) should be unique.

Test Plan: Created lots of duplicate interfaces, bound those interfaces to various services, observed migration script clean things up correctly.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D19388
---
 .../20180418.alamanc.interface.unique.php     | 85 +++++++++++++++++++
 .../almanac/editor/AlmanacInterfaceEditor.php | 18 ++++
 .../almanac/storage/AlmanacInterface.php      |  4 +
 3 files changed, 107 insertions(+)
 create mode 100644 resources/sql/autopatches/20180418.alamanc.interface.unique.php

diff --git a/resources/sql/autopatches/20180418.alamanc.interface.unique.php b/resources/sql/autopatches/20180418.alamanc.interface.unique.php
new file mode 100644
index 0000000000..0ad4fbea12
--- /dev/null
+++ b/resources/sql/autopatches/20180418.alamanc.interface.unique.php
@@ -0,0 +1,85 @@
+<?php
+
+$interface_table = new AlmanacInterface();
+$binding_table = new AlmanacBinding();
+$interface_conn = $interface_table->establishConnection('w');
+
+queryfx(
+  $interface_conn,
+  'LOCK TABLES %T WRITE, %T WRITE',
+  $interface_table->getTableName(),
+  $binding_table->getTableName());
+
+$seen = array();
+foreach (new LiskMigrationIterator($interface_table) as $interface) {
+  $device = $interface->getDevicePHID();
+  $network = $interface->getNetworkPHID();
+  $address = $interface->getAddress();
+  $port = $interface->getPort();
+  $key = "{$device}/{$network}/{$address}/{$port}";
+
+  // If this is the first copy of this row we've seen, mark it as seen and
+  // move on.
+  if (empty($seen[$key])) {
+    $seen[$key] = $interface->getID();
+    continue;
+  }
+
+  $survivor = queryfx_one(
+    $interface_conn,
+    'SELECT * FROM %T WHERE id = %d',
+    $interface_table->getTableName(),
+    $seen[$key]);
+
+  $bindings = queryfx_all(
+    $interface_conn,
+    'SELECT * FROM %T WHERE interfacePHID = %s',
+    $binding_table->getTableName(),
+    $interface->getPHID());
+
+  // Repoint bindings to the survivor.
+  foreach ($bindings as $binding) {
+    // Check if there's already a binding to the survivor.
+    $existing = queryfx_one(
+      $interface_conn,
+      'SELECT * FROM %T WHERE interfacePHID = %s and devicePHID = %s and '.
+      'servicePHID = %s',
+      $binding_table->getTableName(),
+      $survivor['phid'],
+      $binding['devicePHID'],
+      $binding['servicePHID']);
+
+    if (!$existing) {
+      // Reattach this binding to the survivor.
+      queryfx(
+        $interface_conn,
+        'UPDATE %T SET interfacePHID = %s WHERE id = %d',
+        $binding_table->getTableName(),
+        $survivor['phid'],
+        $binding['id']);
+    } else {
+      // Binding to survivor already exists. Remove this now-redundant binding.
+      queryfx(
+        $interface_conn,
+        'DELETE FROM %T WHERE id = %d',
+        $binding_table->getTableName(),
+        $binding['id']);
+    }
+  }
+
+  queryfx(
+    $interface_conn,
+    'DELETE FROM %T WHERE id = %d',
+    $interface_table->getTableName(),
+    $interface->getID());
+}
+
+queryfx(
+  $interface_conn,
+  'ALTER TABLE %T ADD UNIQUE KEY `key_unique` '.
+  '(devicePHID, networkPHID, address, port)',
+  $interface_table->getTableName());
+
+queryfx(
+  $interface_conn,
+  'UNLOCK TABLES');
diff --git a/src/applications/almanac/editor/AlmanacInterfaceEditor.php b/src/applications/almanac/editor/AlmanacInterfaceEditor.php
index 865402db36..771076efc9 100644
--- a/src/applications/almanac/editor/AlmanacInterfaceEditor.php
+++ b/src/applications/almanac/editor/AlmanacInterfaceEditor.php
@@ -15,4 +15,22 @@ public function getCreateObjectTitleForFeed($author, $object) {
     return pht('%s created %s.', $author, $object);
   }
 
+  protected function didCatchDuplicateKeyException(
+    PhabricatorLiskDAO $object,
+    array $xactions,
+    Exception $ex) {
+
+    $errors = array();
+
+    $errors[] = new PhabricatorApplicationTransactionValidationError(
+      null,
+      pht('Invalid'),
+      pht(
+        'Interfaces must have a unique combination of network, device, '.
+        'address, and port.'),
+      null);
+
+    throw new PhabricatorApplicationTransactionValidationException($errors);
+  }
+
 }
diff --git a/src/applications/almanac/storage/AlmanacInterface.php b/src/applications/almanac/storage/AlmanacInterface.php
index 4002651d08..5c7f65ddd1 100644
--- a/src/applications/almanac/storage/AlmanacInterface.php
+++ b/src/applications/almanac/storage/AlmanacInterface.php
@@ -35,6 +35,10 @@ protected function getConfiguration() {
         'key_device' => array(
           'columns' => array('devicePHID'),
         ),
+        'key_unique' => array(
+          'columns' => array('devicePHID', 'networkPHID', 'address', 'port'),
+          'unique' => true,
+        ),
       ),
     ) + parent::getConfiguration();
   }

From 9bf4df2c1ddfa55dfbe375b2fa1a078e9d15fb71 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 17 Apr 2018 16:00:51 -0700
Subject: [PATCH 850/865] Allow demoted builds to automatically promote if
 builds pass after a restart

Summary:
Ref T13124. See PHI584. When you create a draft revision and it automatically demotes to "Changes Planned + Draft" because builds fail, let it promote to "Needs Review" automatically if builds pass. Usually, this will be because someone restarted the builds and they worked the second time.

Although I'm a little wary about adding even more state transitions to the diagram in T13110#237736, I think this one is reasonably natural and not ambiguous.

Test Plan:
  - Created a failing build plan with a "Throw Exception" step.
  - Created a revision which hit the build plan, saw it demote to "Changes Planned" when Harbormaster failed.
  - Edited the build plan to remove the "Throw Exception" step, restarted the build, got a pass.
  - Saw revision promote again:

{F5526104}

I didn't exhaustively test that the other 40 state transitions still work properly, but I think the scope of this change is small enough that it's unlikely I did much collateral damage.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13124

Differential Revision: https://secure.phabricator.com/D19380
---
 .../editor/DifferentialTransactionEditor.php  | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 50094b02f4..82740459b0 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1555,13 +1555,41 @@ protected function didApplyTransactions($object, array $xactions) {
       $auto_undraft = false;
     }
 
-    if ($object->isDraft() && $auto_undraft) {
+    $can_promote = false;
+    $can_demote = false;
+
+    // "Draft" revisions can promote to "Review Requested" after builds pass,
+    // or demote to "Changes Planned" after builds fail.
+    if ($object->isDraft()) {
+      $can_promote = true;
+      $can_demote = true;
+    }
+
+    // See PHI584. "Changes Planned" revisions which are not yet broadcasting
+    // can promote to "Review Requested" if builds pass.
+
+    // This pass is presumably the result of someone restarting the builds and
+    // having them work this time, perhaps because the builds are not perfectly
+    // reliable or perhaps because someone fixed some issue with build hardware
+    // or some other dependency.
+
+    // Currently, there's no legitimate way to end up in this state except
+    // through automatic demotion, so this behavior should not generate an
+    // undue level of confusion or ambiguity. Also note that these changes can
+    // not demote again since they've already been demoted once.
+    if ($object->isChangePlanned()) {
+      if (!$object->getShouldBroadcast()) {
+        $can_promote = true;
+      }
+    }
+
+    if (($can_promote || $can_demote) && $auto_undraft) {
       $status = $this->loadCompletedBuildableStatus($object);
 
       $is_passed = ($status === HarbormasterBuildableStatus::STATUS_PASSED);
       $is_failed = ($status === HarbormasterBuildableStatus::STATUS_FAILED);
 
-      if ($is_passed) {
+      if ($is_passed && $can_promote) {
         // When Harbormaster moves a revision out of the draft state, we
         // attribute the action to the revision author since this is more
         // natural and more useful.
@@ -1593,7 +1621,7 @@ protected function didApplyTransactions($object, array $xactions) {
         // batch of transactions finishes so that Herald can fire on the new
         // revision state. See T13027 for discussion.
         $this->queueTransaction($xaction);
-      } else if ($is_failed) {
+      } else if ($is_failed && $can_demote) {
         // When demoting a revision, we act as "Harbormaster" instead of
         // the author since this feels a little more natural.
         $harbormaster_phid = id(new PhabricatorHarbormasterApplication())
@@ -1607,8 +1635,6 @@ protected function didApplyTransactions($object, array $xactions) {
           ->setNewValue(true);
 
         $this->queueTransaction($xaction);
-
-        // TODO: Notify the author (only) that we did this.
       }
     }
 

From 95e179d9a4f31b8c5c2cbb4db8f7fa9f2d3867d6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Apr 2018 12:51:31 -0700
Subject: [PATCH 851/865] Fix a fatal in the document engine blame view with
 files that blame to the initial commit

Summary:
Ref T13126. When you view a file using the new document engine view and some lines were introduced in the initial commit to the repository, Git renders "^abc123" in the blame output.

We currently don't do anything about this, and later fail to look it up and fatal.

It's also unlikely-but-conceivably-possible to end up here if a commit has not imported yet or has been nuked with `bin/remove destroy`.

Let the whole thing run without fataling even if a `$commit` is missing. Future refinements could improve this behavior.

Test Plan: Viewed a file with lines introduced in the initial commit, got empty blame instead of a fatal.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13126

Differential Revision: https://secure.phabricator.com/D19391
---
 .../controller/DiffusionBlameController.php   | 50 +++++++++++++------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBlameController.php b/src/applications/diffusion/controller/DiffusionBlameController.php
index 66403a8af9..85ab393ef6 100644
--- a/src/applications/diffusion/controller/DiffusionBlameController.php
+++ b/src/applications/diffusion/controller/DiffusionBlameController.php
@@ -80,7 +80,6 @@ public function handleRequest(AphrontRequest $request) {
 
     $handles = $viewer->loadHandles($handle_phids);
 
-
     $map = array();
     $epochs = array();
     foreach ($identifiers as $identifier) {
@@ -106,9 +105,21 @@ public function handleRequest(AphrontRequest $request) {
         ),
         $skip_icon);
 
-      $commit = $commits[$identifier];
+      // We may not have a commit object for a given identifier if the commit
+      // has not imported yet.
+
+      // At time of writing, this can also happen if a line was part of the
+      // initial import: blame produces a "^abc123" identifier in Git, which
+      // doesn't correspond to a real commit.
+
+      $commit = idx($commits, $identifier);
+
+      $author_phid = null;
+
+      if ($commit) {
+        $author_phid = $commit->getAuthorPHID();
+      }
 
-      $author_phid = $commit->getAuthorPHID();
       if (!$author_phid && $revision) {
         $author_phid = $revision->getAuthorPHID();
       }
@@ -141,18 +152,22 @@ public function handleRequest(AphrontRequest $request) {
           'meta' => $author_meta,
         ));
 
-      $commit_link = javelin_tag(
-        'a',
-        array(
-          'href' => $commit->getURI(),
-          'sigil' => 'has-tooltip',
-          'meta'  => array(
-            'tip' => $this->renderCommitTooltip($commit, $handles),
-            'align' => 'E',
-            'size' => 600,
+      if ($commit) {
+        $commit_link = javelin_tag(
+          'a',
+          array(
+            'href' => $commit->getURI(),
+            'sigil' => 'has-tooltip',
+            'meta'  => array(
+              'tip' => $this->renderCommitTooltip($commit, $handles),
+              'align' => 'E',
+              'size' => 600,
+            ),
           ),
-        ),
-        $commit->getLocalName());
+          $commit->getLocalName());
+      } else {
+        $commit_link = null;
+      }
 
       $info = array(
         $author_link,
@@ -180,7 +195,12 @@ public function handleRequest(AphrontRequest $request) {
         );
       }
 
-      $epoch = $commit->getEpoch();
+      if ($commit) {
+        $epoch = $commit->getEpoch();
+      } else {
+        $epoch = 0;
+      }
+
       $epochs[] = $epoch;
 
       $data = array(

From 8c78cde32f5e3c4db2fcd62c50ffae974c108e9a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Apr 2018 13:09:47 -0700
Subject: [PATCH 852/865] Stop "git blame" from printing "^" markers on root
 repository commits

Summary: Depends on D19391. Ref T13126. See that task for some details on what's going on here.

Test Plan:
  - Viewed a file which includes lines that were added during the first commit to the repository.
  - Before D19391: fatal.
  - After D19391: blank.
  - After this patch: accurate blame information.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13126

Differential Revision: https://secure.phabricator.com/D19392
---
 .../diffusion/query/blame/DiffusionGitBlameQuery.php        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/query/blame/DiffusionGitBlameQuery.php b/src/applications/diffusion/query/blame/DiffusionGitBlameQuery.php
index f98cc645a7..0eb15cd018 100644
--- a/src/applications/diffusion/query/blame/DiffusionGitBlameQuery.php
+++ b/src/applications/diffusion/query/blame/DiffusionGitBlameQuery.php
@@ -7,8 +7,12 @@ protected function newBlameFuture(DiffusionRequest $request, $path) {
 
     $commit = $request->getCommit();
 
+    // NOTE: The "--root" flag suppresses the addition of the "^" boundary
+    // commit marker. Without it, root commits render with a "^" before them,
+    // and one fewer character of the commit hash.
+
     return $repository->getLocalCommandFuture(
-      '--no-pager blame -s -l %s -- %s',
+      '--no-pager blame --root -s -l %s -- %s',
       $commit,
       $path);
   }

From 33da9f833fdd6bbf2d1ade40acd091f4a9f0ac76 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 20 Apr 2018 13:14:44 -0700
Subject: [PATCH 853/865] Fix odd line number line wrapping on embedded pastes
 (`{Pxxx}`)

Summary: Ref T13126. After SourceView changes, embedded pastes with the `{Pxxx}` syntax are line-wrapping line numbers in Safari, at least. Put a stop to this.

Test Plan: Viewed a `{Pxxx}` with more than 10 lines. Before: weird line wrapping; after: nice consistent display.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13126

Differential Revision: https://secure.phabricator.com/D19393
---
 resources/celerity/map.php                               | 4 ++--
 webroot/rsrc/css/layout/phabricator-source-code-view.css | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index e41220b8b5..dd4d978fed 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -119,7 +119,7 @@
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'b912ad97',
-    'rsrc/css/layout/phabricator-source-code-view.css' => 'fdbefca0',
+    'rsrc/css/layout/phabricator-source-code-view.css' => '2ab25dfa',
     'rsrc/css/phui/button/phui-button-bar.css' => 'f1ff5494',
     'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
     'rsrc/css/phui/button/phui-button.css' => '1863cc6e',
@@ -776,7 +776,7 @@
     'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
-    'phabricator-source-code-view-css' => 'fdbefca0',
+    'phabricator-source-code-view-css' => '2ab25dfa',
     'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
index b0c334da26..9b61425d63 100644
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -24,6 +24,7 @@
   text-align: right;
   border-right: 1px solid {$paste.border};
   color: {$sh-yellowtext};
+  white-space: nowrap;
 }
 
 .phabricator-source-line > a::before {

From 7622f6afccf44556b2c00deed9c033e5d36f6b7b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 21 Apr 2018 09:08:13 -0700
Subject: [PATCH 854/865] Fix excessively severe CSP URI error during
 first-time setup

Summary:
See D19394. Currently, during first-time setup before you configure "phabricator.base-uri", we may attempt to generate a setup page, try to generate a CSP header for it, and fail to access the environmental config. This causes a too-severe error page ("configure phabricator.base-uri") instead of preflight guidance (like "can't connect to MySQL").

Instead, treat this more like "security.alternate-file-domain" and just bail on CSP if we can't fetch it.

Test Plan: On a fresh (non-explodey laptop) install with critical setup errors (no MySQL installed yet), loaded Phabricator. Before: error about phabricator.base-uri. After: more helpful guidance about installing/configuring MySQL.

Reviewers: amckinley, avivey

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19396
---
 src/aphront/response/AphrontResponse.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
index fe1e80318f..2e6513c7a8 100644
--- a/src/aphront/response/AphrontResponse.php
+++ b/src/aphront/response/AphrontResponse.php
@@ -113,6 +113,7 @@ private function newContentSecurityPolicyHeader() {
 
     try {
       $cdn = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
+      $base_uri = PhabricatorEnv::getURI('/');
     } catch (Exception $ex) {
       return null;
     }
@@ -124,8 +125,6 @@ private function newContentSecurityPolicyHeader() {
       // If an alternate file domain is not configured and the user is viewing
       // a Phame blog on a custom domain or some other custom site, we'll still
       // serve resources from the main site. Include the main site explicitly.
-
-      $base_uri = PhabricatorEnv::getURI('/');
       $base_uri = $this->newContentSecurityPolicySource($base_uri);
 
       $default = "'self' {$base_uri}";

From 15e6e2adea61f27431b1c8a4d2a4552a89fed6b1 Mon Sep 17 00:00:00 2001
From: Aviv Eyal <avivey@gmail.com>
Date: Fri, 20 Apr 2018 21:42:18 -0700
Subject: [PATCH 855/865] Update install_ubuntu.sh to the new age

Summary:
Ref T4200. Since the last time this script was written, Ubuntu has made lots of changes.
Try to keep up with those.

Test Plan:
Ran this on frash installs of Ubuntu 16.04 LTS and 18.04 LTS (Pre-release).
Got to see Phabricator running.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: amckinley, Korvin

Maniphest Tasks: T4200

Differential Revision: https://secure.phabricator.com/D19394
---
 scripts/install/install_ubuntu.sh | 89 +++++++++++++++++++++----------
 1 file changed, 60 insertions(+), 29 deletions(-)

diff --git a/scripts/install/install_ubuntu.sh b/scripts/install/install_ubuntu.sh
index 5408cdb3e1..ab83c3a46c 100755
--- a/scripts/install/install_ubuntu.sh
+++ b/scripts/install/install_ubuntu.sh
@@ -5,9 +5,22 @@ confirm() {
   read -e ignored
 }
 
-GIT='git'
+INSTALL_URI="   https://phurl.io/u/install"
+
+failed() {
+  echo
+  echo
+  echo "Installation has failed."
+  echo "Text above this message might be useful to understanding what exactly failed."
+  echo
+  echo "Please follow this guide to manually complete installation:"
+  echo
+  echo $INSTALL_URI
+  echo
+  echo "We apologize for the inconvenience."
+  exit 3
+}
 
-LTS="Ubuntu 10.04"
 ISSUE=`cat /etc/issue`
 if [[ $ISSUE != Ubuntu* ]]
 then
@@ -15,20 +28,13 @@ then
   echo "to be something else. Your results may vary.";
   echo
   confirm
-elif [[ `expr match "$ISSUE" "$LTS"` -eq ${#LTS} ]]
-then
-  GIT='git-core'
 fi
 
 echo "PHABRICATOR UBUNTU INSTALL SCRIPT";
-echo "This script will install Phabricator and all of its core dependencies.";
+echo "This script will install Apache, Phabricator and its core dependencies.";
 echo "Run it from the directory you want to install into.";
 echo
 
-ROOT=`pwd`
-echo "Phabricator will be installed to: ${ROOT}.";
-confirm
-
 echo "Testing sudo..."
 sudo true
 if [ $? -ne 0 ]
@@ -37,31 +43,56 @@ then
   exit 1;
 fi;
 
-echo "Installing dependencies: git, apache, mysql, php...";
-echo
+echo 'Testing Ubuntu version...'
 
-set +x
+VERSION=`lsb_release -rs`
+MAJOR=`expr match "$VERSION" '\([0-9]*\)'`
 
-sudo apt-get -qq update
-sudo apt-get install \
-  $GIT mysql-server apache2 dpkg-dev \
-  php5 php5-mysqlnd php5-gd php5-dev php5-curl php-apc php5-cli php5-json
-
-# Enable mod_rewrite
-sudo a2enmod rewrite
+if [ "$MAJOR" -lt 16 ]
+then
+  echo 'This script is intented to install on modern operating systems; Your '
+  echo 'operating system is too old for this script.'
+  echo 'You can still install Phabricator manually - please consult the installation'
+  echo 'guide to see how:'
+  echo
+  echo $INSTALL_URI
+  echo
+  exit 2
+fi
 
-HAVEPCNTL=`php -r "echo extension_loaded('pcntl');"`
-if [ $HAVEPCNTL != "1" ]
+# Ubuntu 16.04 LTS only has php 7.0 in their repos, so they need this extra ppa.
+# Ubuntu 17.4 and up have official 7.2 builds.
+if [ "$MAJOR" -eq 16 ]
 then
-  echo "Installing pcntl...";
+  echo 'This version of Ubuntu requires additional resources in order to install'
+  echo 'and run Phabricator.'
+  echo 'We will now add a the following package repository to your system:'
+  echo '  https://launchpad.net/~ondrej/+archive/ubuntu/php'
   echo
-  apt-get source php5
-  PHP5=`ls -1F | grep '^php5-.*/$'`
-  (cd $PHP5/ext/pcntl && phpize && ./configure && make && sudo make install)
-else
-  echo "pcntl already installed";
+  echo 'This repository is generally considered safe to use.'
+  confirm
+
+  sudo add-apt-repository -y ppa:ondrej/php  || failed
 fi
 
+ROOT=`pwd`
+echo "Phabricator will be installed to: ${ROOT}.";
+confirm
+
+echo "Installing dependencies: git, apache, mysql, php...";
+echo
+sudo apt-get -qq update
+sudo apt-get install \
+  git mysql-server apache2 libapache2-mod-php \
+  php php-mysql php-gd php-curl php-apcu php-cli php-json php-mbstring \
+  || failed
+
+echo "Enabling mod_rewrite in Apache..."
+echo
+sudo a2enmod rewrite  || failed
+
+echo "Downloading Phabricator and dependencies..."
+echo
 if [ ! -e libphutil ]
 then
   git clone https://github.com/phacility/libphutil.git
@@ -89,4 +120,4 @@ echo "Install probably worked mostly correctly. Continue with the 'Configuration
 echo
 echo "    https://secure.phabricator.com/book/phabricator/article/configuration_guide/";
 echo
-echo "You can delete any php5-* stuff that's left over in this directory if you want.";
+echo 'Next step is "Configuring Apache webserver".'

From 16af0d35e5109b89a74175e93002e3a6d3745a6f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 21 Apr 2018 13:00:54 -0700
Subject: [PATCH 856/865] In Differential, prevent "Accept" and "Reject" from
 "Plan Changes + Draft"

Summary:
Ref T13130. See PHI483. Currently, "Plan Changes + Draft" uses rules like "Plan Changes", not rules like "Draft", and allows "Accept".

This isn't consistent with how "Draft" and "Accept" work in other cases. Make "Plan Changes + Draft" more like "Draft" for consistency.

Also fix a string that didn't have a natural English version.

Test Plan:
  - Added a failing build plan.
  - Created a revision.
  - Loaded the revision before builds completed, saw a nicer piece of text about "waiting for builds" instead of "waiting for 2 build(s)".
  - Builds failed, which automatically demoted the reivsion to "Changes Planned + Draft".
  - As the author and as a reviewer, verified all the actions available to me made sense (particularly, no "Accept").
  - Abandoned the revision to test "Abandoned + Draft".
  - As the author and as a reviewer, verified all the actions available to me made sense.
  - Reclaimed the revision, then used "Request Review" to send it to "Needs Review". Verified that actions made sense and, e.g., reviewers could now "Accept" normally.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13130

Differential Revision: https://secure.phabricator.com/D19398
---
 .../xaction/DifferentialRevisionAcceptTransaction.php     | 2 +-
 .../xaction/DifferentialRevisionRejectTransaction.php     | 2 +-
 .../translation/PhabricatorUSEnglishTranslation.php       | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
index 190a6a4920..81544f08ff 100644
--- a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
@@ -162,7 +162,7 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'closed. Only open revisions can be accepted.'));
     }
 
-    if ($object->isDraft()) {
+    if ($object->isDraft() || !$object->getShouldBroadcast()) {
       throw new Exception(
         pht('You can not accept a draft revision.'));
     }
diff --git a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
index a15ca0641b..78f88489ff 100644
--- a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
@@ -73,7 +73,7 @@ protected function validateAction($object, PhabricatorUser $viewer) {
           'not own.'));
     }
 
-    if ($object->isDraft()) {
+    if ($object->isDraft() || !$object->getShouldBroadcast()) {
       throw new Exception(
         pht('You can not request changes to a draft revision.'));
     }
diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
index d33f042d0b..a1e7ae4eae 100644
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -1659,6 +1659,14 @@ protected function getTranslations() {
         'you can no longer see were discarded.',
       ),
 
+      'This draft revision will be sent for review once %s '.
+      'build(s) pass: %s.' => array(
+        'This draft revision will be sent for review once this build '.
+        'passes: %2$s.',
+        'This draft revision will be sent for review once these builds '.
+        'pass: %2$s.',
+      ),
+
     );
   }
 

From 1b24b486f58afaba7d254773f536f18e40381f8b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 23 Apr 2018 13:03:59 -0700
Subject: [PATCH 857/865] Manage object mailKeys automatically in Mail instead
 of storing them on objects

Summary:
Ref T13065. `mailKey`s are a private secret for each object. In some mail configurations, they help us ensure that inbound mail is authentic: when we send you mail, the "Reply-To" is "T123+456+abcdef".

  - The `T123` is the object you're actually replying to.
  - The `456` is your user ID.
  - The `abcdef` is a hash of your user account with the `mailKey`.

Knowing this hash effectively proves that Phabricator has sent you mail about the object before, i.e. that you legitimately control the account you're sending from. Without this, anyone could send mail to any object "From" someone else, and have comments post under their username.

To generate this hash, we need a stable secret per object. (We can't use properties like the PHID because the secret has to be legitimately secret.)

Today, we store these in `mailKey` properties on the actual objects, and manually generate them. This results in tons and tons and tons of copies of this same ~10 lines of code.

Instead, just store them in the Mail application and generate them on demand. This change also anticipates possibly adding flags like "must encrypt" and "original subject", which are other "durable metadata about mail transmission" properties we may have use cases for eventually.

Test Plan:
  - See next change for additional testing and context.
  - Sent mail about Herald rules (next change); saw mail keys generate cleanly.
  - Destroyed a Herald rule with a mail key, saw the mail properties get nuked.
  - Grepped for `getMailKey()` and converted all callsites I could which aren't the copy/pasted boilerplate present in 50 places.
  - Used `bin/mail receive-test --to T123` to test normal mail receipt of older-style objects and make sure that wasn't broken.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13065

Differential Revision: https://secure.phabricator.com/D19399
---
 .../20180423.mail.01.properties.sql           |  8 ++
 src/__phutil_library_map__.php                |  9 ++
 .../auth/storage/PhabricatorAuthSSHKey.php    |  6 --
 ...ilPropertiesDestructionEngineExtension.php | 28 ++++++
 ...catorMailManagementReceiveTestWorkflow.php |  4 +-
 .../PhabricatorMetaMTAMailPropertiesQuery.php | 51 +++++++++++
 .../PhabricatorObjectMailReceiver.php         |  3 +-
 .../PhabricatorObjectMailReceiverTestCase.php |  5 +-
 .../PhabricatorMailReplyHandler.php           | 10 +-
 .../PhabricatorMetaMTAMailProperties.php      | 91 +++++++++++++++++++
 10 files changed, 204 insertions(+), 11 deletions(-)
 create mode 100644 resources/sql/autopatches/20180423.mail.01.properties.sql
 create mode 100644 src/applications/metamta/engineextension/PhabricatorMailPropertiesDestructionEngineExtension.php
 create mode 100644 src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php
 create mode 100644 src/applications/metamta/storage/PhabricatorMetaMTAMailProperties.php

diff --git a/resources/sql/autopatches/20180423.mail.01.properties.sql b/resources/sql/autopatches/20180423.mail.01.properties.sql
new file mode 100644
index 0000000000..d4fc008023
--- /dev/null
+++ b/resources/sql/autopatches/20180423.mail.01.properties.sql
@@ -0,0 +1,8 @@
+CREATE TABLE {$NAMESPACE}_metamta.metamta_mailproperties (
+  id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  objectPHID VARBINARY(64) NOT NULL,
+  mailProperties LONGTEXT NOT NULL COLLATE {$COLLATE_TEXT},
+  dateCreated INT UNSIGNED NOT NULL,
+  dateModified INT UNSIGNED NOT NULL,
+  UNIQUE KEY `key_object` (objectPHID)
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index beec5058a6..4ab77d5207 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3346,6 +3346,7 @@
     'PhabricatorMailOutboundRoutingSelfEmailHeraldAction' => 'applications/metamta/herald/PhabricatorMailOutboundRoutingSelfEmailHeraldAction.php',
     'PhabricatorMailOutboundRoutingSelfNotificationHeraldAction' => 'applications/metamta/herald/PhabricatorMailOutboundRoutingSelfNotificationHeraldAction.php',
     'PhabricatorMailOutboundStatus' => 'applications/metamta/constants/PhabricatorMailOutboundStatus.php',
+    'PhabricatorMailPropertiesDestructionEngineExtension' => 'applications/metamta/engineextension/PhabricatorMailPropertiesDestructionEngineExtension.php',
     'PhabricatorMailReceiver' => 'applications/metamta/receiver/PhabricatorMailReceiver.php',
     'PhabricatorMailReceiverTestCase' => 'applications/metamta/receiver/__tests__/PhabricatorMailReceiverTestCase.php',
     'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/PhabricatorMailReplyHandler.php',
@@ -3403,6 +3404,8 @@
     'PhabricatorMetaMTAMailHasRecipientEdgeType' => 'applications/metamta/edge/PhabricatorMetaMTAMailHasRecipientEdgeType.php',
     'PhabricatorMetaMTAMailListController' => 'applications/metamta/controller/PhabricatorMetaMTAMailListController.php',
     'PhabricatorMetaMTAMailPHIDType' => 'applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php',
+    'PhabricatorMetaMTAMailProperties' => 'applications/metamta/storage/PhabricatorMetaMTAMailProperties.php',
+    'PhabricatorMetaMTAMailPropertiesQuery' => 'applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php',
     'PhabricatorMetaMTAMailQuery' => 'applications/metamta/query/PhabricatorMetaMTAMailQuery.php',
     'PhabricatorMetaMTAMailSearchEngine' => 'applications/metamta/query/PhabricatorMetaMTAMailSearchEngine.php',
     'PhabricatorMetaMTAMailSection' => 'applications/metamta/view/PhabricatorMetaMTAMailSection.php',
@@ -9038,6 +9041,7 @@
     'PhabricatorMailOutboundRoutingSelfEmailHeraldAction' => 'PhabricatorMailOutboundRoutingHeraldAction',
     'PhabricatorMailOutboundRoutingSelfNotificationHeraldAction' => 'PhabricatorMailOutboundRoutingHeraldAction',
     'PhabricatorMailOutboundStatus' => 'Phobject',
+    'PhabricatorMailPropertiesDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
     'PhabricatorMailReceiver' => 'Phobject',
     'PhabricatorMailReceiverTestCase' => 'PhabricatorTestCase',
     'PhabricatorMailReplyHandler' => 'Phobject',
@@ -9106,6 +9110,11 @@
     'PhabricatorMetaMTAMailHasRecipientEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorMetaMTAMailListController' => 'PhabricatorMetaMTAController',
     'PhabricatorMetaMTAMailPHIDType' => 'PhabricatorPHIDType',
+    'PhabricatorMetaMTAMailProperties' => array(
+      'PhabricatorMetaMTADAO',
+      'PhabricatorPolicyInterface',
+    ),
+    'PhabricatorMetaMTAMailPropertiesQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorMetaMTAMailQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorMetaMTAMailSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorMetaMTAMailSection' => 'Phobject',
diff --git a/src/applications/auth/storage/PhabricatorAuthSSHKey.php b/src/applications/auth/storage/PhabricatorAuthSSHKey.php
index 2a9a6273bf..5bbb7de834 100644
--- a/src/applications/auth/storage/PhabricatorAuthSSHKey.php
+++ b/src/applications/auth/storage/PhabricatorAuthSSHKey.php
@@ -70,12 +70,6 @@ public function save() {
     return parent::save();
   }
 
-  public function getMailKey() {
-    // NOTE: We don't actually receive mail for these objects. It's OK for
-    // the mail key to be predictable until we do.
-    return PhabricatorHash::digestForIndex($this->getPHID());
-  }
-
   public function toPublicKey() {
     return PhabricatorAuthSSHPublicKey::newFromStoredKey($this);
   }
diff --git a/src/applications/metamta/engineextension/PhabricatorMailPropertiesDestructionEngineExtension.php b/src/applications/metamta/engineextension/PhabricatorMailPropertiesDestructionEngineExtension.php
new file mode 100644
index 0000000000..4e9e0fe38f
--- /dev/null
+++ b/src/applications/metamta/engineextension/PhabricatorMailPropertiesDestructionEngineExtension.php
@@ -0,0 +1,28 @@
+<?php
+
+final class PhabricatorMailPropertiesDestructionEngineExtension
+  extends PhabricatorDestructionEngineExtension {
+
+  const EXTENSIONKEY = 'mail.properties';
+
+  public function getExtensionName() {
+    return pht('Mail Properties');
+  }
+
+  public function destroyObject(
+    PhabricatorDestructionEngine $engine,
+    $object) {
+
+    $object_phid = $object->getPHID();
+    $viewer = $engine->getViewer();
+
+    $properties = id(new PhabricatorMetaMTAMailPropertiesQuery())
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object_phid))
+      ->executeOne();
+    if ($properties) {
+      $properties->delete();
+    }
+  }
+
+}
diff --git a/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
index 3cbe2345eb..46c444571b 100644
--- a/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php
@@ -139,8 +139,10 @@ public function execute(PhutilArgumentParser $args) {
         throw new Exception(pht("No such object '%s'!", $to));
       }
 
+      $mail_key = PhabricatorMetaMTAMailProperties::loadMailKey($object);
+
       $hash = PhabricatorObjectMailReceiver::computeMailHash(
-        $object->getMailKey(),
+        $mail_key,
         $user->getPHID());
 
       $header_content['to'] = $to.'+'.$user->getID().'+'.$hash.'@test.com';
diff --git a/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php
new file mode 100644
index 0000000000..e6ec09f4ff
--- /dev/null
+++ b/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php
@@ -0,0 +1,51 @@
+<?php
+
+final class PhabricatorMetaMTAMailPropertiesQuery
+  extends PhabricatorCursorPagedPolicyAwareQuery {
+
+  private $ids;
+  private $objectPHIDs;
+
+  public function withIDs(array $ids) {
+    $this->ids = $ids;
+    return $this;
+  }
+
+  public function withObjectPHIDs(array $object_phids) {
+    $this->objectPHIDs = $object_phids;
+    return $this;
+  }
+
+  public function newResultObject() {
+    return new PhabricatorMetaMTAMailProperties();
+  }
+
+  protected function loadPage() {
+    return $this->loadStandardPage($this->newResultObject());
+  }
+
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
+
+    if ($this->ids !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'id IN (%Ld)',
+        $this->ids);
+    }
+
+    if ($this->objectPHIDs !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'objectPHID IN (%Ls)',
+        $this->objectPHIDs);
+    }
+
+    return $where;
+  }
+
+  public function getQueryApplicationClass() {
+    return 'PhabricatorMetaMTAApplication';
+  }
+
+}
diff --git a/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php b/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
index 5985458ab4..801f7a8e6f 100644
--- a/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
+++ b/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php
@@ -124,7 +124,8 @@ public function validateSender(
       $check_phid = $sender->getPHID();
     }
 
-    $expect_hash = self::computeMailHash($object->getMailKey(), $check_phid);
+    $mail_key = PhabricatorMetaMTAMailProperties::loadMailKey($object);
+    $expect_hash = self::computeMailHash($mail_key, $check_phid);
 
     if (!phutil_hashes_are_identical($expect_hash, $parts['hash'])) {
       throw new PhabricatorMetaMTAReceivedMailProcessingException(
diff --git a/src/applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php b/src/applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php
index 2c2e0561cf..a697436d21 100644
--- a/src/applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php
+++ b/src/applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php
@@ -98,8 +98,11 @@ private function buildMail($style) {
     if ($is_bad_hash) {
       $hash = PhabricatorObjectMailReceiver::computeMailHash('x', 'y');
     } else {
+
+      $mail_key = PhabricatorMetaMTAMailProperties::loadMailKey($task);
+
       $hash = PhabricatorObjectMailReceiver::computeMailHash(
-        $task->getMailKey(),
+        $mail_key,
         $is_public ? $task->getPHID() : $user->getPHID());
     }
 
diff --git a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
index f8dd784e3b..70b524b52f 100644
--- a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
+++ b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
@@ -136,8 +136,11 @@ protected function getDefaultPublicReplyHandlerEmailAddress($prefix) {
     // We compute a hash using the object's own PHID to prevent an attacker
     // from blindly interacting with objects that they haven't ever received
     // mail about by just sending to D1@, D2@, etc...
+
+    $mail_key = PhabricatorMetaMTAMailProperties::loadMailKey($receiver);
+
     $hash = PhabricatorObjectMailReceiver::computeMailHash(
-      $receiver->getMailKey(),
+      $mail_key,
       $receiver->getPHID());
 
     $address = "{$prefix}{$receiver_id}+public+{$hash}@{$domain}";
@@ -159,8 +162,11 @@ protected function getDefaultPrivateReplyHandlerEmailAddress(
     $receiver = $this->getMailReceiver();
     $receiver_id = $receiver->getID();
     $user_id = $user->getID();
+
+    $mail_key = PhabricatorMetaMTAMailProperties::loadMailKey($receiver);
+
     $hash = PhabricatorObjectMailReceiver::computeMailHash(
-      $receiver->getMailKey(),
+      $mail_key,
       $user->getPHID());
     $domain = $this->getReplyHandlerDomain();
 
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMailProperties.php b/src/applications/metamta/storage/PhabricatorMetaMTAMailProperties.php
new file mode 100644
index 0000000000..eb454b650e
--- /dev/null
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMailProperties.php
@@ -0,0 +1,91 @@
+<?php
+
+final class PhabricatorMetaMTAMailProperties
+  extends PhabricatorMetaMTADAO
+  implements PhabricatorPolicyInterface {
+
+  protected $objectPHID;
+  protected $mailProperties = array();
+
+  protected function getConfiguration() {
+    return array(
+      self::CONFIG_SERIALIZATION => array(
+        'mailProperties' => self::SERIALIZATION_JSON,
+      ),
+      self::CONFIG_COLUMN_SCHEMA => array(),
+      self::CONFIG_KEY_SCHEMA => array(
+        'key_object' => array(
+          'columns' => array('objectPHID'),
+          'unique' => true,
+        ),
+      ),
+    ) + parent::getConfiguration();
+  }
+
+  public function getMailProperty($key, $default = null) {
+    return idx($this->mailProperties, $key, $default);
+  }
+
+  public function setMailProperty($key, $value) {
+    $this->mailProperties[$key] = $value;
+    return $this;
+  }
+
+  public static function loadMailKey($object) {
+    // If this is an older object with an onboard "mailKey" property, just
+    // use it.
+    // TODO: We should eventually get rid of these and get rid of this
+    // piece of code.
+    if ($object->hasProperty('mailKey')) {
+      return $object->getMailKey();
+    }
+
+    $viewer = PhabricatorUser::getOmnipotentUser();
+    $object_phid = $object->getPHID();
+
+    $properties = id(new PhabricatorMetaMTAMailPropertiesQuery())
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object_phid))
+      ->executeOne();
+    if (!$properties) {
+      $properties = id(new self())
+        ->setObjectPHID($object_phid);
+    }
+
+    $mail_key = $properties->getMailProperty('mailKey');
+    if ($mail_key !== null) {
+      return $mail_key;
+    }
+
+    $mail_key = Filesystem::readRandomCharacters(20);
+    $properties->setMailProperty('mailKey', $mail_key);
+
+    $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+      $properties->save();
+    unset($unguarded);
+
+    return $mail_key;
+  }
+
+
+/* -(  PhabricatorPolicyInterface  )----------------------------------------- */
+
+
+  public function getCapabilities() {
+    return array(
+      PhabricatorPolicyCapability::CAN_VIEW,
+    );
+  }
+
+  public function getPolicy($capability) {
+    switch ($capability) {
+      case PhabricatorPolicyCapability::CAN_VIEW:
+        return PhabricatorPolicies::POLICY_NOONE;
+    }
+  }
+
+  public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
+    return false;
+  }
+
+}

From cac41d1e48580a584152f9e6b54154ad702e771d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 22 Apr 2018 19:57:22 -0700
Subject: [PATCH 858/865] Support Herald rules for Herald rules

Summary:
Depends on D19399. Ref T13130. This adds basic support for writing Herald rules against Herald rules. See T13130 for a lot more detail.

This needs a bit more work to be useful: for example, there's no way to specify the rule type or subject, so you can't say "notify me when global rules are edited" or "notify me when Maniphest rules are edited". I'll add some fields for that in followup changes to actually solve the original use case.

Test Plan:
  - Wrote Herald rules against Herald rules.
  - Ran them by editing rules and in the test console.
  - Verified they sent some mail with `bin/mail list-outbound`.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13130

Differential Revision: https://secure.phabricator.com/D19400
---
 src/__phutil_library_map__.php                |  4 +
 .../herald/adapter/HeraldRuleAdapter.php      | 74 +++++++++++++++++++
 .../herald/editor/HeraldRuleEditor.php        | 50 +++++++++++++
 .../herald/mail/HeraldRuleReplyHandler.php    | 16 ++++
 4 files changed, 144 insertions(+)
 create mode 100644 src/applications/herald/adapter/HeraldRuleAdapter.php
 create mode 100644 src/applications/herald/mail/HeraldRuleReplyHandler.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4ab77d5207..cccd82e882 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1485,12 +1485,14 @@
     'HeraldRemarkupFieldValue' => 'applications/herald/value/HeraldRemarkupFieldValue.php',
     'HeraldRemarkupRule' => 'applications/herald/remarkup/HeraldRemarkupRule.php',
     'HeraldRule' => 'applications/herald/storage/HeraldRule.php',
+    'HeraldRuleAdapter' => 'applications/herald/adapter/HeraldRuleAdapter.php',
     'HeraldRuleController' => 'applications/herald/controller/HeraldRuleController.php',
     'HeraldRuleDatasource' => 'applications/herald/typeahead/HeraldRuleDatasource.php',
     'HeraldRuleEditor' => 'applications/herald/editor/HeraldRuleEditor.php',
     'HeraldRuleListController' => 'applications/herald/controller/HeraldRuleListController.php',
     'HeraldRulePHIDType' => 'applications/herald/phid/HeraldRulePHIDType.php',
     'HeraldRuleQuery' => 'applications/herald/query/HeraldRuleQuery.php',
+    'HeraldRuleReplyHandler' => 'applications/herald/mail/HeraldRuleReplyHandler.php',
     'HeraldRuleSearchEngine' => 'applications/herald/query/HeraldRuleSearchEngine.php',
     'HeraldRuleSerializer' => 'applications/herald/editor/HeraldRuleSerializer.php',
     'HeraldRuleTestCase' => 'applications/herald/storage/__tests__/HeraldRuleTestCase.php',
@@ -6918,12 +6920,14 @@
       'PhabricatorDestructibleInterface',
       'PhabricatorSubscribableInterface',
     ),
+    'HeraldRuleAdapter' => 'HeraldAdapter',
     'HeraldRuleController' => 'HeraldController',
     'HeraldRuleDatasource' => 'PhabricatorTypeaheadDatasource',
     'HeraldRuleEditor' => 'PhabricatorApplicationTransactionEditor',
     'HeraldRuleListController' => 'HeraldController',
     'HeraldRulePHIDType' => 'PhabricatorPHIDType',
     'HeraldRuleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'HeraldRuleReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
     'HeraldRuleSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'HeraldRuleSerializer' => 'Phobject',
     'HeraldRuleTestCase' => 'PhabricatorTestCase',
diff --git a/src/applications/herald/adapter/HeraldRuleAdapter.php b/src/applications/herald/adapter/HeraldRuleAdapter.php
new file mode 100644
index 0000000000..8ed851a1a9
--- /dev/null
+++ b/src/applications/herald/adapter/HeraldRuleAdapter.php
@@ -0,0 +1,74 @@
+<?php
+
+final class HeraldRuleAdapter extends HeraldAdapter {
+
+  private $rule;
+
+  protected function newObject() {
+    return new HeraldRule();
+  }
+
+  public function getAdapterApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  public function getAdapterContentDescription() {
+    return pht('React to Herald rules being created or updated.');
+  }
+
+  public function isTestAdapterForObject($object) {
+    return ($object instanceof HeraldRule);
+  }
+
+  public function getAdapterTestDescription() {
+    return pht(
+      'Test rules which run when another Herald rule is created or '.
+      'updated.');
+  }
+
+  protected function initializeNewAdapter() {
+    $this->rule = $this->newObject();
+  }
+
+  public function supportsApplicationEmail() {
+    return true;
+  }
+
+  public function supportsRuleType($rule_type) {
+    switch ($rule_type) {
+      case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
+      case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
+        return true;
+      case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
+      default:
+        return false;
+    }
+  }
+
+  public function setRule(HeraldRule $rule) {
+    $this->rule = $rule;
+    return $this;
+  }
+
+  public function getRule() {
+    return $this->rule;
+  }
+
+  public function setObject($object) {
+    $this->rule = $object;
+    return $this;
+  }
+
+  public function getObject() {
+    return $this->rule;
+  }
+
+  public function getAdapterContentName() {
+    return pht('Herald Rules');
+  }
+
+  public function getHeraldName() {
+    return $this->getRule()->getMonogram();
+  }
+
+}
diff --git a/src/applications/herald/editor/HeraldRuleEditor.php b/src/applications/herald/editor/HeraldRuleEditor.php
index 30480108f4..8c83ef6597 100644
--- a/src/applications/herald/editor/HeraldRuleEditor.php
+++ b/src/applications/herald/editor/HeraldRuleEditor.php
@@ -87,4 +87,54 @@ protected function applyCustomExternalTransaction(
     return;
   }
 
+  protected function shouldApplyHeraldRules(
+    PhabricatorLiskDAO $object,
+    array $xactions) {
+    return true;
+  }
+
+  protected function buildHeraldAdapter(
+    PhabricatorLiskDAO $object,
+    array $xactions) {
+    return id(new HeraldRuleAdapter())
+      ->setRule($object);
+  }
+
+  protected function shouldSendMail(
+    PhabricatorLiskDAO $object,
+    array $xactions) {
+    return true;
+  }
+
+  protected function getMailTo(PhabricatorLiskDAO $object) {
+    $phids = array();
+
+    $phids[] = $this->getActingAsPHID();
+
+    if ($object->isPersonalRule()) {
+      $phids[] = $object->getAuthorPHID();
+    }
+
+    return $phids;
+  }
+
+  protected function buildReplyHandler(PhabricatorLiskDAO $object) {
+    return id(new HeraldRuleReplyHandler())
+      ->setMailReceiver($object);
+  }
+
+  protected function buildMailTemplate(PhabricatorLiskDAO $object) {
+    $monogram = $object->getMonogram();
+    $name = $object->getName();
+
+    $subject = pht('%s: %s', $monogram, $name);
+
+    return id(new PhabricatorMetaMTAMail())
+      ->setSubject($subject);
+  }
+
+  protected function getMailSubjectPrefix() {
+    return pht('[Herald]');
+  }
+
 }
diff --git a/src/applications/herald/mail/HeraldRuleReplyHandler.php b/src/applications/herald/mail/HeraldRuleReplyHandler.php
new file mode 100644
index 0000000000..c4bf9fad44
--- /dev/null
+++ b/src/applications/herald/mail/HeraldRuleReplyHandler.php
@@ -0,0 +1,16 @@
+<?php
+
+final class HeraldRuleReplyHandler
+  extends PhabricatorApplicationTransactionReplyHandler {
+
+  public function validateMailReceiver($mail_receiver) {
+    if (!($mail_receiver instanceof HeraldRule)) {
+      throw new Exception(pht('Mail receiver is not a %s!', 'HeraldRule'));
+    }
+  }
+
+  public function getObjectPrefix() {
+    return 'H';
+  }
+
+}

From 2319d2ede2f26c52a7f6eb8d5bdba538ee71ed10 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 24 Apr 2018 15:55:56 -0700
Subject: [PATCH 859/865] Fix a typo in the Diffusion importing user guide

Summary: This word isn't the right word.

Test Plan: Reading?

Reviewers: avivey, amckinley

Reviewed By: avivey

Differential Revision: https://secure.phabricator.com/D19404
---
 src/docs/user/userguide/diffusion_existing.diviner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/user/userguide/diffusion_existing.diviner b/src/docs/user/userguide/diffusion_existing.diviner
index bf09d9ef1f..341146f0fd 100644
--- a/src/docs/user/userguide/diffusion_existing.diviner
+++ b/src/docs/user/userguide/diffusion_existing.diviner
@@ -47,7 +47,7 @@ There are two primary ways to import an existing repository:
 Once the import completes, change the "I/O Type" on the **Observe** URI to
 "No I/O" mode to automatically convert it into a hosted repository.
 
-**Push to Empty Repository**: Create an activate an empty repository, then push
+**Push to Empty Repository**: Create and activate an empty repository, then push
 all of your changes to the empty repository.
 
 In Git and Mercurial, you can do this with `git push` or `hg push`.

From b4796d28374c604e9e3cb94877249afebe60b0a0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 24 Apr 2018 15:31:18 -0700
Subject: [PATCH 860/865] Add "Content type" and "Rule type" fields to Herald
 rules for Herald rules

Summary:
Depends on D19400. Ref T13130. Currently, when you write Herald rules about other Herald rules, you can't pick a rule type or content type, so there's no way to get notified about edits to just global rules (which is the primary driving use case).

Add a "Content type" field to let the rule match rules that affect revisions, tasks, commits, etc.

Add a "Rule type" field to let the rule match global, personal, or object rules.

Test Plan:
  - Wrote a global rule for other rules about global Herald rules:

{F5540307}

{F5540308}

  - Ran it against itself which matched:

{F5540309}

  - Ran it against another rule (not a global rule about Herald rules), which did not match:

{F5540311}

  - Also reviewed the fields in those transcripts in more detail to make sure they were extracting matching correctly.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13130

Differential Revision: https://secure.phabricator.com/D19403
---
 src/__phutil_library_map__.php                | 12 +++++
 .../field/rule/HeraldRuleAdapterField.php     | 29 ++++++++++++
 .../herald/field/rule/HeraldRuleField.php     | 14 ++++++
 .../field/rule/HeraldRuleFieldGroup.php       | 16 +++++++
 .../herald/field/rule/HeraldRuleTypeField.php | 28 ++++++++++++
 .../typeahead/HeraldAdapterDatasource.php     | 45 +++++++++++++++++++
 .../typeahead/HeraldRuleTypeDatasource.php    | 42 +++++++++++++++++
 7 files changed, 186 insertions(+)
 create mode 100644 src/applications/herald/field/rule/HeraldRuleAdapterField.php
 create mode 100644 src/applications/herald/field/rule/HeraldRuleField.php
 create mode 100644 src/applications/herald/field/rule/HeraldRuleFieldGroup.php
 create mode 100644 src/applications/herald/field/rule/HeraldRuleTypeField.php
 create mode 100644 src/applications/herald/typeahead/HeraldAdapterDatasource.php
 create mode 100644 src/applications/herald/typeahead/HeraldRuleTypeDatasource.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index cccd82e882..9de57b2530 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1430,6 +1430,7 @@
     'HeraldActionGroup' => 'applications/herald/action/HeraldActionGroup.php',
     'HeraldActionRecord' => 'applications/herald/storage/HeraldActionRecord.php',
     'HeraldAdapter' => 'applications/herald/adapter/HeraldAdapter.php',
+    'HeraldAdapterDatasource' => 'applications/herald/typeahead/HeraldAdapterDatasource.php',
     'HeraldAlwaysField' => 'applications/herald/field/HeraldAlwaysField.php',
     'HeraldAnotherRuleField' => 'applications/herald/field/HeraldAnotherRuleField.php',
     'HeraldApplicationActionGroup' => 'applications/herald/action/HeraldApplicationActionGroup.php',
@@ -1486,9 +1487,12 @@
     'HeraldRemarkupRule' => 'applications/herald/remarkup/HeraldRemarkupRule.php',
     'HeraldRule' => 'applications/herald/storage/HeraldRule.php',
     'HeraldRuleAdapter' => 'applications/herald/adapter/HeraldRuleAdapter.php',
+    'HeraldRuleAdapterField' => 'applications/herald/field/rule/HeraldRuleAdapterField.php',
     'HeraldRuleController' => 'applications/herald/controller/HeraldRuleController.php',
     'HeraldRuleDatasource' => 'applications/herald/typeahead/HeraldRuleDatasource.php',
     'HeraldRuleEditor' => 'applications/herald/editor/HeraldRuleEditor.php',
+    'HeraldRuleField' => 'applications/herald/field/rule/HeraldRuleField.php',
+    'HeraldRuleFieldGroup' => 'applications/herald/field/rule/HeraldRuleFieldGroup.php',
     'HeraldRuleListController' => 'applications/herald/controller/HeraldRuleListController.php',
     'HeraldRulePHIDType' => 'applications/herald/phid/HeraldRulePHIDType.php',
     'HeraldRuleQuery' => 'applications/herald/query/HeraldRuleQuery.php',
@@ -1500,6 +1504,8 @@
     'HeraldRuleTransactionComment' => 'applications/herald/storage/HeraldRuleTransactionComment.php',
     'HeraldRuleTranscript' => 'applications/herald/storage/transcript/HeraldRuleTranscript.php',
     'HeraldRuleTypeConfig' => 'applications/herald/config/HeraldRuleTypeConfig.php',
+    'HeraldRuleTypeDatasource' => 'applications/herald/typeahead/HeraldRuleTypeDatasource.php',
+    'HeraldRuleTypeField' => 'applications/herald/field/rule/HeraldRuleTypeField.php',
     'HeraldRuleViewController' => 'applications/herald/controller/HeraldRuleViewController.php',
     'HeraldSchemaSpec' => 'applications/herald/storage/HeraldSchemaSpec.php',
     'HeraldSelectFieldValue' => 'applications/herald/value/HeraldSelectFieldValue.php',
@@ -6852,6 +6858,7 @@
     'HeraldActionGroup' => 'HeraldGroup',
     'HeraldActionRecord' => 'HeraldDAO',
     'HeraldAdapter' => 'Phobject',
+    'HeraldAdapterDatasource' => 'PhabricatorTypeaheadDatasource',
     'HeraldAlwaysField' => 'HeraldField',
     'HeraldAnotherRuleField' => 'HeraldField',
     'HeraldApplicationActionGroup' => 'HeraldActionGroup',
@@ -6921,9 +6928,12 @@
       'PhabricatorSubscribableInterface',
     ),
     'HeraldRuleAdapter' => 'HeraldAdapter',
+    'HeraldRuleAdapterField' => 'HeraldRuleField',
     'HeraldRuleController' => 'HeraldController',
     'HeraldRuleDatasource' => 'PhabricatorTypeaheadDatasource',
     'HeraldRuleEditor' => 'PhabricatorApplicationTransactionEditor',
+    'HeraldRuleField' => 'HeraldField',
+    'HeraldRuleFieldGroup' => 'HeraldFieldGroup',
     'HeraldRuleListController' => 'HeraldController',
     'HeraldRulePHIDType' => 'PhabricatorPHIDType',
     'HeraldRuleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
@@ -6935,6 +6945,8 @@
     'HeraldRuleTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'HeraldRuleTranscript' => 'Phobject',
     'HeraldRuleTypeConfig' => 'Phobject',
+    'HeraldRuleTypeDatasource' => 'PhabricatorTypeaheadDatasource',
+    'HeraldRuleTypeField' => 'HeraldRuleField',
     'HeraldRuleViewController' => 'HeraldController',
     'HeraldSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'HeraldSelectFieldValue' => 'HeraldFieldValue',
diff --git a/src/applications/herald/field/rule/HeraldRuleAdapterField.php b/src/applications/herald/field/rule/HeraldRuleAdapterField.php
new file mode 100644
index 0000000000..bcb57f520f
--- /dev/null
+++ b/src/applications/herald/field/rule/HeraldRuleAdapterField.php
@@ -0,0 +1,29 @@
+<?php
+
+final class HeraldRuleAdapterField
+  extends HeraldRuleField {
+
+  const FIELDCONST = 'adapter';
+
+  public function getHeraldFieldName() {
+    return pht('Content type');
+  }
+
+  public function getHeraldFieldValue($object) {
+    return $object->getContentType();
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID;
+  }
+
+  protected function getDatasource() {
+    return new HeraldAdapterDatasource();
+  }
+
+  protected function getDatasourceValueMap() {
+    $adapters = HeraldAdapter::getAllAdapters();
+    return mpull($adapters, 'getAdapterContentName', 'getAdapterContentType');
+  }
+
+}
diff --git a/src/applications/herald/field/rule/HeraldRuleField.php b/src/applications/herald/field/rule/HeraldRuleField.php
new file mode 100644
index 0000000000..00ade268b3
--- /dev/null
+++ b/src/applications/herald/field/rule/HeraldRuleField.php
@@ -0,0 +1,14 @@
+<?php
+
+abstract class HeraldRuleField
+  extends HeraldField {
+
+  public function getFieldGroupKey() {
+    return ManiphestTaskHeraldFieldGroup::FIELDGROUPKEY;
+  }
+
+  public function supportsObject($object) {
+    return ($object instanceof HeraldRule);
+  }
+
+}
diff --git a/src/applications/herald/field/rule/HeraldRuleFieldGroup.php b/src/applications/herald/field/rule/HeraldRuleFieldGroup.php
new file mode 100644
index 0000000000..ac9b54035c
--- /dev/null
+++ b/src/applications/herald/field/rule/HeraldRuleFieldGroup.php
@@ -0,0 +1,16 @@
+<?php
+
+final class HeraldRuleFieldGroup
+  extends HeraldFieldGroup {
+
+  const FIELDGROUPKEY = 'herald.rule';
+
+  public function getGroupLabel() {
+    return pht('Rule Fields');
+  }
+
+  protected function getGroupOrder() {
+    return 500;
+  }
+
+}
diff --git a/src/applications/herald/field/rule/HeraldRuleTypeField.php b/src/applications/herald/field/rule/HeraldRuleTypeField.php
new file mode 100644
index 0000000000..1a367c0a8d
--- /dev/null
+++ b/src/applications/herald/field/rule/HeraldRuleTypeField.php
@@ -0,0 +1,28 @@
+<?php
+
+final class HeraldRuleTypeField
+  extends HeraldRuleField {
+
+  const FIELDCONST = 'rule-type';
+
+  public function getHeraldFieldName() {
+    return pht('Rule type');
+  }
+
+  public function getHeraldFieldValue($object) {
+    return $object->getRuleType();
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_PHID;
+  }
+
+  protected function getDatasource() {
+    return new HeraldRuleTypeDatasource();
+  }
+
+  protected function getDatasourceValueMap() {
+    return HeraldRuleTypeConfig::getRuleTypeMap();
+  }
+
+}
diff --git a/src/applications/herald/typeahead/HeraldAdapterDatasource.php b/src/applications/herald/typeahead/HeraldAdapterDatasource.php
new file mode 100644
index 0000000000..1fffd1bb6b
--- /dev/null
+++ b/src/applications/herald/typeahead/HeraldAdapterDatasource.php
@@ -0,0 +1,45 @@
+<?php
+
+final class HeraldAdapterDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  public function getBrowseTitle() {
+    return pht('Browse Herald Adapters');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type an adapter name...');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  public function loadResults() {
+    $results = $this->buildResults();
+    return $this->filterResultsAgainstTokens($results);
+  }
+
+  protected function renderSpecialTokens(array $values) {
+    return $this->renderTokensFromResults($this->buildResults(), $values);
+  }
+
+  private function buildResults() {
+    $results = array();
+
+    $adapters = HeraldAdapter::getAllAdapters();
+    foreach ($adapters as $adapter) {
+      $value = $adapter->getAdapterContentType();
+      $name = $adapter->getAdapterContentName();
+
+      $result = id(new PhabricatorTypeaheadResult())
+        ->setPHID($value)
+        ->setName($name);
+
+      $results[$value] = $result;
+    }
+
+    return $results;
+  }
+
+}
diff --git a/src/applications/herald/typeahead/HeraldRuleTypeDatasource.php b/src/applications/herald/typeahead/HeraldRuleTypeDatasource.php
new file mode 100644
index 0000000000..8dfa7d0f6a
--- /dev/null
+++ b/src/applications/herald/typeahead/HeraldRuleTypeDatasource.php
@@ -0,0 +1,42 @@
+<?php
+
+final class HeraldRuleTypeDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  public function getBrowseTitle() {
+    return pht('Browse Rule Types');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type a rule type...');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
+  public function loadResults() {
+    $results = $this->buildResults();
+    return $this->filterResultsAgainstTokens($results);
+  }
+
+  protected function renderSpecialTokens(array $values) {
+    return $this->renderTokensFromResults($this->buildResults(), $values);
+  }
+
+  private function buildResults() {
+    $results = array();
+
+    $type_map = HeraldRuleTypeConfig::getRuleTypeMap();
+    foreach ($type_map as $type => $name) {
+      $result = id(new PhabricatorTypeaheadResult())
+        ->setPHID($type)
+        ->setName($name);
+
+      $results[$type] = $result;
+    }
+
+    return $results;
+  }
+
+}

From 9f8e0ad473a653e38c850b9314bf32fcfcc8bd23 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 25 Apr 2018 06:17:17 -0700
Subject: [PATCH 861/865] Remove unusual unicode marks in Differential action
 dropdown

Summary:
See <https://twitter.com/HayleyCAnderson/status/988873585363009536>.

Currently, the action dropdown in Differential shows a heavy "X" after "Request Changes" and a heavy checkmark after "Accept Revision".

Although I'm not convinced that the messaging around "Request Changes" is too strong, I do think these marks are out of place in modern Differential. They came from a simpler time when this dropdown had fewer actions, but feel a little weird and inconsistent to me in the modern UI.

Let's try getting rid of them and see how it goes?

Test Plan:
  - Viewed these actions in the dropdown, no longer saw the mark icons.
  - Grepped for these unicode sequences without getting any other hits.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19405
---
 .../xaction/DifferentialRevisionAcceptTransaction.php           | 2 +-
 .../xaction/DifferentialRevisionRejectTransaction.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
index 81544f08ff..42cd798584 100644
--- a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
@@ -7,7 +7,7 @@ final class DifferentialRevisionAcceptTransaction
   const ACTIONKEY = 'accept';
 
   protected function getRevisionActionLabel() {
-    return pht("Accept Revision \xE2\x9C\x94");
+    return pht('Accept Revision');
   }
 
   protected function getRevisionActionDescription(
diff --git a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
index 78f88489ff..0ed6db96bf 100644
--- a/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRejectTransaction.php
@@ -7,7 +7,7 @@ final class DifferentialRevisionRejectTransaction
   const ACTIONKEY = 'reject';
 
   protected function getRevisionActionLabel() {
-    return pht("Request Changes \xE2\x9C\x98");
+    return pht('Request Changes');
   }
 
   protected function getRevisionActionDescription(

From 28517110c6cb41d95ba52b4ac2021e9a06baf8e2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 27 Apr 2018 10:58:28 -0700
Subject: [PATCH 862/865] Fix an issue in the new Harbormaster build log view
 where clicking the "^" icon doesn't work right

Summary:
Ref T13130. See PHI617.

The new build log UI has tags like `<a href="http://github.com/...">Show More Above <span icon>^</span></a>`. If you click the little "^" icon, the event target is the `<span />` instead of the `<a />` so we expand on the wrong node.

Instead, select the `<a />` by sigil explicitly.

Test Plan: Viewed new log UI in Harbormaster, clicked "^" icon and text, got the same (correct) behavior on both.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13130

Differential Revision: https://secure.phabricator.com/D19410
---
 resources/celerity/map.php                             | 10 +++++-----
 .../harbormaster/behavior-harbormaster-log.js          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index dd4d978fed..480c4b602d 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -391,7 +391,7 @@
     'rsrc/js/application/files/behavior-document-engine.js' => 'ee0deff8',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909',
+    'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '549459b8',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e',
     'rsrc/js/application/herald/PathTypeahead.js' => '662e9cea',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
@@ -609,7 +609,7 @@
     'javelin-behavior-event-all-day' => 'b41537c9',
     'javelin-behavior-fancy-datepicker' => 'ecf4e799',
     'javelin-behavior-global-drag-and-drop' => '960f6a39',
-    'javelin-behavior-harbormaster-log' => '191b4909',
+    'javelin-behavior-harbormaster-log' => '549459b8',
     'javelin-behavior-herald-rule-editor' => '7ebaeed3',
     'javelin-behavior-high-security-warning' => 'a464fe03',
     'javelin-behavior-history-install' => '7ee2b591',
@@ -960,9 +960,6 @@
     '185bbd53' => array(
       'javelin-install',
     ),
-    '191b4909' => array(
-      'javelin-behavior',
-    ),
     '1ad0a787' => array(
       'javelin-install',
       'javelin-reactor',
@@ -1257,6 +1254,9 @@
       'javelin-vector',
       'javelin-typeahead-static-source',
     ),
+    '549459b8' => array(
+      'javelin-behavior',
+    ),
     '54b612ba' => array(
       'javelin-color',
       'javelin-install',
diff --git a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
index 5bff2c1bb0..db60c47055 100644
--- a/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
+++ b/webroot/rsrc/js/application/harbormaster/behavior-harbormaster-log.js
@@ -16,7 +16,7 @@ JX.behavior('harbormaster-log', function(config) {
 
     e.kill();
 
-    expand(e.getTarget(), true);
+    expand(e.getNode('harbormaster-log-expand'), true);
   });
 
   function expand(node, is_action) {

From 223d7b84dd18d13cbb2df0107402e48563b97e6f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 25 Apr 2018 06:16:32 -0700
Subject: [PATCH 863/865] Recover more gracefully when favicon configuration
 points at a corrupt/damaged file

Summary:
Ref T13103. Locally, I managed to break the data for a bunch of files by doing `git clean -df` in a working copy that I'd updated to a commit from many many years ago. Since `conf/local.json` wasn't on the gitignore list many years ago, this removed it, and I lost my encryption keyring.

I've symlinked my local config to a version-controlled file now to avoid this specific type of creative self-sabotage in the future, but this has exposed a few cases where we could handle things more gracefully.

One issue is that if your favicon is customized but the file it points at can't actually be loaded, we fail explosively and you really can't do anything to move forward except somehow guess that you need to fix your favicon. Instead, recover more gracefully.

Test Plan:
  - Configure file encryption.
  - Configure a favicon.
  - Remove the encryption key from your keyring.
  - Purge Phabricator's caches.
  - Before: you pretty much dead-end on a fatal that's hard to understand/fix.
  - After: everything works except your favicon.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13103

Differential Revision: https://secure.phabricator.com/D19406
---
 src/applications/files/favicon/PhabricatorFaviconRef.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/applications/files/favicon/PhabricatorFaviconRef.php b/src/applications/files/favicon/PhabricatorFaviconRef.php
index d6c2fd80a8..08ade5283f 100644
--- a/src/applications/files/favicon/PhabricatorFaviconRef.php
+++ b/src/applications/files/favicon/PhabricatorFaviconRef.php
@@ -247,7 +247,14 @@ private function newCompositedFavicon($template) {
     $src_w = $template['width'];
     $src_h = $template['height'];
 
-    $template_data = $template['file']->loadFileData();
+    try {
+      $template_data = $template['file']->loadFileData();
+    } catch (Exception $ex) {
+      // In rare cases, we can end up with a corrupted or inaccessible file.
+      // If we do, just give up: otherwise, it's impossible to get pages to
+      // generate and not obvious how to fix it.
+      return null;
+    }
 
     if (!function_exists('imagecreatefromstring')) {
       return $template_data;

From d40007aa32ae674627d1228c367991c17ac6bc94 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 27 Apr 2018 11:13:00 -0700
Subject: [PATCH 864/865] Fix an issue where the Herald test console doesn't
 work with "Content source" rules

Summary:
Ref T13130. See PHI619. Currently, the Herald "Test Console" doesn't pass a "Content Source" to the adapter, so if any rules of the given type execute a "Content source" field rule, they'll fatal.

Provide a content source:

  - If possible, use the content source from the most recent transaction.
  - Otherwise, build a default "web" content source from the current request.

Test Plan:
  - Wrote a "When [content source][is][whatever]" rule for tasks.
  - Ran test console against a task.
  - Before: got a fatal trying to interact with the content source.
  - After: transcript reports sensible content source.
    - Also commented out the "xaction" logic to test the fallback behavior.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13130

Differential Revision: https://secure.phabricator.com/D19411
---
 .../HeraldTestConsoleController.php           | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/applications/herald/controller/HeraldTestConsoleController.php b/src/applications/herald/controller/HeraldTestConsoleController.php
index 4ddab2669b..5c2d26cf5a 100644
--- a/src/applications/herald/controller/HeraldTestConsoleController.php
+++ b/src/applications/herald/controller/HeraldTestConsoleController.php
@@ -38,8 +38,10 @@ public function handleRequest(AphrontRequest $request) {
 
     $object = $this->getTestObject();
     $adapter = $this->getTestAdapter();
+    $source = $this->newContentSource($object);
 
     $adapter
+      ->setContentSource($source)
       ->setIsNewObject(false)
       ->setActingAsPHID($viewer->getPHID())
       ->setViewer($viewer);
@@ -218,4 +220,29 @@ private function buildTestConsoleResponse($form, array $errors) {
       ->appendChild($view);
   }
 
+  private function newContentSource($object) {
+    $viewer = $this->getViewer();
+
+    // Try using the content source associated with the most recent transaction
+    // on the object.
+
+    $query = PhabricatorApplicationTransactionQuery::newQueryForObject($object);
+
+    $xaction = $query
+      ->setViewer($viewer)
+      ->withObjectPHIDs(array($object->getPHID()))
+      ->setLimit(1)
+      ->setOrder('newest')
+      ->executeOne();
+    if ($xaction) {
+      return $xaction->getContentSource();
+    }
+
+    // If we couldn't find a transaction (which should be rare), fall back to
+    // building a new content source from the test console request itself.
+
+    $request = $this->getRequest();
+    return PhabricatorContentSource::newFromRequest($request);
+  }
+
 }

From 5f774f7008b48d22839ced7040fbe5b1d48c2d34 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 27 Apr 2018 11:22:49 -0700
Subject: [PATCH 865/865] Stop build target start times from being overwritten
 on reentry

Summary:
See PHI615. Ref T13130. An install is reporting that "Lease Working Copy" build steps always report "Built instantly" after completion.

I'm not 100% sure that this is the fix, but I'm like 99% sure: "Lease Working Copy" build steps yield after they ask Drydock for a lease. They will later reenter `doWork()`, see that the lease is filled, and complete.

Right now, we reset the start time every time we enter `doWork()`. Instead, set it only if it hasn't been set yet.

Test Plan: This is low-risk and a bit tricky to reproduce locally, but I'll run some production builds and see what they look like.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13130

Differential Revision: https://secure.phabricator.com/D19412
---
 .../harbormaster/worker/HarbormasterTargetWorker.php      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/applications/harbormaster/worker/HarbormasterTargetWorker.php b/src/applications/harbormaster/worker/HarbormasterTargetWorker.php
index fa3a01272b..a6860f579c 100644
--- a/src/applications/harbormaster/worker/HarbormasterTargetWorker.php
+++ b/src/applications/harbormaster/worker/HarbormasterTargetWorker.php
@@ -46,7 +46,13 @@ protected function doWork() {
     $build = $target->getBuild();
     $viewer = $this->getViewer();
 
-    $target->setDateStarted(time());
+    // If this is the first time we're starting work on this target, mark the
+    // current time as the start time. If the target yields or waits, we may
+    // end up here again later, so we don't want to overwrite the start time if
+    // we already have a value.
+    if (!$target->getDateStarted()) {
+      $target->setDateStarted(PhabricatorTime::getNow());
+    }
 
     try {
       if ($target->getBuildGeneration() !== $build->getBuildGeneration()) {