From 4c09e88c95829ad629c86e4b58e1be069fd0d018 Mon Sep 17 00:00:00 2001
From: Arturas Moskvinas <arturas@uber.com>
Date: Wed, 1 Aug 2018 14:42:52 +0300
Subject: [PATCH 001/125] Add parsing for ssh options (-o) which are passed
 when using GIT v2 wire protocol by git command (SSH transport)

Summary:
Makes `ssh-connect` compatible with Git v2 wire protocol over SSH

More details about git V2 wire: https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html

`git` command (2.18+) passes extra options (`-o "SendEnv GIT_PROTOCOL"`) to underlying `ssh` command to enable v2 wire protocol (environment variable enabling new protocol).

Phabricator `ssh-connect` command doesn't understand `-o` options and interprets it as host parts hence when you enable git v2 all clones/ls-remotes crash with:
```
#0 ExecFuture::resolvex() called at [<phabricator>/src/applications/repository/storage/PhabricatorRepository.php:525]
#1 PhabricatorRepository::execxRemoteCommand(string, PhutilOpaqueEnvelope) called at [<phabricator>/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php:400]
#2 PhabricatorRepositoryPullEngine::loadGitRemoteRefs(PhabricatorRepository) called at [<phabricator>/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php:343]
#3 PhabricatorRepositoryPullEngine::executeGitUpdate() called at [<phabricator>/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php:126]
#4 PhabricatorRepositoryPullEngine::pullRepositoryWithLock() called at [<phabricator>/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php:40]
#5 PhabricatorRepositoryPullEngine::pullRepository() called at [<phabricator>/src/applications/repository/management/PhabricatorRepositoryManagementUpdateWorkflow.php:59]
#6 PhabricatorRepositoryManagementUpdateWorkflow::execute(PhutilArgumentParser) called at [<phutil>/src/parser/argument/PhutilArgumentParser.php:441]
#7 PhutilArgumentParser::parseWorkflowsFull(array) called at [<phutil>/src/parser/argument/PhutilArgumentParser.php:333]
#8 PhutilArgumentParser::parseWorkflows(array) called at [<phabricator>/scripts/repository/manage_repositories.php:22]
COMMAND
git ls-remote '********'
STDOUT
(empty)
STDERR
ssh: Could not resolve hostname -o: Name or service not known
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
at [<phutil>/src/future/exec/ExecFuture.php:369]
```

Test Plan:
How to reproduce:
1. add repository to Phabricator which is accessed via `ssh`
2. Use git 2.18+
3. Enable wire protocol in `/etc/gitconfig`:
```
[protocol]
    version = 2
```
4. Try refreshing repository: `phabricator/bin/repository update somecallsing`
5. Repository update fails with `ssh: Could not resolve hostname -o: Name or service not known`

after this changes - updates will succeed

Reviewers: epriestley, Pawka, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19542
---
 scripts/ssh/ssh-connect.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/scripts/ssh/ssh-connect.php b/scripts/ssh/ssh-connect.php
index 9757f3cbbe..0d87f16973 100755
--- a/scripts/ssh/ssh-connect.php
+++ b/scripts/ssh/ssh-connect.php
@@ -27,7 +27,15 @@ $args->parsePartial(
       'param' => pht('port'),
       'help' => pht('Port number to connect to.'),
     ),
+    array(
+      'name' => 'options',
+      'short' => 'o',
+      'param' => pht('options'),
+      'repeat' => true,
+      'help' => pht('SSH options.'),
+    ),
   ));
+
 $unconsumed_argv = $args->getUnconsumedArgumentVector();
 
 if (function_exists('pcntl_signal')) {
@@ -113,6 +121,25 @@ if ($port) {
   $arguments[] = $port;
 }
 
+$options = $args->getArg('options');
+$allowed_ssh_options = array('SendEnv=GIT_PROTOCOL');
+
+if (!empty($options)) {
+  foreach ($options as $option) {
+    if (array_search($option, $allowed_ssh_options) !== false) {
+      $pattern[] = '-o %s';
+      $arguments[] = $option;
+    } else {
+      throw new Exception(
+        pht(
+          'Disallowed ssh option "%s" given with "-o". '.
+          'Allowed options are: %s.',
+          $option,
+          implode(', ', $allowed_ssh_options)));
+    }
+  }
+}
+
 $pattern[] = '--';
 
 $pattern[] = '%s';

From 356b2781bcadf43aaf7e4d8086fcc8ab867a38cb Mon Sep 17 00:00:00 2001
From: Arturas Moskvinas <arturas@uber.com>
Date: Thu, 2 Aug 2018 17:41:40 +0300
Subject: [PATCH 002/125] Gracefully fail request if non existing callsign is
 passed to getrecentcommitsbypath instead of crashing

Summary:
`diffusion.getrecentcommitsbypath` fails with 500 error when non existing callsign is passed:
```
>>> UNRECOVERABLE FATAL ERROR <<<

Call to a member function getCommit() on null

```

Expected Behavior:
Return more graceful error notifying caller that such callsign/repository does not exist

Reproduction steps:
Open conduit: https://secure.phabricator.com/conduit/method/diffusion.getrecentcommitsbypath/
Enter:
callsign: "obviouslynotexisting"
path: "/random"
Click call method

Test Plan: after applying patch - call no longer fails with 500s

Reviewers: Pawka, epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19558
---
 ...DiffusionGetRecentCommitsByPathConduitAPIMethod.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
index 002805ac4e..65bc5f69da 100644
--- a/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
@@ -23,6 +23,12 @@ final class DiffusionGetRecentCommitsByPathConduitAPIMethod
     );
   }
 
+  protected function defineErrorTypes() {
+    return array(
+      'ERR_NOT_FOUND' => pht('Repository was not found.'),
+    );
+  }
+
   protected function defineReturnType() {
     return 'nonempty list<string>';
   }
@@ -36,6 +42,10 @@ final class DiffusionGetRecentCommitsByPathConduitAPIMethod
         'branch' => $request->getValue('branch'),
       ));
 
+    if ($drequest === null) {
+        throw new ConduitException('ERR_NOT_FOUND');
+    }
+
     $limit = nonempty(
       $request->getValue('limit'),
       self::DEFAULT_LIMIT);

From 3574a55a95bda7d852dacd3082bfa312d610f615 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 2 Aug 2018 16:33:41 -0700
Subject: [PATCH 003/125] Deprecate Conduit method
 "diffusion.getrecentcommitsbypath"

Summary:
See D19558. This method has no callers and just wraps `diffusion.historyquery`, since D5960 (2013).

This was introduced in D315 (which didn't make it out of FB, I think) inside Facebook for unclear purposes in 2011.

Test Plan: Grepped for callers, found none.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: artms

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

diff --git a/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
index 65bc5f69da..286831f82b 100644
--- a/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
@@ -9,6 +9,14 @@ final class DiffusionGetRecentCommitsByPathConduitAPIMethod
     return 'diffusion.getrecentcommitsbypath';
   }
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_DEPRECATED;
+  }
+
+  public function getMethodStatusDescription() {
+    return pht('Obsoleted by "diffusion.historyquery".');
+  }
+
   public function getMethodDescription() {
     return pht(
       'Get commit identifiers for recent commits affecting a given path.');

From f3fa164882eab06ef10cfdfcacb82248962d9f80 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 3 Aug 2018 12:15:29 -0700
Subject: [PATCH 004/125] Add a "Last Edited" property to Wiki pages

Summary:
Ref T13164. See PHI797. The last edit is available in the page header, but it's not precise (just says "180 days ago") and a little weird (it's unusual for us to put that kind of information in the header).

Add a precise timestamp to the footer for now. I'd imagine re-examining this the next time Phriction gets some UI work and maybe trying to integrate timeline/transactions more cleanly (see also T1894).

Test Plan: Looked at a wiki page, then edited it. Saw precise "Last Edit" timestamp adjacent to "Last Author".

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19560
---
 .../phriction/controller/PhrictionDocumentController.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 8377cf7d29..c8ffb86ce8 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -254,7 +254,8 @@ final class PhrictionDocumentController
     PhrictionContent $content,
     $slug) {
 
-    $viewer = $this->getRequest()->getUser();
+    $viewer = $this->getViewer();
+
     $view = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($document);
@@ -263,6 +264,10 @@ final class PhrictionDocumentController
       pht('Last Author'),
       $viewer->renderHandle($content->getAuthorPHID()));
 
+    $view->addProperty(
+      pht('Last Edited'),
+      phabricator_datetime($content->getDateCreated(), $viewer));
+
     return $view;
   }
 

From 5839a54b604d972c11192105896124da38fb702a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 3 Aug 2018 13:02:23 -0700
Subject: [PATCH 005/125] Raise a tailored error when calling
 "transaction.search" with empty "phids" constraint

Summary:
Ref T13164. See PHI725. For real "*.search" methods, parameters get validated and you get an error if you use an empty list as a constraint.

Since "transaction.search" isn't really a normal "*.search" method, it doesn't benefit from this. Just do the check manually for now.

Test Plan: Made `transaction.search` calls with no constraints (got results); a valid costraint (got fewer results); and an invalid empty constraint (got an exception).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19562
---
 .../conduit/TransactionSearchConduitAPIMethod.php         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php b/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
index 3b040ea2c3..0394432ff3 100644
--- a/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
+++ b/src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
@@ -79,6 +79,14 @@ final class TransactionSearchConduitAPIMethod
       ));
 
     $with_phids = idx($constraints, 'phids');
+
+    if ($with_phids === array()) {
+      throw new Exception(
+        pht(
+          'Constraint "phids" to "transaction.search" requires nonempty list, '.
+          'empty list provided.'));
+    }
+
     if ($with_phids) {
       $xaction_query->withPHIDs($with_phids);
     }

From 91abc0f027209908c4d9eff824ea7445e0ca5555 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 3 Aug 2018 13:38:24 -0700
Subject: [PATCH 006/125] Stop indexing the chunk data objects for large Files
 stored in multiple chunks

Summary:
Ref T13164. See PHI766. Currently, when file data is stored in small chunks, we submit each chunk to the indexing engine.

However, chunks are never surfaced directly and can never be found via any search/query, so this work is pointless. Just skip it.

(It would be nice to do this a little more formally on `IndexableInterface` or similar as `isThisAnIndexableObject()`, but we'd have to add like a million empty "yes, index this always" methods to do that, and it seems unlikely that we'll end up with too many other objects like these.)

Test Plan:
  - Ran `bin/harbormaster rebuild-log --id ... --force` before and after change, saw about 200 fewer queries after the change.
  - Uploaded a uniquely named file and searched for it to make sure I didn't break that.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19563
---
 src/applications/files/storage/PhabricatorFile.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
index 1517b4435b..5109202a33 100644
--- a/src/applications/files/storage/PhabricatorFile.php
+++ b/src/applications/files/storage/PhabricatorFile.php
@@ -159,10 +159,22 @@ final class PhabricatorFile extends PhabricatorFileDAO
 
   public function saveAndIndex() {
     $this->save();
-    PhabricatorSearchWorker::queueDocumentForIndexing($this->getPHID());
+
+    if ($this->isIndexableFile()) {
+      PhabricatorSearchWorker::queueDocumentForIndexing($this->getPHID());
+    }
+
     return $this;
   }
 
+  private function isIndexableFile() {
+    if ($this->getIsChunk()) {
+      return false;
+    }
+
+    return true;
+  }
+
   public function getMonogram() {
     return 'F'.$this->getID();
   }

From 201f29fbf4ab74a2cd41433c4ba57c77d64e4e6e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 8 Aug 2018 09:24:48 -0700
Subject: [PATCH 007/125] Fix truncation in "bin/storage probe" of tables
 larger than 100GB

Summary:
Ref T13164. PHI805 incidentally includes some `bin/storage probe` output for 100GB+ tables which renders wrong.

We have the tools to render it properly, so stop doing this manually and let ConsoleTable figure out the alignment.

Test Plan:
Faked very large table sizes, ran `bin/storage probe`:

{F5785946}

(Then, un-faked the very large table sizes and ran it again, got sensible output.)

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19567
---
 ...PhabricatorStorageManagementProbeWorkflow.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php
index a75afe69e8..5c55dc779e 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php
@@ -56,8 +56,18 @@ final class PhabricatorStorageManagementProbeWorkflow
       ->setShowHeader(false)
       ->setPadding(2)
       ->addColumn('name', array('title' => pht('Database / Table')))
-      ->addColumn('size', array('title' => pht('Size')))
-      ->addColumn('percentage', array('title' => pht('Percentage')));
+      ->addColumn(
+        'size',
+        array(
+          'title' => pht('Size'),
+          'align' => PhutilConsoleTable::ALIGN_RIGHT,
+        ))
+      ->addColumn(
+        'percentage',
+        array(
+          'title' => pht('Percentage'),
+          'align' => PhutilConsoleTable::ALIGN_RIGHT,
+        ));
 
     foreach ($totals as $db => $size) {
       list($database_size, $database_percentage) = $this->formatSize(
@@ -98,7 +108,7 @@ final class PhabricatorStorageManagementProbeWorkflow
 
   private function formatSize($n, $o) {
     return array(
-      sprintf('%8.8s MB', number_format($n / (1024 * 1024), 1)),
+      pht('%s MB', new PhutilNumber($n / (1024 * 1024), 1)),
       sprintf('%3.1f%%', 100 * ($n / $o)),
     );
   }

From 3ca3f09a1aa6c0dc407ee2ae9e5f9cf4f995bbd6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 8 Aug 2018 09:06:22 -0700
Subject: [PATCH 008/125] Add an "--as" flag to "bin/conduit call ..." to
 improve flexibility and ease of profiling

Summary:
Ref T13164. In PHI801, an install reported a particular slow Conduit method call.

Conduit calls aren't easily profilable with normal tools (for example, `arc call-conduit --xprofile ...` gives you a profile of the //client//). They can be profiled most easily with `bin/conduit call ... --xprofile`.

However, `bin/conduit call` currently doesn't let you pick a user to execute the command on behalf of, so it's not terribly useful for profiling `*.edit`-style methods which do a write: these need a real acting user.

Test Plan:
Ran `bin/conduit call --method user.whoami --as epriestley ...` with valid, invalid, and no acting users.

```
$ echo '{}' | ./bin/conduit call --method user.whoami --as epriestley --input -
Reading input from stdin...
{
  "result": {
    "phid": "PHID-USER-icyixzkx3f4ttv67avbn",
    "userName": "epriestley",
    "realName": "Evan Priestley",
...
```

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19566
---
 ...abricatorConduitCallManagementWorkflow.php | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php b/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php
index 6cb3bd2409..f9ba48b372 100644
--- a/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php
+++ b/src/applications/conduit/management/PhabricatorConduitCallManagementWorkflow.php
@@ -21,6 +21,13 @@ final class PhabricatorConduitCallManagementWorkflow
               'File to read parameters from, or "-" to read from '.
               'stdin.'),
           ),
+          array(
+            'name' => 'as',
+            'param' => 'username',
+            'help' => pht(
+              'Execute the call as the given user. (If omitted, the call will '.
+              'be executed as an omnipotent user.)'),
+          ),
         ));
   }
 
@@ -39,6 +46,22 @@ final class PhabricatorConduitCallManagementWorkflow
         pht('Specify a file to read parameters from with "--input".'));
     }
 
+    $as = $args->getArg('as');
+    if (strlen($as)) {
+      $actor = id(new PhabricatorPeopleQuery())
+        ->setViewer($viewer)
+        ->withUsernames(array($as))
+        ->executeOne();
+      if (!$actor) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'No such user "%s" exists.',
+            $as));
+      }
+    } else {
+      $actor = $viewer;
+    }
+
     if ($input === '-') {
       fprintf(STDERR, tsprintf("%s\n", pht('Reading input from stdin...')));
       $input_json = file_get_contents('php://stdin');
@@ -49,7 +72,7 @@ final class PhabricatorConduitCallManagementWorkflow
     $params = phutil_json_decode($input_json);
 
     $result = id(new ConduitCall($method, $params))
-      ->setUser($viewer)
+      ->setUser($actor)
       ->execute();
 
     $output = array(

From df31405d64a44a9ae7a12a324fb292dc8357be46 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 8 Aug 2018 11:26:34 -0700
Subject: [PATCH 009/125] Improve compatibility of "Config > Cache Status"
 across APCu versions

Summary:
Ref T13164. See PHI790. Older versions of APCu reported cache keys as "key" from `apcu_cache_info()`. APC and newer APCu report it as "info".

Check both indexes for compatibility.

Test Plan:
  - Locally, with newer APCu, saw no behavioral change.
  - Will double check on `admin`, which has an older APCu with the "key" behavior.
  - (I hunted this down by dumping `apcu_cache_info()` on `admin` to see what was going on.)

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19569
---
 .../cache/spec/PhabricatorDataCacheSpec.php     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/applications/cache/spec/PhabricatorDataCacheSpec.php b/src/applications/cache/spec/PhabricatorDataCacheSpec.php
index bf6a495f7f..103b0d8394 100644
--- a/src/applications/cache/spec/PhabricatorDataCacheSpec.php
+++ b/src/applications/cache/spec/PhabricatorDataCacheSpec.php
@@ -106,8 +106,21 @@ final class PhabricatorDataCacheSpec extends PhabricatorCacheSpec {
       $cache = $info['cache_list'];
       $state = array();
       foreach ($cache as $item) {
-        $info = idx($item, 'info', '<unknown-key>');
-        $key = self::getKeyPattern($info);
+        // Some older versions of APCu report the cachekey as "key", while
+        // newer APCu and APC report it as "info". Just check both indexes
+        // for commpatibility. See T13164 for details.
+
+        $info = idx($item, 'info');
+        if ($info === null) {
+          $info = idx($item, 'key');
+        }
+
+        if ($info === null) {
+          $key = '<unknown-key>';
+        } else {
+          $key = self::getKeyPattern($info);
+        }
+
         if (empty($state[$key])) {
           $state[$key] = array(
             'max' => 0,

From 6df278bea84a2c8a66752bf4b591d7f3d4432f89 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 8 Aug 2018 10:07:00 -0700
Subject: [PATCH 010/125] In "bin/ssh-auth", cache a structure instead of a
 flat file because paths may change at runtime

Summary:
Fixes T12397. Ref T13164. See PHI801.

Several installs have hit various use cases where the path on disk where Phabricator lives changes at runtime. Currently, `bin/ssh-auth` caches a flat file which includes the path to `bin/ssh-exec`, so this may fall out of date if `phabricator/` moves.

These use cases have varying strengths of legitimacy, but "we're migrating to a new set of hosts and the pool is half old machines and half new machines" seems reasonably compelling and not a problem entirely of one's own making.

Test Plan:
  - Compared output on `master` to output after change, found them byte-for-byte identical.
  - Moved `phabricator/` to `phabricator2/`, ran `bin/ssh-auth`, got updated output.
  - Added a new SSH key, saw it appear in the output.
  - Grepped for `AUTHFILE_CACHEKEY` (no hits).
  - Dropped the cache, verified that the file regenerates cleanly.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164, T12397

Differential Revision: https://secure.phabricator.com/D19568
---
 scripts/ssh/ssh-auth.php                      | 89 +++++++++++++------
 .../auth/query/PhabricatorAuthSSHKeyQuery.php |  4 +-
 2 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/scripts/ssh/ssh-auth.php b/scripts/ssh/ssh-auth.php
index b25905668b..3c4f3f2b33 100755
--- a/scripts/ssh/ssh-auth.php
+++ b/scripts/ssh/ssh-auth.php
@@ -2,13 +2,27 @@
 <?php
 
 $root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once $root.'/scripts/init/init-script.php';
+
+// NOTE: We are caching a datastructure rather than the flat key file because
+// the path on disk to "ssh-exec" is arbitrarily mutable at runtime. See T12397.
 
 $cache = PhabricatorCaches::getMutableCache();
-$authfile_key = PhabricatorAuthSSHKeyQuery::AUTHFILE_CACHEKEY;
-$authfile = $cache->getKey($authfile_key);
+$authstruct_key = PhabricatorAuthSSHKeyQuery::AUTHSTRUCT_CACHEKEY;
+$authstruct_raw = $cache->getKey($authstruct_key);
 
-if ($authfile === null) {
+$authstruct = null;
+
+if (strlen($authstruct_raw)) {
+  try {
+    $authstruct = phutil_json_decode($authstruct_raw);
+  } catch (Exception $ex) {
+    // Ignore any issues with the cached data; we'll just rebuild the
+    // structure below.
+  }
+}
+
+if ($authstruct === null) {
   $keys = id(new PhabricatorAuthSSHKeyQuery())
     ->setViewer(PhabricatorUser::getOmnipotentUser())
     ->withIsActive(true)
@@ -19,7 +33,7 @@ if ($authfile === null) {
     exit(1);
   }
 
-  $bin = $root.'/bin/ssh-exec';
+  $key_list = array();
   foreach ($keys as $ssh_key) {
     $key_argv = array();
     $object = $ssh_key->getObject();
@@ -42,18 +56,7 @@ if ($authfile === null) {
     $key_argv[] = '--phabricator-ssh-key';
     $key_argv[] = $ssh_key->getID();
 
-    $cmd = csprintf('%s %Ls', $bin, $key_argv);
-
-    $instance = PhabricatorEnv::getEnvConfig('cluster.instance');
-    if (strlen($instance)) {
-      $cmd = csprintf('PHABRICATOR_INSTANCE=%s %C', $instance, $cmd);
-    }
-
-    // This is additional escaping for the SSH 'command="..."' string.
-    $cmd = addcslashes($cmd, '"\\');
-
     // Strip out newlines and other nonsense from the key type and key body.
-
     $type = $ssh_key->getKeyType();
     $type = preg_replace('@[\x00-\x20]+@', '', $type);
     if (!strlen($type)) {
@@ -66,22 +69,54 @@ if ($authfile === null) {
       continue;
     }
 
-    $options = array(
-      'command="'.$cmd.'"',
-      'no-port-forwarding',
-      'no-X11-forwarding',
-      'no-agent-forwarding',
-      'no-pty',
+    $key_list[] = array(
+      'argv' => $key_argv,
+      'type' => $type,
+      'key' => $key,
     );
-    $options = implode(',', $options);
-
-    $lines[] = $options.' '.$type.' '.$key."\n";
   }
 
-  $authfile = implode('', $lines);
+  $authstruct = array(
+    'keys' => $key_list,
+  );
+
+  $authstruct_raw = phutil_json_encode($authstruct);
   $ttl = phutil_units('24 hours in seconds');
-  $cache->setKey($authfile_key, $authfile, $ttl);
+  $cache->setKey($authstruct_key, $authstruct_raw, $ttl);
 }
 
+$bin = $root.'/bin/ssh-exec';
+$instance = PhabricatorEnv::getEnvConfig('cluster.instance');
+
+$lines = array();
+foreach ($authstruct['keys'] as $key_struct) {
+  $key_argv = $key_struct['argv'];
+  $key = $key_struct['key'];
+  $type = $key_struct['type'];
+
+  $cmd = csprintf('%s %Ls', $bin, $key_argv);
+
+  if (strlen($instance)) {
+    $cmd = csprintf('PHABRICATOR_INSTANCE=%s %C', $instance, $cmd);
+  }
+
+  // This is additional escaping for the SSH 'command="..."' string.
+  $cmd = addcslashes($cmd, '"\\');
+
+  $options = array(
+    'command="'.$cmd.'"',
+    'no-port-forwarding',
+    'no-X11-forwarding',
+    'no-agent-forwarding',
+    'no-pty',
+  );
+  $options = implode(',', $options);
+
+  $lines[] = $options.' '.$type.' '.$key."\n";
+}
+
+$authfile = implode('', $lines);
+
 echo $authfile;
+
 exit(0);
diff --git a/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php b/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
index 77b666ea44..d8474085b2 100644
--- a/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
@@ -3,7 +3,7 @@
 final class PhabricatorAuthSSHKeyQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
-  const AUTHFILE_CACHEKEY = 'ssh.authfile';
+  const AUTHSTRUCT_CACHEKEY = 'ssh.authstruct';
 
   private $ids;
   private $phids;
@@ -13,7 +13,7 @@ final class PhabricatorAuthSSHKeyQuery
 
   public static function deleteSSHKeyCache() {
     $cache = PhabricatorCaches::getMutableCache();
-    $authfile_key = self::AUTHFILE_CACHEKEY;
+    $authfile_key = self::AUTHSTRUCT_CACHEKEY;
     $cache->deleteKey($authfile_key);
   }
 

From 2951694c27370b501816f9eecff76e4cb65fb081 Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Thu, 9 Aug 2018 12:30:42 -0700
Subject: [PATCH 011/125] Correctly spell 'committer'

Summary: It's a funny word. h/t @joshuaspence

Test Plan: Inspection of correct spelling.

Reviewers: epriestley, joshuaspence

Reviewed By: joshuaspence

Subscribers: Korvin, joshuaspence

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

diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index abcf862b40..cf88c0eb54 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -206,7 +206,7 @@ final class PhabricatorRepositoryCommit
     return $this->assertAttached($this->authorIdentity);
   }
 
-  public function getCommiterIdentity() {
+  public function getCommitterIdentity() {
     return $this->assertAttached($this->committerIdentity);
   }
 

From a6951a0a5aa0510b702f32ea68c014e99e174b18 Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Thu, 9 Aug 2018 12:24:36 -0700
Subject: [PATCH 012/125] Add migration to encourage rebuilding repository
 identities

Summary: Ref T12164. Defines a new manual activity that suggests rebuilding repository identities before Phabricator begins to rely on them.

Test Plan:
- Ran migration, observed expected setup issue: {F5788217}
- Ran `bin/config done identities` and observed setup issue get marked as done.
- Ran `/bin/storage upgrade --apply phabricator:20170912.ferret.01.activity.php` to make sure I didn't break the reindex migration; observed reindex setup issue appear as expected.
- Ran `./bin/config done reindex` and observed reindex issue cleared as expected.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T12164

Differential Revision: https://secure.phabricator.com/D19497
---
 .../20180809.repo_identities.activity.php     |  20 ++
 .../PhabricatorManualActivitySetupCheck.php   | 177 ++++++++++++------
 .../PhabricatorConfigManualActivity.php       |   2 +
 3 files changed, 146 insertions(+), 53 deletions(-)
 create mode 100644 resources/sql/autopatches/20180809.repo_identities.activity.php

diff --git a/resources/sql/autopatches/20180809.repo_identities.activity.php b/resources/sql/autopatches/20180809.repo_identities.activity.php
new file mode 100644
index 0000000000..e1077d4ddb
--- /dev/null
+++ b/resources/sql/autopatches/20180809.repo_identities.activity.php
@@ -0,0 +1,20 @@
+<?php
+
+// Advise installs to rebuild the repository identities.
+
+// If the install has no commits (or no commits that lack an
+// authorIdentityPHID), don't require a rebuild.
+$commits = id(new PhabricatorRepositoryCommit())
+  ->loadAllWhere('authorIdentityPHID IS NULL LIMIT 1');
+
+if (!$commits) {
+  return;
+}
+
+try {
+  id(new PhabricatorConfigManualActivity())
+    ->setActivityType(PhabricatorConfigManualActivity::TYPE_IDENTITIES)
+    ->save();
+} catch (AphrontDuplicateKeyQueryException $ex) {
+  // If we've already noted that this activity is required, just move on.
+}
diff --git a/src/applications/config/check/PhabricatorManualActivitySetupCheck.php b/src/applications/config/check/PhabricatorManualActivitySetupCheck.php
index 44db1b57a6..c5c756e49b 100644
--- a/src/applications/config/check/PhabricatorManualActivitySetupCheck.php
+++ b/src/applications/config/check/PhabricatorManualActivitySetupCheck.php
@@ -13,63 +13,134 @@ final class PhabricatorManualActivitySetupCheck
     foreach ($activities as $activity) {
       $type = $activity->getActivityType();
 
-      // For now, there is only one type of manual activity. It's not clear
-      // if we're really going to have too much more of this stuff so this
-      // is a bit under-designed for now.
+      switch ($type) {
+        case PhabricatorConfigManualActivity::TYPE_REINDEX:
+          $this->raiseSearchReindexIssue();
+          break;
 
-      $activity_name = pht('Rebuild Search Index');
-      $activity_summary = pht(
-        'The search index algorithm has been updated and the index needs '.
-        'be rebuilt.');
+        case PhabricatorConfigManualActivity::TYPE_IDENTITIES:
+          $this->raiseRebuildIdentitiesIssue();
+          break;
 
-      $message = array();
-
-      $message[] = pht(
-        'The indexing algorithm for the fulltext search index has been '.
-        'updated and the index needs to be rebuilt. Until you rebuild the '.
-        'index, global search (and other fulltext search) will not '.
-        'function correctly.');
-
-      $message[] = pht(
-        'You can rebuild the search index while Phabricator is running.');
-
-      $message[] = pht(
-        'To rebuild the index, run this command:');
-
-      $message[] = phutil_tag(
-        'pre',
-        array(),
-        (string)csprintf(
-          'phabricator/ $ ./bin/search index --all --force --background'));
-
-      $message[] = pht(
-        'You can find more information about rebuilding the search '.
-        'index here: %s',
-        phutil_tag(
-          'a',
-          array(
-            'href' => 'https://phurl.io/u/reindex',
-            'target' => '_blank',
-          ),
-          'https://phurl.io/u/reindex'));
-
-      $message[] = pht(
-        'After rebuilding the index, run this command to clear this setup '.
-        'warning:');
-
-      $message[] = phutil_tag(
-        'pre',
-        array(),
-        (string)csprintf('phabricator/ $ ./bin/config done %R', $type));
-
-      $activity_message = phutil_implode_html("\n\n", $message);
-
-      $this->newIssue('manual.'.$type)
-        ->setName($activity_name)
-        ->setSummary($activity_summary)
-        ->setMessage($activity_message);
+        default:
+      }
     }
+  }
 
+  private function raiseSearchReindexIssue() {
+    $activity_name = pht('Rebuild Search Index');
+    $activity_summary = pht(
+      'The search index algorithm has been updated and the index needs '.
+      'be rebuilt.');
+
+    $message = array();
+
+    $message[] = pht(
+      'The indexing algorithm for the fulltext search index has been '.
+      'updated and the index needs to be rebuilt. Until you rebuild the '.
+      'index, global search (and other fulltext search) will not '.
+      'function correctly.');
+
+    $message[] = pht(
+      'You can rebuild the search index while Phabricator is running.');
+
+    $message[] = pht(
+      'To rebuild the index, run this command:');
+
+    $message[] = phutil_tag(
+      'pre',
+      array(),
+      (string)csprintf(
+        'phabricator/ $ ./bin/search index --all --force --background'));
+
+    $message[] = pht(
+      'You can find more information about rebuilding the search '.
+      'index here: %s',
+      phutil_tag(
+        'a',
+        array(
+          'href' => 'https://phurl.io/u/reindex',
+          'target' => '_blank',
+        ),
+        'https://phurl.io/u/reindex'));
+
+    $message[] = pht(
+      'After rebuilding the index, run this command to clear this setup '.
+      'warning:');
+
+    $message[] = phutil_tag(
+      'pre',
+      array(),
+      'phabricator/ $ ./bin/config done reindex');
+
+    $activity_message = phutil_implode_html("\n\n", $message);
+
+    $this->newIssue('manual.reindex')
+      ->setName($activity_name)
+      ->setSummary($activity_summary)
+      ->setMessage($activity_message);
+  }
+
+  private function raiseRebuildIdentitiesIssue() {
+    $activity_name = pht('Rebuild Repository Identities');
+    $activity_summary = pht(
+      'The mapping from VCS users to Phabricator users has changed '.
+      'and must be rebuilt.');
+
+    $message = array();
+
+    $message[] = pht(
+      'The way Phabricator attributes VCS activity to Phabricator users '.
+      'has changed. There is a new indirection layer between the strings '.
+      'that appear as VCS authors and committers (such as "John Developer '.
+      '<johnd@bigcorp.com>") and the Phabricator user that gets associated '.
+      'with VCS commits. This is to support situations where users '.
+      'are incorrectly associated with commits by Phabricator making bad '.
+      'guesses about the identity of the corresponding Phabricator user. '.
+      'This also helps with situations where existing repositories are '.
+      'imported without having created accounts for all the committers to '.
+      'that repository. Until you rebuild these repository identities, you '.
+      'are likely to encounter problems with future Phabricator features '.
+      'which will rely on the existence of these identities.');
+
+    $message[] = pht(
+      'You can rebuild repository identities while Phabricator is running.');
+
+    $message[] = pht(
+      'To rebuild identities, run this command:');
+
+    $message[] = phutil_tag(
+      'pre',
+      array(),
+      (string)csprintf(
+        'phabricator/ $ ./bin/repository rebuild-identities --all'));
+
+    $message[] = pht(
+      'You can find more information about this new identity mapping '.
+      'here: %s',
+      phutil_tag(
+        'a',
+        array(
+          'href' => 'https://phurl.io/u/repoIdentities',
+          'target' => '_blank',
+        ),
+        'https://phurl.io/u/repoIdentities'));
+
+    $message[] = pht(
+      'After rebuilding repository identities, run this command to clear '.
+      'this setup warning:');
+
+    $message[] = phutil_tag(
+      'pre',
+      array(),
+      'phabricator/ $ ./bin/config done identities');
+
+    $activity_message = phutil_implode_html("\n\n", $message);
+
+    $this->newIssue('manual.identities')
+      ->setName($activity_name)
+      ->setSummary($activity_summary)
+      ->setMessage($activity_message);
   }
 
 }
diff --git a/src/applications/config/storage/PhabricatorConfigManualActivity.php b/src/applications/config/storage/PhabricatorConfigManualActivity.php
index 44c26f77dd..9952021575 100644
--- a/src/applications/config/storage/PhabricatorConfigManualActivity.php
+++ b/src/applications/config/storage/PhabricatorConfigManualActivity.php
@@ -7,6 +7,8 @@ final class PhabricatorConfigManualActivity
   protected $parameters = array();
 
   const TYPE_REINDEX = 'reindex';
+  const TYPE_IDENTITIES = 'identities';
+
 
   protected function getConfiguration() {
     return array(

From e5906f4e127eb9bba62397f1228fa5d01f52ce22 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 08:21:16 -0700
Subject: [PATCH 013/125] In Differential standalone views, disable some
 keyboard shortcuts which don't work

Summary:
Ref T13164. See PHI693. In Differential, you can {nav View Options > View Standalone} to get a standalone view of a single changeset. You can also arrive here via the big changeset list for revisions affecting a huge number of files.

We currently suggest that all the keyboard shortcuts work, but some do not. In particular, the "Next File" and "Previous File" keyboard shortcuts (and some similar shortcuts) do not work. In the main view, the next/previous files are on the same page. In the standalone view, we'd need to actually change the URI.

Ideally, we should do this (and, e.g., put prev/next links on the page). As a first step toward that, hide the nonfunctional shortcuts to stop users from being misled.

Test Plan:
  - Viewed a revision in normal and standalone views.
  - No changes in normal view, and all keys still work ("N", "P", etc).
  - In standalone view, "?" no longer shows nonfunctional key commands.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19571
---
 resources/celerity/map.php                    | 32 +++++++++----------
 .../DifferentialChangesetViewController.php   |  1 +
 .../view/DifferentialChangesetListView.php    | 11 +++++++
 .../js/application/diff/DiffChangesetList.js  | 29 +++++++++++------
 .../differential/behavior-populate.js         |  3 +-
 5 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 9c0d0eda0a..12d47cd5f9 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -12,7 +12,7 @@ return array(
     'core.pkg.css' => 'f515619b',
     'core.pkg.js' => '2058ec09',
     'differential.pkg.css' => '06dc617c',
-    'differential.pkg.js' => 'ef19e026',
+    'differential.pkg.js' => '11a08e85',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'maniphest.pkg.css' => '4845691a',
@@ -373,12 +373,12 @@ return array(
     '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' => 'f0ffe8c3',
+    'rsrc/js/application/diff/DiffChangesetList.js' => '7b95a80a',
     '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',
     'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
-    'rsrc/js/application/differential/behavior-populate.js' => '419998ab',
+    'rsrc/js/application/differential/behavior-populate.js' => 'f0eb6708',
     'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
     'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => '00676f00',
     'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
@@ -594,7 +594,7 @@ return array(
     'javelin-behavior-diff-preview-link' => '051c7832',
     'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
     'javelin-behavior-differential-feedback-preview' => '51c5ad07',
-    'javelin-behavior-differential-populate' => '419998ab',
+    'javelin-behavior-differential-populate' => 'f0eb6708',
     'javelin-behavior-differential-user-select' => 'a8d8459d',
     'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
     'javelin-behavior-diffusion-commit-graph' => '75b83cbb',
@@ -752,7 +752,7 @@ return array(
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'b49b59d6',
-    'phabricator-diff-changeset-list' => 'f0ffe8c3',
+    'phabricator-diff-changeset-list' => '7b95a80a',
     'phabricator-diff-inline' => 'e83d28f3',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
@@ -1133,14 +1133,6 @@ return array(
       'javelin-workflow',
       'phabricator-draggable-list',
     ),
-    '419998ab' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'phabricator-tooltip',
-      'phabricator-diff-changeset-list',
-      'phabricator-diff-changeset',
-    ),
     '4250a34e' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1508,6 +1500,10 @@ return array(
       'owners-path-editor',
       'javelin-behavior',
     ),
+    '7b95a80a' => array(
+      'javelin-install',
+      'phuix-button-view',
+    ),
     '7cbe244b' => array(
       'javelin-install',
       'javelin-util',
@@ -2117,9 +2113,13 @@ return array(
       'javelin-workflow',
       'javelin-json',
     ),
-    'f0ffe8c3' => array(
-      'javelin-install',
-      'phuix-button-view',
+    'f0eb6708' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'phabricator-tooltip',
+      'phabricator-diff-changeset-list',
+      'phabricator-diff-changeset',
     ),
     'f1ff5494' => array(
       'phui-button-css',
diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php
index 9d02202f9f..c41f951394 100644
--- a/src/applications/differential/controller/DifferentialChangesetViewController.php
+++ b/src/applications/differential/controller/DifferentialChangesetViewController.php
@@ -276,6 +276,7 @@ final class DifferentialChangesetViewController extends DifferentialController {
       ->setDiff($diff)
       ->setTitle(pht('Standalone View'))
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setIsStandalone(true)
       ->setParser($parser);
 
     if ($revision_id) {
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
index 59f73b5465..2ed963bae3 100644
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -10,6 +10,7 @@ final class DifferentialChangesetListView extends AphrontView {
   private $whitespace;
   private $background;
   private $header;
+  private $isStandalone;
 
   private $standaloneURI;
   private $leftRawFileURI;
@@ -124,6 +125,15 @@ final class DifferentialChangesetListView extends AphrontView {
     return $this;
   }
 
+  public function setIsStandalone($is_standalone) {
+    $this->isStandalone = $is_standalone;
+    return $this;
+  }
+
+  public function getIsStandalone() {
+    return $this->isStandalone;
+  }
+
   public function setBackground($background) {
     $this->background = $background;
     return $this;
@@ -219,6 +229,7 @@ final class DifferentialChangesetListView extends AphrontView {
       'changesetViewIDs' => $ids,
       'inlineURI' => $this->inlineURI,
       'inlineListURI' => $this->inlineListURI,
+      'isStandalone' => $this->getIsStandalone(),
       '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 9e87fb0f31..66c80cb9cf 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -89,7 +89,8 @@ JX.install('DiffChangesetList', {
   properties: {
     translations: null,
     inlineURI: null,
-    inlineListURI: null
+    inlineListURI: null,
+    isStandalone: false
   },
 
   members: {
@@ -149,6 +150,12 @@ JX.install('DiffChangesetList', {
       this._initialized = true;
       var pht = this.getTranslations();
 
+      // We may be viewing the normal "/D123" view (with all the changesets)
+      // or the standalone view (with just one changeset). In the standalone
+      // view, some options (like jumping to next or previous file) do not
+      // make sense and do not function.
+      var standalone = this.getIsStandalone();
+
       var label;
 
       label = pht('Jump to next change.');
@@ -157,11 +164,13 @@ JX.install('DiffChangesetList', {
       label = pht('Jump to previous change.');
       this._installJumpKey('k', label, -1);
 
-      label = pht('Jump to next file.');
-      this._installJumpKey('J', label, 1, 'file');
+      if (!standalone) {
+        label = pht('Jump to next file.');
+        this._installJumpKey('J', label, 1, 'file');
 
-      label = pht('Jump to previous file.');
-      this._installJumpKey('K', label, -1, 'file');
+        label = pht('Jump to previous file.');
+        this._installJumpKey('K', label, -1, 'file');
+      }
 
       label = pht('Jump to next inline comment.');
       this._installJumpKey('n', label, 1, 'comment');
@@ -176,11 +185,13 @@ JX.install('DiffChangesetList', {
         'Jump to previous inline comment, including collapsed comments.');
       this._installJumpKey('P', label, -1, 'comment', true);
 
-      label = pht('Hide or show the current file.');
-      this._installKey('h', label, this._onkeytogglefile);
+      if (!standalone) {
+        label = pht('Hide or show the current file.');
+        this._installKey('h', label, this._onkeytogglefile);
 
-      label = pht('Jump to the table of contents.');
-      this._installKey('t', label, this._ontoc);
+        label = pht('Jump to the table of contents.');
+        this._installKey('t', label, this._ontoc);
+      }
 
       label = pht('Reply to selected inline comment or change.');
       this._installKey('r', label, JX.bind(this, this._onkeyreply, false));
diff --git a/webroot/rsrc/js/application/differential/behavior-populate.js b/webroot/rsrc/js/application/differential/behavior-populate.js
index 0a4a7912e4..5b415fd131 100644
--- a/webroot/rsrc/js/application/differential/behavior-populate.js
+++ b/webroot/rsrc/js/application/differential/behavior-populate.js
@@ -61,7 +61,8 @@ JX.behavior('differential-populate', function(config, statics) {
   var changeset_list = new JX.DiffChangesetList()
     .setTranslations(JX.phtize(config.pht))
     .setInlineURI(config.inlineURI)
-    .setInlineListURI(config.inlineListURI);
+    .setInlineListURI(config.inlineListURI)
+    .setIsStandalone(config.isStandalone);
 
   // Install and activate the current page.
   var page_id = JX.Quicksand.getCurrentPageID();

From b86dae6214ffccc0fec4bd29ea9b054f9eaa3ac3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 09:25:41 -0700
Subject: [PATCH 014/125] Fix an issue with error handling when no mailers are
 available

Summary:
Ref T13164. See PHI785. See D19546. I think I didn't test the updated error messaging here entirely properly, since I have some tasks in queue which error out here ("Missing argument 1 to newMailers(...)").

This is an error condition already, but we want to get through this call so we can raise a tailored message.

Test Plan: Tasks which errored out here now succeed. This condition is only reachable if you misconfigure things in the first place.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

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

diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
index d757868483..e7ebf6dc83 100644
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -621,7 +621,7 @@ final class PhabricatorMetaMTAMail
 
   public function sendWithMailers(array $mailers) {
     if (!$mailers) {
-      $any_mailers = self::newMailers();
+      $any_mailers = self::newMailers(array());
 
       // NOTE: We can end up here with some custom list of "$mailers", like
       // from a unit test. In that case, this message could be misleading. We

From fb3ae72e367f5ec57c706593d67975c4630463c6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 09:31:13 -0700
Subject: [PATCH 015/125] When cancelling addition of an Almanac interface,
 return to the Device page

Summary:
Fixes T13184. In Almanac, interfaces are always added to devices. However, if you "Add New Interface" and then "Cancel", you go to the nonexistent `/interface/` page.

Instead, return to the device page.

Test Plan: From a device page, clicked "Add Interface" and then "Cancel". Ended up back where I was.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13184

Differential Revision: https://secure.phabricator.com/D19573
---
 src/applications/almanac/editor/AlmanacInterfaceEditEngine.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php b/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php
index 2c68ed0374..30c371d6f9 100644
--- a/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php
+++ b/src/applications/almanac/editor/AlmanacInterfaceEditEngine.php
@@ -127,6 +127,9 @@ final class AlmanacInterfaceEditEngine
   }
 
   protected function getObjectCreateCancelURI($object) {
+    if ($this->getDevice()) {
+      return $this->getDevice()->getURI();
+    }
     return '/almanac/interface/';
   }
 

From 92a29f72c14c3f4329c337df0706849eb75e06e5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 09:49:22 -0700
Subject: [PATCH 016/125] Make the Drydock repository operation page slightly
 richer

Summary:
Ref T13164. See PHI788. The issue requests a "created" timestamp.

Also add filtering for repository, state, and author.

Test Plan:
Used all filters.

{F5795085}

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19574
---
 .../query/DrydockRepositoryOperationQuery.php | 13 +++++++
 ...DrydockRepositoryOperationSearchEngine.php | 34 +++++++++++++++++++
 .../storage/DrydockRepositoryOperation.php    | 17 ++++++----
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/applications/drydock/query/DrydockRepositoryOperationQuery.php b/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
index 570e68e825..fb1f6583a8 100644
--- a/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
+++ b/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
@@ -9,6 +9,7 @@ final class DrydockRepositoryOperationQuery extends DrydockQuery {
   private $operationStates;
   private $operationTypes;
   private $isDismissed;
+  private $authorPHIDs;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
@@ -45,6 +46,11 @@ final class DrydockRepositoryOperationQuery extends DrydockQuery {
     return $this;
   }
 
+  public function withAuthorPHIDs(array $phids) {
+    $this->authorPHIDs = $phids;
+    return $this;
+  }
+
   public function newResultObject() {
     return new DrydockRepositoryOperation();
   }
@@ -165,6 +171,13 @@ final class DrydockRepositoryOperationQuery extends DrydockQuery {
         (int)$this->isDismissed);
     }
 
+    if ($this->authorPHIDs !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'authorPHID IN (%Ls)',
+        $this->authorPHIDs);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/drydock/query/DrydockRepositoryOperationSearchEngine.php b/src/applications/drydock/query/DrydockRepositoryOperationSearchEngine.php
index 1de32be28f..eeb85329bf 100644
--- a/src/applications/drydock/query/DrydockRepositoryOperationSearchEngine.php
+++ b/src/applications/drydock/query/DrydockRepositoryOperationSearchEngine.php
@@ -18,11 +18,41 @@ final class DrydockRepositoryOperationSearchEngine
   protected function buildQueryFromParameters(array $map) {
     $query = $this->newQuery();
 
+    if ($map['repositoryPHIDs']) {
+      $query->withRepositoryPHIDs($map['repositoryPHIDs']);
+    }
+
+    if ($map['authorPHIDs']) {
+      $query->withAuthorPHIDs($map['authorPHIDs']);
+    }
+
+    if ($map['states']) {
+      $query->withOperationStates($map['states']);
+    }
+
     return $query;
   }
 
   protected function buildCustomSearchFields() {
     return array(
+      id(new PhabricatorSearchDatasourceField())
+        ->setLabel(pht('Repositories'))
+        ->setKey('repositoryPHIDs')
+        ->setAliases(array('repository', 'repositories', 'repositoryPHID'))
+        ->setDatasource(new DiffusionRepositoryFunctionDatasource()),
+
+      // NOTE: Repository operations aren't necessarily created by a real
+      // user, but for now they normally are. Just use a user typeahead until
+      // more use cases arise.
+      id(new PhabricatorUsersSearchField())
+        ->setLabel(pht('Authors'))
+        ->setKey('authorPHIDs')
+        ->setAliases(array('author', 'authors', 'authorPHID')),
+      id(new PhabricatorSearchCheckboxesField())
+        ->setLabel(pht('States'))
+        ->setKey('states')
+        ->setAliases(array('state'))
+        ->setOptions(DrydockRepositoryOperation::getOperationStateNameMap()),
     );
   }
 
@@ -72,6 +102,10 @@ final class DrydockRepositoryOperationSearchEngine
 
       $item->setStatusIcon($icon, $name);
 
+
+      $created = phabricator_datetime($operation->getDateCreated(), $viewer);
+      $item->addIcon(null, $created);
+
       $item->addByline(
         array(
           pht('Via:'),
diff --git a/src/applications/drydock/storage/DrydockRepositoryOperation.php b/src/applications/drydock/storage/DrydockRepositoryOperation.php
index 190b5b1310..4e25280c3f 100644
--- a/src/applications/drydock/storage/DrydockRepositoryOperation.php
+++ b/src/applications/drydock/storage/DrydockRepositoryOperation.php
@@ -99,6 +99,15 @@ final class DrydockRepositoryOperation extends DrydockDAO
     return $this;
   }
 
+  public static function getOperationStateNameMap() {
+    return array(
+      self::STATE_WAIT => pht('Waiting'),
+      self::STATE_WORK => pht('Working'),
+      self::STATE_DONE => pht('Done'),
+      self::STATE_FAIL => pht('Failed'),
+    );
+  }
+
   public static function getOperationStateIcon($state) {
     $map = array(
       self::STATE_WAIT => 'fa-clock-o',
@@ -111,13 +120,7 @@ final class DrydockRepositoryOperation extends DrydockDAO
   }
 
   public static function getOperationStateName($state) {
-    $map = array(
-      self::STATE_WAIT => pht('Waiting'),
-      self::STATE_WORK => pht('Working'),
-      self::STATE_DONE => pht('Done'),
-      self::STATE_FAIL => pht('Failed'),
-    );
-
+    $map = self::getOperationStateNameMap();
     return idx($map, $state, pht('<Unknown: %s>', $state));
   }
 

From 9a15129b402fd7a15e81df3b5fe6fdf4a68d1ae0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 11:35:02 -0700
Subject: [PATCH 017/125] Remove 750ms timeout on owners path validation

Summary:
Ref T13164. See PHI748. Path validation has a 750ms timeout which blames to rP5038ab850c, in 2011.

Production path validation is sometimes taking more than 750ms, particularly on the initial page load where we may validate many paths simultaneously.

I have no idea why we have this timeout, and it isn't consistent with how we perform other AJAX requests. Just remove it.

Test Plan:
  - Reproduced issue in production, saw all validation calls failing at 750ms. Actual underlying calls succeed, they just take more than 750ms to resolve.
  - Loaded path validator locally, got green checkmark.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19575
---
 resources/celerity/map.php                    | 20 +++++++++----------
 .../js/application/herald/PathTypeahead.js    |  2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 12d47cd5f9..2b81560e43 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -393,7 +393,7 @@ return array(
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
     '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/PathTypeahead.js' => '6d8c7912',
     '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',
@@ -739,7 +739,7 @@ return array(
     'owners-path-editor' => 'c96502cf',
     'owners-path-editor-css' => '9c136c29',
     'paste-css' => '9fcc9773',
-    'path-typeahead' => '662e9cea',
+    'path-typeahead' => '6d8c7912',
     'people-picture-menu-item-css' => 'a06f7f34',
     'people-profile-css' => '4df76faf',
     'phabricator-action-list-view-css' => '0bcd9a45',
@@ -1353,14 +1353,6 @@ return array(
       'javelin-workflow',
       'javelin-dom',
     ),
-    '662e9cea' => array(
-      'javelin-install',
-      'javelin-typeahead',
-      'javelin-dom',
-      'javelin-request',
-      'javelin-typeahead-ondemand-source',
-      'javelin-util',
-    ),
     66888767 => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1436,6 +1428,14 @@ return array(
       'javelin-typeahead',
       'javelin-uri',
     ),
+    '6d8c7912' => array(
+      'javelin-install',
+      'javelin-typeahead',
+      'javelin-dom',
+      'javelin-request',
+      'javelin-typeahead-ondemand-source',
+      'javelin-util',
+    ),
     '70baed2f' => array(
       'javelin-install',
       'javelin-dom',
diff --git a/webroot/rsrc/js/application/herald/PathTypeahead.js b/webroot/rsrc/js/application/herald/PathTypeahead.js
index 0ce9823d13..eed6e62b62 100644
--- a/webroot/rsrc/js/application/herald/PathTypeahead.js
+++ b/webroot/rsrc/js/application/herald/PathTypeahead.js
@@ -208,8 +208,6 @@ JX.install('PathTypeahead', {
 
       this._validationInflight = validation_request;
       JX.DOM.setContent(error_display, JX.$H(this._icons.test));
-
-      validation_request.setTimeout(750);
       validation_request.send();
     }
   }

From 3b05e920e0094af372416839f36e34fc9af2458a Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Mon, 13 Aug 2018 14:21:56 -0700
Subject: [PATCH 018/125] Start changing DiffusionCommitController to use
 identities

Summary: Depends on D19491.

Test Plan: Viewed some commits where the identity was mapped to a user and another that wasn't; saw the header render either a link to the user or the identity object.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19492
---
 .../controller/DiffusionCommitController.php  | 32 +++------
 .../storage/PhabricatorRepositoryCommit.php   | 71 +++++++++++++++++++
 .../storage/PhabricatorRepositoryIdentity.php |  8 +++
 3 files changed, 87 insertions(+), 24 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 67ffb73357..a6743b6557 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -46,6 +46,7 @@ final class DiffusionCommitController extends DiffusionController {
       ->needCommitData(true)
       ->needAuditRequests(true)
       ->setLimit(100)
+      ->needIdentities(true)
       ->execute();
 
     $multiple_results = count($commits) > 1;
@@ -504,15 +505,13 @@ final class DiffusionCommitController extends DiffusionController {
 
     $phids = $edge_query->getDestinationPHIDs(array($commit_phid));
 
-    if ($data->getCommitDetail('authorPHID')) {
-      $phids[] = $data->getCommitDetail('authorPHID');
-    }
+
     if ($data->getCommitDetail('reviewerPHID')) {
       $phids[] = $data->getCommitDetail('reviewerPHID');
     }
-    if ($data->getCommitDetail('committerPHID')) {
-      $phids[] = $data->getCommitDetail('committerPHID');
-    }
+
+    $phids[] = $commit->getCommitterDisplayPHID();
+    $phids[] = $commit->getAuthorDisplayPHID();
 
     // NOTE: We should never normally have more than a single push log, but
     // it can occur naturally if a commit is pushed, then the branch it was
@@ -573,24 +572,11 @@ final class DiffusionCommitController extends DiffusionController {
       }
     }
 
-    $author_phid = $data->getCommitDetail('authorPHID');
-    $author_name = $data->getAuthorName();
     $author_epoch = $data->getCommitDetail('authorEpoch');
 
     $committed_info = id(new PHUIStatusItemView())
-      ->setNote(phabricator_datetime($commit->getEpoch(), $viewer));
-
-    $committer_phid = $data->getCommitDetail('committerPHID');
-    $committer_name = $data->getCommitDetail('committer');
-    if ($committer_phid) {
-      $committed_info->setTarget($handles[$committer_phid]->renderLink());
-    } else if (strlen($committer_name)) {
-      $committed_info->setTarget($committer_name);
-    } else if ($author_phid) {
-      $committed_info->setTarget($handles[$author_phid]->renderLink());
-    } else if (strlen($author_name)) {
-      $committed_info->setTarget($author_name);
-    }
+      ->setNote(phabricator_datetime($commit->getEpoch(), $viewer))
+      ->setTarget($commit->renderAnyCommitter($viewer, $handles));
 
     $committed_list = new PHUIStatusListView();
     $committed_list->addItem($committed_info);
@@ -716,7 +702,7 @@ final class DiffusionCommitController extends DiffusionController {
       return null;
     }
 
-    $author_phid = $data->getCommitDetail('authorPHID');
+    $author_phid = $commit->getAuthorDisplayPHID();
     $author_name = $data->getAuthorName();
     $author_epoch = $data->getCommitDetail('authorEpoch');
     $date = null;
@@ -748,10 +734,8 @@ final class DiffusionCommitController extends DiffusionController {
       ->setImage($image_uri)
       ->setImageHref($image_href)
       ->setContent($content);
-
   }
 
-
   private function buildComments(PhabricatorRepositoryCommit $commit) {
     $timeline = $this->buildTransactionTimeline(
       $commit,
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index cf88c0eb54..8ad182ee7b 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -439,6 +439,77 @@ final class PhabricatorRepositoryCommit
     return $repository->formatCommitName($identifier, $local = true);
   }
 
+  /**
+   * Make a strong effort to find a way to render this commit's committer.
+   * This currently attempts to use @{PhabricatorRepositoryIdentity}, and
+   * falls back to examining the commit detail information. After we force
+   * the migration to using identities, update this method to remove the
+   * fallback. See T12164 for details.
+   */
+  public function renderAnyCommitter(PhabricatorUser $viewer, array $handles) {
+    $committer = $this->renderCommitter($viewer, $handles);
+    if ($committer) {
+      return $committer;
+    }
+
+    return $this->renderAuthor($viewer, $handles);
+  }
+
+  public function renderCommitter(PhabricatorUser $viewer, array $handles) {
+    $committer_phid = $this->getCommitterDisplayPHID();
+    if ($committer_phid) {
+      return $handles[$committer_phid]->renderLink();
+    }
+
+    $data = $this->getCommitData();
+    $committer_name = $data->getCommitDetail('committer');
+    if (strlen($committer_name)) {
+      return $committer_name;
+    }
+
+    return null;
+  }
+
+  public function renderAuthor(PhabricatorUser $viewer, array $handles) {
+    $author_phid = $this->getAuthorDisplayPHID();
+    if ($author_phid) {
+      return $handles[$author_phid]->renderLink();
+    }
+
+    $data = $this->getCommitData();
+    $author_name = $data->getAuthorName();
+    if (strlen($author_name)) {
+      return $author_name;
+    }
+
+    return null;
+  }
+
+  public function hasCommitterIdentity() {
+    return ($this->getCommitterIdentity() !== null);
+  }
+
+  public function hasAuthorIdentity() {
+    return ($this->getAuthorIdentity() !== null);
+  }
+
+  public function getCommitterDisplayPHID() {
+    if ($this->hasCommitterIdentity()) {
+      return $this->getCommitterIdentity()->getIdentityDisplayPHID();
+    }
+
+    $data = $this->getCommitData();
+    return $data->getCommitDetail('committerPHID');
+  }
+
+  public function getAuthorDisplayPHID() {
+    if ($this->hasAuthorIdentity()) {
+      return $this->getAuthorIdentity()->getIdentityDisplayPHID();
+    }
+
+    $data = $this->getCommitData();
+    return $data->getCommitDetail('authorPHID');
+  }
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryIdentity.php b/src/applications/repository/storage/PhabricatorRepositoryIdentity.php
index bf421692a0..f801e06b89 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryIdentity.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryIdentity.php
@@ -78,6 +78,14 @@ final class PhabricatorRepositoryIdentity
     return ($this->currentEffectiveUserPHID != null);
   }
 
+  public function getIdentityDisplayPHID() {
+    if ($this->hasEffectiveUser()) {
+      return $this->getCurrentEffectiveUserPHID();
+    } else {
+      return $this->getPHID();
+    }
+  }
+
   public function save() {
     if ($this->manuallySetUserPHID) {
       $this->currentEffectiveUserPHID = $this->manuallySetUserPHID;

From cc1def6ceaab41483103919e94bd227da01f5cdc Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Mon, 13 Aug 2018 15:37:04 -0700
Subject: [PATCH 019/125] Remove some array typehints for passing  around

Summary: See discussion at https://secure.phabricator.com/D19492#241996

Test Plan: Refreshed a few Diffusion tabs; nothing broke.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19578
---
 .../repository/storage/PhabricatorRepositoryCommit.php      | 6 +++---
 .../subscriptions/view/SubscriptionListDialogBuilder.php    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 8ad182ee7b..bf3b796a76 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -446,7 +446,7 @@ final class PhabricatorRepositoryCommit
    * the migration to using identities, update this method to remove the
    * fallback. See T12164 for details.
    */
-  public function renderAnyCommitter(PhabricatorUser $viewer, array $handles) {
+  public function renderAnyCommitter(PhabricatorUser $viewer, $handles) {
     $committer = $this->renderCommitter($viewer, $handles);
     if ($committer) {
       return $committer;
@@ -455,7 +455,7 @@ final class PhabricatorRepositoryCommit
     return $this->renderAuthor($viewer, $handles);
   }
 
-  public function renderCommitter(PhabricatorUser $viewer, array $handles) {
+  public function renderCommitter(PhabricatorUser $viewer, $handles) {
     $committer_phid = $this->getCommitterDisplayPHID();
     if ($committer_phid) {
       return $handles[$committer_phid]->renderLink();
@@ -470,7 +470,7 @@ final class PhabricatorRepositoryCommit
     return null;
   }
 
-  public function renderAuthor(PhabricatorUser $viewer, array $handles) {
+  public function renderAuthor(PhabricatorUser $viewer, $handles) {
     $author_phid = $this->getAuthorDisplayPHID();
     if ($author_phid) {
       return $handles[$author_phid]->renderLink();
diff --git a/src/applications/subscriptions/view/SubscriptionListDialogBuilder.php b/src/applications/subscriptions/view/SubscriptionListDialogBuilder.php
index 7d1b8d799c..da157848ea 100644
--- a/src/applications/subscriptions/view/SubscriptionListDialogBuilder.php
+++ b/src/applications/subscriptions/view/SubscriptionListDialogBuilder.php
@@ -58,7 +58,7 @@ final class SubscriptionListDialogBuilder extends Phobject {
       ->addCancelButton($object_handle->getURI(), pht('Close'));
   }
 
-  private function buildBody(PhabricatorUser $viewer, array $handles) {
+  private function buildBody(PhabricatorUser $viewer, $handles) {
 
     $list = id(new PHUIObjectItemListView())
       ->setUser($viewer);

From ba25586016b2b6731860ab1c682ddeba65eed0bb Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Thu, 16 Aug 2018 06:39:07 +1000
Subject: [PATCH 020/125] Improve symbol generation scripts

Summary: Currently the symbol generation scripts fail if passed a list containing no files because `explode("\n", $input)` returns `array("")` rather than `array()`. This means that a generic Harbormaster Build Plan with a step which executes `find . -type f -name '*.php' | ./scripts/generate_php_symbols.php` won't work because it fails in repositories that don't contain any PHP code.

Test Plan: Ran `echo | generate_php_symbols` and saw no output instead of an exception.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19588
---
 scripts/symbols/generate_ctags_symbols.php | 4 ++++
 scripts/symbols/generate_php_symbols.php   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/scripts/symbols/generate_ctags_symbols.php b/scripts/symbols/generate_ctags_symbols.php
index 8d77bfc478..e93b0c5cbc 100755
--- a/scripts/symbols/generate_ctags_symbols.php
+++ b/scripts/symbols/generate_ctags_symbols.php
@@ -39,6 +39,10 @@ $data = array();
 $futures = array();
 
 foreach (explode("\n", trim($input)) as $file) {
+  if (!strlen($file)) {
+    continue;
+  }
+
   $file = Filesystem::readablePath($file);
   $futures[$file] = ctags_get_parser_future($file);
 }
diff --git a/scripts/symbols/generate_php_symbols.php b/scripts/symbols/generate_php_symbols.php
index db8412764e..af87d580d8 100755
--- a/scripts/symbols/generate_php_symbols.php
+++ b/scripts/symbols/generate_php_symbols.php
@@ -27,6 +27,10 @@ $data = array();
 $futures = array();
 
 foreach (explode("\n", trim($input)) as $file) {
+  if (!strlen($file)) {
+    continue;
+  }
+
   $file = Filesystem::readablePath($file);
   $data[$file] = Filesystem::readFile($file);
   $futures[$file] = PhutilXHPASTBinary::getParserFuture($data[$file]);

From 39d415e90eb3111c04cadee78045048bf3c4ec03 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 14:05:47 -0700
Subject: [PATCH 021/125] Move users to modular transactions

Summary:
Ref T13164. See PHI642. I'd like to provide a third-generation `user.edit` API endpoint and make `user.enable` and `user.disable` obsolete before meddling with policy details, even if it isn't full-fledged yet.

Users do already have a transactions table and a Transaction-based editor, but it's only used for editing title, real name, etc. All of these are custom fields, so their support comes in automatically through CustomField extension code.

Realign it for modular transactions so new code will be fully modern. There are no actual standalone transaction types yet so this diff is pretty thin.

Test Plan:
  - Grepped for `UserProfileEditor`.
  - Edited a user's title/real name/icon.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19576
---
 src/__phutil_library_map__.php                            | 8 +++++---
 .../controller/PhabricatorPeopleProfileEditController.php | 5 ++---
 ...ileEditor.php => PhabricatorUserTransactionEditor.php} | 5 ++---
 src/applications/people/storage/PhabricatorUser.php       | 2 +-
 .../people/storage/PhabricatorUserTransaction.php         | 6 +++++-
 .../people/xaction/PhabricatorUserTransactionType.php     | 4 ++++
 6 files changed, 19 insertions(+), 11 deletions(-)
 rename src/applications/people/editor/{PhabricatorUserProfileEditor.php => PhabricatorUserTransactionEditor.php} (73%)
 create mode 100644 src/applications/people/xaction/PhabricatorUserTransactionType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index bd4cfef6c2..47ea4e8bf1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4583,7 +4583,6 @@ phutil_register_library_map(array(
     'PhabricatorUserPreferencesTransaction' => 'applications/settings/storage/PhabricatorUserPreferencesTransaction.php',
     'PhabricatorUserPreferencesTransactionQuery' => 'applications/settings/query/PhabricatorUserPreferencesTransactionQuery.php',
     'PhabricatorUserProfile' => 'applications/people/storage/PhabricatorUserProfile.php',
-    'PhabricatorUserProfileEditor' => 'applications/people/editor/PhabricatorUserProfileEditor.php',
     'PhabricatorUserProfileImageCacheType' => 'applications/people/cache/PhabricatorUserProfileImageCacheType.php',
     'PhabricatorUserRealNameField' => 'applications/people/customfield/PhabricatorUserRealNameField.php',
     'PhabricatorUserRolesField' => 'applications/people/customfield/PhabricatorUserRolesField.php',
@@ -4593,6 +4592,8 @@ phutil_register_library_map(array(
     'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php',
     'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php',
     'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php',
+    'PhabricatorUserTransactionEditor' => 'applications/people/editor/PhabricatorUserTransactionEditor.php',
+    'PhabricatorUserTransactionType' => 'applications/people/xaction/PhabricatorUserTransactionType.php',
     'PhabricatorUsersEditField' => 'applications/transactions/editfield/PhabricatorUsersEditField.php',
     'PhabricatorUsersPolicyRule' => 'applications/people/policyrule/PhabricatorUsersPolicyRule.php',
     'PhabricatorUsersSearchField' => 'applications/people/searchfield/PhabricatorUsersSearchField.php',
@@ -10575,7 +10576,6 @@ phutil_register_library_map(array(
     'PhabricatorUserPreferencesTransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorUserPreferencesTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorUserProfile' => 'PhabricatorUserDAO',
-    'PhabricatorUserProfileEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorUserProfileImageCacheType' => 'PhabricatorUserCacheType',
     'PhabricatorUserRealNameField' => 'PhabricatorUserCustomField',
     'PhabricatorUserRolesField' => 'PhabricatorUserCustomField',
@@ -10584,7 +10584,9 @@ phutil_register_library_map(array(
     'PhabricatorUserStatusField' => 'PhabricatorUserCustomField',
     'PhabricatorUserTestCase' => 'PhabricatorTestCase',
     'PhabricatorUserTitleField' => 'PhabricatorUserCustomField',
-    'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction',
+    'PhabricatorUserTransaction' => 'PhabricatorModularTransaction',
+    'PhabricatorUserTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
+    'PhabricatorUserTransactionType' => 'PhabricatorModularTransactionType',
     'PhabricatorUsersEditField' => 'PhabricatorTokenizerEditField',
     'PhabricatorUsersPolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorUsersSearchField' => 'PhabricatorSearchTokenizerField',
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
index 3eda8a968b..4876f4495d 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
@@ -38,10 +38,9 @@ final class PhabricatorPeopleProfileEditController
         new PhabricatorUserTransaction(),
         $request);
 
-      $editor = id(new PhabricatorUserProfileEditor())
+      $editor = id(new PhabricatorUserTransactionEditor())
         ->setActor($viewer)
-        ->setContentSource(
-          PhabricatorContentSource::newFromRequest($request))
+        ->setContentSourceFromRequest($request)
         ->setContinueOnNoEffect(true);
 
       try {
diff --git a/src/applications/people/editor/PhabricatorUserProfileEditor.php b/src/applications/people/editor/PhabricatorUserTransactionEditor.php
similarity index 73%
rename from src/applications/people/editor/PhabricatorUserProfileEditor.php
rename to src/applications/people/editor/PhabricatorUserTransactionEditor.php
index 9ec02ba2af..c0dfa941af 100644
--- a/src/applications/people/editor/PhabricatorUserProfileEditor.php
+++ b/src/applications/people/editor/PhabricatorUserTransactionEditor.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorUserProfileEditor
+final class PhabricatorUserTransactionEditor
   extends PhabricatorApplicationTransactionEditor {
 
   public function getEditorApplicationClass() {
@@ -8,8 +8,7 @@ final class PhabricatorUserProfileEditor
   }
 
   public function getEditorObjectsDescription() {
-    return pht('User Profiles');
+    return pht('Users');
   }
 
-
 }
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index ba8b1cf292..03da9dee04 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -1362,7 +1362,7 @@ final class PhabricatorUser
 
 
   public function getApplicationTransactionEditor() {
-    return new PhabricatorUserProfileEditor();
+    return new PhabricatorUserTransactionEditor();
   }
 
   public function getApplicationTransactionObject() {
diff --git a/src/applications/people/storage/PhabricatorUserTransaction.php b/src/applications/people/storage/PhabricatorUserTransaction.php
index b4bd1c9865..24edb2f5b5 100644
--- a/src/applications/people/storage/PhabricatorUserTransaction.php
+++ b/src/applications/people/storage/PhabricatorUserTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorUserTransaction
-  extends PhabricatorApplicationTransaction {
+  extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'user';
@@ -15,4 +15,8 @@ final class PhabricatorUserTransaction
     return null;
   }
 
+  public function getBaseTransactionClass() {
+    return 'PhabricatorUserTransactionType';
+  }
+
 }
diff --git a/src/applications/people/xaction/PhabricatorUserTransactionType.php b/src/applications/people/xaction/PhabricatorUserTransactionType.php
new file mode 100644
index 0000000000..89392fd039
--- /dev/null
+++ b/src/applications/people/xaction/PhabricatorUserTransactionType.php
@@ -0,0 +1,4 @@
+<?php
+
+abstract class PhabricatorUserTransactionType
+  extends PhabricatorModularTransactionType {}

From 65904d7c51370d2bfba7a8cb910d9e052ab769b7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 14:18:37 -0700
Subject: [PATCH 022/125] Add a modern "user.edit" API method for users

Summary:
Depends on D19576. Ref T13164. See PHI642. This adds an EditEngine for users and a `user.edit` modern API method.

For now, all it supports is editing real name, blurb, title, and icon (same as "Edit Profile" from the UI).

Test Plan:
  - Edited my stuff via the new API method.
  - Tried to edit another user, got rejected by policies.
  - Tried to create a user, got rejected by policies.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19577
---
 src/__phutil_library_map__.php                |  4 ++
 .../conduit/UserEditConduitAPIMethod.php      | 20 ++++++
 .../customfield/PhabricatorUserBlurbField.php | 21 ++++++
 .../customfield/PhabricatorUserIconField.php  | 21 ++++++
 .../PhabricatorUserRealNameField.php          | 21 ++++++
 .../customfield/PhabricatorUserTitleField.php | 21 ++++++
 .../editor/PhabricatorUserEditEngine.php      | 70 +++++++++++++++++++
 7 files changed, 178 insertions(+)
 create mode 100644 src/applications/people/conduit/UserEditConduitAPIMethod.php
 create mode 100644 src/applications/people/editor/PhabricatorUserEditEngine.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 47ea4e8bf1..628f4958b5 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4562,6 +4562,7 @@ phutil_register_library_map(array(
     'PhabricatorUserCustomFieldNumericIndex' => 'applications/people/storage/PhabricatorUserCustomFieldNumericIndex.php',
     'PhabricatorUserCustomFieldStringIndex' => 'applications/people/storage/PhabricatorUserCustomFieldStringIndex.php',
     'PhabricatorUserDAO' => 'applications/people/storage/PhabricatorUserDAO.php',
+    'PhabricatorUserEditEngine' => 'applications/people/editor/PhabricatorUserEditEngine.php',
     'PhabricatorUserEditor' => 'applications/people/editor/PhabricatorUserEditor.php',
     'PhabricatorUserEditorTestCase' => 'applications/people/editor/__tests__/PhabricatorUserEditorTestCase.php',
     'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php',
@@ -5233,6 +5234,7 @@ phutil_register_library_map(array(
     'TransactionSearchConduitAPIMethod' => 'applications/transactions/conduit/TransactionSearchConduitAPIMethod.php',
     'UserConduitAPIMethod' => 'applications/people/conduit/UserConduitAPIMethod.php',
     'UserDisableConduitAPIMethod' => 'applications/people/conduit/UserDisableConduitAPIMethod.php',
+    'UserEditConduitAPIMethod' => 'applications/people/conduit/UserEditConduitAPIMethod.php',
     'UserEnableConduitAPIMethod' => 'applications/people/conduit/UserEnableConduitAPIMethod.php',
     'UserFindConduitAPIMethod' => 'applications/people/conduit/UserFindConduitAPIMethod.php',
     'UserQueryConduitAPIMethod' => 'applications/people/conduit/UserQueryConduitAPIMethod.php',
@@ -10547,6 +10549,7 @@ phutil_register_library_map(array(
     'PhabricatorUserCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
     'PhabricatorUserCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
     'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorUserEditEngine' => 'PhabricatorEditEngine',
     'PhabricatorUserEditor' => 'PhabricatorEditor',
     'PhabricatorUserEditorTestCase' => 'PhabricatorTestCase',
     'PhabricatorUserEmail' => 'PhabricatorUserDAO',
@@ -11388,6 +11391,7 @@ phutil_register_library_map(array(
     'TransactionSearchConduitAPIMethod' => 'ConduitAPIMethod',
     'UserConduitAPIMethod' => 'ConduitAPIMethod',
     'UserDisableConduitAPIMethod' => 'UserConduitAPIMethod',
+    'UserEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'UserEnableConduitAPIMethod' => 'UserConduitAPIMethod',
     'UserFindConduitAPIMethod' => 'UserConduitAPIMethod',
     'UserQueryConduitAPIMethod' => 'UserConduitAPIMethod',
diff --git a/src/applications/people/conduit/UserEditConduitAPIMethod.php b/src/applications/people/conduit/UserEditConduitAPIMethod.php
new file mode 100644
index 0000000000..edc4204c3b
--- /dev/null
+++ b/src/applications/people/conduit/UserEditConduitAPIMethod.php
@@ -0,0 +1,20 @@
+<?php
+
+final class UserEditConduitAPIMethod
+  extends PhabricatorEditEngineAPIMethod {
+
+  public function getAPIMethodName() {
+    return 'user.edit';
+  }
+
+  public function newEditEngine() {
+    return new PhabricatorUserEditEngine();
+  }
+
+  public function getMethodSummary() {
+    return pht(
+      'Apply transactions to edit a user. (Users can not be created via '.
+      'the API.)');
+  }
+
+}
diff --git a/src/applications/people/customfield/PhabricatorUserBlurbField.php b/src/applications/people/customfield/PhabricatorUserBlurbField.php
index 04fb419918..222061ad04 100644
--- a/src/applications/people/customfield/PhabricatorUserBlurbField.php
+++ b/src/applications/people/customfield/PhabricatorUserBlurbField.php
@@ -9,6 +9,14 @@ final class PhabricatorUserBlurbField
     return 'user:blurb';
   }
 
+  public function getModernFieldKey() {
+    return 'blurb';
+  }
+
+  public function getFieldKeyForConduit() {
+    return $this->getModernFieldKey();
+  }
+
   public function getFieldName() {
     return pht('Blurb');
   }
@@ -50,6 +58,11 @@ final class PhabricatorUserBlurbField
     $this->value = $request->getStr($this->getFieldKey());
   }
 
+  public function setValueFromStorage($value) {
+    $this->value = $value;
+    return $this;
+  }
+
   public function renderEditControl(array $handles) {
     return id(new PhabricatorRemarkupControl())
       ->setUser($this->getViewer())
@@ -85,4 +98,12 @@ final class PhabricatorUserBlurbField
     return 'block';
   }
 
+  public function shouldAppearInConduitTransactions() {
+    return true;
+  }
+
+  protected function newConduitEditParameterType() {
+    return new ConduitStringParameterType();
+  }
+
 }
diff --git a/src/applications/people/customfield/PhabricatorUserIconField.php b/src/applications/people/customfield/PhabricatorUserIconField.php
index a3f43cb7bf..0b25a9dd81 100644
--- a/src/applications/people/customfield/PhabricatorUserIconField.php
+++ b/src/applications/people/customfield/PhabricatorUserIconField.php
@@ -9,6 +9,14 @@ final class PhabricatorUserIconField
     return 'user:icon';
   }
 
+  public function getModernFieldKey() {
+    return 'icon';
+  }
+
+  public function getFieldKeyForConduit() {
+    return $this->getModernFieldKey();
+  }
+
   public function getFieldName() {
     return pht('Icon');
   }
@@ -50,6 +58,11 @@ final class PhabricatorUserIconField
     $this->value = $request->getStr($this->getFieldKey());
   }
 
+  public function setValueFromStorage($value) {
+    $this->value = $value;
+    return $this;
+  }
+
   public function renderEditControl(array $handles) {
     return id(new PHUIFormIconSetControl())
       ->setName($this->getFieldKey())
@@ -58,4 +71,12 @@ final class PhabricatorUserIconField
       ->setIconSet(new PhabricatorPeopleIconSet());
   }
 
+  public function shouldAppearInConduitTransactions() {
+    return true;
+  }
+
+  protected function newConduitEditParameterType() {
+    return new ConduitStringParameterType();
+  }
+
 }
diff --git a/src/applications/people/customfield/PhabricatorUserRealNameField.php b/src/applications/people/customfield/PhabricatorUserRealNameField.php
index 90e490fc3b..e7e610fb07 100644
--- a/src/applications/people/customfield/PhabricatorUserRealNameField.php
+++ b/src/applications/people/customfield/PhabricatorUserRealNameField.php
@@ -9,6 +9,14 @@ final class PhabricatorUserRealNameField
     return 'user:realname';
   }
 
+  public function getModernFieldKey() {
+    return 'realName';
+  }
+
+  public function getFieldKeyForConduit() {
+    return $this->getModernFieldKey();
+  }
+
   public function getFieldName() {
     return pht('Real Name');
   }
@@ -53,6 +61,11 @@ final class PhabricatorUserRealNameField
     $this->value = $request->getStr($this->getFieldKey());
   }
 
+  public function setValueFromStorage($value) {
+    $this->value = $value;
+    return $this;
+  }
+
   public function renderEditControl(array $handles) {
     return id(new AphrontFormTextControl())
       ->setName($this->getFieldKey())
@@ -65,4 +78,12 @@ final class PhabricatorUserRealNameField
     return PhabricatorEnv::getEnvConfig('account.editable');
   }
 
+  public function shouldAppearInConduitTransactions() {
+    return true;
+  }
+
+  protected function newConduitEditParameterType() {
+    return new ConduitStringParameterType();
+  }
+
 }
diff --git a/src/applications/people/customfield/PhabricatorUserTitleField.php b/src/applications/people/customfield/PhabricatorUserTitleField.php
index af6793e76e..5ceb774fa4 100644
--- a/src/applications/people/customfield/PhabricatorUserTitleField.php
+++ b/src/applications/people/customfield/PhabricatorUserTitleField.php
@@ -9,6 +9,14 @@ final class PhabricatorUserTitleField
     return 'user:title';
   }
 
+  public function getModernFieldKey() {
+    return 'title';
+  }
+
+  public function getFieldKeyForConduit() {
+    return $this->getModernFieldKey();
+  }
+
   public function getFieldName() {
     return pht('Title');
   }
@@ -50,6 +58,11 @@ final class PhabricatorUserTitleField
     $this->value = $request->getStr($this->getFieldKey());
   }
 
+  public function setValueFromStorage($value) {
+    $this->value = $value;
+    return $this;
+  }
+
   public function renderEditControl(array $handles) {
     return id(new AphrontFormTextControl())
       ->setName($this->getFieldKey())
@@ -57,4 +70,12 @@ final class PhabricatorUserTitleField
       ->setLabel($this->getFieldName());
   }
 
+  public function shouldAppearInConduitTransactions() {
+    return true;
+  }
+
+  protected function newConduitEditParameterType() {
+    return new ConduitStringParameterType();
+  }
+
 }
diff --git a/src/applications/people/editor/PhabricatorUserEditEngine.php b/src/applications/people/editor/PhabricatorUserEditEngine.php
new file mode 100644
index 0000000000..b978eb2618
--- /dev/null
+++ b/src/applications/people/editor/PhabricatorUserEditEngine.php
@@ -0,0 +1,70 @@
+<?php
+
+final class PhabricatorUserEditEngine
+  extends PhabricatorEditEngine {
+
+  const ENGINECONST = 'people.user';
+
+  public function isEngineConfigurable() {
+    return false;
+  }
+
+  public function getEngineName() {
+    return pht('Users');
+  }
+
+  public function getSummaryHeader() {
+    return pht('Configure User Forms');
+  }
+
+  public function getSummaryText() {
+    return pht('Configure creation and editing forms for users.');
+  }
+
+  public function getEngineApplicationClass() {
+    return 'PhabricatorPeopleApplication';
+  }
+
+  protected function newEditableObject() {
+    return new PhabricatorUser();
+  }
+
+  protected function newObjectQuery() {
+    return id(new PhabricatorPeopleQuery());
+  }
+
+  protected function getObjectCreateTitleText($object) {
+    return pht('Create New User');
+  }
+
+  protected function getObjectEditTitleText($object) {
+    return pht('Edit User: %s', $object->getUsername());
+  }
+
+  protected function getObjectEditShortText($object) {
+    return $object->getMonogram();
+  }
+
+  protected function getObjectCreateShortText() {
+    return pht('Create User');
+  }
+
+  protected function getObjectName() {
+    return pht('User');
+  }
+
+  protected function getObjectViewURI($object) {
+    return $object->getURI();
+  }
+
+  protected function getCreateNewObjectPolicy() {
+    // At least for now, forbid creating new users via EditEngine. This is
+    // primarily enforcing that "user.edit" can not create users via the API.
+    return PhabricatorPolicies::POLICY_NOONE;
+  }
+
+  protected function buildCustomEditFields($object) {
+    return array();
+  }
+
+}

From f9673a72a87d61edd69be864491518e83d4645f7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 15:32:24 -0700
Subject: [PATCH 023/125] Allow "user.edit" to enable or disable users

Summary:
Depends on D19577. Ref T13164. See PHI642. This adds modern transaction-oriented enable/disable support.

Currently, this also doesn't let you disable normal users even when you're an administrator. I'll refine the policy model later in this change series, since that's also the goal here (let users set "Can Disable Users" to some more broad set of users than "Administrators").

This also leaves us with two different edit pathways: the old UserEditor one and the new UserTransactionEditor one. The next couple diffs will redefine the other pathways in terms of this pathway.

Test Plan:
  - Enabled/disabled a bot.
  - Tried to disable another non-bot user. This isn't allowed yet, since even as an administrator you don't have CAN_EDIT on them and currently need it: right now, there's no way for a particular set of transactions to say they can move forward with reduced permissions.
  - Tried to enable/disable myself. This isn't allowed since you can't enable/disable yourself.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19579
---
 src/__phutil_library_map__.php                |  2 +
 .../editor/PhabricatorUserEditEngine.php      | 13 +++-
 .../PhabricatorUserDisableTransaction.php     | 72 +++++++++++++++++++
 .../PhabricatorUserTransactionType.php        | 11 ++-
 4 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 src/applications/people/xaction/PhabricatorUserDisableTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 628f4958b5..c8b84d19fe 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4562,6 +4562,7 @@ phutil_register_library_map(array(
     'PhabricatorUserCustomFieldNumericIndex' => 'applications/people/storage/PhabricatorUserCustomFieldNumericIndex.php',
     'PhabricatorUserCustomFieldStringIndex' => 'applications/people/storage/PhabricatorUserCustomFieldStringIndex.php',
     'PhabricatorUserDAO' => 'applications/people/storage/PhabricatorUserDAO.php',
+    'PhabricatorUserDisableTransaction' => 'applications/people/xaction/PhabricatorUserDisableTransaction.php',
     'PhabricatorUserEditEngine' => 'applications/people/editor/PhabricatorUserEditEngine.php',
     'PhabricatorUserEditor' => 'applications/people/editor/PhabricatorUserEditor.php',
     'PhabricatorUserEditorTestCase' => 'applications/people/editor/__tests__/PhabricatorUserEditorTestCase.php',
@@ -10549,6 +10550,7 @@ phutil_register_library_map(array(
     'PhabricatorUserCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
     'PhabricatorUserCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
     'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorUserDisableTransaction' => 'PhabricatorUserTransactionType',
     'PhabricatorUserEditEngine' => 'PhabricatorEditEngine',
     'PhabricatorUserEditor' => 'PhabricatorEditor',
     'PhabricatorUserEditorTestCase' => 'PhabricatorTestCase',
diff --git a/src/applications/people/editor/PhabricatorUserEditEngine.php b/src/applications/people/editor/PhabricatorUserEditEngine.php
index b978eb2618..c547426b12 100644
--- a/src/applications/people/editor/PhabricatorUserEditEngine.php
+++ b/src/applications/people/editor/PhabricatorUserEditEngine.php
@@ -64,7 +64,18 @@ final class PhabricatorUserEditEngine
   }
 
   protected function buildCustomEditFields($object) {
-    return array();
+    return array(
+      id(new PhabricatorBoolEditField())
+        ->setKey('disabled')
+        ->setOptions(pht('Active'), pht('Disabled'))
+        ->setLabel(pht('Disabled'))
+        ->setDescription(pht('Disable the user.'))
+        ->setTransactionType(PhabricatorUserDisableTransaction::TRANSACTIONTYPE)
+        ->setIsConduitOnly(true)
+        ->setConduitDescription(pht('Disable or enable the user.'))
+        ->setConduitTypeDescription(pht('True to disable the user.'))
+        ->setValue($object->getIsDisabled()),
+    );
   }
 
 }
diff --git a/src/applications/people/xaction/PhabricatorUserDisableTransaction.php b/src/applications/people/xaction/PhabricatorUserDisableTransaction.php
new file mode 100644
index 0000000000..0ea6ef36c1
--- /dev/null
+++ b/src/applications/people/xaction/PhabricatorUserDisableTransaction.php
@@ -0,0 +1,72 @@
+<?php
+
+final class PhabricatorUserDisableTransaction
+  extends PhabricatorUserTransactionType {
+
+  const TRANSACTIONTYPE = 'user.disable';
+
+  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);
+
+    $this->newUserLog(PhabricatorUserLog::ACTION_DISABLE)
+      ->setOldValue((bool)$object->getIsDisabled())
+      ->setNewValue((bool)$value)
+      ->save();
+  }
+
+  public function getTitle() {
+    $new = $this->getNewValue();
+    if ($new) {
+      return pht(
+        '%s disabled this user.',
+        $this->renderAuthor());
+    } else {
+      return pht(
+        '%s enabled this user.',
+        $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());
+    }
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    foreach ($xactions as $xaction) {
+      $is_disabled = (bool)$object->getIsDisabled();
+
+      if ((bool)$xaction->getNewValue() === $is_disabled) {
+        continue;
+      }
+
+      if ($this->getActingAsPHID() === $object->getPHID()) {
+        $errors[] = $this->newInvalidError(
+          pht('You can not enable or disable your own account.'));
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/applications/people/xaction/PhabricatorUserTransactionType.php b/src/applications/people/xaction/PhabricatorUserTransactionType.php
index 89392fd039..dcd45d480e 100644
--- a/src/applications/people/xaction/PhabricatorUserTransactionType.php
+++ b/src/applications/people/xaction/PhabricatorUserTransactionType.php
@@ -1,4 +1,13 @@
 <?php
 
 abstract class PhabricatorUserTransactionType
-  extends PhabricatorModularTransactionType {}
+  extends PhabricatorModularTransactionType {
+
+  protected function newUserLog($action) {
+    return PhabricatorUserLog::initializeNewLog(
+      $this->getActor(),
+      $this->getObject()->getPHID(),
+      $action);
+  }
+
+}

From 296bf046a8122c451ba0bf1a93733dccccaeb390 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Aug 2018 10:44:52 -0700
Subject: [PATCH 024/125] Remove deprecated Maniphest "Can Edit <Specific
 Property>" capabilities

Summary:
Depends on D19579. Fixes T10003. These have been deprecated with a setup warning about their impending removal for about two and a half years.

Ref T13164. See PHI642. My overall goal here is to simplify how we handle transactions which have special policy behaviors. In particular, I'm hoping to replace `ApplicationTransactionEditor->requireCapabilities()` with a new, more clear policy check.

A problem with `requireCapabilities()` is that it doesn't actually enforce any policies in almost all cases: the default is "nothing", not CAN_EDIT. So it ends up looking like it's the right place to specialize policy checks, but it usually isn't.

For "Disable", I need to be able to weaken the check selectively (you can disable users if you have the permission, even if you can't edit them otherwise). We have a handful of other edits which work like this (notably, leaving and joining projects) but they're very rare.

Test Plan: Grepped for all removed classes. Edited a Maniphest task.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164, T10003

Differential Revision: https://secure.phabricator.com/D19581
---
 src/__phutil_library_map__.php                | 10 ---
 .../PhabricatorExtraConfigSetupCheck.php      | 65 -------------------
 .../PhabricatorManiphestApplication.php       |  5 --
 .../ManiphestEditAssignCapability.php         | 15 -----
 .../ManiphestEditPoliciesCapability.php       | 16 -----
 .../ManiphestEditPriorityCapability.php       | 16 -----
 .../ManiphestEditProjectsCapability.php       | 16 -----
 .../ManiphestEditStatusCapability.php         | 15 -----
 .../editor/ManiphestTransactionEditor.php     | 45 -------------
 .../query/ManiphestTaskSearchEngine.php       |  6 +-
 10 files changed, 1 insertion(+), 208 deletions(-)
 delete mode 100644 src/applications/maniphest/capability/ManiphestEditAssignCapability.php
 delete mode 100644 src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
 delete mode 100644 src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
 delete mode 100644 src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
 delete mode 100644 src/applications/maniphest/capability/ManiphestEditStatusCapability.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c8b84d19fe..af6fa96ba3 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1646,13 +1646,8 @@ phutil_register_library_map(array(
     'ManiphestDAO' => 'applications/maniphest/storage/ManiphestDAO.php',
     'ManiphestDefaultEditCapability' => 'applications/maniphest/capability/ManiphestDefaultEditCapability.php',
     'ManiphestDefaultViewCapability' => 'applications/maniphest/capability/ManiphestDefaultViewCapability.php',
-    'ManiphestEditAssignCapability' => 'applications/maniphest/capability/ManiphestEditAssignCapability.php',
     'ManiphestEditConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestEditConduitAPIMethod.php',
     'ManiphestEditEngine' => 'applications/maniphest/editor/ManiphestEditEngine.php',
-    'ManiphestEditPoliciesCapability' => 'applications/maniphest/capability/ManiphestEditPoliciesCapability.php',
-    'ManiphestEditPriorityCapability' => 'applications/maniphest/capability/ManiphestEditPriorityCapability.php',
-    'ManiphestEditProjectsCapability' => 'applications/maniphest/capability/ManiphestEditProjectsCapability.php',
-    'ManiphestEditStatusCapability' => 'applications/maniphest/capability/ManiphestEditStatusCapability.php',
     'ManiphestEmailCommand' => 'applications/maniphest/command/ManiphestEmailCommand.php',
     'ManiphestGetTaskTransactionsConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php',
     'ManiphestHovercardEngineExtension' => 'applications/maniphest/engineextension/ManiphestHovercardEngineExtension.php',
@@ -7152,13 +7147,8 @@ phutil_register_library_map(array(
     'ManiphestDAO' => 'PhabricatorLiskDAO',
     'ManiphestDefaultEditCapability' => 'PhabricatorPolicyCapability',
     'ManiphestDefaultViewCapability' => 'PhabricatorPolicyCapability',
-    'ManiphestEditAssignCapability' => 'PhabricatorPolicyCapability',
     'ManiphestEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
     'ManiphestEditEngine' => 'PhabricatorEditEngine',
-    'ManiphestEditPoliciesCapability' => 'PhabricatorPolicyCapability',
-    'ManiphestEditPriorityCapability' => 'PhabricatorPolicyCapability',
-    'ManiphestEditProjectsCapability' => 'PhabricatorPolicyCapability',
-    'ManiphestEditStatusCapability' => 'PhabricatorPolicyCapability',
     'ManiphestEmailCommand' => 'MetaMTAEmailTransactionCommand',
     'ManiphestGetTaskTransactionsConduitAPIMethod' => 'ManiphestConduitAPIMethod',
     'ManiphestHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
index 84fd5bedf2..7df50a4524 100644
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -361,69 +361,4 @@ final class PhabricatorExtraConfigSetupCheck extends PhabricatorSetupCheck {
     return $ancient_config;
   }
 
-  private function executeManiphestFieldChecks() {
-    $maniphest_appclass = 'PhabricatorManiphestApplication';
-    if (!PhabricatorApplication::isClassInstalled($maniphest_appclass)) {
-      return;
-    }
-
-    $capabilities = array(
-      ManiphestEditAssignCapability::CAPABILITY,
-      ManiphestEditPoliciesCapability::CAPABILITY,
-      ManiphestEditPriorityCapability::CAPABILITY,
-      ManiphestEditProjectsCapability::CAPABILITY,
-      ManiphestEditStatusCapability::CAPABILITY,
-    );
-
-    // Check for any of these capabilities set to anything other than
-    // "All Users".
-
-    $any_set = false;
-    $app = new PhabricatorManiphestApplication();
-    foreach ($capabilities as $capability) {
-      $setting = $app->getPolicy($capability);
-      if ($setting != PhabricatorPolicies::POLICY_USER) {
-        $any_set = true;
-        break;
-      }
-    }
-
-    if (!$any_set) {
-      return;
-    }
-
-    $issue_summary = pht(
-      'Maniphest is currently configured with deprecated policy settings '.
-      'which will be removed in a future version of Phabricator.');
-
-
-    $message = pht(
-      'Some policy settings in Maniphest are now deprecated and will be '.
-      'removed in a future version of Phabricator. You are currently using '.
-      'at least one of these settings.'.
-      "\n\n".
-      'The deprecated settings are "Can Assign Tasks", '.
-      '"Can Edit Task Policies", "Can Prioritize Tasks", '.
-      '"Can Edit Task Projects", and "Can Edit Task Status". You can '.
-      'find these settings in Applications, or follow the link below.'.
-      "\n\n".
-      'You can find discussion of this change (including rationale and '.
-      'recommendations on how to configure similar features) in the upstream, '.
-      'at the link below.'.
-      "\n\n".
-      'To resolve this issue, set all of these policies to "All Users" after '.
-      'making any necessary form customization changes.');
-
-    $more_href = 'https://secure.phabricator.com/T10003';
-    $edit_href = '/applications/view/PhabricatorManiphestApplication/';
-
-    $issue = $this->newIssue('maniphest.T10003-per-field-policies')
-      ->setShortName(pht('Deprecated Policies'))
-      ->setName(pht('Deprecated Maniphest Field Policies'))
-      ->setSummary($issue_summary)
-      ->setMessage($message)
-      ->addLink($more_href, pht('Learn More: Upstream Discussion'))
-      ->addLink($edit_href, pht('Edit These Settings'));
-  }
-
 }
diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
index e57b9b545e..1ed4096660 100644
--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
@@ -85,11 +85,6 @@ final class PhabricatorManiphestApplication extends PhabricatorApplication {
         'template' => ManiphestTaskPHIDType::TYPECONST,
         'capability' => PhabricatorPolicyCapability::CAN_EDIT,
       ),
-      ManiphestEditStatusCapability::CAPABILITY => array(),
-      ManiphestEditAssignCapability::CAPABILITY => array(),
-      ManiphestEditPoliciesCapability::CAPABILITY => array(),
-      ManiphestEditPriorityCapability::CAPABILITY => array(),
-      ManiphestEditProjectsCapability::CAPABILITY => array(),
       ManiphestBulkEditCapability::CAPABILITY => array(),
     );
   }
diff --git a/src/applications/maniphest/capability/ManiphestEditAssignCapability.php b/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
deleted file mode 100644
index 5da3adf55e..0000000000
--- a/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-final class ManiphestEditAssignCapability extends PhabricatorPolicyCapability {
-
-  const CAPABILITY = 'maniphest.edit.assign';
-
-  public function getCapabilityName() {
-    return pht('Can Assign Tasks');
-  }
-
-  public function describeCapabilityRejection() {
-    return pht('You do not have permission to assign tasks.');
-  }
-
-}
diff --git a/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php b/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
deleted file mode 100644
index 55dd37a91f..0000000000
--- a/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-final class ManiphestEditPoliciesCapability
-  extends PhabricatorPolicyCapability {
-
-  const CAPABILITY = 'maniphest.edit.policies';
-
-  public function getCapabilityName() {
-    return pht('Can Edit Task Policies');
-  }
-
-  public function describeCapabilityRejection() {
-    return pht('You do not have permission to edit task policies.');
-  }
-
-}
diff --git a/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php b/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
deleted file mode 100644
index 09da656f4c..0000000000
--- a/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-final class ManiphestEditPriorityCapability
-  extends PhabricatorPolicyCapability {
-
-  const CAPABILITY = 'maniphest.edit.priority';
-
-  public function getCapabilityName() {
-    return pht('Can Prioritize Tasks');
-  }
-
-  public function describeCapabilityRejection() {
-    return pht('You do not have permission to prioritize tasks.');
-  }
-
-}
diff --git a/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php b/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
deleted file mode 100644
index 46367ae24b..0000000000
--- a/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-final class ManiphestEditProjectsCapability
-  extends PhabricatorPolicyCapability {
-
-  const CAPABILITY = 'maniphest.edit.projects';
-
-  public function getCapabilityName() {
-    return pht('Can Edit Task Projects');
-  }
-
-  public function describeCapabilityRejection() {
-    return pht('You do not have permission to edit task projects.');
-  }
-
-}
diff --git a/src/applications/maniphest/capability/ManiphestEditStatusCapability.php b/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
deleted file mode 100644
index 171c2c77cb..0000000000
--- a/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-final class ManiphestEditStatusCapability extends PhabricatorPolicyCapability {
-
-  const CAPABILITY = 'maniphest.edit.status';
-
-  public function getCapabilityName() {
-    return pht('Can Edit Task Status');
-  }
-
-  public function describeCapabilityRejection() {
-    return pht('You do not have permission to edit task status.');
-  }
-
-}
diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
index 66247ca6d0..7c77e4acee 100644
--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
@@ -279,51 +279,6 @@ final class ManiphestTransactionEditor
       ->setTask($object);
   }
 
-  protected function requireCapabilities(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    parent::requireCapabilities($object, $xaction);
-
-    $app_capability_map = array(
-      ManiphestTaskPriorityTransaction::TRANSACTIONTYPE =>
-        ManiphestEditPriorityCapability::CAPABILITY,
-      ManiphestTaskStatusTransaction::TRANSACTIONTYPE =>
-        ManiphestEditStatusCapability::CAPABILITY,
-      ManiphestTaskOwnerTransaction::TRANSACTIONTYPE =>
-        ManiphestEditAssignCapability::CAPABILITY,
-      PhabricatorTransactions::TYPE_EDIT_POLICY =>
-        ManiphestEditPoliciesCapability::CAPABILITY,
-      PhabricatorTransactions::TYPE_VIEW_POLICY =>
-        ManiphestEditPoliciesCapability::CAPABILITY,
-    );
-
-
-    $transaction_type = $xaction->getTransactionType();
-
-    $app_capability = null;
-    if ($transaction_type == PhabricatorTransactions::TYPE_EDGE) {
-      switch ($xaction->getMetadataValue('edge:type')) {
-        case PhabricatorProjectObjectHasProjectEdgeType::EDGECONST:
-          $app_capability = ManiphestEditProjectsCapability::CAPABILITY;
-          break;
-      }
-    } else {
-      $app_capability = idx($app_capability_map, $transaction_type);
-    }
-
-    if ($app_capability) {
-      $app = id(new PhabricatorApplicationQuery())
-        ->setViewer($this->getActor())
-        ->withClasses(array('PhabricatorManiphestApplication'))
-        ->executeOne();
-      PhabricatorPolicyFilter::requireCapability(
-        $this->getActor(),
-        $app,
-        $app_capability);
-    }
-  }
-
   protected function adjustObjectForPolicyChecks(
     PhabricatorLiskDAO $object,
     array $xactions) {
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index 68f87a6f6b..437362fa41 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -369,11 +369,7 @@ final class ManiphestTaskSearchEngine
       $can_edit_priority = false;
       $can_bulk_edit = false;
     } else {
-      $can_edit_priority = PhabricatorPolicyFilter::hasCapability(
-        $viewer,
-        $this->getApplication(),
-        ManiphestEditPriorityCapability::CAPABILITY);
-
+      $can_edit_priority = true;
       $can_bulk_edit = PhabricatorPolicyFilter::hasCapability(
         $viewer,
         $this->getApplication(),

From a39852ae1b4a131354a606753495f052ea836e74 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Aug 2018 13:19:53 -0700
Subject: [PATCH 025/125] Remove pointless requireCapabilities() method from
 PhabricatorProjectColumnTransactionEditor

Summary:
Depends on D19581. Ref T13164. This method has no effect:

  - You must always have CAN_EDIT to reach an Editor in the first place.
  - Per previous change, I'm going to restructure this so transactions explicitly check CAN_EDIT by default anyway.

Test Plan: Tried to edit and hide a project column as a user without permission, hit global permission checks long before reaching this method.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19582
---
 ...abricatorProjectColumnTransactionEditor.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/applications/project/editor/PhabricatorProjectColumnTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectColumnTransactionEditor.php
index 19f059b8b5..d494767085 100644
--- a/src/applications/project/editor/PhabricatorProjectColumnTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectColumnTransactionEditor.php
@@ -137,22 +137,4 @@ final class PhabricatorProjectColumnTransactionEditor
     return $errors;
   }
 
-
-  protected function requireCapabilities(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case PhabricatorProjectColumnTransaction::TYPE_NAME:
-      case PhabricatorProjectColumnTransaction::TYPE_STATUS:
-        PhabricatorPolicyFilter::requireCapability(
-          $this->requireActor(),
-          $object,
-          PhabricatorPolicyCapability::CAN_EDIT);
-        return;
-    }
-
-    return parent::requireCapabilities($object, $xaction);
-  }
-
 }

From 24d4445845489cb3fa6c9f1e7ab3dfd8dbe40255 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Aug 2018 13:28:37 -0700
Subject: [PATCH 026/125] Remove pointless requireCapabilities() method from
 PhabricatorRepositoryEditor

Summary: Depends on D19582. Ref T13164. It's not possible to reach the editor without passing through a CAN_EDIT check, and it shouldn't be necessarily to manually specify that edits require CAN_EDIT by default.

Test Plan: Grepped for `RepositoryEditor`, verified that all callsites pass through a CAN_EDIT check.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19583
---
 .../editor/PhabricatorRepositoryEditor.php    | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/src/applications/repository/editor/PhabricatorRepositoryEditor.php b/src/applications/repository/editor/PhabricatorRepositoryEditor.php
index 768121de5a..882c1a11fa 100644
--- a/src/applications/repository/editor/PhabricatorRepositoryEditor.php
+++ b/src/applications/repository/editor/PhabricatorRepositoryEditor.php
@@ -236,40 +236,6 @@ final class PhabricatorRepositoryEditor
 
   }
 
-  protected function requireCapabilities(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case PhabricatorRepositoryTransaction::TYPE_ACTIVATE:
-      case PhabricatorRepositoryTransaction::TYPE_NAME:
-      case PhabricatorRepositoryTransaction::TYPE_DESCRIPTION:
-      case PhabricatorRepositoryTransaction::TYPE_ENCODING:
-      case PhabricatorRepositoryTransaction::TYPE_DEFAULT_BRANCH:
-      case PhabricatorRepositoryTransaction::TYPE_TRACK_ONLY:
-      case PhabricatorRepositoryTransaction::TYPE_AUTOCLOSE_ONLY:
-      case PhabricatorRepositoryTransaction::TYPE_UUID:
-      case PhabricatorRepositoryTransaction::TYPE_SVN_SUBPATH:
-      case PhabricatorRepositoryTransaction::TYPE_VCS:
-      case PhabricatorRepositoryTransaction::TYPE_NOTIFY:
-      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:
-      case PhabricatorRepositoryTransaction::TYPE_SYMBOLS_LANGUAGE:
-      case PhabricatorRepositoryTransaction::TYPE_STAGING_URI:
-      case PhabricatorRepositoryTransaction::TYPE_AUTOMATION_BLUEPRINTS:
-        PhabricatorPolicyFilter::requireCapability(
-          $this->requireActor(),
-          $object,
-          PhabricatorPolicyCapability::CAN_EDIT);
-        break;
-    }
-  }
-
   protected function validateTransaction(
     PhabricatorLiskDAO $object,
     $type,

From 3b92da22f4333d5bfa050d0da4397648147cee09 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Aug 2018 14:29:19 -0700
Subject: [PATCH 027/125] Move the hierarchical edit policy check in Phriction
 from requireCapabilities() to validateTransactions()

Summary:
Depends on D19583. Ref T13164. This continues the work of getting rid of `requireCapabilities()`.

This check is valid, but can be a `validateTransactions()` check instead. This is generally more consistent with how other applications work (e.g., creating subprojects).

The UI for this isn't terribly great: you get a policy error //after// you try to create the object. But that's how it worked before, so this isn't any worse than it was. The actual policy exception is (very) slightly more clear now (raised against the right object).

Test Plan:
  - Created a child as a user with permission to do so to make sure I didn't break that.
  - Set edit permission on `a/` to just me, tried to create `a/b/` as another user, got a policy exception since they can't edit the parent.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19584
---
 .../editor/PhrictionTransactionEditor.php     | 52 -------------------
 .../PhrictionDocumentTitleTransaction.php     | 23 ++++++++
 2 files changed, 23 insertions(+), 52 deletions(-)

diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index e6bf46c150..b9f2c0e2ca 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -516,58 +516,6 @@ final class PhrictionTransactionEditor
     }
     return $error;
   }
-  protected function requireCapabilities(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    /*
-     * New objects have a special case. If a user can't see
-     *   x/y
-     * then definitely don't let them make some
-     *   x/y/z
-     * We need to load the direct parent to handle this case.
-     */
-    if ($this->getIsNewObject()) {
-      $actor = $this->requireActor();
-      $parent_doc = null;
-      $ancestral_slugs = PhabricatorSlug::getAncestry($object->getSlug());
-      // No ancestral slugs is "/"; the first person gets to play with "/".
-      if ($ancestral_slugs) {
-        $parent = end($ancestral_slugs);
-        $parent_doc = id(new PhrictionDocumentQuery())
-          ->setViewer($actor)
-          ->withSlugs(array($parent))
-          ->executeOne();
-        // If the $actor can't see the $parent_doc then they can't create
-        // the child $object; throw a policy exception.
-        if (!$parent_doc) {
-          id(new PhabricatorPolicyFilter())
-            ->setViewer($actor)
-            ->raisePolicyExceptions(true)
-            ->rejectObject(
-              $object,
-              $object->getEditPolicy(),
-              PhabricatorPolicyCapability::CAN_EDIT);
-        }
-
-        // If the $actor can't edit the $parent_doc then they can't create
-        // the child $object; throw a policy exception.
-        if (!PhabricatorPolicyFilter::hasCapability(
-          $actor,
-          $parent_doc,
-          PhabricatorPolicyCapability::CAN_EDIT)) {
-          id(new PhabricatorPolicyFilter())
-            ->setViewer($actor)
-            ->raisePolicyExceptions(true)
-            ->rejectObject(
-              $object,
-              $object->getEditPolicy(),
-              PhabricatorPolicyCapability::CAN_EDIT);
-        }
-      }
-    }
-    return parent::requireCapabilities($object, $xaction);
-  }
 
   protected function supportsSearch() {
     return true;
diff --git a/src/applications/phriction/xaction/PhrictionDocumentTitleTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentTitleTransaction.php
index 4f1ba850a7..5c97d1bec8 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentTitleTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentTitleTransaction.php
@@ -91,6 +91,29 @@ final class PhrictionDocumentTitleTransaction
         pht('Documents must have a title.'));
     }
 
+    if ($this->isNewObject()) {
+      // No ancestral slugs is "/". No ancestry checks apply when creating the
+      // root document.
+      $ancestral_slugs = PhabricatorSlug::getAncestry($object->getSlug());
+      if ($ancestral_slugs) {
+        // You must be able to view and edit the parent document to create a new
+        // child.
+        $parent_document = id(new PhrictionDocumentQuery())
+          ->setViewer($this->getActor())
+          ->withSlugs(array(last($ancestral_slugs)))
+          ->requireCapabilities(
+            array(
+              PhabricatorPolicyCapability::CAN_VIEW,
+              PhabricatorPolicyCapability::CAN_EDIT,
+            ))
+          ->executeOne();
+        if (!$parent_document) {
+          $errors[] = $this->newInvalidError(
+            pht('You can not create a document which does not have a parent.'));
+        }
+      }
+    }
+
     return $errors;
   }
 

From 7e29ec2e2a66087528027b7e80cc548ec30f6fff Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Aug 2018 14:46:59 -0700
Subject: [PATCH 028/125] Move the "Can Lock Projects" check from
 requireCapabilities() to transaction validation

Summary: Depends on D19584. Ref T13164. This check is an //extra// check: you need EDIT //and// this capability. Thus, we can do it in validation without issues.

Test Plan:
  - This code isn't reachable today: all methods of applying this transaction do a separate check for "Can Lock" upfront.
  - Commented out the "Can Lock" check in the LockController, tried to lock as a user without permission. Was rejected with a policy exception.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19585
---
 .../editor/PhabricatorProjectTransactionEditor.php     |  6 ------
 .../xaction/PhabricatorProjectLockTransaction.php      |  8 ++++++++
 .../storage/PhabricatorModularTransactionType.php      | 10 ++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
index 2a90d6ce29..ef0cc65c8e 100644
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -120,12 +120,6 @@ final class PhabricatorProjectTransactionEditor
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
-      case PhabricatorProjectLockTransaction::TRANSACTIONTYPE:
-        PhabricatorPolicyFilter::requireCapability(
-          $this->requireActor(),
-          newv($this->getEditorApplicationClass(), array()),
-          ProjectCanLockProjectsCapability::CAPABILITY);
-        return;
       case PhabricatorTransactions::TYPE_EDGE:
         switch ($xaction->getMetadataValue('edge:type')) {
           case PhabricatorProjectProjectHasMemberEdgeType::EDGECONST:
diff --git a/src/applications/project/xaction/PhabricatorProjectLockTransaction.php b/src/applications/project/xaction/PhabricatorProjectLockTransaction.php
index 42551dfb2c..c54c9284ce 100644
--- a/src/applications/project/xaction/PhabricatorProjectLockTransaction.php
+++ b/src/applications/project/xaction/PhabricatorProjectLockTransaction.php
@@ -53,4 +53,12 @@ final class PhabricatorProjectLockTransaction
     }
   }
 
+  public function validateTransactions($object, array $xactions) {
+    if ($xactions) {
+      $this->requireApplicationCapability(
+        ProjectCanLockProjectsCapability::CAPABILITY);
+    }
+    return array();
+  }
+
 }
diff --git a/src/applications/transactions/storage/PhabricatorModularTransactionType.php b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
index eaf7d029ce..b0714aeccf 100644
--- a/src/applications/transactions/storage/PhabricatorModularTransactionType.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
@@ -356,4 +356,14 @@ abstract class PhabricatorModularTransactionType
     return array();
   }
 
+  protected function requireApplicationCapability($capability) {
+    $application_class = $this->getEditor()->getEditorApplicationClass();
+    $application = newv($application_class, array());
+
+    PhabricatorPolicyFilter::requireCapability(
+      $this->getActor(),
+      $application,
+      $capability);
+  }
+
 }

From 0ccf1410e057cede3e2c2a552cb78981d8ac8179 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 16 Aug 2018 10:07:28 -0700
Subject: [PATCH 029/125] Give PhabricatorAuthPassword a formal CAN_EDIT policy

Summary:
Depends on D19585. Ref T13164. This is a precursor for D19586, which causes Editors to start doing more explicit CAN_EDIT checks.

Passwords have an Editor, but don't actually define a CAN_EDIT capability. Define one (you can edit a password if you can edit the object the password is associated with).

(Today, this object is always a User -- this table just unified VCS passwords and Account passwords so they can be handled more consistently.)

Test Plan:
  - With D19586, ran unit tests and got a pass.
  - Edited my own password.
  - Tried to edit another user's password and wasn't permitted to.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19592
---
 src/applications/auth/storage/PhabricatorAuthPassword.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/applications/auth/storage/PhabricatorAuthPassword.php b/src/applications/auth/storage/PhabricatorAuthPassword.php
index 5343e622fd..3bcb95693e 100644
--- a/src/applications/auth/storage/PhabricatorAuthPassword.php
+++ b/src/applications/auth/storage/PhabricatorAuthPassword.php
@@ -178,6 +178,7 @@ final class PhabricatorAuthPassword
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
+      PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
@@ -195,7 +196,7 @@ final class PhabricatorAuthPassword
 
   public function getExtendedPolicy($capability, PhabricatorUser $viewer) {
     return array(
-      array($this->getObject(), PhabricatorPolicyCapability::CAN_VIEW),
+      array($this->getObject(), $capability),
     );
   }
 

From a48e6897a4180ec074f4581c677448b2ac400812 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 16 Aug 2018 11:07:37 -0700
Subject: [PATCH 030/125] Remove obsolete setup check call to Maniphest "Can
 Edit <X>" field checks

Summary: Ref T13164. Missed this in D19581.

Test Plan:
  - Forced setup checks to re-run by visiting {nav Config > Setup Issues} explicitly.
  - Before patch: fatal on call to nonexistent method.
  - After patch: setup issues.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19593
---
 .../config/check/PhabricatorExtraConfigSetupCheck.php           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
index 7df50a4524..4bf51602ba 100644
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -84,8 +84,6 @@ final class PhabricatorExtraConfigSetupCheck extends PhabricatorSetupCheck {
         $issue->addPhabricatorConfig($key);
       }
     }
-
-    $this->executeManiphestFieldChecks();
   }
 
   /**

From 438edde03150984b267347b0374998149f2c45e9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 16 Aug 2018 13:48:42 -0700
Subject: [PATCH 031/125] Add some missing aural button labels for
 accessibility

Summary:
Ref T13164. See PHI823. (See that issue for some more details and discussion.)

Add aural labels to various buttons which were missing reasonable aural labels.

The "Search" button (magnifying glass in the global search input) had an entire menu thing inside it. I moved that one level up and it doesn't look like it broke anything (?). All the other changes are pretty straightforward.

Test Plan:
{F5806497}

{F5806498}

  - Will follow up on the issue to make sure things are in better shape for the reporting user.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19594
---
 ...abricatorFavoritesMainMenuBarExtension.php |  3 +-
 .../PeopleMainMenuBarExtension.php            |  3 +-
 ...catorApplicationTransactionCommentView.php |  2 +-
 .../view/PHUIDiffInlineCommentDetailView.php  | 15 ++++++---
 .../menu/PhabricatorMainMenuSearchView.php    | 32 +++++++++++--------
 .../page/menu/PhabricatorMainMenuView.php     |  3 +-
 src/view/phui/PHUIButtonView.php              | 25 +++++++++++++--
 src/view/phui/PHUIHeadThingView.php           |  2 +-
 src/view/phui/PHUITimelineEventView.php       |  2 +-
 9 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php b/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
index 9afb836b94..7b5d6d0720 100644
--- a/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
+++ b/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
@@ -30,7 +30,8 @@ final class PhabricatorFavoritesMainMenuBarExtension
       ->addClass('phabricator-core-user-menu')
       ->setNoCSS(true)
       ->setDropdown(true)
-      ->setDropdownMenu($dropdown);
+      ->setDropdownMenu($dropdown)
+      ->setAuralLabel(pht('Favorites Menu'));
 
     return array(
       $favorites_menu,
diff --git a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
index 152fb2becf..e19cedd305 100644
--- a/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
+++ b/src/applications/people/engineextension/PeopleMainMenuBarExtension.php
@@ -43,7 +43,8 @@ final class PeopleMainMenuBarExtension
       ->setIcon($profile_image)
       ->addClass('phabricator-core-user-menu')
       ->setHasCaret(true)
-      ->setNoCSS(true);
+      ->setNoCSS(true)
+      ->setAuralLabel(pht('Account Menu'));
 
     return array(
       $user_menu,
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
index a5dcfcb4ae..c0d46e21a5 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -230,7 +230,7 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
       'div',
       array(
         'style' => 'background-image: url('.$image_uri.')',
-        'class' => 'phui-comment-image',
+        'class' => 'phui-comment-image visual-only',
       ));
     $wedge = phutil_tag(
       'div',
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
index 27a489a705..a32197059a 100644
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
@@ -233,7 +233,8 @@ final class PHUIDiffInlineCommentDetailView
         ->setIcon('fa-reply')
         ->setTooltip(pht('Reply'))
         ->addSigil('differential-inline-reply')
-        ->setMustCapture(true);
+        ->setMustCapture(true)
+        ->setAuralLabel(pht('Reply'));
     }
 
     if ($this->editable && !$this->preview) {
@@ -242,14 +243,16 @@ final class PHUIDiffInlineCommentDetailView
         ->setIcon('fa-pencil')
         ->setTooltip(pht('Edit'))
         ->addSigil('differential-inline-edit')
-        ->setMustCapture(true);
+        ->setMustCapture(true)
+        ->setAuralLabel(pht('Edit'));
 
       $action_buttons[] = id(new PHUIButtonView())
         ->setTag('a')
         ->setIcon('fa-trash-o')
         ->setTooltip(pht('Delete'))
         ->addSigil('differential-inline-delete')
-        ->setMustCapture(true);
+        ->setMustCapture(true)
+        ->setAuralLabel(pht('Delete'));
 
     } else if ($this->preview) {
       $links[] = javelin_tag(
@@ -268,7 +271,8 @@ final class PHUIDiffInlineCommentDetailView
         ->setTooltip(pht('Delete'))
         ->setIcon('fa-trash-o')
         ->addSigil('differential-inline-delete')
-        ->setMustCapture(true);
+        ->setMustCapture(true)
+        ->setAuralLabel(pht('Delete'));
     }
 
     if (!$this->preview && $this->canHide()) {
@@ -277,7 +281,8 @@ final class PHUIDiffInlineCommentDetailView
         ->setTooltip(pht('Collapse'))
         ->setIcon('fa-times')
         ->addSigil('hide-inline')
-        ->setMustCapture(true);
+        ->setMustCapture(true)
+        ->setAuralLabel(pht('Collapse'));
     }
 
     $done_button = null;
diff --git a/src/view/page/menu/PhabricatorMainMenuSearchView.php b/src/view/page/menu/PhabricatorMainMenuSearchView.php
index 0b2ca8ab10..15319a357e 100644
--- a/src/view/page/menu/PhabricatorMainMenuSearchView.php
+++ b/src/view/page/menu/PhabricatorMainMenuSearchView.php
@@ -94,21 +94,24 @@ final class PhabricatorMainMenuSearchView extends AphrontView {
         'action' => '/search/',
         'method' => 'POST',
       ),
-      phutil_tag_div('phabricator-main-menu-search-container', array(
-        $input,
-        phutil_tag(
-          'button',
-          array(
-            'id' => $button_id,
-            'class' => 'phui-icon-view phui-font-fa fa-search',
+      phutil_tag(
+        'div',
+        array(
+          'class' => 'phabricator-main-menu-search-container',
+        ),
+        array(
+          $input,
+          phutil_tag(
+            'button',
+            array(
+              'id' => $button_id,
+              'class' => 'phui-icon-view phui-font-fa fa-search',
             ),
-          array(
-            $selector,
-            $search_text,
-          )),
-        $primary_input,
-        $target,
-      )));
+            $search_text),
+          $selector,
+          $primary_input,
+          $target,
+        )));
 
     return $form;
   }
@@ -207,6 +210,7 @@ final class PhabricatorMainMenuSearchView extends AphrontView {
         id(new PHUIIconView())
           ->addSigil('global-search-dropdown-icon')
           ->setIcon($current_icon))
+      ->setAuralLabel(pht('Configure Global Search'))
       ->setDropdown(true);
 
     $input = javelin_tag(
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index 583952b0a9..67badce911 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -232,7 +232,8 @@ final class PhabricatorMainMenuView extends AphrontView {
       ->addClass('phabricator-core-user-menu')
       ->addClass('phabricator-core-user-mobile-menu')
       ->setNoCSS(true)
-      ->setDropdownMenu($dropdown);
+      ->setDropdownMenu($dropdown)
+      ->setAuralLabel(pht('Page Menu'));
   }
 
   private function renderApplicationMenu() {
diff --git a/src/view/phui/PHUIButtonView.php b/src/view/phui/PHUIButtonView.php
index 91c336eaaf..1fb2206428 100644
--- a/src/view/phui/PHUIButtonView.php
+++ b/src/view/phui/PHUIButtonView.php
@@ -31,6 +31,7 @@ final class PHUIButtonView extends AphrontTagView {
   private $noCSS;
   private $hasCaret;
   private $buttonType = self::BUTTONTYPE_DEFAULT;
+  private $auralLabel;
 
   public function setName($name) {
     $this->name = $name;
@@ -123,6 +124,15 @@ final class PHUIButtonView extends AphrontTagView {
     return $this->buttonType;
   }
 
+  public function setAuralLabel($aural_label) {
+    $this->auralLabel = $aural_label;
+    return $this;
+  }
+
+  public function getAuralLabel() {
+    return $this->auralLabel;
+  }
+
   public function setIcon($icon, $first = true) {
     if (!($icon instanceof PHUIIconView)) {
       $icon = id(new PHUIIconView())
@@ -265,10 +275,21 @@ final class PHUIButtonView extends AphrontTagView {
       $caret = phutil_tag('span', array('class' => 'caret'), '');
     }
 
+    $aural = null;
+    if ($this->auralLabel !== null) {
+      $aural = phutil_tag(
+        'span',
+        array(
+          'class' => 'aural-only',
+        ),
+        $this->auralLabel);
+    }
+
+
     if ($this->iconFirst == true) {
-      return array($icon, $text, $caret);
+      return array($aural, $icon, $text, $caret);
     } else {
-      return array($text, $icon, $caret);
+      return array($aural, $text, $icon, $caret);
     }
   }
 }
diff --git a/src/view/phui/PHUIHeadThingView.php b/src/view/phui/PHUIHeadThingView.php
index dd788399d4..ab2feee984 100644
--- a/src/view/phui/PHUIHeadThingView.php
+++ b/src/view/phui/PHUIHeadThingView.php
@@ -55,7 +55,7 @@ final class PHUIHeadThingView extends AphrontTagView {
     $image = phutil_tag(
       'a',
       array(
-        'class' => 'phui-head-thing-image',
+        'class' => 'phui-head-thing-image visual-only',
         'style' => 'background-image: url('.$this->image.');',
         'href' => $this->imageHref,
       ));
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index e64b9b06b2..e44332c1b5 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -404,7 +404,7 @@ final class PHUITimelineEventView extends AphrontView {
         ($this->userHandle->getURI()) ? 'a' : 'div',
         array(
           'style' => 'background-image: url('.$image_uri.')',
-          'class' => 'phui-timeline-image',
+          'class' => 'phui-timeline-image visual-only',
           'href' => $this->userHandle->getURI(),
         ),
         '');

From 5c4c593af32578a406857d2433c1be2a74403128 Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Fri, 17 Aug 2018 12:23:59 -0700
Subject: [PATCH 032/125] Update DiffusionLastModifiedController to use
 identities

Summary: Ref T12164. Updates another controller to use identities.

Test Plan:
Pretty ad-hoc, but loaded the main pages of several different repos with and without repo identities. I'm not totally convinced the `author` from this data structure is actually being used:
```
$return = array(
  'commit'    => $modified,
  'date'      => $date,
  'author'    => $author,
  'details'   => $details,
);
```

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12164

Differential Revision: https://secure.phabricator.com/D19580
---
 .../controller/DiffusionBlameController.php   |  8 ++--
 .../DiffusionLastModifiedController.php       | 47 ++++++-------------
 .../PhabricatorRepositoryIdentityPHIDType.php |  1 +
 .../storage/PhabricatorRepositoryCommit.php   |  4 +-
 4 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBlameController.php b/src/applications/diffusion/controller/DiffusionBlameController.php
index 85ab393ef6..42cabbc0d9 100644
--- a/src/applications/diffusion/controller/DiffusionBlameController.php
+++ b/src/applications/diffusion/controller/DiffusionBlameController.php
@@ -24,6 +24,7 @@ final class DiffusionBlameController extends DiffusionController {
         ->setViewer($viewer)
         ->withRepository($repository)
         ->withIdentifiers($identifiers)
+        ->needIdentities(true)
         ->execute();
       $commits = mpull($commits, null, 'getCommitIdentifier');
     } else {
@@ -68,10 +69,7 @@ final class DiffusionBlameController extends DiffusionController {
 
     $handle_phids = array();
     foreach ($commits as $commit) {
-      $author_phid = $commit->getAuthorPHID();
-      if ($author_phid) {
-        $handle_phids[] = $author_phid;
-      }
+      $handle_phids[] = $commit->getAuthorDisplayPHID();
     }
 
     foreach ($revisions as $revision) {
@@ -117,7 +115,7 @@ final class DiffusionBlameController extends DiffusionController {
       $author_phid = null;
 
       if ($commit) {
-        $author_phid = $commit->getAuthorPHID();
+        $author_phid = $commit->getAuthorDisplayPHID();
       }
 
       if (!$author_phid && $revision) {
diff --git a/src/applications/diffusion/controller/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
index 945f8a58b5..1a31d3a2ba 100644
--- a/src/applications/diffusion/controller/DiffusionLastModifiedController.php
+++ b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
@@ -35,6 +35,7 @@ final class DiffusionLastModifiedController extends DiffusionController {
         ->withRepository($drequest->getRepository())
         ->withIdentifiers(array_values($modified_map))
         ->needCommitData(true)
+        ->needIdentities(true)
         ->execute();
       $commit_map = mpull($commit_map, null, 'getCommitIdentifier');
     } else {
@@ -54,9 +55,8 @@ final class DiffusionLastModifiedController extends DiffusionController {
 
     $phids = array();
     foreach ($commits as $commit) {
-      $data = $commit->getCommitData();
-      $phids[] = $data->getCommitDetail('authorPHID');
-      $phids[] = $data->getCommitDetail('committerPHID');
+      $phids[] = $commit->getCommitterDisplayPHID();
+      $phids[] = $commit->getAuthorDisplayPHID();
     }
     $phids = array_filter($phids);
     $handles = $this->loadViewerHandles($phids);
@@ -110,38 +110,21 @@ final class DiffusionLastModifiedController extends DiffusionController {
       $date = '';
     }
 
-    $data = $commit->getCommitData();
-    if ($data) {
-      $author_phid = $data->getCommitDetail('authorPHID');
-      if ($author_phid && isset($handles[$author_phid])) {
-        $author = $handles[$author_phid]->renderLink();
-      } else {
-        $author = DiffusionView::renderName($data->getAuthorName());
-      }
+    $author = $commit->renderAuthor($viewer, $handles);
+    $committer = $commit->renderCommitter($viewer, $handles);
 
-      $committer = $data->getCommitDetail('committer');
-      if ($committer) {
-        $committer_phid = $data->getCommitDetail('committerPHID');
-        if ($committer_phid && isset($handles[$committer_phid])) {
-          $committer = $handles[$committer_phid]->renderLink();
-        } else {
-          $committer = DiffusionView::renderName($committer);
-        }
-        if ($author != $committer) {
-          $author = hsprintf('%s/%s', $author, $committer);
-        }
-      }
-
-      $details = DiffusionView::linkDetail(
-        $drequest->getRepository(),
-        $commit->getCommitIdentifier(),
-        $data->getSummary());
-      $details = AphrontTableView::renderSingleDisplayLine($details);
-    } else {
-      $author = '';
-      $details = '';
+    if ($author != $committer) {
+      $author = hsprintf('%s/%s', $author, $committer);
     }
 
+    $data = $commit->getCommitData();
+    $details = DiffusionView::linkDetail(
+      $drequest->getRepository(),
+      $commit->getCommitIdentifier(),
+      $data->getSummary());
+    $details = AphrontTableView::renderSingleDisplayLine($details);
+
+
     $return = array(
       'commit'    => $modified,
       'date'      => $date,
diff --git a/src/applications/repository/phid/PhabricatorRepositoryIdentityPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryIdentityPHIDType.php
index 5bb4d5b907..5d9b06e0a3 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryIdentityPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryIdentityPHIDType.php
@@ -39,6 +39,7 @@ final class PhabricatorRepositoryIdentityPHIDType
       $handle->setObjectName(pht('Identity %d', $id));
       $handle->setName($name);
       $handle->setURI($identity->getURI());
+      $handle->setIcon('fa-user');
     }
   }
 
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index bf3b796a76..4cb9def346 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -464,7 +464,7 @@ final class PhabricatorRepositoryCommit
     $data = $this->getCommitData();
     $committer_name = $data->getCommitDetail('committer');
     if (strlen($committer_name)) {
-      return $committer_name;
+      return DiffusionView::renderName($committer_name);
     }
 
     return null;
@@ -479,7 +479,7 @@ final class PhabricatorRepositoryCommit
     $data = $this->getCommitData();
     $author_name = $data->getAuthorName();
     if (strlen($author_name)) {
-      return $author_name;
+      return DiffusionView::renderName($author_name);
     }
 
     return null;

From 75a5dd8d8cc0ba8cdf274ab509284ab4f7c0577c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 17 Aug 2018 10:53:28 -0700
Subject: [PATCH 033/125] Add more accessibility labels for screen readers

Summary:
Depends on D19594. See PHI823. Ref T13164.

  - Add a label for the "X" button in comment areas, like "Remove Action: Change Subscribers".
  - Add a label for the floating header display options menu in Differential.
  - Add `role="button"` to `PHUIButtonView` objects that we render with an `<a ...>` tag.

Test Plan:
Viewed a revision with `?__aural__=true`:

  - Saw "Remove Action: ..." label.
  - Saw "Display Options" label.
  - Used inspector to verify that some `<a class="button" ...>` now have `<a class="button" role="button" ...>`. This isn't exhaustive, but at least improves things. A specific example is the "edit", "reply", etc., actions on inline comments.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19595
---
 resources/celerity/map.php                    | 48 +++++++++----------
 .../view/DifferentialChangesetListView.php    |  1 +
 ...catorApplicationTransactionCommentView.php |  6 ++-
 src/view/phui/PHUIButtonView.php              |  8 ++++
 .../js/application/diff/DiffChangesetList.js  |  7 +--
 .../transactions/behavior-comment-actions.js  |  5 +-
 webroot/rsrc/js/phuix/PHUIXButtonView.js      | 25 ++++++++++
 7 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 2b81560e43..c60c2f7e85 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -12,7 +12,7 @@ return array(
     'core.pkg.css' => 'f515619b',
     'core.pkg.js' => '2058ec09',
     'differential.pkg.css' => '06dc617c',
-    'differential.pkg.js' => '11a08e85',
+    'differential.pkg.js' => 'c1cfa143',
     'diffusion.pkg.css' => 'a2d17c7d',
     'diffusion.pkg.js' => '6134c5a1',
     'maniphest.pkg.css' => '4845691a',
@@ -373,7 +373,7 @@ return array(
     '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' => '7b95a80a',
+    'rsrc/js/application/diff/DiffChangesetList.js' => 'e0b984b5',
     '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',
@@ -423,7 +423,7 @@ return array(
     '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',
-    'rsrc/js/application/transactions/behavior-comment-actions.js' => '9a6dd75c',
+    'rsrc/js/application/transactions/behavior-comment-actions.js' => '54110499',
     'rsrc/js/application/transactions/behavior-reorder-configs.js' => 'd7a74243',
     'rsrc/js/application/transactions/behavior-reorder-fields.js' => 'b59e1e96',
     'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '8f29b364',
@@ -506,7 +506,7 @@ return array(
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => '8d4a8c72',
     'rsrc/js/phuix/PHUIXAutocomplete.js' => 'df1bbd34',
-    'rsrc/js/phuix/PHUIXButtonView.js' => '8a91e1ac',
+    'rsrc/js/phuix/PHUIXButtonView.js' => '85ac9772',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '04b2ae03',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
     'rsrc/js/phuix/PHUIXFormControl.js' => '210a16c1',
@@ -575,7 +575,7 @@ return array(
     'javelin-behavior-bulk-job-reload' => 'edf8a145',
     'javelin-behavior-calendar-month-view' => 'fe33e256',
     'javelin-behavior-choose-control' => '327a00d1',
-    'javelin-behavior-comment-actions' => '9a6dd75c',
+    'javelin-behavior-comment-actions' => '54110499',
     'javelin-behavior-config-reorder-fields' => 'b6993408',
     'javelin-behavior-conpherence-menu' => '4047cd35',
     'javelin-behavior-conpherence-participant-pane' => 'd057e45a',
@@ -752,7 +752,7 @@ return array(
     'phabricator-darkmessage' => 'c48cccdd',
     'phabricator-dashboard-css' => 'fe5b1869',
     'phabricator-diff-changeset' => 'b49b59d6',
-    'phabricator-diff-changeset-list' => '7b95a80a',
+    'phabricator-diff-changeset-list' => 'e0b984b5',
     'phabricator-diff-inline' => 'e83d28f3',
     'phabricator-drag-and-drop-file-upload' => '58dea2fa',
     'phabricator-draggable-list' => 'bea6e7f4',
@@ -858,7 +858,7 @@ return array(
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '8d4a8c72',
     'phuix-autocomplete' => 'df1bbd34',
-    'phuix-button-view' => '8a91e1ac',
+    'phuix-button-view' => '85ac9772',
     'phuix-dropdown-menu' => '04b2ae03',
     'phuix-form-control-view' => '210a16c1',
     'phuix-icon-view' => 'bff6884b',
@@ -1251,6 +1251,15 @@ return array(
       'javelin-vector',
       'javelin-typeahead-static-source',
     ),
+    54110499 => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-dom',
+      'phuix-form-control-view',
+      'phuix-icon-view',
+      'javelin-behavior-phabricator-gesture',
+    ),
     '549459b8' => array(
       'javelin-behavior',
     ),
@@ -1500,10 +1509,6 @@ return array(
       'owners-path-editor',
       'javelin-behavior',
     ),
-    '7b95a80a' => array(
-      'javelin-install',
-      'phuix-button-view',
-    ),
     '7cbe244b' => array(
       'javelin-install',
       'javelin-util',
@@ -1533,6 +1538,10 @@ return array(
       'javelin-dom',
       'javelin-stratcom',
     ),
+    '85ac9772' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     '85ee8ce6' => array(
       'aphront-dialog-view-css',
     ),
@@ -1560,10 +1569,6 @@ return array(
       'javelin-install',
       'javelin-dom',
     ),
-    '8a91e1ac' => array(
-      'javelin-install',
-      'javelin-dom',
-    ),
     '8ce821c5' => array(
       'phabricator-notification',
       'javelin-stratcom',
@@ -1640,15 +1645,6 @@ return array(
       'javelin-mask',
       'phabricator-drag-and-drop-file-upload',
     ),
-    '9a6dd75c' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-dom',
-      'phuix-form-control-view',
-      'phuix-icon-view',
-      'javelin-behavior-phabricator-gesture',
-    ),
     '9a860428' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -2021,6 +2017,10 @@ return array(
       'phuix-icon-view',
       'phabricator-prefab',
     ),
+    'e0b984b5' => array(
+      'javelin-install',
+      'phuix-button-view',
+    ),
     'e1d25dfb' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
index 2ed963bae3..14de553e59 100644
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -309,6 +309,7 @@ final class DifferentialChangesetListView extends AphrontView {
         'Show All Inlines' => pht('Show All Inlines'),
 
         'List Inline Comments' => pht('List Inline Comments'),
+        'Display Options' => pht('Display Options'),
 
         'Hide or show all inline comments.' =>
           pht('Hide or show all inline comments.'),
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
index c0d46e21a5..7469004e1b 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -319,14 +319,18 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
 
       foreach ($comment_actions as $key => $comment_action) {
         $key = $comment_action->getKey();
+        $label = $comment_action->getLabel();
+
+
         $action_map[$key] = array(
           'key' => $key,
-          'label' => $comment_action->getLabel(),
+          'label' => $label,
           'type' => $comment_action->getPHUIXControlType(),
           'spec' => $comment_action->getPHUIXControlSpecification(),
           'initialValue' => $comment_action->getInitialValue(),
           'groupKey' => $comment_action->getGroupKey(),
           'conflictKey' => $comment_action->getConflictKey(),
+          'auralLabel' => pht('Remove Action: %s', $label),
         );
 
         $type_map[$key] = $comment_action;
diff --git a/src/view/phui/PHUIButtonView.php b/src/view/phui/PHUIButtonView.php
index 1fb2206428..bad24122bc 100644
--- a/src/view/phui/PHUIButtonView.php
+++ b/src/view/phui/PHUIButtonView.php
@@ -233,6 +233,13 @@ final class PHUIButtonView extends AphrontTagView {
       $classes = array();
     }
 
+    // See PHI823. If we aren't rendering a "<button>" tag, give the tag we
+    // are rendering a "button" role as a hint to screen readers.
+    $role = null;
+    if ($this->tag !== 'button') {
+      $role = 'button';
+    }
+
     return array(
       'class'  => $classes,
       'href'   => $this->href,
@@ -240,6 +247,7 @@ final class PHUIButtonView extends AphrontTagView {
       'title'  => $this->title,
       'sigil'  => $sigil,
       'meta'   => $meta,
+      'role' => $role,
     );
   }
 
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index 66c80cb9cf..a95267c0a3 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -1662,9 +1662,12 @@ JX.install('DiffChangesetList', {
 
     _getMenuButton: function() {
       if (!this._menuButton) {
+        var pht = this.getTranslations();
+
         var button = new JX.PHUIXButtonView()
           .setIcon('fa-bars')
-          .setButtonType(JX.PHUIXButtonView.BUTTONTYPE_SIMPLE);
+          .setButtonType(JX.PHUIXButtonView.BUTTONTYPE_SIMPLE)
+          .setAuralLabel(pht('Display Options'));
 
         var dropdown = new JX.PHUIXDropdownMenu(button.getNode());
         this._menuItems = {};
@@ -1703,8 +1706,6 @@ JX.install('DiffChangesetList', {
 
         dropdown.listen('open', JX.bind(this, this._ondropdown));
 
-        var pht = this.getTranslations();
-
         if (this.getInlineListURI()) {
           list.addItem(
             new JX.PHUIXActionView()
diff --git a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
index 11141f138a..3bfcd6c8d5 100644
--- a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
+++ b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
@@ -163,9 +163,12 @@ JX.behavior('comment-actions', function(config) {
 
     option.disabled = true;
 
+    var aural = JX.$N('span', {className: 'aural-only'}, action.auralLabel);
+
     var icon = new JX.PHUIXIconView()
       .setIcon('fa-times-circle');
-    var remove = JX.$N('a', {href: '#'}, icon.getNode());
+
+    var remove = JX.$N('a', {href: '#'}, [aural, icon.getNode()]);
 
     var control = new JX.PHUIXFormControl()
       .setLabel(action.label)
diff --git a/webroot/rsrc/js/phuix/PHUIXButtonView.js b/webroot/rsrc/js/phuix/PHUIXButtonView.js
index b7ca44a677..1205ad3d96 100644
--- a/webroot/rsrc/js/phuix/PHUIXButtonView.js
+++ b/webroot/rsrc/js/phuix/PHUIXButtonView.js
@@ -13,6 +13,7 @@ JX.install('PHUIXButtonView', {
   members: {
     _node: null,
     _textNode: null,
+    _auralNode: null,
 
     _iconView: null,
     _color: null,
@@ -69,6 +70,12 @@ JX.install('PHUIXButtonView', {
       return this;
     },
 
+    setAuralLabel: function(label) {
+      JX.DOM.setContent(this._getAuralNode(), label);
+      this._redraw();
+      return this;
+    },
+
     getNode: function() {
       if (!this._node) {
         var attrs = {
@@ -95,13 +102,31 @@ JX.install('PHUIXButtonView', {
       return this._textNode;
     },
 
+    _getAuralNode: function() {
+      if (!this._auralNode) {
+        var attrs = {
+          className: 'aural-only'
+        };
+
+        this._auralNode = JX.$N('span', attrs);
+      }
+
+      return this._auralNode;
+    },
+
     _redraw: function() {
       var node = this.getNode();
 
+      var aural = this._auralNode;
       var icon = this._iconView;
       var text = this._textNode;
 
       var content = [];
+
+      if (aural) {
+        content.push(aural);
+      }
+
       if (icon) {
         content.push(icon.getNode());
       }

From 7ef2bb1b569bd0e6c989a78b701e726fcab3600b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 23 Aug 2018 14:59:42 -0700
Subject: [PATCH 034/125] Support Mercurial "protocaps" wire command

Summary:
Ref T13187. See PHI834. Mercurial has somewhat-recently (changeset is from Jan 2018) introduced a new "protocaps" command, that appears in Mercurial 4.7 and possibly before then.

We must explicitly enumerate all protocol commands because you can't decode the protocol without knowing how many arguments the command expects, so enumerate it.

(Also fix an issue where the related error message had an extra apostrophe.)

Test Plan:
  - Ran `hg clone ...` with client and server on Mercurial 4.7.
  - Before: fatal on unknown "protocaps" command.
  - Midway: better typography in error message.
  - After: clean clone.

Reviewers: amckinley

Maniphest Tasks: T13187

Differential Revision: https://secure.phabricator.com/D19596
---
 .../diffusion/protocol/DiffusionMercurialWireProtocol.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php b/src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php
index 251935a6dc..8a9deb5d84 100644
--- a/src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php
+++ b/src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php
@@ -23,12 +23,16 @@ final class DiffusionMercurialWireProtocol extends Phobject {
       'listkeys' => array('namespace'),
       'lookup' => array('key'),
       'pushkey' => array('namespace', 'key', 'old', 'new'),
+      'protocaps' => array('caps'),
       'stream_out' => array(''),
       'unbundle' => array('heads'),
     );
 
     if (!isset($commands[$command])) {
-      throw new Exception(pht("Unknown Mercurial command '%s!", $command));
+      throw new Exception(
+        pht(
+          'Unknown Mercurial command "%s"!',
+          $command));
     }
 
     return $commands[$command];
@@ -49,6 +53,7 @@ final class DiffusionMercurialWireProtocol extends Phobject {
       'known' => true,
       'listkeys' => true,
       'lookup' => true,
+      'protocaps' => true,
       'stream_out' => true,
     );
 

From ca618a86794f5d3b7df737a6c096bfbad8501b3e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 24 Aug 2018 08:04:46 -0700
Subject: [PATCH 035/125] Document that `phd.taskmasters` is a local setting,
 per daemon

Summary: Ref T13187. See PHI807. The documentation currently does not make it very clear that this is a local setting, per `phd` process. Make it more clear.

Test Plan: {F5827757}

Reviewers: amckinley

Maniphest Tasks: T13187

Differential Revision: https://secure.phabricator.com/D19597
---
 .../config/option/PhabricatorPHDConfigOptions.php     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/applications/config/option/PhabricatorPHDConfigOptions.php b/src/applications/config/option/PhabricatorPHDConfigOptions.php
index bfe7c148c4..37fae45dfb 100644
--- a/src/applications/config/option/PhabricatorPHDConfigOptions.php
+++ b/src/applications/config/option/PhabricatorPHDConfigOptions.php
@@ -34,9 +34,14 @@ final class PhabricatorPHDConfigOptions
         ->setSummary(pht('Maximum taskmaster daemon pool size.'))
         ->setDescription(
           pht(
-            'Maximum number of taskmaster daemons to run at once. Raising '.
-            'this can increase the maximum throughput of the task queue. The '.
-            'pool will automatically scale down when unutilized.')),
+            "Maximum number of taskmaster daemons to run at once. Raising ".
+            "this can increase the maximum throughput of the task queue. The ".
+            "pool will automatically scale down when unutilized.".
+            "\n\n".
+            "If you are running a cluster, this limit applies separately ".
+            "to each instance of `phd`. For example, if this limit is set ".
+            "to `4` and you have three hosts running daemons, the effective ".
+            "global limit will be 12.")),
       $this->newOption('phd.verbose', 'bool', false)
         ->setLocked(true)
         ->setBoolOptions(

From 5e4d9dfa9219cb50b9d3559437855855fb8eb854 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 24 Aug 2018 09:50:36 -0700
Subject: [PATCH 036/125] Condition "Changes Since Last Action" Differential
 link on "first broadcast", not "new object"

Summary: Ref T13187. Ref T13176. With drafts, we actually want to suppress this link on "first broadcast" (the first time we send mail), not on "new object" (when the revision is created as a draft).

Test Plan: Poked at this locally, will keep an eye on it in production.

Reviewers: amckinley

Maniphest Tasks: T13187, T13176

Differential Revision: https://secure.phabricator.com/D19598
---
 .../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 f4dd3f9fe3..9c24a50b4e 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -671,7 +671,7 @@ final class DifferentialTransactionEditor
 
     $this->addCustomFieldsToMailBody($body, $object, $xactions);
 
-    if (!$this->getIsNewObject()) {
+    if (!$this->isFirstBroadcast()) {
       $body->addLinkSection(pht('CHANGES SINCE LAST ACTION'), $new_uri);
     }
 

From b6fa009cf00a6bbd894a49d519e6c1d03a999790 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 24 Aug 2018 10:00:37 -0700
Subject: [PATCH 037/125] Enrich "priority" transactions in Maniphest for
 "transaction.search"

Summary:
Ref T13187. See <https://discourse.phabricator-community.org/t/task-priority-change-info-missing-in-firehose-webhook/1832/2>. We can reasonably enrich these transactions.

Since priorities don't have unique authorative string identifiers, I've mostly mimicked the `maniphest.search` structure.

Test Plan: Called `transaction.search` on tasks which were: created normally, created with a priority change, saw a priority change after creation. All the output looked useful and sensible.

Reviewers: amckinley

Maniphest Tasks: T13187

Differential Revision: https://secure.phabricator.com/D19599
---
 .../ManiphestTaskPriorityTransaction.php      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php b/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
index 83f38fc659..398808e006 100644
--- a/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
+++ b/src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php
@@ -172,4 +172,33 @@ final class ManiphestTaskPriorityTransaction
     return $errors;
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'priority';
+  }
+
+  public function getFieldValuesForConduit($xaction, $data) {
+    $old = $xaction->getOldValue();
+    if ($old !== null) {
+      $old = (int)$old;
+      $old_name = ManiphestTaskPriority::getTaskPriorityName($old);
+    } else {
+      $old_name = null;
+    }
+
+    $new = $xaction->getNewValue();
+    $new = (int)$new;
+    $new_name = ManiphestTaskPriority::getTaskPriorityName($new);
+
+    return array(
+      'old' => array(
+        'value' => $old,
+        'name' => $old_name,
+      ),
+      'new' => array(
+        'value' => $new,
+        'name' => $new_name,
+      ),
+    );
+  }
+
 }

From 8a6d767843631e1858459cf7da018388d022870a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 24 Aug 2018 10:07:47 -0700
Subject: [PATCH 038/125] Fix a minor text alignment issue for static text
 comment actions like "Accept Revision"

Summary:
Ref T13187. See PHI836. The "action" comment actions in Differential (Accept, Reject, etc) render a single line of descriptive text. This is currently slightly misaligned.

Give it similar sizing information to the label element to the left, so it lines up properly.

Test Plan:
Note that "Request Review" and "This revision will be..." are now aligned:

{F5828077}

Reviewers: amckinley

Maniphest Tasks: T13187

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

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index c60c2f7e85..66a568dabe 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'f515619b',
+    'core.pkg.css' => 'fc4839c8',
     'core.pkg.js' => '2058ec09',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c1cfa143',
@@ -151,7 +151,7 @@ return array(
     '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-view.css' => 'f808e5be',
     'rsrc/css/phui/phui-form.css' => '7aaa04e3',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
     'rsrc/css/phui/phui-header-view.css' => 'edeb9252',
@@ -819,7 +819,7 @@ return array(
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
     'phui-form-css' => '7aaa04e3',
-    'phui-form-view-css' => 'ae9f8d16',
+    'phui-form-view-css' => 'f808e5be',
     'phui-head-thing-view-css' => 'fd311e5f',
     'phui-header-view-css' => 'edeb9252',
     'phui-hovercard' => '1bd28176',
diff --git a/webroot/rsrc/css/phui/phui-form-view.css b/webroot/rsrc/css/phui/phui-form-view.css
index 1b7400656a..9824196882 100644
--- a/webroot/rsrc/css/phui/phui-form-view.css
+++ b/webroot/rsrc/css/phui/phui-form-view.css
@@ -546,7 +546,8 @@ properly, and submit values. */
 }
 
 .phui-form-static-action {
-  padding: 4px;
+  height: 28px;
+  line-height: 28px;
   color: {$bluetext};
 }
 

From b584834b193413806e91a03d0e94508f3bcc34e5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 24 Aug 2018 10:18:28 -0700
Subject: [PATCH 039/125] In Differential: when the file tree is enabled,
 default to the "History" tab instead of "Files"

Summary:
Ref T13187. See PHI811. If the file tree is enabled and visible, set the default tab to "History".

  - This is a bit magic.
  - It won't work entirely on mobile (we can't tell that you're on mobile on the server, so we'll pick the "History" tab even though the file tree isn't actually visible on your device).
  - There's no corresponding logic in Diffusion. Diffusion doesn't have the same tab layout, but this makes things somewhat inconsistent.

So I don't love this, but we can try it and see if it's confusing or helpful on the balance.

Test Plan: With filetree on and off, reloaded revisions. Saw appropriate tab selected by default.

Reviewers: amckinley

Maniphest Tasks: T13187

Differential Revision: https://secure.phabricator.com/D19601
---
 .../DifferentialRevisionViewController.php    | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 33440e535f..b809a8ee80 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -463,7 +463,7 @@ final class DifferentialRevisionViewController
       }
     }
 
-    $tab_group = id(new PHUITabGroupView());
+    $tab_group = new PHUITabGroupView();
 
     if ($toc_view) {
       $tab_group->addTab(
@@ -473,17 +473,30 @@ final class DifferentialRevisionViewController
           ->appendChild($toc_view));
     }
 
-    $tab_group
-      ->addTab(
-        id(new PHUITabView())
-          ->setName(pht('History'))
-          ->setKey('history')
-          ->appendChild($history))
-      ->addTab(
-        id(new PHUITabView())
-          ->setName(pht('Commits'))
-          ->setKey('commits')
-          ->appendChild($local_table));
+    $tab_group->addTab(
+      id(new PHUITabView())
+        ->setName(pht('History'))
+        ->setKey('history')
+        ->appendChild($history));
+
+    $filetree_on = $viewer->compareUserSetting(
+      PhabricatorShowFiletreeSetting::SETTINGKEY,
+      PhabricatorShowFiletreeSetting::VALUE_ENABLE_FILETREE);
+
+    $collapsed_key = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
+    $filetree_collapsed = (bool)$viewer->getUserSetting($collapsed_key);
+
+    // See PHI811. If the viewer has the file tree on, the files tab with the
+    // table of contents is redundant, so default to the "History" tab instead.
+    if ($filetree_on && !$filetree_collapsed) {
+      $tab_group->selectTab('history');
+    }
+
+    $tab_group->addTab(
+      id(new PHUITabView())
+        ->setName(pht('Commits'))
+        ->setKey('commits')
+        ->appendChild($local_table));
 
     $stack_graph = id(new DifferentialRevisionGraph())
       ->setViewer($viewer)
@@ -601,22 +614,15 @@ final class DifferentialRevisionViewController
     $crumbs->addTextCrumb($monogram);
     $crumbs->setBorder(true);
 
-    $filetree_on = $viewer->compareUserSetting(
-      PhabricatorShowFiletreeSetting::SETTINGKEY,
-      PhabricatorShowFiletreeSetting::VALUE_ENABLE_FILETREE);
-
     $nav = null;
     if ($filetree_on && !$this->isVeryLargeDiff()) {
-      $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)
+        ->setCollapsed($filetree_collapsed)
         ->setWidth((int)$width_value)
         ->build($changesets);
     }

From 4d89afcc6149974a08fe57f1dc009426fad39b35 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Aug 2018 14:29:23 -0700
Subject: [PATCH 040/125] Remove requireCapabilities() from
 ApplicationTransactionEditor and require CAN_EDIT by default

Summary:
Depends on D19585. Ref T13164.

Almost all transactions require CAN_EDIT on the object, but they generally do not enforce this directly today. Instead, this is effectively enforced by Controllers, API methods, and EditEngine doing a `CAN_EDIT` check when loading the object to be edited.

A small number of transactions do not require CAN_EDIT, and instead require only a weaker/lesser permission. These are:

  - Joining a project which you have CAN_JOIN on.
  - Leaving a project which isn't locked.
  - Joining a Conpherence thread you can see (today, no separate CAN_JOIN permission for Conpherence).
  - Leaving a Conpherence thread.
  - Unsubscribing.
  - Using the special `!history` command from email.

Additionally, these require CAN_INTERACT, which is weaker than CAN_EDIT:

  - Adding comments.
  - Subscribing.
  - Awarding tokens.

Soon, I want to add "disabling users" to this list, so that you can disable users if you have "Can Disable User" permission, even if you can not otherwise edit users.

It's possible this list isn't exhaustive, so this change might break something by adding a policy check to a place where we previously didn't have one. If so, we can go weaken that policy check to the appropriate level.

Enforcement of these special cases is currently weird:

  - We mostly don't actually enforce CAN_EDIT in the Editor; instead, it's enforced before you get to the editor (in EditEngine/Controllers).
  - To apply a weaker requirement (like leaving comments or leaving a project), we let you get through the Controller without CAN_EDIT, then apply the weaker policy check in the Editor.
  - Some transactions apply a confusing/redundant explicit CAN_EDIT policy check. These mostly got cleaned up in previous changes.

Instead, the new world order is:

  - Every transaction has capability/policy requirements.
  - The default is CAN_EDIT, but transactions can weaken this explicitly they want.
  - So now we'll get requirements right in the Editor, even if Controllers or API endpoints make a mistake.
  - And you don't have to copy/paste a bunch of code to say "yes, every transaction should require CAN_EDIT".

Test Plan:
- Tried to add members to a Conpherence thread I could not edit (permissions error).
- Left a Conpherence thread I could not edit (worked properly).
- Joined a thread I could see but could not edit (worked properly).
- Tried to join a thread I could not see (permissions error).
- Implemented `requireCapabilites()` on ManiphestTransactionEditor and tried to edit a task (upgrade guidance error).
- Mentioned an object I can not edit on another object (works).
- Mentioned another object on an object I can not edit (works).
- Added a `{F...}` reference to an object I can not edit (works).
- Awarded tokens to an object I can not edit (works).
- Subscribed/unsubscribed from an object I can not edit (works).
- Muted/unmuted an object I can not edit (works).
- Tried to do other types of edits to an object I can not edit (correctly results in a permissions error).
- Joined and left a project I can not edit (works).
- Tried to edit and add members to a project I can not edit (permissions error).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13164

Differential Revision: https://secure.phabricator.com/D19586
---
 .../conpherence/editor/ConpherenceEditor.php  |  43 ----
 ...npherenceThreadParticipantsTransaction.php |  30 +++
 .../PhabricatorProjectTransactionEditor.php   |  52 -----
 ...PhabricatorSubscriptionsMuteController.php |   2 -
 ...habricatorApplicationTransactionEditor.php | 184 +++++++++++++++---
 .../PhabricatorModularTransactionType.php     |  26 +++
 6 files changed, 214 insertions(+), 123 deletions(-)

diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
index 3d451e78d3..3b4ad09e11 100644
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -146,49 +146,6 @@ final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
     return $xactions;
   }
 
-  protected function requireCapabilities(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    parent::requireCapabilities($object, $xaction);
-
-    switch ($xaction->getTransactionType()) {
-      case ConpherenceThreadParticipantsTransaction::TRANSACTIONTYPE:
-        $old_map = array_fuse($xaction->getOldValue());
-        $new_map = array_fuse($xaction->getNewValue());
-
-        $add = array_keys(array_diff_key($new_map, $old_map));
-        $rem = array_keys(array_diff_key($old_map, $new_map));
-
-        $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:
-      case ConpherenceThreadTopicTransaction::TRANSACTIONTYPE:
-        PhabricatorPolicyFilter::requireCapability(
-          $this->requireActor(),
-          $object,
-          PhabricatorPolicyCapability::CAN_EDIT);
-        break;
-    }
-  }
-
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
diff --git a/src/applications/conpherence/xaction/ConpherenceThreadParticipantsTransaction.php b/src/applications/conpherence/xaction/ConpherenceThreadParticipantsTransaction.php
index 681c6d639c..c0e4c7c501 100644
--- a/src/applications/conpherence/xaction/ConpherenceThreadParticipantsTransaction.php
+++ b/src/applications/conpherence/xaction/ConpherenceThreadParticipantsTransaction.php
@@ -114,4 +114,34 @@ final class ConpherenceThreadParticipantsTransaction
     return $errors;
   }
 
+  public function getRequiredCapabilities(
+    $object,
+    PhabricatorApplicationTransaction $xaction) {
+
+    $old_map = array_fuse($xaction->getOldValue());
+    $new_map = array_fuse($xaction->getNewValue());
+
+    $add = array_keys(array_diff_key($new_map, $old_map));
+    $rem = array_keys(array_diff_key($old_map, $new_map));
+
+    $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.
+      return null;
+    }
+
+    if ($is_leave) {
+      // Anyone can leave a thread.
+      return null;
+    }
+
+    // You need CAN_EDIT to add or remove participants. For additional
+    // discussion, see D17696 and T4411.
+    return PhabricatorPolicyCapability::CAN_EDIT;
+  }
+
 }
diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
index ef0cc65c8e..581ec23153 100644
--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
@@ -115,58 +115,6 @@ final class PhabricatorProjectTransactionEditor
     return $errors;
   }
 
-  protected function requireCapabilities(
-    PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
-
-    switch ($xaction->getTransactionType()) {
-      case PhabricatorTransactions::TYPE_EDGE:
-        switch ($xaction->getMetadataValue('edge:type')) {
-          case PhabricatorProjectProjectHasMemberEdgeType::EDGECONST:
-            $old = $xaction->getOldValue();
-            $new = $xaction->getNewValue();
-
-            $add = array_keys(array_diff_key($new, $old));
-            $rem = array_keys(array_diff_key($old, $new));
-
-            $actor_phid = $this->requireActor()->getPHID();
-
-            $is_join = (($add === array($actor_phid)) && !$rem);
-            $is_leave = (($rem === array($actor_phid)) && !$add);
-
-            if ($is_join) {
-              // You need CAN_JOIN to join a project.
-              PhabricatorPolicyFilter::requireCapability(
-                $this->requireActor(),
-                $object,
-                PhabricatorPolicyCapability::CAN_JOIN);
-            } else if ($is_leave) {
-              // You usually don't need any capabilities to leave a project.
-              if ($object->getIsMembershipLocked()) {
-                // you must be able to edit though to leave locked projects
-                PhabricatorPolicyFilter::requireCapability(
-                  $this->requireActor(),
-                  $object,
-                  PhabricatorPolicyCapability::CAN_EDIT);
-              }
-            } else {
-              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;
-        }
-        break;
-    }
-
-    return parent::requireCapabilities($object, $xaction);
-  }
-
   protected function willPublish(PhabricatorLiskDAO $object, array $xactions) {
     // NOTE: We're using the omnipotent user here because the original actor
     // may no longer have permission to view the object.
diff --git a/src/applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php b/src/applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php
index 1369643ffc..e29d5e3802 100644
--- a/src/applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php
+++ b/src/applications/subscriptions/controller/PhabricatorSubscriptionsMuteController.php
@@ -44,8 +44,6 @@ final class PhabricatorSubscriptionsMuteController
         );
       }
 
-      $muted_type = PhabricatorMutedByEdgeType::EDGECONST;
-
       $xaction = id($object->getApplicationTransactionTemplate())
         ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
         ->setMetadataValue('edge:type', $muted_type)
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 7e98ebb364..1873fcb6e4 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -976,6 +976,27 @@ abstract class PhabricatorApplicationTransactionEditor
         $this->adjustTransactionValues($object, $xaction);
       }
 
+      // Now that we've merged and combined transactions, check for required
+      // capabilities. Note that we're doing this before filtering
+      // transactions: if you try to apply an edit which you do not have
+      // permission to apply, we want to give you a permissions error even
+      // if the edit would have no effect.
+      $this->applyCapabilityChecks($object, $xactions);
+
+      // See T13186. Fatal hard if this object has an older
+      // "requireCapabilities()" method. The code may rely on this method being
+      // called to apply policy checks, so err on the side of safety and fatal.
+      // TODO: Remove this check after some time has passed.
+      if (method_exists($this, 'requireCapabilities')) {
+        throw new Exception(
+          pht(
+            'Editor (of class "%s") implements obsolete policy method '.
+            'requireCapabilities(). The implementation for this Editor '.
+            'MUST be updated. See <%s> for discussion.',
+            get_class($this),
+            'https://secure.phabricator.com/T13186'));
+      }
+
       $xactions = $this->filterTransactions($object, $xactions);
 
       // TODO: Once everything is on EditEngine, just use getIsNewObject() to
@@ -994,12 +1015,6 @@ abstract class PhabricatorApplicationTransactionEditor
         }
       }
 
-      // 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);
 
@@ -1459,34 +1474,151 @@ abstract class PhabricatorApplicationTransactionEditor
     }
   }
 
-  protected function requireCapabilities(
+  private function applyCapabilityChecks(
     PhabricatorLiskDAO $object,
-    PhabricatorApplicationTransaction $xaction) {
+    array $xactions) {
+    assert_instances_of($xactions, 'PhabricatorApplicationTransaction');
+
+    $can_edit = PhabricatorPolicyCapability::CAN_EDIT;
 
     if ($this->getIsNewObject()) {
-      return;
+      // If we're creating a new object, we don't need any special capabilities
+      // on the object. The actor has already made it through creation checks,
+      // and objects which haven't been created yet often can not be
+      // meaningfully tested for capabilities anyway.
+      $required_capabilities = array();
+    } else {
+      if (!$xactions && !$this->xactions) {
+        // If we aren't doing anything, require CAN_EDIT to improve consistency.
+        $required_capabilities = array($can_edit);
+      } else {
+        $required_capabilities = array();
+
+        foreach ($xactions as $xaction) {
+          $type = $xaction->getTransactionType();
+
+          $xtype = $this->getModularTransactionType($type);
+          if (!$xtype) {
+            $capabilities = $this->getLegacyRequiredCapabilities($xaction);
+          } else {
+            $capabilities = $xtype->getRequiredCapabilities($object, $xaction);
+          }
+
+          // For convenience, we allow flexibility in the return types because
+          // it's very unusual that a transaction actually requires multiple
+          // capability checks.
+          if ($capabilities === null) {
+            $capabilities = array();
+          } else {
+            $capabilities = (array)$capabilities;
+          }
+
+          foreach ($capabilities as $capability) {
+            $required_capabilities[$capability] = $capability;
+          }
+        }
+      }
     }
 
-    $actor = $this->requireActor();
-    switch ($xaction->getTransactionType()) {
-      case PhabricatorTransactions::TYPE_COMMENT:
-        PhabricatorPolicyFilter::requireCapability(
-          $actor,
-          $object,
-          PhabricatorPolicyCapability::CAN_VIEW);
-        break;
-      case PhabricatorTransactions::TYPE_VIEW_POLICY:
-      case PhabricatorTransactions::TYPE_EDIT_POLICY:
-      case PhabricatorTransactions::TYPE_JOIN_POLICY:
-      case PhabricatorTransactions::TYPE_SPACE:
-        PhabricatorPolicyFilter::requireCapability(
-          $actor,
-          $object,
-          PhabricatorPolicyCapability::CAN_EDIT);
-        break;
+    $required_capabilities = array_fuse($required_capabilities);
+    $actor = $this->getActor();
+
+    if ($required_capabilities) {
+      id(new PhabricatorPolicyFilter())
+        ->setViewer($actor)
+        ->requireCapabilities($required_capabilities)
+        ->raisePolicyExceptions(true)
+        ->apply(array($object));
     }
   }
 
+  private function getLegacyRequiredCapabilities(
+    PhabricatorApplicationTransaction $xaction) {
+
+    $type = $xaction->getTransactionType();
+    switch ($type) {
+      case PhabricatorTransactions::TYPE_COMMENT:
+        // TODO: Comments technically require CAN_INTERACT, but this is
+        // currently somewhat special and handled through EditEngine. For now,
+        // don't enforce it here.
+        return null;
+      case PhabricatorTransactions::TYPE_SUBSCRIBERS:
+        // TODO: Removing subscribers other than yourself should probably
+        // require CAN_EDIT permission. You can do this via the API but
+        // generally can not via the web interface.
+        return null;
+      case PhabricatorTransactions::TYPE_TOKEN:
+        // TODO: This technically requires CAN_INTERACT, like comments.
+        return null;
+      case PhabricatorTransactions::TYPE_HISTORY:
+        // This is a special magic transaction which sends you history via
+        // email and is only partially supported in the upstream. You don't
+        // need any capabilities to apply it.
+        return null;
+      case PhabricatorTransactions::TYPE_EDGE:
+        return $this->getLegacyRequiredEdgeCapabilities($xaction);
+      default:
+        // For other older (non-modular) transactions, always require exactly
+        // CAN_EDIT. Transactions which do not need CAN_EDIT or need additional
+        // capabilities must move to ModularTransactions.
+        return PhabricatorPolicyCapability::CAN_EDIT;
+    }
+  }
+
+  private function getLegacyRequiredEdgeCapabilities(
+    PhabricatorApplicationTransaction $xaction) {
+
+    // You don't need to have edit permission on an object to mention it or
+    // otherwise add a relationship pointing toward it.
+    if ($this->getIsInverseEdgeEditor()) {
+      return null;
+    }
+
+    $edge_type = $xaction->getMetadataValue('edge:type');
+    switch ($edge_type) {
+      case PhabricatorMutedByEdgeType::EDGECONST:
+        // At time of writing, you can only write this edge for yourself, so
+        // you don't need permissions. If you can eventually mute an object
+        // for other users, this would need to be revisited.
+        return null;
+      case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
+        return null;
+      case PhabricatorProjectProjectHasMemberEdgeType::EDGECONST:
+        $old = $xaction->getOldValue();
+        $new = $xaction->getNewValue();
+
+        $add = array_keys(array_diff_key($new, $old));
+        $rem = array_keys(array_diff_key($old, $new));
+
+        $actor_phid = $this->requireActor()->getPHID();
+
+        $is_join = (($add === array($actor_phid)) && !$rem);
+        $is_leave = (($rem === array($actor_phid)) && !$add);
+
+        if ($is_join) {
+          // You need CAN_JOIN to join a project.
+          return PhabricatorPolicyCapability::CAN_JOIN;
+        }
+
+        if ($is_leave) {
+          $object = $this->object;
+          // You usually don't need any capabilities to leave a project...
+          if ($object->getIsMembershipLocked()) {
+            // ...you must be able to edit to leave locked projects, though.
+            return PhabricatorPolicyCapability::CAN_EDIT;
+          } else {
+            return null;
+          }
+        }
+
+        // You need CAN_EDIT to change members other than yourself.
+        return PhabricatorPolicyCapability::CAN_EDIT;
+      default:
+        return PhabricatorPolicyCapability::CAN_EDIT;
+    }
+  }
+
+
   private function buildSubscribeTransaction(
     PhabricatorLiskDAO $object,
     array $xactions,
diff --git a/src/applications/transactions/storage/PhabricatorModularTransactionType.php b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
index b0714aeccf..3d81e02c38 100644
--- a/src/applications/transactions/storage/PhabricatorModularTransactionType.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
@@ -366,4 +366,30 @@ abstract class PhabricatorModularTransactionType
       $capability);
   }
 
+  /**
+   * Get a list of capabilities the actor must have on the object to apply
+   * a transaction to it.
+   *
+   * Usually, you should use this to reduce capability requirements when a
+   * transaction (like leaving a Conpherence thread) can be applied without
+   * having edit permission on the object. You can override this method to
+   * remove the CAN_EDIT requirement, or to replace it with a different
+   * requirement.
+   *
+   * If you are increasing capability requirements and need to add an
+   * additional capability or policy requirement above and beyond CAN_EDIT, it
+   * is usually better implemented as a validation check.
+   *
+   * @param object Object being edited.
+   * @param PhabricatorApplicationTransaction Transaction being applied.
+   * @return null|const|list<const> A capability constant (or list of
+   *    capability constants) which the actor must have on the object. You can
+   *    return `null` as a shorthand for "no capabilities are required".
+   */
+  public function getRequiredCapabilities(
+    $object,
+    PhabricatorApplicationTransaction $xaction) {
+    return PhabricatorPolicyCapability::CAN_EDIT;
+  }
+
 }

From 2f7b10c023b96722dee3489419cfb5acd74f363a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 06:32:21 -0700
Subject: [PATCH 041/125] Replace "Disable User" web UI flow with transactions

Summary:
Ref T13189. See PHI642. Upgrades the "Disable" action in the web UI to be transaction-based.

This technically breaks things a little (you can't disable non-bot users, since they now require CAN_EDIT and you won't have it) but an upcoming change will fix the permissions issue.

Test Plan: Disabled and enabled a (bot) user from the web UI.

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19604
---
 .../PhabricatorPeopleDisableController.php          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/applications/people/controller/PhabricatorPeopleDisableController.php b/src/applications/people/controller/PhabricatorPeopleDisableController.php
index a556f8e519..f51f42047b 100644
--- a/src/applications/people/controller/PhabricatorPeopleDisableController.php
+++ b/src/applications/people/controller/PhabricatorPeopleDisableController.php
@@ -39,9 +39,18 @@ final class PhabricatorPeopleDisableController
     }
 
     if ($request->isFormPost()) {
-      id(new PhabricatorUserEditor())
+      $xactions = array();
+
+      $xactions[] = id(new PhabricatorUserTransaction())
+        ->setTransactionType(PhabricatorUserDisableTransaction::TRANSACTIONTYPE)
+        ->setNewValue($should_disable);
+
+      id(new PhabricatorUserTransactionEditor())
         ->setActor($viewer)
-        ->disableUser($user, $should_disable);
+        ->setContentSourceFromRequest($request)
+        ->setContinueOnMissingFields(true)
+        ->setContinueOnNoEffect(true)
+        ->applyTransactions($user, $xactions);
 
       return id(new AphrontRedirectResponse())->setURI($done_uri);
     }

From 8cf56913d8ef1a5c8cdbfbe94057177b00d83f34 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 13 Aug 2018 15:32:30 -0700
Subject: [PATCH 042/125] Deprecate "user.enable" and "user.disable" API
 methods, redefine them in terms of "user.edit"

Summary:
Depends on D19604. Ref T13189. See PHI642. Deprecates these in favor of "user.edit", redefines them in terms of it, and removes the old `disableUser()` method.

I kept the "is admin" permissions check for consistency, since these methods have always said "(admin only)". This check may not be the most tailored check soon, but we can just keep executing it in addition to the real check.

For now, this change stops this method from actually disabling non-bot users (since it implicitly adds a CAN_EDIT requirement, and even administrators don't have that). An upcoming change will fix that.

Test Plan: Enabled and disabled a (bot) user via these methods. Checked API UI, saw them marked as "disabled".

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19605
---
 .../conduit/UserDisableConduitAPIMethod.php   | 28 +++++++++++--
 .../conduit/UserEnableConduitAPIMethod.php    | 28 +++++++++++--
 .../people/editor/PhabricatorUserEditor.php   | 39 -------------------
 3 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/src/applications/people/conduit/UserDisableConduitAPIMethod.php b/src/applications/people/conduit/UserDisableConduitAPIMethod.php
index 3512d3f742..a6f2e2c4f1 100644
--- a/src/applications/people/conduit/UserDisableConduitAPIMethod.php
+++ b/src/applications/people/conduit/UserDisableConduitAPIMethod.php
@@ -10,6 +10,14 @@ final class UserDisableConduitAPIMethod extends UserConduitAPIMethod {
     return pht('Permanently disable specified users (admin only).');
   }
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_DEPRECATED;
+  }
+
+  public function getMethodStatusDescription() {
+    return pht('Obsoleted by method "user.edit".');
+  }
+
   protected function defineParamTypes() {
     return array(
       'phids' => 'required list<phid>',
@@ -43,11 +51,23 @@ final class UserDisableConduitAPIMethod extends UserConduitAPIMethod {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
-    foreach ($users as $user) {
-      id(new PhabricatorUserEditor())
-        ->setActor($actor)
-        ->disableUser($user, true);
+    foreach ($phids as $phid) {
+      $params = array(
+        'transactions' => array(
+          array(
+            'type' => 'disabled',
+            'value' => true,
+          ),
+        ),
+        'objectIdentifier' => $phid,
+      );
+
+      id(new ConduitCall('user.edit', $params))
+        ->setUser($actor)
+        ->execute();
     }
+
+    return null;
   }
 
 }
diff --git a/src/applications/people/conduit/UserEnableConduitAPIMethod.php b/src/applications/people/conduit/UserEnableConduitAPIMethod.php
index f7cb117df6..3e4e09b778 100644
--- a/src/applications/people/conduit/UserEnableConduitAPIMethod.php
+++ b/src/applications/people/conduit/UserEnableConduitAPIMethod.php
@@ -10,6 +10,14 @@ final class UserEnableConduitAPIMethod extends UserConduitAPIMethod {
     return pht('Re-enable specified users (admin only).');
   }
 
+  public function getMethodStatus() {
+    return self::METHOD_STATUS_DEPRECATED;
+  }
+
+  public function getMethodStatusDescription() {
+    return pht('Obsoleted by method "user.edit".');
+  }
+
   protected function defineParamTypes() {
     return array(
       'phids' => 'required list<phid>',
@@ -43,11 +51,23 @@ final class UserEnableConduitAPIMethod extends UserConduitAPIMethod {
       throw new ConduitException('ERR-BAD-PHID');
     }
 
-    foreach ($users as $user) {
-      id(new PhabricatorUserEditor())
-        ->setActor($actor)
-        ->disableUser($user, false);
+    foreach ($phids as $phid) {
+      $params = array(
+        'transactions' => array(
+          array(
+            'type' => 'disabled',
+            'value' => false,
+          ),
+        ),
+        'objectIdentifier' => $phid,
+      );
+
+      id(new ConduitCall('user.edit', $params))
+        ->setUser($actor)
+        ->execute();
     }
+
+    return null;
   }
 
 }
diff --git a/src/applications/people/editor/PhabricatorUserEditor.php b/src/applications/people/editor/PhabricatorUserEditor.php
index 786ead79c3..58c2ba1ff1 100644
--- a/src/applications/people/editor/PhabricatorUserEditor.php
+++ b/src/applications/people/editor/PhabricatorUserEditor.php
@@ -293,45 +293,6 @@ final class PhabricatorUserEditor extends PhabricatorEditor {
     return $this;
   }
 
-  /**
-   * @task role
-   */
-  public function disableUser(PhabricatorUser $user, $disable) {
-    $actor = $this->requireActor();
-
-    if (!$user->getID()) {
-      throw new Exception(pht('User has not been created yet!'));
-    }
-
-    $user->openTransaction();
-      $user->beginWriteLocking();
-
-        $user->reload();
-        if ($user->getIsDisabled() == $disable) {
-          $user->endWriteLocking();
-          $user->killTransaction();
-          return $this;
-        }
-
-        $log = PhabricatorUserLog::initializeNewLog(
-          $actor,
-          $user->getPHID(),
-          PhabricatorUserLog::ACTION_DISABLE);
-        $log->setOldValue($user->getIsDisabled());
-        $log->setNewValue($disable);
-
-        $user->setIsDisabled((int)$disable);
-        $user->save();
-
-        $log->save();
-
-      $user->endWriteLocking();
-    $user->saveTransaction();
-
-    return $this;
-  }
-
-
   /**
    * @task role
    */

From 058952e72ecf032735ea019e33014c9981229023 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Aug 2018 08:50:32 -0700
Subject: [PATCH 043/125] Add a "Can Disable Users" capability to the "People"
 application

Summary:
Depends on D19605. Ref T13189. See PHI642. This adds a separate "Can Disable Users" capability, and makes the underlying transaction use it.

This doesn't actually let you weaken the permission, since all pathways need more permissions:

  - `user.edit` needs CAN_EDIT.
  - `user.disable/enable` need admin.
  - Web UI workflow needs admin.

Upcoming changes will update these pathways.

Without additional changes, this does let you //strengthen// the permission.

This also fixes the inability to disable non-bot users via the web UI.

Test Plan:
  - Set permission to "No One", tried to disable users. Got a tailored policy error.
  - Set permission to "All Users", disabled/enabled a non-bot user.

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19606
---
 src/__phutil_library_map__.php                   |  2 ++
 .../application/PhabricatorPeopleApplication.php |  3 +++
 .../capability/PeopleDisableUsersCapability.php  | 16 ++++++++++++++++
 .../PhabricatorUserDisableTransaction.php        | 14 ++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 src/applications/people/capability/PeopleDisableUsersCapability.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index af6fa96ba3..05ef3c96fe 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2042,6 +2042,7 @@ phutil_register_library_map(array(
     'PasteSearchConduitAPIMethod' => 'applications/paste/conduit/PasteSearchConduitAPIMethod.php',
     'PeopleBrowseUserDirectoryCapability' => 'applications/people/capability/PeopleBrowseUserDirectoryCapability.php',
     'PeopleCreateUsersCapability' => 'applications/people/capability/PeopleCreateUsersCapability.php',
+    'PeopleDisableUsersCapability' => 'applications/people/capability/PeopleDisableUsersCapability.php',
     'PeopleHovercardEngineExtension' => 'applications/people/engineextension/PeopleHovercardEngineExtension.php',
     'PeopleMainMenuBarExtension' => 'applications/people/engineextension/PeopleMainMenuBarExtension.php',
     'PeopleUserLogGarbageCollector' => 'applications/people/garbagecollector/PeopleUserLogGarbageCollector.php',
@@ -7592,6 +7593,7 @@ phutil_register_library_map(array(
     'PasteSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'PeopleBrowseUserDirectoryCapability' => 'PhabricatorPolicyCapability',
     'PeopleCreateUsersCapability' => 'PhabricatorPolicyCapability',
+    'PeopleDisableUsersCapability' => 'PhabricatorPolicyCapability',
     'PeopleHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
     'PeopleMainMenuBarExtension' => 'PhabricatorMainMenuBarExtension',
     'PeopleUserLogGarbageCollector' => 'PhabricatorGarbageCollector',
diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php
index 6322b29b24..9238d8da3b 100644
--- a/src/applications/people/application/PhabricatorPeopleApplication.php
+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
@@ -97,6 +97,9 @@ final class PhabricatorPeopleApplication extends PhabricatorApplication {
       PeopleCreateUsersCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
+      PeopleDisableUsersCapability::CAPABILITY => array(
+        'default' => PhabricatorPolicies::POLICY_ADMIN,
+      ),
       PeopleBrowseUserDirectoryCapability::CAPABILITY => array(),
     );
   }
diff --git a/src/applications/people/capability/PeopleDisableUsersCapability.php b/src/applications/people/capability/PeopleDisableUsersCapability.php
new file mode 100644
index 0000000000..bb58ed2e76
--- /dev/null
+++ b/src/applications/people/capability/PeopleDisableUsersCapability.php
@@ -0,0 +1,16 @@
+<?php
+
+final class PeopleDisableUsersCapability
+  extends PhabricatorPolicyCapability {
+
+  const CAPABILITY = 'people.disable.users';
+
+  public function getCapabilityName() {
+    return pht('Can Disable Users');
+  }
+
+  public function describeCapabilityRejection() {
+    return pht('You do not have permission to disable or enable users.');
+  }
+
+}
diff --git a/src/applications/people/xaction/PhabricatorUserDisableTransaction.php b/src/applications/people/xaction/PhabricatorUserDisableTransaction.php
index 0ea6ef36c1..ab399a28e0 100644
--- a/src/applications/people/xaction/PhabricatorUserDisableTransaction.php
+++ b/src/applications/people/xaction/PhabricatorUserDisableTransaction.php
@@ -60,6 +60,10 @@ final class PhabricatorUserDisableTransaction
         continue;
       }
 
+      // You must have the "Can Disable Users" permission to disable a user.
+      $this->requireApplicationCapability(
+        PeopleDisableUsersCapability::CAPABILITY);
+
       if ($this->getActingAsPHID() === $object->getPHID()) {
         $errors[] = $this->newInvalidError(
           pht('You can not enable or disable your own account.'));
@@ -69,4 +73,14 @@ final class PhabricatorUserDisableTransaction
     return $errors;
   }
 
+  public function getRequiredCapabilities(
+    $object,
+    PhabricatorApplicationTransaction $xaction) {
+
+    // You do not need to be able to edit users to disable them. Instead, this
+    // requirement is replaced with a requirement that you have the "Can
+    // Disable Users" permission.
+
+    return null;
+  }
 }

From f9192d07f2c798b5f4257c7cdf6cfb566fe6e3cc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 14 Aug 2018 10:43:40 -0700
Subject: [PATCH 044/125] Align web UI "Disable" and "Approve/Disapprove" flows
 with new "Can Disable Users" permission

Summary:
Depends on D19606. Ref T13189. See PHI642.

  - Disabling/enabling users no longer requires admin. Now, you just need "Can Disable Users".
  - Update the UI to appropriately show the action in black or grey depending on what clicking the button will do.
  - For "Approve/Disapprove", fix a couple bugs, then let them go through without respect for "Can Disable Users". This is conceptually a different action, even though it ultimately sets the "Disabled" flag.

Test Plan:
  - Disabled/enabled users from the web UI as various users, including a non-administrator with "Can Disable Users".
  - Hit permissions errors from the web UI as various users, including an administrator without "Can Disable Users".
  - Saw the "Disable/Enable" action activate properly based on whether clicking the button would actually work.
  - Disapproved a user without "Can Disable Users" permission, tried to re-disapprove a user.
  - Approved a user, tried to reapprove a user.

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19607
---
 .../PhabricatorPeopleApproveController.php    |  7 ++++
 .../PhabricatorPeopleDisableController.php    | 34 +++++++++++++++++--
 ...abricatorPeopleProfileManageController.php | 19 +++++++----
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/applications/people/controller/PhabricatorPeopleApproveController.php b/src/applications/people/controller/PhabricatorPeopleApproveController.php
index 58cd2e2119..0e97ad6ee6 100644
--- a/src/applications/people/controller/PhabricatorPeopleApproveController.php
+++ b/src/applications/people/controller/PhabricatorPeopleApproveController.php
@@ -16,6 +16,13 @@ final class PhabricatorPeopleApproveController
 
     $done_uri = $this->getApplicationURI('query/approval/');
 
+    if ($user->getIsApproved()) {
+      return $this->newDialog()
+        ->setTitle(pht('Already Approved'))
+        ->appendChild(pht('This user has already been approved.'))
+        ->addCancelButton($done_uri);
+    }
+
     if ($request->isFormPost()) {
       id(new PhabricatorUserEditor())
         ->setActor($viewer)
diff --git a/src/applications/people/controller/PhabricatorPeopleDisableController.php b/src/applications/people/controller/PhabricatorPeopleDisableController.php
index f51f42047b..9f2718086b 100644
--- a/src/applications/people/controller/PhabricatorPeopleDisableController.php
+++ b/src/applications/people/controller/PhabricatorPeopleDisableController.php
@@ -3,10 +3,14 @@
 final class PhabricatorPeopleDisableController
   extends PhabricatorPeopleController {
 
+  public function shouldRequireAdmin() {
+    return false;
+  }
+
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
     $id = $request->getURIData('id');
-    $via = $request->getURIData('id');
+    $via = $request->getURIData('via');
 
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer($viewer)
@@ -20,11 +24,36 @@ final class PhabricatorPeopleDisableController
     // on profiles and also via the "X" action on the approval queue. We do
     // things slightly differently depending on the context the actor is in.
 
+    // In particular, disabling via "Disapprove" requires you be an
+    // administrator (and bypasses the "Can Disable Users" permission).
+    // Disabling via "Disable" requires the permission only.
+
     $is_disapprove = ($via == 'disapprove');
     if ($is_disapprove) {
       $done_uri = $this->getApplicationURI('query/approval/');
+
+      if (!$viewer->getIsAdmin()) {
+        return $this->newDialog()
+          ->setTitle(pht('No Permission'))
+          ->appendParagraph(pht('Only administrators can disapprove users.'))
+          ->addCancelButton($done_uri);
+      }
+
+      if ($user->getIsApproved()) {
+        return $this->newDialog()
+          ->setTitle(pht('Already Approved'))
+          ->appendParagraph(pht('This user has already been approved.'))
+          ->addCancelButton($done_uri);
+      }
+
+      // On the "Disapprove" flow, bypass the "Can Disable Users" permission.
+      $actor = PhabricatorUser::getOmnipotentUser();
       $should_disable = true;
     } else {
+      $this->requireApplicationCapability(
+        PeopleDisableUsersCapability::CAPABILITY);
+
+      $actor = $viewer;
       $done_uri = $this->getApplicationURI("manage/{$id}/");
       $should_disable = !$user->getIsDisabled();
     }
@@ -46,7 +75,8 @@ final class PhabricatorPeopleDisableController
         ->setNewValue($should_disable);
 
       id(new PhabricatorUserTransactionEditor())
-        ->setActor($viewer)
+        ->setActor($actor)
+        ->setActingAsPHID($viewer->getPHID())
         ->setContentSourceFromRequest($request)
         ->setContinueOnMissingFields(true)
         ->setContinueOnNoEffect(true)
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
index 2ac3e6de89..9759a375c7 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
@@ -75,11 +75,22 @@ final class PhabricatorPeopleProfileManageController
   private function buildCurtain(PhabricatorUser $user) {
     $viewer = $this->getViewer();
 
+    $is_self = ($user->getPHID() === $viewer->getPHID());
+
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $user,
       PhabricatorPolicyCapability::CAN_EDIT);
 
+    $is_admin = $viewer->getIsAdmin();
+    $can_admin = ($is_admin && !$is_self);
+
+    $has_disable = $this->hasApplicationCapability(
+      PeopleDisableUsersCapability::CAPABILITY);
+    $can_disable = ($has_disable && !$is_self);
+
+    $can_welcome = ($is_admin && $user->canEstablishWebSessions());
+
     $curtain = $this->newCurtainView($user);
 
     $curtain->addAction(
@@ -114,10 +125,6 @@ final class PhabricatorPeopleProfileManageController
       $empower_name = pht('Make Administrator');
     }
 
-    $is_admin = $viewer->getIsAdmin();
-    $is_self = ($user->getPHID() === $viewer->getPHID());
-    $can_admin = ($is_admin && !$is_self);
-
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon($empower_icon)
@@ -146,7 +153,7 @@ final class PhabricatorPeopleProfileManageController
       id(new PhabricatorActionView())
         ->setIcon($disable_icon)
         ->setName($disable_name)
-        ->setDisabled(!$can_admin)
+        ->setDisabled(!$can_disable)
         ->setWorkflow(true)
         ->setHref($this->getApplicationURI('disable/'.$user->getID().'/')));
 
@@ -158,8 +165,6 @@ final class PhabricatorPeopleProfileManageController
         ->setWorkflow(true)
         ->setHref($this->getApplicationURI('delete/'.$user->getID().'/')));
 
-    $can_welcome = ($is_admin && $user->canEstablishWebSessions());
-
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-envelope')

From cd8b5b82c8602f64a42efaaaa80ab96f40e6bbea Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 07:52:04 -0700
Subject: [PATCH 045/125] Stop requiring CAN_EDIT to reach the
 TransactionEditor via "*.edit" in EditEngine

Summary:
Depends on D19607. Ref T13189. See PHI642. Ref T13186.

Some transactions can sometimes be applied to objects you can not edit. Currently, using `*.edit` to edit an object always explicitly requires CAN_EDIT.

Now that individual transactions require CAN_EDIT by default and can reduce or replace this requirement, stop requiring CAN_EDIT to reach the editor.

The only expected effect of this change is that low-permission edits (like disabling a user, leaving a project, or leaving a thread) can now work via `*.edit`.

Test Plan:
  - Tried to perform a normal edit (changing a task title) against an object with no CAN_EDIT. Still got a permissions error.
  - As a non-admin, disabled other users while holding the "Can Disable Users" permission.
  - As a non-admin, got a permissions error while trying to disable other users while not holding the "Can Disable Users" permission.

Reviewers: amckinley

Maniphest Tasks: T13189, T13186

Differential Revision: https://secure.phabricator.com/D19608
---
 .../editengine/PhabricatorEditEngine.php           | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index f8f6f371bc..ad495a3a44 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -2003,7 +2003,19 @@ abstract class PhabricatorEditEngine
     $identifier = $request->getValue('objectIdentifier');
     if ($identifier) {
       $this->setIsCreate(false);
-      $object = $this->newObjectFromIdentifier($identifier);
+
+      // After T13186, each transaction can individually weaken or replace the
+      // capabilities required to apply it, so we no longer need CAN_EDIT to
+      // attempt to apply transactions to objects. In practice, almost all
+      // transactions require CAN_EDIT so we won't get very far if we don't
+      // have it.
+      $capabilities = array(
+        PhabricatorPolicyCapability::CAN_VIEW,
+      );
+
+      $object = $this->newObjectFromIdentifier(
+        $identifier,
+        $capabilities);
     } else {
       $this->requireCreateCapability();
 

From 0295a0022917ab7570cda02df27768558474ae80 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 09:27:32 -0700
Subject: [PATCH 046/125] When there are no setup issues, don't show a weird
 empty box

Summary: Ref T13189. When there are no setup issues, we currently double-render a weird setup issues box underneath the notice. Get rid of it.

Test Plan: Viewed page with and without setup issues, saw less awkward UI.

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19609
---
 .../PhabricatorConfigIssueListController.php  | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
index 770f79a9f2..0ca94abe04 100644
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -33,27 +33,26 @@ final class PhabricatorConfigIssueListController
       PhabricatorSetupCheck::GROUP_OTHER,
       'fa-question-circle');
 
-    $no_issues = null;
-    if (empty($issues)) {
-      $no_issues = id(new PHUIInfoView())
+    $title = pht('Setup Issues');
+    $header = $this->buildHeaderView($title);
+
+    if (!$issues) {
+      $issue_list = id(new PHUIInfoView())
         ->setTitle(pht('No Issues'))
         ->appendChild(
           pht('Your install has no current setup issues to resolve.'))
         ->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
+    } else {
+      $issue_list = array(
+        $important,
+        $php,
+        $mysql,
+        $other,
+      );
+
+      $issue_list = $this->buildConfigBoxView(pht('Issues'), $issue_list);
     }
 
-    $title = pht('Setup Issues');
-    $header = $this->buildHeaderView($title);
-
-    $issue_list = array(
-      $important,
-      $php,
-      $mysql,
-      $other,
-    );
-
-    $issue_list = $this->buildConfigBoxView(pht('Issues'), $issue_list);
-
     $crumbs = $this->buildApplicationCrumbs()
       ->addTextCrumb($title)
       ->setBorder(true);
@@ -62,10 +61,7 @@ final class PhabricatorConfigIssueListController
       ->setHeader($header)
       ->setNavigation($nav)
       ->setFixed(true)
-      ->setMainColumn(array(
-        $no_issues,
-        $issue_list,
-      ));
+      ->setMainColumn($issue_list);
 
     return $this->newPage()
       ->setTitle($title)

From b87a809b0bfe9a44243c7540841fdb185207cb0e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 09:48:11 -0700
Subject: [PATCH 047/125] Make some remarkup handling in Config cleaner, fixing
 {{other.option} links

Summary:
Depends on D19609. Ref T13189. At some point, we switched from RemarkupEngine to RemarkupView and lost this piece of hack-magic.

Restore the hack-magic. It's still hack-magic instead of a real rule, but things are at least cleaner than they were before.

Test Plan: Viewed `auth.require-approval`, etc. Saw references to other config options linked properly.

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19610
---
 src/__phutil_library_map__.php                |  5 +--
 .../PhabricatorConfigEditController.php       | 26 +++--------
 .../config/option/PhabricatorConfigOption.php | 43 ++++---------------
 3 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 05ef3c96fe..b6d71ea81b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -8290,10 +8290,7 @@ phutil_register_library_map(array(
     'PhabricatorConfigManualActivity' => 'PhabricatorConfigEntryDAO',
     'PhabricatorConfigModule' => 'Phobject',
     'PhabricatorConfigModuleController' => 'PhabricatorConfigController',
-    'PhabricatorConfigOption' => array(
-      'Phobject',
-      'PhabricatorMarkupInterface',
-    ),
+    'PhabricatorConfigOption' => 'Phobject',
     'PhabricatorConfigOptionType' => 'Phobject',
     'PhabricatorConfigPHIDModule' => 'PhabricatorConfigModule',
     'PhabricatorConfigProxySource' => 'PhabricatorConfigSource',
diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php
index 37f7db6c7c..224705e181 100644
--- a/src/applications/config/controller/PhabricatorConfigEditController.php
+++ b/src/applications/config/controller/PhabricatorConfigEditController.php
@@ -153,30 +153,16 @@ final class PhabricatorConfigEditController
         $e_value);
     }
 
-    $engine = new PhabricatorMarkupEngine();
-    $engine->setViewer($viewer);
-    $engine->addObject($option, 'description');
-    $engine->process();
-    $description = phutil_tag(
-      'div',
-      array(
-        'class' => 'phabricator-remarkup',
-      ),
-      $engine->getOutput($option, 'description'));
-
     $form
       ->setUser($viewer)
       ->addHiddenInput('issue', $request->getStr('issue'));
 
-    $description = $option->getDescription();
-    if (strlen($description)) {
-      $description_view = new PHUIRemarkupView($viewer, $description);
-
-      $form
-        ->appendChild(
-          id(new AphrontFormMarkupControl())
-            ->setLabel(pht('Description'))
-            ->setValue($description_view));
+    $description = $option->newDescriptionRemarkupView($viewer);
+    if ($description) {
+      $form->appendChild(
+        id(new AphrontFormMarkupControl())
+          ->setLabel(pht('Description'))
+          ->setValue($description));
     }
 
     if ($group) {
diff --git a/src/applications/config/option/PhabricatorConfigOption.php b/src/applications/config/option/PhabricatorConfigOption.php
index 11b8de2617..385af002c7 100644
--- a/src/applications/config/option/PhabricatorConfigOption.php
+++ b/src/applications/config/option/PhabricatorConfigOption.php
@@ -1,8 +1,7 @@
 <?php
 
 final class PhabricatorConfigOption
-  extends Phobject
-  implements PhabricatorMarkupInterface {
+  extends Phobject {
 
   private $key;
   private $default;
@@ -204,43 +203,19 @@ final class PhabricatorConfigOption
     return $this;
   }
 
-/* -(  PhabricatorMarkupInterface  )----------------------------------------- */
-
-  public function getMarkupFieldKey($field) {
-    return $this->getKey().':'.$field;
-  }
-
-  public function newMarkupEngine($field) {
-    return PhabricatorMarkupEngine::newMarkupEngine(array());
-  }
-
-  public function getMarkupText($field) {
-    switch ($field) {
-      case 'description':
-        $text = $this->getDescription();
-        break;
-      case 'summary':
-        $text = $this->getSummary();
-        break;
+  public function newDescriptionRemarkupView(PhabricatorUser $viewer) {
+    $description = $this->getDescription();
+    if (!strlen($description)) {
+      return null;
     }
 
-    // TODO: We should probably implement this as a real Markup rule, but
-    // markup rules are a bit of a mess right now and it doesn't hurt us to
-    // fake this.
-    $text = preg_replace(
+    // TODO: Some day, we should probably implement this as a real rule.
+    $description = preg_replace(
       '/{{([^}]+)}}/',
       '[[/config/edit/\\1/ | \\1]]',
-      $text);
+      $description);
 
-    return $text;
-  }
-
-  public function didMarkupText($field, $output, PhutilMarkupEngine $engine) {
-    return $output;
-  }
-
-  public function shouldUseMarkupCache($field) {
-    return false;
+    return new PHUIRemarkupView($viewer, $description);
   }
 
 }

From 415de4ce375a2477be95e37a97be938e3d038e73 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 10:09:13 -0700
Subject: [PATCH 048/125] Repaint filetree more consistently for mobile/device
 views

Summary:
Ref T13189. See <https://discourse.phabricator-community.org/t/diffusion-differential-mobile-layout-broken-when-enabling-file-tree/1751>.

We currently call a nonexistent `resetdrag()` which does nothing. Some sequences of interactions can result in a blank left column in mobile/device widths.

Repaint the filetree away more consistently on device change.

Test Plan: Viewed a revision, toggled filetree off + on, resized to narrow width. Before: bad left margin, JS console error. After: proper repaint at device breakpoint, no JS console error.

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19611
---
 resources/celerity/map.php                    | 26 +++++-----
 .../rsrc/js/core/behavior-phabricator-nav.js  | 51 ++++++++++++-------
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 66a568dabe..d674d399e7 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@ return array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
     'core.pkg.css' => 'fc4839c8',
-    'core.pkg.js' => '2058ec09',
+    'core.pkg.js' => 'b5a949ca',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c1cfa143',
     'diffusion.pkg.css' => 'a2d17c7d',
@@ -473,7 +473,7 @@ return array(
     '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' => '94b7c320',
+    'rsrc/js/core/behavior-phabricator-nav.js' => '9d32bc88',
     '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',
@@ -631,7 +631,7 @@ return array(
     'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '01fca1f0',
     'javelin-behavior-phabricator-line-linker' => '66a62306',
-    'javelin-behavior-phabricator-nav' => '94b7c320',
+    'javelin-behavior-phabricator-nav' => '9d32bc88',
     'javelin-behavior-phabricator-notification-example' => '8ce821c5',
     'javelin-behavior-phabricator-object-selector' => '77c1f0b0',
     'javelin-behavior-phabricator-oncopy' => '2926fff2',
@@ -1628,16 +1628,6 @@ return array(
       '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',
@@ -1658,6 +1648,16 @@ return array(
       'javelin-workflow',
       'javelin-stratcom',
     ),
+    '9d32bc88' => array(
+      'javelin-behavior',
+      'javelin-behavior-device',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-magical-init',
+      'javelin-vector',
+      'javelin-request',
+      'javelin-util',
+    ),
     '9d9685d6' => array(
       'phui-oi-list-view-css',
     ),
diff --git a/webroot/rsrc/js/core/behavior-phabricator-nav.js b/webroot/rsrc/js/core/behavior-phabricator-nav.js
index cf6dc880bc..8bc4ad04e8 100644
--- a/webroot/rsrc/js/core/behavior-phabricator-nav.js
+++ b/webroot/rsrc/js/core/behavior-phabricator-nav.js
@@ -20,10 +20,13 @@ JX.behavior('phabricator-nav', function(config) {
 
 // - Flexible Navigation Column ------------------------------------------------
 
-
   var dragging;
   var track;
 
+  var collapsed = config.collapsed;
+  var narrowed;
+  var visible = null;
+
   JX.enableDispatch(document.body, 'mousemove');
 
   JX.DOM.listen(drag, 'mousedown', null, function(e) {
@@ -95,6 +98,7 @@ JX.behavior('phabricator-nav', function(config) {
     if (!dragging) {
       return;
     }
+
     JX.DOM.alterClass(document.body, 'jx-drag-col', false);
     dragging = false;
 
@@ -117,6 +121,29 @@ JX.behavior('phabricator-nav', function(config) {
     return (JX.$V(drag).x - JX.Vector.getScroll().x);
   }
 
+  function repaint() {
+    narrowed = !JX.Device.isDesktop();
+
+    var was_visible = visible;
+    visible = (!collapsed && !narrowed);
+
+    if (was_visible === visible) {
+      return;
+    }
+
+    if (!visible) {
+      savedrag();
+    }
+
+    JX.DOM.alterClass(main, 'has-local-nav', visible);
+    JX.DOM.alterClass(main, 'has-drag-nav', visible);
+    JX.DOM.alterClass(main, 'has-closed-nav', !visible);
+
+    if (visible) {
+      restoredrag();
+    }
+  }
+
   var saved_width = config.width;
   function savedrag() {
     saved_width = get_width();
@@ -136,21 +163,10 @@ JX.behavior('phabricator-nav', function(config) {
     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);
-
-    if (!collapsed) {
-      restoredrag();
-    }
+    repaint();
 
     new JX.Request('/settings/adjust/', JX.bag)
       .setData({ key : 'nav-collapsed', value : (collapsed ? 1 : 0) })
@@ -168,7 +184,9 @@ JX.behavior('phabricator-nav', function(config) {
   // of the navigation bar.
 
   function onresize() {
-    if (JX.Device.getDevice() != 'desktop') {
+    repaint();
+
+    if (!visible) {
       return;
     }
 
@@ -193,14 +211,13 @@ JX.behavior('phabricator-nav', function(config) {
   local.style.left = 0;
 
   JX.Stratcom.listen(['scroll', 'resize'], null, onresize);
-  onresize();
 
+  repaint();
 
 // - Navigation Reset ----------------------------------------------------------
 
   JX.Stratcom.listen('phabricator-device-change', null, function() {
-    resetdrag();
-    onresize();
+    repaint();
   });
 
 });

From ee823982a46b3cf8d72628f4a7c9a06febc13340 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 10:48:08 -0700
Subject: [PATCH 049/125] Remove another old remarkup engine callsite in Config

Summary: Ref T13189. Summaries do not appear to be meaningfully rendered with Remarkup so just drop the engine. See D19610 for the previous change in this vein.

Test Plan: Viewed config list with option summaries.

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19612
---
 .../controller/PhabricatorConfigGroupController.php      | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/applications/config/controller/PhabricatorConfigGroupController.php b/src/applications/config/controller/PhabricatorConfigGroupController.php
index 7068ddaecc..7a3f77dfea 100644
--- a/src/applications/config/controller/PhabricatorConfigGroupController.php
+++ b/src/applications/config/controller/PhabricatorConfigGroupController.php
@@ -60,17 +60,10 @@ final class PhabricatorConfigGroupController
       $db_values = mpull($db_values, null, 'getConfigKey');
     }
 
-    $engine = id(new PhabricatorMarkupEngine())
-      ->setViewer($this->getRequest()->getUser());
-    foreach ($options as $option) {
-      $engine->addObject($option, 'summary');
-    }
-    $engine->process();
-
     $list = new PHUIObjectItemListView();
     $list->setBig(true);
     foreach ($options as $option) {
-      $summary = $engine->getOutput($option, 'summary');
+      $summary = $option->getSummary();
 
       $item = id(new PHUIObjectItemView())
         ->setHeader($option->getKey())

From 2f5c6541fc8efba09a08e7979a08c0c6de060f99 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 10:41:59 -0700
Subject: [PATCH 050/125] Add an "Activated Epoch" and an "Acquired Epoch" to
 Drydock Leases

Summary: Ref T13189. See PHI690. When a lease is first acquired or activated, note the time. This supports better visibility into queue lengths. For now, this is only queryable via DB and visible in the UI, but can be more broadly exposed in the future.

Test Plan: Landed a revision, saw the leases get sensible timestamps for acquisition/activation.

Reviewers: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19613
---
 .../20180827.drydock.01.acquired.sql          |  2 ++
 .../20180827.drydock.02.activated.sql         |  2 ++
 .../controller/DrydockLeaseViewController.php | 24 +++++++++++++++++++
 .../drydock/storage/DrydockLease.php          | 20 ++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 resources/sql/autopatches/20180827.drydock.01.acquired.sql
 create mode 100644 resources/sql/autopatches/20180827.drydock.02.activated.sql

diff --git a/resources/sql/autopatches/20180827.drydock.01.acquired.sql b/resources/sql/autopatches/20180827.drydock.01.acquired.sql
new file mode 100644
index 0000000000..55948391c9
--- /dev/null
+++ b/resources/sql/autopatches/20180827.drydock.01.acquired.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_drydock.drydock_lease
+  ADD acquiredEpoch INT UNSIGNED;
diff --git a/resources/sql/autopatches/20180827.drydock.02.activated.sql b/resources/sql/autopatches/20180827.drydock.02.activated.sql
new file mode 100644
index 0000000000..552f7b6b24
--- /dev/null
+++ b/resources/sql/autopatches/20180827.drydock.02.activated.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_drydock.drydock_lease
+  ADD activatedEpoch INT UNSIGNED;
diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php
index 91a911277f..18e1d0088d 100644
--- a/src/applications/drydock/controller/DrydockLeaseViewController.php
+++ b/src/applications/drydock/controller/DrydockLeaseViewController.php
@@ -163,6 +163,30 @@ final class DrydockLeaseViewController extends DrydockLeaseController {
     }
     $view->addProperty(pht('Expires'), $until_display);
 
+    $acquired_epoch = $lease->getAcquiredEpoch();
+    $activated_epoch = $lease->getActivatedEpoch();
+
+    if ($acquired_epoch) {
+      $acquired_display = phabricator_datetime($acquired_epoch, $viewer);
+    } else {
+      if ($activated_epoch) {
+        $acquired_display = phutil_tag(
+          'em',
+          array(),
+          pht('Activated on Acquisition'));
+      } else {
+        $acquired_display = phutil_tag('em', array(), pht('Not Acquired'));
+      }
+    }
+    $view->addProperty(pht('Acquired'), $acquired_display);
+
+    if ($activated_epoch) {
+      $activated_display = phabricator_datetime($activated_epoch, $viewer);
+    } else {
+      $activated_display = phutil_tag('em', array(), pht('Not Activated'));
+    }
+    $view->addProperty(pht('Activated'), $activated_display);
+
     $attributes = $lease->getAttributes();
     if ($attributes) {
       $view->addSectionHeader(
diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
index 4cee7a5f17..866bb21b37 100644
--- a/src/applications/drydock/storage/DrydockLease.php
+++ b/src/applications/drydock/storage/DrydockLease.php
@@ -10,6 +10,8 @@ final class DrydockLease extends DrydockDAO
   protected $authorizingPHID;
   protected $attributes = array();
   protected $status = DrydockLeaseStatus::STATUS_PENDING;
+  protected $acquiredEpoch;
+  protected $activatedEpoch;
 
   private $resource = self::ATTACHABLE;
   private $unconsumedCommands = self::ATTACHABLE;
@@ -62,6 +64,22 @@ final class DrydockLease extends DrydockDAO
     $this->scheduleUpdate();
   }
 
+  public function setStatus($status) {
+    if ($status == DrydockLeaseStatus::STATUS_ACQUIRED) {
+      if (!$this->getAcquiredEpoch()) {
+        $this->setAcquiredEpoch(PhabricatorTime::getNow());
+      }
+    }
+
+    if ($status == DrydockLeaseStatus::STATUS_ACTIVE) {
+      if (!$this->getActivatedEpoch()) {
+        $this->setActivatedEpoch(PhabricatorTime::getNow());
+      }
+    }
+
+    return parent::setStatus($status);
+  }
+
   public function getLeaseName() {
     return pht('Lease %d', $this->getID());
   }
@@ -78,6 +96,8 @@ final class DrydockLease extends DrydockDAO
         'resourceType' => 'text128',
         'ownerPHID' => 'phid?',
         'resourcePHID' => 'phid?',
+        'acquiredEpoch' => 'epoch?',
+        'activatedEpoch' => 'epoch?',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'key_resource' => array(

From 632cafec881bbabcd84ddbe7022c521dea6e81bc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 27 Aug 2018 12:46:03 -0700
Subject: [PATCH 051/125] Pass commit authorship information to Buildkite

Summary:
Fixes T12251. Ref T13189. See PHI610. The difficulty here is that we don't want to disclose Phabricator account information to Buildkite. We're comfortable disclosing information from `git`, etc.

  - For commits, use the Identity to provide authorship information from Git.
  - For revisions, use the local commit information on the Diff to provide the Git/Mercurial/etc author of the HEAD commit.

Test Plan:
  - Built commits and revisions in Buildkite via Harbormaster.
  - I can't actually figure out how to see author information on the Buildkite side, but the values look sane when dumped locally.

Reviewers: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13189, T12251

Differential Revision: https://secure.phabricator.com/D19614
---
 .../DifferentialBuildableEngine.php           | 24 +++++++++++++++++++
 .../harbormaster/DiffusionBuildableEngine.php |  6 +++++
 .../engine/HarbormasterBuildableEngine.php    |  3 +++
 ...masterBuildkiteBuildStepImplementation.php | 14 +++++++++++
 .../storage/PhabricatorRepositoryCommit.php   | 19 +++++++++++++++
 .../storage/PhabricatorRepositoryIdentity.php | 10 ++++++++
 6 files changed, 76 insertions(+)

diff --git a/src/applications/differential/harbormaster/DifferentialBuildableEngine.php b/src/applications/differential/harbormaster/DifferentialBuildableEngine.php
index df38885edf..8554f7be25 100644
--- a/src/applications/differential/harbormaster/DifferentialBuildableEngine.php
+++ b/src/applications/differential/harbormaster/DifferentialBuildableEngine.php
@@ -54,4 +54,28 @@ final class DifferentialBuildableEngine
     $this->applyTransactions(array($xaction));
   }
 
+  public function getAuthorIdentity() {
+    $object = $this->getObject();
+
+    if ($object instanceof DifferentialRevision) {
+      $object = $object->loadActiveDiff();
+    }
+
+    $authorship = $object->getDiffAuthorshipDict();
+    if (!isset($authorship['authorName'])) {
+      return null;
+    }
+
+    $name = $authorship['authorName'];
+    $address = idx($authorship, 'authorEmail');
+
+    $full = id(new PhutilEmailAddress())
+      ->setDisplayName($name)
+      ->setAddress($address);
+
+    return id(new PhabricatorRepositoryIdentity())
+      ->setIdentityName((string)$full)
+      ->makeEphemeral();
+  }
+
 }
diff --git a/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php b/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
index bb222df28e..748386f1bd 100644
--- a/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
+++ b/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
@@ -34,4 +34,10 @@ final class DiffusionBuildableEngine
     $this->applyTransactions(array($xaction));
   }
 
+  public function getAuthorIdentity() {
+    return $this->getObject()
+      ->loadIdentities($this->getViewer())
+      ->getAuthorIdentity();
+  }
+
 }
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
index 41d31673d1..25222975b7 100644
--- a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
@@ -101,5 +101,8 @@ abstract class HarbormasterBuildableEngine
       $xactions);
   }
 
+  public function getAuthorIdentity() {
+    return null;
+  }
 
 }
diff --git a/src/applications/harbormaster/step/HarbormasterBuildkiteBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterBuildkiteBuildStepImplementation.php
index 8a522c4926..ef4cc0daf1 100644
--- a/src/applications/harbormaster/step/HarbormasterBuildkiteBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterBuildkiteBuildStepImplementation.php
@@ -117,6 +117,20 @@ EOTEXT
       ),
     );
 
+    $engine = HarbormasterBuildableEngine::newForObject(
+      $object,
+      $viewer);
+
+    $author_identity = $engine->getAuthorIdentity();
+    if ($author_identity) {
+      $data_structure += array(
+        'author' => array(
+          'name' => $author_identity->getIdentityDisplayName(),
+          'email' => $author_identity->getIdentityEmailAddress(),
+        ),
+      );
+    }
+
     $json_data = phutil_json_encode($data_structure);
 
     $credential_phid = $this->getSetting('token');
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 4cb9def346..f36869686f 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -200,6 +200,8 @@ final class PhabricatorRepositoryCommit
 
     $this->authorIdentity = $author;
     $this->committerIdentity = $committer;
+
+    return $this;
   }
 
   public function getAuthorIdentity() {
@@ -485,6 +487,23 @@ final class PhabricatorRepositoryCommit
     return null;
   }
 
+  public function loadIdentities(PhabricatorUser $viewer) {
+    if ($this->authorIdentity !== self::ATTACHABLE) {
+      return $this;
+    }
+
+    $commit = id(new DiffusionCommitQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($this->getID()))
+      ->needIdentities(true)
+      ->executeOne();
+
+    $author_identity = $commit->getAuthorIdentity();
+    $committer_identity = $commit->getCommitterIdentity();
+
+    return $this->attachIdentities($author_identity, $committer_identity);
+  }
+
   public function hasCommitterIdentity() {
     return ($this->getCommitterIdentity() !== null);
   }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryIdentity.php b/src/applications/repository/storage/PhabricatorRepositoryIdentity.php
index f801e06b89..416d1a3cd2 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryIdentity.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryIdentity.php
@@ -65,6 +65,16 @@ final class PhabricatorRepositoryIdentity
       $this->getIdentityNameEncoding());
   }
 
+  public function getIdentityEmailAddress() {
+    $address = new PhutilEmailAddress($this->getIdentityName());
+    return $address->getAddress();
+  }
+
+  public function getIdentityDisplayName() {
+    $address = new PhutilEmailAddress($this->getIdentityName());
+    return $address->getDisplayName();
+  }
+
   public function getIdentityShortName() {
     // TODO
     return $this->getIdentityName();

From 614f9ba1fba60c8c971b564c97ef4750575effd3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Aug 2018 13:02:17 -0700
Subject: [PATCH 052/125] Allow unit test results to specify that their details
 are formatted with remarkup when reporting to "harbormaster.sendmessage"

Summary: Ref T13189. See PHI710. Ref T13088. Fixes T9951. Allow callers to `harbormaster.sendmessage` to specify that the test details are remarkup so they can use rich formatting and include links, files, etc.

Test Plan: {F5840098}

Reviewers: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13189, T13088, T9951

Differential Revision: https://secure.phabricator.com/D19615
---
 resources/celerity/map.php                    |  4 +-
 .../DifferentialRevisionViewController.php    |  2 +-
 .../HarbormasterBuildableViewController.php   |  3 +-
 .../HarbormasterUnitMessageListController.php |  1 +
 .../HarbormasterUnitMessageViewController.php | 18 +----
 .../build/HarbormasterBuildUnitMessage.php    | 75 +++++++++++++++++++
 .../view/HarbormasterUnitPropertyView.php     | 35 ++-------
 .../view/HarbormasterUnitSummaryView.php      |  1 +
 .../application/harbormaster/harbormaster.css |  7 +-
 9 files changed, 93 insertions(+), 53 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d674d399e7..3842fbe839 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -75,7 +75,7 @@ return array(
     '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' => '730a4a3c',
+    'rsrc/css/application/harbormaster/harbormaster.css' => '7446ce72',
     'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
     'rsrc/css/application/herald/herald.css' => 'cd8d0134',
     'rsrc/css/application/maniphest/report.css' => '9b9580b7',
@@ -554,7 +554,7 @@ return array(
     'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => 'b556a948',
-    'harbormaster-css' => '730a4a3c',
+    'harbormaster-css' => '7446ce72',
     'herald-css' => 'cd8d0134',
     'herald-rule-editor' => 'dca75c0e',
     'herald-test-css' => 'a52e323e',
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index b809a8ee80..8216c11557 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -1315,7 +1315,7 @@ final class DifferentialRevisionViewController
     }
 
     return id(new HarbormasterUnitSummaryView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
       ->setExcuse($excuse)
       ->setBuildable($diff->getBuildable())
       ->setUnitMessages($diff->getUnitMessages())
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
index 2ebc934605..1e79ad2b46 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -318,7 +318,7 @@ final class HarbormasterBuildableViewController
 
     if ($lint_data) {
       $lint_table = id(new HarbormasterLintPropertyView())
-        ->setUser($viewer)
+        ->setViewer($viewer)
         ->setLimit(10)
         ->setLintMessages($lint_data);
 
@@ -343,6 +343,7 @@ final class HarbormasterBuildableViewController
 
     if ($unit_data) {
       $unit = id(new HarbormasterUnitSummaryView())
+        ->setViewer($viewer)
         ->setBuildable($buildable)
         ->setUnitMessages($unit_data)
         ->setShowViewAll(true)
diff --git a/src/applications/harbormaster/controller/HarbormasterUnitMessageListController.php b/src/applications/harbormaster/controller/HarbormasterUnitMessageListController.php
index 5f65bca86d..d548ceac98 100644
--- a/src/applications/harbormaster/controller/HarbormasterUnitMessageListController.php
+++ b/src/applications/harbormaster/controller/HarbormasterUnitMessageListController.php
@@ -39,6 +39,7 @@ final class HarbormasterUnitMessageListController
     }
 
     $unit = id(new HarbormasterUnitSummaryView())
+      ->setViewer($viewer)
       ->setBuildable($buildable)
       ->setUnitMessages($unit_data);
 
diff --git a/src/applications/harbormaster/controller/HarbormasterUnitMessageViewController.php b/src/applications/harbormaster/controller/HarbormasterUnitMessageViewController.php
index 9881da06c6..5cb33c0c9a 100644
--- a/src/applications/harbormaster/controller/HarbormasterUnitMessageViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterUnitMessageViewController.php
@@ -88,23 +88,7 @@ final class HarbormasterUnitMessageViewController
       pht('Run At'),
       phabricator_datetime($message->getDateCreated(), $viewer));
 
-    $details = $message->getUnitMessageDetails();
-    if (strlen($details)) {
-      // TODO: Use the log view here, once it gets cleaned up.
-      // Shenanigans below.
-      $details = phutil_tag(
-        'div',
-        array(
-          'class' => 'PhabricatorMonospaced',
-          'style' =>
-            'white-space: pre-wrap; '.
-            'color: #666666; '.
-            'overflow-x: auto;',
-        ),
-        $details);
-    } else {
-      $details = phutil_tag('em', array(), pht('No details provided.'));
-    }
+    $details = $message->newUnitMessageDetailsView($viewer);
 
     $view->addSectionHeader(
       pht('Details'),
diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php b/src/applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php
index 956850bd9f..b2f566c3eb 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php
@@ -13,6 +13,9 @@ final class HarbormasterBuildUnitMessage
 
   private $buildTarget = self::ATTACHABLE;
 
+  const FORMAT_TEXT = 'text';
+  const FORMAT_REMARKUP = 'remarkup';
+
   public static function initializeNewUnitMessage(
     HarbormasterBuildTarget $build_target) {
     return id(new HarbormasterBuildUnitMessage())
@@ -66,6 +69,13 @@ final class HarbormasterBuildUnitMessage
         'description' => pht(
           'Additional human-readable information about the failure.'),
       ),
+      'format' => array(
+        'type' => 'optional string',
+        'description' => pht(
+          'Format for the text provided in "details". Valid values are '.
+          '"text" (default) or "remarkup". This controls how test details '.
+          'are rendered when shown to users.'),
+      ),
     );
   }
 
@@ -104,6 +114,11 @@ final class HarbormasterBuildUnitMessage
       $obj->setProperty('details', $details);
     }
 
+    $format = idx($dict, 'format');
+    if ($format) {
+      $obj->setProperty('format', $format);
+    }
+
     return $obj;
   }
 
@@ -149,6 +164,66 @@ final class HarbormasterBuildUnitMessage
     return $this->getProperty('details', '');
   }
 
+  public function getUnitMessageDetailsFormat() {
+    return $this->getProperty('format', self::FORMAT_TEXT);
+  }
+
+  public function newUnitMessageDetailsView(
+    PhabricatorUser $viewer,
+    $summarize = false) {
+
+    $format = $this->getUnitMessageDetailsFormat();
+
+    $is_text = ($format !== self::FORMAT_REMARKUP);
+    $is_remarkup = ($format === self::FORMAT_REMARKUP);
+
+    $full_details = $this->getUnitMessageDetails();
+
+    if (!strlen($full_details)) {
+      if ($summarize) {
+        return null;
+      }
+      $details = phutil_tag('em', array(), pht('No details provided.'));
+    } else if ($summarize) {
+      if ($is_text) {
+        $details = id(new PhutilUTF8StringTruncator())
+          ->setMaximumBytes(2048)
+          ->truncateString($full_details);
+        $details = phutil_split_lines($details);
+
+        $limit = 3;
+        if (count($details) > $limit) {
+          $details = array_slice($details, 0, $limit);
+        }
+
+        $details = implode('', $details);
+      } else {
+        $details = $full_details;
+      }
+    } else {
+      $details = $full_details;
+    }
+
+    require_celerity_resource('harbormaster-css');
+
+    $classes = array();
+    $classes[] = 'harbormaster-unit-details';
+
+    if ($is_remarkup) {
+      $details = new PHUIRemarkupView($viewer, $details);
+    } else {
+      $classes[] = 'harbormaster-unit-details-text';
+      $classes[] = 'PhabricatorMonospaced';
+    }
+
+    return phutil_tag(
+      'div',
+      array(
+        'class' => implode(' ', $classes),
+      ),
+      $details);
+  }
+
   public function getUnitMessageDisplayName() {
     $name = $this->getName();
 
diff --git a/src/applications/harbormaster/view/HarbormasterUnitPropertyView.php b/src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
index 0ce1688027..ee8b80a7a7 100644
--- a/src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
+++ b/src/applications/harbormaster/view/HarbormasterUnitPropertyView.php
@@ -34,9 +34,8 @@ final class HarbormasterUnitPropertyView extends AphrontView {
     return $this;
   }
 
-
   public function render() {
-    require_celerity_resource('harbormaster-css');
+    $viewer = $this->getViewer();
 
     $messages = $this->unitMessages;
     $messages = msort($messages, 'getSortKey');
@@ -84,13 +83,10 @@ final class HarbormasterUnitPropertyView extends AphrontView {
           $name);
       }
 
-      $details = $message->getUnitMessageDetails();
-      if (strlen($details)) {
-        $name = array(
-          $name,
-          $this->renderUnitTestDetails($details),
-        );
-      }
+      $name = array(
+        $name,
+        $message->newUnitMessageDetailsView($viewer, true),
+      );
 
       $rows[] = array(
         $result_icon,
@@ -158,25 +154,4 @@ final class HarbormasterUnitPropertyView extends AphrontView {
     return $table;
   }
 
-  private function renderUnitTestDetails($full_details) {
-    $details = id(new PhutilUTF8StringTruncator())
-      ->setMaximumBytes(2048)
-      ->truncateString($full_details);
-    $details = phutil_split_lines($details);
-
-    $limit = 3;
-    if (count($details) > $limit) {
-      $details = array_slice($details, 0, $limit);
-    }
-
-    $details = implode('', $details);
-
-    return phutil_tag(
-      'div',
-      array(
-        'class' => 'PhabricatorMonospaced harbormaster-unit-details',
-      ),
-      $details);
-  }
-
 }
diff --git a/src/applications/harbormaster/view/HarbormasterUnitSummaryView.php b/src/applications/harbormaster/view/HarbormasterUnitSummaryView.php
index e5a66a3eb8..66ba2307b6 100644
--- a/src/applications/harbormaster/view/HarbormasterUnitSummaryView.php
+++ b/src/applications/harbormaster/view/HarbormasterUnitSummaryView.php
@@ -77,6 +77,7 @@ final class HarbormasterUnitSummaryView extends AphrontView {
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
 
     $table = id(new HarbormasterUnitPropertyView())
+      ->setViewer($this->getViewer())
       ->setUnitMessages($messages);
 
     if ($this->showViewAll) {
diff --git a/webroot/rsrc/css/application/harbormaster/harbormaster.css b/webroot/rsrc/css/application/harbormaster/harbormaster.css
index f3b75a397b..9fdad43a42 100644
--- a/webroot/rsrc/css/application/harbormaster/harbormaster.css
+++ b/webroot/rsrc/css/application/harbormaster/harbormaster.css
@@ -26,11 +26,14 @@
 .harbormaster-unit-details {
   margin: 8px 0 4px;
   overflow: hidden;
-  white-space: pre;
-  text-overflow: ellipsis;
   color: {$lightgreytext};
 }
 
+.harbormaster-unit-details-text {
+  white-space: pre-wrap;
+  text-overflow: ellipsis;
+}
+
 .harbormaster-log-view-loading {
   padding: 8px;
   text-align: center;

From fd0da4c41f822182dc40822a498e03995c4a5485 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Aug 2018 13:57:35 -0700
Subject: [PATCH 053/125] Rename "PHUIDocumentViewPro" to "PHUIDocumentView"

Summary: Ref T13077. There is no "PHUIDocumentView" so toss the "Pro" suffix from this classname.

Test Plan: Grepped for `PHUIDocumentView` and `PHUIDocumentViewPro`.

Reviewers: amckinley

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19616
---
 src/__phutil_library_map__.php                      |  4 ++--
 .../diffusion/view/DiffusionReadmeView.php          |  2 +-
 .../diviner/controller/DivinerAtomController.php    |  2 +-
 .../diviner/controller/DivinerBookController.php    |  2 +-
 .../diviner/controller/DivinerMainController.php    |  2 +-
 .../guides/module/PhabricatorGuideInstallModule.php |  2 +-
 .../module/PhabricatorGuideQuickStartModule.php     |  2 +-
 .../controller/LegalpadDocumentSignController.php   |  2 +-
 ...habricatorApplicationEmailCommandsController.php |  2 +-
 .../phame/controller/PhameHomeController.php        |  2 +-
 .../controller/blog/PhameBlogViewController.php     |  2 +-
 .../controller/post/PhamePostViewController.php     |  2 +-
 .../controller/PhrictionDocumentController.php      | 13 +++++++------
 .../editengine/PhabricatorEditEngine.php            |  2 +-
 .../PhabricatorTypeaheadFunctionHelpController.php  |  2 +-
 ...PHUIDocumentViewPro.php => PHUIDocumentView.php} |  2 +-
 src/view/phui/PHUIRemarkupPreviewPanel.php          |  2 +-
 17 files changed, 24 insertions(+), 23 deletions(-)
 rename src/view/phui/{PHUIDocumentViewPro.php => PHUIDocumentView.php} (98%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index b6d71ea81b..284980bcc5 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1912,7 +1912,7 @@ phutil_register_library_map(array(
     'PHUIDiffTableOfContentsListView' => 'infrastructure/diff/view/PHUIDiffTableOfContentsListView.php',
     'PHUIDiffTwoUpInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php',
     'PHUIDocumentSummaryView' => 'view/phui/PHUIDocumentSummaryView.php',
-    'PHUIDocumentViewPro' => 'view/phui/PHUIDocumentViewPro.php',
+    'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php',
     'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php',
     'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php',
     'PHUIFormDividerControl' => 'view/form/control/PHUIFormDividerControl.php',
@@ -7453,7 +7453,7 @@ phutil_register_library_map(array(
     'PHUIDiffTableOfContentsListView' => 'AphrontView',
     'PHUIDiffTwoUpInlineCommentRowScaffold' => 'PHUIDiffInlineCommentRowScaffold',
     'PHUIDocumentSummaryView' => 'AphrontTagView',
-    'PHUIDocumentViewPro' => 'AphrontTagView',
+    'PHUIDocumentView' => 'AphrontTagView',
     'PHUIFeedStoryExample' => 'PhabricatorUIExample',
     'PHUIFeedStoryView' => 'AphrontView',
     'PHUIFormDividerControl' => 'AphrontFormControl',
diff --git a/src/applications/diffusion/view/DiffusionReadmeView.php b/src/applications/diffusion/view/DiffusionReadmeView.php
index 693333249d..21e97f4718 100644
--- a/src/applications/diffusion/view/DiffusionReadmeView.php
+++ b/src/applications/diffusion/view/DiffusionReadmeView.php
@@ -94,7 +94,7 @@ final class DiffusionReadmeView extends DiffusionView {
     }
 
     $readme_content = phutil_tag_div($class, $readme_content);
-    $document = id(new PHUIDocumentViewPro())
+    $document = id(new PHUIDocumentView())
       ->setFluid(true)
       ->appendChild($readme_content);
 
diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php
index bf69497b16..0c92bd1738 100644
--- a/src/applications/diviner/controller/DivinerAtomController.php
+++ b/src/applications/diviner/controller/DivinerAtomController.php
@@ -72,7 +72,7 @@ final class DivinerAtomController extends DivinerController {
     $prop_list = new PHUIPropertyGroupView();
     $prop_list->addPropertyList($properties);
 
-    $document = id(new PHUIDocumentViewPro())
+    $document = id(new PHUIDocumentView())
       ->setBook($book->getTitle(), $group_name)
       ->setHeader($header)
       ->addClass('diviner-view');
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
index 1aa8790ffa..4e0ae3524b 100644
--- a/src/applications/diviner/controller/DivinerBookController.php
+++ b/src/applications/diviner/controller/DivinerBookController.php
@@ -45,7 +45,7 @@ final class DivinerBookController extends DivinerController {
           ->setName($book->getRepository()->getMonogram()));
     }
 
-    $document = new PHUIDocumentViewPro();
+    $document = new PHUIDocumentView();
     $document->setHeader($header);
     $document->addClass('diviner-view');
 
diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php
index e7d179c077..400fb48d0f 100644
--- a/src/applications/diviner/controller/DivinerMainController.php
+++ b/src/applications/diviner/controller/DivinerMainController.php
@@ -27,7 +27,7 @@ final class DivinerMainController extends DivinerController {
       ->setHeader(pht('Documentation Books'))
       ->addActionLink($query_button);
 
-    $document = new PHUIDocumentViewPro();
+    $document = new PHUIDocumentView();
     $document->setHeader($header);
     $document->addClass('diviner-view');
 
diff --git a/src/applications/guides/module/PhabricatorGuideInstallModule.php b/src/applications/guides/module/PhabricatorGuideInstallModule.php
index 7a46b20027..172ff7a17b 100644
--- a/src/applications/guides/module/PhabricatorGuideInstallModule.php
+++ b/src/applications/guides/module/PhabricatorGuideInstallModule.php
@@ -169,7 +169,7 @@ final class PhabricatorGuideInstallModule extends PhabricatorGuideModule {
 
     $intro = new PHUIRemarkupView($viewer, $intro);
 
-    $intro = id(new PHUIDocumentViewPro())
+    $intro = id(new PHUIDocumentView())
       ->appendChild($intro);
 
     return array($intro, $guide_items);
diff --git a/src/applications/guides/module/PhabricatorGuideQuickStartModule.php b/src/applications/guides/module/PhabricatorGuideQuickStartModule.php
index c06e320df7..8c4b4c2606 100644
--- a/src/applications/guides/module/PhabricatorGuideQuickStartModule.php
+++ b/src/applications/guides/module/PhabricatorGuideQuickStartModule.php
@@ -206,7 +206,7 @@ final class PhabricatorGuideQuickStartModule extends PhabricatorGuideModule {
       'these features at your own pace.');
 
     $intro = new PHUIRemarkupView($viewer, $intro);
-    $intro = id(new PHUIDocumentViewPro())
+    $intro = id(new PHUIDocumentView())
       ->appendChild($intro);
 
     return array($intro, $guide_items);
diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
index f19cf43d0e..1748dba452 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
@@ -272,7 +272,7 @@ final class LegalpadDocumentSignController extends LegalpadController {
       $preamble_box->addPropertyList($preamble);
     }
 
-    $content = id(new PHUIDocumentViewPro())
+    $content = id(new PHUIDocumentView())
       ->addClass('legalpad')
       ->setHeader($header)
       ->appendChild(
diff --git a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php
index 2979e92229..43ed2e957e 100644
--- a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php
@@ -132,7 +132,7 @@ final class PhabricatorApplicationEmailCommandsController
     $header = id(new PHUIHeaderView())
       ->setHeader($title);
 
-    $document = id(new PHUIDocumentViewPro())
+    $document = id(new PHUIDocumentView())
       ->setHeader($header)
       ->appendChild($info_view)
       ->appendChild($content_box);
diff --git a/src/applications/phame/controller/PhameHomeController.php b/src/applications/phame/controller/PhameHomeController.php
index 037026fa80..bf263e97a8 100644
--- a/src/applications/phame/controller/PhameHomeController.php
+++ b/src/applications/phame/controller/PhameHomeController.php
@@ -84,7 +84,7 @@ final class PhameHomeController extends PhamePostController {
       pht('Recent Posts'),
       $this->getApplicationURI('post/'));
 
-    $page = id(new PHUIDocumentViewPro())
+    $page = id(new PHUIDocumentView())
       ->setHeader($header)
       ->appendChild($post_list);
 
diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
index 08b23e5a95..e9e422aeb1 100644
--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
@@ -85,7 +85,7 @@ final class PhameBlogViewController extends PhameLiveController {
       }
     }
 
-    $page = id(new PHUIDocumentViewPro())
+    $page = id(new PHUIDocumentView())
       ->setHeader($header)
       ->appendChild($post_list);
 
diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
index 63adedb7ae..11d94d2f94 100644
--- a/src/applications/phame/controller/post/PhamePostViewController.php
+++ b/src/applications/phame/controller/post/PhamePostViewController.php
@@ -30,7 +30,7 @@ final class PhamePostViewController
       $header->setActionList($actions);
     }
 
-    $document = id(new PHUIDocumentViewPro())
+    $document = id(new PHUIDocumentView())
       ->setHeader($header);
 
     if ($moved) {
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index c8ffb86ce8..57dad25ab5 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -227,7 +227,7 @@ final class PhrictionDocumentController
     }
     $prop_list = phutil_tag_div('phui-document-view-pro-box', $prop_list);
 
-    $page_content = id(new PHUIDocumentViewPro())
+    $page_content = id(new PHUIDocumentView())
       ->setHeader($header)
       ->setToc($toc)
       ->appendChild(
@@ -241,11 +241,12 @@ final class PhrictionDocumentController
       ->setTitle($page_title)
       ->setCrumbs($crumbs)
       ->setPageObjectPHIDs(array($document->getPHID()))
-      ->appendChild(array(
-        $page_content,
-        $prop_list,
-        $children,
-      ));
+      ->appendChild(
+        array(
+          $page_content,
+          $prop_list,
+          $children,
+        ));
 
   }
 
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index ad495a3a44..579b53a989 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1679,7 +1679,7 @@ abstract class PhabricatorEditEngine
       ->setUser($viewer)
       ->setFields($fields);
 
-    $document = id(new PHUIDocumentViewPro())
+    $document = id(new PHUIDocumentView())
       ->setUser($viewer)
       ->setHeader($header)
       ->appendChild($help_view);
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php
index 27b30a6278..a7a1f55caa 100644
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php
@@ -142,7 +142,7 @@ final class PhabricatorTypeaheadFunctionHelpController
     $header = id(new PHUIHeaderView())
       ->setHeader($title);
 
-    $document = id(new PHUIDocumentViewPro())
+    $document = id(new PHUIDocumentView())
       ->setHeader($header)
       ->appendChild($content_box);
 
diff --git a/src/view/phui/PHUIDocumentViewPro.php b/src/view/phui/PHUIDocumentView.php
similarity index 98%
rename from src/view/phui/PHUIDocumentViewPro.php
rename to src/view/phui/PHUIDocumentView.php
index 51ecc3526e..5b6bf9fcf9 100644
--- a/src/view/phui/PHUIDocumentViewPro.php
+++ b/src/view/phui/PHUIDocumentView.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PHUIDocumentViewPro extends AphrontTagView {
+final class PHUIDocumentView extends AphrontTagView {
 
   private $header;
   private $bookname;
diff --git a/src/view/phui/PHUIRemarkupPreviewPanel.php b/src/view/phui/PHUIRemarkupPreviewPanel.php
index 064379cd0c..46c0f5cd53 100644
--- a/src/view/phui/PHUIRemarkupPreviewPanel.php
+++ b/src/view/phui/PHUIRemarkupPreviewPanel.php
@@ -105,7 +105,7 @@ final class PHUIRemarkupPreviewPanel extends AphrontTagView {
       $header = id(new PHUIHeaderView())
         ->setHeader(pht('%s (Preview)', $this->header));
 
-      $content = id(new PHUIDocumentViewPro())
+      $content = id(new PHUIDocumentView())
         ->setHeader($header)
         ->appendChild($preview);
     }

From 4afb6446d97ba4353ec495f65b75bb71ad7b7228 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Aug 2018 14:37:19 -0700
Subject: [PATCH 054/125] Allow DocumentView to render with a curtain, and make
 Phriction use a curtain

Summary:
Depends on D19616. Ref T13077. Fixes T8172. In the last round of design updates, a lot of actions got stuffed into "Actions" menus.

I never really got used to these and think they're a net usability loss, and broadly agree with the feedback in T8172. I'd generally like to move back toward a state where actions are available on the page, not hidden in a menu.

For now, just put a curtain view on these pages. This could be refined later (e.g., stick this menu to the right hand side of the screen) depending on where other Phriction changes go.

(Broadly, I'm also not satisfied with where we ended up on the fixed-width pages like Diffusion > Manage, Config, and Instances. In contrast, I //do// like where we ended up with Phortune in terms of overall design. I anticipate revisiting some of this stuff eventually.)

Test Plan:
  - Looked at Phriction pages on desktop/tablet/mobile/printable -- actions are now available on the page.
  - Looked at other DocumentView pages (like Phame blogs) -- no changes for now.

Reviewers: amckinley

Maniphest Tasks: T13077, T8172

Differential Revision: https://secure.phabricator.com/D19617
---
 resources/celerity/map.php                    | 14 ++--
 .../PhrictionDocumentController.php           | 46 +++++------
 src/view/phui/PHUIDocumentView.php            | 76 ++++++++++++++-----
 webroot/rsrc/css/phui/phui-document-pro.css   | 29 +++++++
 webroot/rsrc/css/phui/phui-document.css       |  7 +-
 webroot/rsrc/css/phui/phui-header-view.css    |  1 -
 6 files changed, 116 insertions(+), 57 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 3842fbe839..609f156e88 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'fc4839c8',
+    'core.pkg.css' => 'badf3f16',
     'core.pkg.js' => 'b5a949ca',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c1cfa143',
@@ -146,15 +146,15 @@ return array(
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
     'rsrc/css/phui/phui-crumbs-view.css' => '10728aaa',
     'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026',
-    'rsrc/css/phui/phui-document-pro.css' => '8af7ea27',
+    'rsrc/css/phui/phui-document-pro.css' => '0e41dd91',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
-    'rsrc/css/phui/phui-document.css' => '878c2f52',
+    'rsrc/css/phui/phui-document.css' => '552493fa',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
     'rsrc/css/phui/phui-fontkit.css' => '1320ed01',
     'rsrc/css/phui/phui-form-view.css' => 'f808e5be',
     'rsrc/css/phui/phui-form.css' => '7aaa04e3',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
-    'rsrc/css/phui/phui-header-view.css' => 'edeb9252',
+    'rsrc/css/phui/phui-header-view.css' => '1ba8b707',
     'rsrc/css/phui/phui-hovercard.css' => 'f0592bcf',
     'rsrc/css/phui/phui-icon-set-selector.css' => '87db8fee',
     'rsrc/css/phui/phui-icon.css' => 'cf24ceec',
@@ -813,15 +813,15 @@ return array(
     'phui-crumbs-view-css' => '10728aaa',
     'phui-curtain-view-css' => '2bdaf026',
     'phui-document-summary-view-css' => '9ca48bdf',
-    'phui-document-view-css' => '878c2f52',
-    'phui-document-view-pro-css' => '8af7ea27',
+    'phui-document-view-css' => '552493fa',
+    'phui-document-view-pro-css' => '0e41dd91',
     'phui-feed-story-css' => '44a9c8e9',
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
     'phui-form-css' => '7aaa04e3',
     'phui-form-view-css' => 'f808e5be',
     'phui-head-thing-view-css' => 'fd311e5f',
-    'phui-header-view-css' => 'edeb9252',
+    'phui-header-view-css' => '1ba8b707',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'f0592bcf',
     'phui-icon-set-selector-css' => '87db8fee',
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 57dad25ab5..fce2c066f7 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -201,7 +201,10 @@ final class PhrictionDocumentController
 
     $children = $this->renderDocumentChildren($slug);
 
-    $actions = $this->buildActionView($viewer, $document);
+    $curtain = null;
+    if ($document->getID()) {
+      $curtain = $this->buildCurtain($document);
+    }
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setBorder(true);
@@ -213,8 +216,7 @@ final class PhrictionDocumentController
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setPolicyObject($document)
-      ->setHeader($page_title)
-      ->setActionList($actions);
+      ->setHeader($page_title);
 
     if ($content) {
       $header->setEpoch($content->getDateCreated());
@@ -237,6 +239,10 @@ final class PhrictionDocumentController
           $core_content,
         ));
 
+    if ($curtain) {
+      $page_content->setCurtain($curtain);
+    }
+
     return $this->newPage()
       ->setTitle($page_title)
       ->setCrumbs($crumbs)
@@ -258,8 +264,7 @@ final class PhrictionDocumentController
     $viewer = $this->getViewer();
 
     $view = id(new PHUIPropertyListView())
-      ->setUser($viewer)
-      ->setObject($document);
+      ->setUser($viewer);
 
     $view->addProperty(
       pht('Last Author'),
@@ -272,9 +277,9 @@ final class PhrictionDocumentController
     return $view;
   }
 
-  private function buildActionView(
-    PhabricatorUser $viewer,
-    PhrictionDocument $document) {
+  private function buildCurtain(PhrictionDocument $document) {
+    $viewer = $this->getViewer();
+
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $document,
@@ -282,19 +287,9 @@ final class PhrictionDocumentController
 
     $slug = PhabricatorSlug::normalize($this->slug);
 
-    $action_view = id(new PhabricatorActionListView())
-      ->setUser($viewer)
-      ->setObject($document);
+    $curtain = $this->newCurtainView($document);
 
-    if (!$document->getID()) {
-      return $action_view->addAction(
-        id(new PhabricatorActionView())
-          ->setName(pht('Create This Document'))
-          ->setIcon('fa-plus-square')
-          ->setHref('/phriction/edit/?slug='.$slug));
-    }
-
-    $action_view->addAction(
+    $curtain->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Document'))
         ->setDisabled(!$can_edit)
@@ -302,7 +297,7 @@ final class PhrictionDocumentController
         ->setHref('/phriction/edit/'.$document->getID().'/'));
 
     if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
-      $action_view->addAction(
+      $curtain->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Move Document'))
           ->setDisabled(!$can_edit)
@@ -310,7 +305,7 @@ final class PhrictionDocumentController
           ->setHref('/phriction/move/'.$document->getID().'/')
           ->setWorkflow(true));
 
-      $action_view->addAction(
+      $curtain->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Delete Document'))
           ->setDisabled(!$can_edit)
@@ -319,7 +314,7 @@ final class PhrictionDocumentController
           ->setWorkflow(true));
     }
 
-    $action_view->addAction(
+    $curtain->addAction(
       id(new PhabricatorActionView())
       ->setName(pht('View History'))
       ->setIcon('fa-list')
@@ -327,15 +322,14 @@ final class PhrictionDocumentController
 
     $print_uri = PhrictionDocument::getSlugURI($slug).'?__print__=1';
 
-    $action_view->addAction(
+    $curtain->addAction(
       id(new PhabricatorActionView())
       ->setName(pht('Printable Page'))
       ->setIcon('fa-print')
       ->setOpenInNewWindow(true)
       ->setHref($print_uri));
 
-    return $action_view;
-
+    return $curtain;
   }
 
   private function renderDocumentChildren($slug) {
diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php
index 5b6bf9fcf9..32324ddb5a 100644
--- a/src/view/phui/PHUIDocumentView.php
+++ b/src/view/phui/PHUIDocumentView.php
@@ -8,6 +8,7 @@ final class PHUIDocumentView extends AphrontTagView {
   private $fluid;
   private $toc;
   private $foot;
+  private $curtain;
 
   public function setHeader(PHUIHeaderView $header) {
     $header->setTall(true);
@@ -36,6 +37,15 @@ final class PHUIDocumentView extends AphrontTagView {
     return $this;
   }
 
+  public function setCurtain(PHUICurtainView $curtain) {
+    $this->curtain = $curtain;
+    return $this;
+  }
+
+  public function getCurtain() {
+    return $this->curtain;
+  }
+
   protected function getTagAttributes() {
     $classes = array();
 
@@ -61,6 +71,17 @@ final class PHUIDocumentView extends AphrontTagView {
     $classes[] = 'phui-document-view';
     $classes[] = 'phui-document-view-pro';
 
+    if ($this->curtain) {
+      $classes[] = 'has-curtain';
+    } else {
+      $classes[] = 'has-no-curtain';
+    }
+
+    if ($this->curtain) {
+      $action_list = $this->curtain->getActionList();
+      $this->header->setActionListID($action_list->getID());
+    }
+
     $book = null;
     if ($this->bookname) {
       $book = pht('%s (%s)', $this->bookname, $this->bookdescription);
@@ -114,32 +135,51 @@ final class PHUIDocumentView extends AphrontTagView {
         $this->foot);
     }
 
-    $content_inner = phutil_tag(
+    $curtain = null;
+    if ($this->curtain) {
+      $curtain = phutil_tag(
         'div',
         array(
-          'class' => 'phui-document-inner',
+          'class' => 'phui-document-curtain',
         ),
+        $this->curtain);
+    }
+
+    $main_content = phutil_tag(
+      'div',
+      array(
+        'class' => 'phui-document-content-view',
+      ),
+      $main_content);
+
+    $content_inner = phutil_tag(
+      'div',
+      array(
+        'class' => 'phui-document-inner',
+      ),
+      array(
+        $table_of_contents,
+        $this->header,
         array(
-          $table_of_contents,
-          $this->header,
+          $curtain,
           $main_content,
-          $foot_content,
-        ));
+        ),
+        $foot_content,
+      ));
 
     $content = phutil_tag(
-        'div',
-        array(
-          'class' => 'phui-document-content',
-        ),
-        $content_inner);
-
-  return phutil_tag(
-    'div',
-    array(
-      'class' => implode(' ', $classes),
-    ),
-    $content);
+      'div',
+      array(
+        'class' => 'phui-document-content',
+      ),
+      $content_inner);
 
+    return phutil_tag(
+      'div',
+      array(
+        'class' => implode(' ', $classes),
+      ),
+      $content);
   }
 
 }
diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css
index 35c843f81f..29dc3beffa 100644
--- a/webroot/rsrc/css/phui/phui-document-pro.css
+++ b/webroot/rsrc/css/phui/phui-document-pro.css
@@ -8,6 +8,35 @@
   margin: 0 auto;
 }
 
+.phui-document-view.phui-document-view-pro.has-curtain {
+  max-width: 1132px;
+}
+
+.printable .phui-document-view.phui-document-view-pro.has-curtain {
+  max-width: none;
+}
+
+.device-desktop .phui-document-inner {
+  overflow: hidden;
+}
+
+.device-desktop .has-curtain .phui-document-content-view {
+  padding-right: 332px;
+}
+
+.printable .phui-document-content-view {
+  padding-right: 0;
+}
+
+.device-desktop .phui-document-curtain {
+  float: right;
+  width: 300px;
+}
+
+.printable .phui-document-curtain {
+  display: none;
+}
+
 .phui-document-container {
   background-color: {$page.content};
   position: relative;
diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css
index 954a220229..f554930a5f 100644
--- a/webroot/rsrc/css/phui/phui-document.css
+++ b/webroot/rsrc/css/phui/phui-document.css
@@ -63,7 +63,8 @@
   font-size: 14px;
 }
 
-.phui-document-view .phui-header-action-links .phui-mobile-menu {
+.phui-document-view.has-no-curtain
+  .phui-header-action-links .phui-mobile-menu {
   display: block;
 }
 
@@ -71,10 +72,6 @@
   padding: 8px;
 }
 
-.device-desktop .phui-document-content .phabricator-action-list-view {
-  display: none;
-}
-
 .phui-document-content .phabricator-remarkup .remarkup-code-block {
   clear: both;
   margin: 16px 0;
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
index 5a8f06281d..6cafb3e330 100644
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -259,7 +259,6 @@ body .phui-header-shell.phui-bleed-header
   color: {$lightgreytext};
 }
 
-
 .phui-header-action-links .phui-mobile-menu {
   display: none;
 }

From 04f8270a746645a045261765d18c50d8f54ce94a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Aug 2018 15:10:28 -0700
Subject: [PATCH 055/125] Remove some unusual UI policy hints in Phriction

Summary:
Ref T13077. We currently have these weird policy hints in Phriction that we don't use in other applications. Just remove them for consistency to make the eventual swap to EditEngine a little easier.

Also nuke some unreacahble code.

Test Plan: Loaded edit page, saw more standard UI.

Reviewers: amckinley

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19618
---
 .../controller/PhrictionEditController.php    | 24 +++++++------------
 .../form/control/AphrontFormPolicyControl.php | 10 --------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
index ccd473931c..675b1cd630 100644
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -226,13 +226,7 @@ final class PhrictionEditController
       ->execute();
     $view_capability = PhabricatorPolicyCapability::CAN_VIEW;
     $edit_capability = PhabricatorPolicyCapability::CAN_EDIT;
-    $codex = id(PhabricatorPolicyCodex::newFromObject($document, $viewer))
-      ->setCapability($view_capability);
 
-    $view_capability_description = $codex->getPolicySpecialRuleForCapability(
-      PhabricatorPolicyCapability::CAN_VIEW)->getDescription();
-    $edit_capability_description = $codex->getPolicySpecialRuleForCapability(
-      PhabricatorPolicyCapability::CAN_EDIT)->getDescription();
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
@@ -279,15 +273,13 @@ final class PhrictionEditController
           ->setSpacePHID($v_space)
           ->setPolicyObject($document)
           ->setCapability($view_capability)
-          ->setPolicies($policies)
-          ->setCaption($view_capability_description))
+          ->setPolicies($policies))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setName('editPolicy')
           ->setPolicyObject($document)
           ->setCapability($edit_capability)
-          ->setPolicies($policies)
-          ->setCaption($edit_capability_description))
+          ->setPolicies($policies))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Edit Notes'))
@@ -323,17 +315,17 @@ final class PhrictionEditController
     $crumbs->setBorder(true);
 
     $view = id(new PHUITwoColumnView())
-      ->setFooter(array(
-        $draft_note,
-        $form_box,
-        $preview,
-      ));
+      ->setFooter(
+        array(
+          $draft_note,
+          $form_box,
+          $preview,
+        ));
 
     return $this->newPage()
       ->setTitle($page_title)
       ->setCrumbs($crumbs)
       ->appendChild($view);
-
   }
 
 }
diff --git a/src/view/form/control/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php
index 0b0e608048..53e6f940c9 100644
--- a/src/view/form/control/AphrontFormPolicyControl.php
+++ b/src/view/form/control/AphrontFormPolicyControl.php
@@ -279,7 +279,6 @@ final class AphrontFormPolicyControl extends AphrontFormControl {
         ->setIcon($icon);
     }
 
-
     if ($this->templatePHIDType) {
       $context_path = 'template/'.$this->templatePHIDType.'/';
     } else {
@@ -346,15 +345,6 @@ final class AphrontFormPolicyControl extends AphrontFormControl {
           )),
         $input,
       ));
-
-    return AphrontFormSelectControl::renderSelectTag(
-      $this->getValue(),
-      $this->getOptions(),
-      array(
-        'name'      => $this->getName(),
-        'disabled'  => $this->getDisabled() ? 'disabled' : null,
-        'id'        => $this->getID(),
-      ));
   }
 
   public static function getSelectCustomKey() {

From 64cee4a902dafa5265d6ce82f6b16ddc852bf6e0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Aug 2018 16:09:24 -0700
Subject: [PATCH 056/125] Move Phriction internal document/content references
 from IDs to PHIDs

Summary:
Ref T13077. This is mostly just a small cleanup change, even though the actual change is large.

We currently reference content and document objects from one another with `contentID` and `documentID`, but this means that `contentID` must be nullable. Switching to PHIDs allows the column to be non-nullable.

This also supports reorienting some current and future transactions around PHIDs, which is preferable for the API. In particular, I'm adding a "publish version X" transaction soon, and would rather callers pass a PHID than an ID or version number, since this will make the API more consistent and powerful.

Today, `contentID` gets used as a cheaty way to order documents by (content) edit time. Since PHIDs aren't orderable and stuff is going to become actually-revertible soon, replace this with an epoch timestamp.

Test Plan:
  - Created, edited, moved, retitled, and deleted Phriction documents.
  - Grepped for `documentID` and `contentID`.
  - This probably breaks //something// but I'll be in this code for a bit and am likely to catch whatever breaks.

Reviewers: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19619
---
 .../20180828.phriction.01.contentphid.sql     |  2 +
 .../20180828.phriction.02.documentphid.sql    |  2 +
 .../20180828.phriction.03.editedepoch.sql     |  2 +
 .../20180828.phriction.04.migrate.php         | 57 ++++++++++++
 .../20180828.phriction.05.contentid.sql       |  2 +
 .../20180828.phriction.06.documentid.sql      |  2 +
 src/__phutil_library_map__.php                | 12 +--
 .../controller/PhrictionDiffController.php    |  7 +-
 .../PhrictionDocumentController.php           |  2 +-
 .../controller/PhrictionHistoryController.php |  2 +-
 .../editor/PhrictionTransactionEditor.php     | 87 ++++++++-----------
 .../phriction/query/PhrictionContentQuery.php | 12 +--
 .../query/PhrictionDocumentQuery.php          | 20 ++---
 .../phriction/storage/PhrictionContent.php    |  4 +-
 .../phriction/storage/PhrictionDocument.php   | 25 +++---
 .../PhrictionDocumentContentTransaction.php   |  7 +-
 .../PhrictionDocumentDeleteTransaction.php    | 11 ++-
 .../PhrictionDocumentMoveAwayTransaction.php  | 14 ++-
 .../PhrictionDocumentMoveToTransaction.php    | 17 ++--
 .../PhrictionDocumentTitleTransaction.php     |  8 +-
 .../PhrictionDocumentVersionTransaction.php   | 10 +++
 21 files changed, 183 insertions(+), 122 deletions(-)
 create mode 100644 resources/sql/autopatches/20180828.phriction.01.contentphid.sql
 create mode 100644 resources/sql/autopatches/20180828.phriction.02.documentphid.sql
 create mode 100644 resources/sql/autopatches/20180828.phriction.03.editedepoch.sql
 create mode 100644 resources/sql/autopatches/20180828.phriction.04.migrate.php
 create mode 100644 resources/sql/autopatches/20180828.phriction.05.contentid.sql
 create mode 100644 resources/sql/autopatches/20180828.phriction.06.documentid.sql
 create mode 100644 src/applications/phriction/xaction/PhrictionDocumentVersionTransaction.php

diff --git a/resources/sql/autopatches/20180828.phriction.01.contentphid.sql b/resources/sql/autopatches/20180828.phriction.01.contentphid.sql
new file mode 100644
index 0000000000..cf3d78ebdf
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.01.contentphid.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_document
+  ADD contentPHID VARBINARY(64) NOT NULL;
diff --git a/resources/sql/autopatches/20180828.phriction.02.documentphid.sql b/resources/sql/autopatches/20180828.phriction.02.documentphid.sql
new file mode 100644
index 0000000000..c15b4b17b8
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.02.documentphid.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_content
+  ADD documentPHID VARBINARY(64) NOT NULL;
diff --git a/resources/sql/autopatches/20180828.phriction.03.editedepoch.sql b/resources/sql/autopatches/20180828.phriction.03.editedepoch.sql
new file mode 100644
index 0000000000..eae31fc0ba
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.03.editedepoch.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_document
+  ADD editedEpoch INT UNSIGNED NOT NULL;
diff --git a/resources/sql/autopatches/20180828.phriction.04.migrate.php b/resources/sql/autopatches/20180828.phriction.04.migrate.php
new file mode 100644
index 0000000000..461eae2dad
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.04.migrate.php
@@ -0,0 +1,57 @@
+<?php
+
+// Update the PhrictionDocument and PhrictionContent tables to refer to one
+// another by PHID instead of by ID.
+
+$document_table = new PhrictionDocument();
+$content_table = new PhrictionContent();
+
+$conn = $document_table->establishConnection('w');
+
+$document_iterator = new LiskRawMigrationIterator(
+  $conn,
+  $document_table->getTableName());
+foreach ($document_iterator as $row) {
+  $content_id = $row['contentID'];
+
+  $content_row = queryfx_one(
+    $conn,
+    'SELECT phid, dateCreated FROM %T WHERE id = %d',
+    $content_table->getTableName(),
+    $content_id);
+
+  if (!$content_row) {
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET contentPHID = %s, editedEpoch = %d WHERE id = %d',
+    $document_table->getTableName(),
+    $content_row['phid'],
+    $content_row['dateCreated'],
+    $row['id']);
+}
+
+$content_iterator = new LiskRawMigrationIterator(
+  $conn,
+  $content_table->getTableName());
+foreach ($content_iterator as $row) {
+  $document_id = $row['documentID'];
+
+  $document_row = queryfx_one(
+    $conn,
+    'SELECT phid FROM %T WHERE id = %d',
+    $document_table->getTableName(),
+    $document_id);
+  if (!$document_row) {
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET documentPHID = %s WHERE id = %d',
+    $content_table->getTableName(),
+    $document_row['phid'],
+    $row['id']);
+}
diff --git a/resources/sql/autopatches/20180828.phriction.05.contentid.sql b/resources/sql/autopatches/20180828.phriction.05.contentid.sql
new file mode 100644
index 0000000000..d6cba741a3
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.05.contentid.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_document
+  DROP contentID;
diff --git a/resources/sql/autopatches/20180828.phriction.06.documentid.sql b/resources/sql/autopatches/20180828.phriction.06.documentid.sql
new file mode 100644
index 0000000000..2323154b3e
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.06.documentid.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_content
+  DROP documentID;
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 284980bcc5..191522d8fb 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -5036,6 +5036,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentTitleHeraldField' => 'applications/phriction/herald/PhrictionDocumentTitleHeraldField.php',
     'PhrictionDocumentTitleTransaction' => 'applications/phriction/xaction/PhrictionDocumentTitleTransaction.php',
     'PhrictionDocumentTransactionType' => 'applications/phriction/xaction/PhrictionDocumentTransactionType.php',
+    'PhrictionDocumentVersionTransaction' => 'applications/phriction/xaction/PhrictionDocumentVersionTransaction.php',
     'PhrictionEditConduitAPIMethod' => 'applications/phriction/conduit/PhrictionEditConduitAPIMethod.php',
     'PhrictionEditController' => 'applications/phriction/controller/PhrictionEditController.php',
     'PhrictionHistoryConduitAPIMethod' => 'applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php',
@@ -11129,17 +11130,17 @@ phutil_register_library_map(array(
     ),
     'PhrictionDocumentAuthorHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentContentHeraldField' => 'PhrictionDocumentHeraldField',
-    'PhrictionDocumentContentTransaction' => 'PhrictionDocumentTransactionType',
+    'PhrictionDocumentContentTransaction' => 'PhrictionDocumentVersionTransaction',
     'PhrictionDocumentController' => 'PhrictionController',
     'PhrictionDocumentDatasource' => 'PhabricatorTypeaheadDatasource',
-    'PhrictionDocumentDeleteTransaction' => 'PhrictionDocumentTransactionType',
+    'PhrictionDocumentDeleteTransaction' => 'PhrictionDocumentVersionTransaction',
     'PhrictionDocumentFerretEngine' => 'PhabricatorFerretEngine',
     'PhrictionDocumentFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhrictionDocumentHeraldAdapter' => 'HeraldAdapter',
     'PhrictionDocumentHeraldField' => 'HeraldField',
     'PhrictionDocumentHeraldFieldGroup' => 'HeraldFieldGroup',
-    'PhrictionDocumentMoveAwayTransaction' => 'PhrictionDocumentTransactionType',
-    'PhrictionDocumentMoveToTransaction' => 'PhrictionDocumentTransactionType',
+    'PhrictionDocumentMoveAwayTransaction' => 'PhrictionDocumentVersionTransaction',
+    'PhrictionDocumentMoveToTransaction' => 'PhrictionDocumentVersionTransaction',
     'PhrictionDocumentPHIDType' => 'PhabricatorPHIDType',
     'PhrictionDocumentPathHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentPolicyCodex' => 'PhabricatorPolicyCodex',
@@ -11148,8 +11149,9 @@ phutil_register_library_map(array(
     'PhrictionDocumentSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhrictionDocumentStatus' => 'PhabricatorObjectStatus',
     'PhrictionDocumentTitleHeraldField' => 'PhrictionDocumentHeraldField',
-    'PhrictionDocumentTitleTransaction' => 'PhrictionDocumentTransactionType',
+    'PhrictionDocumentTitleTransaction' => 'PhrictionDocumentVersionTransaction',
     'PhrictionDocumentTransactionType' => 'PhabricatorModularTransactionType',
+    'PhrictionDocumentVersionTransaction' => 'PhrictionDocumentTransactionType',
     'PhrictionEditConduitAPIMethod' => 'PhrictionConduitAPIMethod',
     'PhrictionEditController' => 'PhrictionController',
     'PhrictionHistoryConduitAPIMethod' => 'PhrictionConduitAPIMethod',
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
index f443ad657b..c81a90a3df 100644
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -65,8 +65,8 @@ final class PhrictionDiffController extends PhrictionController {
 
     $slug = $document->getSlug();
 
-    $revert_l = $this->renderRevertButton($content_l, $current);
-    $revert_r = $this->renderRevertButton($content_r, $current);
+    $revert_l = $this->renderRevertButton($document, $content_l, $current);
+    $revert_r = $this->renderRevertButton($document, $content_r, $current);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumb_views = $this->renderBreadcrumbs($slug);
@@ -179,10 +179,11 @@ final class PhrictionDiffController extends PhrictionController {
   }
 
   private function renderRevertButton(
+    PhrictionDocument $document,
     PhrictionContent $content,
     PhrictionContent $current) {
 
-    $document_id = $content->getDocumentID();
+    $document_id = $document->getID();
     $version = $content->getVersion();
 
     $hidden_statuses = array(
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index fce2c066f7..0018ca229a 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -78,7 +78,7 @@ final class PhrictionDocumentController
           return new Aphront404Response();
         }
 
-        if ($content->getID() != $document->getContentID()) {
+        if ($content->getPHID() != $document->getContentPHID()) {
           $version_note = id(new PHUIInfoView())
             ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
             ->appendChild(
diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
index 432b1dfdef..2a3afc9769 100644
--- a/src/applications/phriction/controller/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
@@ -52,7 +52,7 @@ final class PhrictionHistoryController
       }
 
       $vs_head = null;
-      if ($content->getID() != $document->getContentID()) {
+      if ($content->getPHID() != $document->getContentPHID()) {
         $vs_head = $diff_uri
           ->alter('l', $content->getVersion())
           ->alter('r', $current->getVersion());
diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index b9f2c0e2ca..d91165ab1d 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -93,29 +93,13 @@ final class PhrictionTransactionEditor
     return $types;
   }
 
-  protected function shouldApplyInitialEffects(
-    PhabricatorLiskDAO $object,
-    array $xactions) {
-
-    foreach ($xactions as $xaction) {
-      switch ($xaction->getTransactionType()) {
-        case PhrictionDocumentTitleTransaction::TRANSACTIONTYPE:
-        case PhrictionDocumentContentTransaction::TRANSACTIONTYPE:
-        case PhrictionDocumentDeleteTransaction::TRANSACTIONTYPE:
-        case PhrictionDocumentMoveToTransaction::TRANSACTIONTYPE:
-        case PhrictionDocumentMoveAwayTransaction::TRANSACTIONTYPE:
-          return true;
-      }
-    }
-    return parent::shouldApplyInitialEffects($object, $xactions);
-  }
-
-  protected function applyInitialEffects(
+  protected function expandTransactions(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $this->setOldContent($object->getContent());
-    $this->setNewContent($this->buildNewContentTemplate($object));
+
+    return parent::expandTransactions($object, $xactions);
   }
 
   protected function expandTransaction(
@@ -148,7 +132,6 @@ final class PhrictionTransactionEditor
         break;
       default:
         break;
-
     }
 
     return $xactions;
@@ -158,29 +141,12 @@ final class PhrictionTransactionEditor
     PhabricatorLiskDAO $object,
     array $xactions) {
 
-    $save_content = false;
-    foreach ($xactions as $xaction) {
-      switch ($xaction->getTransactionType()) {
-        case PhrictionDocumentTitleTransaction::TRANSACTIONTYPE:
-        case PhrictionDocumentMoveToTransaction::TRANSACTIONTYPE:
-        case PhrictionDocumentMoveAwayTransaction::TRANSACTIONTYPE:
-        case PhrictionDocumentDeleteTransaction::TRANSACTIONTYPE:
-        case PhrictionDocumentContentTransaction::TRANSACTIONTYPE:
-          $save_content = true;
-          break;
-        default:
-          break;
-      }
-    }
+    if ($this->hasNewDocumentContent()) {
+      $content = $this->getNewDocumentContent($object);
 
-    if ($save_content) {
-      $content = $this->getNewContent();
-      $content->setDocumentID($object->getID());
-      $content->save();
-
-      $object->setContentID($content->getID());
-      $object->save();
-      $object->attachContent($content);
+      $content
+        ->setDocumentPHID($object->getPHID())
+        ->save();
     }
 
     if ($this->getIsNewObject() && !$this->getSkipAncestorCheck()) {
@@ -535,24 +501,47 @@ final class PhrictionTransactionEditor
       ->setDocument($object);
   }
 
-  private function buildNewContentTemplate(
-    PhrictionDocument $document) {
+  private function hasNewDocumentContent() {
+    return (bool)$this->newContent;
+  }
 
-    $new_content = id(new PhrictionContent())
+  public function getNewDocumentContent(PhrictionDocument $document) {
+    if (!$this->hasNewDocumentContent()) {
+      $content = $this->newDocumentContent($document);
+
+      // Generate a PHID now so we can populate "contentPHID" before saving
+      // the document to the database: the column is not nullable so we need
+      // a value.
+      $content_phid = $content->generatePHID();
+
+      $content->setPHID($content_phid);
+
+      $document->setContentPHID($content_phid);
+      $document->attachContent($content);
+      $document->setEditedEpoch(PhabricatorTime::getNow());
+
+      $this->newContent = $content;
+    }
+
+    return $this->newContent;
+  }
+
+  private function newDocumentContent(PhrictionDocument $document) {
+    $content = id(new PhrictionContent())
       ->setSlug($document->getSlug())
-      ->setAuthorPHID($this->getActor()->getPHID())
+      ->setAuthorPHID($this->getActingAsPHID())
       ->setChangeType(PhrictionChangeType::CHANGE_EDIT)
       ->setTitle($this->getOldContent()->getTitle())
       ->setContent($this->getOldContent()->getContent())
       ->setDescription('');
 
     if (strlen($this->getDescription())) {
-      $new_content->setDescription($this->getDescription());
+      $content->setDescription($this->getDescription());
     }
 
-    $new_content->setVersion($this->getOldContent()->getVersion() + 1);
+    $content->setVersion($this->getOldContent()->getVersion() + 1);
 
-    return $new_content;
+    return $content;
   }
 
   protected function getCustomWorkerState() {
diff --git a/src/applications/phriction/query/PhrictionContentQuery.php b/src/applications/phriction/query/PhrictionContentQuery.php
index 053f40cf9c..6efab5e1c6 100644
--- a/src/applications/phriction/query/PhrictionContentQuery.php
+++ b/src/applications/phriction/query/PhrictionContentQuery.php
@@ -76,7 +76,7 @@ final class PhrictionContentQuery
     if ($this->shouldJoinDocumentTable()) {
       $joins[] = qsprintf(
         $conn,
-        'JOIN %T d ON d.id = c.documentID',
+        'JOIN %T d ON d.phid = c.documentPHID',
         id(new PhrictionDocument())->getTableName());
     }
 
@@ -84,19 +84,19 @@ final class PhrictionContentQuery
   }
 
   protected function willFilterPage(array $contents) {
-    $document_ids = mpull($contents, 'getDocumentID');
+    $document_phids = mpull($contents, 'getDocumentPHID');
 
     $documents = id(new PhrictionDocumentQuery())
       ->setViewer($this->getViewer())
       ->setParentQuery($this)
-      ->withIDs($document_ids)
+      ->withPHIDs($document_phids)
       ->execute();
-    $documents = mpull($documents, null, 'getID');
+    $documents = mpull($documents, null, 'getPHID');
 
     foreach ($contents as $key => $content) {
-      $document_id = $content->getDocumentID();
+      $document_phid = $content->getDocumentPHID();
 
-      $document = idx($documents, $document_id);
+      $document = idx($documents, $document_phid);
       if (!$document) {
         unset($contents[$key]);
         $this->didRejectResult($content);
diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php
index 0c6a2c23bc..8a0fa325ae 100644
--- a/src/applications/phriction/query/PhrictionDocumentQuery.php
+++ b/src/applications/phriction/query/PhrictionDocumentQuery.php
@@ -151,17 +151,17 @@ final class PhrictionDocumentQuery
       $contents = id(new PhrictionContentQuery())
         ->setViewer($this->getViewer())
         ->setParentQuery($this)
-        ->withIDs(mpull($documents, 'getContentID'))
+        ->withPHIDs(mpull($documents, 'getContentPHID'))
         ->execute();
-      $contents = mpull($contents, null, 'getID');
+      $contents = mpull($contents, null, 'getPHID');
 
       foreach ($documents as $key => $document) {
-        $content_id = $document->getContentID();
-        if (empty($contents[$content_id])) {
+        $content_phid = $document->getContentPHID();
+        if (empty($contents[$content_phid])) {
           unset($documents[$key]);
           continue;
         }
-        $document->attachContent($contents[$content_id]);
+        $document->attachContent($contents[$content_phid]);
       }
     }
 
@@ -175,7 +175,7 @@ final class PhrictionDocumentQuery
       $content_dao = new PhrictionContent();
       $joins[] = qsprintf(
         $conn,
-        'JOIN %T c ON d.contentID = c.id',
+        'JOIN %T c ON d.contentPHID = c.phid',
         $content_dao->getTableName());
     }
 
@@ -321,7 +321,7 @@ final class PhrictionDocumentQuery
   public function getBuiltinOrders() {
     return parent::getBuiltinOrders() + array(
       self::ORDER_HIERARCHY => array(
-        'vector' => array('depth', 'title', 'updated'),
+        'vector' => array('depth', 'title', 'updated', 'id'),
         'name' => pht('Hierarchy'),
       ),
     );
@@ -343,9 +343,9 @@ final class PhrictionDocumentQuery
       ),
       'updated' => array(
         'table' => 'd',
-        'column' => 'contentID',
+        'column' => 'editedEpoch',
         'type' => 'int',
-        'unique' => true,
+        'unique' => false,
       ),
     );
   }
@@ -356,7 +356,7 @@ final class PhrictionDocumentQuery
     $map = array(
       'id' => $document->getID(),
       'depth' => $document->getDepth(),
-      'updated' => $document->getContentID(),
+      'updated' => $document->getEditedEpoch(),
     );
 
     foreach ($keys as $key) {
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index 515fc6b7d5..287974715f 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -7,7 +7,7 @@ final class PhrictionContent
     PhabricatorDestructibleInterface,
     PhabricatorConduitResultInterface {
 
-  protected $documentID;
+  protected $documentPHID;
   protected $version;
   protected $authorPHID;
 
@@ -35,7 +35,7 @@ final class PhrictionContent
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'documentID' => array(
-          'columns' => array('documentID', 'version'),
+          'columns' => array('documentPHID', 'version'),
           'unique' => true,
         ),
         'authorPHID' => array(
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 6edb516e6e..0e260c2e40 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -17,12 +17,13 @@ final class PhrictionDocument extends PhrictionDAO
 
   protected $slug;
   protected $depth;
-  protected $contentID;
+  protected $contentPHID;
   protected $status;
   protected $mailKey;
   protected $viewPolicy;
   protected $editPolicy;
   protected $spacePHID;
+  protected $editedEpoch;
 
   private $contentObject = self::ATTACHABLE;
   private $ancestors = array();
@@ -34,16 +35,11 @@ final class PhrictionDocument extends PhrictionDAO
       self::CONFIG_COLUMN_SCHEMA => array(
         'slug' => 'sort128',
         'depth' => 'uint32',
-        'contentID' => 'id?',
         'status' => 'text32',
         'mailKey' => 'bytes20',
+        'editedEpoch' => 'epoch',
       ),
       self::CONFIG_KEY_SCHEMA => array(
-        'key_phid' => null,
-        'phid' => array(
-          'columns' => array('phid'),
-          'unique' => true,
-        ),
         'slug' => array(
           'columns' => array('slug'),
           'unique' => true,
@@ -56,17 +52,16 @@ final class PhrictionDocument extends PhrictionDAO
     ) + parent::getConfiguration();
   }
 
-  public function generatePHID() {
-    return PhabricatorPHID::generateNewPHID(
-      PhrictionDocumentPHIDType::TYPECONST);
+  public function getPHIDType() {
+    return PhrictionDocumentPHIDType::TYPECONST;
   }
 
   public static function initializeNewDocument(PhabricatorUser $actor, $slug) {
-    $document = new PhrictionDocument();
-    $document->setSlug($slug);
+    $document = id(new self())
+      ->setSlug($slug);
 
-    $content = new PhrictionContent();
-    $content->setSlug($slug);
+    $content = id(new PhrictionContent())
+      ->setSlug($slug);
 
     $default_title = PhabricatorSlug::getDefaultTitle($slug);
     $content->setTitle($default_title);
@@ -95,6 +90,8 @@ final class PhrictionDocument extends PhrictionDAO
         ->setSpacePHID($actor->getDefaultSpacePHID());
     }
 
+    $document->setEditedEpoch(PhabricatorTime::getNow());
+
     return $document;
   }
 
diff --git a/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
index a051546824..759121dd65 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhrictionDocumentContentTransaction
-  extends PhrictionDocumentTransactionType {
+  extends PhrictionDocumentVersionTransaction {
 
   const TRANSACTIONTYPE = 'content';
 
@@ -18,10 +18,9 @@ final class PhrictionDocumentContentTransaction
 
   public function applyInternalEffects($object, $value) {
     $object->setStatus(PhrictionDocumentStatus::STATUS_EXISTS);
-  }
 
-  public function applyExternalEffects($object, $value) {
-    $this->getEditor()->getNewContent()->setContent($value);
+    $content = $this->getNewDocumentContent($object);
+    $content->setContent($value);
   }
 
   public function shouldHide() {
diff --git a/src/applications/phriction/xaction/PhrictionDocumentDeleteTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentDeleteTransaction.php
index 25cc7c2b28..b1d894b96c 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentDeleteTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentDeleteTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhrictionDocumentDeleteTransaction
-  extends PhrictionDocumentTransactionType {
+  extends PhrictionDocumentVersionTransaction {
 
   const TRANSACTIONTYPE = 'delete';
 
@@ -11,12 +11,11 @@ final class PhrictionDocumentDeleteTransaction
 
   public function applyInternalEffects($object, $value) {
     $object->setStatus(PhrictionDocumentStatus::STATUS_DELETED);
-  }
 
-  public function applyExternalEffects($object, $value) {
-    $this->getEditor()->getNewContent()->setContent('');
-    $this->getEditor()->getNewContent()->setChangeType(
-      PhrictionChangeType::CHANGE_DELETE);
+    $content = $this->getNewDocumentContent($object);
+
+    $content->setContent('');
+    $content->setChangeType(PhrictionChangeType::CHANGE_DELETE);
   }
 
   public function getActionStrength() {
diff --git a/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
index 3cd45f73b7..09ec56dd25 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhrictionDocumentMoveAwayTransaction
-  extends PhrictionDocumentTransactionType {
+  extends PhrictionDocumentVersionTransaction {
 
   const TRANSACTIONTYPE = 'move-away';
 
@@ -22,14 +22,12 @@ final class PhrictionDocumentMoveAwayTransaction
 
   public function applyInternalEffects($object, $value) {
     $object->setStatus(PhrictionDocumentStatus::STATUS_MOVED);
-  }
 
-  public function applyExternalEffects($object, $value) {
-    $dict = $value;
-    $this->getEditor()->getNewContent()->setContent('');
-    $this->getEditor()->getNewContent()->setChangeType(
-      PhrictionChangeType::CHANGE_MOVE_AWAY);
-    $this->getEditor()->getNewContent()->setChangeRef($dict['id']);
+    $content = $this->getNewDocumentContent($object);
+
+    $content->setContent('');
+    $content->setChangeType(PhrictionChangeType::CHANGE_MOVE_AWAY);
+    $content->setChangeRef($value['id']);
   }
 
   public function getActionName() {
diff --git a/src/applications/phriction/xaction/PhrictionDocumentMoveToTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentMoveToTransaction.php
index bdf2c5d8fc..180c263942 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentMoveToTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentMoveToTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhrictionDocumentMoveToTransaction
-  extends PhrictionDocumentTransactionType {
+  extends PhrictionDocumentVersionTransaction {
 
   const TRANSACTIONTYPE = 'move-to';
 
@@ -11,6 +11,7 @@ final class PhrictionDocumentMoveToTransaction
 
   public function generateNewValue($object, $value) {
     $document = $value;
+
     $dict = array(
       'id' => $document->getID(),
       'phid' => $document->getPHID(),
@@ -26,15 +27,13 @@ final class PhrictionDocumentMoveToTransaction
 
   public function applyInternalEffects($object, $value) {
     $object->setStatus(PhrictionDocumentStatus::STATUS_EXISTS);
-  }
 
-  public function applyExternalEffects($object, $value) {
-    $dict = $value;
-    $this->getEditor()->getNewContent()->setContent($dict['content']);
-    $this->getEditor()->getNewContent()->setTitle($dict['title']);
-    $this->getEditor()->getNewContent()->setChangeType(
-      PhrictionChangeType::CHANGE_MOVE_HERE);
-    $this->getEditor()->getNewContent()->setChangeRef($dict['id']);
+    $content = $this->getNewDocumentContent($object);
+
+    $content->setContent($value['content']);
+    $content->setTitle($value['title']);
+    $content->setChangeType(PhrictionChangeType::CHANGE_MOVE_HERE);
+    $content->setChangeRef($value['id']);
   }
 
   public function getActionStrength() {
diff --git a/src/applications/phriction/xaction/PhrictionDocumentTitleTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentTitleTransaction.php
index 5c97d1bec8..25a77efffe 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentTitleTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentTitleTransaction.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhrictionDocumentTitleTransaction
-  extends PhrictionDocumentTransactionType {
+  extends PhrictionDocumentVersionTransaction {
 
   const TRANSACTIONTYPE = 'title';
 
@@ -14,10 +14,10 @@ final class PhrictionDocumentTitleTransaction
 
   public function applyInternalEffects($object, $value) {
     $object->setStatus(PhrictionDocumentStatus::STATUS_EXISTS);
-  }
 
-  public function applyExternalEffects($object, $value) {
-    $this->getEditor()->getNewContent()->setTitle($value);
+    $content = $this->getNewDocumentContent($object);
+
+    $content->setTitle($value);
   }
 
   public function getActionStrength() {
diff --git a/src/applications/phriction/xaction/PhrictionDocumentVersionTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentVersionTransaction.php
new file mode 100644
index 0000000000..005e617e3b
--- /dev/null
+++ b/src/applications/phriction/xaction/PhrictionDocumentVersionTransaction.php
@@ -0,0 +1,10 @@
+<?php
+
+abstract class PhrictionDocumentVersionTransaction
+  extends PhrictionDocumentTransactionType {
+
+  protected function getNewDocumentContent($object) {
+    return $this->getEditor()->getNewDocumentContent($object);
+  }
+
+}

From 50f4adef64cfee615f3bc4638e7328e864bca00c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 29 Aug 2018 08:22:53 -0700
Subject: [PATCH 057/125] Remove on-object mailkeys from Phriction

Summary: Depends on D19619. Ref T13065. Ref T13077. Migrate Phriction mail keys to the new infrastructure and drop the column.

Test Plan: Ran migrations, spot-checked the database.

Reviewers: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13077, T13065

Differential Revision: https://secure.phabricator.com/D19620
---
 .../20180829.phriction.01.mailkey.php         | 26 +++++++++++++++++++
 .../20180829.phriction.02.rmkey.sql           |  2 ++
 .../phriction/storage/PhrictionDocument.php   | 15 +++--------
 3 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 resources/sql/autopatches/20180829.phriction.01.mailkey.php
 create mode 100644 resources/sql/autopatches/20180829.phriction.02.rmkey.sql

diff --git a/resources/sql/autopatches/20180829.phriction.01.mailkey.php b/resources/sql/autopatches/20180829.phriction.01.mailkey.php
new file mode 100644
index 0000000000..cb85a3c5ef
--- /dev/null
+++ b/resources/sql/autopatches/20180829.phriction.01.mailkey.php
@@ -0,0 +1,26 @@
+<?php
+
+$document_table = new PhrictionDocument();
+$document_conn = $document_table->establishConnection('w');
+$document_name = $document_table->getTableName();
+
+$properties_table = new PhabricatorMetaMTAMailProperties();
+$conn = $properties_table->establishConnection('w');
+
+$iterator = new LiskRawMigrationIterator($document_conn, $document_name);
+foreach ($iterator as $row) {
+  queryfx(
+    $conn,
+    'INSERT IGNORE INTO %T
+        (objectPHID, mailProperties, dateCreated, dateModified)
+      VALUES
+        (%s, %s, %d, %d)',
+    $properties_table->getTableName(),
+    $row['phid'],
+    phutil_json_encode(
+      array(
+        'mailKey' => $row['mailKey'],
+      )),
+    PhabricatorTime::getNow(),
+    PhabricatorTime::getNow());
+}
diff --git a/resources/sql/autopatches/20180829.phriction.02.rmkey.sql b/resources/sql/autopatches/20180829.phriction.02.rmkey.sql
new file mode 100644
index 0000000000..8199287db7
--- /dev/null
+++ b/resources/sql/autopatches/20180829.phriction.02.rmkey.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_document
+  DROP mailKey;
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 0e260c2e40..626d02c1db 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -19,7 +19,6 @@ final class PhrictionDocument extends PhrictionDAO
   protected $depth;
   protected $contentPHID;
   protected $status;
-  protected $mailKey;
   protected $viewPolicy;
   protected $editPolicy;
   protected $spacePHID;
@@ -36,7 +35,6 @@ final class PhrictionDocument extends PhrictionDAO
         'slug' => 'sort128',
         'depth' => 'uint32',
         'status' => 'text32',
-        'mailKey' => 'bytes20',
         'editedEpoch' => 'epoch',
       ),
       self::CONFIG_KEY_SCHEMA => array(
@@ -95,13 +93,6 @@ final class PhrictionDocument extends PhrictionDAO
     return $document;
   }
 
-  public function save() {
-    if (!$this->getMailKey()) {
-      $this->setMailKey(Filesystem::readRandomCharacters(20));
-    }
-    return parent::save();
-  }
-
   public static function getSlugURI($slug, $type = 'document') {
     static $types = array(
       'document'  => '/w/',
@@ -329,9 +320,9 @@ final class PhrictionDocument extends PhrictionDAO
 /* -(  PhabricatorPolicyCodexInterface  )------------------------------------ */
 
 
-    public function newPolicyCodex() {
-      return new PhrictionDocumentPolicyCodex();
-    }
+  public function newPolicyCodex() {
+    return new PhrictionDocumentPolicyCodex();
+  }
 
 
 }

From 349686319e3066c954e876ce0d296da0443717bb Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 28 Aug 2018 15:43:40 -0700
Subject: [PATCH 058/125] Allow the published version of a Phriction document
 to differ from the most recent version

Summary:
Depends on D19620. Ref T13077. This adds a "Publish" operation which points the current version at some historical version of the document -- not necessarily the most recent version. Newer versions become "drafts".

This is still quite rough and missing a lot of hinting in the UI, I'm just making it work so I can start making the UI understand it.

Test Plan: Used the "Publish" action to publish older versions of a document, saw the document revert. Many UI hints are missing and this operation is puzzling and not yet usable for normal users.

Reviewers: amckinley

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19621
---
 src/__phutil_library_map__.php                |  4 +
 .../PhabricatorPhrictionApplication.php       |  2 +
 .../PhrictionDocumentController.php           | 29 ++++++-
 .../controller/PhrictionPublishController.php | 86 +++++++++++++++++++
 .../PhrictionDocumentPublishTransaction.php   | 71 +++++++++++++++
 src/view/phui/PHUIDocumentView.php            | 11 +++
 6 files changed, 200 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/phriction/controller/PhrictionPublishController.php
 create mode 100644 src/applications/phriction/xaction/PhrictionDocumentPublishTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 191522d8fb..a86027bf13 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -5029,6 +5029,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentPHIDType' => 'applications/phriction/phid/PhrictionDocumentPHIDType.php',
     'PhrictionDocumentPathHeraldField' => 'applications/phriction/herald/PhrictionDocumentPathHeraldField.php',
     'PhrictionDocumentPolicyCodex' => 'applications/phriction/codex/PhrictionDocumentPolicyCodex.php',
+    'PhrictionDocumentPublishTransaction' => 'applications/phriction/xaction/PhrictionDocumentPublishTransaction.php',
     'PhrictionDocumentQuery' => 'applications/phriction/query/PhrictionDocumentQuery.php',
     'PhrictionDocumentSearchConduitAPIMethod' => 'applications/phriction/conduit/PhrictionDocumentSearchConduitAPIMethod.php',
     'PhrictionDocumentSearchEngine' => 'applications/phriction/query/PhrictionDocumentSearchEngine.php',
@@ -5046,6 +5047,7 @@ phutil_register_library_map(array(
     'PhrictionMarkupPreviewController' => 'applications/phriction/controller/PhrictionMarkupPreviewController.php',
     'PhrictionMoveController' => 'applications/phriction/controller/PhrictionMoveController.php',
     'PhrictionNewController' => 'applications/phriction/controller/PhrictionNewController.php',
+    'PhrictionPublishController' => 'applications/phriction/controller/PhrictionPublishController.php',
     'PhrictionRemarkupRule' => 'applications/phriction/markup/PhrictionRemarkupRule.php',
     'PhrictionReplyHandler' => 'applications/phriction/mail/PhrictionReplyHandler.php',
     'PhrictionSchemaSpec' => 'applications/phriction/storage/PhrictionSchemaSpec.php',
@@ -11144,6 +11146,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentPHIDType' => 'PhabricatorPHIDType',
     'PhrictionDocumentPathHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentPolicyCodex' => 'PhabricatorPolicyCodex',
+    'PhrictionDocumentPublishTransaction' => 'PhrictionDocumentTransactionType',
     'PhrictionDocumentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhrictionDocumentSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'PhrictionDocumentSearchEngine' => 'PhabricatorApplicationSearchEngine',
@@ -11161,6 +11164,7 @@ phutil_register_library_map(array(
     'PhrictionMarkupPreviewController' => 'PhabricatorController',
     'PhrictionMoveController' => 'PhrictionController',
     'PhrictionNewController' => 'PhrictionController',
+    'PhrictionPublishController' => 'PhrictionController',
     'PhrictionRemarkupRule' => 'PhutilRemarkupRule',
     'PhrictionReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
     'PhrictionSchemaSpec' => 'PhabricatorConfigSchemaSpec',
diff --git a/src/applications/phriction/application/PhabricatorPhrictionApplication.php b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
index ea91727c76..d44845c4b9 100644
--- a/src/applications/phriction/application/PhabricatorPhrictionApplication.php
+++ b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
@@ -56,6 +56,8 @@ final class PhabricatorPhrictionApplication extends PhabricatorApplication {
 
         'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhrictionEditController',
         'delete/(?P<id>[1-9]\d*)/'    => 'PhrictionDeleteController',
+        'publish/(?P<documentID>[1-9]\d*)/(?P<contentID>[1-9]\d*)/'
+          => 'PhrictionPublishController',
         'new/'                        => 'PhrictionNewController',
         'move/(?P<id>[1-9]\d*)/' => 'PhrictionMoveController',
 
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 0018ca229a..7ffc00086b 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -203,7 +203,7 @@ final class PhrictionDocumentController
 
     $curtain = null;
     if ($document->getID()) {
-      $curtain = $this->buildCurtain($document);
+      $curtain = $this->buildCurtain($document, $content);
     }
 
     $crumbs = $this->buildApplicationCrumbs();
@@ -230,11 +230,11 @@ final class PhrictionDocumentController
     $prop_list = phutil_tag_div('phui-document-view-pro-box', $prop_list);
 
     $page_content = id(new PHUIDocumentView())
+      ->setBanner($version_note)
       ->setHeader($header)
       ->setToc($toc)
       ->appendChild(
         array(
-          $version_note,
           $move_notice,
           $core_content,
         ));
@@ -277,7 +277,9 @@ final class PhrictionDocumentController
     return $view;
   }
 
-  private function buildCurtain(PhrictionDocument $document) {
+  private function buildCurtain(
+    PhrictionDocument $document,
+    PhrictionContent $content) {
     $viewer = $this->getViewer();
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
@@ -286,6 +288,7 @@ final class PhrictionDocumentController
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $slug = PhabricatorSlug::normalize($this->slug);
+    $id = $document->getID();
 
     $curtain = $this->newCurtainView($document);
 
@@ -296,6 +299,26 @@ final class PhrictionDocumentController
         ->setIcon('fa-pencil')
         ->setHref('/phriction/edit/'.$document->getID().'/'));
 
+    $is_current = false;
+    $content_id = null;
+    if ($content) {
+      if ($content->getPHID() == $document->getContentPHID()) {
+        $is_current = true;
+      }
+      $content_id = $content->getID();
+    }
+    $can_publish = ($can_edit && $content && !$is_current);
+
+    $publish_uri = "/phriction/publish/{$id}/{$content_id}/";
+
+    $curtain->addAction(
+      id(new PhabricatorActionView())
+      ->setName(pht('Publish'))
+      ->setIcon('fa-upload')
+      ->setDisabled(!$can_publish)
+      ->setWorkflow(true)
+      ->setHref($publish_uri));
+
     if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
       $curtain->addAction(
         id(new PhabricatorActionView())
diff --git a/src/applications/phriction/controller/PhrictionPublishController.php b/src/applications/phriction/controller/PhrictionPublishController.php
new file mode 100644
index 0000000000..43c90cb1fa
--- /dev/null
+++ b/src/applications/phriction/controller/PhrictionPublishController.php
@@ -0,0 +1,86 @@
+<?php
+
+final class PhrictionPublishController
+  extends PhrictionController {
+
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+    $id = $request->getURIData('documentID');
+    $content_id = $request->getURIData('contentID');
+
+    $document = id(new PhrictionDocumentQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($id))
+      ->needContent(true)
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_EDIT,
+          PhabricatorPolicyCapability::CAN_VIEW,
+        ))
+      ->executeOne();
+    if (!$document) {
+      return new Aphront404Response();
+    }
+
+    $document_uri = $document->getURI();
+
+    $content = id(new PhrictionContentQuery())
+      ->setViewer($viewer)
+      ->withIDs(array($content_id))
+      ->executeOne();
+    if (!$content) {
+      return new Aphront404Response();
+    }
+
+    if ($content->getPHID() == $document->getContentPHID()) {
+      return $this->newDialog()
+        ->setTitle(pht('Already Published'))
+        ->appendChild(
+          pht(
+            'This version of the document is already the published '.
+            'version.'))
+        ->addCancelButton($document_uri);
+    }
+
+    $content_uri = $document_uri.'?v='.$content->getVersion();
+
+    if ($request->isFormPost()) {
+      $xactions = array();
+
+      $xactions[] = id(new PhrictionTransaction())
+        ->setTransactionType(
+          PhrictionDocumentPublishTransaction::TRANSACTIONTYPE)
+        ->setNewValue($content->getPHID());
+
+      id(new PhrictionTransactionEditor())
+        ->setActor($viewer)
+        ->setContentSourceFromRequest($request)
+        ->setContinueOnNoEffect(true)
+        ->setContinueOnMissingFields(true)
+        ->applyTransactions($document, $xactions);
+
+      return id(new AphrontRedirectResponse())->setURI($document_uri);
+    }
+
+    if ($content->getVersion() < $document->getContent()->getVersion()) {
+      $title = pht('Revert Document?');
+      $body = pht(
+        'Revert the published version of this document to an older '.
+        'version?');
+      $button = pht('Revert');
+    } else {
+      $title = pht('Publish Draft?');
+      $body = pht(
+        'Update the published version of this document to this newer '.
+        'version?');
+      $button = pht('Publish');
+    }
+
+    return $this->newDialog()
+      ->setTitle($title)
+      ->appendChild($body)
+      ->addSubmitButton($button)
+      ->addCancelButton($content_uri);
+  }
+
+}
diff --git a/src/applications/phriction/xaction/PhrictionDocumentPublishTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentPublishTransaction.php
new file mode 100644
index 0000000000..324e5c2d4d
--- /dev/null
+++ b/src/applications/phriction/xaction/PhrictionDocumentPublishTransaction.php
@@ -0,0 +1,71 @@
+<?php
+
+final class PhrictionDocumentPublishTransaction
+  extends PhrictionDocumentTransactionType {
+
+  const TRANSACTIONTYPE = 'publish';
+
+  public function generateOldValue($object) {
+    return $object->getContentPHID();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setContentPHID($value);
+  }
+
+  public function getActionName() {
+    return pht('Published');
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s published a new version of this document.',
+      $this->renderAuthor());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s published a new version of %s.',
+      $this->renderAuthor(),
+      $this->renderObject());
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $actor = $this->getActor();
+    $errors = array();
+
+    foreach ($xactions as $xaction) {
+      $content_phid = $xaction->getNewValue();
+
+      // If this isn't changing anything, skip it.
+      if ($content_phid === $object->getContentPHID()) {
+        continue;
+      }
+
+      $content = id(new PhrictionContentQuery())
+        ->setViewer($actor)
+        ->withPHIDs(array($content_phid))
+        ->executeOne();
+      if (!$content) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Unable to load Content object with PHID "%s".',
+            $content_phid),
+          $xaction);
+        continue;
+      }
+
+      if ($content->getDocumentPHID() !== $object->getPHID()) {
+        $errors[] = $this->newInvalidError(
+          pht(
+            'Content object "%s" can not be published because it belongs '.
+            'to a different document.',
+            $content_phid));
+        continue;
+      }
+    }
+
+    return $errors;
+  }
+
+}
diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php
index 32324ddb5a..b29afb5496 100644
--- a/src/view/phui/PHUIDocumentView.php
+++ b/src/view/phui/PHUIDocumentView.php
@@ -9,6 +9,7 @@ final class PHUIDocumentView extends AphrontTagView {
   private $toc;
   private $foot;
   private $curtain;
+  private $banner;
 
   public function setHeader(PHUIHeaderView $header) {
     $header->setTall(true);
@@ -46,6 +47,15 @@ final class PHUIDocumentView extends AphrontTagView {
     return $this->curtain;
   }
 
+  public function setBanner($banner) {
+    $this->banner = $banner;
+    return $this;
+  }
+
+  public function getBanner() {
+    return $this->banner;
+  }
+
   protected function getTagAttributes() {
     $classes = array();
 
@@ -160,6 +170,7 @@ final class PHUIDocumentView extends AphrontTagView {
       array(
         $table_of_contents,
         $this->header,
+        $this->banner,
         array(
           $curtain,
           $main_content,

From 876638e42895bb3f2387b3b68955bb8e667e161f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 29 Aug 2018 09:31:32 -0700
Subject: [PATCH 059/125] Add a UI element for navigating between versions of a
 Phriction document

Summary: Depends on D19621. Ref T13077. Fixes T4815. This adds previous/current/next/draft buttons and makes navigation between unpublished and published versions of a document more clear.

Test Plan: {F5841997}

Reviewers: amckinley

Maniphest Tasks: T13077, T4815

Differential Revision: https://secure.phabricator.com/D19622
---
 resources/celerity/map.php                    |   4 +-
 .../PhrictionDocumentController.php           | 158 +++++++++++++++---
 webroot/rsrc/css/phui/phui-document.css       |   6 +
 3 files changed, 147 insertions(+), 21 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 609f156e88..743abd38ee 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -148,7 +148,7 @@ return array(
     'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026',
     'rsrc/css/phui/phui-document-pro.css' => '0e41dd91',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
-    'rsrc/css/phui/phui-document.css' => '552493fa',
+    'rsrc/css/phui/phui-document.css' => 'c4ac41f9',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
     'rsrc/css/phui/phui-fontkit.css' => '1320ed01',
     'rsrc/css/phui/phui-form-view.css' => 'f808e5be',
@@ -813,7 +813,7 @@ return array(
     'phui-crumbs-view-css' => '10728aaa',
     'phui-curtain-view-css' => '2bdaf026',
     'phui-document-summary-view-css' => '9ca48bdf',
-    'phui-document-view-css' => '552493fa',
+    'phui-document-view-css' => 'c4ac41f9',
     'phui-document-view-pro-css' => '0e41dd91',
     'phui-feed-story-css' => '44a9c8e9',
     'phui-font-icon-base-css' => '870a7360',
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 7ffc00086b..6e9edc1346 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -20,8 +20,6 @@ final class PhrictionDocumentController
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
-    require_celerity_resource('phriction-document-css');
-
     $version_note = null;
     $core_content = '';
     $move_notice = '';
@@ -29,6 +27,8 @@ final class PhrictionDocumentController
     $content = null;
     $toc = null;
 
+    $is_draft = false;
+
     $document = id(new PhrictionDocumentQuery())
       ->setViewer($viewer)
       ->withSlugs(array($slug))
@@ -66,8 +66,14 @@ final class PhrictionDocumentController
         ->addAction($create_button);
 
     } else {
-      $version = $request->getInt('v');
+      $draft_content = id(new PhrictionContentQuery())
+        ->setViewer($viewer)
+        ->withDocumentPHIDs(array($document->getPHID()))
+        ->setLimit(1)
+        ->executeOne();
+      $max_version = (int)$draft_content->getVersion();
 
+      $version = $request->getInt('v');
       if ($version) {
         $content = id(new PhrictionContentQuery())
           ->setViewer($viewer)
@@ -78,15 +84,111 @@ final class PhrictionDocumentController
           return new Aphront404Response();
         }
 
-        if ($content->getPHID() != $document->getContentPHID()) {
-          $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)));
+        // When the "v" parameter exists, the user is in history mode so we
+        // show this header even if they're looking at the current version
+        // of the document. This keeps the next/previous links working.
+
+        $view_version = (int)$content->getVersion();
+        $published_version = (int)$document->getContent()->getVersion();
+
+        if ($view_version < $published_version) {
+          $version_note = pht(
+            'You are viewing an older version of this document, as it '.
+            'appeared on %s.',
+            phabricator_datetime($content->getDateCreated(), $viewer));
+        } else if ($view_version > $published_version) {
+          $is_draft = true;
+          $version_note = pht(
+            'You are viewing an unpublished draft of this document.');
+        } else {
+          $version_note = pht(
+            'You are viewing the current published version of this document.');
         }
+
+        $version_note = array(
+          phutil_tag(
+            'strong',
+            array(),
+            pht('Version %d of %d: ', $view_version, $max_version)),
+          ' ',
+          $version_note,
+        );
+
+        $version_note = id(new PHUIInfoView())
+          ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
+          ->appendChild($version_note);
+
+        $document_uri = new PhutilURI($document->getURI());
+
+        if ($view_version > 1) {
+          $previous_uri = $document_uri->alter('v', ($view_version - 1));
+        } else {
+          $previous_uri = null;
+        }
+
+        if ($view_version !== $published_version) {
+          $current_uri = $document_uri->alter('v', $published_version);
+        } else {
+          $current_uri = null;
+        }
+
+        if ($view_version < $max_version) {
+          $next_uri = $document_uri->alter('v', ($view_version + 1));
+        } else {
+          $next_uri = null;
+        }
+
+        if ($view_version !== $max_version) {
+          $draft_uri = $document_uri->alter('v', $max_version);
+        } else {
+          $draft_uri = null;
+        }
+
+        $button_bar = id(new PHUIButtonBarView())
+          ->addButton(
+            id(new PHUIButtonView())
+              ->setTag('a')
+              ->setColor('grey')
+              ->setIcon('fa-backward')
+              ->setDisabled(!$previous_uri)
+              ->setHref($previous_uri)
+              ->setText(pht('Previous')))
+          ->addButton(
+            id(new PHUIButtonView())
+              ->setTag('a')
+              ->setColor('grey')
+              ->setIcon('fa-file-o')
+              ->setDisabled(!$current_uri)
+              ->setHref($current_uri)
+              ->setText(pht('Published')))
+          ->addButton(
+            id(new PHUIButtonView())
+              ->setTag('a')
+              ->setColor('grey')
+              ->setIcon('fa-forward', false)
+              ->setDisabled(!$next_uri)
+              ->setHref($next_uri)
+              ->setText(pht('Next')))
+          ->addButton(
+            id(new PHUIButtonView())
+              ->setTag('a')
+              ->setColor('grey')
+              ->setIcon('fa-fast-forward', false)
+              ->setDisabled(!$draft_uri)
+              ->setHref($draft_uri)
+              ->setText(pht('Draft')));
+
+        require_celerity_resource('phui-document-view-css');
+
+        $version_note = array(
+          $version_note,
+          phutil_tag(
+            'div',
+            array(
+              'class' => 'phui-document-version-navigation',
+            ),
+            $button_bar),
+        );
       } else {
         $content = $document->getContent();
       }
@@ -218,7 +320,15 @@ final class PhrictionDocumentController
       ->setPolicyObject($document)
       ->setHeader($page_title);
 
-    if ($content) {
+    if ($is_draft) {
+      $draft_tag = id(new PHUITagView())
+        ->setName(pht('Draft'))
+        ->setIcon('fa-spinner')
+        ->setColor('pink')
+        ->setType(PHUITagView::TYPE_SHADE);
+
+      $header->addTag($draft_tag);
+    } else if ($content) {
       $header->setEpoch($content->getDateCreated());
     }
 
@@ -299,21 +409,37 @@ final class PhrictionDocumentController
         ->setIcon('fa-pencil')
         ->setHref('/phriction/edit/'.$document->getID().'/'));
 
+    $curtain->addAction(
+      id(new PhabricatorActionView())
+      ->setName(pht('View History'))
+      ->setIcon('fa-history')
+      ->setHref(PhrictionDocument::getSlugURI($slug, 'history')));
+
     $is_current = false;
     $content_id = null;
+    $is_draft = false;
     if ($content) {
       if ($content->getPHID() == $document->getContentPHID()) {
         $is_current = true;
       }
       $content_id = $content->getID();
+
+      $current_version = $document->getContent()->getVersion();
+      $is_draft = ($content->getVersion() >= $current_version);
     }
     $can_publish = ($can_edit && $content && !$is_current);
 
+    if ($is_draft) {
+      $publish_name = pht('Publish Draft');
+    } else {
+      $publish_name = pht('Publish Revert');
+    }
+
     $publish_uri = "/phriction/publish/{$id}/{$content_id}/";
 
     $curtain->addAction(
       id(new PhabricatorActionView())
-      ->setName(pht('Publish'))
+      ->setName($publish_name)
       ->setIcon('fa-upload')
       ->setDisabled(!$can_publish)
       ->setWorkflow(true)
@@ -337,12 +463,6 @@ final class PhrictionDocumentController
           ->setWorkflow(true));
     }
 
-    $curtain->addAction(
-      id(new PhabricatorActionView())
-      ->setName(pht('View History'))
-      ->setIcon('fa-list')
-      ->setHref(PhrictionDocument::getSlugURI($slug, 'history')));
-
     $print_uri = PhrictionDocument::getSlugURI($slug).'?__print__=1';
 
     $curtain->addAction(
diff --git a/webroot/rsrc/css/phui/phui-document.css b/webroot/rsrc/css/phui/phui-document.css
index f554930a5f..1c5511b0d3 100644
--- a/webroot/rsrc/css/phui/phui-document.css
+++ b/webroot/rsrc/css/phui/phui-document.css
@@ -100,3 +100,9 @@
   .remarkup-code {
   font: 13px/18px "Menlo", "Consolas", "Monaco", monospace;
 }
+
+.phui-document-version-navigation {
+  text-align: center;
+  padding: 8px;
+  background-color: {$lightgreybackground};
+}

From 75a04551524f87c9b1b8dc09343a5ee3ce3e98c7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 29 Aug 2018 14:11:35 -0700
Subject: [PATCH 060/125] Add "Revision test plan" as a Herald field; remove
 test plan from the "Revision summary" field

Summary:
See PHI844. Ref T13189.

Add "Revision test plan" as an available field for Herald. This is a little niche -- and a little odd because it sticks around even if you fully disable test plans -- but probably broadly reasonable.

The existing "Revision summary" field counterintuitively included the test plan. Separate this out since it's now a separate field and the behavior was weird historic nonsense. I'll note this in the changelog.

Test Plan: Wrote a rule using both fields, verified they generated the expected values.

Reviewers: amckinley

Maniphest Tasks: T13189

Differential Revision: https://secure.phabricator.com/D19623
---
 src/__phutil_library_map__.php                |  2 ++
 ...DifferentialRevisionSummaryHeraldField.php |  5 +----
 ...ifferentialRevisionTestPlanHeraldField.php | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 src/applications/differential/herald/DifferentialRevisionTestPlanHeraldField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index a86027bf13..3abc10ef49 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -644,6 +644,7 @@ phutil_register_library_map(array(
     'DifferentialRevisionStatusTransaction' => 'applications/differential/xaction/DifferentialRevisionStatusTransaction.php',
     'DifferentialRevisionSummaryHeraldField' => 'applications/differential/herald/DifferentialRevisionSummaryHeraldField.php',
     'DifferentialRevisionSummaryTransaction' => 'applications/differential/xaction/DifferentialRevisionSummaryTransaction.php',
+    'DifferentialRevisionTestPlanHeraldField' => 'applications/differential/herald/DifferentialRevisionTestPlanHeraldField.php',
     'DifferentialRevisionTestPlanTransaction' => 'applications/differential/xaction/DifferentialRevisionTestPlanTransaction.php',
     'DifferentialRevisionTitleHeraldField' => 'applications/differential/herald/DifferentialRevisionTitleHeraldField.php',
     'DifferentialRevisionTitleTransaction' => 'applications/differential/xaction/DifferentialRevisionTitleTransaction.php',
@@ -6004,6 +6005,7 @@ phutil_register_library_map(array(
     'DifferentialRevisionStatusTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionSummaryHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionSummaryTransaction' => 'DifferentialRevisionTransactionType',
+    'DifferentialRevisionTestPlanHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionTestPlanTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionTitleHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionTitleTransaction' => 'DifferentialRevisionTransactionType',
diff --git a/src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php b/src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php
index eafc9bc990..587468d549 100644
--- a/src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php
+++ b/src/applications/differential/herald/DifferentialRevisionSummaryHeraldField.php
@@ -10,10 +10,7 @@ final class DifferentialRevisionSummaryHeraldField
   }
 
   public function getHeraldFieldValue($object) {
-    // NOTE: For historical reasons, this field includes the test plan. We
-    // could maybe try to fix this some day, but it probably aligns reasonably
-    // well with user expectation without harming anything.
-    return $object->getSummary()."\n\n".$object->getTestPlan();
+    return $object->getSummary();
   }
 
   protected function getHeraldFieldStandardType() {
diff --git a/src/applications/differential/herald/DifferentialRevisionTestPlanHeraldField.php b/src/applications/differential/herald/DifferentialRevisionTestPlanHeraldField.php
new file mode 100644
index 0000000000..bb2e6d0910
--- /dev/null
+++ b/src/applications/differential/herald/DifferentialRevisionTestPlanHeraldField.php
@@ -0,0 +1,20 @@
+<?php
+
+final class DifferentialRevisionTestPlanHeraldField
+  extends DifferentialRevisionHeraldField {
+
+  const FIELDCONST = 'differential.revision.test-plan';
+
+  public function getHeraldFieldName() {
+    return pht('Revision test plan');
+  }
+
+  public function getHeraldFieldValue($object) {
+    return $object->getTestPlan();
+  }
+
+  protected function getHeraldFieldStandardType() {
+    return self::STANDARD_TEXT;
+  }
+
+}

From 0a77b0e53e7f96a46bbf5013489b1de67286f308 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 30 Aug 2018 06:13:43 -0700
Subject: [PATCH 061/125] Work around an issue in MariaDB where dropping a
 column from a UNIQUE KEY fails

Summary:
See T13193. See T13077. If we drop a column which is part of a UNIQUE KEY, MariaDB raises an error.

This is probably a bad idea on our side anyway, but in this case it wasn't an obviously bad idea.

To get around this:

  - Drop the unique key, if it exists, before dropping the column.
  - Explicitly add the new unique key afterward.

Test Plan: Ran `bin/storage upgrade` locally without issue, but I'm on MySQL. Will follow up on T13193.

Reviewers: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Differential Revision: https://secure.phabricator.com/D19624
---
 .../20180828.phriction.06.c.documentid.php    | 20 +++++++++++++++++++
 .../20180828.phriction.07.documentkey.sql     |  2 ++
 .../phriction/storage/PhrictionContent.php    |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20180828.phriction.06.c.documentid.php
 create mode 100644 resources/sql/autopatches/20180828.phriction.07.documentkey.sql

diff --git a/resources/sql/autopatches/20180828.phriction.06.c.documentid.php b/resources/sql/autopatches/20180828.phriction.06.c.documentid.php
new file mode 100644
index 0000000000..474643d620
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.06.c.documentid.php
@@ -0,0 +1,20 @@
+<?php
+
+// See T13193. We're about to drop the "documentID" column, which is part of
+// a UNIQUE KEY. In MariaDB, we must first drop the "documentID" key or we get
+// into deep trouble.
+
+// There's no "IF EXISTS" modifier for "ALTER TABLE" so run this as a PHP patch
+// instead of an SQL patch.
+
+$table = new PhrictionContent();
+$conn = $table->establishConnection('w');
+
+try {
+  queryfx(
+    $conn,
+    'ALTER TABLE %T DROP KEY documentID',
+    $table->getTableName());
+} catch (AphrontQueryException $ex) {
+  // Ignore.
+}
diff --git a/resources/sql/autopatches/20180828.phriction.07.documentkey.sql b/resources/sql/autopatches/20180828.phriction.07.documentkey.sql
new file mode 100644
index 0000000000..aea3c97130
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.07.documentkey.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_content
+  ADD UNIQUE KEY `key_version` (documentPHID, version);
diff --git a/src/applications/phriction/storage/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
index 287974715f..5c597ab885 100644
--- a/src/applications/phriction/storage/PhrictionContent.php
+++ b/src/applications/phriction/storage/PhrictionContent.php
@@ -34,7 +34,7 @@ final class PhrictionContent
         'description' => 'text',
       ),
       self::CONFIG_KEY_SCHEMA => array(
-        'documentID' => array(
+        'key_version' => array(
           'columns' => array('documentPHID', 'version'),
           'unique' => true,
         ),

From 3b1294cf4599a86aa4789cb0618e004e4210b521 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 30 Aug 2018 09:53:18 -0700
Subject: [PATCH 062/125] Store Phriction max version on Document, improve
 editing rules for editing documents with drafts

Summary:
Ref T13077. We need to know the maximum version of a document in several cases, so denormalize it onto the Document object.

Then clean up some behaviors where we edit a document with, e.g., 7 versions but version 5 is currently published. For now, we: edit starting with version 7, save as version 8, and immediately publish the new version.

Test Plan:
  - Ran migration.
  - Edited a draft page without hitting any weird version errors.
  - Checked database for sensible `maxVersion` values.

Reviewers: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19625
---
 .../20180830.phriction.01.maxversion.sql      |  2 ++
 .../20180830.phriction.02.maxes.php           | 30 +++++++++++++++++++
 .../PhrictionDocumentController.php           |  7 +----
 .../controller/PhrictionEditController.php    | 26 ++++++++++------
 .../editor/PhrictionTransactionEditor.php     |  5 ++--
 .../phriction/storage/PhrictionDocument.php   |  3 ++
 6 files changed, 56 insertions(+), 17 deletions(-)
 create mode 100644 resources/sql/autopatches/20180830.phriction.01.maxversion.sql
 create mode 100644 resources/sql/autopatches/20180830.phriction.02.maxes.php

diff --git a/resources/sql/autopatches/20180830.phriction.01.maxversion.sql b/resources/sql/autopatches/20180830.phriction.01.maxversion.sql
new file mode 100644
index 0000000000..f6f24e8333
--- /dev/null
+++ b/resources/sql/autopatches/20180830.phriction.01.maxversion.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phriction.phriction_document
+  ADD maxVersion INT UNSIGNED NOT NULL;
diff --git a/resources/sql/autopatches/20180830.phriction.02.maxes.php b/resources/sql/autopatches/20180830.phriction.02.maxes.php
new file mode 100644
index 0000000000..97abf010db
--- /dev/null
+++ b/resources/sql/autopatches/20180830.phriction.02.maxes.php
@@ -0,0 +1,30 @@
+<?php
+
+// Populate the "maxVersion" column by copying the maximum "version" from the
+// content table.
+
+$document_table = new PhrictionDocument();
+$content_table = new PhrictionContent();
+
+$conn = $document_table->establishConnection('w');
+
+$iterator = new LiskRawMigrationIterator(
+  $conn,
+  $document_table->getTableName());
+foreach ($iterator as $row) {
+  $content = queryfx_one(
+    $conn,
+    'SELECT MAX(version) max FROM %T WHERE documentPHID = %s',
+    $content_table->getTableName(),
+    $row['phid']);
+  if (!$content) {
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET maxVersion = %d WHERE id = %d',
+    $document_table->getTableName(),
+    $content['max'],
+    $row['id']);
+}
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 6e9edc1346..0a4dfdd070 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -66,12 +66,7 @@ final class PhrictionDocumentController
         ->addAction($create_button);
 
     } else {
-      $draft_content = id(new PhrictionContentQuery())
-        ->setViewer($viewer)
-        ->withDocumentPHIDs(array($document->getPHID()))
-        ->setLimit(1)
-        ->executeOne();
-      $max_version = (int)$draft_content->getVersion();
+      $max_version = (int)$document->getMaxVersion();
 
       $version = $request->getInt('v');
       if ($version) {
diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
index 675b1cd630..2c47187007 100644
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -7,7 +7,7 @@ final class PhrictionEditController
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
-    $current_version = null;
+    $max_version = null;
     if ($id) {
       $is_new = false;
       $document = id(new PhrictionDocumentQuery())
@@ -24,7 +24,7 @@ final class PhrictionEditController
         return new Aphront404Response();
       }
 
-      $current_version = $document->getContent()->getVersion();
+      $max_version = $document->getMaxVersion();
 
       $revert = $request->getInt('revert');
       if ($revert) {
@@ -37,9 +37,12 @@ final class PhrictionEditController
           return new Aphront404Response();
         }
       } else {
-        $content = $document->getContent();
+        $content = id(new PhrictionContentQuery())
+          ->setViewer($viewer)
+          ->withDocumentPHIDs(array($document->getPHID()))
+          ->setLimit(1)
+          ->executeOne();
       }
-
     } else {
       $slug = $request->getStr('slug');
       $slug = PhabricatorSlug::normalize($slug);
@@ -54,8 +57,13 @@ final class PhrictionEditController
         ->executeOne();
 
       if ($document) {
-        $content = $document->getContent();
-        $current_version = $content->getVersion();
+        $content = id(new PhrictionContentQuery())
+          ->setViewer($viewer)
+          ->withDocumentPHIDs(array($document->getPHID()))
+          ->setLimit(1)
+          ->executeOne();
+
+        $max_version = $document->getMaxVersion();
         $is_new = false;
       } else {
         $document = PhrictionDocument::initializeNewDocument($viewer, $slug);
@@ -128,7 +136,7 @@ final class PhrictionEditController
       $title = $request->getStr('title');
       $content_text = $request->getStr('content');
       $notes = $request->getStr('description');
-      $current_version = $request->getInt('contentVersion');
+      $max_version = $request->getInt('contentVersion');
       $v_view = $request->getStr('viewPolicy');
       $v_edit = $request->getStr('editPolicy');
       $v_cc = $request->getArr('cc');
@@ -168,7 +176,7 @@ final class PhrictionEditController
         ->setContinueOnNoEffect(true)
         ->setDescription($notes)
         ->setProcessContentVersionError(!$request->getBool('overwrite'))
-        ->setContentVersion($current_version);
+        ->setContentVersion($max_version);
 
       try {
         $editor->applyTransactions($document, $xactions);
@@ -232,7 +240,7 @@ final class PhrictionEditController
       ->setUser($viewer)
       ->addHiddenInput('slug', $document->getSlug())
       ->addHiddenInput('nodraft', $request->getBool('nodraft'))
-      ->addHiddenInput('contentVersion', $current_version)
+      ->addHiddenInput('contentVersion', $max_version)
       ->addHiddenInput('overwrite', $overwrite)
       ->appendChild(
         id(new AphrontFormTextControl())
diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index d91165ab1d..3c045e16ba 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -468,7 +468,7 @@ final class PhrictionTransactionEditor
 
     $error = null;
     if ($this->getContentVersion() &&
-       ($object->getContent()->getVersion() != $this->getContentVersion())) {
+       ($object->getMaxVersion() != $this->getContentVersion())) {
       $error = new PhabricatorApplicationTransactionValidationError(
         $type,
         pht('Edit Conflict'),
@@ -519,6 +519,7 @@ final class PhrictionTransactionEditor
       $document->setContentPHID($content_phid);
       $document->attachContent($content);
       $document->setEditedEpoch(PhabricatorTime::getNow());
+      $document->setMaxVersion($content->getVersion());
 
       $this->newContent = $content;
     }
@@ -539,7 +540,7 @@ final class PhrictionTransactionEditor
       $content->setDescription($this->getDescription());
     }
 
-    $content->setVersion($this->getOldContent()->getVersion() + 1);
+    $content->setVersion($document->getMaxVersion() + 1);
 
     return $content;
   }
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
index 626d02c1db..b6dcd6d56d 100644
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -23,6 +23,7 @@ final class PhrictionDocument extends PhrictionDAO
   protected $editPolicy;
   protected $spacePHID;
   protected $editedEpoch;
+  protected $maxVersion;
 
   private $contentObject = self::ATTACHABLE;
   private $ancestors = array();
@@ -36,6 +37,7 @@ final class PhrictionDocument extends PhrictionDAO
         'depth' => 'uint32',
         'status' => 'text32',
         'editedEpoch' => 'epoch',
+        'maxVersion' => 'uint32',
       ),
       self::CONFIG_KEY_SCHEMA => array(
         'slug' => array(
@@ -89,6 +91,7 @@ final class PhrictionDocument extends PhrictionDAO
     }
 
     $document->setEditedEpoch(PhabricatorTime::getNow());
+    $document->setMaxVersion(0);
 
     return $document;
   }

From 18e8d9a452651aa465e9c87bc3fc28fc38d41c3b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 29 Aug 2018 15:46:13 -0700
Subject: [PATCH 063/125] Make the Phriction "History" view more aware of
 drafts

Summary: Ref T13077. Updates the "History" view to be slightly better organized and draft-aware.

Test Plan: Viewed page history in Phriction.

Reviewers: amckinley

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19626
---
 .../controller/PhrictionHistoryController.php | 131 ++++++++++--------
 src/view/phui/PHUIObjectItemView.php          |   4 +-
 2 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
index 2a3afc9769..3023d7dcce 100644
--- a/src/applications/phriction/controller/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
@@ -31,32 +31,18 @@ final class PhrictionHistoryController
       ->executeWithCursorPager($pager);
 
     $author_phids = mpull($history, 'getAuthorPHID');
-    $handles = $this->loadViewerHandles($author_phids);
+    $handles = $viewer->loadHandles($author_phids);
+
+    $max_version = (int)$document->getMaxVersion();
+    $current_version = $document->getContent()->getVersion();
 
     $list = new PHUIObjectItemListView();
     $list->setFlush(true);
-
     foreach ($history as $content) {
-
-      $author = $handles[$content->getAuthorPHID()]->renderLink();
       $slug_uri = PhrictionDocument::getSlugURI($document->getSlug());
       $version = $content->getVersion();
 
-      $diff_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');
-
-      $vs_previous = null;
-      if ($content->getVersion() != 1) {
-        $vs_previous = $diff_uri
-          ->alter('l', $content->getVersion() - 1)
-          ->alter('r', $content->getVersion());
-      }
-
-      $vs_head = null;
-      if ($content->getPHID() != $document->getContentPHID()) {
-        $vs_head = $diff_uri
-          ->alter('l', $content->getVersion())
-          ->alter('r', $current->getVersion());
-      }
+      $base_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');
 
       $change_type = PhrictionChangeType::getChangeTypeLabel(
         $content->getChangeType());
@@ -68,63 +54,90 @@ final class PhrictionHistoryController
           $color = 'lightbluetext';
           break;
         case PhrictionChangeType::CHANGE_MOVE_HERE:
-            $color = 'yellow';
+          $color = 'yellow';
           break;
         case PhrictionChangeType::CHANGE_MOVE_AWAY:
-            $color = 'orange';
+          $color = 'orange';
           break;
         case PhrictionChangeType::CHANGE_STUB:
           $color = 'green';
           break;
         default:
-          throw new Exception(pht('Unknown change type!'));
+          $color = 'indigo';
           break;
       }
 
+      $version_uri = $slug_uri.'?v='.$version;
+
       $item = id(new PHUIObjectItemView())
-        ->setHeader(pht('%s by %s', $change_type, $author))
-        ->setStatusIcon('fa-file '.$color)
-        ->addAttribute(
-          phutil_tag(
-            'a',
-            array(
-              'href' => $slug_uri.'?v='.$version,
-            ),
-            pht('Version %s', $version)))
-        ->addAttribute(pht('%s %s',
-          phabricator_date($content->getDateCreated(), $viewer),
-          phabricator_time($content->getDateCreated(), $viewer)));
+        ->setHref($version_uri);
 
-      if ($content->getDescription()) {
-        $item->addAttribute($content->getDescription());
-      }
-
-      if ($vs_previous) {
-        $item->addIcon(
-          'fa-reply',
-          pht('Show Change'),
-          array(
-            'href' => $vs_previous,
-          ));
+      if ($version > $current_version) {
+        $icon = 'fa-spinner';
+        $color = 'pink';
+        $header = pht('Draft %d', $version);
       } else {
-        $item->addIcon(
-          'fa-reply grey',
-          phutil_tag('em', array(), pht('No previous change')));
+        $icon = 'fa-file-o';
+        $header = pht('Version %d', $version);
       }
 
-      if ($vs_head) {
-        $item->addIcon(
-          'fa-reply-all',
-          pht('Show Later Changes'),
-          array(
-            'href' => $vs_head,
-          ));
-      } else {
-        $item->addIcon(
-          'fa-reply-all grey',
-          phutil_tag('em', array(), pht('No later changes')));
+      if ($version == $current_version) {
+        $item->setEffect('selected');
       }
 
+      $item
+        ->setHeader($header)
+        ->setStatusIcon($icon.' '.$color);
+
+      $description = $content->getDescription();
+      if (strlen($description)) {
+        $item->addAttribute($description);
+      }
+
+      $item->addIcon(
+        null,
+        phabricator_datetime($content->getDateCreated(), $viewer));
+
+      $author_phid = $content->getAuthorPHID();
+      $item->addByline($viewer->renderHandle($author_phid));
+
+      $diff_uri = null;
+      if ($version > 1) {
+        $diff_uri = $base_uri
+          ->alter('l', $version - 1)
+          ->alter('r', $version);
+      } else {
+        $diff_uri = null;
+      }
+
+      if ($content->getVersion() != $max_version) {
+        $compare_uri = $base_uri
+          ->alter('l', $version)
+          ->alter('r', $max_version);
+      } else {
+        $compare_uri = null;
+      }
+
+      $button_bar = id(new PHUIButtonBarView())
+        ->addButton(
+          id(new PHUIButtonView())
+            ->setTag('a')
+            ->setColor('grey')
+            ->setIcon('fa-chevron-down')
+            ->setDisabled(!$diff_uri)
+            ->setHref($diff_uri)
+            ->setText(pht('Diff')))
+        ->addButton(
+          id(new PHUIButtonView())
+            ->setTag('a')
+            ->setColor('grey')
+            ->setIcon('fa-chevron-circle-up')
+           ->setDisabled(!$compare_uri)
+           ->setHref($compare_uri)
+            ->setText(pht('Compare')));
+
+      $item->setSideColumn($button_bar);
+
       $list->addItem($item);
     }
 
diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php
index c1e57632c4..0657086c49 100644
--- a/src/view/phui/PHUIObjectItemView.php
+++ b/src/view/phui/PHUIObjectItemView.php
@@ -709,8 +709,9 @@ final class PHUIObjectItemView extends AphrontTagView {
     }
 
     /* Fixed width, right column container. */
+    $column3 = null;
     if ($this->sideColumn) {
-      $column2 = phutil_tag(
+      $column3 = phutil_tag(
         'div',
         array(
           'class' => 'phui-oi-col2 phui-oi-side-column',
@@ -731,6 +732,7 @@ final class PHUIObjectItemView extends AphrontTagView {
           $column0,
           $column1,
           $column2,
+          $column3,
         )));
 
     $box = phutil_tag(

From 26d9ee456f30805624d6a1ff975ea022e7285b34 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 31 Aug 2018 10:02:28 -0700
Subject: [PATCH 064/125] Hide the new Phriction "Publish" operation behind the
 "Prototype" toggle

Summary: Ref T13077. This is currently a little too confusing to go out into the world, mostly because there's no way to edit documents without auto-publishing them. Keep it out of the spotlight for this release.

Test Plan: Viewed Phriction, saw publish operation marked as a prototype.

Reviewers: amckinley

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19627
---
 .../controller/PhrictionDocumentController.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 0a4dfdd070..f2cf974504 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -432,13 +432,17 @@ final class PhrictionDocumentController
 
     $publish_uri = "/phriction/publish/{$id}/{$content_id}/";
 
-    $curtain->addAction(
-      id(new PhabricatorActionView())
-      ->setName($publish_name)
-      ->setIcon('fa-upload')
-      ->setDisabled(!$can_publish)
-      ->setWorkflow(true)
-      ->setHref($publish_uri));
+    if (PhabricatorEnv::getEnvConfig('phabricator.show-prototypes')) {
+      $publish_name = pht('Publish (Prototype!)');
+
+      $curtain->addAction(
+        id(new PhabricatorActionView())
+        ->setName($publish_name)
+        ->setIcon('fa-upload')
+        ->setDisabled(!$can_publish)
+        ->setWorkflow(true)
+        ->setHref($publish_uri));
+    }
 
     if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
       $curtain->addAction(

From c5960c71f92995ab9cae5e1f700268ce25c24c3a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 31 Aug 2018 12:02:41 -0700
Subject: [PATCH 065/125] Splice in a patch to remove Phriction content rows
 with no document

The unique key on <documentPHID, version> may fail to apply if any content
rows don't have a valid document. This is rare, but we have some old random
garbage rows on "secure.phabricator.com" which prevent the next patch from
applying. Just toss these rows, they're junk.
---
 .../sql/autopatches/20180828.phriction.07.c.documentuniq.sql     | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 resources/sql/autopatches/20180828.phriction.07.c.documentuniq.sql

diff --git a/resources/sql/autopatches/20180828.phriction.07.c.documentuniq.sql b/resources/sql/autopatches/20180828.phriction.07.c.documentuniq.sql
new file mode 100644
index 0000000000..481935beed
--- /dev/null
+++ b/resources/sql/autopatches/20180828.phriction.07.c.documentuniq.sql
@@ -0,0 +1 @@
+DELETE FROM phriction_content WHERE documentPHID = '';

From dc0924deeddff1a76251ae84e7c2bddd11854073 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 31 Aug 2018 12:07:07 -0700
Subject: [PATCH 066/125] Properly namespace the query in the spliced-in
 content cleanup patch

Yikes. Actually ran it this time!
---
 .../sql/autopatches/20180828.phriction.07.c.documentuniq.sql    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/sql/autopatches/20180828.phriction.07.c.documentuniq.sql b/resources/sql/autopatches/20180828.phriction.07.c.documentuniq.sql
index 481935beed..d086cc6141 100644
--- a/resources/sql/autopatches/20180828.phriction.07.c.documentuniq.sql
+++ b/resources/sql/autopatches/20180828.phriction.07.c.documentuniq.sql
@@ -1 +1 @@
-DELETE FROM phriction_content WHERE documentPHID = '';
+DELETE FROM {$NAMESPACE}_phriction.phriction_content WHERE documentPHID = '';

From 650e74933abb94fa3b37d0cbae4b6323a0633ecd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 4 Sep 2018 11:26:30 -0700
Subject: [PATCH 067/125] Update some inline comment logic to use more modern
 "Viewer"-oriented calls/variables

Summary:
Ref T13195. Ref T8573. The inline comment controllers currently use outdated `$user = $this->getRequest()->getUser()` calls.

Instead, use `$viewer = $this->getViewer()`.

This is just a small consistency update with no behavioral changes.

Test Plan: Viewed and added inlines in Differential and Diffusion.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195, T8573

Differential Revision: https://secure.phabricator.com/D19633
---
 ...DifferentialInlineCommentEditController.php | 12 +++++-------
 .../DiffusionInlineCommentController.php       | 12 +++++-------
 .../PhabricatorInlineCommentController.php     | 18 +++++++++---------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialInlineCommentEditController.php b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
index 926158cb41..2e44e86822 100644
--- a/src/applications/differential/controller/DifferentialInlineCommentEditController.php
+++ b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
@@ -77,19 +77,17 @@ final class DifferentialInlineCommentEditController
   }
 
   protected function loadCommentForEdit($id) {
-    $request = $this->getRequest();
-    $user = $request->getUser();
+    $viewer = $this->getViewer();
 
     $inline = $this->loadComment($id);
-    if (!$this->canEditInlineComment($user, $inline)) {
+    if (!$this->canEditInlineComment($viewer, $inline)) {
       throw new Exception(pht('That comment is not editable!'));
     }
     return $inline;
   }
 
   protected function loadCommentForDone($id) {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
+    $viewer = $this->getViewer();
 
     $inline = $this->loadComment($id);
     if (!$inline) {
@@ -128,11 +126,11 @@ final class DifferentialInlineCommentEditController
   }
 
   private function canEditInlineComment(
-    PhabricatorUser $user,
+    PhabricatorUser $viewer,
     DifferentialInlineComment $inline) {
 
     // Only the author may edit a comment.
-    if ($inline->getAuthorPHID() != $user->getPHID()) {
+    if ($inline->getAuthorPHID() != $viewer->getPHID()) {
       return false;
     }
 
diff --git a/src/applications/diffusion/controller/DiffusionInlineCommentController.php b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
index 8af9a1cd65..bc7448a9e2 100644
--- a/src/applications/diffusion/controller/DiffusionInlineCommentController.php
+++ b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
@@ -50,19 +50,17 @@ final class DiffusionInlineCommentController
   }
 
   protected function loadCommentForEdit($id) {
-    $request = $this->getRequest();
-    $user = $request->getUser();
+    $viewer = $this->getViewer();
 
     $inline = $this->loadComment($id);
-    if (!$this->canEditInlineComment($user, $inline)) {
+    if (!$this->canEditInlineComment($viewer, $inline)) {
       throw new Exception(pht('That comment is not editable!'));
     }
     return $inline;
   }
 
   protected function loadCommentForDone($id) {
-    $request = $this->getRequest();
-    $viewer = $request->getUser();
+    $viewer = $this->getViewer();
 
     $inline = $this->loadComment($id);
     if (!$inline) {
@@ -86,11 +84,11 @@ final class DiffusionInlineCommentController
   }
 
   private function canEditInlineComment(
-    PhabricatorUser $user,
+    PhabricatorUser $viewer,
     PhabricatorAuditInlineComment $inline) {
 
     // Only the author may edit a comment.
-    if ($inline->getAuthorPHID() != $user->getPHID()) {
+    if ($inline->getAuthorPHID() != $viewer->getPHID()) {
       return false;
     }
 
diff --git a/src/infrastructure/diff/PhabricatorInlineCommentController.php b/src/infrastructure/diff/PhabricatorInlineCommentController.php
index d7f1a9dd3a..22e410612a 100644
--- a/src/infrastructure/diff/PhabricatorInlineCommentController.php
+++ b/src/infrastructure/diff/PhabricatorInlineCommentController.php
@@ -88,7 +88,7 @@ abstract class PhabricatorInlineCommentController
 
   public function processRequest() {
     $request = $this->getRequest();
-    $user = $request->getUser();
+    $viewer = $this->getViewer();
 
     $this->readRequestParameters();
 
@@ -221,7 +221,7 @@ abstract class PhabricatorInlineCommentController
 
         $inline = $this->createComment()
           ->setChangesetID($this->getChangesetID())
-          ->setAuthorPHID($user->getPHID())
+          ->setAuthorPHID($viewer->getPHID())
           ->setLineNumber($this->getLineNumber())
           ->setLineLength($this->getLineLength())
           ->setIsNewFile($this->getIsNewFile())
@@ -313,10 +313,10 @@ abstract class PhabricatorInlineCommentController
 
   private function buildEditDialog() {
     $request = $this->getRequest();
-    $user = $request->getUser();
+    $viewer = $this->getViewer();
 
     $edit_dialog = id(new PHUIDiffInlineCommentEditView())
-      ->setUser($user)
+      ->setUser($viewer)
       ->setSubmitURI($request->getRequestURI())
       ->setIsOnRight($this->getIsOnRight())
       ->setIsNewFile($this->getIsNewFile())
@@ -342,22 +342,22 @@ abstract class PhabricatorInlineCommentController
     $on_right) {
 
     $request = $this->getRequest();
-    $user = $request->getUser();
+    $viewer = $this->getViewer();
 
     $engine = new PhabricatorMarkupEngine();
-    $engine->setViewer($user);
+    $engine->setViewer($viewer);
     $engine->addObject(
       $inline,
       PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
     $engine->process();
 
-    $phids = array($user->getPHID());
+    $phids = array($viewer->getPHID());
 
     $handles = $this->loadViewerHandles($phids);
     $object_owner_phid = $this->loadObjectOwnerPHID($inline);
 
     $view = id(new PHUIDiffInlineCommentDetailView())
-      ->setUser($user)
+      ->setUser($viewer)
       ->setInlineComment($inline)
       ->setIsOnRight($on_right)
       ->setMarkupEngine($engine)
@@ -378,7 +378,7 @@ abstract class PhabricatorInlineCommentController
 
   private function renderTextArea($text) {
     return id(new PhabricatorRemarkupControl())
-      ->setUser($this->getRequest()->getUser())
+      ->setViewer($this->getViewer())
       ->setSigil('differential-inline-comment-edit-textarea')
       ->setName('text')
       ->setValue($text)

From 041392988ece4d1f7a0eff5e08d58bb0bba4ca70 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 4 Sep 2018 10:41:13 -0700
Subject: [PATCH 068/125] When a transaction adds more than 100 inline
 comments, include only the first 100 in email

Summary:
Ref T13195. An install had a user apply a transaction which added about 1,000 inline comments. Rendering the email for this transaction took a very long time because the context section for each comment must be highlighted separately.

We can make the highlighting faster (in this case, by porting the lexer to PHP) but it's also sort of silly to include more than 100 inlines in an email. These emails are likely to be truncated by outbound size rules at some point anyway. Instead, limit inlines rendered directly into email to the first 100 per transaction group.

Test Plan:
Set limit to 2, added 4 comments, viewed text and HTML emails:

{F5859967}

{F5859968}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195

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

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 9c24a50b4e..dc47683875 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -892,6 +892,17 @@ final class DifferentialTransactionEditor
     array $inlines,
     PhabricatorMetaMTAMailBody $body) {
 
+    $limit = 100;
+    $limit_note = null;
+    if (count($inlines) > $limit) {
+      $limit_note = pht(
+        '(Showing first %s of %s inlines.)',
+        new PhutilNumber($limit),
+        phutil_count($inlines));
+
+      $inlines = array_slice($inlines, 0, $limit, true);
+    }
+
     $section = id(new DifferentialInlineCommentMailView())
       ->setViewer($this->getActor())
       ->setInlines($inlines)
@@ -900,6 +911,9 @@ final class DifferentialTransactionEditor
     $header = pht('INLINE COMMENTS');
 
     $section_text = "\n".$section->getPlaintext();
+    if ($limit_note) {
+      $section_text = $limit_note."\n".$section_text;
+    }
 
     $style = array(
       'margin: 6px 0 12px 0;',
@@ -912,6 +926,16 @@ final class DifferentialTransactionEditor
       ),
       $section->getHTML());
 
+    if ($limit_note) {
+      $section_html = array(
+        phutil_tag(
+          'em',
+          array(),
+          $limit_note),
+        $section_html,
+      );
+    }
+
     $body->addPlaintextSection($header, $section_text, false);
     $body->addHTMLSection($header, $section_html);
   }

From e6ee5ee9a10488f89aa6b17d080a832e332f1c9c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 4 Sep 2018 12:44:11 -0700
Subject: [PATCH 069/125] When applying repository operations via Drydock,
 provide more context on OperationType

Summary: Ref T13195. See PHI845. For custom OperationTypes, provide access to the Interface and Operation via getters. This is just for convenience, since passing these around everywhere can be a bit of a pain if you have a deep-ish stack of things or love using callbacks or whatever.

Test Plan: Landed a revision via upstream Drydock operations.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19636
---
 .../DrydockRepositoryOperationType.php        | 23 +++++++++++++++++++
 .../query/DrydockRepositoryOperationQuery.php |  7 +++++-
 .../storage/DrydockRepositoryOperation.php    |  6 ++---
 ...DrydockRepositoryOperationUpdateWorker.php |  5 ----
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/applications/drydock/operation/DrydockRepositoryOperationType.php b/src/applications/drydock/operation/DrydockRepositoryOperationType.php
index 7ec3689aff..32b562a303 100644
--- a/src/applications/drydock/operation/DrydockRepositoryOperationType.php
+++ b/src/applications/drydock/operation/DrydockRepositoryOperationType.php
@@ -3,6 +3,8 @@
 abstract class DrydockRepositoryOperationType extends Phobject {
 
   private $viewer;
+  private $operation;
+  private $interface;
 
   abstract public function applyOperation(
     DrydockRepositoryOperation $operation,
@@ -29,6 +31,27 @@ abstract class DrydockRepositoryOperationType extends Phobject {
     return $this->viewer;
   }
 
+  final public function setOperation(DrydockRepositoryOperation $operation) {
+    $this->operation = $operation;
+    return $this;
+  }
+
+  final public function getOperation() {
+    return $this->operation;
+  }
+
+  final public function setInterface(DrydockInterface $interface) {
+    $this->interface = $interface;
+    return $this;
+  }
+
+  final public function getInterface() {
+    if (!$this->interface) {
+      throw new PhutilInvalidStateException('setInterface');
+    }
+    return $this->interface;
+  }
+
   final public function getOperationConstant() {
     return $this->getPhobjectClassConstant('OPCONST', 32);
   }
diff --git a/src/applications/drydock/query/DrydockRepositoryOperationQuery.php b/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
index fb1f6583a8..a5fbe0acc9 100644
--- a/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
+++ b/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
@@ -62,6 +62,8 @@ final class DrydockRepositoryOperationQuery extends DrydockQuery {
   protected function willFilterPage(array $operations) {
     $implementations = DrydockRepositoryOperationType::getAllOperationTypes();
 
+    $viewer = $this->getViewer();
+
     foreach ($operations as $key => $operation) {
       $impl = idx($implementations, $operation->getOperationType());
       if (!$impl) {
@@ -69,7 +71,10 @@ final class DrydockRepositoryOperationQuery extends DrydockQuery {
         unset($operations[$key]);
         continue;
       }
-      $impl = clone $impl;
+      $impl = id(clone $impl)
+        ->setViewer($viewer)
+        ->setOperation($operation);
+
       $operation->attachImplementation($impl);
     }
 
diff --git a/src/applications/drydock/storage/DrydockRepositoryOperation.php b/src/applications/drydock/storage/DrydockRepositoryOperation.php
index 4e25280c3f..809a10a116 100644
--- a/src/applications/drydock/storage/DrydockRepositoryOperation.php
+++ b/src/applications/drydock/storage/DrydockRepositoryOperation.php
@@ -137,9 +137,9 @@ final class DrydockRepositoryOperation extends DrydockDAO
   }
 
   public function applyOperation(DrydockInterface $interface) {
-    return $this->getImplementation()->applyOperation(
-      $this,
-      $interface);
+    $impl = $this->getImplementation();
+    $impl->setInterface($interface);
+    return $impl->applyOperation($this, $interface);
   }
 
   public function getOperationDescription(PhabricatorUser $viewer) {
diff --git a/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php b/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
index dfd603fd12..2ee9324fb6 100644
--- a/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
@@ -25,8 +25,6 @@ final class DrydockRepositoryOperationUpdateWorker
 
 
   private function handleUpdate(DrydockRepositoryOperation $operation) {
-    $viewer = $this->getViewer();
-
     $operation_state = $operation->getOperationState();
 
     switch ($operation_state) {
@@ -53,9 +51,6 @@ final class DrydockRepositoryOperationUpdateWorker
     // waiting for a lease we're holding.
 
     try {
-      $operation->getImplementation()
-        ->setViewer($viewer);
-
       $lease = $this->loadWorkingCopyLease($operation);
 
       $interface = $lease->getInterface(

From 7967fab5ccc6d189c4ddf9927e30a6b6133f83f9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 5 Sep 2018 13:47:43 -0700
Subject: [PATCH 070/125] Remove outdated "rebuild_summaries.php" script

Summary:
Ref T13195. See PHI842. Alternative to D19638.

Instead of doing all the stuff in D19638, //just// remove the `rebuild_summaries.php` script. This script is outdated, copy/pastes the rebuild logic, and doesn't understand unreachable commits.

If we had some use for it it should move to `bin/repository rebuild-summary ...` or similar, but it's not clear there's any use for it. The incremental summary rebuilds seem to work fine as-is.

Test Plan: Grepped for callers or documentation referencing this script, found nothing.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19643
---
 scripts/repository/rebuild_summaries.php | 53 ------------------------
 1 file changed, 53 deletions(-)
 delete mode 100755 scripts/repository/rebuild_summaries.php

diff --git a/scripts/repository/rebuild_summaries.php b/scripts/repository/rebuild_summaries.php
deleted file mode 100755
index de3d5acca0..0000000000
--- a/scripts/repository/rebuild_summaries.php
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
-
-$commit = new PhabricatorRepositoryCommit();
-
-$conn_w = id(new PhabricatorRepository())->establishConnection('w');
-$sizes = queryfx_all(
-  $conn_w,
-  'SELECT repositoryID, count(*) N FROM %T GROUP BY repositoryID',
-  $commit->getTableName());
-$sizes = ipull($sizes, 'N', 'repositoryID');
-
-$maxes = queryfx_all(
-  $conn_w,
-  'SELECT repositoryID, max(epoch) maxEpoch FROM %T GROUP BY repositoryID',
-  $commit->getTableName());
-$maxes = ipull($maxes, 'maxEpoch', 'repositoryID');
-
-
-$repository_ids = array_keys($sizes + $maxes);
-
-echo pht('Updating %d repositories', count($repository_ids));
-
-foreach ($repository_ids as $repository_id) {
-  $last_commit = queryfx_one(
-    $conn_w,
-    'SELECT id FROM %T WHERE repositoryID = %d AND epoch = %d LIMIT 1',
-    $commit->getTableName(),
-    $repository_id,
-    idx($maxes, $repository_id, 0));
-  if ($last_commit) {
-    $last_commit = $last_commit['id'];
-  } else {
-    $last_commit = 0;
-  }
-  queryfx(
-    $conn_w,
-    'INSERT INTO %T (repositoryID, lastCommitID, size, epoch)
-      VALUES (%d, %d, %d, %d) ON DUPLICATE KEY UPDATE
-        lastCommitID = VALUES(lastCommitID),
-        size = VALUES(size),
-        epoch = VALUES(epoch)',
-    PhabricatorRepository::TABLE_SUMMARY,
-    $repository_id,
-    $last_commit,
-    idx($sizes, $repository_id, 0),
-    idx($maxes, $repository_id, 0));
-  echo '.';
-}
-echo "\n".pht('Done.')."\n";

From a20f0674a98525fd1bae9826f5f1e2bb0f437439 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 5 Sep 2018 09:28:50 -0700
Subject: [PATCH 071/125] Improve some documentation for
 "diffusion.commit.search"

Summary:
Ref T13195. See PHI851. Start by making some minor improvements here:

  - Clarify that the example of what constraints look like is just an example.
  - Add descriptions for parameters missing descriptions.

Test Plan: Looked at API method page, saw more helpful/complete instructions.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19640
---
 .../query/PhabricatorCommitSearchEngine.php   | 25 ++++++++++++++-----
 .../PhabricatorSearchEngineAPIMethod.php      |  4 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
index 993626e1e3..e1b294a9d6 100644
--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
@@ -67,35 +67,48 @@ final class PhabricatorCommitSearchEngine
         ->setKey('responsiblePHIDs')
         ->setConduitKey('responsible')
         ->setAliases(array('responsible', 'responsibles', 'responsiblePHID'))
-        ->setDatasource(new DifferentialResponsibleDatasource()),
+        ->setDatasource(new DifferentialResponsibleDatasource())
+        ->setDescription(
+          pht(
+            'Find commits where given users, projects, or packages are '.
+            'responsible for the next steps in the audit workflow.')),
       id(new PhabricatorUsersSearchField())
         ->setLabel(pht('Authors'))
         ->setKey('authorPHIDs')
         ->setConduitKey('authors')
-        ->setAliases(array('author', 'authors', 'authorPHID')),
+        ->setAliases(array('author', 'authors', 'authorPHID'))
+        ->setDescription(pht('Find commits authored by particular users.')),
       id(new PhabricatorSearchDatasourceField())
         ->setLabel(pht('Auditors'))
         ->setKey('auditorPHIDs')
         ->setConduitKey('auditors')
         ->setAliases(array('auditor', 'auditors', 'auditorPHID'))
-        ->setDatasource(new DiffusionAuditorFunctionDatasource()),
+        ->setDatasource(new DiffusionAuditorFunctionDatasource())
+        ->setDescription(
+          pht(
+            'Find commits where given users, projects, or packages are '.
+            'auditors.')),
       id(new PhabricatorSearchCheckboxesField())
         ->setLabel(pht('Audit Status'))
         ->setKey('statuses')
         ->setAliases(array('status'))
-        ->setOptions(PhabricatorAuditCommitStatusConstants::getStatusNameMap()),
+        ->setOptions(PhabricatorAuditCommitStatusConstants::getStatusNameMap())
+        ->setDescription(pht('Find commits with given audit statuses.')),
       id(new PhabricatorSearchDatasourceField())
         ->setLabel(pht('Repositories'))
         ->setKey('repositoryPHIDs')
         ->setConduitKey('repositories')
         ->setAliases(array('repository', 'repositories', 'repositoryPHID'))
-        ->setDatasource(new DiffusionRepositoryFunctionDatasource()),
+        ->setDatasource(new DiffusionRepositoryFunctionDatasource())
+        ->setDescription(pht('Find commits in particular repositories.')),
       id(new PhabricatorSearchDatasourceField())
         ->setLabel(pht('Packages'))
         ->setKey('packagePHIDs')
         ->setConduitKey('packages')
         ->setAliases(array('package', 'packages', 'packagePHID'))
-        ->setDatasource(new PhabricatorOwnersPackageDatasource()),
+        ->setDatasource(new PhabricatorOwnersPackageDatasource())
+        ->setDescription(
+          pht('Find commits which affect given packages.')),
       id(new PhabricatorSearchThreeStateField())
         ->setLabel(pht('Unreachable'))
         ->setKey('unreachable')
diff --git a/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php b/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
index 3d13f2c3d9..4a8fccb876 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
@@ -161,7 +161,9 @@ If you specify both a `queryKey` and `constraints`, the builtin or saved query
 will be applied first as a starting point, then any additional values in
 `constraints` will be applied, overwriting the defaults from the original query.
 
-Specify constraints like this:
+Different endpoints support different constraints. The constraints this method
+supports are detailed below. As an example, you might specify constraints like
+this:
 
 ```lang=json, name="Example Custom Constraints"
 {

From 5a38b75f16ea8ba9ec95ce85a16b8dfa8382c173 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 5 Sep 2018 10:06:47 -0700
Subject: [PATCH 072/125] In Conduit, let checkbox constraints self-document

Summary:
Ref T13195. Ref PHI851. Currently, checkbox constraints don't tell you what values are supported on the API page.

You can figure this out with "Inspect Element" or by viewing the source code, but just render a nice table instead.

Test Plan: {F5862969}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19641
---
 src/__phutil_library_map__.php                |  2 +
 .../data/ConduitConstantDescription.php       | 26 +++++++++++
 .../PhabricatorSearchEngineAPIMethod.php      | 43 ++++++++++++++++++-
 .../PhabricatorSearchCheckboxesField.php      | 12 ++++++
 .../search/field/PhabricatorSearchField.php   |  4 ++
 5 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/conduit/data/ConduitConstantDescription.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3abc10ef49..9774741060 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -313,6 +313,7 @@ phutil_register_library_map(array(
     'ConduitCallTestCase' => 'applications/conduit/call/__tests__/ConduitCallTestCase.php',
     'ConduitColumnsParameterType' => 'applications/conduit/parametertype/ConduitColumnsParameterType.php',
     'ConduitConnectConduitAPIMethod' => 'applications/conduit/method/ConduitConnectConduitAPIMethod.php',
+    'ConduitConstantDescription' => 'applications/conduit/data/ConduitConstantDescription.php',
     'ConduitEpochParameterType' => 'applications/conduit/parametertype/ConduitEpochParameterType.php',
     'ConduitException' => 'applications/conduit/protocol/exception/ConduitException.php',
     'ConduitGetCapabilitiesConduitAPIMethod' => 'applications/conduit/method/ConduitGetCapabilitiesConduitAPIMethod.php',
@@ -5628,6 +5629,7 @@ phutil_register_library_map(array(
     'ConduitCallTestCase' => 'PhabricatorTestCase',
     'ConduitColumnsParameterType' => 'ConduitParameterType',
     'ConduitConnectConduitAPIMethod' => 'ConduitAPIMethod',
+    'ConduitConstantDescription' => 'Phobject',
     'ConduitEpochParameterType' => 'ConduitParameterType',
     'ConduitException' => 'Exception',
     'ConduitGetCapabilitiesConduitAPIMethod' => 'ConduitAPIMethod',
diff --git a/src/applications/conduit/data/ConduitConstantDescription.php b/src/applications/conduit/data/ConduitConstantDescription.php
new file mode 100644
index 0000000000..fe2af2b716
--- /dev/null
+++ b/src/applications/conduit/data/ConduitConstantDescription.php
@@ -0,0 +1,26 @@
+<?php
+
+final class ConduitConstantDescription extends Phobject {
+
+  private $key;
+  private $value;
+
+  public function setKey($key) {
+    $this->key = $key;
+    return $this;
+  }
+
+  public function getKey() {
+    return $this->key;
+  }
+
+  public function setValue($value) {
+    $this->value = $value;
+    return $this;
+  }
+
+  public function getValue() {
+    return $this->value;
+  }
+
+}
diff --git a/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php b/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
index 4a8fccb876..335ba58852 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
@@ -190,15 +190,26 @@ EOTEXT
       $fields,
       array('ids', 'phids')) + $fields;
 
+    $constant_lists = array();
+
     $rows = array();
     foreach ($fields as $field) {
       $key = $field->getConduitKey();
       $label = $field->getLabel();
 
+      $constants = $field->newConduitConstants();
+
       $type_object = $field->getConduitParameterType();
       if ($type_object) {
         $type = $type_object->getTypeName();
         $description = $field->getDescription();
+        if ($constants) {
+          $description = array(
+            $description,
+            ' ',
+            phutil_tag('em', array(), pht('(See table below.)')),
+          );
+        }
       } else {
         $type = null;
         $description = phutil_tag('em', array(), pht('Not supported.'));
@@ -210,6 +221,35 @@ EOTEXT
         $type,
         $description,
       );
+
+      if ($constants) {
+        $constant_lists[] = $this->buildRemarkup(
+          pht(
+            'Constants supported by the `%s` constraint:',
+            'statuses'));
+
+        $constants_rows = array();
+        foreach ($constants as $constant) {
+          $constants_rows[] = array(
+            $constant->getKey(),
+            $constant->getValue(),
+          );
+        }
+
+        $constants_table = id(new AphrontTableView($constants_rows))
+          ->setHeaders(
+            array(
+              pht('Key'),
+              pht('Value'),
+            ))
+          ->setColumnClasses(
+            array(
+              'pre',
+              'wide',
+            ));
+
+        $constant_lists[] = $constants_table;
+      }
     }
 
     $table = id(new AphrontTableView($rows))
@@ -233,7 +273,8 @@ EOTEXT
       ->setCollapsed(true)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->appendChild($this->buildRemarkup($info))
-      ->appendChild($table);
+      ->appendChild($table)
+      ->appendChild($constant_lists);
   }
 
   private function buildOrderBox(
diff --git a/src/applications/search/field/PhabricatorSearchCheckboxesField.php b/src/applications/search/field/PhabricatorSearchCheckboxesField.php
index e1a72f4576..0985c976ce 100644
--- a/src/applications/search/field/PhabricatorSearchCheckboxesField.php
+++ b/src/applications/search/field/PhabricatorSearchCheckboxesField.php
@@ -49,4 +49,16 @@ final class PhabricatorSearchCheckboxesField
     return new ConduitStringListParameterType();
   }
 
+  public function newConduitConstants() {
+    $list = array();
+
+    foreach ($this->getOptions() as $key => $option) {
+      $list[] = id(new ConduitConstantDescription())
+        ->setKey($key)
+        ->setValue($option);
+    }
+
+    return $list;
+  }
+
 }
diff --git a/src/applications/search/field/PhabricatorSearchField.php b/src/applications/search/field/PhabricatorSearchField.php
index 1a038ec665..36db0523b7 100644
--- a/src/applications/search/field/PhabricatorSearchField.php
+++ b/src/applications/search/field/PhabricatorSearchField.php
@@ -382,6 +382,10 @@ abstract class PhabricatorSearchField extends Phobject {
     return $this->enableForConduit;
   }
 
+  public function newConduitConstants() {
+    return array();
+  }
+
 
 /* -(  Utility Methods )----------------------------------------------------- */
 

From ef26b06ca861d56f54e254699695076daa7fc4db Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 5 Sep 2018 10:26:02 -0700
Subject: [PATCH 073/125] Begin transitioning audits to modern (string) status
 constants, from legacy (integer) status constants

Summary:
Ref T13195. See PHI851. Audits currently have older integer status constants. We've moved almost all object types away from this to string constants (which are better in basically every way, and particularly way better for exposing over the API).

Commits/audits are currently accessible over the API and expose these constants via a "statuses" constraint.

Prepare to move toward modern string constants by defining a new, more modern map of status details and defining the existing methods in terms of it.

Test Plan: Browsed audits checking for icons/names/open-ness, saw no changes. This change should have no user-visible effects, as it just reorganizes code.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19642
---
 .../PhabricatorAuditCommitStatusConstants.php | 132 +++++++++---------
 1 file changed, 68 insertions(+), 64 deletions(-)

diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
index 31bb2c22f7..877fd0b4ba 100644
--- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
@@ -9,17 +9,16 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
   const FULLY_AUDITED       = 4;
   const NEEDS_VERIFICATION = 5;
 
-  public static function getStatusNameMap() {
-    $map = array(
-      self::NONE                => pht('No Audits'),
-      self::NEEDS_AUDIT         => pht('Audit Required'),
-      self::CONCERN_RAISED      => pht('Concern Raised'),
-      self::NEEDS_VERIFICATION => pht('Needs Verification'),
-      self::PARTIALLY_AUDITED   => pht('Partially Audited'),
-      self::FULLY_AUDITED       => pht('Audited'),
-    );
+  const MODERN_NONE = 'none';
+  const MODERN_NEEDS_AUDIT = 'needs-audit';
+  const MODERN_CONCERN_RAISED = 'concern-raised';
+  const MODERN_PARTIALLY_AUDITED = 'partially-audited';
+  const MODERN_AUDITED = 'audited';
+  const MODERN_NEEDS_VERIFICATION = 'needs-verification';
 
-    return $map;
+  public static function getStatusNameMap() {
+    $map = self::getMap();
+    return ipull($map, 'name', 'legacy');
   }
 
   public static function getStatusName($code) {
@@ -27,66 +26,71 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
   }
 
   public static function getOpenStatusConstants() {
-    return array(
-      self::CONCERN_RAISED,
-      self::NEEDS_AUDIT,
-      self::NEEDS_VERIFICATION,
-      self::PARTIALLY_AUDITED,
-    );
+    $constants = array();
+    foreach (self::getMap() as $map) {
+      if (!$map['closed']) {
+        $constants[] = $map['legacy'];
+      }
+    }
+    return $constants;
   }
 
   public static function getStatusColor($code) {
-    switch ($code) {
-      case self::CONCERN_RAISED:
-        $color = 'red';
-        break;
-      case self::NEEDS_AUDIT:
-        $color = 'orange';
-        break;
-      case self::PARTIALLY_AUDITED:
-        $color = 'yellow';
-        break;
-      case self::FULLY_AUDITED:
-        $color = 'green';
-        break;
-      case self::NONE:
-        $color = 'bluegrey';
-        break;
-      case self::NEEDS_VERIFICATION:
-        $color = 'indigo';
-        break;
-      default:
-        $color = null;
-        break;
-    }
-    return $color;
+    $map = self::getMap();
+    $map = ipull($map, 'color', 'legacy');
+    return idx($map, $code);
   }
 
   public static function getStatusIcon($code) {
-    switch ($code) {
-      case self::CONCERN_RAISED:
-        $icon = 'fa-times-circle';
-        break;
-      case self::NEEDS_AUDIT:
-        $icon = 'fa-exclamation-circle';
-        break;
-      case self::PARTIALLY_AUDITED:
-        $icon = 'fa-check-circle-o';
-        break;
-      case self::FULLY_AUDITED:
-        $icon = 'fa-check-circle';
-        break;
-      case self::NONE:
-        $icon = 'fa-check';
-        break;
-      case self::NEEDS_VERIFICATION:
-        $icon = 'fa-refresh';
-        break;
-      default:
-        $icon = null;
-        break;
-    }
-    return $icon;
+    $map = self::getMap();
+    $map = ipull($map, 'icon', 'legacy');
+    return idx($map, $code);
   }
 
+  private static function getMap() {
+    return array(
+      self::MODERN_NONE => array(
+        'name' => pht('No Audits'),
+        'legacy' => self::NONE,
+        'icon' => 'fa-check',
+        'color' => 'bluegrey',
+        'closed' => true,
+      ),
+      self::MODERN_NEEDS_AUDIT => array(
+        'name' => pht('Audit Required'),
+        'legacy' => self::NEEDS_AUDIT,
+        'icon' => 'fa-exclamation-circle',
+        'color' => 'orange',
+        'closed' => false,
+      ),
+      self::MODERN_CONCERN_RAISED => array(
+        'name' => pht('Concern Raised'),
+        'legacy' => self::CONCERN_RAISED,
+        'icon' => 'fa-times-circle',
+        'color' => 'red',
+        'closed' => false,
+      ),
+      self::MODERN_PARTIALLY_AUDITED => array(
+        'name' => pht('Partially Audited'),
+        'legacy' => self::PARTIALLY_AUDITED,
+        'icon' => 'fa-check-circle-o',
+        'color' => 'yellow',
+        'closed' => false,
+      ),
+      self::MODERN_AUDITED => array(
+        'name' => pht('Audited'),
+        'legacy' => self::FULLY_AUDITED,
+        'icon' => 'fa-check-circle',
+        'color' => 'green',
+        'closed' => true,
+      ),
+      self::MODERN_NEEDS_VERIFICATION => array(
+        'name' => pht('Needs Verification'),
+        'legacy' => self::NEEDS_VERIFICATION,
+        'icon' => 'fa-refresh',
+        'color' => 'indigo',
+        'closed' => false,
+      ),
+    );
+  }
 }

From e8e5dc0f56900f0fa74d9733aae87b063e534452 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 6 Sep 2018 10:55:23 -0700
Subject: [PATCH 074/125] Make a language improvement ("inlines" -> "inline
 comments")

Summary: See D19632. Agreed that this is more clear.

Test Plan: Read carefully.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19644
---
 .../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 dc47683875..29dac38b5a 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -896,7 +896,7 @@ final class DifferentialTransactionEditor
     $limit_note = null;
     if (count($inlines) > $limit) {
       $limit_note = pht(
-        '(Showing first %s of %s inlines.)',
+        '(Showing first %s of %s inline comments.)',
         new PhutilNumber($limit),
         phutil_count($inlines));
 

From ab4d33bede84f03c295a7d46b21c8a5518adf5e6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 5 Sep 2018 13:47:31 -0700
Subject: [PATCH 075/125] Allow underscores to appear in Harbormaster variable
 names

Summary:
See PHI859. Ref T13195. The regexp for replacing variables currently does not include underscores.

Include underscores.

I also made a note in T13088: we should (almost certainly?) throw immediately if you try to pass a bogus variable name as a custom parameter, but this is a slightly larger change.

Test Plan:
  - Made an "http request" build plan with `?x=${initiator.phid}&y={$some_variable}`.
  - Added `some_variable` as a parameter to the parameter collection.
  - Before patch: `initiator.phid` was replaced, but `some_variable` was not.
  - After patch: both variables are replaced.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19645
---
 .../harbormaster/step/HarbormasterBuildStepImplementation.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
index ccf97451b7..e0dfe05cc0 100644
--- a/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
@@ -193,7 +193,7 @@ abstract class HarbormasterBuildStepImplementation extends Phobject {
    * @return string String with variables replaced safely into it.
    */
   protected function mergeVariables($function, $pattern, array $variables) {
-    $regexp = '@\\$\\{(?P<name>[a-z\\./-]+)\\}@';
+    $regexp = '@\\$\\{(?P<name>[a-z\\./_-]+)\\}@';
 
     $matches = null;
     preg_match_all($regexp, $pattern, $matches);

From a1ce23b9f557a40151007ed9b0d40543d60448d1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 7 Sep 2018 08:30:18 -0700
Subject: [PATCH 076/125] Introduce an AuditStatus object for commits and move
 some callsites to it

Summary:
Ref T13195. See PHI851. Add an object, analogous to the `DifferentialRevisionStatus` object, to handle audit status management.

This will primarily make it easier to swap storage over to strings later, but also cleans things up a bit.

Test Plan: Viewed audit/commit lists, saw sensible state icons. Ran `bin/audit synchronize`, got sensible output.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19646
---
 .../PhabricatorAuditCommitStatusConstants.php | 44 +++++++++++++++++++
 ...atorAuditSynchronizeManagementWorkflow.php | 12 +++--
 .../audit/view/PhabricatorAuditListView.php   | 11 ++---
 .../view/DiffusionHistoryTableView.php        |  8 ++--
 .../PhabricatorRepositoryCommitPHIDType.php   |  8 ++--
 .../storage/PhabricatorRepositoryCommit.php   |  5 +++
 6 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
index 877fd0b4ba..e559862c83 100644
--- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
@@ -2,6 +2,9 @@
 
 final class PhabricatorAuditCommitStatusConstants extends Phobject {
 
+  private $key;
+  private $spec = array();
+
   const NONE                = 0;
   const NEEDS_AUDIT         = 1;
   const CONCERN_RAISED      = 2;
@@ -16,6 +19,47 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
   const MODERN_AUDITED = 'audited';
   const MODERN_NEEDS_VERIFICATION = 'needs-verification';
 
+  public static function newForLegacyStatus($status) {
+    $map = self::getMap();
+
+    foreach ($map as $key => $spec) {
+      if (idx($spec, 'legacy') == $status) {
+        return self::newForStatus($key);
+      }
+    }
+
+    return self::newForStatus($status);
+  }
+
+  public static function newForStatus($status) {
+    $result = new self();
+
+    $result->key = $status;
+
+    $map = self::getMap();
+    if (isset($map[$status])) {
+      $result->spec = $map[$status];
+    }
+
+    return $result;
+  }
+
+  public function getKey() {
+    return $this->key;
+  }
+
+  public function getIcon() {
+    return idx($this->spec, 'icon');
+  }
+
+  public function getColor() {
+    return idx($this->spec, 'color');
+  }
+
+  public function getName() {
+    return idx($this->spec, 'name', pht('Unknown ("%s")', $this->key));
+  }
+
   public static function getStatusNameMap() {
     $map = self::getMap();
     return ipull($map, 'name', 'legacy');
diff --git a/src/applications/audit/management/PhabricatorAuditSynchronizeManagementWorkflow.php b/src/applications/audit/management/PhabricatorAuditSynchronizeManagementWorkflow.php
index db6ce096c4..96d06e65c2 100644
--- a/src/applications/audit/management/PhabricatorAuditSynchronizeManagementWorkflow.php
+++ b/src/applications/audit/management/PhabricatorAuditSynchronizeManagementWorkflow.php
@@ -30,11 +30,11 @@ final class PhabricatorAuditSynchronizeManagementWorkflow
           continue;
         }
 
-        $old_status = $commit->getAuditStatus();
+        $old_status = $commit->getAuditStatusObject();
         $commit->updateAuditStatus($commit->getAudits());
-        $new_status = $commit->getAuditStatus();
+        $new_status = $commit->getAuditStatusObject();
 
-        if ($old_status == $new_status) {
+        if ($old_status->getKey() == $new_status->getKey()) {
           echo tsprintf(
             "%s\n",
             pht(
@@ -46,10 +46,8 @@ final class PhabricatorAuditSynchronizeManagementWorkflow
             pht(
               'Updating "%s": "%s" -> "%s".',
               $commit->getDisplayName(),
-              PhabricatorAuditCommitStatusConstants::getStatusName(
-                $old_status),
-              PhabricatorAuditCommitStatusConstants::getStatusName(
-                $new_status)));
+              $old_status->getName(),
+              $new_status->getName()));
 
           $commit->save();
         }
diff --git a/src/applications/audit/view/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php
index cb9fecac3a..fb56e7cd55 100644
--- a/src/applications/audit/view/PhabricatorAuditListView.php
+++ b/src/applications/audit/view/PhabricatorAuditListView.php
@@ -120,14 +120,11 @@ final class PhabricatorAuditListView extends AphrontView {
       $commit_desc = $this->getCommitDescription($commit_phid);
       $committed = phabricator_datetime($commit->getEpoch(), $viewer);
 
-      $status = $commit->getAuditStatus();
+      $status = $commit->getAuditStatusObject();
 
-      $status_text =
-        PhabricatorAuditCommitStatusConstants::getStatusName($status);
-      $status_color =
-        PhabricatorAuditCommitStatusConstants::getStatusColor($status);
-      $status_icon =
-        PhabricatorAuditCommitStatusConstants::getStatusIcon($status);
+      $status_text = $status->getName();
+      $status_color = $status->getColor();
+      $status_icon = $status->getIcon();
 
       $author_phid = $commit->getAuthorPHID();
       if ($author_phid) {
diff --git a/src/applications/diffusion/view/DiffusionHistoryTableView.php b/src/applications/diffusion/view/DiffusionHistoryTableView.php
index 3885bbf47c..cfd7019679 100644
--- a/src/applications/diffusion/view/DiffusionHistoryTableView.php
+++ b/src/applications/diffusion/view/DiffusionHistoryTableView.php
@@ -114,10 +114,10 @@ final class DiffusionHistoryTableView extends DiffusionHistoryView {
           'type' => $history->getFileType(),
         ));
 
-      $status = $commit->getAuditStatus();
-      $icon = PhabricatorAuditCommitStatusConstants::getStatusIcon($status);
-      $color = PhabricatorAuditCommitStatusConstants::getStatusColor($status);
-      $name = PhabricatorAuditCommitStatusConstants::getStatusName($status);
+      $status = $commit->getAuditStatusObject();
+      $icon = $status->getIcon();
+      $color = $status->getColor();
+      $name = $status->getName();
 
       $audit_view = id(new PHUIIconView())
         ->setIcon($icon, $color)
diff --git a/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
index b5abd40032..c37bdc04f9 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
@@ -82,10 +82,10 @@ final class PhabricatorRepositoryCommitPHIDType extends PhabricatorPHIDType {
       $handle->setURI($commit->getURI());
       $handle->setTimestamp($commit->getEpoch());
 
-      $status = $commit->getAuditStatus();
-      $icon = PhabricatorAuditCommitStatusConstants::getStatusIcon($status);
-      $color = PhabricatorAuditCommitStatusConstants::getStatusColor($status);
-      $name = PhabricatorAuditCommitStatusConstants::getStatusName($status);
+      $status = $commit->getAuditStatusObject();
+      $icon = $status->getIcon();
+      $color = $status->getColor();
+      $name = $status->getName();
 
       $handle
         ->setStateIcon($icon)
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index f36869686f..447db08e6c 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -530,6 +530,11 @@ final class PhabricatorRepositoryCommit
     return $data->getCommitDetail('authorPHID');
   }
 
+  public function getAuditStatusObject() {
+    $status = $this->getAuditStatus();
+    return PhabricatorAuditCommitStatusConstants::newForLegacyStatus($status);
+  }
+
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
   public function getCapabilities() {

From 046c1b5b828d2ead3ffc5de26ab5abae43d3ae8c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 7 Sep 2018 09:42:16 -0700
Subject: [PATCH 077/125] Expose "isDraft" and "holdAsDraft" revision
 properties over Conduit

Summary:
Ref T13195. See PHI861. The "+ Draft" flag is not currently exposed over the API, but seems stable enough to expose.

Also expose the "hold as draft" flag, normally `arc diff --draft`.

Today, you can get "+ Draft" with some other state by:

  - abandoning a draft revision ("Abandoned + Draft"); or
  - using `arc diff --plan-changes` with an older `arc` version ("Changes Planned + Draft").

Test Plan: Called `differential.revision.search` via Conduit and got sensible-looking results for revisions in various states.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19648
---
 .../storage/DifferentialRevision.php             | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index a432c02a96..9b169f3c67 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -1152,6 +1152,20 @@ final class DifferentialRevision extends DifferentialDAO
         ->setKey('testPlan')
         ->setType('string')
         ->setDescription(pht('Revision test plan.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('isDraft')
+        ->setType('bool')
+        ->setDescription(
+          pht(
+            'True if this revision is in any draft state, and thus not '.
+            'notifying reviewers and subscribers about changes.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('holdAsDraft')
+        ->setType('bool')
+        ->setDescription(
+          pht(
+            'True if this revision is being held as a draft. It will not be '.
+            'automatically submitted for review even if tests pass.')),
     );
   }
 
@@ -1172,6 +1186,8 @@ final class DifferentialRevision extends DifferentialDAO
       'diffPHID' => $this->getActiveDiffPHID(),
       'summary' => $this->getSummary(),
       'testPlan' => $this->getTestPlan(),
+      'isDraft' => !$this->getShouldBroadcast(),
+      'holdAsDraft' => (bool)$this->getHoldAsDraft(),
     );
   }
 

From 16a6fc8341ea2fa9b940c914e5f7a961c653eb93 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 4 Sep 2018 11:33:24 -0700
Subject: [PATCH 078/125] Allow reviewers to mark their own inlines as "Done"
 before they submit them

Summary:
Ref T13195. Ref T8573. This allows reviewers to mark their own inline comments as "Done" before they submit them.

If you're leaving a non-actionable comment like "this is good", you can pre-check "Done" to give the author a hint that you don't expect any response.

Test Plan: On revisions and commits, added inlines as the author and a reviewer/auditor. Marked them done/not-done before submitting. As author, marked the not-done ones done after submitting. Checked preivews, toggled done/not done states.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195, T8573

Differential Revision: https://secure.phabricator.com/D19634
---
 .../audit/editor/PhabricatorAuditEditor.php   | 24 ++++++++++++-----
 ...ifferentialInlineCommentEditController.php | 17 ++++++++++--
 .../editor/DifferentialTransactionEditor.php  | 27 ++++++++++++++-----
 .../DiffusionInlineCommentController.php      | 18 ++++++++++---
 .../view/PHUIDiffInlineCommentDetailView.php  | 21 ++++++++++-----
 5 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
index 984e2c1472..c04bb8185b 100644
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -258,19 +258,31 @@ final class PhabricatorAuditEditor
           $this->didExpandInlineState = true;
 
           $actor_phid = $this->getActingAsPHID();
-          $actor_is_author = ($object->getAuthorPHID() == $actor_phid);
-          if (!$actor_is_author) {
-            break;
-          }
+          $author_phid = $object->getAuthorPHID();
+          $actor_is_author = ($actor_phid == $author_phid);
 
           $state_map = PhabricatorTransactions::getInlineStateMap();
 
-          $inlines = id(new DiffusionDiffInlineCommentQuery())
+          $query = id(new DiffusionDiffInlineCommentQuery())
             ->setViewer($this->getActor())
             ->withCommitPHIDs(array($object->getPHID()))
-            ->withFixedStates(array_keys($state_map))
+            ->withFixedStates(array_keys($state_map));
+
+          $inlines = array();
+
+          $inlines[] = id(clone $query)
+            ->withAuthorPHIDs(array($actor_phid))
+            ->withHasTransaction(false)
             ->execute();
 
+          if ($actor_is_author) {
+            $inlines[] = id(clone $query)
+              ->withHasTransaciton(true)
+              ->execute();
+          }
+
+          $inlines = array_mergev($inlines);
+
           if (!$inlines) {
             break;
           }
diff --git a/src/applications/differential/controller/DifferentialInlineCommentEditController.php b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
index 2e44e86822..9741cc93ee 100644
--- a/src/applications/differential/controller/DifferentialInlineCommentEditController.php
+++ b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
@@ -118,8 +118,21 @@ final class DifferentialInlineCommentEditController
       throw new Exception(pht('Unable to load revision.'));
     }
 
-    if ($revision->getAuthorPHID() !== $viewer->getPHID()) {
-      throw new Exception(pht('You are not the revision owner.'));
+    $viewer_phid = $viewer->getPHID();
+    $is_owner = ($viewer_phid == $revision->getAuthorPHID());
+    $is_author = ($viewer_phid == $inline->getAuthorPHID());
+    $is_draft = ($inline->isDraft());
+
+    if ($is_owner) {
+      // You own the revision, so you can mark the comment as "Done".
+    } else if ($is_author && $is_draft) {
+      // You made this comment and it's still a draft, so you can mark
+      // it as "Done".
+    } else {
+      throw new Exception(
+        pht(
+          'You are not the revision owner, and this is not a draft comment '.
+          'you authored.'));
     }
 
     return $inline;
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 29dac38b5a..c452cb9346 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -248,19 +248,34 @@ final class DifferentialTransactionEditor
           $this->didExpandInlineState = true;
 
           $actor_phid = $this->getActingAsPHID();
-          $actor_is_author = ($object->getAuthorPHID() == $actor_phid);
-          if (!$actor_is_author) {
-            break;
-          }
+          $author_phid = $object->getAuthorPHID();
+          $actor_is_author = ($actor_phid == $author_phid);
 
           $state_map = PhabricatorTransactions::getInlineStateMap();
 
-          $inlines = id(new DifferentialDiffInlineCommentQuery())
+          $query = id(new DifferentialDiffInlineCommentQuery())
             ->setViewer($this->getActor())
             ->withRevisionPHIDs(array($object->getPHID()))
-            ->withFixedStates(array_keys($state_map))
+            ->withFixedStates(array_keys($state_map));
+
+          $inlines = array();
+
+          // We're going to undraft any "done" marks on your own inlines.
+          $inlines[] = id(clone $query)
+            ->withAuthorPHIDs(array($actor_phid))
+            ->withHasTransaction(false)
             ->execute();
 
+          // If you're the author, we also undraft any "done" marks on other
+          // inlines.
+          if ($actor_is_author) {
+            $inlines[] = id(clone $query)
+              ->withHasTransaction(true)
+              ->execute();
+          }
+
+          $inlines = array_mergev($inlines);
+
           if (!$inlines) {
             break;
           }
diff --git a/src/applications/diffusion/controller/DiffusionInlineCommentController.php b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
index bc7448a9e2..ce69511dde 100644
--- a/src/applications/diffusion/controller/DiffusionInlineCommentController.php
+++ b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
@@ -75,9 +75,21 @@ final class DiffusionInlineCommentController
       throw new Exception(pht('Failed to load commit.'));
     }
 
-    if ((!$commit->getAuthorPHID()) ||
-        ($commit->getAuthorPHID() != $viewer->getPHID())) {
-      throw new Exception(pht('You can not mark this comment as complete.'));
+    $owner_phid = $commit->getAuthorPHID();
+    $viewer_phid = $viewer->getPHID();
+    $viewer_is_owner = ($owner_phid && ($owner_phid == $viewer_phid));
+    $viewer_is_author = ($viewer_phid == $inline->getAuthorPHID());
+    $is_draft = $inline->isDraft();
+
+    if ($viewer_is_owner) {
+      // You can mark inlines on your own commits as "Done".
+    } else if ($viewer_is_author && $is_draft) {
+      // You can mark your own unsubmitted inlines as "Done".
+    } else {
+      throw new Exception(
+        pht(
+          'You can not mark this comment as complete: you did not author '.
+          'the commit and the comment is not a draft you wrote.'));
     }
 
     return $inline;
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
index a32197059a..4da3bbd8fa 100644
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
@@ -287,15 +287,24 @@ final class PHUIDiffInlineCommentDetailView
 
     $done_button = null;
 
+    $mark_done = $this->getCanMarkDone();
+
+    // Allow users to mark their own draft inlines as "Done".
+    if ($viewer_phid == $inline->getAuthorPHID()) {
+      if ($inline->isDraft()) {
+        $mark_done = true;
+      }
+    }
+
     if (!$is_synthetic) {
       $draft_state = false;
       switch ($inline->getFixedState()) {
         case PhabricatorInlineCommentInterface::STATE_DRAFT:
-          $is_done = ($this->getCanMarkDone());
+          $is_done = $mark_done;
           $draft_state = true;
           break;
         case PhabricatorInlineCommentInterface::STATE_UNDRAFT:
-          $is_done = !($this->getCanMarkDone());
+          $is_done = !$mark_done;
           $draft_state = true;
           break;
         case PhabricatorInlineCommentInterface::STATE_DONE:
@@ -309,7 +318,7 @@ final class PHUIDiffInlineCommentDetailView
 
       // If you don't have permission to mark the comment as "Done", you also
       // can not see the draft state.
-      if (!$this->getCanMarkDone()) {
+      if (!$mark_done) {
         $draft_state = false;
       }
 
@@ -321,21 +330,19 @@ final class PHUIDiffInlineCommentDetailView
         $classes[] = 'inline-state-is-draft';
       }
 
-      if ($this->getCanMarkDone()) {
+      if ($mark_done && !$this->preview) {
         $done_input = javelin_tag(
           'input',
           array(
             'type' => 'checkbox',
             'checked' => ($is_done ? 'checked' : null),
-            'disabled' => ($this->getCanMarkDone() ? null : 'disabled'),
             'class' => 'differential-inline-done',
             'sigil' => 'differential-inline-done',
           ));
         $done_button = phutil_tag(
           'label',
           array(
-            'class' => 'differential-inline-done-label '.
-                        ($this->getCanMarkDone() ? null : 'done-is-disabled'),
+            'class' => 'differential-inline-done-label ',
           ),
           array(
             $done_input,

From 2a03367a50c0ab2dbeceda0f802bf6e29ae55055 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 4 Sep 2018 11:33:28 -0700
Subject: [PATCH 079/125] When authors add inlines to their own
 revisions/commits, mark them as "Done" by default

Summary:
Ref T13195. Fixes T8573. When you're adding inlines to your own stuff, mark them "Done" by default. You can unmark them as "Done" if you're legitimately leaving TODOs for yourself, although I think this is unusual.

(If this turns out to be less unusual than I think, we could consider an alternate rule: mark replies by the author as "Done" by default.)

Test Plan: Added some inlines as an author and a non-author. Saw my author inlines marked as "Done" by default. Submitted them; unmarked and submittted them.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195, T8573

Differential Revision: https://secure.phabricator.com/D19635
---
 .../diff/PhabricatorInlineCommentController.php          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/infrastructure/diff/PhabricatorInlineCommentController.php b/src/infrastructure/diff/PhabricatorInlineCommentController.php
index 22e410612a..e6572672ce 100644
--- a/src/infrastructure/diff/PhabricatorInlineCommentController.php
+++ b/src/infrastructure/diff/PhabricatorInlineCommentController.php
@@ -231,6 +231,15 @@ abstract class PhabricatorInlineCommentController
           $inline->setReplyToCommentPHID($this->getReplyToCommentPHID());
         }
 
+        // If you own this object, mark your own inlines as "Done" by default.
+        $owner_phid = $this->loadObjectOwnerPHID($inline);
+        if ($owner_phid) {
+          if ($viewer->getPHID() == $owner_phid) {
+            $fixed_state = PhabricatorInlineCommentInterface::STATE_DRAFT;
+            $inline->setFixedState($fixed_state);
+          }
+        }
+
         $this->saveComment($inline);
 
         return $this->buildRenderedCommentResponse(

From 6dc721009d9e91a46bec34b23b804ca1ff33a1bf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 7 Sep 2018 12:18:39 -0700
Subject: [PATCH 080/125] Layout Phriction actions without floats, to avoid
 conflicts with floating content

Summary:
Ref T13195. If a Phriction page begins with a code block, the `clear: both;` currently makes it clear the action list.

Instead, use table-cell layout on desktops.

Test Plan: Viewed a Phriction page with an initial code block on desktop/tablet/mobile/printable layouts. Now got more sensible layouts in all cases.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: GoogleLegacy

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19649
---
 resources/celerity/map.php                  |  4 ++--
 src/view/phui/PHUIDocumentView.php          | 18 ++++++++++++++----
 webroot/rsrc/css/phui/phui-document-pro.css | 16 +++++++++++++---
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 743abd38ee..d3a9a1a34f 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -146,7 +146,7 @@ return array(
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
     'rsrc/css/phui/phui-crumbs-view.css' => '10728aaa',
     'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026',
-    'rsrc/css/phui/phui-document-pro.css' => '0e41dd91',
+    'rsrc/css/phui/phui-document-pro.css' => '1a08ef4b',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
     'rsrc/css/phui/phui-document.css' => 'c4ac41f9',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
@@ -814,7 +814,7 @@ return array(
     'phui-curtain-view-css' => '2bdaf026',
     'phui-document-summary-view-css' => '9ca48bdf',
     'phui-document-view-css' => 'c4ac41f9',
-    'phui-document-view-pro-css' => '0e41dd91',
+    'phui-document-view-pro-css' => '1a08ef4b',
     'phui-feed-story-css' => '44a9c8e9',
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
diff --git a/src/view/phui/PHUIDocumentView.php b/src/view/phui/PHUIDocumentView.php
index b29afb5496..f57152833e 100644
--- a/src/view/phui/PHUIDocumentView.php
+++ b/src/view/phui/PHUIDocumentView.php
@@ -171,10 +171,20 @@ final class PHUIDocumentView extends AphrontTagView {
         $table_of_contents,
         $this->header,
         $this->banner,
-        array(
-          $curtain,
-          $main_content,
-        ),
+        phutil_tag(
+          'div',
+          array(
+            'class' => 'phui-document-content-outer',
+          ),
+          phutil_tag(
+            'div',
+            array(
+              'class' => 'phui-document-content-inner',
+            ),
+            array(
+              $main_content,
+              $curtain,
+            ))),
         $foot_content,
       ));
 
diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css
index 29dc3beffa..4d58d17cb1 100644
--- a/webroot/rsrc/css/phui/phui-document-pro.css
+++ b/webroot/rsrc/css/phui/phui-document-pro.css
@@ -4,7 +4,7 @@
 
 .phui-document-view.phui-document-view-pro {
   max-width: 800px;
-  padding: 16px 16px 64px 16px;
+  padding: 16px 16px 32px 16px;
   margin: 0 auto;
 }
 
@@ -21,15 +21,25 @@
 }
 
 .device-desktop .has-curtain .phui-document-content-view {
-  padding-right: 332px;
+  display: table-cell;
 }
 
 .printable .phui-document-content-view {
   padding-right: 0;
 }
 
+.device-desktop .phui-document-content-outer {
+  display: table;
+  width: 100%;
+  layout: fixed;
+}
+
+.device-desktop .phui-document-content-inner {
+  display: table-row;
+}
+
 .device-desktop .phui-document-curtain {
-  float: right;
+  display: table-cell;
   width: 300px;
 }
 

From bae8a951143ab02d3f8d4f3c920784fc4c0f34d1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 7 Sep 2018 09:01:30 -0700
Subject: [PATCH 081/125] Continue replacing Commit/Audit status checks with
 object-based checks

Summary: Ref T13195. See PHI851. Continuing down the path toward replacing these legacy numeric constants with more modern string constants.

Test Plan:
- Raised concern, requested verification, verified.
- Looked at commit hovercard with audit status.
- Viewed header on a commit page.
- (Didn't test the Doorkeeper stuff since it requires linking to Asana and seems unlikely to break.)

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13195

Differential Revision: https://secure.phabricator.com/D19647
---
 .../PhabricatorAuditCommitStatusConstants.php | 24 ++++++++++++
 .../audit/editor/PhabricatorAuditEditor.php   |  4 +-
 .../controller/DiffusionCommitController.php  | 13 +++----
 ...sionDoorkeeperCommitFeedStoryPublisher.php | 13 +------
 .../DiffusionHovercardEngineExtension.php     | 10 ++---
 ...fusionCommitRequiredActionResultBucket.php | 11 ++----
 .../DiffusionCommitConcernTransaction.php     |  4 +-
 .../DiffusionCommitStateTransaction.php       | 39 ++++++++++---------
 .../DiffusionCommitVerifyTransaction.php      |  3 +-
 .../storage/PhabricatorRepositoryCommit.php   | 20 ++++++++++
 10 files changed, 84 insertions(+), 57 deletions(-)

diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
index e559862c83..50e4180074 100644
--- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
@@ -60,6 +60,30 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
     return idx($this->spec, 'name', pht('Unknown ("%s")', $this->key));
   }
 
+  public function isNoAudit() {
+    return ($this->key == self::MODERN_NONE);
+  }
+
+  public function isConcernRaised() {
+    return ($this->key == self::MODERN_CONCERN_RAISED);
+  }
+
+  public function isNeedsVerification() {
+    return ($this->key == self::MODERN_NEEDS_VERIFICATION);
+  }
+
+  public function isPartiallyAudited() {
+    return ($this->key == self::MODERN_PARTIALLY_AUDITED);
+  }
+
+  public function isAudited() {
+    return ($this->key == self::MODERN_AUDITED);
+  }
+
+  public function getIsClosed() {
+    return idx($this->spec, 'closed');
+  }
+
   public static function getStatusNameMap() {
     $map = self::getMap();
     return ipull($map, 'name', 'legacy');
diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
index c04bb8185b..d5c22fba6b 100644
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -206,12 +206,10 @@ final class PhabricatorAuditEditor
       $object->writeImportStatusFlag($import_status_flag);
     }
 
-    $partial_status = PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED;
-
     // If the commit has changed state after this edit, add an informational
     // transaction about the state change.
     if ($old_status != $new_status) {
-      if ($new_status == $partial_status) {
+      if ($object->isAuditStatusPartiallyAudited()) {
         // This state isn't interesting enough to get a transaction. The
         // best way we could lead the user forward is something like "This
         // commit still requires additional audits." but that's redundant and
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index a6743b6557..283278fcf8 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -171,13 +171,12 @@ final class DiffusionCommitController extends DiffusionController {
         ->setHeaderIcon('fa-code-fork')
         ->addTag($commit_tag);
 
-      if ($commit->getAuditStatus()) {
-        $icon = PhabricatorAuditCommitStatusConstants::getStatusIcon(
-          $commit->getAuditStatus());
-        $color = PhabricatorAuditCommitStatusConstants::getStatusColor(
-          $commit->getAuditStatus());
-        $status = PhabricatorAuditCommitStatusConstants::getStatusName(
-          $commit->getAuditStatus());
+      if (!$commit->isAuditStatusNoAudit()) {
+        $status = $commit->getAuditStatusObject();
+
+        $icon = $status->getIcon();
+        $color = $status->getColor();
+        $status = $status->getName();
 
         $header->setStatus($icon, $color, $status);
       }
diff --git a/src/applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php b/src/applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php
index 088f4b752e..712b7ae150 100644
--- a/src/applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php
+++ b/src/applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php
@@ -31,8 +31,6 @@ final class DiffusionDoorkeeperCommitFeedStoryPublisher
     // After ApplicationTransactions, we could annotate feed stories more
     // explicitly.
 
-    $fully_audited = PhabricatorAuditCommitStatusConstants::FULLY_AUDITED;
-
     $story = $this->getFeedStory();
     $xaction = $story->getPrimaryTransaction();
     switch ($xaction->getTransactionType()) {
@@ -41,7 +39,7 @@ final class DiffusionDoorkeeperCommitFeedStoryPublisher
           case PhabricatorAuditActionConstants::CLOSE:
             return true;
           case PhabricatorAuditActionConstants::ACCEPT:
-            if ($object->getAuditStatus() == $fully_audited) {
+            if ($object->isAuditStatusAudited()) {
               return true;
             }
             break;
@@ -165,14 +163,7 @@ final class DiffusionDoorkeeperCommitFeedStoryPublisher
   }
 
   public function isObjectClosed($object) {
-    switch ($object->getAuditStatus()) {
-      case PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT:
-      case PhabricatorAuditCommitStatusConstants::CONCERN_RAISED:
-      case PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED:
-        return false;
-      default:
-        return true;
-    }
+    return $object->getAuditStatusObject()->getIsClosed();
   }
 
   public function getResponsibilityTitle($object) {
diff --git a/src/applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php b/src/applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php
index 0711028796..3ce95cb3c3 100644
--- a/src/applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php
+++ b/src/applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php
@@ -41,12 +41,12 @@ final class DiffusionHovercardEngineExtension
     $hovercard->addField(pht('Date'),
       phabricator_date($commit->getEpoch(), $viewer));
 
-    if ($commit->getAuditStatus() !=
-      PhabricatorAuditCommitStatusConstants::NONE) {
+    if (!$commit->isAuditStatusNoAudit()) {
+      $status = $commit->getAuditStatusObject();
 
-      $hovercard->addField(pht('Audit Status'),
-        PhabricatorAuditCommitStatusConstants::getStatusName(
-          $commit->getAuditStatus()));
+      $hovercard->addField(
+        pht('Audit Status'),
+        $status->getName());
     }
   }
 
diff --git a/src/applications/diffusion/query/DiffusionCommitRequiredActionResultBucket.php b/src/applications/diffusion/query/DiffusionCommitRequiredActionResultBucket.php
index 40bc63025d..70584ae243 100644
--- a/src/applications/diffusion/query/DiffusionCommitRequiredActionResultBucket.php
+++ b/src/applications/diffusion/query/DiffusionCommitRequiredActionResultBucket.php
@@ -69,14 +69,12 @@ final class DiffusionCommitRequiredActionResultBucket
     $results = array();
     $objects = $this->objects;
 
-    $status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
-
     foreach ($objects as $key => $object) {
       if (empty($phids[$object->getAuthorPHID()])) {
         continue;
       }
 
-      if ($object->getAuditStatus() != $status_concern) {
+      if (!$object->isAuditStatusConcernRaised()) {
         continue;
       }
 
@@ -91,7 +89,6 @@ final class DiffusionCommitRequiredActionResultBucket
     $results = array();
     $objects = $this->objects;
 
-    $status_verify = PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION;
     $has_concern = array(
       PhabricatorAuditStatusConstants::CONCERNED,
     );
@@ -102,7 +99,7 @@ final class DiffusionCommitRequiredActionResultBucket
         continue;
       }
 
-      if ($object->getAuditStatus() != $status_verify) {
+      if (!$object->isAuditStatusNeedsVerification()) {
         continue;
       }
 
@@ -147,10 +144,8 @@ final class DiffusionCommitRequiredActionResultBucket
     $results = array();
     $objects = $this->objects;
 
-    $status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
-
     foreach ($objects as $key => $object) {
-      if ($object->getAuditStatus() != $status_concern) {
+      if (!$object->isAuditStatusConcernRaised()) {
         continue;
       }
 
diff --git a/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
index 30ec8d9f6d..07194a2af3 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
@@ -54,10 +54,8 @@ final class DiffusionCommitConcernTransaction
 
     // Even if you've already raised a concern, you can raise again as long
     // as the author requested you verify.
-    $state_verify = PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION;
-
     if ($this->isViewerFullyRejected($object, $viewer)) {
-      if ($object->getAuditStatus() != $state_verify) {
+      if (!$object->isAuditStatusNeedsVerification()) {
         throw new Exception(
           pht(
             'You can not raise a concern with this commit because you have '.
diff --git a/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
index a6288923f4..bcf6a9e382 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
@@ -11,29 +11,32 @@ final class DiffusionCommitStateTransaction
     throw new PhutilMethodNotImplementedException();
   }
 
-  public function getIcon() {
+  private function getAuditStatusObject() {
     $new = $this->getNewValue();
-    return PhabricatorAuditCommitStatusConstants::getStatusIcon($new);
+    return PhabricatorAuditCommitStatusConstants::newForLegacyStatus($new);
+  }
+
+  public function getIcon() {
+    return $this->getAuditStatusObject()->getIcon();
   }
 
   public function getColor() {
-    $new = $this->getNewValue();
-    return PhabricatorAuditCommitStatusConstants::getStatusColor($new);
+    return $this->getAuditStatusObject()->getColor();
   }
 
   public function getTitle() {
-    $new = $this->getNewValue();
+    $status = $this->getAuditStatusObject();
 
-    switch ($new) {
-      case PhabricatorAuditCommitStatusConstants::NONE:
+    switch ($status->getKey()) {
+      case PhabricatorAuditCommitStatusConstants::MODERN_NONE:
         return pht('This commit no longer requires audit.');
-      case PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT:
+      case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT:
         return pht('This commit now requires audit.');
-      case PhabricatorAuditCommitStatusConstants::CONCERN_RAISED:
+      case PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED:
         return pht('This commit now has outstanding concerns.');
-      case PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION:
+      case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION:
         return pht('This commit now requires verification by auditors.');
-      case PhabricatorAuditCommitStatusConstants::FULLY_AUDITED:
+      case PhabricatorAuditCommitStatusConstants::MODERN_AUDITED:
         return pht('All concerns with this commit have now been addressed.');
     }
 
@@ -41,26 +44,26 @@ final class DiffusionCommitStateTransaction
   }
 
   public function getTitleForFeed() {
-    $new = $this->getNewValue();
+    $status = $this->getAuditStatusObject();
 
-    switch ($new) {
-      case PhabricatorAuditCommitStatusConstants::NONE:
+    switch ($status->getKey()) {
+      case PhabricatorAuditCommitStatusConstants::MODERN_NONE:
         return pht(
           '%s no longer requires audit.',
           $this->renderObject());
-      case PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT:
+      case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT:
         return pht(
           '%s now requires audit.',
           $this->renderObject());
-      case PhabricatorAuditCommitStatusConstants::CONCERN_RAISED:
+      case PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED:
         return pht(
           '%s now has outstanding concerns.',
           $this->renderObject());
-      case PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION:
+      case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION:
         return pht(
           '%s now requires verification by auditors.',
           $this->renderObject());
-      case PhabricatorAuditCommitStatusConstants::FULLY_AUDITED:
+      case PhabricatorAuditCommitStatusConstants::MODERN_AUDITED:
         return pht(
           'All concerns with %s have now been addressed.',
           $this->renderObject());
diff --git a/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
index a44261f7a4..3e6abb705f 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
@@ -48,8 +48,7 @@ final class DiffusionCommitVerifyTransaction
           'are not the author.'));
     }
 
-    $status = $object->getAuditStatus();
-    if ($status != PhabricatorAuditCommitStatusConstants::CONCERN_RAISED) {
+    if (!$object->isAuditStatusConcernRaised()) {
       throw new Exception(
         pht(
           'You can not request verification of this commit because no '.
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 447db08e6c..f56962d9f8 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -535,6 +535,26 @@ final class PhabricatorRepositoryCommit
     return PhabricatorAuditCommitStatusConstants::newForLegacyStatus($status);
   }
 
+  public function isAuditStatusNoAudit() {
+    return $this->getAuditStatusObject()->isNoAudit();
+  }
+
+  public function isAuditStatusConcernRaised() {
+    return $this->getAuditStatusObject()->isConcernRaised();
+  }
+
+  public function isAuditStatusNeedsVerification() {
+    return $this->getAuditStatusObject()->isNeedsVerification();
+  }
+
+  public function isAuditStatusPartiallyAudited() {
+    return $this->getAuditStatusObject()->isPartiallyAudited();
+  }
+
+  public function isAuditStatusAudited() {
+    return $this->getAuditStatusObject()->isAudited();
+  }
+
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
   public function getCapabilities() {

From 853a816b3caf7d863d97deda2d3cc4a45f4f2434 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 10 Sep 2018 11:35:11 -0700
Subject: [PATCH 082/125] Continue converting Audit constants, allowing the
 Query to handle either strings or integers

Summary: Ref T13197. We're almost ready to migrate: let the Query accept either older integer values or new string values. Then move some callsites to use strings.

Test Plan: Called `audit.query`, browsed audits, audited commits.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19650
---
 .../audit/conduit/AuditQueryConduitAPIMethod.php | 10 +++++-----
 .../PhabricatorAuditCommitStatusConstants.php    | 16 +++++++++++++---
 .../diffusion/query/DiffusionCommitQuery.php     |  9 ++++++++-
 ...DiffusionCommitRequiredActionResultBucket.php | 14 ++++++--------
 .../PhabricatorOwnersDetailController.php        |  3 ++-
 .../storage/PhabricatorRepositoryCommit.php      | 11 ++++++-----
 6 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php b/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
index f3858afbf8..6d29d2345d 100644
--- a/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
+++ b/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
@@ -68,17 +68,17 @@ final class AuditQueryConduitAPIMethod extends AuditConduitAPIMethod {
 
     $status_map = array(
       self::AUDIT_LEGACYSTATUS_OPEN => array(
-        PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT,
-        PhabricatorAuditCommitStatusConstants::CONCERN_RAISED,
+        PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT,
+        PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED,
       ),
       self::AUDIT_LEGACYSTATUS_CONCERN => array(
-        PhabricatorAuditCommitStatusConstants::CONCERN_RAISED,
+        PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED,
       ),
       self::AUDIT_LEGACYSTATUS_ACCEPTED => array(
-        PhabricatorAuditCommitStatusConstants::FULLY_AUDITED,
+        PhabricatorAuditCommitStatusConstants::MODERN_AUDITED,
       ),
       self::AUDIT_LEGACYSTATUS_PARTIAL => array(
-        PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED,
+        PhabricatorAuditCommitStatusConstants::MODERN_PARTIALLY_AUDITED,
       ),
     );
 
diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
index 50e4180074..2196940545 100644
--- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
@@ -22,9 +22,11 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
   public static function newForLegacyStatus($status) {
     $map = self::getMap();
 
-    foreach ($map as $key => $spec) {
-      if (idx($spec, 'legacy') == $status) {
-        return self::newForStatus($key);
+    if (is_int($status) || ctype_digit($status)) {
+      foreach ($map as $key => $spec) {
+        if ((int)idx($spec, 'legacy') === (int)$status) {
+          return self::newForStatus($key);
+        }
       }
     }
 
@@ -56,6 +58,10 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
     return idx($this->spec, 'color');
   }
 
+  public function getLegacyKey() {
+    return idx($this->spec, 'legacy');
+  }
+
   public function getName() {
     return idx($this->spec, 'name', pht('Unknown ("%s")', $this->key));
   }
@@ -64,6 +70,10 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
     return ($this->key == self::MODERN_NONE);
   }
 
+  public function isNeedsAudit() {
+    return ($this->key == self::MODERN_NEEDS_AUDIT);
+  }
+
   public function isConcernRaised() {
     return ($this->key == self::MODERN_CONCERN_RAISED);
   }
diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
index 0ca9cd97d4..9a7e21b0af 100644
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -714,10 +714,17 @@ final class DiffusionCommitQuery
     }
 
     if ($this->statuses !== null) {
+      $statuses = array();
+      foreach ($this->statuses as $status) {
+        $object = PhabricatorAuditCommitStatusConstants::newForLegacyStatus(
+          $status);
+        $statuses[] = $object->getLegacyKey();
+      }
+
       $where[] = qsprintf(
         $conn,
         'commit.auditStatus IN (%Ld)',
-        $this->statuses);
+        $statuses);
     }
 
     if ($this->packagePHIDs !== null) {
diff --git a/src/applications/diffusion/query/DiffusionCommitRequiredActionResultBucket.php b/src/applications/diffusion/query/DiffusionCommitRequiredActionResultBucket.php
index 70584ae243..25984c93e1 100644
--- a/src/applications/diffusion/query/DiffusionCommitRequiredActionResultBucket.php
+++ b/src/applications/diffusion/query/DiffusionCommitRequiredActionResultBucket.php
@@ -164,15 +164,13 @@ final class DiffusionCommitRequiredActionResultBucket
     $results = array();
     $objects = $this->objects;
 
-    $status_waiting = array(
-      PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT,
-      PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION,
-      PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED,
-    );
-    $status_waiting = array_fuse($status_waiting);
-
     foreach ($objects as $key => $object) {
-      if (empty($status_waiting[$object->getAuditStatus()])) {
+      $any_waiting =
+        $object->isAuditStatusNeedsAudit() ||
+        $object->isAuditStatusNeedsVerification() ||
+        $object->isAuditStatusPartiallyAudited();
+
+      if (!$any_waiting) {
         continue;
       }
 
diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
index 1caf12a82d..bdc4a2e475 100644
--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
@@ -71,7 +71,8 @@ final class PhabricatorOwnersDetailController
           'package' => $package->getPHID(),
         ));
 
-    $status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
+    $status_concern =
+      PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED;
 
     $attention_commits = id(new DiffusionCommitQuery())
       ->setViewer($request->getUser())
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index f56962d9f8..291c895231 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -381,14 +381,11 @@ final class PhabricatorRepositoryCommit
       }
     }
 
-    $current_status = $this->getAuditStatus();
-    $status_verify = PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION;
-
     if ($any_concern) {
-      if ($current_status == $status_verify) {
+      if ($this->isAuditStatusNeedsVerification()) {
         // If the change is in "Needs Verification", we keep it there as
         // long as any auditors still have concerns.
-        $status = $status_verify;
+        $status = PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION;
       } else {
         $status = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
       }
@@ -539,6 +536,10 @@ final class PhabricatorRepositoryCommit
     return $this->getAuditStatusObject()->isNoAudit();
   }
 
+  public function isAuditStatusNeedsAudit() {
+    return $this->getAuditStatusObject()->isNeedsAudit();
+  }
+
   public function isAuditStatusConcernRaised() {
     return $this->getAuditStatusObject()->isConcernRaised();
   }

From 8eb8e8e1d86f1eddaf4c4b839910501f9b444a90 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 10 Sep 2018 12:07:36 -0700
Subject: [PATCH 083/125] Make DiffusionCommitSearch accept modern (string)
 constants

Summary:
Depends on D19650. Ref T13197. Allow `SearchCheckboxesField` to have a "deprecated" map of older aliases, then convert them to modern values.

On the API method page, show all the values.

This technically resolves the issue in PHI841, although I still plan to migrate behind this.

Test Plan:
{F5875363}

- Queried audits, fiddled with `?status=1,audited`, etc.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19651
---
 .../PhabricatorAuditCommitStatusConstants.php | 27 ++++++--------
 .../query/PhabricatorCommitSearchEngine.php   |  4 +-
 .../data/ConduitConstantDescription.php       | 10 +++++
 .../PhabricatorSearchEngineAPIMethod.php      | 15 +++++++-
 .../PhabricatorSearchCheckboxesField.php      | 37 ++++++++++++++++++-
 5 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
index 2196940545..eca420ce1b 100644
--- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
@@ -94,15 +94,6 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
     return idx($this->spec, 'closed');
   }
 
-  public static function getStatusNameMap() {
-    $map = self::getMap();
-    return ipull($map, 'name', 'legacy');
-  }
-
-  public static function getStatusName($code) {
-    return idx(self::getStatusNameMap(), $code, pht('Unknown'));
-  }
-
   public static function getOpenStatusConstants() {
     $constants = array();
     foreach (self::getMap() as $map) {
@@ -113,16 +104,22 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
     return $constants;
   }
 
-  public static function getStatusColor($code) {
+  public static function newOptions() {
     $map = self::getMap();
-    $map = ipull($map, 'color', 'legacy');
-    return idx($map, $code);
+    return ipull($map, 'name');
   }
 
-  public static function getStatusIcon($code) {
+  public static function newDeprecatedOptions() {
     $map = self::getMap();
-    $map = ipull($map, 'icon', 'legacy');
-    return idx($map, $code);
+
+    $results = array();
+    foreach ($map as $key => $spec) {
+      if (isset($spec['legacy'])) {
+        $results[$spec['legacy']] = $key;
+      }
+    }
+
+    return $results;
   }
 
   private static function getMap() {
diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
index e1b294a9d6..67861b7e7d 100644
--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
@@ -92,7 +92,9 @@ final class PhabricatorCommitSearchEngine
         ->setLabel(pht('Audit Status'))
         ->setKey('statuses')
         ->setAliases(array('status'))
-        ->setOptions(PhabricatorAuditCommitStatusConstants::getStatusNameMap())
+        ->setOptions(PhabricatorAuditCommitStatusConstants::newOptions())
+        ->setDeprecatedOptions(
+          PhabricatorAuditCommitStatusConstants::newDeprecatedOptions())
         ->setDescription(pht('Find commits with given audit statuses.')),
       id(new PhabricatorSearchDatasourceField())
         ->setLabel(pht('Repositories'))
diff --git a/src/applications/conduit/data/ConduitConstantDescription.php b/src/applications/conduit/data/ConduitConstantDescription.php
index fe2af2b716..c9b2d00f6b 100644
--- a/src/applications/conduit/data/ConduitConstantDescription.php
+++ b/src/applications/conduit/data/ConduitConstantDescription.php
@@ -4,6 +4,7 @@ final class ConduitConstantDescription extends Phobject {
 
   private $key;
   private $value;
+  private $isDeprecated;
 
   public function setKey($key) {
     $this->key = $key;
@@ -23,4 +24,13 @@ final class ConduitConstantDescription extends Phobject {
     return $this->value;
   }
 
+  public function setIsDeprecated($is_deprecated) {
+    $this->isDeprecated = $is_deprecated;
+    return $this;
+  }
+
+  public function getIsDeprecated() {
+    return $this->isDeprecated;
+  }
+
 }
diff --git a/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php b/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
index 335ba58852..235d74d6f3 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
@@ -230,9 +230,20 @@ EOTEXT
 
         $constants_rows = array();
         foreach ($constants as $constant) {
+          if ($constant->getIsDeprecated()) {
+            $icon = id(new PHUIIconView())
+              ->setIcon('fa-exclamation-triangle', 'red');
+          } else {
+            $icon = null;
+          }
+
           $constants_rows[] = array(
             $constant->getKey(),
-            $constant->getValue(),
+            array(
+              $icon,
+              ' ',
+              $constant->getValue(),
+            ),
           );
         }
 
@@ -244,7 +255,7 @@ EOTEXT
             ))
           ->setColumnClasses(
             array(
-              'pre',
+              'mono',
               'wide',
             ));
 
diff --git a/src/applications/search/field/PhabricatorSearchCheckboxesField.php b/src/applications/search/field/PhabricatorSearchCheckboxesField.php
index 0985c976ce..ce41f85db3 100644
--- a/src/applications/search/field/PhabricatorSearchCheckboxesField.php
+++ b/src/applications/search/field/PhabricatorSearchCheckboxesField.php
@@ -4,6 +4,7 @@ final class PhabricatorSearchCheckboxesField
   extends PhabricatorSearchField {
 
   private $options;
+  private $deprecatedOptions = array();
 
   public function setOptions(array $options) {
     $this->options = $options;
@@ -14,6 +15,15 @@ final class PhabricatorSearchCheckboxesField
     return $this->options;
   }
 
+  public function setDeprecatedOptions(array $deprecated_options) {
+    $this->deprecatedOptions = $deprecated_options;
+    return $this;
+  }
+
+  public function getDeprecatedOptions() {
+    return $this->deprecatedOptions;
+  }
+
   protected function getDefaultValue() {
     return array();
   }
@@ -23,11 +33,12 @@ final class PhabricatorSearchCheckboxesField
       return array();
     }
 
-    return $value;
+    return $this->getCanonicalValue($value);
   }
 
   protected function getValueFromRequest(AphrontRequest $request, $key) {
-    return $this->getListFromRequest($request, $key);
+    $value = $this->getListFromRequest($request, $key);
+    return $this->getCanonicalValue($value);
   }
 
   protected function newControl() {
@@ -58,7 +69,29 @@ final class PhabricatorSearchCheckboxesField
         ->setValue($option);
     }
 
+    foreach ($this->getDeprecatedOptions() as $key => $value) {
+      $list[] = id(new ConduitConstantDescription())
+        ->setKey($key)
+        ->setIsDeprecated(true)
+        ->setValue(pht('Deprecated alias for "%s".', $value));
+    }
+
     return $list;
   }
 
+  private function getCanonicalValue(array $values) {
+    // Always map the current normal options to themselves.
+    $normal_options = array_fuse(array_keys($this->getOptions()));
+
+    // Map deprecated values to their new values.
+    $deprecated_options = $this->getDeprecatedOptions();
+
+    $map = $normal_options + $deprecated_options;
+    foreach ($values as $key => $value) {
+      $values[$key] = idx($map, $value, $value);
+    }
+
+    return $values;
+  }
+
 }

From 185e72c881cfa9a99af4a259fcfbf1010b4979e5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 10 Sep 2018 14:32:55 -0700
Subject: [PATCH 084/125] Add aural section headers for "Event Timeline", "Add
 Comment", and "Comment Preview"

Summary: See PHI871. Ref T13197. These sections are only divided visually and don't have textual headers. Add aural headers.

Test Plan: {F5875471}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19654
---
 resources/celerity/map.php                    | 22 +++++++++----------
 ...bricatorApplicationTransactionResponse.php |  8 +++++++
 ...catorApplicationTransactionCommentView.php |  7 ++++++
 src/view/phui/PHUITimelineView.php            | 10 ++++++++-
 .../transactions/behavior-comment-actions.js  |  1 +
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d3a9a1a34f..39fe047f19 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -423,7 +423,7 @@ return array(
     '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',
-    'rsrc/js/application/transactions/behavior-comment-actions.js' => '54110499',
+    'rsrc/js/application/transactions/behavior-comment-actions.js' => '038bf27f',
     'rsrc/js/application/transactions/behavior-reorder-configs.js' => 'd7a74243',
     'rsrc/js/application/transactions/behavior-reorder-fields.js' => 'b59e1e96',
     'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '8f29b364',
@@ -575,7 +575,7 @@ return array(
     'javelin-behavior-bulk-job-reload' => 'edf8a145',
     'javelin-behavior-calendar-month-view' => 'fe33e256',
     'javelin-behavior-choose-control' => '327a00d1',
-    'javelin-behavior-comment-actions' => '54110499',
+    'javelin-behavior-comment-actions' => '038bf27f',
     'javelin-behavior-config-reorder-fields' => 'b6993408',
     'javelin-behavior-conpherence-menu' => '4047cd35',
     'javelin-behavior-conpherence-participant-pane' => 'd057e45a',
@@ -905,6 +905,15 @@ return array(
       'javelin-behavior',
       'javelin-uri',
     ),
+    '038bf27f' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-dom',
+      'phuix-form-control-view',
+      'phuix-icon-view',
+      'javelin-behavior-phabricator-gesture',
+    ),
     '040fce04' => array(
       'javelin-behavior',
       'javelin-request',
@@ -1251,15 +1260,6 @@ return array(
       'javelin-vector',
       'javelin-typeahead-static-source',
     ),
-    54110499 => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-dom',
-      'phuix-form-control-view',
-      'phuix-icon-view',
-      'javelin-behavior-phabricator-gesture',
-    ),
     '549459b8' => array(
       'javelin-behavior',
     ),
diff --git a/src/applications/transactions/response/PhabricatorApplicationTransactionResponse.php b/src/applications/transactions/response/PhabricatorApplicationTransactionResponse.php
index 08e6ec464b..43a2fbc1b5 100644
--- a/src/applications/transactions/response/PhabricatorApplicationTransactionResponse.php
+++ b/src/applications/transactions/response/PhabricatorApplicationTransactionResponse.php
@@ -83,7 +83,15 @@ final class PhabricatorApplicationTransactionResponse
       $xactions[$key] = hsprintf('%s', $xaction);
     }
 
+    $aural = phutil_tag(
+      'h3',
+      array(
+        'class' => 'aural-only',
+      ),
+      pht('Comment Preview'));
+
     $content = array(
+      'header' => hsprintf('%s', $aural),
       'xactions' => $xactions,
       'spacer' => PHUITimelineView::renderSpacer(),
       'previewContent' => hsprintf('%s', $this->getPreviewContent()),
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
index 7469004e1b..fcdc2fcb31 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -245,6 +245,13 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
       ->setFlush(true)
       ->addClass('phui-comment-form-view')
       ->addSigil('phui-comment-form')
+      ->appendChild(
+        phutil_tag(
+          'h3',
+          array(
+            'class' => 'aural-only',
+          ),
+          pht('Add Comment')))
       ->appendChild($image)
       ->appendChild($badge_view)
       ->appendChild($wedge)
diff --git a/src/view/phui/PHUITimelineView.php b/src/view/phui/PHUITimelineView.php
index 804b060d55..3353a2e2bd 100644
--- a/src/view/phui/PHUITimelineView.php
+++ b/src/view/phui/PHUITimelineView.php
@@ -83,7 +83,15 @@ final class PHUITimelineView extends AphrontView {
         'class' => 'phui-timeline-view',
         'id' => $this->id,
       ),
-      $events);
+      array(
+        phutil_tag(
+          'h3',
+          array(
+            'class' => 'aural-only',
+          ),
+          pht('Event Timeline')),
+        $events,
+      ));
   }
 
   public function buildEvents() {
diff --git a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
index 3bfcd6c8d5..9cec374f6b 100644
--- a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
+++ b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
@@ -105,6 +105,7 @@ JX.behavior('comment-actions', function(config) {
       JX.DOM.setContent(
         preview_root,
         [
+          JX.$H(response.header),
           JX.$H(response.xactions.join('')),
           JX.$H(response.previewContent)
         ]);

From 2379c21fbbd1b4309fe78de98de814bff905b1f2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 08:10:38 -0700
Subject: [PATCH 085/125] Give Phriction documents a normal timeline

Summary:
Ref T13077. See PHI840. Ref T1894. I'm planning to just let you comment on Phriction documents. I think this will create a few problems (e.g., around popular documents which collect long comment threads that are eventually obsolete) but nothing should be too terribly critical (e.g., we handle it gracefully when objects have very large number of comments/transactions) and for most documents this is likely just a net improvement.

"Just enable comments" is probably not the final iteration on this, but I think it's probably a step forward on the balance, not a step sideways or a slippery slope down into a dark hole or anything.

Test Plan: {F5877316}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13077, T1894

Differential Revision: https://secure.phabricator.com/D19659
---
 .../controller/PhrictionDocumentController.php   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index f2cf974504..3cdcf7230c 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -348,6 +348,10 @@ final class PhrictionDocumentController
       $page_content->setCurtain($curtain);
     }
 
+    $timeline = $this->buildTransactionTimeline(
+      $document,
+      new PhrictionTransactionQuery());
+
     return $this->newPage()
       ->setTitle($page_title)
       ->setCrumbs($crumbs)
@@ -356,7 +360,15 @@ final class PhrictionDocumentController
         array(
           $page_content,
           $prop_list,
-          $children,
+          phutil_tag(
+            'div',
+            array(
+              'class' => 'phui-document-view-pro-box',
+            ),
+            array(
+              $children,
+              $timeline,
+            )),
         ));
 
   }
@@ -600,7 +612,7 @@ final class PhrictionDocumentController
           ),
           $list)));
 
-     return phutil_tag_div('phui-document-view-pro-box', $box);
+    return $box;
   }
 
   private function renderChildDocumentLink(array $info) {

From cc3b6d57907b7dc85a990a75ca5469353ac6fe49 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 12 Sep 2018 12:05:21 -0700
Subject: [PATCH 086/125] Fix a "withHasTransactions()" typo in AuditEditor

Summary: See <https://discourse.phabricator-community.org/t/typo-in-phabricatorauditeditor-php/1910>. This is trivial and reproduces easily, I just missed it in testing.

Test Plan:
  - Left a comment on a commit which I was the author of.
  - Before change: fatal with obvious typo.
  - After change: smooth sailing.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D19667
---
 src/applications/audit/editor/PhabricatorAuditEditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
index d5c22fba6b..cfa84b8bd7 100644
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -275,7 +275,7 @@ final class PhabricatorAuditEditor
 
           if ($actor_is_author) {
             $inlines[] = id(clone $query)
-              ->withHasTransaciton(true)
+              ->withHasTransaction(true)
               ->execute();
           }
 

From 09703938fb44b659fba28c18711ddc0870ba7032 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 10 Sep 2018 12:48:13 -0700
Subject: [PATCH 087/125] Migrate old commit saved queries to new audit status
 constants

Summary: Depends on D19651. Ref T13197. The application now accepts either numeric or string values. However, for consistency and to reduce surprise in the future, migrate existing saved queries to use string values.

Test Plan: Saved some queries on `master` with numeric constants, ran the migration, saw string constants in the database and equivalent behavior in the UI.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19652
---
 .../20180910.audit.01.searches.php            | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 resources/sql/autopatches/20180910.audit.01.searches.php

diff --git a/resources/sql/autopatches/20180910.audit.01.searches.php b/resources/sql/autopatches/20180910.audit.01.searches.php
new file mode 100644
index 0000000000..f68e76fe45
--- /dev/null
+++ b/resources/sql/autopatches/20180910.audit.01.searches.php
@@ -0,0 +1,54 @@
+<?php
+
+$table = new PhabricatorSavedQuery();
+$conn = $table->establishConnection('w');
+
+$status_map = array(
+  0 => 'none',
+  1 => 'needs-audit',
+  2 => 'concern-raised',
+  3 => 'partially-audited',
+  4 => 'audited',
+  5 => 'needs-verification',
+);
+
+foreach (new LiskMigrationIterator($table) as $query) {
+  if ($query->getEngineClassName() !== 'PhabricatorCommitSearchEngine') {
+    continue;
+  }
+
+  $parameters = $query->getParameters();
+  $status = idx($parameters, 'statuses');
+
+  if (!$status) {
+    // No saved "status" constraint.
+    continue;
+  }
+
+  if (!is_array($status)) {
+    // Saved constraint isn't a list.
+    continue;
+  }
+
+  // Migrate old integer values to new string values.
+  $old_status = $status;
+  foreach ($status as $key => $value) {
+    if (is_numeric($value)) {
+      $status[$key] = $status_map[$value];
+    }
+  }
+
+  if ($status === $old_status) {
+    // Nothing changed.
+    continue;
+  }
+
+  $parameters['statuses'] = $status;
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET parameters = %s WHERE id = %d',
+    $table->getTableName(),
+    phutil_json_encode($parameters),
+    $query->getID());
+}

From d63281cc549e27978ec8ff6a4e2cbc1a157c93ee Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 10 Sep 2018 13:01:37 -0700
Subject: [PATCH 088/125] Migrate remaining Audit database status constants

Summary: Depends on D19652. Ref T13197. See PHI851. This migrates the actual `auditStatus` on Commits, and older status transactions.

Test Plan:
  - Ran migrations.
  - Spot-checked the database for sanity.
  - Ran some different queries, got unchanged results from before migration.
  - Reviewed historic audit state transactions, and accepted/raised concern on new audits. All state transactions appeared to generate properly.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19655
---
 .../autopatches/20180910.audit.02.string.sql  |  2 +
 .../autopatches/20180910.audit.03.status.php  | 28 +++++++++++
 .../20180910.audit.04.xactions.php            | 48 +++++++++++++++++++
 .../PhabricatorAuditCommitStatusConstants.php | 25 +++++-----
 .../diffusion/query/DiffusionCommitQuery.php  | 10 ++--
 .../DiffusionCommitConcernTransaction.php     |  2 +-
 .../DiffusionCommitStateTransaction.php       |  2 +-
 .../DiffusionCommitVerifyTransaction.php      |  2 +-
 .../storage/PhabricatorRepositoryCommit.php   | 20 ++++----
 9 files changed, 107 insertions(+), 32 deletions(-)
 create mode 100644 resources/sql/autopatches/20180910.audit.02.string.sql
 create mode 100644 resources/sql/autopatches/20180910.audit.03.status.php
 create mode 100644 resources/sql/autopatches/20180910.audit.04.xactions.php

diff --git a/resources/sql/autopatches/20180910.audit.02.string.sql b/resources/sql/autopatches/20180910.audit.02.string.sql
new file mode 100644
index 0000000000..4caa4a1724
--- /dev/null
+++ b/resources/sql/autopatches/20180910.audit.02.string.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_commit
+  CHANGE auditStatus auditStatus VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20180910.audit.03.status.php b/resources/sql/autopatches/20180910.audit.03.status.php
new file mode 100644
index 0000000000..b7a0bf9f58
--- /dev/null
+++ b/resources/sql/autopatches/20180910.audit.03.status.php
@@ -0,0 +1,28 @@
+<?php
+
+$table = new PhabricatorRepositoryCommit();
+$conn = $table->establishConnection('w');
+
+$status_map = array(
+  0 => 'none',
+  1 => 'needs-audit',
+  2 => 'concern-raised',
+  3 => 'partially-audited',
+  4 => 'audited',
+  5 => 'needs-verification',
+);
+
+foreach (new LiskMigrationIterator($table) as $commit) {
+  $status = $commit->getAuditStatus();
+
+  if (!isset($status_map[$status])) {
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET auditStatus = %s WHERE id = %d',
+    $table->getTableName(),
+    $status_map[$status],
+    $commit->getID());
+}
diff --git a/resources/sql/autopatches/20180910.audit.04.xactions.php b/resources/sql/autopatches/20180910.audit.04.xactions.php
new file mode 100644
index 0000000000..1ecf9ef320
--- /dev/null
+++ b/resources/sql/autopatches/20180910.audit.04.xactions.php
@@ -0,0 +1,48 @@
+<?php
+
+$table = new PhabricatorAuditTransaction();
+$conn = $table->establishConnection('w');
+
+$status_map = array(
+  0 => 'none',
+  1 => 'needs-audit',
+  2 => 'concern-raised',
+  3 => 'partially-audited',
+  4 => 'audited',
+  5 => 'needs-verification',
+);
+
+$state_type = DiffusionCommitStateTransaction::TRANSACTIONTYPE;
+
+foreach (new LiskMigrationIterator($table) as $xaction) {
+  if ($xaction->getTransactionType() !== $state_type) {
+    continue;
+  }
+
+  $old_value = $xaction->getOldValue();
+  $new_value = $xaction->getNewValue();
+
+  $any_change = false;
+
+  if (isset($status_map[$old_value])) {
+    $old_value = $status_map[$old_value];
+    $any_change = true;
+  }
+
+  if (isset($status_map[$new_value])) {
+    $new_value = $status_map[$new_value];
+    $any_change = true;
+  }
+
+  if (!$any_change) {
+    continue;
+  }
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET oldValue = %s, newValue = %s WHERE id = %d',
+    $table->getTableName(),
+    phutil_json_encode($old_value),
+    phutil_json_encode($new_value),
+    $xaction->getID());
+}
diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
index eca420ce1b..23964920b7 100644
--- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
@@ -19,18 +19,21 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
   const MODERN_AUDITED = 'audited';
   const MODERN_NEEDS_VERIFICATION = 'needs-verification';
 
-  public static function newForLegacyStatus($status) {
+  public static function newModernKeys(array $values) {
     $map = self::getMap();
 
-    if (is_int($status) || ctype_digit($status)) {
-      foreach ($map as $key => $spec) {
-        if ((int)idx($spec, 'legacy') === (int)$status) {
-          return self::newForStatus($key);
-        }
+    $modern = array();
+    foreach ($map as $key => $spec) {
+      if (isset($spec['legacy'])) {
+        $modern[$spec['legacy']] = $key;
       }
     }
 
-    return self::newForStatus($status);
+    foreach ($values as $key => $value) {
+      $values[$key] = idx($modern, $value, $value);
+    }
+
+    return $values;
   }
 
   public static function newForStatus($status) {
@@ -58,10 +61,6 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
     return idx($this->spec, 'color');
   }
 
-  public function getLegacyKey() {
-    return idx($this->spec, 'legacy');
-  }
-
   public function getName() {
     return idx($this->spec, 'name', pht('Unknown ("%s")', $this->key));
   }
@@ -96,9 +95,9 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
 
   public static function getOpenStatusConstants() {
     $constants = array();
-    foreach (self::getMap() as $map) {
+    foreach (self::getMap() as $key => $map) {
       if (!$map['closed']) {
-        $constants[] = $map['legacy'];
+        $constants[] = $key;
       }
     }
     return $constants;
diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
index 9a7e21b0af..0a50e834c3 100644
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -714,16 +714,12 @@ final class DiffusionCommitQuery
     }
 
     if ($this->statuses !== null) {
-      $statuses = array();
-      foreach ($this->statuses as $status) {
-        $object = PhabricatorAuditCommitStatusConstants::newForLegacyStatus(
-          $status);
-        $statuses[] = $object->getLegacyKey();
-      }
+      $statuses = PhabricatorAuditCommitStatusConstants::newModernKeys(
+        $this->statuses);
 
       $where[] = qsprintf(
         $conn,
-        'commit.auditStatus IN (%Ld)',
+        'commit.auditStatus IN (%Ls)',
         $statuses);
     }
 
diff --git a/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
index 07194a2af3..21d688a481 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
@@ -34,7 +34,7 @@ final class DiffusionCommitConcernTransaction
     // NOTE: We force the commit directly into "Concern Raised" so that we
     // override a possible "Needs Verification" state.
     $object->setAuditStatus(
-      PhabricatorAuditCommitStatusConstants::CONCERN_RAISED);
+      PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED);
   }
 
   public function applyExternalEffects($object, $value) {
diff --git a/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
index bcf6a9e382..ad8b94f548 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
@@ -13,7 +13,7 @@ final class DiffusionCommitStateTransaction
 
   private function getAuditStatusObject() {
     $new = $this->getNewValue();
-    return PhabricatorAuditCommitStatusConstants::newForLegacyStatus($new);
+    return PhabricatorAuditCommitStatusConstants::newForStatus($new);
   }
 
   public function getIcon() {
diff --git a/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
index 3e6abb705f..5464df7fa1 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
@@ -37,7 +37,7 @@ final class DiffusionCommitVerifyTransaction
 
   public function applyInternalEffects($object, $value) {
     $object->setAuditStatus(
-      PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION);
+      PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 291c895231..7b9f38c388 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -27,7 +27,7 @@ final class PhabricatorRepositoryCommit
   protected $epoch;
   protected $mailKey;
   protected $authorPHID;
-  protected $auditStatus = PhabricatorAuditCommitStatusConstants::NONE;
+  protected $auditStatus = PhabricatorAuditCommitStatusConstants::MODERN_NONE;
   protected $summary = '';
   protected $importStatus = 0;
 
@@ -120,7 +120,7 @@ final class PhabricatorRepositoryCommit
         'authorPHID' => 'phid?',
         'authorIdentityPHID' => 'phid?',
         'committerIdentityPHID' => 'phid?',
-        'auditStatus' => 'uint32',
+        'auditStatus' => 'text32',
         'summary' => 'text255',
         'importStatus' => 'uint32',
       ),
@@ -385,20 +385,22 @@ final class PhabricatorRepositoryCommit
       if ($this->isAuditStatusNeedsVerification()) {
         // If the change is in "Needs Verification", we keep it there as
         // long as any auditors still have concerns.
-        $status = PhabricatorAuditCommitStatusConstants::NEEDS_VERIFICATION;
+        $status =
+          PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION;
       } else {
-        $status = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
+        $status = PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED;
       }
     } else if ($any_accept) {
       if ($any_need) {
-        $status = PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED;
+        $status =
+          PhabricatorAuditCommitStatusConstants::MODERN_PARTIALLY_AUDITED;
       } else {
-        $status = PhabricatorAuditCommitStatusConstants::FULLY_AUDITED;
+        $status = PhabricatorAuditCommitStatusConstants::MODERN_AUDITED;
       }
     } else if ($any_need) {
-      $status = PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT;
+      $status = PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT;
     } else {
-      $status = PhabricatorAuditCommitStatusConstants::NONE;
+      $status = PhabricatorAuditCommitStatusConstants::MODERN_NONE;
     }
 
     return $this->setAuditStatus($status);
@@ -529,7 +531,7 @@ final class PhabricatorRepositoryCommit
 
   public function getAuditStatusObject() {
     $status = $this->getAuditStatus();
-    return PhabricatorAuditCommitStatusConstants::newForLegacyStatus($status);
+    return PhabricatorAuditCommitStatusConstants::newForStatus($status);
   }
 
   public function isAuditStatusNoAudit() {

From aaf22695515a3b2496f6763866b7856d32820121 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 07:13:08 -0700
Subject: [PATCH 089/125] Remove legacy numeric Audit status constants

Summary: Depends on D19655. Ref T13197. These no longer have callers.

Test Plan: Grepped for these constants.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19656
---
 .../PhabricatorAuditCommitStatusConstants.php | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
index 23964920b7..98b8324a38 100644
--- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
@@ -5,13 +5,6 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
   private $key;
   private $spec = array();
 
-  const NONE                = 0;
-  const NEEDS_AUDIT         = 1;
-  const CONCERN_RAISED      = 2;
-  const PARTIALLY_AUDITED   = 3;
-  const FULLY_AUDITED       = 4;
-  const NEEDS_VERIFICATION = 5;
-
   const MODERN_NONE = 'none';
   const MODERN_NEEDS_AUDIT = 'needs-audit';
   const MODERN_CONCERN_RAISED = 'concern-raised';
@@ -125,42 +118,42 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
     return array(
       self::MODERN_NONE => array(
         'name' => pht('No Audits'),
-        'legacy' => self::NONE,
+        'legacy' => 0,
         'icon' => 'fa-check',
         'color' => 'bluegrey',
         'closed' => true,
       ),
       self::MODERN_NEEDS_AUDIT => array(
         'name' => pht('Audit Required'),
-        'legacy' => self::NEEDS_AUDIT,
+        'legacy' => 1,
         'icon' => 'fa-exclamation-circle',
         'color' => 'orange',
         'closed' => false,
       ),
       self::MODERN_CONCERN_RAISED => array(
         'name' => pht('Concern Raised'),
-        'legacy' => self::CONCERN_RAISED,
+        'legacy' => 2,
         'icon' => 'fa-times-circle',
         'color' => 'red',
         'closed' => false,
       ),
       self::MODERN_PARTIALLY_AUDITED => array(
         'name' => pht('Partially Audited'),
-        'legacy' => self::PARTIALLY_AUDITED,
+        'legacy' => 3,
         'icon' => 'fa-check-circle-o',
         'color' => 'yellow',
         'closed' => false,
       ),
       self::MODERN_AUDITED => array(
         'name' => pht('Audited'),
-        'legacy' => self::FULLY_AUDITED,
+        'legacy' => 4,
         'icon' => 'fa-check-circle',
         'color' => 'green',
         'closed' => true,
       ),
       self::MODERN_NEEDS_VERIFICATION => array(
         'name' => pht('Needs Verification'),
-        'legacy' => self::NEEDS_VERIFICATION,
+        'legacy' => 5,
         'icon' => 'fa-refresh',
         'color' => 'indigo',
         'closed' => false,

From c7e7b63f155f22d4e1915f81584338dfb8631733 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 07:19:37 -0700
Subject: [PATCH 090/125] Rename "PhabricatorAuditCommitStatusConstants" to
 "DiffusionCommitAuditStatus"; remove "MODERN_"

Summary:
Depends on D19656. Ref T13197. See PHI851.

  - This class is now a real object, so get rid of the "Constants" part of the name.
  - Rename it for greater consistency with other modern objects.
  - Get rid of the `MODERN_` tag now that the old constants are gone.

Test Plan: Bunch of `grep`, browsed around.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19657
---
 src/__phutil_library_map__.php                |  4 +-
 .../conduit/AuditQueryConduitAPIMethod.php    | 10 ++---
 .../query/PhabricatorCommitSearchEngine.php   |  6 +--
 .../DiffusionCommitAuditStatus.php}           | 38 +++++++++----------
 .../diffusion/query/DiffusionCommitQuery.php  |  2 +-
 .../DiffusionCommitConcernTransaction.php     |  3 +-
 .../DiffusionCommitStateTransaction.php       | 22 +++++------
 .../DiffusionCommitVerifyTransaction.php      |  3 +-
 .../PhabricatorOwnersDetailController.php     |  3 +-
 .../storage/PhabricatorRepositoryCommit.php   | 18 ++++-----
 10 files changed, 52 insertions(+), 57 deletions(-)
 rename src/applications/{audit/constants/PhabricatorAuditCommitStatusConstants.php => diffusion/DiffusionCommitAuditStatus.php} (76%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 9774741060..ab454e0455 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -704,6 +704,7 @@ phutil_register_library_map(array(
     'DiffusionCommitAcceptTransaction' => 'applications/diffusion/xaction/DiffusionCommitAcceptTransaction.php',
     'DiffusionCommitActionTransaction' => 'applications/diffusion/xaction/DiffusionCommitActionTransaction.php',
     'DiffusionCommitAffectedFilesHeraldField' => 'applications/diffusion/herald/DiffusionCommitAffectedFilesHeraldField.php',
+    'DiffusionCommitAuditStatus' => 'applications/diffusion/DiffusionCommitAuditStatus.php',
     'DiffusionCommitAuditTransaction' => 'applications/diffusion/xaction/DiffusionCommitAuditTransaction.php',
     'DiffusionCommitAuditorsHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php',
     'DiffusionCommitAuditorsTransaction' => 'applications/diffusion/xaction/DiffusionCommitAuditorsTransaction.php',
@@ -2147,7 +2148,6 @@ phutil_register_library_map(array(
     'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php',
     'PhabricatorAuditApplication' => 'applications/audit/application/PhabricatorAuditApplication.php',
     'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php',
-    'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/PhabricatorAuditCommitStatusConstants.php',
     'PhabricatorAuditController' => 'applications/audit/controller/PhabricatorAuditController.php',
     'PhabricatorAuditEditor' => 'applications/audit/editor/PhabricatorAuditEditor.php',
     'PhabricatorAuditInlineComment' => 'applications/audit/storage/PhabricatorAuditInlineComment.php',
@@ -6066,6 +6066,7 @@ phutil_register_library_map(array(
     'DiffusionCommitAcceptTransaction' => 'DiffusionCommitAuditTransaction',
     'DiffusionCommitActionTransaction' => 'DiffusionCommitTransactionType',
     'DiffusionCommitAffectedFilesHeraldField' => 'DiffusionCommitHeraldField',
+    'DiffusionCommitAuditStatus' => 'Phobject',
     'DiffusionCommitAuditTransaction' => 'DiffusionCommitActionTransaction',
     'DiffusionCommitAuditorsHeraldField' => 'DiffusionCommitHeraldField',
     'DiffusionCommitAuditorsTransaction' => 'DiffusionCommitTransactionType',
@@ -7715,7 +7716,6 @@ phutil_register_library_map(array(
     'PhabricatorAuditActionConstants' => 'Phobject',
     'PhabricatorAuditApplication' => 'PhabricatorApplication',
     'PhabricatorAuditCommentEditor' => 'PhabricatorEditor',
-    'PhabricatorAuditCommitStatusConstants' => 'Phobject',
     'PhabricatorAuditController' => 'PhabricatorController',
     'PhabricatorAuditEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorAuditInlineComment' => array(
diff --git a/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php b/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
index 6d29d2345d..d0d3779c2a 100644
--- a/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
+++ b/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
@@ -68,17 +68,17 @@ final class AuditQueryConduitAPIMethod extends AuditConduitAPIMethod {
 
     $status_map = array(
       self::AUDIT_LEGACYSTATUS_OPEN => array(
-        PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT,
-        PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED,
+        DiffusionCommitAuditStatus::NEEDS_AUDIT,
+        DiffusionCommitAuditStatus::CONCERN_RAISED,
       ),
       self::AUDIT_LEGACYSTATUS_CONCERN => array(
-        PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED,
+        DiffusionCommitAuditStatus::CONCERN_RAISED,
       ),
       self::AUDIT_LEGACYSTATUS_ACCEPTED => array(
-        PhabricatorAuditCommitStatusConstants::MODERN_AUDITED,
+        DiffusionCommitAuditStatus::AUDITED,
       ),
       self::AUDIT_LEGACYSTATUS_PARTIAL => array(
-        PhabricatorAuditCommitStatusConstants::MODERN_PARTIALLY_AUDITED,
+        DiffusionCommitAuditStatus::PARTIALLY_AUDITED,
       ),
     );
 
diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
index 67861b7e7d..44413946db 100644
--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
@@ -92,9 +92,9 @@ final class PhabricatorCommitSearchEngine
         ->setLabel(pht('Audit Status'))
         ->setKey('statuses')
         ->setAliases(array('status'))
-        ->setOptions(PhabricatorAuditCommitStatusConstants::newOptions())
+        ->setOptions(DiffusionCommitAuditStatus::newOptions())
         ->setDeprecatedOptions(
-          PhabricatorAuditCommitStatusConstants::newDeprecatedOptions())
+          DiffusionCommitAuditStatus::newDeprecatedOptions())
         ->setDescription(pht('Find commits with given audit statuses.')),
       id(new PhabricatorSearchDatasourceField())
         ->setLabel(pht('Repositories'))
@@ -162,7 +162,7 @@ final class PhabricatorCommitSearchEngine
       case 'active':
         $bucket_key = DiffusionCommitRequiredActionResultBucket::BUCKETKEY;
 
-        $open = PhabricatorAuditCommitStatusConstants::getOpenStatusConstants();
+        $open = DiffusionCommitAuditStatus::getOpenStatusConstants();
 
         $query
           ->setParameter('responsiblePHIDs', array($viewer_phid))
diff --git a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php b/src/applications/diffusion/DiffusionCommitAuditStatus.php
similarity index 76%
rename from src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
rename to src/applications/diffusion/DiffusionCommitAuditStatus.php
index 98b8324a38..ce8ec09d27 100644
--- a/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
+++ b/src/applications/diffusion/DiffusionCommitAuditStatus.php
@@ -1,16 +1,16 @@
 <?php
 
-final class PhabricatorAuditCommitStatusConstants extends Phobject {
+final class DiffusionCommitAuditStatus extends Phobject {
 
   private $key;
   private $spec = array();
 
-  const MODERN_NONE = 'none';
-  const MODERN_NEEDS_AUDIT = 'needs-audit';
-  const MODERN_CONCERN_RAISED = 'concern-raised';
-  const MODERN_PARTIALLY_AUDITED = 'partially-audited';
-  const MODERN_AUDITED = 'audited';
-  const MODERN_NEEDS_VERIFICATION = 'needs-verification';
+  const NONE = 'none';
+  const NEEDS_AUDIT = 'needs-audit';
+  const CONCERN_RAISED = 'concern-raised';
+  const PARTIALLY_AUDITED = 'partially-audited';
+  const AUDITED = 'audited';
+  const NEEDS_VERIFICATION = 'needs-verification';
 
   public static function newModernKeys(array $values) {
     $map = self::getMap();
@@ -59,27 +59,27 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
   }
 
   public function isNoAudit() {
-    return ($this->key == self::MODERN_NONE);
+    return ($this->key == self::NONE);
   }
 
   public function isNeedsAudit() {
-    return ($this->key == self::MODERN_NEEDS_AUDIT);
+    return ($this->key == self::NEEDS_AUDIT);
   }
 
   public function isConcernRaised() {
-    return ($this->key == self::MODERN_CONCERN_RAISED);
+    return ($this->key == self::CONCERN_RAISED);
   }
 
   public function isNeedsVerification() {
-    return ($this->key == self::MODERN_NEEDS_VERIFICATION);
+    return ($this->key == self::NEEDS_VERIFICATION);
   }
 
   public function isPartiallyAudited() {
-    return ($this->key == self::MODERN_PARTIALLY_AUDITED);
+    return ($this->key == self::PARTIALLY_AUDITED);
   }
 
   public function isAudited() {
-    return ($this->key == self::MODERN_AUDITED);
+    return ($this->key == self::AUDITED);
   }
 
   public function getIsClosed() {
@@ -116,42 +116,42 @@ final class PhabricatorAuditCommitStatusConstants extends Phobject {
 
   private static function getMap() {
     return array(
-      self::MODERN_NONE => array(
+      self::NONE => array(
         'name' => pht('No Audits'),
         'legacy' => 0,
         'icon' => 'fa-check',
         'color' => 'bluegrey',
         'closed' => true,
       ),
-      self::MODERN_NEEDS_AUDIT => array(
+      self::NEEDS_AUDIT => array(
         'name' => pht('Audit Required'),
         'legacy' => 1,
         'icon' => 'fa-exclamation-circle',
         'color' => 'orange',
         'closed' => false,
       ),
-      self::MODERN_CONCERN_RAISED => array(
+      self::CONCERN_RAISED => array(
         'name' => pht('Concern Raised'),
         'legacy' => 2,
         'icon' => 'fa-times-circle',
         'color' => 'red',
         'closed' => false,
       ),
-      self::MODERN_PARTIALLY_AUDITED => array(
+      self::PARTIALLY_AUDITED => array(
         'name' => pht('Partially Audited'),
         'legacy' => 3,
         'icon' => 'fa-check-circle-o',
         'color' => 'yellow',
         'closed' => false,
       ),
-      self::MODERN_AUDITED => array(
+      self::AUDITED => array(
         'name' => pht('Audited'),
         'legacy' => 4,
         'icon' => 'fa-check-circle',
         'color' => 'green',
         'closed' => true,
       ),
-      self::MODERN_NEEDS_VERIFICATION => array(
+      self::NEEDS_VERIFICATION => array(
         'name' => pht('Needs Verification'),
         'legacy' => 5,
         'icon' => 'fa-refresh',
diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
index 0a50e834c3..f2d0920b3a 100644
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -714,7 +714,7 @@ final class DiffusionCommitQuery
     }
 
     if ($this->statuses !== null) {
-      $statuses = PhabricatorAuditCommitStatusConstants::newModernKeys(
+      $statuses = DiffusionCommitAuditStatus::newModernKeys(
         $this->statuses);
 
       $where[] = qsprintf(
diff --git a/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
index 21d688a481..1f6ae72621 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitConcernTransaction.php
@@ -33,8 +33,7 @@ final class DiffusionCommitConcernTransaction
   public function applyInternalEffects($object, $value) {
     // NOTE: We force the commit directly into "Concern Raised" so that we
     // override a possible "Needs Verification" state.
-    $object->setAuditStatus(
-      PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED);
+    $object->setAuditStatus(DiffusionCommitAuditStatus::CONCERN_RAISED);
   }
 
   public function applyExternalEffects($object, $value) {
diff --git a/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
index ad8b94f548..6fd2a6977d 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitStateTransaction.php
@@ -13,7 +13,7 @@ final class DiffusionCommitStateTransaction
 
   private function getAuditStatusObject() {
     $new = $this->getNewValue();
-    return PhabricatorAuditCommitStatusConstants::newForStatus($new);
+    return DiffusionCommitAuditStatus::newForStatus($new);
   }
 
   public function getIcon() {
@@ -28,15 +28,15 @@ final class DiffusionCommitStateTransaction
     $status = $this->getAuditStatusObject();
 
     switch ($status->getKey()) {
-      case PhabricatorAuditCommitStatusConstants::MODERN_NONE:
+      case DiffusionCommitAuditStatus::NONE:
         return pht('This commit no longer requires audit.');
-      case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT:
+      case DiffusionCommitAuditStatus::NEEDS_AUDIT:
         return pht('This commit now requires audit.');
-      case PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED:
+      case DiffusionCommitAuditStatus::CONCERN_RAISED:
         return pht('This commit now has outstanding concerns.');
-      case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION:
+      case DiffusionCommitAuditStatus::NEEDS_VERIFICATION:
         return pht('This commit now requires verification by auditors.');
-      case PhabricatorAuditCommitStatusConstants::MODERN_AUDITED:
+      case DiffusionCommitAuditStatus::AUDITED:
         return pht('All concerns with this commit have now been addressed.');
     }
 
@@ -47,23 +47,23 @@ final class DiffusionCommitStateTransaction
     $status = $this->getAuditStatusObject();
 
     switch ($status->getKey()) {
-      case PhabricatorAuditCommitStatusConstants::MODERN_NONE:
+      case DiffusionCommitAuditStatus::NONE:
         return pht(
           '%s no longer requires audit.',
           $this->renderObject());
-      case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT:
+      case DiffusionCommitAuditStatus::NEEDS_AUDIT:
         return pht(
           '%s now requires audit.',
           $this->renderObject());
-      case PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED:
+      case DiffusionCommitAuditStatus::CONCERN_RAISED:
         return pht(
           '%s now has outstanding concerns.',
           $this->renderObject());
-      case PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION:
+      case DiffusionCommitAuditStatus::NEEDS_VERIFICATION:
         return pht(
           '%s now requires verification by auditors.',
           $this->renderObject());
-      case PhabricatorAuditCommitStatusConstants::MODERN_AUDITED:
+      case DiffusionCommitAuditStatus::AUDITED:
         return pht(
           'All concerns with %s have now been addressed.',
           $this->renderObject());
diff --git a/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
index 5464df7fa1..f1ec5834b1 100644
--- a/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
+++ b/src/applications/diffusion/xaction/DiffusionCommitVerifyTransaction.php
@@ -36,8 +36,7 @@ final class DiffusionCommitVerifyTransaction
   }
 
   public function applyInternalEffects($object, $value) {
-    $object->setAuditStatus(
-      PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION);
+    $object->setAuditStatus(DiffusionCommitAuditStatus::NEEDS_VERIFICATION);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
index bdc4a2e475..f71009cf19 100644
--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
@@ -71,8 +71,7 @@ final class PhabricatorOwnersDetailController
           'package' => $package->getPHID(),
         ));
 
-    $status_concern =
-      PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED;
+    $status_concern = DiffusionCommitAuditStatus::CONCERN_RAISED;
 
     $attention_commits = id(new DiffusionCommitQuery())
       ->setViewer($request->getUser())
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 7b9f38c388..38a6631200 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -27,7 +27,7 @@ final class PhabricatorRepositoryCommit
   protected $epoch;
   protected $mailKey;
   protected $authorPHID;
-  protected $auditStatus = PhabricatorAuditCommitStatusConstants::MODERN_NONE;
+  protected $auditStatus = DiffusionCommitAuditStatus::NONE;
   protected $summary = '';
   protected $importStatus = 0;
 
@@ -385,22 +385,20 @@ final class PhabricatorRepositoryCommit
       if ($this->isAuditStatusNeedsVerification()) {
         // If the change is in "Needs Verification", we keep it there as
         // long as any auditors still have concerns.
-        $status =
-          PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_VERIFICATION;
+        $status = DiffusionCommitAuditStatus::NEEDS_VERIFICATION;
       } else {
-        $status = PhabricatorAuditCommitStatusConstants::MODERN_CONCERN_RAISED;
+        $status = DiffusionCommitAuditStatus::CONCERN_RAISED;
       }
     } else if ($any_accept) {
       if ($any_need) {
-        $status =
-          PhabricatorAuditCommitStatusConstants::MODERN_PARTIALLY_AUDITED;
+        $status = DiffusionCommitAuditStatus::PARTIALLY_AUDITED;
       } else {
-        $status = PhabricatorAuditCommitStatusConstants::MODERN_AUDITED;
+        $status = DiffusionCommitAuditStatus::AUDITED;
       }
     } else if ($any_need) {
-      $status = PhabricatorAuditCommitStatusConstants::MODERN_NEEDS_AUDIT;
+      $status = DiffusionCommitAuditStatus::NEEDS_AUDIT;
     } else {
-      $status = PhabricatorAuditCommitStatusConstants::MODERN_NONE;
+      $status = DiffusionCommitAuditStatus::NONE;
     }
 
     return $this->setAuditStatus($status);
@@ -531,7 +529,7 @@ final class PhabricatorRepositoryCommit
 
   public function getAuditStatusObject() {
     $status = $this->getAuditStatus();
-    return PhabricatorAuditCommitStatusConstants::newForStatus($status);
+    return DiffusionCommitAuditStatus::newForStatus($status);
   }
 
   public function isAuditStatusNoAudit() {

From 8268abcb78803c03a4d1f7a7f82a3baf325c9d74 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 07:41:22 -0700
Subject: [PATCH 091/125] Enrich "diffusion.commit.search" with identity,
 status, and message information

Summary:
Depends on D19657. Ref T13197. See PHI841.

This enriches the results from `diffusion.commit.search` with information similar to the information returned by the "commits" attachment from `differential.diff.search`.

Also include unreachable, imported, message, audit status, and repository PHID.

Test Plan: Called `diffusion.commit.search` and reviewed the results, which looked sensible.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19658
---
 .../query/PhabricatorCommitSearchEngine.php   |  1 +
 .../diffusion/DiffusionCommitAuditStatus.php  | 10 ++
 .../storage/PhabricatorRepositoryCommit.php   | 98 ++++++++++++++++++-
 3 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
index 44413946db..ee5105f193 100644
--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
@@ -15,6 +15,7 @@ final class PhabricatorCommitSearchEngine
     return id(new DiffusionCommitQuery())
       ->needAuditRequests(true)
       ->needCommitData(true)
+      ->needIdentities(true)
       ->needDrafts(true);
   }
 
diff --git a/src/applications/diffusion/DiffusionCommitAuditStatus.php b/src/applications/diffusion/DiffusionCommitAuditStatus.php
index ce8ec09d27..95d0e52213 100644
--- a/src/applications/diffusion/DiffusionCommitAuditStatus.php
+++ b/src/applications/diffusion/DiffusionCommitAuditStatus.php
@@ -54,6 +54,10 @@ final class DiffusionCommitAuditStatus extends Phobject {
     return idx($this->spec, 'color');
   }
 
+  public function getAnsiColor() {
+    return idx($this->spec, 'color.ansi');
+  }
+
   public function getName() {
     return idx($this->spec, 'name', pht('Unknown ("%s")', $this->key));
   }
@@ -122,6 +126,7 @@ final class DiffusionCommitAuditStatus extends Phobject {
         'icon' => 'fa-check',
         'color' => 'bluegrey',
         'closed' => true,
+        'color.ansi' => null,
       ),
       self::NEEDS_AUDIT => array(
         'name' => pht('Audit Required'),
@@ -129,6 +134,7 @@ final class DiffusionCommitAuditStatus extends Phobject {
         'icon' => 'fa-exclamation-circle',
         'color' => 'orange',
         'closed' => false,
+        'color.ansi' => 'magenta',
       ),
       self::CONCERN_RAISED => array(
         'name' => pht('Concern Raised'),
@@ -136,6 +142,7 @@ final class DiffusionCommitAuditStatus extends Phobject {
         'icon' => 'fa-times-circle',
         'color' => 'red',
         'closed' => false,
+        'color.ansi' => 'red',
       ),
       self::PARTIALLY_AUDITED => array(
         'name' => pht('Partially Audited'),
@@ -143,6 +150,7 @@ final class DiffusionCommitAuditStatus extends Phobject {
         'icon' => 'fa-check-circle-o',
         'color' => 'yellow',
         'closed' => false,
+        'color.ansi' => 'yellow',
       ),
       self::AUDITED => array(
         'name' => pht('Audited'),
@@ -150,6 +158,7 @@ final class DiffusionCommitAuditStatus extends Phobject {
         'icon' => 'fa-check-circle',
         'color' => 'green',
         'closed' => true,
+        'color.ansi' => 'green',
       ),
       self::NEEDS_VERIFICATION => array(
         'name' => pht('Needs Verification'),
@@ -157,6 +166,7 @@ final class DiffusionCommitAuditStatus extends Phobject {
         'icon' => 'fa-refresh',
         'color' => 'indigo',
         'closed' => false,
+        'color.ansi' => 'magenta',
       ),
     );
   }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 38a6631200..0362aa778c 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -851,16 +851,110 @@ final class PhabricatorRepositoryCommit
         ->setKey('identifier')
         ->setType('string')
         ->setDescription(pht('The commit identifier.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('repositoryPHID')
+        ->setType('phid')
+        ->setDescription(pht('The repository this commit belongs to.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('author')
+        ->setType('map<string, wild>')
+        ->setDescription(pht('Information about the commit author.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('committer')
+        ->setType('map<string, wild>')
+        ->setDescription(pht('Information about the committer.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('isImported')
+        ->setType('bool')
+        ->setDescription(pht('True if the commit is fully imported.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('isUnreachable')
+        ->setType('bool')
+        ->setDescription(
+          pht(
+            'True if the commit is not the ancestor of any tag, branch, or '.
+            'ref.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('auditStatus')
+        ->setType('map<string, wild>')
+        ->setDescription(pht('Information about the current audit status.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('message')
+        ->setType('string')
+        ->setDescription(pht('The commit message.')),
     );
   }
 
   public function getFieldValuesForConduit() {
+    $data = $this->getCommitData();
 
-    // NOTE: This data should be similar to the information returned about
-    // commmits by "differential.diff.search" with the "commits" attachment.
+    $author_identity = $this->getAuthorIdentity();
+    if ($author_identity) {
+      $author_name = $author_identity->getIdentityDisplayName();
+      $author_email = $author_identity->getIdentityEmailAddress();
+      $author_raw = $author_identity->getIdentityName();
+      $author_identity_phid = $author_identity->getPHID();
+      $author_user_phid = $author_identity->getCurrentEffectiveUserPHID();
+    } else {
+      $author_name = null;
+      $author_email = null;
+      $author_raw = null;
+      $author_identity_phid = null;
+      $author_user_phid = null;
+    }
+
+    $committer_identity = $this->getCommitterIdentity();
+    if ($committer_identity) {
+      $committer_name = $committer_identity->getIdentityDisplayName();
+      $committer_email = $committer_identity->getIdentityEmailAddress();
+      $committer_raw = $committer_identity->getIdentityName();
+      $committer_identity_phid = $committer_identity->getPHID();
+      $committer_user_phid = $committer_identity->getCurrentEffectiveUserPHID();
+    } else {
+      $committer_name = null;
+      $committer_email = null;
+      $committer_raw = null;
+      $committer_identity_phid = null;
+      $committer_user_phid = null;
+    }
+
+    $author_epoch = $data->getCommitDetail('authorEpoch');
+    if ($author_epoch) {
+      $author_epoch = (int)$author_epoch;
+    } else {
+      $author_epoch = null;
+    }
+
+    $audit_status = $this->getAuditStatusObject();
 
     return array(
       'identifier' => $this->getCommitIdentifier(),
+      'repositoryPHID' => $this->getRepository()->getPHID(),
+      'author' => array(
+        'name' => $author_name,
+        'email' => $author_email,
+        'raw' => $author_raw,
+        'epoch' => $author_epoch,
+        'identityPHID' => $author_identity_phid,
+        'userPHID' => $author_user_phid,
+      ),
+      'committer' => array(
+        'name' => $committer_name,
+        'email' => $committer_email,
+        'raw' => $committer_raw,
+        'epoch' => (int)$this->getEpoch(),
+        'identityPHID' => $committer_identity_phid,
+        'userPHID' => $committer_user_phid,
+      ),
+      'isUnreachable' => (bool)$this->isUnreachable(),
+      'isImported' => (bool)$this->isImported(),
+      'auditStatus' => array(
+        'value' => $audit_status->getKey(),
+        'name' => $audit_status->getName(),
+        'closed' => (bool)$audit_status->getIsClosed(),
+        'color.ansi' => $audit_status->getAnsiColor(),
+      ),
+      'message' => $data->getCommitMessage(),
     );
   }
 

From f5e90a363e7a9444e871492bca4fa3b86a9b3cae Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 13:47:15 -0700
Subject: [PATCH 092/125] When a user takes actions while in a high security
 session, note it on the resulting transactions

Summary:
Ref T13197. See PHI873. Record when a user has MFA'd and add a little icon to the transaction, similar to the exiting "Silent" icon.

For now, this just makes this stuff more auditable. Future changes may add ways to require MFA for certain specific transactions, outside of the ones that already always require MFA (like revealing credentials).

Test Plan: {F5877960}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19665
---
 .../engine/PhabricatorAuthSessionEngine.php    |  3 +--
 .../auth/storage/PhabricatorAuthSession.php    | 16 ++++++++++++++++
 .../people/storage/PhabricatorUser.php         |  8 ++++++++
 ...PhabricatorApplicationTransactionEditor.php |  4 ++++
 .../PhabricatorApplicationTransaction.php      | 14 ++++++++++++++
 .../PhabricatorApplicationTransactionView.php  |  3 ++-
 src/view/phui/PHUITimelineEventView.php        | 18 ++++++++++++++++++
 7 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/applications/auth/engine/PhabricatorAuthSessionEngine.php b/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
index 82303fff2b..6e40cdde98 100644
--- a/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
@@ -490,8 +490,7 @@ final class PhabricatorAuthSessionEngine extends Phobject {
     PhabricatorAuthSession $session,
     $force = false) {
 
-    $until = $session->getHighSecurityUntil();
-    if ($until > time() || $force) {
+    if ($session->isHighSecuritySession() || $force) {
       return new PhabricatorAuthHighSecurityToken();
     }
 
diff --git a/src/applications/auth/storage/PhabricatorAuthSession.php b/src/applications/auth/storage/PhabricatorAuthSession.php
index b0b4996c93..cf707a053d 100644
--- a/src/applications/auth/storage/PhabricatorAuthSession.php
+++ b/src/applications/auth/storage/PhabricatorAuthSession.php
@@ -74,6 +74,22 @@ final class PhabricatorAuthSession extends PhabricatorAuthDAO
     }
   }
 
+  public function isHighSecuritySession() {
+    $until = $this->getHighSecurityUntil();
+
+    if (!$until) {
+      return false;
+    }
+
+    $now = PhabricatorTime::getNow();
+    if ($until < $now) {
+      return false;
+    }
+
+    return true;
+  }
+
+
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
index 03da9dee04..cd85800ab1 100644
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -306,6 +306,14 @@ final class PhabricatorUser
     return ($this->session !== self::ATTACHABLE);
   }
 
+  public function hasHighSecuritySession() {
+    if (!$this->hasSession()) {
+      return false;
+    }
+
+    return $this->getSession()->isHighSecuritySession();
+  }
+
   private function generateConduitCertificate() {
     return Filesystem::readRandomCharacters(255);
   }
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 1873fcb6e4..b4dd09ed10 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -850,6 +850,10 @@ abstract class PhabricatorApplicationTransactionEditor
       $xaction->setIsSilentTransaction(true);
     }
 
+    if ($actor->hasHighSecuritySession()) {
+      $xaction->setIsMFATransaction(true);
+    }
+
     return $xaction;
   }
 
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index ed88ac98db..c65adcac6b 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -165,6 +165,14 @@ abstract class PhabricatorApplicationTransaction
     return (bool)$this->getMetadataValue('core.silent', false);
   }
 
+  public function setIsMFATransaction($mfa) {
+    return $this->setMetadataValue('core.mfa', $mfa);
+  }
+
+  public function getIsMFATransaction() {
+    return (bool)$this->getMetadataValue('core.mfa', false);
+  }
+
   public function attachComment(
     PhabricatorApplicationTransactionComment $comment) {
     $this->comment = $comment;
@@ -1461,6 +1469,12 @@ abstract class PhabricatorApplicationTransaction
       if ($is_silent != $xaction->getIsSilentTransaction()) {
         return false;
       }
+
+      // Don't group MFA and non-MFA transactions together.
+      $is_mfa = $this->getIsMFATransaction();
+      if ($is_mfa != $xaction->getIsMFATransaction()) {
+        return false;
+      }
     }
 
     return true;
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
index e10f5c008e..9916628edf 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
@@ -424,7 +424,8 @@ class PhabricatorApplicationTransactionView extends AphrontView {
       ->setIcon($xaction->getIcon())
       ->setColor($xaction->getColor())
       ->setHideCommentOptions($this->getHideCommentOptions())
-      ->setIsSilent($xaction->getIsSilentTransaction());
+      ->setIsSilent($xaction->getIsSilentTransaction())
+      ->setIsMFA($xaction->getIsMFATransaction());
 
     list($token, $token_removed) = $xaction->getToken();
     if ($token) {
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index e44332c1b5..79aeb454b6 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -30,6 +30,7 @@ final class PHUITimelineEventView extends AphrontView {
   private $badges = array();
   private $pinboardItems = array();
   private $isSilent;
+  private $isMFA;
 
   public function setAuthorPHID($author_phid) {
     $this->authorPHID = $author_phid;
@@ -187,6 +188,15 @@ final class PHUITimelineEventView extends AphrontView {
     return $this->isSilent;
   }
 
+  public function setIsMFA($is_mfa) {
+    $this->isMFA = $is_mfa;
+    return $this;
+  }
+
+  public function getIsMFA() {
+    return $this->isMFA;
+  }
+
   public function setReallyMajorEvent($me) {
     $this->reallyMajorEvent = $me;
     return $this;
@@ -590,6 +600,14 @@ final class PHUITimelineEventView extends AphrontView {
           ->setIcon('fa-bell-slash', 'red')
           ->setTooltip(pht('Silent Edit'));
       }
+
+      // If this edit was applied while the actor was in high-security mode,
+      // provide a hint that it was extra authentic.
+      if ($this->getIsMFA()) {
+        $extra[] = id(new PHUIIconView())
+          ->setIcon('fa-vcard', 'green')
+          ->setTooltip(pht('MFA Authenticated'));
+      }
     }
 
     $extra = javelin_tag(

From e19c555913b1da40e178ce6174cd857d5492cc4d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 08:35:22 -0700
Subject: [PATCH 093/125] Support (basic) commenting on Phriction documents

Summary:
Depends on D19659. Fixes T1894. Ref T13077. See PHI840.

  - Add an EditEngine, although it currently supports no fields.
  - Add (basic, top-level-only) commenting (we already had the table in the database).

This will probably create some issues. I'm most concerned about documents accumulating a ton of old, irrelevant comments over time which are hard to keep track of and no longer relevant. But I think this is probably a step forward in almost all cases, and a good thing on the balance.

This also moves us incrementally toward putting all editing on top of EditEngine.

Test Plan: {F5877347}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13077, T1894

Differential Revision: https://secure.phabricator.com/D19660
---
 resources/celerity/map.php                    |  4 +-
 src/__phutil_library_map__.php                |  4 +
 .../PhabricatorPhrictionApplication.php       |  3 +
 .../PhrictionDocumentController.php           |  8 ++
 .../PhrictionEditEngineController.php         | 14 +++
 .../editor/PhrictionDocumentEditEngine.php    | 85 +++++++++++++++++++
 ...catorApplicationTransactionCommentView.php |  1 +
 src/view/phui/PHUIObjectBoxView.php           | 10 ++-
 webroot/rsrc/css/phui/phui-document-pro.css   |  5 +-
 9 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 src/applications/phriction/controller/PhrictionEditEngineController.php
 create mode 100644 src/applications/phriction/editor/PhrictionDocumentEditEngine.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 39fe047f19..1b4fd3517a 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -146,7 +146,7 @@ return array(
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
     'rsrc/css/phui/phui-crumbs-view.css' => '10728aaa',
     'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026',
-    'rsrc/css/phui/phui-document-pro.css' => '1a08ef4b',
+    'rsrc/css/phui/phui-document-pro.css' => 'd033e8d5',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
     'rsrc/css/phui/phui-document.css' => 'c4ac41f9',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
@@ -814,7 +814,7 @@ return array(
     'phui-curtain-view-css' => '2bdaf026',
     'phui-document-summary-view-css' => '9ca48bdf',
     'phui-document-view-css' => 'c4ac41f9',
-    'phui-document-view-pro-css' => '1a08ef4b',
+    'phui-document-view-pro-css' => 'd033e8d5',
     'phui-feed-story-css' => '44a9c8e9',
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index ab454e0455..e6146bc9ef 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -5021,6 +5021,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentController' => 'applications/phriction/controller/PhrictionDocumentController.php',
     'PhrictionDocumentDatasource' => 'applications/phriction/typeahead/PhrictionDocumentDatasource.php',
     'PhrictionDocumentDeleteTransaction' => 'applications/phriction/xaction/PhrictionDocumentDeleteTransaction.php',
+    'PhrictionDocumentEditEngine' => 'applications/phriction/editor/PhrictionDocumentEditEngine.php',
     'PhrictionDocumentFerretEngine' => 'applications/phriction/search/PhrictionDocumentFerretEngine.php',
     'PhrictionDocumentFulltextEngine' => 'applications/phriction/search/PhrictionDocumentFulltextEngine.php',
     'PhrictionDocumentHeraldAdapter' => 'applications/phriction/herald/PhrictionDocumentHeraldAdapter.php',
@@ -5042,6 +5043,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentVersionTransaction' => 'applications/phriction/xaction/PhrictionDocumentVersionTransaction.php',
     'PhrictionEditConduitAPIMethod' => 'applications/phriction/conduit/PhrictionEditConduitAPIMethod.php',
     'PhrictionEditController' => 'applications/phriction/controller/PhrictionEditController.php',
+    'PhrictionEditEngineController' => 'applications/phriction/controller/PhrictionEditEngineController.php',
     'PhrictionHistoryConduitAPIMethod' => 'applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php',
     'PhrictionHistoryController' => 'applications/phriction/controller/PhrictionHistoryController.php',
     'PhrictionInfoConduitAPIMethod' => 'applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php',
@@ -11140,6 +11142,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentController' => 'PhrictionController',
     'PhrictionDocumentDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhrictionDocumentDeleteTransaction' => 'PhrictionDocumentVersionTransaction',
+    'PhrictionDocumentEditEngine' => 'PhabricatorEditEngine',
     'PhrictionDocumentFerretEngine' => 'PhabricatorFerretEngine',
     'PhrictionDocumentFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhrictionDocumentHeraldAdapter' => 'HeraldAdapter',
@@ -11161,6 +11164,7 @@ phutil_register_library_map(array(
     'PhrictionDocumentVersionTransaction' => 'PhrictionDocumentTransactionType',
     'PhrictionEditConduitAPIMethod' => 'PhrictionConduitAPIMethod',
     'PhrictionEditController' => 'PhrictionController',
+    'PhrictionEditEngineController' => 'PhrictionController',
     'PhrictionHistoryConduitAPIMethod' => 'PhrictionConduitAPIMethod',
     'PhrictionHistoryController' => 'PhrictionController',
     'PhrictionInfoConduitAPIMethod' => 'PhrictionConduitAPIMethod',
diff --git a/src/applications/phriction/application/PhabricatorPhrictionApplication.php b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
index d44845c4b9..02f285aef3 100644
--- a/src/applications/phriction/application/PhabricatorPhrictionApplication.php
+++ b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
@@ -63,6 +63,9 @@ final class PhabricatorPhrictionApplication extends PhabricatorApplication {
 
         'preview/(?P<slug>.*/)' => 'PhrictionMarkupPreviewController',
         'diff/(?P<id>[1-9]\d*)/' => 'PhrictionDiffController',
+
+        $this->getEditRoutePattern('document/edit/')
+          => 'PhrictionEditEngineController',
       ),
     );
   }
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 3cdcf7230c..d4c9d0b263 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -352,6 +352,13 @@ final class PhrictionDocumentController
       $document,
       new PhrictionTransactionQuery());
 
+    $edit_engine = id(new PhrictionDocumentEditEngine())
+      ->setViewer($viewer)
+      ->setTargetObject($document);
+
+    $comment_view = $edit_engine
+      ->buildEditEngineCommentView($document);
+
     return $this->newPage()
       ->setTitle($page_title)
       ->setCrumbs($crumbs)
@@ -368,6 +375,7 @@ final class PhrictionDocumentController
             array(
               $children,
               $timeline,
+              $comment_view,
             )),
         ));
 
diff --git a/src/applications/phriction/controller/PhrictionEditEngineController.php b/src/applications/phriction/controller/PhrictionEditEngineController.php
new file mode 100644
index 0000000000..f2b7722eab
--- /dev/null
+++ b/src/applications/phriction/controller/PhrictionEditEngineController.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PhrictionEditEngineController
+  extends PhrictionController {
+
+  public function handleRequest(AphrontRequest $request) {
+    // NOTE: For now, this controller is only used to handle comments.
+
+    return id(new PhrictionDocumentEditEngine())
+      ->setController($this)
+      ->buildResponse();
+  }
+
+}
diff --git a/src/applications/phriction/editor/PhrictionDocumentEditEngine.php b/src/applications/phriction/editor/PhrictionDocumentEditEngine.php
new file mode 100644
index 0000000000..22f56f2f57
--- /dev/null
+++ b/src/applications/phriction/editor/PhrictionDocumentEditEngine.php
@@ -0,0 +1,85 @@
+<?php
+
+final class PhrictionDocumentEditEngine
+  extends PhabricatorEditEngine {
+
+  const ENGINECONST = 'phriction.document';
+
+  public function isEngineConfigurable() {
+    return false;
+  }
+
+  public function getEngineName() {
+    return pht('Phriction Document');
+  }
+
+  public function getSummaryHeader() {
+    return pht('Edit Phriction Document Configurations');
+  }
+
+  public function getSummaryText() {
+    return pht('This engine is used to edit Phriction documents.');
+  }
+
+  public function getEngineApplicationClass() {
+    return 'PhabricatorPhrictionApplication';
+  }
+
+  protected function newEditableObject() {
+    $viewer = $this->getViewer();
+    return PhrictionDocument::initializeNewDocument(
+      $viewer,
+      '/');
+  }
+
+  protected function newObjectQuery() {
+    return id(new PhrictionDocumentQuery())
+      ->needContent(true);
+  }
+
+  protected function getObjectCreateTitleText($object) {
+    return pht('Create Document');
+  }
+
+  protected function getObjectCreateButtonText($object) {
+    return pht('Create Document');
+  }
+
+  protected function getObjectEditTitleText($object) {
+    return pht('Edit Document: %s', $object->getContent()->getTitle());
+  }
+
+  protected function getObjectEditShortText($object) {
+    return pht('Edit Document');
+  }
+
+  protected function getObjectCreateShortText() {
+    return pht('Create Document');
+  }
+
+  protected function getObjectName() {
+    return pht('Document');
+  }
+
+  protected function getEditorURI() {
+    return '/phriction/document/edit/';
+  }
+
+  protected function getObjectCreateCancelURI($object) {
+    return '/phriction/document/';
+  }
+
+  protected function getObjectViewURI($object) {
+    return $object->getURI();
+  }
+
+  protected function getCreateNewObjectPolicy() {
+    // NOTE: For now, this engine is only to support commenting.
+    return PhabricatorPolicies::POLICY_NOONE;
+  }
+
+  protected function buildCustomEditFields($object) {
+    return array();
+  }
+
+}
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
index fcdc2fcb31..8be45f8cde 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -243,6 +243,7 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
 
     $comment_box = id(new PHUIObjectBoxView())
       ->setFlush(true)
+      ->setNoBorder(true)
       ->addClass('phui-comment-form-view')
       ->addSigil('phui-comment-form')
       ->appendChild(
diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php
index f5fdbfffc4..f19c485a36 100644
--- a/src/view/phui/PHUIObjectBoxView.php
+++ b/src/view/phui/PHUIObjectBoxView.php
@@ -25,6 +25,7 @@ final class PHUIObjectBoxView extends AphrontTagView {
   private $showHideHref;
   private $showHideContent;
   private $showHideOpen;
+  private $noBorder;
 
   private $propertyLists = array();
 
@@ -147,6 +148,11 @@ final class PHUIObjectBoxView extends AphrontTagView {
     return $this;
   }
 
+  public function setNoBorder($no_border) {
+    $this->noBorder = $no_border;
+    return $this;
+  }
+
   public function setValidationException(
     PhabricatorApplicationTransactionValidationException $ex = null) {
     $this->validationException = $ex;
@@ -156,7 +162,9 @@ final class PHUIObjectBoxView extends AphrontTagView {
   protected function getTagAttributes() {
     $classes = array();
     $classes[] = 'phui-box';
-    $classes[] = 'phui-box-border';
+    if (!$this->noBorder) {
+      $classes[] = 'phui-box-border';
+    }
     $classes[] = 'phui-object-box';
     $classes[] = 'mlt mll mlr';
 
diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css
index 4d58d17cb1..520ae597cb 100644
--- a/webroot/rsrc/css/phui/phui-document-pro.css
+++ b/webroot/rsrc/css/phui/phui-document-pro.css
@@ -241,10 +241,13 @@ body.printable {
   }
 }
 
+.phui-document-view-pro-box {
+  margin-bottom: 24px;
+}
+
 .phui-document-view-pro-box .phui-timeline-view {
   padding: 16px 0 0 0;
   background: none;
-  border-top: 1px solid rgba({$alphablue}, 0.20);
 }
 
 .phui-document-view-pro-box .phui-timeline-wedge {

From 152e7713eb06453b0dfe4fa89729af6aba4834fa Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 08:35:22 -0700
Subject: [PATCH 094/125] Remove obsolete, nonfunctional draft auto-saving in
 Phriction

Summary:
Depends on D19660. Ref T5811. Ref T13077.

Long ago, if you started editing a Phriction document but didn't save it, we'd save the draft in the background as part of the preview.

D11169 updated the preview to use shared infrastructure and broke this function, since we never save drafts.

Since this doesn't work right now, I want to add another thing called "draft", and the future of this feature should be more integrated with modern drafts and EditEngine (which fixed some bugs related to versioning), just get rid of this code for the moment.

Test Plan: Edited documents. This code doesn't do anything since D11169, so no behavior changed.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13077, T5811

Differential Revision: https://secure.phabricator.com/D19661
---
 .../controller/PhrictionEditController.php    | 45 +------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
index 2c47187007..4c1d69c272 100644
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -72,43 +72,6 @@ final class PhrictionEditController
       }
     }
 
-    if ($request->getBool('nodraft')) {
-      $draft = null;
-      $draft_key = null;
-    } else {
-      if ($document->getPHID()) {
-        $draft_key = $document->getPHID().':'.$content->getVersion();
-      } else {
-        $draft_key = 'phriction:'.$content->getSlug();
-      }
-      $draft = id(new PhabricatorDraft())->loadOneWhere(
-        'authorPHID = %s AND draftKey = %s',
-        $viewer->getPHID(),
-        $draft_key);
-    }
-
-    if ($draft &&
-      strlen($draft->getDraft()) &&
-      ($draft->getDraft() != $content->getContent())) {
-      $content_text = $draft->getDraft();
-
-      $discard = phutil_tag(
-        'a',
-        array(
-          'href' => $request->getRequestURI()->alter('nodraft', true),
-        ),
-        pht('discard this draft'));
-
-      $draft_note = new PHUIInfoView();
-      $draft_note->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
-      $draft_note->setTitle(pht('Recovered Draft'));
-      $draft_note->appendChild(
-        pht('Showing a saved draft of your edits, you can %s.', $discard));
-    } else {
-      $content_text = $content->getContent();
-      $draft_note = null;
-    }
-
     require_celerity_resource('phriction-document-css');
 
     $e_title = true;
@@ -131,6 +94,8 @@ final class PhrictionEditController
 
     $v_space = $document->getSpacePHID();
 
+    $content_text = $content->getContent();
+
     if ($request->isFormPost()) {
 
       $title = $request->getStr('title');
@@ -181,10 +146,6 @@ final class PhrictionEditController
       try {
         $editor->applyTransactions($document, $xactions);
 
-        if ($draft) {
-          $draft->delete();
-        }
-
         $uri = PhrictionDocument::getSlugURI($document->getSlug());
         return id(new AphrontRedirectResponse())->setURI($uri);
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
@@ -239,7 +200,6 @@ final class PhrictionEditController
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->addHiddenInput('slug', $document->getSlug())
-      ->addHiddenInput('nodraft', $request->getBool('nodraft'))
       ->addHiddenInput('contentVersion', $max_version)
       ->addHiddenInput('overwrite', $overwrite)
       ->appendChild(
@@ -325,7 +285,6 @@ final class PhrictionEditController
     $view = id(new PHUITwoColumnView())
       ->setFooter(
         array(
-          $draft_note,
           $form_box,
           $preview,
         ));

From 550028a8825a781faaf548c19d1c6b29850baea6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 09:04:44 -0700
Subject: [PATCH 095/125] Allow Phriction document edits to be saved as drafts

Summary:
Depends on D19661. Ref T13077. See PHI840.

When a user edits a page normally, add a "Save as Draft" button. Much of this change is around making that button render and behave properly: it needs to be an `<input type="submit" ...>` so browsers submit it and we can figure out which button the user clicked.

Then there are a few minor rules:

  - If you're editing a page which is already a draft, we only give you "Save as Draft". This makes edits to update/revise a draft more natural.
  - Highlight "Publish" if it's a likely action that you might want to take.

Internally, there are two types of edits. Both types create a new version with the new content. However:

  - A "content" edit sets the version shown on the live page to the newly-created version.
  - A "draft" edit does not update the version shown on the live page.

Test Plan: Edited a published document, edited the draft. Published documents. Reverted documents.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19662
---
 resources/celerity/map.php                    | 10 +-
 src/__phutil_library_map__.php                |  6 +-
 .../PhrictionDocumentController.php           | 31 +++---
 .../controller/PhrictionEditController.php    | 41 ++++++--
 .../editor/PhrictionTransactionEditor.php     | 15 +++
 .../PhrictionDocumentContentTransaction.php   | 86 +----------------
 .../PhrictionDocumentDraftTransaction.php     | 14 +++
 .../PhrictionDocumentEditTransaction.php      | 95 +++++++++++++++++++
 src/view/phui/PHUIButtonView.php              | 19 +++-
 webroot/rsrc/css/phui/button/phui-button.css  | 13 ++-
 webroot/rsrc/css/phui/phui-form-view.css      | 11 +--
 11 files changed, 218 insertions(+), 123 deletions(-)
 create mode 100644 src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
 create mode 100644 src/applications/phriction/xaction/PhrictionDocumentEditTransaction.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 1b4fd3517a..720683c371 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'badf3f16',
+    'core.pkg.css' => '2574c199',
     'core.pkg.js' => 'b5a949ca',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c1cfa143',
@@ -122,7 +122,7 @@ return array(
     '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',
+    'rsrc/css/phui/button/phui-button.css' => '6ccb303c',
     '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' => '21154caf',
@@ -151,7 +151,7 @@ return array(
     'rsrc/css/phui/phui-document.css' => 'c4ac41f9',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
     'rsrc/css/phui/phui-fontkit.css' => '1320ed01',
-    'rsrc/css/phui/phui-form-view.css' => 'f808e5be',
+    'rsrc/css/phui/phui-form-view.css' => '2f43fae7',
     'rsrc/css/phui/phui-form.css' => '7aaa04e3',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
     'rsrc/css/phui/phui-header-view.css' => '1ba8b707',
@@ -800,7 +800,7 @@ return array(
     'phui-box-css' => '4bd6cdb9',
     'phui-bulk-editor-css' => '9a81e5d5',
     'phui-button-bar-css' => 'f1ff5494',
-    'phui-button-css' => '1863cc6e',
+    'phui-button-css' => '6ccb303c',
     'phui-button-simple-css' => '8e1baf68',
     'phui-calendar-css' => 'f1ddf11c',
     'phui-calendar-day-css' => '572b1893',
@@ -819,7 +819,7 @@ return array(
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
     'phui-form-css' => '7aaa04e3',
-    'phui-form-view-css' => 'f808e5be',
+    'phui-form-view-css' => '2f43fae7',
     'phui-head-thing-view-css' => 'fd311e5f',
     'phui-header-view-css' => '1ba8b707',
     'phui-hovercard' => '1bd28176',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e6146bc9ef..c25019b1fb 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -5021,7 +5021,9 @@ phutil_register_library_map(array(
     'PhrictionDocumentController' => 'applications/phriction/controller/PhrictionDocumentController.php',
     'PhrictionDocumentDatasource' => 'applications/phriction/typeahead/PhrictionDocumentDatasource.php',
     'PhrictionDocumentDeleteTransaction' => 'applications/phriction/xaction/PhrictionDocumentDeleteTransaction.php',
+    'PhrictionDocumentDraftTransaction' => 'applications/phriction/xaction/PhrictionDocumentDraftTransaction.php',
     'PhrictionDocumentEditEngine' => 'applications/phriction/editor/PhrictionDocumentEditEngine.php',
+    'PhrictionDocumentEditTransaction' => 'applications/phriction/xaction/PhrictionDocumentEditTransaction.php',
     'PhrictionDocumentFerretEngine' => 'applications/phriction/search/PhrictionDocumentFerretEngine.php',
     'PhrictionDocumentFulltextEngine' => 'applications/phriction/search/PhrictionDocumentFulltextEngine.php',
     'PhrictionDocumentHeraldAdapter' => 'applications/phriction/herald/PhrictionDocumentHeraldAdapter.php',
@@ -11138,11 +11140,13 @@ phutil_register_library_map(array(
     ),
     'PhrictionDocumentAuthorHeraldField' => 'PhrictionDocumentHeraldField',
     'PhrictionDocumentContentHeraldField' => 'PhrictionDocumentHeraldField',
-    'PhrictionDocumentContentTransaction' => 'PhrictionDocumentVersionTransaction',
+    'PhrictionDocumentContentTransaction' => 'PhrictionDocumentEditTransaction',
     'PhrictionDocumentController' => 'PhrictionController',
     'PhrictionDocumentDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhrictionDocumentDeleteTransaction' => 'PhrictionDocumentVersionTransaction',
+    'PhrictionDocumentDraftTransaction' => 'PhrictionDocumentEditTransaction',
     'PhrictionDocumentEditEngine' => 'PhabricatorEditEngine',
+    'PhrictionDocumentEditTransaction' => 'PhrictionDocumentVersionTransaction',
     'PhrictionDocumentFerretEngine' => 'PhabricatorFerretEngine',
     'PhrictionDocumentFulltextEngine' => 'PhabricatorFulltextEngine',
     'PhrictionDocumentHeraldAdapter' => 'HeraldAdapter',
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index d4c9d0b263..e424a7f148 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -450,19 +450,28 @@ final class PhrictionDocumentController
       $publish_name = pht('Publish Revert');
     }
 
+    // If you're looking at the current version; and it's an unpublished
+    // draft; and you can publish it, add a UI hint that this might be an
+    // interesting action to take.
+    $hint_publish = false;
+    if ($is_draft) {
+      if ($can_publish) {
+        if ($document->getMaxVersion() == $content->getVersion()) {
+          $hint_publish = true;
+        }
+      }
+    }
+
     $publish_uri = "/phriction/publish/{$id}/{$content_id}/";
 
-    if (PhabricatorEnv::getEnvConfig('phabricator.show-prototypes')) {
-      $publish_name = pht('Publish (Prototype!)');
-
-      $curtain->addAction(
-        id(new PhabricatorActionView())
-        ->setName($publish_name)
-        ->setIcon('fa-upload')
-        ->setDisabled(!$can_publish)
-        ->setWorkflow(true)
-        ->setHref($publish_uri));
-    }
+    $curtain->addAction(
+      id(new PhabricatorActionView())
+      ->setName($publish_name)
+      ->setIcon('fa-upload')
+      ->setSelected($hint_publish)
+      ->setDisabled(!$can_publish)
+      ->setWorkflow(true)
+      ->setHref($publish_uri));
 
     if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
       $curtain->addAction(
diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
index 4c1d69c272..31879632de 100644
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -95,8 +95,10 @@ final class PhrictionEditController
     $v_space = $document->getSpacePHID();
 
     $content_text = $content->getContent();
+    $is_draft_mode = ($document->getContent()->getVersion() != $max_version);
 
     if ($request->isFormPost()) {
+      $save_as_draft = ($is_draft_mode || $request->getExists('draft'));
 
       $title = $request->getStr('title');
       $content_text = $request->getStr('content');
@@ -108,13 +110,18 @@ final class PhrictionEditController
       $v_projects = $request->getArr('projects');
       $v_space = $request->getStr('spacePHID');
 
+      if ($save_as_draft) {
+        $edit_type = PhrictionDocumentDraftTransaction::TRANSACTIONTYPE;
+      } else {
+        $edit_type = PhrictionDocumentContentTransaction::TRANSACTIONTYPE;
+      }
+
       $xactions = array();
       $xactions[] = id(new PhrictionTransaction())
         ->setTransactionType(PhrictionDocumentTitleTransaction::TRANSACTIONTYPE)
         ->setNewValue($title);
       $xactions[] = id(new PhrictionTransaction())
-        ->setTransactionType(
-          PhrictionDocumentContentTransaction::TRANSACTIONTYPE)
+        ->setTransactionType($edit_type)
         ->setNewValue($content_text);
       $xactions[] = id(new PhrictionTransaction())
         ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
@@ -147,6 +154,14 @@ final class PhrictionEditController
         $editor->applyTransactions($document, $xactions);
 
         $uri = PhrictionDocument::getSlugURI($document->getSlug());
+        $uri = new PhutilURI($uri);
+
+        // If the user clicked "Save as Draft", take them to the draft, not
+        // to the current published page.
+        if ($save_as_draft) {
+          $uri = $uri->alter('v', $document->getMaxVersion());
+        }
+
         return id(new AphrontRedirectResponse())->setURI($uri);
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
         $validation_exception = $ex;
@@ -176,7 +191,7 @@ final class PhrictionEditController
       if ($overwrite) {
         $submit_button = pht('Overwrite Changes');
       } else {
-        $submit_button = pht('Save Changes');
+        $submit_button = pht('Save and Publish');
       }
     } else {
       $submit_button = pht('Create Document');
@@ -196,7 +211,6 @@ final class PhrictionEditController
     $view_capability = PhabricatorPolicyCapability::CAN_VIEW;
     $edit_capability = PhabricatorPolicyCapability::CAN_EDIT;
 
-
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->addHiddenInput('slug', $document->getSlug())
@@ -253,11 +267,26 @@ final class PhrictionEditController
           ->setLabel(pht('Edit Notes'))
           ->setValue($notes)
           ->setError(null)
-          ->setName('description'))
-      ->appendChild(
+          ->setName('description'));
+
+    if ($is_draft_mode) {
+      $form->appendControl(
         id(new AphrontFormSubmitControl())
+          ->addCancelButton($cancel_uri)
+          ->setValue(pht('Save Draft')));
+    } else {
+      $draft_button = id(new PHUIButtonView())
+        ->setTag('input')
+        ->setName('draft')
+        ->setText(pht('Save as Draft'))
+        ->setColor(PHUIButtonView::GREEN);
+
+      $form->appendControl(
+        id(new AphrontFormSubmitControl())
+          ->addButton($draft_button)
           ->addCancelButton($cancel_uri)
           ->setValue($submit_button));
+    }
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($page_title)
diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index 3c045e16ba..6d72fc5b8e 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -74,6 +74,21 @@ final class PhrictionTransactionEditor
     return $this;
   }
 
+  public function setShouldPublishContent(
+    PhrictionDocument $object,
+    $publish) {
+
+    if ($publish) {
+      $content_phid = $this->getNewContent()->getPHID();
+    } else {
+      $content_phid = $this->getOldContent()->getPHID();
+    }
+
+    $object->setContentPHID($content_phid);
+
+    return $this;
+  }
+
   public function getEditorApplicationClass() {
     return 'PhabricatorPhrictionApplication';
   }
diff --git a/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
index 759121dd65..de6d92aac6 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
@@ -1,94 +1,16 @@
 <?php
 
 final class PhrictionDocumentContentTransaction
-  extends PhrictionDocumentVersionTransaction {
+  extends PhrictionDocumentEditTransaction {
 
   const TRANSACTIONTYPE = 'content';
 
-  public function generateOldValue($object) {
-    if ($this->getEditor()->getIsNewObject()) {
-      return null;
-    }
-    return $object->getContent()->getContent();
-  }
-
-  public function generateNewValue($object, $value) {
-    return $value;
-  }
-
   public function applyInternalEffects($object, $value) {
+    parent::applyInternalEffects($object, $value);
+
     $object->setStatus(PhrictionDocumentStatus::STATUS_EXISTS);
 
-    $content = $this->getNewDocumentContent($object);
-    $content->setContent($value);
-  }
-
-  public function shouldHide() {
-    if ($this->getOldValue() === null) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  public function getActionStrength() {
-    return 1.3;
-  }
-
-  public function getActionName() {
-    return pht('Edited');
-  }
-
-  public function getTitle() {
-    return pht(
-      '%s edited the content of this document.',
-      $this->renderAuthor());
-  }
-
-  public function getTitleForFeed() {
-    return pht(
-      '%s edited the content of %s.',
-      $this->renderAuthor(),
-      $this->renderObject());
-  }
-
-  public function hasChangeDetailView() {
-    return true;
-  }
-
-  public function getMailDiffSectionHeader() {
-    return pht('CHANGES TO DOCUMENT CONTENT');
-  }
-
-  public function newChangeDetailView() {
-    $viewer = $this->getViewer();
-
-    return id(new PhabricatorApplicationTransactionTextDiffDetailView())
-      ->setViewer($viewer)
-      ->setOldText($this->getOldValue())
-      ->setNewText($this->getNewValue());
-  }
-
-  public function newRemarkupChanges() {
-    $changes = array();
-
-    $changes[] = $this->newRemarkupChange()
-      ->setOldValue($this->getOldValue())
-      ->setNewValue($this->getNewValue());
-
-    return $changes;
-  }
-
-  public function validateTransactions($object, array $xactions) {
-    $errors = array();
-
-    $content = $object->getContent()->getContent();
-    if ($this->isEmptyTextTransaction($content, $xactions)) {
-      $errors[] = $this->newRequiredError(
-        pht('Documents must have content.'));
-    }
-
-    return $errors;
+    $this->getEditor()->setShouldPublishContent($object, true);
   }
 
 }
diff --git a/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
new file mode 100644
index 0000000000..91a4b4ade5
--- /dev/null
+++ b/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
@@ -0,0 +1,14 @@
+<?php
+
+final class PhrictionDocumentDraftTransaction
+  extends PhrictionDocumentEditTransaction {
+
+  const TRANSACTIONTYPE = 'draft';
+
+  public function applyInternalEffects($object, $value) {
+    parent::applyInternalEffects($object, $value);
+
+    $this->getEditor()->setShouldPublishContent($object, false);
+  }
+
+}
diff --git a/src/applications/phriction/xaction/PhrictionDocumentEditTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentEditTransaction.php
new file mode 100644
index 0000000000..551e8c8c2a
--- /dev/null
+++ b/src/applications/phriction/xaction/PhrictionDocumentEditTransaction.php
@@ -0,0 +1,95 @@
+<?php
+
+abstract class PhrictionDocumentEditTransaction
+  extends PhrictionDocumentVersionTransaction {
+
+  public function generateOldValue($object) {
+    if ($this->getEditor()->getIsNewObject()) {
+      return null;
+    }
+
+    // NOTE: We want to get the newest version of the content here, regardless
+    // of whether it's published or not.
+
+    $actor = $this->getActor();
+
+    return id(new PhrictionContentQuery())
+      ->setViewer($actor)
+      ->withDocumentPHIDs(array($object->getPHID()))
+      ->setOrder('newest')
+      ->setLimit(1)
+      ->executeOne()
+      ->getContent();
+  }
+
+  public function generateNewValue($object, $value) {
+    return $value;
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $content = $this->getNewDocumentContent($object);
+    $content->setContent($value);
+  }
+
+  public function getActionStrength() {
+    return 1.3;
+  }
+
+  public function getActionName() {
+    return pht('Edited');
+  }
+
+  public function getTitle() {
+    return pht(
+      '%s edited the content of this document.',
+      $this->renderAuthor());
+  }
+
+  public function getTitleForFeed() {
+    return pht(
+      '%s edited the content of %s.',
+      $this->renderAuthor(),
+      $this->renderObject());
+  }
+
+  public function getMailDiffSectionHeader() {
+    return pht('CHANGES TO DOCUMENT CONTENT');
+  }
+
+  public function hasChangeDetailView() {
+    return true;
+  }
+
+  public function newChangeDetailView() {
+    $viewer = $this->getViewer();
+
+    return id(new PhabricatorApplicationTransactionTextDiffDetailView())
+      ->setViewer($viewer)
+      ->setOldText($this->getOldValue())
+      ->setNewText($this->getNewValue());
+  }
+
+  public function newRemarkupChanges() {
+    $changes = array();
+
+    $changes[] = $this->newRemarkupChange()
+      ->setOldValue($this->getOldValue())
+      ->setNewValue($this->getNewValue());
+
+    return $changes;
+  }
+
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    $content = $object->getContent()->getContent();
+    if ($this->isEmptyTextTransaction($content, $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Documents must have content.'));
+    }
+
+    return $errors;
+  }
+
+
+}
diff --git a/src/view/phui/PHUIButtonView.php b/src/view/phui/PHUIButtonView.php
index bad24122bc..2231649f12 100644
--- a/src/view/phui/PHUIButtonView.php
+++ b/src/view/phui/PHUIButtonView.php
@@ -233,14 +233,15 @@ final class PHUIButtonView extends AphrontTagView {
       $classes = array();
     }
 
-    // See PHI823. If we aren't rendering a "<button>" tag, give the tag we
-    // are rendering a "button" role as a hint to screen readers.
+    // See PHI823. If we aren't rendering a "<button>" or "<input>" tag,
+    // give the tag we are rendering a "button" role as a hint to screen
+    // readers.
     $role = null;
-    if ($this->tag !== 'button') {
+    if ($this->tag !== 'button' && $this->tag !== 'input') {
       $role = 'button';
     }
 
-    return array(
+    $attrs = array(
       'class'  => $classes,
       'href'   => $this->href,
       'name'   => $this->name,
@@ -249,9 +250,19 @@ final class PHUIButtonView extends AphrontTagView {
       'meta'   => $meta,
       'role' => $role,
     );
+
+    if ($this->tag == 'input') {
+      $attrs['type'] = 'submit';
+      $attrs['value'] = $this->text;
+    }
+
+    return $attrs;
   }
 
   protected function getTagContent() {
+    if ($this->tag === 'input') {
+      return null;
+    }
 
     $icon = $this->icon;
     $text = null;
diff --git a/webroot/rsrc/css/phui/button/phui-button.css b/webroot/rsrc/css/phui/button/phui-button.css
index 14bbdcf46b..22ad96779d 100644
--- a/webroot/rsrc/css/phui/button/phui-button.css
+++ b/webroot/rsrc/css/phui/button/phui-button.css
@@ -4,7 +4,8 @@
 
 
 button,
-a.button {
+a.button,
+input[type="submit"] {
   font: {$basefont};
   -webkit-font-smoothing: antialiased;
   -webkit-user-select: none;
@@ -72,7 +73,8 @@ a.icon:visited {
 
 button.button-green,
 a.button-green.button,
-a.button-green.button:visited {
+a.button-green.button:visited,
+input[type="submit"].button-green {
   background-color: {$green.button.color};
   border-color: {$green.button.color};
   background-image: {$green.button.gradient};
@@ -80,16 +82,17 @@ a.button-green.button:visited {
 
 button.button-red,
 a.button-red.button,
-a.button-red.button:visited {
+a.button-red.button:visited,
+input[type="submit"].button-red {
   background-color: {$red.button.color};
   border-color: {$red.button.color};
   background-image: {$red.button.gradient};
 }
 
 button.button-grey,
-input[type="submit"].button-grey,
 a.button-grey,
-a.button-grey:visited {
+a.button-grey:visited,
+input[type="submit"].button-grey {
   background-color: {$grey.button.color};
   background-image: {$grey.button.gradient};
   border: 1px solid rgba({$alphablue}, 0.3);
diff --git a/webroot/rsrc/css/phui/phui-form-view.css b/webroot/rsrc/css/phui/phui-form-view.css
index 9824196882..539eaa2e71 100644
--- a/webroot/rsrc/css/phui/phui-form-view.css
+++ b/webroot/rsrc/css/phui/phui-form-view.css
@@ -133,19 +133,12 @@
 }
 
 .aphront-form-control-submit button,
-.aphront-form-control-submit a.button {
+.aphront-form-control-submit a.button,
+.aphront-form-control-submit input[type="submit"] {
   float: right;
   margin: 4px 0 0 8px;
 }
 
-.phui-form-control-multi-submit input,
-.phui-form-control-multi-submit button,
-.phui-form-control-multi-submit a {
-  float: right;
-  margin: 4px 0 0 8px;
-  width: auto;
-}
-
 .aphront-form-control-textarea textarea.aphront-textarea-very-short {
   height: 44px;
 }

From b6ba75d991df4babeb6e6bdc6cdd9eeabe8741f2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 10:14:56 -0700
Subject: [PATCH 096/125] Add a Phriction hint when a draft exists, and fix
 some draft editing bugs

Summary:
Depends on D19662. Ref T13077. See PHI840.

  - If you're looking at the published version of a document, but a draft version exists and you can edit it, add a hint/link.
  - Fix an issue where the "draft" transaction would complain when you created a document since the initial content is empty and no "draft" transaction is adding any content.

Test Plan: Created new documents, viewed documents with current published versions and unpublished drafts.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19663
---
 .../PhrictionDocumentController.php           | 29 +++++++++++++++++
 .../controller/PhrictionEditController.php    | 32 ++++++++++++-------
 .../PhrictionDocumentContentTransaction.php   | 16 ++++++++++
 .../PhrictionDocumentDraftTransaction.php     | 21 ++++++++++++
 .../PhrictionDocumentEditTransaction.php      | 13 --------
 5 files changed, 87 insertions(+), 24 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index e424a7f148..1853dd1ee1 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -186,6 +186,35 @@ final class PhrictionDocumentController
         );
       } else {
         $content = $document->getContent();
+
+        if ($content->getVersion() < $document->getMaxVersion()) {
+          $can_edit = PhabricatorPolicyFilter::hasCapability(
+            $viewer,
+            $document,
+            PhabricatorPolicyCapability::CAN_EDIT);
+          if ($can_edit) {
+            $document_uri = new PhutilURI($document->getURI());
+            $draft_uri = $document_uri->alter('v', $document->getMaxVersion());
+
+            $draft_link = phutil_tag(
+              'a',
+              array(
+                'href' => $draft_uri,
+              ),
+              pht('View Draft Version'));
+
+            $draft_link = phutil_tag('strong', array(), $draft_link);
+
+            $version_note = id(new PHUIInfoView())
+              ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
+              ->appendChild(
+                array(
+                  pht('This document has unpublished draft changes.'),
+                  ' ',
+                  $draft_link,
+                ));
+          }
+        }
       }
 
       $page_title = $content->getTitle();
diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
index 31879632de..9f59b63121 100644
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -98,7 +98,11 @@ final class PhrictionEditController
     $is_draft_mode = ($document->getContent()->getVersion() != $max_version);
 
     if ($request->isFormPost()) {
-      $save_as_draft = ($is_draft_mode || $request->getExists('draft'));
+      if ($is_new) {
+        $save_as_draft = false;
+      } else {
+        $save_as_draft = ($is_draft_mode || $request->getExists('draft'));
+      }
 
       $title = $request->getStr('title');
       $content_text = $request->getStr('content');
@@ -117,6 +121,7 @@ final class PhrictionEditController
       }
 
       $xactions = array();
+
       $xactions[] = id(new PhrictionTransaction())
         ->setTransactionType(PhrictionDocumentTitleTransaction::TRANSACTIONTYPE)
         ->setNewValue($title);
@@ -275,17 +280,22 @@ final class PhrictionEditController
           ->addCancelButton($cancel_uri)
           ->setValue(pht('Save Draft')));
     } else {
-      $draft_button = id(new PHUIButtonView())
-        ->setTag('input')
-        ->setName('draft')
-        ->setText(pht('Save as Draft'))
-        ->setColor(PHUIButtonView::GREEN);
+      $submit = id(new AphrontFormSubmitControl());
 
-      $form->appendControl(
-        id(new AphrontFormSubmitControl())
-          ->addButton($draft_button)
-          ->addCancelButton($cancel_uri)
-          ->setValue($submit_button));
+      if (!$is_new) {
+        $draft_button = id(new PHUIButtonView())
+          ->setTag('input')
+          ->setName('draft')
+          ->setText(pht('Save as Draft'))
+          ->setColor(PHUIButtonView::GREEN);
+        $submit->addButton($draft_button);
+      }
+
+      $submit
+        ->addCancelButton($cancel_uri)
+        ->setValue($submit_button);
+
+      $form->appendControl($submit);
     }
 
     $form_box = id(new PHUIObjectBoxView())
diff --git a/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
index de6d92aac6..f5f1305279 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentContentTransaction.php
@@ -13,4 +13,20 @@ final class PhrictionDocumentContentTransaction
     $this->getEditor()->setShouldPublishContent($object, true);
   }
 
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    // NOTE: This is slightly different from the draft validation. Here,
+    // we're validating that: you can't edit away a document; and you can't
+    // create an empty document.
+
+    $content = $object->getContent()->getContent();
+    if ($this->isEmptyTextTransaction($content, $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Documents must have content.'));
+    }
+
+    return $errors;
+  }
+
 }
diff --git a/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
index 91a4b4ade5..b2f39485fc 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
@@ -11,4 +11,25 @@ final class PhrictionDocumentDraftTransaction
     $this->getEditor()->setShouldPublishContent($object, false);
   }
 
+  public function validateTransactions($object, array $xactions) {
+    $errors = array();
+
+    // NOTE: We're only validating that you can't edit a document down to
+    // nothing in a draft transaction. Alone, this doesn't prevent you from
+    // creating a document with no content. The content transaction has
+    // validation for that.
+
+    if (!$xactions) {
+      return $errors;
+    }
+
+    $content = $object->getContent()->getContent();
+    if ($this->isEmptyTextTransaction($content, $xactions)) {
+      $errors[] = $this->newRequiredError(
+        pht('Documents must have content.'));
+    }
+
+    return $errors;
+  }
+
 }
diff --git a/src/applications/phriction/xaction/PhrictionDocumentEditTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentEditTransaction.php
index 551e8c8c2a..3130658311 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentEditTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentEditTransaction.php
@@ -79,17 +79,4 @@ abstract class PhrictionDocumentEditTransaction
     return $changes;
   }
 
-  public function validateTransactions($object, array $xactions) {
-    $errors = array();
-
-    $content = $object->getContent()->getContent();
-    if ($this->isEmptyTextTransaction($content, $xactions)) {
-      $errors[] = $this->newRequiredError(
-        pht('Documents must have content.'));
-    }
-
-    return $errors;
-  }
-
-
 }

From 0089ef4b60e31514735d9cc275906f481e75537d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 11 Sep 2018 13:38:16 -0700
Subject: [PATCH 097/125] Don't show Phriction draft edit events in feed

Summary: Depends on D19663. Ref T13077. When you edit a Phriction draft, don't publish a feed story. (The eventual "Publish" event gets a story.)

Test Plan: Made draft / non-draft / publish edits, only saw feed stories for non-draft and publish edits.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13077

Differential Revision: https://secure.phabricator.com/D19664
---
 .../phriction/xaction/PhrictionDocumentDraftTransaction.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
index b2f39485fc..3fc9d63ca8 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentDraftTransaction.php
@@ -11,6 +11,10 @@ final class PhrictionDocumentDraftTransaction
     $this->getEditor()->setShouldPublishContent($object, false);
   }
 
+  public function shouldHideForFeed() {
+    return true;
+  }
+
   public function validateTransactions($object, array $xactions) {
     $errors = array();
 

From 0abf29765e058cb410a98d5d0db8c434b9df096b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 13 Sep 2018 08:13:41 -0700
Subject: [PATCH 098/125] Make Phriction diff-of-changes view draft-aware and
 clarify some language

Summary:
Ref T13077. Ref T13197. See PHI840.

  - In the "History > Diff/Compare" view, the button language wasn't draft-aware.
  - Revise language to avoid the word "Revert", since this can be ambiguous.
    - "Edit this page, starting with an older version of the text" is now "Edit Older|Current|Draft Version X".
    - "Mark this older version of the page as the current published version" is now "Publish Older Version".
  - Let the user edit the current published version, too, since this is a reasonable operation if there are drafts.

Test Plan: Navigated the history diff view, saw better button and action text.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197, T13077

Differential Revision: https://secure.phabricator.com/D19668
---
 .../controller/PhrictionDiffController.php    | 20 +++++++++----------
 .../PhrictionDocumentController.php           |  2 +-
 .../controller/PhrictionPublishController.php |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
index c81a90a3df..537f743eba 100644
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -95,7 +95,7 @@ final class PhrictionDiffController extends PhrictionController {
     $navigation_table = null;
     if ($l + 1 == $r) {
       $nav_l = ($l > 1);
-      $nav_r = ($r != $current->getVersion());
+      $nav_r = ($r != $document->getMaxVersion());
 
       $uri = $request->getRequestURI();
 
@@ -191,30 +191,28 @@ final class PhrictionDiffController extends PhrictionController {
       PhrictionChangeType::CHANGE_MOVE_AWAY => true, // Plain silly
       PhrictionChangeType::CHANGE_STUB      => true, // Utterly silly
     );
+
     if (isset($hidden_statuses[$content->getChangeType()])) {
       // Don't show an edit/revert button for changes which deleted, moved or
       // stubbed the content since it's silly.
       return null;
     }
 
-    if ($content->getID() == $current->getID()) {
-      return phutil_tag(
-        'a',
-        array(
-          'href'  => '/phriction/edit/'.$document_id.'/',
-          'class' => 'button button-grey',
-        ),
-        pht('Edit Current Version'));
+    if ($version == $current->getVersion()) {
+      $label = pht('Edit Current Version %s...', new PhutilNumber($version));
+    } else if ($version < $current->getVersion()) {
+      $label = pht('Edit Older Version %s...', new PhutilNumber($version));
+    } else {
+      $label = pht('Edit Draft Version %s...', new PhutilNumber($version));
     }
 
-
     return phutil_tag(
       'a',
       array(
         'href'  => '/phriction/edit/'.$document_id.'/?revert='.$version,
         'class' => 'button button-grey',
       ),
-      pht('Revert to Version %s...', $version));
+      $label);
   }
 
   private function renderComparisonTable(array $content) {
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 1853dd1ee1..77f6a3529c 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -476,7 +476,7 @@ final class PhrictionDocumentController
     if ($is_draft) {
       $publish_name = pht('Publish Draft');
     } else {
-      $publish_name = pht('Publish Revert');
+      $publish_name = pht('Publish Older Version');
     }
 
     // If you're looking at the current version; and it's an unpublished
diff --git a/src/applications/phriction/controller/PhrictionPublishController.php b/src/applications/phriction/controller/PhrictionPublishController.php
index 43c90cb1fa..e24b5f9be0 100644
--- a/src/applications/phriction/controller/PhrictionPublishController.php
+++ b/src/applications/phriction/controller/PhrictionPublishController.php
@@ -63,7 +63,7 @@ final class PhrictionPublishController
     }
 
     if ($content->getVersion() < $document->getContent()->getVersion()) {
-      $title = pht('Revert Document?');
+      $title = pht('Publish Older Version?');
       $body = pht(
         'Revert the published version of this document to an older '.
         'version?');

From 2ddc770fd881de7a5bbe613de49d1456e8c978ae Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 13 Sep 2018 09:11:47 -0700
Subject: [PATCH 099/125] Update Phriction documentation for drafts

Summary: Depends on D19668. Ref T13197. See PHI840. This updates the documentation to describe how drafts work in more detail.

Test Plan: Read documentation.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19669
---
 src/docs/user/userguide/phriction.diviner | 75 ++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/docs/user/userguide/phriction.diviner b/src/docs/user/userguide/phriction.diviner
index 60ad6357fe..1a56dce46b 100644
--- a/src/docs/user/userguide/phriction.diviner
+++ b/src/docs/user/userguide/phriction.diviner
@@ -6,5 +6,78 @@ Construct a detailed written history of your civilization.
 Overview
 ========
 
-Phriction is a simple wiki. You can edit pages, and the text you write will stay
+Phriction is a wiki. You can edit pages, and the text you write will stay
 there. Other people can see it later.
+
+Phriction documents are arranged in a hierarchy, like a filesystem. This can
+make it easier to keep things organized and to apply policy controls to
+groups of documents.
+
+
+Policies
+========
+
+Documents and policies in Phriction are hierarchical, similar to a filesystem.
+For example, a document called "Zebra Information" may be located
+at `/zoo/animals/zebra/`.
+
+To view a document in Phrction, you must first be able to view all of its
+ancestors. So a user can only see {nav Zoo > Animals > Zebra Information} if
+they can see the pages {nav Zoo} and {nav Zoo > Animals}.
+
+This allows sections of the wiki to be restricted by applying a restrictive
+policy to the parent (or grandparent) document. For example, if you apply a
+restrictive view policy to the {nav Zoo} page, it will implicitly apply to
+all sub-pages, including {nav Zoo > Animals > Zebra Information}.
+
+
+Versions and Drafts
+===================
+
+Document content is tracked with linear version numbers: version 1, version 2,
+version 3, and so on. Each time a page is edited, a new version of the page is
+created.
+
+You can {nav View History} to review older versions of a page and see how it
+has changed over time (and who has changed it).
+
+When you visit a particular document, you are normally shown the most recent
+version of that document. For example, if there are 17 versions, you'll see
+version 17.
+
+Likewise, when you edit a document using {nav Edit Document > Save and Publish},
+your changes are published immediately. If there were previously 17 versions,
+your new changes will become version 18 and visitors to the document will begin
+seeing version 18.
+
+If you want to edit a document without publishing the changes right away, you
+can use {nav Edit Document > Save as Draft} instead. This will still create a
+new version 18, but it won't change which version users see when they visit the
+document: they'll still see version 17 (the last published version).
+
+You (and other users) can continue editing the draft by using
+{nav Edit Document}. (Once a document has an unpublished draft, editing will
+stay in draft mode.)
+
+Once you're satisfied with your changes, use {nav Publish Draft} to make your
+changes the current visible version of the document that users see by default
+when they visit it.
+
+If you made a mistake and published something you didn't intend to, you can
+navigate back to an older version of the document and use
+{nav Publish Older Version} to change the current visible version of the
+document to some older version.
+
+Note that draft versions are still normal versions of the document: they are
+not private, they can not be deleted, other users can see them if they can see
+the document, and they will eventually become a standard part of the document
+history. The only private parts of drafts are: editing a draft does not
+generate a feed story; and users won't see draft content by default when
+viewing a document.
+
+Drafts may be a good fit if you are:
+
+  - working on changes over time; or
+  - starting with a rough change and refining it in several iterations; or
+  - collaborating with others on a change; or
+  - sharing changes before they're published to get feedback.

From 40d5d5c9848e0191edf0e4dda68aa72642a49913 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 14 Sep 2018 06:24:32 -0700
Subject: [PATCH 100/125] Remove "mailKey" from "PhabricatorRepositoryCommit"

Summary: Ref T13197. Ref T13065. This continues the gradual purge of dedicated "mailKey" columns in favor of shared infrastructure.

Test Plan:
  - Ran migration.
  - Visually inspected database.
  - Grepped for `mailKey`.
  - Added some comments, saw the daemons generate corresponding mail.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13197, T13065

Differential Revision: https://secure.phabricator.com/D19670
---
 .../autopatches/20180914.audit.01.mailkey.php | 26 +++++++++++++++++++
 .../autopatches/20180914.audit.02.rmkey.sql   |  2 ++
 .../storage/PhabricatorRepositoryCommit.php   | 10 -------
 3 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 resources/sql/autopatches/20180914.audit.01.mailkey.php
 create mode 100644 resources/sql/autopatches/20180914.audit.02.rmkey.sql

diff --git a/resources/sql/autopatches/20180914.audit.01.mailkey.php b/resources/sql/autopatches/20180914.audit.01.mailkey.php
new file mode 100644
index 0000000000..de8419a3c4
--- /dev/null
+++ b/resources/sql/autopatches/20180914.audit.01.mailkey.php
@@ -0,0 +1,26 @@
+<?php
+
+$commit_table = new PhabricatorRepositoryCommit();
+$commit_conn = $commit_table->establishConnection('w');
+$commit_name = $commit_table->getTableName();
+
+$properties_table = new PhabricatorMetaMTAMailProperties();
+$conn = $properties_table->establishConnection('w');
+
+$iterator = new LiskRawMigrationIterator($commit_conn, $commit_name);
+foreach ($iterator as $commit) {
+  queryfx(
+    $conn,
+    'INSERT IGNORE INTO %T
+        (objectPHID, mailProperties, dateCreated, dateModified)
+      VALUES
+        (%s, %s, %d, %d)',
+    $properties_table->getTableName(),
+    $commit['phid'],
+    phutil_json_encode(
+      array(
+        'mailKey' => $commit['mailKey'],
+      )),
+    PhabricatorTime::getNow(),
+    PhabricatorTime::getNow());
+}
diff --git a/resources/sql/autopatches/20180914.audit.02.rmkey.sql b/resources/sql/autopatches/20180914.audit.02.rmkey.sql
new file mode 100644
index 0000000000..3187da4258
--- /dev/null
+++ b/resources/sql/autopatches/20180914.audit.02.rmkey.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_repository.repository_commit
+  DROP mailKey;
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
index 0362aa778c..5615b5231f 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -25,7 +25,6 @@ final class PhabricatorRepositoryCommit
   protected $committerIdentityPHID;
   protected $commitIdentifier;
   protected $epoch;
-  protected $mailKey;
   protected $authorPHID;
   protected $auditStatus = DiffusionCommitAuditStatus::NONE;
   protected $summary = '';
@@ -116,7 +115,6 @@ final class PhabricatorRepositoryCommit
       self::CONFIG_TIMESTAMPS => false,
       self::CONFIG_COLUMN_SCHEMA => array(
         'commitIdentifier' => 'text40',
-        'mailKey' => 'bytes20',
         'authorPHID' => 'phid?',
         'authorIdentityPHID' => 'phid?',
         'committerIdentityPHID' => 'phid?',
@@ -321,13 +319,6 @@ final class PhabricatorRepositoryCommit
     return mpull($audits, 'getAuditorPHID');
   }
 
-  public function save() {
-    if (!$this->mailKey) {
-      $this->mailKey = Filesystem::readRandomCharacters(20);
-    }
-    return parent::save();
-  }
-
   public function delete() {
     $data = $this->loadCommitData();
     $audits = id(new PhabricatorRepositoryAuditRequest())
@@ -605,7 +596,6 @@ final class PhabricatorRepositoryCommit
       'phid' =>  $this->getPHID(),
       'commitIdentifier' =>  $this->getCommitIdentifier(),
       'epoch' => $this->getEpoch(),
-      'mailKey' => $this->getMailKey(),
       'authorPHID' => $this->getAuthorPHID(),
       'auditStatus' => $this->getAuditStatus(),
       'summary' => $this->getSummary(),

From 10f219fb82771669dfaa2405dc11bb2fb0eb6790 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 14 Sep 2018 06:34:17 -0700
Subject: [PATCH 101/125] Allow Drydock logs to be associated with
 RepositoryOperation objects

Summary: Ref T13197. See PHI873. I want to give RepositoryOperation objects access to Drydock logging like leases, resources, and blueprints currently have. This just does the schema/query changes, no actual UI or new logging yet.

Test Plan: Ran storage upgrade, poked around the UI looking for anything broken.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19671
---
 .../20180914.drydock.01.operationphid.sql     |  2 ++
 .../drydock/query/DrydockLogQuery.php         | 34 +++++++++++++++++++
 .../drydock/storage/DrydockLog.php            | 24 +++++++++++--
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 resources/sql/autopatches/20180914.drydock.01.operationphid.sql

diff --git a/resources/sql/autopatches/20180914.drydock.01.operationphid.sql b/resources/sql/autopatches/20180914.drydock.01.operationphid.sql
new file mode 100644
index 0000000000..bdfe02b0df
--- /dev/null
+++ b/resources/sql/autopatches/20180914.drydock.01.operationphid.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_drydock.drydock_log
+  ADD operationPHID VARBINARY(64);
diff --git a/src/applications/drydock/query/DrydockLogQuery.php b/src/applications/drydock/query/DrydockLogQuery.php
index 00980edb4d..b73ad371ae 100644
--- a/src/applications/drydock/query/DrydockLogQuery.php
+++ b/src/applications/drydock/query/DrydockLogQuery.php
@@ -5,6 +5,7 @@ final class DrydockLogQuery extends DrydockQuery {
   private $blueprintPHIDs;
   private $resourcePHIDs;
   private $leasePHIDs;
+  private $operationPHIDs;
 
   public function withBlueprintPHIDs(array $phids) {
     $this->blueprintPHIDs = $phids;
@@ -21,6 +22,11 @@ final class DrydockLogQuery extends DrydockQuery {
     return $this;
   }
 
+  public function withOperationPHIDs(array $phids) {
+    $this->operationPHIDs = $phids;
+    return $this;
+  }
+
   public function newResultObject() {
     return new DrydockLog();
   }
@@ -93,6 +99,27 @@ final class DrydockLogQuery extends DrydockQuery {
       $log->attachLease($lease);
     }
 
+    $operation_phids = array_filter(mpull($logs, 'getOperationPHID'));
+    if ($operation_phids) {
+      $operations = id(new DrydockRepositoryOperationQuery())
+        ->setParentQuery($this)
+        ->setViewer($this->getViewer())
+        ->withPHIDs($operation_phids)
+        ->execute();
+      $operations = mpull($operations, null, 'getPHID');
+    } else {
+      $operations = array();
+    }
+
+    foreach ($logs as $key => $log) {
+      $operation = null;
+      $operation_phid = $log->getOperationPHID();
+      if ($operation_phid) {
+        $operation = idx($operations, $operation_phid);
+      }
+      $log->attachOperation($operation);
+    }
+
     return $logs;
   }
 
@@ -120,6 +147,13 @@ final class DrydockLogQuery extends DrydockQuery {
         $this->leasePHIDs);
     }
 
+    if ($this->operationPHIDs !== null) {
+      $where[] = qsprintf(
+        $conn,
+        'operationPHID IN (%Ls)',
+        $this->operationPHIDs);
+    }
+
     return $where;
   }
 
diff --git a/src/applications/drydock/storage/DrydockLog.php b/src/applications/drydock/storage/DrydockLog.php
index 5d75d82c65..81879944a0 100644
--- a/src/applications/drydock/storage/DrydockLog.php
+++ b/src/applications/drydock/storage/DrydockLog.php
@@ -6,6 +6,7 @@ final class DrydockLog extends DrydockDAO
   protected $blueprintPHID;
   protected $resourcePHID;
   protected $leasePHID;
+  protected $operationPHID;
   protected $epoch;
   protected $type;
   protected $data = array();
@@ -13,6 +14,7 @@ final class DrydockLog extends DrydockDAO
   private $blueprint = self::ATTACHABLE;
   private $resource = self::ATTACHABLE;
   private $lease = self::ATTACHABLE;
+  private $operation = self::ATTACHABLE;
 
   protected function getConfiguration() {
     return array(
@@ -24,6 +26,7 @@ final class DrydockLog extends DrydockDAO
         'blueprintPHID' => 'phid?',
         'resourcePHID' => 'phid?',
         'leasePHID' => 'phid?',
+        'operationPHID' => 'phid?',
         'type' => 'text64',
       ),
       self::CONFIG_KEY_SCHEMA => array(
@@ -36,6 +39,9 @@ final class DrydockLog extends DrydockDAO
         'key_lease' => array(
           'columns' => array('leasePHID', 'type'),
         ),
+        'key_operation' => array(
+          'columns' => array('operationPHID', 'type'),
+        ),
         'epoch' => array(
           'columns' => array('epoch'),
         ),
@@ -70,6 +76,16 @@ final class DrydockLog extends DrydockDAO
     return $this->assertAttached($this->lease);
   }
 
+  public function attachOperation(
+    DrydockRepositoryOperation $operation = null) {
+    $this->operation = $operation;
+    return $this;
+  }
+
+  public function getOperation() {
+    return $this->assertAttached($this->operation);
+  }
+
   public function isComplete() {
     if ($this->getBlueprintPHID() && !$this->getBlueprint()) {
       return false;
@@ -83,6 +99,10 @@ final class DrydockLog extends DrydockDAO
       return false;
     }
 
+    if ($this->getOperationPHID() && !$this->getOperation()) {
+      return false;
+    }
+
     return true;
   }
 
@@ -108,8 +128,8 @@ final class DrydockLog extends DrydockDAO
 
   public function describeAutomaticCapability($capability) {
     return pht(
-      'To view log details, you must be able to view the associated '.
-      'blueprint, resource and lease.');
+      'To view log details, you must be able to view all associated '.
+      'blueprints, resources, leases, and repository operations.');
   }
 
 }

From 92bcf859747dcaed3871c0b9ecd7205dc43d0051 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 14 Sep 2018 06:48:06 -0700
Subject: [PATCH 102/125] Add Drydock logs to the RepositoryOperation UI

Summary:
Depends on D19671. Ref T13197. See PHI873.

Expose logs in the RepositoryOperation UI. Nothing writes the logs yet, so these interfaces are currently always empty.

Test Plan:
{F5887102}

{F5887103}

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19672
---
 .../PhabricatorDrydockApplication.php         |  2 ++
 .../controller/DrydockLogController.php       | 32 +++++++++++++++++++
 .../controller/DrydockLogListController.php   | 11 +++++++
 ...ydockRepositoryOperationViewController.php | 15 +++++++--
 .../drydock/query/DrydockLogSearchEngine.php  | 23 ++++++++++++-
 5 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/applications/drydock/application/PhabricatorDrydockApplication.php b/src/applications/drydock/application/PhabricatorDrydockApplication.php
index fef2c843ff..79bc1cb0d7 100644
--- a/src/applications/drydock/application/PhabricatorDrydockApplication.php
+++ b/src/applications/drydock/application/PhabricatorDrydockApplication.php
@@ -93,6 +93,8 @@ final class PhabricatorDrydockApplication extends PhabricatorApplication {
             '' => 'DrydockRepositoryOperationViewController',
             'status/' => 'DrydockRepositoryOperationStatusController',
             'dismiss/' => 'DrydockRepositoryOperationDismissController',
+            'logs/(?:query/(?P<queryKey>[^/]+)/)?' =>
+              'DrydockLogListController',
           ),
         ),
       ),
diff --git a/src/applications/drydock/controller/DrydockLogController.php b/src/applications/drydock/controller/DrydockLogController.php
index 704cbb53b9..69e0c84804 100644
--- a/src/applications/drydock/controller/DrydockLogController.php
+++ b/src/applications/drydock/controller/DrydockLogController.php
@@ -6,6 +6,7 @@ abstract class DrydockLogController
   private $blueprint;
   private $resource;
   private $lease;
+  private $operation;
 
   public function setBlueprint(DrydockBlueprint $blueprint) {
     $this->blueprint = $blueprint;
@@ -34,6 +35,15 @@ abstract class DrydockLogController
     return $this->lease;
   }
 
+  public function setOperation(DrydockRepositoryOperation $operation) {
+    $this->operation = $operation;
+    return $this;
+  }
+
+  public function getOperation() {
+    return $this->operation;
+  }
+
   public function buildSideNavView() {
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
@@ -56,6 +66,11 @@ abstract class DrydockLogController
       $engine->setLease($lease);
     }
 
+    $operation = $this->getOperation();
+    if ($operation) {
+      $engine->setOperation($operation);
+    }
+
     $engine->addNavigationItems($nav->getMenu());
 
     $nav->selectFilter(null);
@@ -66,9 +81,12 @@ abstract class DrydockLogController
   protected function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
 
+    $viewer = $this->getViewer();
+
     $blueprint = $this->getBlueprint();
     $resource = $this->getResource();
     $lease = $this->getLease();
+    $operation = $this->getOperation();
     if ($blueprint) {
       $id = $blueprint->getID();
 
@@ -111,6 +129,20 @@ abstract class DrydockLogController
       $crumbs->addTextCrumb(
         pht('Logs'),
         $this->getApplicationURI("lease/{$id}/logs/"));
+    } else if ($operation) {
+      $id = $operation->getID();
+
+      $crumbs->addTextCrumb(
+        pht('Operations'),
+        $this->getApplicationURI('operation/'));
+
+      $crumbs->addTextCrumb(
+        pht('Repository Operation %d', $id),
+        $this->getApplicationURI("operation/{$id}/"));
+
+      $crumbs->addTextCrumb(
+        pht('Logs'),
+        $this->getApplicationURI("operation/{$id}/logs/"));
     }
 
     return $crumbs;
diff --git a/src/applications/drydock/controller/DrydockLogListController.php b/src/applications/drydock/controller/DrydockLogListController.php
index b5e4d4ff0c..26719db39e 100644
--- a/src/applications/drydock/controller/DrydockLogListController.php
+++ b/src/applications/drydock/controller/DrydockLogListController.php
@@ -46,6 +46,17 @@ final class DrydockLogListController extends DrydockLogController {
         $engine->setLease($lease);
         $this->setLease($lease);
         break;
+      case 'operation':
+        $operation = id(new DrydockRepositoryOperationQuery())
+          ->setViewer($viewer)
+          ->withIDs(array($id))
+          ->executeOne();
+        if (!$operation) {
+          return new Aphront404Response();
+        }
+        $engine->setOperation($operation);
+        $this->setOperation($operation);
+        break;
       default:
         return new Aphront404Response();
     }
diff --git a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
index e7fbf07b35..23e381a1ee 100644
--- a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
+++ b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
@@ -47,13 +47,22 @@ final class DrydockRepositoryOperationViewController
       ->setUser($viewer)
       ->setOperation($operation);
 
+    $log_query = id(new DrydockLogQuery())
+      ->withOperationPHIDs(array($operation->getPHID()));
+
+    $logs = $this->buildLogBox(
+      $log_query,
+      $this->getApplicationURI("operation/{$id}/logs/query/all/"));
+
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->setCurtain($curtain)
       ->addPropertySection(pht('Properties'), $properties)
-      ->setMainColumn(array(
-        $status_view,
-      ));
+      ->setMainColumn(
+        array(
+          $status_view,
+          $logs,
+        ));
 
     return $this->newPage()
       ->setTitle($title)
diff --git a/src/applications/drydock/query/DrydockLogSearchEngine.php b/src/applications/drydock/query/DrydockLogSearchEngine.php
index 43b1511c01..3602714a60 100644
--- a/src/applications/drydock/query/DrydockLogSearchEngine.php
+++ b/src/applications/drydock/query/DrydockLogSearchEngine.php
@@ -5,6 +5,7 @@ final class DrydockLogSearchEngine extends PhabricatorApplicationSearchEngine {
   private $blueprint;
   private $resource;
   private $lease;
+  private $operation;
 
   public function setBlueprint(DrydockBlueprint $blueprint) {
     $this->blueprint = $blueprint;
@@ -33,6 +34,15 @@ final class DrydockLogSearchEngine extends PhabricatorApplicationSearchEngine {
     return $this->lease;
   }
 
+  public function setOperation(DrydockRepositoryOperation $operation) {
+    $this->operation = $operation;
+    return $this;
+  }
+
+  public function getOperation() {
+    return $this->operation;
+  }
+
   public function canUseInPanelContext() {
     // Prevent use on Dashboard panels since all log queries currently need a
     // parent object and these don't seem particularly useful in any case.
@@ -65,6 +75,11 @@ final class DrydockLogSearchEngine extends PhabricatorApplicationSearchEngine {
       $query->withLeasePHIDs(array($lease->getPHID()));
     }
 
+    $operation = $this->getOperation();
+    if ($operation) {
+      $query->withOperationPHIDs(array($operation->getPHID()));
+    }
+
     return $query;
   }
 
@@ -97,9 +112,15 @@ final class DrydockLogSearchEngine extends PhabricatorApplicationSearchEngine {
       return "/drydock/lease/{$id}/logs/{$path}";
     }
 
+    $operation = $this->getOperation();
+    if ($operation) {
+      $id = $operation->getID();
+      return "/drydock/operation/{$id}/logs/{$path}";
+    }
+
     throw new Exception(
       pht(
-        'Search engine has no blueprint, resource, or lease.'));
+        'Search engine has no blueprint, resource, lease, or operation.'));
   }
 
   protected function getBuiltinQueryNames() {

From a7e060f062e0c3c088a604f4ba5d74e0633bad8d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 14 Sep 2018 06:56:11 -0700
Subject: [PATCH 103/125] Write a trivial log when starting a repository
 operation

Summary:
Depends on D19672. Ref T13197. See PHI873. This writes a trivial log when we begin acting on a working copy and makes it look reasonable in the UI.

This is mostly just to prove that logging works properly.

Test Plan: {F5887697}

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19673
---
 src/__phutil_library_map__.php                |  2 +
 .../DrydockBlueprintViewController.php        |  5 +-
 .../drydock/controller/DrydockController.php  |  9 ++-
 .../controller/DrydockLeaseViewController.php |  5 +-
 ...ydockRepositoryOperationViewController.php |  5 +-
 .../DrydockResourceViewController.php         | 18 +++---
 .../logtype/DrydockOperationWorkLogType.php   | 19 +++++++
 .../DrydockRepositoryOperationPHIDType.php    |  4 +-
 .../storage/DrydockRepositoryOperation.php    | 37 ++++++++++++
 .../drydock/view/DrydockLogListView.php       | 57 +++++++++++++++++++
 ...DrydockRepositoryOperationUpdateWorker.php |  4 ++
 11 files changed, 150 insertions(+), 15 deletions(-)
 create mode 100644 src/applications/drydock/logtype/DrydockOperationWorkLogType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index c25019b1fb..ed10d0f9ef 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1168,6 +1168,7 @@ phutil_register_library_map(array(
     'DrydockManagementUpdateResourceWorkflow' => 'applications/drydock/management/DrydockManagementUpdateResourceWorkflow.php',
     'DrydockManagementWorkflow' => 'applications/drydock/management/DrydockManagementWorkflow.php',
     'DrydockObjectAuthorizationView' => 'applications/drydock/view/DrydockObjectAuthorizationView.php',
+    'DrydockOperationWorkLogType' => 'applications/drydock/logtype/DrydockOperationWorkLogType.php',
     'DrydockQuery' => 'applications/drydock/query/DrydockQuery.php',
     'DrydockRepositoryOperation' => 'applications/drydock/storage/DrydockRepositoryOperation.php',
     'DrydockRepositoryOperationController' => 'applications/drydock/controller/DrydockRepositoryOperationController.php',
@@ -6575,6 +6576,7 @@ phutil_register_library_map(array(
     'DrydockManagementUpdateResourceWorkflow' => 'DrydockManagementWorkflow',
     'DrydockManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'DrydockObjectAuthorizationView' => 'AphrontView',
+    'DrydockOperationWorkLogType' => 'DrydockLogType',
     'DrydockQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'DrydockRepositoryOperation' => array(
       'DrydockDAO',
diff --git a/src/applications/drydock/controller/DrydockBlueprintViewController.php b/src/applications/drydock/controller/DrydockBlueprintViewController.php
index d3f73bf78c..2c31e4ae8f 100644
--- a/src/applications/drydock/controller/DrydockBlueprintViewController.php
+++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php
@@ -58,8 +58,11 @@ final class DrydockBlueprintViewController extends DrydockBlueprintController {
     $log_query = id(new DrydockLogQuery())
       ->withBlueprintPHIDs(array($blueprint->getPHID()));
 
+    $log_table = $this->buildLogTable($log_query)
+      ->setHideBlueprints(true);
+
     $logs = $this->buildLogBox(
-      $log_query,
+      $log_table,
       $this->getApplicationURI("blueprint/{$id}/logs/query/all/"));
 
     $view = id(new PHUITwoColumnView())
diff --git a/src/applications/drydock/controller/DrydockController.php b/src/applications/drydock/controller/DrydockController.php
index 872a78f66f..f393f210d7 100644
--- a/src/applications/drydock/controller/DrydockController.php
+++ b/src/applications/drydock/controller/DrydockController.php
@@ -79,7 +79,7 @@ abstract class DrydockController extends PhabricatorController {
       ->addRawContent($table);
   }
 
-  protected function buildLogBox(DrydockLogQuery $query, $all_uri) {
+  protected function buildLogTable(DrydockLogQuery $query) {
     $viewer = $this->getViewer();
 
     $logs = $query
@@ -89,9 +89,12 @@ abstract class DrydockController extends PhabricatorController {
 
     $log_table = id(new DrydockLogListView())
       ->setUser($viewer)
-      ->setLogs($logs)
-      ->render();
+      ->setLogs($logs);
 
+    return $log_table;
+  }
+
+  protected function buildLogBox(DrydockLogListView $log_table, $all_uri) {
     $log_header = id(new PHUIHeaderView())
       ->setHeader(pht('Logs'))
       ->addActionLink(
diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php
index 18e1d0088d..dfffcf8402 100644
--- a/src/applications/drydock/controller/DrydockLeaseViewController.php
+++ b/src/applications/drydock/controller/DrydockLeaseViewController.php
@@ -43,8 +43,11 @@ final class DrydockLeaseViewController extends DrydockLeaseController {
     $log_query = id(new DrydockLogQuery())
       ->withLeasePHIDs(array($lease->getPHID()));
 
+    $log_table = $this->buildLogTable($log_query)
+      ->setHideLeases(true);
+
     $logs = $this->buildLogBox(
-      $log_query,
+      $log_table,
       $this->getApplicationURI("lease/{$id}/logs/query/all/"));
 
     $crumbs = $this->buildApplicationCrumbs();
diff --git a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
index 23e381a1ee..e255c63ec3 100644
--- a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
+++ b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
@@ -50,8 +50,11 @@ final class DrydockRepositoryOperationViewController
     $log_query = id(new DrydockLogQuery())
       ->withOperationPHIDs(array($operation->getPHID()));
 
+    $log_table = $this->buildLogTable($log_query)
+      ->setHideOperations(true);
+
     $logs = $this->buildLogBox(
-      $log_query,
+      $log_table,
       $this->getApplicationURI("operation/{$id}/logs/query/all/"));
 
     $view = id(new PHUITwoColumnView())
diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php
index 8718caa9e2..ec0dce53e1 100644
--- a/src/applications/drydock/controller/DrydockResourceViewController.php
+++ b/src/applications/drydock/controller/DrydockResourceViewController.php
@@ -48,8 +48,11 @@ final class DrydockResourceViewController extends DrydockResourceController {
     $log_query = id(new DrydockLogQuery())
       ->withResourcePHIDs(array($resource->getPHID()));
 
-    $log_box = $this->buildLogBox(
-      $log_query,
+    $log_table = $this->buildLogTable($log_query)
+      ->setHideResources(true);
+
+    $logs = $this->buildLogBox(
+      $log_table,
       $this->getApplicationURI("resource/{$id}/logs/query/all/"));
 
     $crumbs = $this->buildApplicationCrumbs();
@@ -86,11 +89,12 @@ final class DrydockResourceViewController extends DrydockResourceController {
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->setCurtain($curtain)
-      ->setMainColumn(array(
-        $object_box,
-        $lease_box,
-        $log_box,
-      ));
+      ->setMainColumn(
+        array(
+          $object_box,
+          $lease_box,
+          $logs,
+        ));
 
     return $this->newPage()
       ->setTitle($title)
diff --git a/src/applications/drydock/logtype/DrydockOperationWorkLogType.php b/src/applications/drydock/logtype/DrydockOperationWorkLogType.php
new file mode 100644
index 0000000000..deff90c16c
--- /dev/null
+++ b/src/applications/drydock/logtype/DrydockOperationWorkLogType.php
@@ -0,0 +1,19 @@
+<?php
+
+final class DrydockOperationWorkLogType extends DrydockLogType {
+
+  const LOGCONST = 'core.operation.work';
+
+  public function getLogTypeName() {
+    return pht('Started Work');
+  }
+
+  public function getLogTypeIcon(array $data) {
+    return 'fa-check green';
+  }
+
+  public function renderLog(array $data) {
+    return pht('Started this operation in a working copy.');
+  }
+
+}
diff --git a/src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php b/src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php
index 0926f92388..6222552f84 100644
--- a/src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php
+++ b/src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php
@@ -5,7 +5,7 @@ final class DrydockRepositoryOperationPHIDType extends PhabricatorPHIDType {
   const TYPECONST = 'DRYO';
 
   public function getTypeName() {
-    return pht('Drydock Repository Operation');
+    return pht('Repository Operation');
   }
 
   public function newObject() {
@@ -33,7 +33,7 @@ final class DrydockRepositoryOperationPHIDType extends PhabricatorPHIDType {
       $operation = $objects[$phid];
       $id = $operation->getID();
 
-      $handle->setName(pht('Drydock Repository Operation %d', $id));
+      $handle->setName(pht('Repository Operation %d', $id));
       $handle->setURI("/drydock/operation/{$id}/");
     }
   }
diff --git a/src/applications/drydock/storage/DrydockRepositoryOperation.php b/src/applications/drydock/storage/DrydockRepositoryOperation.php
index 809a10a116..142e14dcf7 100644
--- a/src/applications/drydock/storage/DrydockRepositoryOperation.php
+++ b/src/applications/drydock/storage/DrydockRepositoryOperation.php
@@ -25,6 +25,7 @@ final class DrydockRepositoryOperation extends DrydockDAO
   private $repository = self::ATTACHABLE;
   private $object = self::ATTACHABLE;
   private $implementation = self::ATTACHABLE;
+  private $workingCopyLease = self::ATTACHABLE;
 
   public static function initializeNewOperation(
     DrydockRepositoryOperationType $op) {
@@ -90,6 +91,19 @@ final class DrydockRepositoryOperation extends DrydockDAO
     return $this->implementation;
   }
 
+  public function getWorkingCopyLease() {
+    return $this->assertAttached($this->workingCopyLease);
+  }
+
+  public function attachWorkingCopyLease(DrydockLease $lease) {
+    $this->workingCopyLease = $lease;
+    return $this;
+  }
+
+  public function hasWorkingCopyLease() {
+    return ($this->workingCopyLease !== self::ATTACHABLE);
+  }
+
   public function getProperty($key, $default = null) {
     return idx($this->properties, $key, $default);
   }
@@ -189,6 +203,29 @@ final class DrydockRepositoryOperation extends DrydockDAO
     return $this->getProperty('exec.workingcopy.error');
   }
 
+  public function logEvent($type, array $data = array()) {
+    $log = id(new DrydockLog())
+      ->setEpoch(PhabricatorTime::getNow())
+      ->setType($type)
+      ->setData($data);
+
+    $log->setOperationPHID($this->getPHID());
+
+    if ($this->hasWorkingCopyLease()) {
+      $lease = $this->getWorkingCopyLease();
+      $log->setLeasePHID($lease->getPHID());
+
+      $resource_phid = $lease->getResourcePHID();
+      if ($resource_phid) {
+        $resource = $lease->getResource();
+
+        $log->setResourcePHID($resource->getPHID());
+        $log->setBlueprintPHID($resource->getBlueprintPHID());
+      }
+    }
+
+    return $log->save();
+  }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
diff --git a/src/applications/drydock/view/DrydockLogListView.php b/src/applications/drydock/view/DrydockLogListView.php
index 61fde7cee7..32f5d0d7ed 100644
--- a/src/applications/drydock/view/DrydockLogListView.php
+++ b/src/applications/drydock/view/DrydockLogListView.php
@@ -3,6 +3,46 @@
 final class DrydockLogListView extends AphrontView {
 
   private $logs;
+  private $hideBlueprints;
+  private $hideResources;
+  private $hideLeases;
+  private $hideOperations;
+
+  public function setHideBlueprints($hide_blueprints) {
+    $this->hideBlueprints = $hide_blueprints;
+    return $this;
+  }
+
+  public function getHideBlueprints() {
+    return $this->hideBlueprints;
+  }
+
+  public function setHideResources($hide_resources) {
+    $this->hideResources = $hide_resources;
+    return $this;
+  }
+
+  public function getHideResources() {
+    return $this->hideResources;
+  }
+
+  public function setHideLeases($hide_leases) {
+    $this->hideLeases = $hide_leases;
+    return $this;
+  }
+
+  public function getHideLeases() {
+    return $this->hideLeases;
+  }
+
+  public function setHideOperations($hide_operations) {
+    $this->hideOperations = $hide_operations;
+    return $this;
+  }
+
+  public function getHideOperations() {
+    return $this->hideOperations;
+  }
 
   public function setLogs(array $logs) {
     assert_instances_of($logs, 'DrydockLog');
@@ -41,6 +81,13 @@ final class DrydockLogListView extends AphrontView {
         $lease = null;
       }
 
+      $operation_phid = $log->getOperationPHID();
+      if ($operation_phid) {
+        $operation = $viewer->renderHandle($operation_phid);
+      } else {
+        $operation = null;
+      }
+
       if ($log->isComplete()) {
         $type_key = $log->getType();
         if (isset($types[$type_key])) {
@@ -72,6 +119,7 @@ final class DrydockLogListView extends AphrontView {
         $blueprint,
         $resource,
         $lease,
+        $operation,
         id(new PHUIIconView())->setIcon($icon),
         $type,
         $data,
@@ -86,16 +134,25 @@ final class DrydockLogListView extends AphrontView {
           pht('Blueprint'),
           pht('Resource'),
           pht('Lease'),
+          pht('Operation'),
           null,
           pht('Type'),
           pht('Data'),
           pht('Date'),
         ))
+      ->setColumnVisibility(
+        array(
+          !$this->getHideBlueprints(),
+          !$this->getHideResources(),
+          !$this->getHideLeases(),
+          !$this->getHideOperations(),
+        ))
       ->setColumnClasses(
         array(
           '',
           '',
           '',
+          '',
           'icon',
           '',
           'wide',
diff --git a/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php b/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
index 2ee9324fb6..c6e6927f22 100644
--- a/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php
@@ -59,6 +59,10 @@ final class DrydockRepositoryOperationUpdateWorker
       // No matter what happens here, destroy the lease away once we're done.
       $lease->setReleaseOnDestruction(true);
 
+      $operation->attachWorkingCopyLease($lease);
+
+      $operation->logEvent(DrydockOperationWorkLogType::LOGCONST);
+
       $operation->applyOperation($interface);
 
     } catch (PhabricatorWorkerYieldException $ex) {

From 0167f357b7233ec23d70985911254681b1c2e6d7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 14 Sep 2018 09:18:54 -0700
Subject: [PATCH 104/125] Provide a convenient way to log arbitrary text in
 Drydock without needing structured log classes

Summary: Depends on D19673. Ref T13197. See PHI873.

Test Plan:
Added some code like this:

```
$operation->logText('Nice convenient text logging.');
```

...then got:

{F5887712}

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13197

Differential Revision: https://secure.phabricator.com/D19674
---
 src/__phutil_library_map__.php                |  2 ++
 .../drydock/logtype/DrydockTextLogType.php    | 27 +++++++++++++++++++
 .../storage/DrydockRepositoryOperation.php    |  8 ++++++
 3 files changed, 37 insertions(+)
 create mode 100644 src/applications/drydock/logtype/DrydockTextLogType.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index ed10d0f9ef..8bcf3d6120 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1206,6 +1206,7 @@ phutil_register_library_map(array(
     'DrydockSlotLockException' => 'applications/drydock/exception/DrydockSlotLockException.php',
     'DrydockSlotLockFailureLogType' => 'applications/drydock/logtype/DrydockSlotLockFailureLogType.php',
     'DrydockTestRepositoryOperation' => 'applications/drydock/operation/DrydockTestRepositoryOperation.php',
+    'DrydockTextLogType' => 'applications/drydock/logtype/DrydockTextLogType.php',
     'DrydockWebrootInterface' => 'applications/drydock/interface/webroot/DrydockWebrootInterface.php',
     'DrydockWorker' => 'applications/drydock/worker/DrydockWorker.php',
     'DrydockWorkingCopyBlueprintImplementation' => 'applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php',
@@ -6620,6 +6621,7 @@ phutil_register_library_map(array(
     'DrydockSlotLockException' => 'Exception',
     'DrydockSlotLockFailureLogType' => 'DrydockLogType',
     'DrydockTestRepositoryOperation' => 'DrydockRepositoryOperationType',
+    'DrydockTextLogType' => 'DrydockLogType',
     'DrydockWebrootInterface' => 'DrydockInterface',
     'DrydockWorker' => 'PhabricatorWorker',
     'DrydockWorkingCopyBlueprintImplementation' => 'DrydockBlueprintImplementation',
diff --git a/src/applications/drydock/logtype/DrydockTextLogType.php b/src/applications/drydock/logtype/DrydockTextLogType.php
new file mode 100644
index 0000000000..8d6fe9264b
--- /dev/null
+++ b/src/applications/drydock/logtype/DrydockTextLogType.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Simple convenience log type for logging arbitrary text.
+ *
+ * Drydock logs can be given formal types, which allows them to be translated
+ * and filtered. If you don't particularly care about fancy logging features,
+ * you can use this log type to just dump some text into the log. Maybe you
+ * could upgrade to more formal logging later.
+ */
+final class DrydockTextLogType extends DrydockLogType {
+
+  const LOGCONST = 'core.text';
+
+  public function getLogTypeName() {
+    return pht('Text');
+  }
+
+  public function getLogTypeIcon(array $data) {
+    return 'fa-file-text-o grey';
+  }
+
+  public function renderLog(array $data) {
+    return idx($data, 'text');
+  }
+
+}
diff --git a/src/applications/drydock/storage/DrydockRepositoryOperation.php b/src/applications/drydock/storage/DrydockRepositoryOperation.php
index 142e14dcf7..195c5de8ec 100644
--- a/src/applications/drydock/storage/DrydockRepositoryOperation.php
+++ b/src/applications/drydock/storage/DrydockRepositoryOperation.php
@@ -203,6 +203,14 @@ final class DrydockRepositoryOperation extends DrydockDAO
     return $this->getProperty('exec.workingcopy.error');
   }
 
+  public function logText($text) {
+    return $this->logEvent(
+      DrydockTextLogType::LOGCONST,
+      array(
+        'text' => $text,
+      ));
+  }
+
   public function logEvent($type, array $data = array()) {
     $log = id(new DrydockLog())
       ->setEpoch(PhabricatorTime::getNow())

From e5c6a5749ad2dd881c30fcd4964494669bfe12f7 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 17 Sep 2018 15:10:29 -0700
Subject: [PATCH 105/125] Fix fatal in rendering Phriction "Moved Away" stories

Summary:
Ref T13202. See PHI881. These stories have bad rendering methods, but they didn't previously render into the timeilne (since Phriction documents didn't have a timeline).

Update the rendering to work.

The rendered outcome isn't great (it isn't very clear or explicit about exactly what moved where), but I'll fix that in a followup. This is a net improvement since it doesn't fatal the page, at least.

Test Plan:
  - Moved page "X" to "Y".
  - Viewed the old page "X".
  - Before patch: bad timeline story would fatal rendering.
  - After patch: story renders, at least, just not great.

Reviewers: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19682
---
 .../xaction/PhrictionDocumentMoveAwayTransaction.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php b/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
index 09ec56dd25..af77a5adea 100644
--- a/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
+++ b/src/applications/phriction/xaction/PhrictionDocumentMoveAwayTransaction.php
@@ -38,19 +38,19 @@ final class PhrictionDocumentMoveAwayTransaction
     $new = $this->getNewValue();
 
     return pht(
-      '%s moved this document to %s',
+      '%s moved this document to %s.',
       $this->renderAuthor(),
-      $this->renderHandleLink($new['phid']));
+      $this->renderObject($new['phid']));
   }
 
   public function getTitleForFeed() {
     $new = $this->getNewValue();
 
     return pht(
-      '%s moved %s to %s',
+      '%s moved %s to %s.',
       $this->renderAuthor(),
       $this->renderObject(),
-      $this->renderHandleLink($new['phid']));
+      $this->renderObject($new['phid']));
   }
 
   public function getIcon() {

From 5ba66e56fd54c5050c61fba4d792995071e0b0a4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 17 Sep 2018 15:16:00 -0700
Subject: [PATCH 106/125] Fix Phriction rendering for initial install and 404
 pages

Summary:
Depends on D19682. Ref T13202. We currently fatal when trying to render a timeline if:

  - an install is fresh, so there are no pages yet, and you look at "/w/"; or
  - you're looking at a Phriction page which doesn't exist (yet) like "/w/aadsflknadsflnf/".

Rendering a timeline and comment area doesn't make sense in these cases, so don't render them.

Test Plan: Hit both cases described above, got "new/empty page" prompts instead of fatals.

Reviewers: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19683
---
 .../PhrictionDocumentController.php           | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index 77f6a3529c..8da9807064 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -377,16 +377,21 @@ final class PhrictionDocumentController
       $page_content->setCurtain($curtain);
     }
 
-    $timeline = $this->buildTransactionTimeline(
-      $document,
-      new PhrictionTransactionQuery());
+    if ($document->getPHID()) {
+      $timeline = $this->buildTransactionTimeline(
+        $document,
+        new PhrictionTransactionQuery());
 
-    $edit_engine = id(new PhrictionDocumentEditEngine())
-      ->setViewer($viewer)
-      ->setTargetObject($document);
+      $edit_engine = id(new PhrictionDocumentEditEngine())
+        ->setViewer($viewer)
+        ->setTargetObject($document);
 
-    $comment_view = $edit_engine
-      ->buildEditEngineCommentView($document);
+      $comment_view = $edit_engine
+        ->buildEditEngineCommentView($document);
+    } else {
+      $timeline = null;
+      $comment_view = null;
+    }
 
     return $this->newPage()
       ->setTitle($page_title)

From 3244324cb1abeb5c7e7a1f78a4edb05914a3eb26 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 18 Sep 2018 07:46:40 -0700
Subject: [PATCH 107/125] Fix comment box borders in timelines after Phriction
 commenting

Summary:
Ref T13202. In D19660, I added comments to Phriction and tweaked some CSS.

One of these tweaks was getting rid of an extra border which was rendering under the comment area. However, I took off too much and ended up removing borders from other applications.

I think we don't actually need this `setNoBorder()` stuff after all -- a later change was sufficient to stop the actual border I was trying to get rid of from rendering. So this mostly just reverts part of D19660.

This rendering still isn't perfect, but I'm fine leaving that for another day for now.

Test Plan:
  - Viewed comment areas in Phriction. Saw correct number of borders (1).
  - Viewed comment areas in Maniphest. Saw correct number of borders (1).
  - Grepped for extraneous removed classs, no hits.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19684
---
 .../PhabricatorApplicationTransactionCommentView.php   |  2 +-
 src/view/phui/PHUIObjectBoxView.php                    | 10 +---------
 src/view/phui/PHUITimelineEventView.php                |  4 ++--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
index 8be45f8cde..c0f514c904 100644
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -23,6 +23,7 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
   private $fullWidth;
   private $infoView;
   private $editEngineLock;
+  private $noBorder;
 
   private $currentVersion;
   private $versionedDraft;
@@ -243,7 +244,6 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
 
     $comment_box = id(new PHUIObjectBoxView())
       ->setFlush(true)
-      ->setNoBorder(true)
       ->addClass('phui-comment-form-view')
       ->addSigil('phui-comment-form')
       ->appendChild(
diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php
index f19c485a36..f5fdbfffc4 100644
--- a/src/view/phui/PHUIObjectBoxView.php
+++ b/src/view/phui/PHUIObjectBoxView.php
@@ -25,7 +25,6 @@ final class PHUIObjectBoxView extends AphrontTagView {
   private $showHideHref;
   private $showHideContent;
   private $showHideOpen;
-  private $noBorder;
 
   private $propertyLists = array();
 
@@ -148,11 +147,6 @@ final class PHUIObjectBoxView extends AphrontTagView {
     return $this;
   }
 
-  public function setNoBorder($no_border) {
-    $this->noBorder = $no_border;
-    return $this;
-  }
-
   public function setValidationException(
     PhabricatorApplicationTransactionValidationException $ex = null) {
     $this->validationException = $ex;
@@ -162,9 +156,7 @@ final class PHUIObjectBoxView extends AphrontTagView {
   protected function getTagAttributes() {
     $classes = array();
     $classes[] = 'phui-box';
-    if (!$this->noBorder) {
-      $classes[] = 'phui-box-border';
-    }
+    $classes[] = 'phui-box-border';
     $classes[] = 'phui-object-box';
     $classes[] = 'mlt mll mlr';
 
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index 79aeb454b6..1cf6400bb5 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -402,7 +402,7 @@ final class PHUITimelineEventView extends AphrontView {
     $wedge = phutil_tag(
       'div',
       array(
-        'class' => 'phui-timeline-wedge phui-timeline-border',
+        'class' => 'phui-timeline-wedge',
         'style' => (nonempty($image_uri)) ? '' : 'display: none;',
       ),
       '');
@@ -461,7 +461,7 @@ final class PHUITimelineEventView extends AphrontView {
     $content = phutil_tag(
       'div',
       array(
-        'class' => 'phui-timeline-group phui-timeline-border',
+        'class' => 'phui-timeline-group',
       ),
       $content);
 

From 7db265cd5da532e8c3f1936702ce7fc0e5ee28a4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 23 Sep 2018 08:37:26 -0700
Subject: [PATCH 108/125] Parameterize the repository read and write locks

Summary:
Ref T13202. See PHI889. Update the read and write locks to the modern parameterized verison, which handles hashing/normalization and can store better logs.

This parameterized mode was added in D19173 and has been used successfully for some time, but not all locks have switched over to it yet.

Test Plan:
- Added an `fprintf(STDERR, $full_name)` to the lock code.
- Pulled a repository.
- Saw sensible lock name on stdout before "acquired read lock...".
- Additional changes in this patch series will vet this more completely.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19701
---
 .../PhabricatorRepositoryWorkingCopyVersion.php  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php b/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
index da5d54b57d..e297dfbf0e 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryWorkingCopyVersion.php
@@ -76,18 +76,20 @@ final class PhabricatorRepositoryWorkingCopyVersion
 
 
   public static function getReadLock($repository_phid, $device_phid) {
-    $repository_hash = PhabricatorHash::digestForIndex($repository_phid);
-    $device_hash = PhabricatorHash::digestForIndex($device_phid);
-    $lock_key = "repo.read({$repository_hash}, {$device_hash})";
+    $parameters = array(
+      'repositoryPHID' => $repository_phid,
+      'devicePHID' => $device_phid,
+    );
 
-    return PhabricatorGlobalLock::newLock($lock_key);
+    return PhabricatorGlobalLock::newLock('repo.read', $parameters);
   }
 
   public static function getWriteLock($repository_phid) {
-    $repository_hash = PhabricatorHash::digestForIndex($repository_phid);
-    $lock_key = "repo.write({$repository_hash})";
+    $parameters = array(
+      'repositoryPHID' => $repository_phid,
+    );
 
-    return PhabricatorGlobalLock::newLock($lock_key);
+    return PhabricatorGlobalLock::newLock('repo.write', $parameters);
   }
 
 

From 021c612cb228ad29fb1d4d7f63276cf29bef754a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 23 Sep 2018 11:01:29 -0700
Subject: [PATCH 109/125] When we fail to acquire a repository lock, try to
 provide a hint about why

Summary:
Ref T13202. See PHI889. If the lock log is enabled, we can try to offer more details about lock holders.

When we fail to acquire a lock:

  - check for recent acquisitions and suggest that this is a bottleneck issue;
  - if there are no recent acquisitions, check for the last acquisition and print details about it (what process, how long ago, whether or not we believe it was released).

Test Plan:
  - Enabled the lock log.
  - Changed the lock wait time to 1 second.
  - Added a `sleep(10)` after grabbing the lock.
  - In one window, ran a Conduit call or a `git fetch`.
  - In another window, ran another operation.
  - Got useful/sensible errors for both ssh and web lock holders, for example:

> PhutilProxyException: Failed to acquire read lock after waiting 1 second(s). You may be able to retry later. (This lock was most recently acquired by a process (pid=12609, host=orbital-3.local, sapi=apache2handler, controller=PhabricatorConduitAPIController, method=diffusion.rawdiffquery) 3 second(s) ago. There is no record of this lock being released.)

> PhutilProxyException: Failed to acquire read lock after waiting 1 second(s). You may be able to retry later. (This lock was most recently acquired by a process (pid=65251, host=orbital-3.local, sapi=cli, argv=/Users/epriestley/dev/core/lib/phabricator/bin/ssh-exec --phabricator-ssh-device local.phacility.net --phabricator-ssh-key 2) 2 second(s) ago. There is no record of this lock being released.)

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19702
---
 .../DiffusionRepositoryClusterEngine.php      |  14 +-
 .../util/PhabricatorGlobalLock.php            | 160 +++++++++++++++++-
 2 files changed, 160 insertions(+), 14 deletions(-)

diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
index d5ba74a30e..b09b3960a1 100644
--- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
@@ -170,12 +170,13 @@ final class DiffusionRepositoryClusterEngine extends Phobject {
           pht(
             'Acquired read lock immediately.'));
       }
-    } catch (Exception $ex) {
+    } catch (PhutilLockException $ex) {
       throw new PhutilProxyException(
         pht(
           'Failed to acquire read lock after waiting %s second(s). You '.
-          'may be able to retry later.',
-          new PhutilNumber($lock_wait)),
+          'may be able to retry later. (%s)',
+          new PhutilNumber($lock_wait),
+          $ex->getHint()),
         $ex);
     }
 
@@ -349,12 +350,13 @@ final class DiffusionRepositoryClusterEngine extends Phobject {
           pht(
             'Acquired write lock immediately.'));
       }
-    } catch (Exception $ex) {
+    } catch (PhutilLockException $ex) {
       throw new PhutilProxyException(
         pht(
           'Failed to acquire write lock after waiting %s second(s). You '.
-          'may be able to retry later.',
-          new PhutilNumber($lock_wait)),
+          'may be able to retry later. (%s)',
+          new PhutilNumber($lock_wait),
+          $ex->getHint()),
         $ex);
     }
 
diff --git a/src/infrastructure/util/PhabricatorGlobalLock.php b/src/infrastructure/util/PhabricatorGlobalLock.php
index 827d7e0e3d..221a75b37c 100644
--- a/src/infrastructure/util/PhabricatorGlobalLock.php
+++ b/src/infrastructure/util/PhabricatorGlobalLock.php
@@ -144,7 +144,8 @@ final class PhabricatorGlobalLock extends PhutilLock {
 
     $ok = head($result);
     if (!$ok) {
-      throw new PhutilLockException($lock_name);
+      throw id(new PhutilLockException($lock_name))
+        ->setHint($this->newHint($lock_name, $wait));
     }
 
     $conn->rememberLock($lock_name);
@@ -152,13 +153,7 @@ final class PhabricatorGlobalLock extends PhutilLock {
     $this->conn = $conn;
 
     if ($this->shouldLogLock()) {
-      global $argv;
-
-      $lock_context = array(
-        'pid' => getmypid(),
-        'host' => php_uname('n'),
-        'argv' => $argv,
-      );
+      $lock_context = $this->newLockContext();
 
       $log = id(new PhabricatorDaemonLockLog())
         ->setLockName($lock_name)
@@ -228,4 +223,153 @@ final class PhabricatorGlobalLock extends PhutilLock {
     return true;
   }
 
+  private function newLockContext() {
+    $context = array(
+      'pid' => getmypid(),
+      'host' => php_uname('n'),
+      'sapi' => php_sapi_name(),
+    );
+
+    global $argv;
+    if ($argv) {
+      $context['argv'] = $argv;
+    }
+
+    $access_log = null;
+
+    // TODO: There's currently no cohesive way to get the parameterized access
+    // log for the current request across different request types. Web requests
+    // have an "AccessLog", SSH requests have an "SSHLog", and other processes
+    // (like scripts) have no log. But there's no method to say "give me any
+    // log you've got". For now, just test if we have a web request and use the
+    // "AccessLog" if we do, since that's the only one we actually read any
+    // parameters from.
+
+    // NOTE: "PhabricatorStartup" is only available from web requests, not
+    // from CLI scripts.
+    if (class_exists('PhabricatorStartup', false)) {
+      $access_log = PhabricatorAccessLog::getLog();
+    }
+
+    if ($access_log) {
+      $controller = $access_log->getData('C');
+      if ($controller) {
+        $context['controller'] = $controller;
+      }
+
+      $method = $access_log->getData('m');
+      if ($method) {
+        $context['method'] = $method;
+      }
+    }
+
+    return $context;
+  }
+
+  private function newHint($lock_name, $wait) {
+    if (!$this->shouldLogLock()) {
+      return pht(
+        'Enable the lock log for more detailed information about '.
+        'which process is holding this lock.');
+    }
+
+    $now = PhabricatorTime::getNow();
+
+    // First, look for recent logs. If other processes have been acquiring and
+    // releasing this lock while we've been waiting, this is more likely to be
+    // a contention/throughput issue than an issue with something hung while
+    // holding the lock.
+    $limit = 100;
+    $logs = id(new PhabricatorDaemonLockLog())->loadAllWhere(
+      'lockName = %s AND dateCreated >= %d ORDER BY id ASC LIMIT %d',
+      $lock_name,
+      ($now - $wait),
+      $limit);
+
+    if ($logs) {
+      if (count($logs) === $limit) {
+        return pht(
+          'During the last %s second(s) spent waiting for the lock, more '.
+          'than %s other process(es) acquired it, so this is likely a '.
+          'bottleneck. Use "bin/lock log --name %s" to review log activity.',
+          new PhutilNumber($wait),
+          new PhutilNumber($limit),
+          $lock_name);
+      } else {
+        return pht(
+          'During the last %s second(s) spent waiting for the lock, %s '.
+          'other process(es) acquired it, so this is likely a '.
+          'bottleneck. Use "bin/lock log --name %s" to review log activity.',
+          new PhutilNumber($wait),
+          phutil_count($logs),
+          $lock_name);
+      }
+    }
+
+    $last_log = id(new PhabricatorDaemonLockLog())->loadOneWhere(
+      'lockName = %s ORDER BY id DESC LIMIT 1',
+      $lock_name);
+
+    if ($last_log) {
+      $info = array();
+
+      $acquired = $last_log->getDateCreated();
+      $context = $last_log->getLockContext();
+
+      $process_info = array();
+
+      $pid = idx($context, 'pid');
+      if ($pid) {
+        $process_info[] = 'pid='.$pid;
+      }
+
+      $host = idx($context, 'host');
+      if ($host) {
+        $process_info[] = 'host='.$host;
+      }
+
+      $sapi = idx($context, 'sapi');
+      if ($sapi) {
+        $process_info[] = 'sapi='.$sapi;
+      }
+
+      $argv = idx($context, 'argv');
+      if ($argv) {
+        $process_info[] = 'argv='.(string)csprintf('%LR', $argv);
+      }
+
+      $controller = idx($context, 'controller');
+      if ($controller) {
+        $process_info[] = 'controller='.$controller;
+      }
+
+      $method = idx($context, 'method');
+      if ($method) {
+        $process_info[] = 'method='.$method;
+      }
+
+      $process_info = implode(', ', $process_info);
+
+      $info[] = pht(
+        'This lock was most recently acquired by a process (%s) '.
+        '%s second(s) ago.',
+        $process_info,
+        new PhutilNumber($now - $acquired));
+
+      $released = $last_log->getLockReleased();
+      if ($released) {
+        $info[] = pht(
+          'This lock was released %s second(s) ago.',
+          new PhutilNumber($now - $released));
+      } else {
+        $info[] = pht('There is no record of this lock being released.');
+      }
+
+      return implode(' ', $info);
+    }
+
+    return pht(
+      'Found no records of processes acquiring or releasing this lock.');
+  }
+
 }

From 8065433ee8dcfd31ca544c52b3bcc620db9df13f Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Fri, 17 Aug 2018 12:24:53 -0700
Subject: [PATCH 110/125] Migrate DiffusionBlameController to use repo
 identities

Summary:
Now on the blame page, identities get `avatar.png` and there are little tooltips that show a few characters of the committer identity string.

Also add a default icon for repo identities.

Test Plan: Loaded some blame pages for files touched by users with and without repo identities attached.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D19587
---
 .../diffusion/controller/DiffusionBlameController.php        | 5 +----
 .../phid/PhabricatorRepositoryIdentityPHIDType.php           | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBlameController.php b/src/applications/diffusion/controller/DiffusionBlameController.php
index 42cabbc0d9..95cc039217 100644
--- a/src/applications/diffusion/controller/DiffusionBlameController.php
+++ b/src/applications/diffusion/controller/DiffusionBlameController.php
@@ -118,10 +118,6 @@ final class DiffusionBlameController extends DiffusionController {
         $author_phid = $commit->getAuthorDisplayPHID();
       }
 
-      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.
@@ -137,6 +133,7 @@ final class DiffusionBlameController extends DiffusionController {
         $author_meta = array(
           'tip' => $handles[$author_phid]->getName(),
           'align' => 'E',
+          'size'  => 'auto',
         );
       }
 
diff --git a/src/applications/repository/phid/PhabricatorRepositoryIdentityPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryIdentityPHIDType.php
index 5d9b06e0a3..873cfbbae6 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryIdentityPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryIdentityPHIDType.php
@@ -30,6 +30,7 @@ final class PhabricatorRepositoryIdentityPHIDType
     array $handles,
     array $objects) {
 
+    $avatar_uri = celerity_get_resource_uri('/rsrc/image/avatar.png');
     foreach ($handles as $phid => $handle) {
       $identity = $objects[$phid];
 
@@ -40,6 +41,7 @@ final class PhabricatorRepositoryIdentityPHIDType
       $handle->setName($name);
       $handle->setURI($identity->getURI());
       $handle->setIcon('fa-user');
+      $handle->setImageURI($avatar_uri);
     }
   }
 

From dbf2302b6c67a4532e1019b41f80e8c07aee824a Mon Sep 17 00:00:00 2001
From: Austin McKinley <austin@phacility.com>
Date: Fri, 28 Sep 2018 13:40:26 -0700
Subject: [PATCH 111/125] Fix self-cancelling typo

Summary: Ref D18268. This typo cancelled itself out, and I can't find any other callers.

Test Plan: arc unit

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
index b09b3960a1..f85c7862fe 100644
--- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
@@ -208,7 +208,7 @@ final class DiffusionRepositoryClusterEngine extends Phobject {
 
           $this->synchronizeWorkingCopyFromDevices($fetchable);
         } else {
-          $this->synchornizeWorkingCopyFromRemote();
+          $this->synchronizeWorkingCopyFromRemote();
         }
 
         PhabricatorRepositoryWorkingCopyVersion::updateVersion(
@@ -609,7 +609,7 @@ final class DiffusionRepositoryClusterEngine extends Phobject {
   /**
    * @task internal
    */
-  private function synchornizeWorkingCopyFromRemote() {
+  private function synchronizeWorkingCopyFromRemote() {
     $repository = $this->getRepository();
     $device = AlmanacKeys::getLiveDevice();
 

From 39b85c0be03967b86ee5f3b530d8d0a2e5b3f2de Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 1 Oct 2018 10:00:17 -0700
Subject: [PATCH 112/125] Use the changeset parse cache when rendering inline
 comments in mail

Summary:
Ref T13202. See PHI903 and PHI894. When a bot leaves 100 inline comments on the same file and the revision has a 30-member recipient list, we currently highlight the file 3000 times when building mail.

Instead, engage the parse cache so we highlight it once and reuse the cache 2,999 times.

Test Plan:
  - Added debugging code to stop after mail generation and show cache hits/misses.
    - Left a bunch of inlines in a file.
    - Ran the worker with `bin/worker execute --id ...`.
    - Before change: saw 4 comments x 2 recipients = 8 cache misses
    - After change: saw 8 cache hits (cache already filled from web UI rendering)
  - Removed debugging code, ran worker to completion.
  - Used `bin/mail show-outbound --id ... --dump-html` to inspect resulting mail, saw no functional differences.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19721
---
 .../differential/mail/DifferentialInlineCommentMailView.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/differential/mail/DifferentialInlineCommentMailView.php b/src/applications/differential/mail/DifferentialInlineCommentMailView.php
index 57958202b1..d88effa46c 100644
--- a/src/applications/differential/mail/DifferentialInlineCommentMailView.php
+++ b/src/applications/differential/mail/DifferentialInlineCommentMailView.php
@@ -345,7 +345,13 @@ final class DifferentialInlineCommentMailView
       $offset_mode = 'old';
     }
 
+    // See PHI894. Use the parse cache since we can end up with a large
+    // rendering cost otherwise when users or bots leave hundreds of inline
+    // comments on diffs with long recipient lists.
+    $cache_key = $changeset->getID();
+
     $parser = id(new DifferentialChangesetParser())
+      ->setRenderCacheKey($cache_key)
       ->setUser($viewer)
       ->setChangeset($changeset)
       ->setOffsetMode($offset_mode)

From 4858d43d1601fd93f3af0e9c32fa7930cb1cee58 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 1 Oct 2018 10:49:44 -0700
Subject: [PATCH 113/125] Add 'autocomplete="off"' to MFA TOTP inputs

Summary:
Ref T13202. See <https://discourse.phabricator-community.org/t/2fa-input-box-isnt-hinted-as-a-password-so-browsers-suggest-auto-fills/1959>.

If browsers are autofilling this, I think browser behavior here is bad, but behavior is probably better on the balance if we hint this as `autocomplete="off"` and this is a minor concesssion.

Test Plan:
  - I couldn't immediately get any browser to try to autofill this field (perhaps I've disabled autofill, or just not enabled it aggressively?), but this change didn't break anything.
  - After the change, answered a TOTP prompt normally.
  - After the change, inspected page content and saw `autocomplete="off"` on the `<input />` node.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19722
---
 .../auth/factor/PhabricatorTOTPAuthFactor.php  |  1 +
 .../form/control/PHUIFormNumberControl.php     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php b/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
index 10c44aaec0..373adfbb54 100644
--- a/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
+++ b/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
@@ -154,6 +154,7 @@ final class PhabricatorTOTPAuthFactor extends PhabricatorAuthFactor {
       id(new PHUIFormNumberControl())
         ->setName($this->getParameterName($config, 'totpcode'))
         ->setLabel(pht('App Code'))
+        ->setDisableAutocomplete(true)
         ->setCaption(pht('Factor Name: %s', $config->getFactorName()))
         ->setValue(idx($validation_result, 'value'))
         ->setError(idx($validation_result, 'error', true)));
diff --git a/src/view/form/control/PHUIFormNumberControl.php b/src/view/form/control/PHUIFormNumberControl.php
index d65e590746..26e7e03955 100644
--- a/src/view/form/control/PHUIFormNumberControl.php
+++ b/src/view/form/control/PHUIFormNumberControl.php
@@ -2,11 +2,28 @@
 
 final class PHUIFormNumberControl extends AphrontFormControl {
 
+  private $disableAutocomplete;
+
+  public function setDisableAutocomplete($disable_autocomplete) {
+    $this->disableAutocomplete = $disable_autocomplete;
+    return $this;
+  }
+
+  public function getDisableAutocomplete() {
+    return $this->disableAutocomplete;
+  }
+
   protected function getCustomControlClass() {
     return 'phui-form-number';
   }
 
   protected function renderInput() {
+    if ($this->getDisableAutocomplete()) {
+      $autocomplete = 'off';
+    } else {
+      $autocomplete = null;
+    }
+
     return javelin_tag(
       'input',
       array(
@@ -15,6 +32,7 @@ final class PHUIFormNumberControl extends AphrontFormControl {
         'name' => $this->getName(),
         'value' => $this->getValue(),
         'disabled' => $this->getDisabled() ? 'disabled' : null,
+        'autocomplete' => $autocomplete,
         'id' => $this->getID(),
       ));
   }

From cfd9fa7f559f993e31fcd6915b4857e0de877506 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 1 Oct 2018 11:06:00 -0700
Subject: [PATCH 114/125] Add an explicit "max-width" to PHUIDocumentPro pages
 to force large tables to scroll

Summary:
Ref T13202. See <https://discourse.phabricator-community.org/t/phriction-page-controls-lost-after-creating-very-wide-table/1961>.

If you put a very wide table in the markup for a new-layout Phriction page, it can push the actions element off screen to the right.

Tables already get a scrollbar if encouraged strongly enough; add a `max-width` to encourage them.

Test Plan:
  - Viewed pages with a large wrappable and non-wrappable content on mobile, tablet, and desktop.

{F5915976}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202

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

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 720683c371..b6817f97eb 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -146,7 +146,7 @@ return array(
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
     'rsrc/css/phui/phui-crumbs-view.css' => '10728aaa',
     'rsrc/css/phui/phui-curtain-view.css' => '2bdaf026',
-    'rsrc/css/phui/phui-document-pro.css' => 'd033e8d5',
+    'rsrc/css/phui/phui-document-pro.css' => 'dd79b5df',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
     'rsrc/css/phui/phui-document.css' => 'c4ac41f9',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
@@ -814,7 +814,7 @@ return array(
     'phui-curtain-view-css' => '2bdaf026',
     'phui-document-summary-view-css' => '9ca48bdf',
     'phui-document-view-css' => 'c4ac41f9',
-    'phui-document-view-pro-css' => 'd033e8d5',
+    'phui-document-view-pro-css' => 'dd79b5df',
     'phui-feed-story-css' => '44a9c8e9',
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css
index 520ae597cb..84dc11601f 100644
--- a/webroot/rsrc/css/phui/phui-document-pro.css
+++ b/webroot/rsrc/css/phui/phui-document-pro.css
@@ -34,6 +34,12 @@
   layout: fixed;
 }
 
+/* Force very wide content, like tables with many columns, to scroll inside
+   the frame. See T13202. */
+.phui-document-content-view {
+  max-width: 800px;
+}
+
 .device-desktop .phui-document-content-inner {
   display: table-row;
 }

From c6c1893dc0be027adf17355f6bd607f00b94b7bf Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 5 Oct 2018 11:07:28 -0700
Subject: [PATCH 115/125] Allow revisions to be filtered by created date

Summary:
Ref T13202. See PHI906. This is a reasonable capability which we support in some other applications already.

(The only real reason not to support this is that it creates some clutter in the UI, but I think we're generally in better shape now than we were in the past, and we could make this UI collapse/fold at some point.)

Test Plan: Ran queries with a minimum date, a maximum date, both, and neither. Saw appropriate results in all cases.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202

Differential Revision: https://secure.phabricator.com/D19732
---
 .../query/DifferentialRevisionQuery.php       | 22 +++++++++++++++++++
 .../DifferentialRevisionSearchEngine.php      | 16 ++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index 727a4ca184..bc93de2db2 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -25,6 +25,8 @@ final class DifferentialRevisionQuery
   private $updatedEpochMax;
   private $statuses;
   private $isOpen;
+  private $createdEpochMin;
+  private $createdEpochMax;
 
   const ORDER_MODIFIED      = 'order-modified';
   const ORDER_CREATED       = 'order-created';
@@ -206,6 +208,12 @@ final class DifferentialRevisionQuery
     return $this;
   }
 
+  public function withCreatedEpochBetween($min, $max) {
+    $this->createdEpochMin = $min;
+    $this->createdEpochMax = $max;
+    return $this;
+  }
+
 
   /**
    * Set whether or not the query should load the active diff for each
@@ -687,6 +695,20 @@ final class DifferentialRevisionQuery
         $this->updatedEpochMax);
     }
 
+    if ($this->createdEpochMin !== null) {
+      $where[] = qsprintf(
+        $conn_r,
+        'r.dateCreated >= %d',
+        $this->createdEpochMin);
+    }
+
+    if ($this->createdEpochMax !== null) {
+      $where[] = qsprintf(
+        $conn_r,
+        'r.dateCreated <= %d',
+        $this->createdEpochMax);
+    }
+
     if ($this->statuses !== null) {
       $where[] = qsprintf(
         $conn_r,
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
index 835291fba8..557ca23078 100644
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -45,6 +45,12 @@ final class DifferentialRevisionSearchEngine
       $query->withStatuses($map['statuses']);
     }
 
+    if ($map['createdStart'] || $map['createdEnd']) {
+      $query->withCreatedEpochBetween(
+        $map['createdStart'],
+        $map['createdEnd']);
+    }
+
     return $query;
   }
 
@@ -84,6 +90,16 @@ final class DifferentialRevisionSearchEngine
         ->setDatasource(new DifferentialRevisionStatusFunctionDatasource())
         ->setDescription(
           pht('Find revisions with particular statuses.')),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created After'))
+        ->setKey('createdStart')
+        ->setDescription(
+          pht('Find revisions created at or after a particular time.')),
+      id(new PhabricatorSearchDateField())
+        ->setLabel(pht('Created Before'))
+        ->setKey('createdEnd')
+        ->setDescription(
+          pht('Find revisions created at or before a particular time.')),
     );
   }
 

From 99034efa8b8d0d7bc32aa28bd78f0aa7cfad12cc Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 5 Oct 2018 11:40:51 -0700
Subject: [PATCH 116/125] Make Pholio mail render without a ton of over-escaped
 HTML

Summary:
Ref T13202. See PHI900. Fixes T12814. Pholio currently builds HTML comments in an older way that can dump a bunch of over-escaped HTML into mail bodies.

Update the logic to be more similar to the Differential rendering logic and stop over-escaping things.

The result isn't perfect, but is dramatically less broken.

Test Plan: {F5919860}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202, T12814

Differential Revision: https://secure.phabricator.com/D19733
---
 .../editor/DifferentialTransactionEditor.php  |   4 +-
 .../pholio/editor/PholioMockEditor.php        | 104 +++++++++++-------
 .../pholio/storage/PholioMock.php             |   4 +
 .../pholio/storage/PholioTransaction.php      |   9 ++
 4 files changed, 79 insertions(+), 42 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index c452cb9346..5bc33dabe1 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -636,8 +636,8 @@ final class DifferentialTransactionEditor
 
     $viewer = $this->requireActor();
 
-    $body = new PhabricatorMetaMTAMailBody();
-    $body->setViewer($this->requireActor());
+    $body = id(new PhabricatorMetaMTAMailBody())
+      ->setViewer($viewer);
 
     $revision_uri = $object->getURI();
     $revision_uri = PhabricatorEnv::getProductionURI($revision_uri);
diff --git a/src/applications/pholio/editor/PholioMockEditor.php b/src/applications/pholio/editor/PholioMockEditor.php
index 6bd49d2e7b..d1f7daf3a5 100644
--- a/src/applications/pholio/editor/PholioMockEditor.php
+++ b/src/applications/pholio/editor/PholioMockEditor.php
@@ -128,51 +128,30 @@ final class PholioMockEditor extends PhabricatorApplicationTransactionEditor {
     PhabricatorLiskDAO $object,
     array $xactions) {
 
-    $body = new PhabricatorMetaMTAMailBody();
-    $headers = array();
-    $comments = array();
-    $inline_comments = array();
+    $viewer = $this->requireActor();
 
+    $body = id(new PhabricatorMetaMTAMailBody())
+      ->setViewer($viewer);
+
+    $mock_uri = $object->getURI();
+    $mock_uri = PhabricatorEnv::getProductionURI($mock_uri);
+
+    $this->addHeadersAndCommentsToMailBody(
+      $body,
+      $xactions,
+      pht('View Mock'),
+      $mock_uri);
+
+    $type_inline = PholioMockInlineTransaction::TRANSACTIONTYPE;
+
+    $inlines = array();
     foreach ($xactions as $xaction) {
-      if ($xaction->shouldHide()) {
-        continue;
-      }
-      $comment = $xaction->getComment();
-      switch ($xaction->getTransactionType()) {
-        case PholioMockInlineTransaction::TRANSACTIONTYPE:
-          if ($comment && strlen($comment->getContent())) {
-            $inline_comments[] = $comment;
-          }
-          break;
-        case PhabricatorTransactions::TYPE_COMMENT:
-          if ($comment && strlen($comment->getContent())) {
-            $comments[] = $comment->getContent();
-          }
-        // fallthrough
-        default:
-          $headers[] = id(clone $xaction)
-            ->setRenderingTarget('text')
-            ->getTitle();
-          break;
+      if ($xaction->getTransactionType() == $type_inline) {
+        $inlines[] = $xaction;
       }
     }
 
-    $body->addRawSection(implode("\n", $headers));
-
-    foreach ($comments as $comment) {
-      $body->addRawSection($comment);
-    }
-
-    if ($inline_comments) {
-      $body->addRawSection(pht('INLINE COMMENTS'));
-      foreach ($inline_comments as $comment) {
-        $text = pht(
-          'Image %d: %s',
-          $comment->getImageID(),
-          $comment->getContent());
-        $body->addRawSection($text);
-      }
-    }
+    $this->appendInlineCommentsForMail($object, $inlines, $body);
 
     $body->addLinkSection(
       pht('MOCK DETAIL'),
@@ -181,6 +160,51 @@ final class PholioMockEditor extends PhabricatorApplicationTransactionEditor {
     return $body;
   }
 
+  private function appendInlineCommentsForMail(
+    $object,
+    array $inlines,
+    PhabricatorMetaMTAMailBody $body) {
+
+    if (!$inlines) {
+      return;
+    }
+
+    $viewer = $this->requireActor();
+
+    $header = pht('INLINE COMMENTS');
+    $body->addRawPlaintextSection($header);
+    $body->addRawHTMLSection(phutil_tag('strong', array(), $header));
+
+    $image_ids = array();
+    foreach ($inlines as $inline) {
+      $comment = $inline->getComment();
+      $image_id = $comment->getImageID();
+      $image_ids[$image_id] = $image_id;
+    }
+
+    $images = id(new PholioImageQuery())
+      ->setViewer($viewer)
+      ->withIDs($image_ids)
+      ->execute();
+    $images = mpull($images, null, 'getID');
+
+    foreach ($inlines as $inline) {
+      $comment = $inline->getComment();
+      $content = $comment->getContent();
+      $image_id = $comment->getImageID();
+      $image = idx($images, $image_id);
+      if ($image) {
+        $image_name = $image->getName();
+      } else {
+        $image_name = pht('Unknown (ID %d)', $image_id);
+      }
+
+      $body->addRemarkupSection(
+        pht('Image "%s":', $image_name),
+        $content);
+    }
+  }
+
   protected function getMailSubjectPrefix() {
     return PhabricatorEnv::getEnvConfig('metamta.pholio.subject-prefix');
   }
diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php
index 523733b3df..569513cb46 100644
--- a/src/applications/pholio/storage/PholioMock.php
+++ b/src/applications/pholio/storage/PholioMock.php
@@ -58,6 +58,10 @@ final class PholioMock extends PholioDAO
     return 'M'.$this->getID();
   }
 
+  public function getURI() {
+    return '/'.$this->getMonogram();
+  }
+
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
diff --git a/src/applications/pholio/storage/PholioTransaction.php b/src/applications/pholio/storage/PholioTransaction.php
index a932cf2a60..240b9d93e6 100644
--- a/src/applications/pholio/storage/PholioTransaction.php
+++ b/src/applications/pholio/storage/PholioTransaction.php
@@ -53,4 +53,13 @@ final class PholioTransaction extends PhabricatorModularTransaction {
     return $tags;
   }
 
+  public function isInlineCommentTransaction() {
+    switch ($this->getTransactionType()) {
+      case PholioMockInlineTransaction::TRANSACTIONTYPE:
+        return true;
+    }
+
+    return parent::isInlineCommentTransaction();
+  }
+
 }

From 4928c34d00c2fd1e162331c49b0bd48c7663fc5c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 8 Oct 2018 10:16:25 -0700
Subject: [PATCH 117/125] Allow "bin/bulk export" to merge multiple queries and
 accept more flexible flags

Summary:
Ref T13210. Minor usability improvements to "bin/bulk export":

  - Allow `--class task` to work (previously, only `--class ManiphestTaskSearchEngine` worked).
  - If you run `--query jXIlzQyOYHPU`, don't require `--class`, since the query identifies the class on its own.
  - Allow users to call `--query A --query B --query C` and get a union of all results.

Test Plan:
  - Ran `--class task`, `--query A --query B`, `--query X` (with no `--class`), got good results.
  - Ran various flavors of bad combinations (queries from different engines, invalid engines, query and class differing, ambiguous/invalid `--class` name) and got sensible errors.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13210

Differential Revision: https://secure.phabricator.com/D19738
---
 ...habricatorBulkManagementExportWorkflow.php | 238 ++++++++++++++----
 .../export/engine/PhabricatorExportEngine.php |   2 +-
 2 files changed, 188 insertions(+), 52 deletions(-)

diff --git a/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php b/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
index cd0ed346fc..154c266da2 100644
--- a/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
+++ b/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
@@ -26,7 +26,8 @@ final class PhabricatorBulkManagementExportWorkflow
             'name' => 'query',
             'param' => 'key',
             'help' => pht(
-              'Export the data selected by this query.'),
+              'Export the data selected by one or more queries.'),
+            'repeat' => true,
           ),
           array(
             'name' => 'output',
@@ -47,56 +48,7 @@ final class PhabricatorBulkManagementExportWorkflow
   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));
-    }
+    list($engine, $queries) = $this->newQueries($args);
 
     $format_key = $args->getArg('format');
     if (!strlen($format_key)) {
@@ -140,6 +92,15 @@ final class PhabricatorBulkManagementExportWorkflow
       }
     }
 
+    // If we have more than one query, execute the queries to figure out which
+    // results they hit, then build a synthetic query for all those results
+    // using the IDs.
+    if (count($queries) > 1) {
+      $saved_query = $this->newUnionQuery($engine, $queries);
+    } else {
+      $saved_query = head($queries);
+    }
+
     $export_engine = id(new PhabricatorExportEngine())
       ->setViewer($viewer)
       ->setTitle(pht('Export'))
@@ -165,4 +126,179 @@ final class PhabricatorBulkManagementExportWorkflow
     return 0;
   }
 
+  private function newQueries(PhutilArgumentParser $args) {
+    $viewer = $this->getViewer();
+
+    $query_keys = $args->getArg('query');
+    if (!$query_keys) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Specify one or more queries to export with "--query".'));
+    }
+
+    $engine_classes = id(new PhutilClassMapQuery())
+      ->setAncestorClass('PhabricatorApplicationSearchEngine')
+      ->execute();
+
+    $class = $args->getArg('class');
+    if (strlen($class)) {
+
+      $class_list = array();
+      foreach ($engine_classes as $class_name => $engine_object) {
+        $can_export = id(clone $engine_object)
+          ->setViewer($viewer)
+          ->canExport();
+        if ($can_export) {
+          $class_list[] = $class_name;
+        }
+      }
+
+      sort($class_list);
+      $class_list = implode(', ', $class_list);
+
+      $matches = array();
+      foreach ($engine_classes as $class_name => $engine_object) {
+        if (stripos($class_name, $class) !== false) {
+          if (strtolower($class_name) == strtolower($class)) {
+            $matches = array($class_name);
+            break;
+          } else {
+            $matches[] = $class_name;
+          }
+        }
+      }
+
+      if (!$matches) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'No search engines match "%s". Available engines which support '.
+            'data export are: %s.',
+            $class,
+            $class_list));
+      } else if (count($matches) > 1) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Multiple search engines match "%s": %s.',
+            $class,
+            implode(', ', $matches)));
+      } else {
+        $class = head($matches);
+      }
+
+      $engine = newv($class, array())
+        ->setViewer($viewer);
+    } else {
+      $engine = null;
+    }
+
+    $queries = array();
+    foreach ($query_keys as $query_key) {
+      if ($engine) {
+        if ($engine->isBuiltinQuery($query_key)) {
+          $queries[$query_key] = $engine->buildSavedQueryFromBuiltin(
+            $query_key);
+          continue;
+        }
+      }
+
+      $saved_query = id(new PhabricatorSavedQueryQuery())
+        ->setViewer($viewer)
+        ->withQueryKeys(array($query_key))
+        ->executeOne();
+      if (!$saved_query) {
+        if (!$engine) {
+          throw new PhutilArgumentUsageException(
+            pht(
+              'Query "%s" is unknown. To run a builtin query like "all" or '.
+              '"active", also specify the search engine with "--class".',
+              $query_key));
+        } else {
+          throw new PhutilArgumentUsageException(
+            pht(
+              'Query "%s" is not a recognized query for class "%s".',
+              $query_key,
+              get_class($engine)));
+        }
+      }
+
+      $queries[$query_key] = $saved_query;
+    }
+
+    // If we don't have an engine from "--class", fill it in by looking at the
+    // class of the first query.
+    if (!$engine) {
+      foreach ($queries as $query) {
+        $engine = newv($query->getEngineClassName(), array())
+          ->setViewer($viewer);
+        break;
+      }
+    }
+
+    $engine_class = get_class($engine);
+
+    foreach ($queries as $query) {
+      $query_class = $query->getEngineClassName();
+      if ($query_class !== $engine_class) {
+        throw new PhutilArgumentUsageException(
+          pht(
+            'Specified queries use different engines: query "%s" uses '.
+            'engine "%s", not "%s". All queries must run on the same '.
+            'engine.',
+            $query->getQueryKey(),
+            $query_class,
+            $engine_class));
+      }
+    }
+
+    if (!$engine->canExport()) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'SearchEngine class ("%s") does not support data export.',
+          $engine_class));
+    }
+
+    return array($engine, $queries);
+  }
+
+  private function newUnionQuery(
+    PhabricatorApplicationSearchEngine $engine,
+    array $queries) {
+
+    assert_instances_of($queries, 'PhabricatorSavedQuery');
+
+    $engine = clone $engine;
+
+    $ids = array();
+    foreach ($queries as $saved_query) {
+      $page_size = 1000;
+      $page_cursor = null;
+      do {
+        $query = $engine->buildQueryFromSavedQuery($saved_query);
+        $pager = $engine->newPagerForSavedQuery($saved_query);
+        $pager->setPageSize($page_size);
+
+        if ($page_cursor !== null) {
+          $pager->setAfterID($page_cursor);
+        }
+
+        $objects = $engine->executeQuery($query, $pager);
+        $page_cursor = $pager->getNextPageID();
+
+        foreach ($objects as $object) {
+          $ids[] = $object->getID();
+        }
+      } while ($pager->getHasMoreResults());
+    }
+
+    // When we're merging multiple different queries, override any query order
+    // and just put the combined result list in ID order. At time of writing,
+    // we can't merge the result sets together while retaining the overall sort
+    // order even if they all used the same order, and it's meaningless to try
+    // to retain orders if the queries had different orders in the first place.
+    rsort($ids);
+
+    return id($engine->newSavedQuery())
+      ->setParameter('ids', $ids);
+  }
+
 }
diff --git a/src/infrastructure/export/engine/PhabricatorExportEngine.php b/src/infrastructure/export/engine/PhabricatorExportEngine.php
index f2c6a1270b..f29eaf0f60 100644
--- a/src/infrastructure/export/engine/PhabricatorExportEngine.php
+++ b/src/infrastructure/export/engine/PhabricatorExportEngine.php
@@ -125,7 +125,7 @@ final class PhabricatorExportEngine
     $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
+    // Iterate over the query results in large pages so we don't have to hold
     // too much stuff in memory.
     $page_size = 1000;
     $page_cursor = null;

From 4f557ff075ad115c598061777f98cb3c7a93d08b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 8 Oct 2018 11:20:58 -0700
Subject: [PATCH 118/125] When using "bin/bulk export --overwrite", actually
 overwrite the file

Summary: Depends on D19738. Ref T13210. Currently, when you use "--overwrite", we just //append// the new content. Instead, actually overwrite the file.

Test Plan: Used `--overwrite`, saw an actual clean overwrite instead of an append.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13210

Differential Revision: https://secure.phabricator.com/D19739
---
 .../management/PhabricatorBulkManagementExportWorkflow.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php b/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
index 154c266da2..53d8441f91 100644
--- a/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
+++ b/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
@@ -114,6 +114,10 @@ final class PhabricatorBulkManagementExportWorkflow
     $iterator = $file->getFileDataIterator();
 
     if (strlen($output_path)) {
+      // Empty the file before we start writing to it. Otherwise, "--overwrite"
+      // will really mean "--append".
+      Filesystem::writeFile($output_path, '');
+
       foreach ($iterator as $chunk) {
         Filesystem::appendFile($output_path, $chunk);
       }

From 4f54d483d5bfbbf915ae8586cff18f6093422bec Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 11 Oct 2018 08:20:13 -0700
Subject: [PATCH 119/125] Support export of revisions to Excel/CSV/JSON/etc

Summary: Ref T13210. See PHI806. This enables basic export of revisions into flat data formats. This isn't too fancy, but just covers the basics since the driving use case isn't especially concerned about getting all the fields and details.

Test Plan: Exported some revisions into JSON, got sensible output.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13210

Differential Revision: https://secure.phabricator.com/D19743
---
 .../PhabricatorDifferentialApplication.php    |  6 +-
 .../DifferentialRevisionSearchEngine.php      | 73 +++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
index 52b222301a..c27d0da820 100644
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -1,6 +1,7 @@
 <?php
 
-final class PhabricatorDifferentialApplication extends PhabricatorApplication {
+final class PhabricatorDifferentialApplication
+  extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/differential/';
@@ -48,8 +49,7 @@ final class PhabricatorDifferentialApplication extends PhabricatorApplication {
         '/(?P<filter>new)/' => 'DifferentialRevisionViewController',
       ),
       '/differential/' => array(
-        '(?:query/(?P<queryKey>[^/]+)/)?'
-          => 'DifferentialRevisionListController',
+        $this->getQueryRoutePattern() => 'DifferentialRevisionListController',
         'diff/' => array(
           '(?P<id>[1-9]\d*)/' => array(
             '' => 'DifferentialDiffViewController',
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
index 557ca23078..be753c5e17 100644
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -289,4 +289,77 @@ final class DifferentialRevisionSearchEngine
     return $result;
   }
 
+  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 PhabricatorStringExportField())
+        ->setKey('status')
+        ->setLabel(pht('Status')),
+      id(new PhabricatorStringExportField())
+        ->setKey('statusName')
+        ->setLabel(pht('Status Name')),
+      id(new PhabricatorURIExportField())
+        ->setKey('uri')
+        ->setLabel(pht('URI')),
+      id(new PhabricatorStringExportField())
+        ->setKey('title')
+        ->setLabel(pht('Title')),
+      id(new PhabricatorStringExportField())
+        ->setKey('summary')
+        ->setLabel(pht('Summary')),
+      id(new PhabricatorStringExportField())
+        ->setKey('testPlan')
+        ->setLabel(pht('Test Plan')),
+    );
+
+    return $fields;
+  }
+
+  protected function newExportData(array $revisions) {
+    $viewer = $this->requireViewer();
+
+    $phids = array();
+    foreach ($revisions as $revision) {
+      $phids[] = $revision->getAuthorPHID();
+    }
+    $handles = $viewer->loadHandles($phids);
+
+    $export = array();
+    foreach ($revisions as $revision) {
+
+      $author_phid = $revision->getAuthorPHID();
+      if ($author_phid) {
+        $author_name = $handles[$author_phid]->getName();
+      } else {
+        $author_name = null;
+      }
+
+      $status = $revision->getStatusObject();
+      $status_name = $status->getDisplayName();
+      $status_value = $status->getKey();
+
+      $export[] = array(
+        'monogram' => $revision->getMonogram(),
+        'authorPHID' => $author_phid,
+        'author' => $author_name,
+        'status' => $status_value,
+        'statusName' => $status_name,
+        'uri' => PhabricatorEnv::getProductionURI($revision->getURI()),
+        'title' => (string)$revision->getTitle(),
+        'summary' => (string)$revision->getSummary(),
+        'testPlan' => (string)$revision->getTestPlan(),
+      );
+    }
+
+    return $export;
+  }
+
 }

From 8bffc9ea0efe2237ae08be6ecaa54c3bed6f7fa0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 11 Oct 2018 12:35:11 -0700
Subject: [PATCH 120/125] In "bin/bulk export", require "--output <path>" by
 default

Summary:
Depends on D19743. Ref T13210. Since this command can easily dump a bunch of binary data (or just a huge long blob of nonsense) to stdout, default to requiring "--output <file>".

Using `--output -` will print to stdout.

Test Plan: Ran with: no `--output`, `--output file`, `--output -`, `--output - --overwrite`. Got sensible results or errors in all cases.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13210

Differential Revision: https://secure.phabricator.com/D19744
---
 ...habricatorBulkManagementExportWorkflow.php | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php b/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
index 53d8441f91..7f10a28d4b 100644
--- a/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
+++ b/src/applications/transactions/bulk/management/PhabricatorBulkManagementExportWorkflow.php
@@ -77,14 +77,27 @@ final class PhabricatorBulkManagementExportWorkflow
     $is_overwrite = $args->getArg('overwrite');
     $output_path = $args->getArg('output');
 
-    if (!strlen($output_path) && $is_overwrite) {
+    if (!strlen($output_path)) {
       throw new PhutilArgumentUsageException(
         pht(
-          'Flag "--overwrite" has no effect without "--output".'));
+          'Use "--output <path>" to specify an output file, or "--output -" '.
+          'to print to stdout.'));
+    }
+
+    if ($output_path === '-') {
+      $is_stdout = true;
+    } else {
+      $is_stdout = false;
+    }
+
+    if ($is_stdout && $is_overwrite) {
+      throw new PhutilArgumentUsageException(
+        pht(
+          'Flag "--overwrite" has no effect when outputting to stdout.'));
     }
 
     if (!$is_overwrite) {
-      if (Filesystem::pathExists($output_path)) {
+      if (!$is_stdout && Filesystem::pathExists($output_path)) {
         throw new PhutilArgumentUsageException(
           pht(
             'Output path already exists. Use "--overwrite" to overwrite '.
@@ -113,7 +126,7 @@ final class PhabricatorBulkManagementExportWorkflow
 
     $iterator = $file->getFileDataIterator();
 
-    if (strlen($output_path)) {
+    if (!$is_stdout) {
       // Empty the file before we start writing to it. Otherwise, "--overwrite"
       // will really mean "--append".
       Filesystem::writeFile($output_path, '');
@@ -121,6 +134,12 @@ final class PhabricatorBulkManagementExportWorkflow
       foreach ($iterator as $chunk) {
         Filesystem::appendFile($output_path, $chunk);
       }
+
+      echo tsprintf(
+        "%s\n",
+        pht(
+          'Exported data to "%s".',
+          Filesystem::readablePath($output_path)));
     } else {
       foreach ($iterator as $chunk) {
         echo $chunk;

From 0a51bc4f05bf5704e3608a839cc199fe69e88834 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 10 Oct 2018 12:40:47 -0700
Subject: [PATCH 121/125] Add a space after "View Inline" in mail to prevent
 double-click on the filename from selecting "Inline"

Summary:
See PHI920. Ref T13210. Since the HTML is just:

```
<a>View Inline</a><span>filename.txt</span>
```

..double-clicking "filename.txt" in email selects "Inlinefilename.txt".

Add a space to stop this. At least in Safari, a space between the tags is not sufficient (perhaps because the parent is a `<div>`?). I couldn't find an authoritative-seeming source on what the rules for this actually are and adding a space here fixes the issue without changing the visual rendering, so just put it here.

Test Plan:
  - Made an inline.
  - Used `bin/mail show-outbound --id ... --dump-html` to dump the HTML.
  - Double-clicked the filename.

{F5929186}

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13210

Differential Revision: https://secure.phabricator.com/D19742
---
 .../mail/DifferentialInlineCommentMailView.php      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/applications/differential/mail/DifferentialInlineCommentMailView.php b/src/applications/differential/mail/DifferentialInlineCommentMailView.php
index d88effa46c..0bc914914b 100644
--- a/src/applications/differential/mail/DifferentialInlineCommentMailView.php
+++ b/src/applications/differential/mail/DifferentialInlineCommentMailView.php
@@ -446,7 +446,18 @@ final class DifferentialInlineCommentMailView
             'style' => implode(' ', $link_style),
             'href' => $link_href,
           ),
-          pht('View Inline'));
+          array(
+            pht('View Inline'),
+
+            // See PHI920. Add a space after the link so we render this into
+            // the document:
+            //
+            //   View Inline filename.txt
+            //
+            // Otherwise, we render "Inlinefilename.txt" and double-clicking
+            // the file name selects the word "Inline" as well.
+            ' ',
+          ));
       } else {
         $link = null;
       }

From 51073b972ecef4f502bbc05639427401973623f5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 5 Oct 2018 13:17:17 -0700
Subject: [PATCH 122/125] Try to route cluster writes to nodes which won't need
 to synchronize first

Summary:
Ref T13109. Ref T13202. See PHI905. See PHI889. When we receive a write to a repository cluster, we currently send it to a random writable node.

Instead, we can prefer:

  - the node currently holding the write lock; or
  - any node which is already up to date.

These should simply be better nodes to take writes in all cases. The write lock is global for the repository, so there's no scaling benefit to spreading writes across different nodes, and these particular nodes will be able to accept the write more quickly.

Test Plan:
  - This is observable by using `fprintf(STDERR, "%s\n", ...)` in the logic, then running `git push`. I'd like to pull this routing logic out of `PhabricatorRepository` at some point, probably into a dedicated `ClusterURIQuery` sort of class, but that is a larger change.
  - Added some `fprintf(...)` stuff around which nodes were being selected.
  - Added a `sleep(10)` after grabbing the write lock.
  - In one window, pushed. Then pushed in a second window.
    - Saw the second window select the lock holder as the write target based on it currently holding the lock.
    - Without a concurrent push, saw pushes select up-to-date nodes based on their up-to-date-ness.

Reviewers: amckinley

Reviewed By: amckinley

Subscribers: joshuaspence, timhirsh

Maniphest Tasks: T13202, T13109

Differential Revision: https://secure.phabricator.com/D19734
---
 .../storage/PhabricatorRepository.php         | 66 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
index 8889040ddf..52824c2aa4 100644
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -2010,12 +2010,72 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
       }
     }
 
-    shuffle($results);
+    if ($writable) {
+      $results = $this->sortWritableAlmanacServiceURIs($results);
+    } else {
+      shuffle($results);
+    }
 
     $result = head($results);
     return $result['uri'];
   }
 
+  private function sortWritableAlmanacServiceURIs(array $results) {
+    // See T13109 for discussion of how this method routes requests.
+
+    // In the absence of other rules, we'll send traffic to devices randomly.
+    // We also want to select randomly among nodes which are equally good
+    // candidates to receive the write, and accomplish that by shuffling the
+    // list up front.
+    shuffle($results);
+
+    $order = array();
+
+    // If some device is currently holding the write lock, send all requests
+    // to that device. We're trying to queue writes on a single device so they
+    // do not need to wait for read synchronization after earlier writes
+    // complete.
+    $writer = PhabricatorRepositoryWorkingCopyVersion::loadWriter(
+      $this->getPHID());
+    if ($writer) {
+      $device_phid = $writer->getWriteProperty('devicePHID');
+      foreach ($results as $key => $result) {
+        if ($result['devicePHID'] === $device_phid) {
+          $order[] = $key;
+        }
+      }
+    }
+
+    // If no device is currently holding the write lock, try to send requests
+    // to a device which is already up to date and will not need to synchronize
+    // before it can accept the write.
+    $versions = PhabricatorRepositoryWorkingCopyVersion::loadVersions(
+      $this->getPHID());
+    if ($versions) {
+      $max_version = (int)max(mpull($versions, 'getRepositoryVersion'));
+
+      $max_devices = array();
+      foreach ($versions as $version) {
+        if ($version->getRepositoryVersion() == $max_version) {
+          $max_devices[] = $version->getDevicePHID();
+        }
+      }
+      $max_devices = array_fuse($max_devices);
+
+      foreach ($results as $key => $result) {
+        if (isset($max_devices[$result['devicePHID']])) {
+          $order[] = $key;
+        }
+      }
+    }
+
+    // Reorder the results, putting any we've selected as preferred targets for
+    // the write at the head of the list.
+    $results = array_select_keys($results, $order) + $results;
+
+    return $results;
+  }
+
   public function supportsSynchronization() {
     // TODO: For now, this is only supported for Git.
     if (!$this->isGit()) {
@@ -2036,7 +2096,7 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
     $parts = array(
       "repo({$repository_phid})",
       "serv({$service_phid})",
-      'v2',
+      'v3',
     );
 
     return implode('.', $parts);
@@ -2063,12 +2123,14 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
       $uri = $this->getClusterRepositoryURIFromBinding($binding);
       $protocol = $uri->getProtocol();
       $device_name = $iface->getDevice()->getName();
+      $device_phid = $iface->getDevice()->getPHID();
 
       $uris[] = array(
         'protocol' => $protocol,
         'uri' => (string)$uri,
         'device' => $device_name,
         'writable' => (bool)$binding->getAlmanacPropertyValue('writable'),
+        'devicePHID' => $device_phid,
       );
     }
 

From bc6c8c0e93a79072b94c8c44bec91fbfc65e10c5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 5 Oct 2018 13:55:10 -0700
Subject: [PATCH 123/125] Explicitly shuffle nodes before selecting one for
 cluster sync

Summary:
Depends on D19734. Ref T13202. Ref T13109. Ref T10884. See PHI905. See PHI889. We currently rank cluster nodes in three cases:

  # when performing a write, we can go to any node (D19734 should make our ranking good);
  # when performing a read, we can go to any node (currently random, but T10884 discusses ideas to improve our ranking);
  # when performing an internal synchronization before a read or a write, we must go to an up-to-date node.

Currently, case (3) is not-exactly-deterministic but not random, and we won't spread intracluster traffic acrosss the cluster evenly if, say, half of it is up to date and half of it is still synchronizing. For a given write, I believe all nodes will tend to synchronize from whichever node first received the write today.

Instead, shuffle the list and synchronize from any up-to-date node.

(I think we could improve upon this only by knowing which nodes actually have load and selecting the least-loaded -- doable, but not trivial.)

Test Plan: Poked at it locally, will deploy to `secure`. This is hard to measure/test terribly convincingly.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13202, T13109, T10884

Differential Revision: https://secure.phabricator.com/D19735
---
 .../diffusion/protocol/DiffusionRepositoryClusterEngine.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
index f85c7862fe..2e5d4215db 100644
--- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php
@@ -688,6 +688,9 @@ final class DiffusionRepositoryClusterEngine extends Phobject {
           'fetchable.'));
     }
 
+    // If we can synchronize from multiple sources, choose one at random.
+    shuffle($fetchable);
+
     $caught = null;
     foreach ($fetchable as $binding) {
       try {

From e0dea4c4862f271edf2ce4b7363ac11668a5dc1b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Oct 2018 04:41:40 -0700
Subject: [PATCH 124/125] Fix `packages(project)` to work properly and add it
 to "MailableFunctionDatasource"

Summary:
Ref T13210. See PHI937. This function datasource isn't quite implemented correctly: it doesn't resolve `package(project)` properly, since the logic only handles users.

This blames back to D14013, where it looks like `packages(..)` was added mostly as a general nice-to-have as part of a larger modernization change.

Test Plan: Ran a `packages(project)` query in Differential, got accurate results (previously: no results).

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13210

Differential Revision: https://secure.phabricator.com/D19747
---
 ...catorMetaMTAMailableFunctionDatasource.php |  1 +
 ...habricatorOwnersPackageOwnerDatasource.php | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php b/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php
index 4b231b959e..b5d82c9749 100644
--- a/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php
+++ b/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php
@@ -23,6 +23,7 @@ final class PhabricatorMetaMTAMailableFunctionDatasource
       new PhabricatorProjectMembersDatasource(),
       new PhabricatorProjectDatasource(),
       new PhabricatorOwnersPackageDatasource(),
+      new PhabricatorOwnersPackageOwnerDatasource(),
     );
   }
 
diff --git a/src/applications/owners/typeahead/PhabricatorOwnersPackageOwnerDatasource.php b/src/applications/owners/typeahead/PhabricatorOwnersPackageOwnerDatasource.php
index 99e770d266..2a0b16e60f 100644
--- a/src/applications/owners/typeahead/PhabricatorOwnersPackageOwnerDatasource.php
+++ b/src/applications/owners/typeahead/PhabricatorOwnersPackageOwnerDatasource.php
@@ -27,7 +27,7 @@ final class PhabricatorOwnersPackageOwnerDatasource
       'packages' => array(
         'name' => pht('Packages: ...'),
         'arguments' => pht('owner'),
-        'summary' => pht("Find results in any of an owner's projects."),
+        'summary' => pht("Find results in any of an owner's packages."),
         'description' => pht(
           "This function allows you to find results associated with any ".
           "of the packages a specified user or project is an owner of. ".
@@ -61,18 +61,21 @@ final class PhabricatorOwnersPackageOwnerDatasource
 
     $phids = $this->resolvePHIDs($phids);
 
-    $user_phids = array();
+    $owner_phids = array();
     foreach ($phids as $key => $phid) {
-      if (phid_get_type($phid) == PhabricatorPeopleUserPHIDType::TYPECONST) {
-        $user_phids[] = $phid;
-        unset($phids[$key]);
+      switch (phid_get_type($phid)) {
+        case PhabricatorPeopleUserPHIDType::TYPECONST:
+        case PhabricatorProjectProjectPHIDType::TYPECONST:
+          $owner_phids[] = $phid;
+          unset($phids[$key]);
+          break;
       }
     }
 
-    if ($user_phids) {
+    if ($owner_phids) {
       $packages = id(new PhabricatorOwnersPackageQuery())
         ->setViewer($this->getViewer())
-        ->withOwnerPHIDs($user_phids)
+        ->withOwnerPHIDs($owner_phids)
         ->execute();
       foreach ($packages as $package) {
         $phids[] = $package->getPHID();
@@ -116,8 +119,13 @@ final class PhabricatorOwnersPackageOwnerDatasource
 
     $usernames = array();
     foreach ($phids as $key => $phid) {
-      if (phid_get_type($phid) != PhabricatorPeopleUserPHIDType::TYPECONST) {
-        $usernames[$key] = $phid;
+      switch (phid_get_type($phid)) {
+        case PhabricatorPeopleUserPHIDType::TYPECONST:
+        case PhabricatorProjectProjectPHIDType::TYPECONST:
+          break;
+        default:
+          $usernames[$key] = $phid;
+          break;
       }
     }
 

From e2cf1e42887afc62631d006726a8ee88beaa56a0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 19 Oct 2018 13:20:39 -0700
Subject: [PATCH 125/125] Skip copied code detection for changes that are too
 large for it to be useful

Summary:
Ref T13210. See PHI944. When parsing certain large diffs (the case in PHI944 is an 2.5-million line JSON diff), we spend ~66% of runtime and ~80% of memory doing copy detection (the little yellow bar which shows up to give you a hint that code was moved around within a diff).

This is pretty much pointless and copy hints are almost certainly never useful on large changes. Instead, just bail if the change is larger than some arbitrary "probably too big for copy hints to ever be useful" threshold (here, 65535 lines).

Test Plan:
Roughly, ran this against a 2.5 million line JSON diff:

```
$changes = id(new ArcanistDiffParser())->parseDiff($raw_diff);
$diff = DifferentialDiff::newFromRawChanges($viewer, $changes);
```

Before the changes, it took 20s + 2.5GB RAM to parse. After the changes, it took 7s + 500MB RAM to parse.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13210

Differential Revision: https://secure.phabricator.com/D19748
---
 .../engine/DifferentialChangesetEngine.php         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/applications/differential/engine/DifferentialChangesetEngine.php b/src/applications/differential/engine/DifferentialChangesetEngine.php
index e8a55a1b0e..d72db025ad 100644
--- a/src/applications/differential/engine/DifferentialChangesetEngine.php
+++ b/src/applications/differential/engine/DifferentialChangesetEngine.php
@@ -88,6 +88,20 @@ final class DifferentialChangesetEngine extends Phobject {
 
 
   private function detectCopiedCode(array $changesets) {
+    // See PHI944. If the total number of changed lines is excessively large,
+    // don't bother with copied code detection. This can take a lot of time and
+    // memory and it's not generally of any use for very large changes.
+    $max_size = 65535;
+
+    $total_size = 0;
+    foreach ($changesets as $changeset) {
+      $total_size += ($changeset->getAddLines() + $changeset->getDelLines());
+    }
+
+    if ($total_size > $max_size) {
+      return;
+    }
+
     $min_width = 30;
     $min_lines = 3;