From 8160baec2a6bba1a9717d25f6805e9b5670fdbf6 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 07:55:54 -0700
Subject: [PATCH 01/46] Add a Differential revision status tokenizer datasource

Summary:
Ref T2543. This adds a tokenizer, similar to the Maniphest tokenizer, so the hard-coded `<select />` control in Differential ApplicationSearch can be replaced with a more flexible control that handles the addition of new statuses with more grace.

This only adds the new datasource.

Test Plan: Used `/typeahead/class/` to preview the behavior of the new datasource.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18392
---
 src/__phutil_library_map__.php                |  8 ++
 .../constants/DifferentialRevisionStatus.php  | 10 +++
 ...erentialRevisionClosedStatusDatasource.php | 74 +++++++++++++++++++
 ...fferentialRevisionOpenStatusDatasource.php | 74 +++++++++++++++++++
 .../DifferentialRevisionStatusDatasource.php  | 52 +++++++++++++
 ...entialRevisionStatusFunctionDatasource.php | 22 ++++++
 6 files changed, 240 insertions(+)
 create mode 100644 src/applications/differential/typeahead/DifferentialRevisionClosedStatusDatasource.php
 create mode 100644 src/applications/differential/typeahead/DifferentialRevisionOpenStatusDatasource.php
 create mode 100644 src/applications/differential/typeahead/DifferentialRevisionStatusDatasource.php
 create mode 100644 src/applications/differential/typeahead/DifferentialRevisionStatusFunctionDatasource.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2b45c3856a..703962b2ae 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -521,6 +521,7 @@ phutil_register_library_map(array(
     'DifferentialRevisionAuthorProjectsHeraldField' => 'applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php',
     'DifferentialRevisionCloseDetailsController' => 'applications/differential/controller/DifferentialRevisionCloseDetailsController.php',
     'DifferentialRevisionCloseTransaction' => 'applications/differential/xaction/DifferentialRevisionCloseTransaction.php',
+    'DifferentialRevisionClosedStatusDatasource' => 'applications/differential/typeahead/DifferentialRevisionClosedStatusDatasource.php',
     'DifferentialRevisionCommandeerTransaction' => 'applications/differential/xaction/DifferentialRevisionCommandeerTransaction.php',
     'DifferentialRevisionContentAddedHeraldField' => 'applications/differential/herald/DifferentialRevisionContentAddedHeraldField.php',
     'DifferentialRevisionContentHeraldField' => 'applications/differential/herald/DifferentialRevisionContentHeraldField.php',
@@ -548,6 +549,7 @@ phutil_register_library_map(array(
     'DifferentialRevisionListController' => 'applications/differential/controller/DifferentialRevisionListController.php',
     'DifferentialRevisionListView' => 'applications/differential/view/DifferentialRevisionListView.php',
     'DifferentialRevisionMailReceiver' => 'applications/differential/mail/DifferentialRevisionMailReceiver.php',
+    'DifferentialRevisionOpenStatusDatasource' => 'applications/differential/typeahead/DifferentialRevisionOpenStatusDatasource.php',
     'DifferentialRevisionOperationController' => 'applications/differential/controller/DifferentialRevisionOperationController.php',
     'DifferentialRevisionPHIDType' => 'applications/differential/phid/DifferentialRevisionPHIDType.php',
     'DifferentialRevisionPackageHeraldField' => 'applications/differential/herald/DifferentialRevisionPackageHeraldField.php',
@@ -572,6 +574,8 @@ phutil_register_library_map(array(
     'DifferentialRevisionSearchConduitAPIMethod' => 'applications/differential/conduit/DifferentialRevisionSearchConduitAPIMethod.php',
     'DifferentialRevisionSearchEngine' => 'applications/differential/query/DifferentialRevisionSearchEngine.php',
     'DifferentialRevisionStatus' => 'applications/differential/constants/DifferentialRevisionStatus.php',
+    'DifferentialRevisionStatusDatasource' => 'applications/differential/typeahead/DifferentialRevisionStatusDatasource.php',
+    'DifferentialRevisionStatusFunctionDatasource' => 'applications/differential/typeahead/DifferentialRevisionStatusFunctionDatasource.php',
     'DifferentialRevisionSummaryHeraldField' => 'applications/differential/herald/DifferentialRevisionSummaryHeraldField.php',
     'DifferentialRevisionSummaryTransaction' => 'applications/differential/xaction/DifferentialRevisionSummaryTransaction.php',
     'DifferentialRevisionTestPlanTransaction' => 'applications/differential/xaction/DifferentialRevisionTestPlanTransaction.php',
@@ -5514,6 +5518,7 @@ phutil_register_library_map(array(
     'DifferentialRevisionAuthorProjectsHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionCloseDetailsController' => 'DifferentialController',
     'DifferentialRevisionCloseTransaction' => 'DifferentialRevisionActionTransaction',
+    'DifferentialRevisionClosedStatusDatasource' => 'PhabricatorTypeaheadDatasource',
     'DifferentialRevisionCommandeerTransaction' => 'DifferentialRevisionActionTransaction',
     'DifferentialRevisionContentAddedHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionContentHeraldField' => 'DifferentialRevisionHeraldField',
@@ -5541,6 +5546,7 @@ phutil_register_library_map(array(
     'DifferentialRevisionListController' => 'DifferentialController',
     'DifferentialRevisionListView' => 'AphrontView',
     'DifferentialRevisionMailReceiver' => 'PhabricatorObjectMailReceiver',
+    'DifferentialRevisionOpenStatusDatasource' => 'PhabricatorTypeaheadDatasource',
     'DifferentialRevisionOperationController' => 'DifferentialController',
     'DifferentialRevisionPHIDType' => 'PhabricatorPHIDType',
     'DifferentialRevisionPackageHeraldField' => 'DifferentialRevisionHeraldField',
@@ -5565,6 +5571,8 @@ phutil_register_library_map(array(
     'DifferentialRevisionSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
     'DifferentialRevisionSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'DifferentialRevisionStatus' => 'Phobject',
+    'DifferentialRevisionStatusDatasource' => 'PhabricatorTypeaheadDatasource',
+    'DifferentialRevisionStatusFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'DifferentialRevisionSummaryHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionSummaryTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionTestPlanTransaction' => 'DifferentialRevisionTransactionType',
diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
index 37b51f1b3b..e5ef7d6a24 100644
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -93,6 +93,16 @@ final class DifferentialRevisionStatus extends Phobject {
     return $result;
   }
 
+  public static function getAll() {
+    $result = array();
+
+    foreach (self::getMap() as $key => $spec) {
+      $result[$key] = self::newForStatus($key);
+    }
+
+    return $result;
+  }
+
   private static function getMap() {
     $close_on_accept = PhabricatorEnv::getEnvConfig(
       'differential.close-on-accept');
diff --git a/src/applications/differential/typeahead/DifferentialRevisionClosedStatusDatasource.php b/src/applications/differential/typeahead/DifferentialRevisionClosedStatusDatasource.php
new file mode 100644
index 0000000000..8487111452
--- /dev/null
+++ b/src/applications/differential/typeahead/DifferentialRevisionClosedStatusDatasource.php
@@ -0,0 +1,74 @@
+<?php
+
+final class DifferentialRevisionClosedStatusDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  const FUNCTION_TOKEN = 'closed()';
+
+  public function getBrowseTitle() {
+    return pht('Browse Any Closed Status');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type closed()...');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return 'PhabricatorDifferentialApplication';
+  }
+
+  public function getDatasourceFunctions() {
+    return array(
+      'closed' => array(
+        'name' => pht('Any Closed Status'),
+        'summary' => pht('Find results with any closed status.'),
+        'description' => pht(
+          'This function includes results which have any closed status.'),
+      ),
+    );
+  }
+
+  public function loadResults() {
+    $results = array(
+      $this->buildClosedResult(),
+    );
+    return $this->filterResultsAgainstTokens($results);
+  }
+
+  protected function evaluateFunction($function, array $argv_list) {
+    $results = array();
+
+    $map = DifferentialRevisionStatus::getAll();
+    foreach ($argv_list as $argv) {
+      foreach ($map as $status) {
+        if ($status->isClosedStatus()) {
+          $results[] = $status->getKey();
+        }
+      }
+    }
+
+    return $results;
+  }
+
+  public function renderFunctionTokens($function, array $argv_list) {
+    $results = array();
+
+    foreach ($argv_list as $argv) {
+      $results[] = PhabricatorTypeaheadTokenView::newFromTypeaheadResult(
+        $this->buildClosedResult());
+    }
+
+    return $results;
+  }
+
+  private function buildClosedResult() {
+    $name = pht('Any Closed Status');
+    return $this->newFunctionResult()
+      ->setName($name.' closed')
+      ->setDisplayName($name)
+      ->setPHID(self::FUNCTION_TOKEN)
+      ->setUnique(true)
+      ->addAttribute(pht('Select any closed status.'));
+  }
+
+}
diff --git a/src/applications/differential/typeahead/DifferentialRevisionOpenStatusDatasource.php b/src/applications/differential/typeahead/DifferentialRevisionOpenStatusDatasource.php
new file mode 100644
index 0000000000..0f00e470c3
--- /dev/null
+++ b/src/applications/differential/typeahead/DifferentialRevisionOpenStatusDatasource.php
@@ -0,0 +1,74 @@
+<?php
+
+final class DifferentialRevisionOpenStatusDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  const FUNCTION_TOKEN = 'open()';
+
+  public function getBrowseTitle() {
+    return pht('Browse Any Open Status');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type open()...');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return 'PhabricatorDifferentialApplication';
+  }
+
+  public function getDatasourceFunctions() {
+    return array(
+      'open' => array(
+        'name' => pht('Any Open Status'),
+        'summary' => pht('Find results with any open status.'),
+        'description' => pht(
+          'This function includes results which have any open status.'),
+      ),
+    );
+  }
+
+  public function loadResults() {
+    $results = array(
+      $this->buildOpenResult(),
+    );
+    return $this->filterResultsAgainstTokens($results);
+  }
+
+  protected function evaluateFunction($function, array $argv_list) {
+    $results = array();
+
+    $map = DifferentialRevisionStatus::getAll();
+    foreach ($argv_list as $argv) {
+      foreach ($map as $status) {
+        if (!$status->isClosedStatus()) {
+          $results[] = $status->getKey();
+        }
+      }
+    }
+
+    return $results;
+  }
+
+  public function renderFunctionTokens($function, array $argv_list) {
+    $results = array();
+
+    foreach ($argv_list as $argv) {
+      $results[] = PhabricatorTypeaheadTokenView::newFromTypeaheadResult(
+        $this->buildOpenResult());
+    }
+
+    return $results;
+  }
+
+  private function buildOpenResult() {
+    $name = pht('Any Open Status');
+    return $this->newFunctionResult()
+      ->setName($name.' open')
+      ->setDisplayName($name)
+      ->setPHID(self::FUNCTION_TOKEN)
+      ->setUnique(true)
+      ->addAttribute(pht('Select any open status.'));
+  }
+
+}
diff --git a/src/applications/differential/typeahead/DifferentialRevisionStatusDatasource.php b/src/applications/differential/typeahead/DifferentialRevisionStatusDatasource.php
new file mode 100644
index 0000000000..5e240d3c29
--- /dev/null
+++ b/src/applications/differential/typeahead/DifferentialRevisionStatusDatasource.php
@@ -0,0 +1,52 @@
+<?php
+
+final class DifferentialRevisionStatusDatasource
+  extends PhabricatorTypeaheadDatasource {
+
+  public function getBrowseTitle() {
+    return pht('Browse Statuses');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type a revision status name...');
+  }
+
+  public function getDatasourceApplicationClass() {
+    return 'PhabricatorDifferentialApplication';
+  }
+
+  public function loadResults() {
+    $results = $this->buildResults();
+    return $this->filterResultsAgainstTokens($results);
+  }
+
+
+  protected function renderSpecialTokens(array $values) {
+    return $this->renderTokensFromResults($this->buildResults(), $values);
+  }
+
+  private function buildResults() {
+    $results = array();
+
+    $statuses = DifferentialRevisionStatus::getAll();
+    foreach ($statuses as $status) {
+      $key = $status->getKey();
+
+      $result = id(new PhabricatorTypeaheadResult())
+        ->setIcon($status->getIcon())
+        ->setPHID($key)
+        ->setName($status->getDisplayName());
+
+      if ($status->isClosedStatus()) {
+        $result->addAttribute(pht('Closed Status'));
+      } else {
+        $result->addAttribute(pht('Open Status'));
+      }
+
+      $results[$key] = $result;
+    }
+
+    return $results;
+  }
+
+}
diff --git a/src/applications/differential/typeahead/DifferentialRevisionStatusFunctionDatasource.php b/src/applications/differential/typeahead/DifferentialRevisionStatusFunctionDatasource.php
new file mode 100644
index 0000000000..2d4ec38363
--- /dev/null
+++ b/src/applications/differential/typeahead/DifferentialRevisionStatusFunctionDatasource.php
@@ -0,0 +1,22 @@
+<?php
+
+final class DifferentialRevisionStatusFunctionDatasource
+  extends PhabricatorTypeaheadCompositeDatasource {
+
+  public function getBrowseTitle() {
+    return pht('Browse Statuses');
+  }
+
+  public function getPlaceholderText() {
+    return pht('Type a revision status name or function...');
+  }
+
+  public function getComponentDatasources() {
+    return array(
+      new DifferentialRevisionStatusDatasource(),
+      new DifferentialRevisionClosedStatusDatasource(),
+      new DifferentialRevisionOpenStatusDatasource(),
+    );
+  }
+
+}

From 53516093aed08ca67efc84c8c9d683674322e4e8 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 08:10:28 -0700
Subject: [PATCH 02/46] Replace Differential hard-coded status "<select />"
 with tokenizer

Summary:
Ref T2543. This updates the UI control in the web UI. Also:

  - This implicitly makes this queryable with the API (`differential.revision.search`); it previously was not.
  - This does NOT migrate existing saved queries. I'll do those in the next change, and hold this until it happens.
  - This will break some existing `/differential/?status=XYZ` links. For example, `status=open` now needs to be `status=open()`. I couldn't find any of these in the upstream, and I suspect these are rare in the wild (users would normally link directly to saved queries, not use URI query construction).

Test Plan: {F5093611}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18393
---
 .../constants/DifferentialLegacyQuery.php         |  6 +++++-
 .../query/DifferentialRevisionQuery.php           | 13 +++++++++++++
 .../query/DifferentialRevisionSearchEngine.php    | 15 ++++++++-------
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/applications/differential/constants/DifferentialLegacyQuery.php b/src/applications/differential/constants/DifferentialLegacyQuery.php
index 4a20267f10..6a87688e99 100644
--- a/src/applications/differential/constants/DifferentialLegacyQuery.php
+++ b/src/applications/differential/constants/DifferentialLegacyQuery.php
@@ -28,8 +28,12 @@ final class DifferentialLegacyQuery
           $status));
     }
 
+    return self::getLegacyValues($map[$status]);
+  }
+
+  public static function getLegacyValues(array $modern_values) {
     $values = array();
-    foreach ($map[$status] as $status_constant) {
+    foreach ($modern_values as $status_constant) {
       $status_object = DifferentialRevisionStatus::newForStatus(
         $status_constant);
 
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index f53ec46a9f..79227df8ac 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -25,6 +25,7 @@ final class DifferentialRevisionQuery
   private $repositoryPHIDs;
   private $updatedEpochMin;
   private $updatedEpochMax;
+  private $statuses;
 
   const ORDER_MODIFIED      = 'order-modified';
   const ORDER_CREATED       = 'order-created';
@@ -146,6 +147,11 @@ final class DifferentialRevisionQuery
     return $this;
   }
 
+  public function withStatuses(array $statuses) {
+    $this->statuses = $statuses;
+    return $this;
+  }
+
 
   /**
    * Filter results to revisions on given branches.
@@ -705,6 +711,13 @@ final class DifferentialRevisionQuery
         $statuses);
     }
 
+    if ($this->statuses !== null) {
+      $where[] = qsprintf(
+        $conn_r,
+        'r.status in (%Ls)',
+        DifferentialLegacyQuery::getLegacyValues($this->statuses));
+    }
+
     $where[] = $this->buildWhereClauseParts($conn_r);
     return $this->formatWhereClause($where);
   }
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
index 8cb8ffd2fb..dcbbaeedee 100644
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -41,8 +41,8 @@ final class DifferentialRevisionSearchEngine
       $query->withRepositoryPHIDs($map['repositoryPHIDs']);
     }
 
-    if ($map['status']) {
-      $query->withStatus($map['status']);
+    if ($map['statuses']) {
+      $query->withStatuses($map['statuses']);
     }
 
     return $query;
@@ -77,10 +77,11 @@ final class DifferentialRevisionSearchEngine
         ->setDatasource(new DiffusionRepositoryFunctionDatasource())
         ->setDescription(
           pht('Find revisions from specific repositories.')),
-      id(new PhabricatorSearchSelectField())
-        ->setLabel(pht('Status'))
-        ->setKey('status')
-        ->setOptions($this->getStatusOptions())
+      id(new PhabricatorSearchDatasourceField())
+        ->setLabel(pht('Statuses'))
+        ->setKey('statuses')
+        ->setAliases(array('status'))
+        ->setDatasource(new DifferentialRevisionStatusFunctionDatasource())
         ->setDescription(
           pht('Find revisions with particular statuses.')),
     );
@@ -115,7 +116,7 @@ final class DifferentialRevisionSearchEngine
 
         return $query
           ->setParameter('responsiblePHIDs', array($viewer->getPHID()))
-          ->setParameter('status', DifferentialLegacyQuery::STATUS_OPEN)
+          ->setParameter('statuses', array('open()'))
           ->setParameter('bucket', $bucket_key);
       case 'authored':
         return $query

From 212d4d0dc7530ed32e1e13d0b4870ba37922ddd4 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 09:03:47 -0700
Subject: [PATCH 03/46] Migrate Differential Revision SavedQueries to the new
 "statuses" tokenizer

Summary: Ref T2543. This migrates existing saved queries so they use the right modern values for the new tokenizer control, introduced in D18393.

Test Plan:
  - Saved a query with "Abandoned" selected as the status in the old "<select />", prior to D18393.
  - Upgraded to D18393, which broke the query (it no longer selected any status filter).
  - Ran the migration to fix things.
  - Saw the query now execute with "Abandoned" selected in the tokenizer, preseving the original behavior accurately.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18394
---
 .../20170811.differential.01.status.php       | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 resources/sql/autopatches/20170811.differential.01.status.php

diff --git a/resources/sql/autopatches/20170811.differential.01.status.php b/resources/sql/autopatches/20170811.differential.01.status.php
new file mode 100644
index 0000000000..9d57d033af
--- /dev/null
+++ b/resources/sql/autopatches/20170811.differential.01.status.php
@@ -0,0 +1,48 @@
+<?php
+
+// Migrate saved Differential revision queries from using a "<select />"
+// control with hard-coded status groups for status selection to using a
+// tokenizer with status functions.
+
+$table = new PhabricatorSavedQuery();
+$conn = $table->establishConnection('w');
+
+$status_map = array(
+  'status-open' => array('open()'),
+  'status-closed' => array('closed()'),
+
+  'status-accepted' => array('accepted'),
+  'status-needs-review' => array('needs-review'),
+  'status-needs-revision' => array('needs-revision'),
+  'status-abandoned' => array('abandoned'),
+);
+
+foreach (new LiskMigrationIterator($table) as $query) {
+  if ($query->getEngineClassName() !== 'DifferentialRevisionSearchEngine') {
+    // This isn't a revision query.
+    continue;
+  }
+
+  $parameters = $query->getParameters();
+  $status = idx($parameters, 'status');
+
+  if (!$status) {
+    // This query didn't specify a "status" value.
+    continue;
+  }
+
+  if (!isset($status_map[$status])) {
+    // The "status" value is unknown, or does not correspond to a
+    // modern "status" constraint.
+    continue;
+  }
+
+  $parameters['statuses'] = $status_map[$status];
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET parameters = %s WHERE id = %d',
+    $table->getTableName(),
+    phutil_json_encode($parameters),
+    $query->getID());
+}

From 50dfdb8d0355b5b6ad7950bbd40c2f25d124bf63 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 09:18:47 -0700
Subject: [PATCH 04/46] Replace legacy Differential queries for "open"
 revisions with a modern mechanism

Summary: Ref T2543. Several queries want only open revisions. Provide a tailored, non-legacy way to issue that query.

Test Plan: Viewed some of these callsites (e.g., "Similar open revisions affecting these files"), saw only open revisions.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18395
---
 .../DifferentialDiffViewController.php        |  2 +-
 .../DifferentialRevisionViewController.php    |  2 +-
 .../query/DifferentialRevisionQuery.php       | 20 +++++++++++++++++++
 .../DifferentialRevisionSearchEngine.php      |  2 +-
 .../controller/DiffusionBrowseController.php  |  2 +-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
index 488d2cec82..7340687bc4 100644
--- a/src/applications/differential/controller/DifferentialDiffViewController.php
+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
@@ -177,7 +177,7 @@ final class DifferentialDiffViewController extends DifferentialController {
     $revisions = id(new DifferentialRevisionQuery())
       ->setViewer($viewer)
       ->withAuthors(array($viewer->getPHID()))
-      ->withStatus(DifferentialLegacyQuery::STATUS_OPEN)
+      ->withIsOpen(true)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 81b2aebda6..06d8cf0a3f 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -808,7 +808,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
 
     $query = id(new DifferentialRevisionQuery())
       ->setViewer($this->getRequest()->getUser())
-      ->withStatus(DifferentialLegacyQuery::STATUS_OPEN)
+      ->withIsOpen(true)
       ->withUpdatedEpochBetween($recent, null)
       ->setOrder(DifferentialRevisionQuery::ORDER_MODIFIED)
       ->setLimit(10)
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index 79227df8ac..8d8169a66e 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -26,6 +26,7 @@ final class DifferentialRevisionQuery
   private $updatedEpochMin;
   private $updatedEpochMax;
   private $statuses;
+  private $isOpen;
 
   const ORDER_MODIFIED      = 'order-modified';
   const ORDER_CREATED       = 'order-created';
@@ -152,6 +153,11 @@ final class DifferentialRevisionQuery
     return $this;
   }
 
+  public function withIsOpen($is_open) {
+    $this->isOpen = $is_open;
+    return $this;
+  }
+
 
   /**
    * Filter results to revisions on given branches.
@@ -718,6 +724,20 @@ final class DifferentialRevisionQuery
         DifferentialLegacyQuery::getLegacyValues($this->statuses));
     }
 
+    if ($this->isOpen !== null) {
+      if ($this->isOpen) {
+        $statuses = DifferentialLegacyQuery::getQueryValues(
+          DifferentialLegacyQuery::STATUS_OPEN);
+      } else {
+        $statuses = DifferentialLegacyQuery::getQueryValues(
+          DifferentialLegacyQuery::STATUS_CLOSED);
+      }
+      $where[] = qsprintf(
+        $conn_r,
+        'r.status in (%Ls)',
+        $statuses);
+    }
+
     $where[] = $this->buildWhereClauseParts($conn_r);
     return $this->formatWhereClause($where);
   }
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
index dcbbaeedee..e2f4bfc421 100644
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -268,7 +268,7 @@ final class DifferentialRevisionSearchEngine
     $blocking_revisions = id(new DifferentialRevisionQuery())
       ->setViewer($viewer)
       ->withPHIDs($revision_phids)
-      ->withStatus(DifferentialLegacyQuery::STATUS_OPEN)
+      ->withIsOpen(true)
       ->execute();
     $blocking_revisions = mpull($blocking_revisions, null, 'getPHID');
 
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 32381207fa..63dc6c3c86 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -1758,7 +1758,7 @@ final class DiffusionBrowseController extends DiffusionController {
     $revisions = id(new DifferentialRevisionQuery())
       ->setViewer($viewer)
       ->withPath($repository->getID(), $path_id)
-      ->withStatus(DifferentialLegacyQuery::STATUS_OPEN)
+      ->withIsOpen(true)
       ->withUpdatedEpochBetween($recent, null)
       ->setOrder(DifferentialRevisionQuery::ORDER_MODIFIED)
       ->setLimit(10)

From f25acf2deef23cc307a63bc993caf6d5660de243 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 11 Aug 2017 13:37:15 -0700
Subject: [PATCH 05/46] Uh, update Phabricator login image

Summary: The things you find testing production.

Test Plan: Run sprite, celerity

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18409
---
 resources/celerity/map.php                |  10 ++---
 resources/sprite/login_1x/Dropbox.png     | Bin 1090 -> 0 bytes
 resources/sprite/login_1x/Linkedin.png    | Bin 879 -> 0 bytes
 resources/sprite/login_1x/Openid.png      | Bin 722 -> 0 bytes
 resources/sprite/login_1x/Phabricator.png | Bin 421 -> 522 bytes
 resources/sprite/login_1x/Yahoo.png       | Bin 365 -> 0 bytes
 resources/sprite/login_2x/Dropbox.png     | Bin 2350 -> 0 bytes
 resources/sprite/login_2x/Linkedin.png    | Bin 1585 -> 0 bytes
 resources/sprite/login_2x/Openid.png      | Bin 1013 -> 0 bytes
 resources/sprite/login_2x/Phabricator.png | Bin 934 -> 1100 bytes
 resources/sprite/login_2x/Yahoo.png       | Bin 776 -> 0 bytes
 resources/sprite/manifest/login.json      |  22 +---------
 webroot/rsrc/css/sprite-login.css         |  48 ++++++++--------------
 webroot/rsrc/image/sprite-login-X2.png    | Bin 48709 -> 29253 bytes
 webroot/rsrc/image/sprite-login.png       | Bin 20480 -> 12792 bytes
 15 files changed, 22 insertions(+), 58 deletions(-)
 delete mode 100644 resources/sprite/login_1x/Dropbox.png
 delete mode 100644 resources/sprite/login_1x/Linkedin.png
 delete mode 100644 resources/sprite/login_1x/Openid.png
 delete mode 100644 resources/sprite/login_1x/Yahoo.png
 delete mode 100644 resources/sprite/login_2x/Dropbox.png
 delete mode 100644 resources/sprite/login_2x/Linkedin.png
 delete mode 100644 resources/sprite/login_2x/Openid.png
 delete mode 100644 resources/sprite/login_2x/Yahoo.png

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 54832d23ae..feab818559 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' => 'b5b51108',
-    'core.pkg.css' => '0e4a68ad',
+    'core.pkg.css' => '038ad839',
     'core.pkg.js' => '5d80e0db',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -183,7 +183,7 @@ return array(
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
     'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
     'rsrc/css/phui/workboards/phui-workpanel.css' => 'a3a63478',
-    'rsrc/css/sprite-login.css' => '587d92d7',
+    'rsrc/css/sprite-login.css' => '396f3c3a',
     'rsrc/css/sprite-tokens.css' => '9cdfd599',
     'rsrc/css/syntax/syntax-default.css' => '9923583c',
     'rsrc/externals/d3/d3.min.js' => 'a11a5ff2',
@@ -359,8 +359,8 @@ return array(
     'rsrc/image/phrequent_active.png' => 'a466a8ed',
     'rsrc/image/phrequent_inactive.png' => 'bfc15a69',
     'rsrc/image/resize.png' => 'fd476de4',
-    'rsrc/image/sprite-login-X2.png' => '4abee916',
-    'rsrc/image/sprite-login.png' => '2b9663fd',
+    'rsrc/image/sprite-login-X2.png' => '308c92c4',
+    'rsrc/image/sprite-login.png' => '9ec54245',
     'rsrc/image/sprite-tokens-X2.png' => '804a5232',
     'rsrc/image/sprite-tokens.png' => 'b41d03da',
     'rsrc/image/texture/card-gradient.png' => '815f26e8',
@@ -897,7 +897,7 @@ return array(
     'releeph-request-differential-create-dialog' => '8d8b92cd',
     'releeph-request-typeahead-css' => '667a48ae',
     'setup-issue-css' => 'f794cfc3',
-    'sprite-login-css' => '587d92d7',
+    'sprite-login-css' => '396f3c3a',
     'sprite-tokens-css' => '9cdfd599',
     'syntax-default-css' => '9923583c',
     'syntax-highlighting-css' => 'cae95e89',
diff --git a/resources/sprite/login_1x/Dropbox.png b/resources/sprite/login_1x/Dropbox.png
deleted file mode 100644
index 1d68eee5ca1bfabb40cbca99ce5631609e16a35c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1090
zcmV-I1ikx-P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<000CDNkl<ZcmeH|
z1CTpc7{I^Uwr$(C-Lq{wcK)_)+qP|E5wFhZ-1fbf*~v7h-TqEV?z0yDRQ_k+_J(tB
z@9r2EJ=r(wr({1E?HT{xD9_AcI~y;9UxRvu_|8LpoQI&AlA+|3{9s?_#@dzQ4Z(7%
zRnq0J5BDs?GEjC(zNITmWzFF~hM!BfjSW|#Xh%ZjX_@>O85s-=F?PL~VaM-ndR~zo
zy0hugD-6t0C_9a1h%5=Pijtol<eED7Nb}7Q3Ee8`oQygASGRR@FvNhC4meYcRZ=7f
z<7z2Yvr>#Yw~iPOmD8c0^3(DSR+g(=A|{U8({wHb6F-BqL-q+2A#!G7k#dj`Elr$V
zprOBuo$kxYn9C<$tfO0?0?BKFf<r&V1`Y<<{CtvcFa*<UQ^S3qjrYzZ25{siCSU}A
zR&!eZWSn<m)pF@pMaQ_d{@SQXzM)Wy<jYYH^+d<7t42YTo|4}f>0VN`OnMX|@$xWt
z&6z67--|k$ID4dzb93op;oXP>wo-ci*#XWqSe7`ip@?4kEY1u+hkjcdKD^1w9=p!U
zI#XwIW$-g8m?z}jWOJOn(ZW*YOT{SoB@`?Y3|~z0^?+YU(kxDwJcsWFzl4{DyGt)O
zGHqw6=nhok(UbN!-2y*B^$PKtZzuT%oUNwXFVNEMAC2{>;ink0r|B$oRYu{RBmL7c
zr195T89r&cFBc+Ev`|RC9+e-<l4(}cWGy}$=bc`+O1uQZQMX+D@CF-uh&a;)CRABw
zyb{k3bgkB`lHOEw3Kt76Jl4;-nEbzn`hgCaShUZV=;%{bONB2(qg=q(5N8!sV7v`M
z22j*ca8fQ=B;?dClVZtxJej(1@-zz6|Np#syghuwXLB#2`?-powA!GE4gT`pY-KlV
zS4mNM3x#iy>`HP&^+6TEx>cv;TkP!SoQ1+$@KfZ>;Y!X@QEgCsiWpIP88_88Xuyuf
z`|m)8ZnHA`$M0);GIJ(pB~F!VgQ|2f3Lti>PX)h(r6*eMPMXH`B_%@!Q)h5F<MuW`
z^FVjUVWpH;85vjijScUVE)-Ho9}7>)ACB=1U(dEa2)`7uwex)R==nBf1{aq%U-&X^
zIu~`0hVCQ*m>B<0jlXo6v$;&wO6kk;g+fg3JmKrFCV8)dU&<k_<3?Pjhx<6^L{H;P
z<Vm62SOXpC7m~rH|9mpn>yruIF*wu9ZR}I<YZ$z(;bHW|-;O5}8ww0i&@kal^H0h*
zb#)vuudROxek<v-`41oJ>)b`A7dtj8(@2v?&|TdfM^($kui*D4c?MT{wS{RweIz?}
z3Cix{abAOMef>G`N3rO5%dJljbS=EQhjT@*%?%I1U(Nq~4@a60T;}Ca{Qv*}07*qo
IM6N<$f@-1@V*mgE

diff --git a/resources/sprite/login_1x/Linkedin.png b/resources/sprite/login_1x/Linkedin.png
deleted file mode 100644
index 2cf76885de38a0bf426c0b102c1e405524b0593e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<0009vNkl<ZcmeHI
z1B@nF5PoCZc8oK^i<7(fe5<oPwr7H~jrERg+qR7!+f!Hd_D^U0_rKxpUL{}m>w5S~
zU60*+^1u9C+TU&Kow95mm?7ANWC}K+SqOZGNQXsmhG2<jMCEjK%O%wEO5S1b-U8;4
z1nh%2V6R`tcPudXL|~sKAQBJY6y4{D4{`4&@jG$}O#{*e=9x^3`NjvoEC6M9B>yN5
zRDDxH)jJtfy$C6wLT_&ZA9HX$g3i$LO%>!4S_Nkc<e3hV<#bH}N!h?G7<rKq3F5&>
zLWhe`IbeVa&QXN){L>^5h9KdqSK-MYO5mV8^G78QuZrl+0TLoby=aKSgdfC!A%>)J
zbP-5;gcY#FaI%l%L=q14Mj6-9;Y#=xNfEaR)1`zogXfTP#@@UMjv-mV-oA<7m{U6F
zwQImGU8O=I1MnM*>aCkx&)1Q+J}C+kV!>$mrNJv#YvGL>^>F@L9eR=kh5_l|nc4;s
zxn1z+*M*>ihDGOf!<D)b_@T5Pp8BDblPdF~kxYmoeK!Vlkno_8$8M21;&<27GIS!2
z%F{m~=^Hm>glQ59-;1G=hVi8hAemp^#_+|1Q$#i#mEMUZI4BKci@@HG0rqKvRKg5_
zHfST^=)yXX%&u(#Ck#JK_}o9$p!Cu|@bbSkqHbk#2lN8dku(<c74eW0E}l-<M4r5P
zgNlWBq`|p0Alcg41H14nz%vvh)RIG3)GJV>QuXriHOPLUo!vdY4(mXXkj8?RoRF3e
z%u*py&*UwzRhG+b^w5zL-crEB_vL#ipYRSsx{L)tva`3(L+5g!N}DN%L`Y#p!ePpx
zOq_8YdnZP6YZE=}o?d}1%*hCbmYRV>SQe~p?QmUQ_cZsKlj3bsGc?cj3#(h;fF7dJ
z(tdoiAYA00$oryMa3<IwiCJ(4?~!V#vkW0!HW&w`^S-J~Jrv(2K^c6lIqp%DHE(Ud
zR6*JWOjhGTR6LXmdeZ@92w6@#emQ$26U56}T#Fv_i}_Ot7jSe=SGV@33Cr4kX@Wk6
z!~pX^(3im=AYFuhKpKJT4?+i_@ma#MdtysByXWM8`42Cc58M0orda?0002ovPDHLk
FV1fZ_piTe)

diff --git a/resources/sprite/login_1x/Openid.png b/resources/sprite/login_1x/Openid.png
deleted file mode 100644
index 7259db47fd103c89311f192f6a4e3a28c8ac8a7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 722
zcmV;@0xkWCP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<0007+Nkl<ZcmeH{
z1CShB6hL3BZ`(FYDaKlBJX2%aR&~suZ^gE4uWj2lZhBH!l-54&zBv6_XxNx!lASBj
zygjQB>6kCtf6@=VIOM`({!=KILs0u8+7t+*qnCzUn94$%V_DN6nmM&LgN2?NdLet7
zHJ&vU^4O?xNJU-&#5a9{$sdNY=ecuv2r{`die;pw-_Q5wzKyyN6cjYC-x9odDv?MO
zP$-lez62VOf_$^0x$`!a2oZ#HpT6lI7_!TsKm{6&c8@?Hut_A+9ww7{xL-27!E!d6
zoy=e`fKI1_4O<U8{{H>{Wa$fQbC?K{WG{!FId@L`@2<T~3WWmrd_IW9V!-!9`z*sp
zM3+jXfD1vbR>Qq}_kQW<fS*0FT*KS8bSi=p)zhVy_iTP@<M00)ghC;3xm@tn;LFuM
z$?y^R%VaW;NF-pfSemP=s=T|#vv_mud4efWpnRcl@2{(0G+~?n!7!}JXfy&Y_FQCm
zpM)xv>Z(?&1rCP;QBhI4p7A`v412!nImo3?uY!dAPXWMOeEF)Op<zXGa`M{H&`@rl
zgt+X1Ua$9z4*vP)pHF+ni}kPAOSCUSk#K5liSG5M(LiyzT$c<612~;d;PH5xp7CnK
z3-&Vo%TR83siu^R1};oYOblGRb}h)|a=@QUGl$Jy)-?{+8Rja}Yfxo=wWiASGA<kh
za&mGQHk%EUN~K2%GO6TOI#2eMCl;yyO55&u9%}W^Hr8tAJ%a{|ii!%~-Me?ES*_M5
zVzp8Z-eN3fpL}61NDwrbUxWtilfnI$0>E>bnVE{qmoMM`@4x@rZCn0_+v^AbhpFN1
z`4LQLuA72}0swfwq@;wLmYIW9W=7kgz4>c2?wDkf$M9oN2Li9^3jhEB07*qoM6N<$
Eg32UavH$=8

diff --git a/resources/sprite/login_1x/Phabricator.png b/resources/sprite/login_1x/Phabricator.png
index 5657d9c3c695c8e9cd78731eb02a8ea376b22f83..b998007a3c4a80e10cc771abd4e063f0151600da 100644
GIT binary patch
delta 496
zcmV<M0T2GA1BwKYB!AIKL_t(YiS5?AYZOrw2JoMPm4ad`Vi7?sR3xzrK2pXiig_6%
zQ5yxtKSEIiQz}@+N5sV_g7~Ne1shEf6vV<tM6pO?A)=tMn7erP?yS3;wF%_FWiRLZ
zzVpq@xpQ_{j-?(e+Td<OKYFk`<(^{}kMQPyT~rrlu+U`9V1IL`W&`*gicaGg`qDaz
z8=3LJ#hML=B6qOqAKZ<o1pZhjW*6Jgoe#Rht%`<%=t+k4V=C=e;VO1yoQFX_+RSWF
zZ9mp!_@$Je#oM$$m2uXn?fXb0vqPELy@2)MBwndMoln!9Y!CcO#u?7dc9s;H2>8bg
zo5bZT_b%|qN`LBgN5h*Xgna?;!snDf9rBYYH?J57)#xp$Hw`Njp={zTg#9P{40l_N
zFX{K2qOUDScgYov2YfE%=M#1U-$VX=;Fmqp_ykaYLhlA_0O#<!q|gUNKjUe=opBnz
z9zz*%ZHAvo`5*Y2_E$2_YWxZ{nht=GKz^KIy?BAGSZR-!IG%AH1bxdRZZwE4v?{{c
zpgYoruFkZg7|@Mk18#L<R*eH{$JBMjK-insIIgMf``}{Ds?q8n@O^A)R;=AmjQ!Y!
mJxTk_-%pIWHfk-$5{^I9k;B_{R@;~W0000<MNUMnLSTXi9QMKh

delta 395
zcmV;60d)R~1f>IzB!6s4L_t(|0qxW?bR_{4fZ?od+qP}nX7$Ro?RL#}ZExJAik*#Z
zH*s?F7q^%bb2;~%FZjpvW}cNf=9p8XS-N_6Tik#PLf{TpgzDc9(5<cxb{zs=oI`I6
z#z1tyF}OhRq&5fYj%eg#g|_y%3{N=W42I~kX-GjfhF14r!+#<8YH0frqdgX(5TwCk
zSnrYcnN>YlZwT%g+AO$h-(~1awS{1@p`Xw`v9f~=Mle2<=zAbIr~d~c6Ya1Yf<q;?
zxrJ2Bspx>;kc;Le`U41t;UGjkL=P0<0~(dsE(IPH9dI_1aIZw)3c+r4g{aY(55d6_
z+Z;s>Hdl6A$A3U@#?TfbQu}yqEzl3SNW;pKCx}H=eQ>6u<bz{@C~JI#s3V5;&T3m*
zlUE}jaTunp7i_eJ!4Xq*Syy;e{7O`Q(1v&hfgQG^6=q->8e=0~Ltuk8b@BB!051@T
pAbiFL1Zn$(u~z1oW6obO#lw>g8y?>R)&Kwi07*qoL<FuvV1lg^wL1U+

diff --git a/resources/sprite/login_1x/Yahoo.png b/resources/sprite/login_1x/Yahoo.png
deleted file mode 100644
index 47a01c53d71806c5cbcca1bfb83434fe8576391f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 365
zcmV-z0h0cSP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<0003rNkl<ZcmeIy
zGk9Hb7{~F{?ou05m)f>5)#lW@51C^-+2T3I5_1XXIE`(!ee)gu(e=GcbbinCIhQZa
z#c^0T(V|7mgJ&Nb&<|1im1fjo1n+F<_Y)Ct$8TeAxTw5GA4F-v30%ca_1=^Cg;%($
zJj7@Gz*Yo9rdZl;FFGOk4`;pCUmzKokXee6hMjPPC}GxoBv&D`d^7T%AP8!3Q|~o@
zi1OCj@8LT{`G*tg`He`0ARU{H)W$+Eh$FWAn0z5hKJK6z0zWf#@et(M^9#;`=+RlI
zNrb@Do`I+E52AdrqNWsrhxQCShQAQyq!l&i@B<s{8F*N4;Atyrj^Yk>*fMA%_Tv>~
zmY>*;qgZ32b_{~6whVMeIsRZk?{Zg&N?b8f`x!cHa?qkh%Yw=zE++0M49XVQ00000
LNkvXXu0mjfI^U*D

diff --git a/resources/sprite/login_2x/Dropbox.png b/resources/sprite/login_2x/Dropbox.png
deleted file mode 100644
index 953ed4eec4c05580684282e6230958dbad5f957a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2350
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
UlBfK83;+NC07*qoM6N<$f;ORhGynhq

diff --git a/resources/sprite/login_2x/Linkedin.png b/resources/sprite/login_2x/Linkedin.png
deleted file mode 100644
index 9999d55c5c0dd76c6d902adf23dac0e12a4fc3dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1585
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

diff --git a/resources/sprite/login_2x/Openid.png b/resources/sprite/login_2x/Openid.png
deleted file mode 100644
index 360aa6e6efb8c25e74d3ac85e7b42a64b95f819d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1013
zcmV<R0}A|!P)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp000BLNkl<ZcmeI#
z1B_%@6vyGSHfC+b8x6v>;;~g~qpWs!skt26o*vtbc5K`B%zFQOZqj&l(+aBgb>;q&
zFDTsV^N_xeR4SE9rBbO>ss@_gk-D<^42d;ZCkn8Wi+T_?_9JXJCD?$g`#gkSjSpdm
zxgI4_JIxP6Mv2re%fpaSBDFi|5y&W!+ME0+WRytlOMMJ7YR&cS+qW$<3&b5rdmOTw
z&pFvw&8?+}fnKZ`Xg<S$0Rvz%nII5%F#QS0h_hHMFc=IF-(l-(2L3>^u34=0e-8Em
zo6x_1f0)f?q^GCDX0t^h?r_GFkP)Z-Tt-F)#K2-8u_l|(Yu2n0=lb>Q_aggw;J|@M
zOG|^@Zf_KEN3x!RjJU?W!)uCxHEYB%K3i>huv6lXa5x;0dA;7>1`i&*XU&>5a|Pm#
zWj_rWapHaPS@9k18ZwGkeEFEU+v2iuI-ODS^Yd>lUc7h-fD+b|eJl`n!ukwk#MOMJ
zCo3r{D?2ULX$Zw5K5K3Htlbem=yJKDj2=CD%k}Hm#b6z%flk?<g-o;Vi)_BtY87iW
zh~iOla`G9s+YOJ$6J-eppd)*d8tIJVImn1J7z}Osir6iN)2=C_SZ6dE&3q)q{S{^E
z)Tx^rJZn;CT`xdJ9Dp}BY}hb(>C&Z3#9Eb=m8WxabAOY6hhiPy=!gA&KePgYz%2mZ
zQ42cnei1UN3BX6JgIJ5DvXYxOZ~nYx%a&<#=gwU-e*E|?6zjxM<Rcqp;>3xosfAti
zwt<YANL=nUgMZ38Qmo6%%Y$s*ym=mKVV8X`K}LG2pr8P<($Z2NwXm!HmmwoP6$}P{
zD=I32WD&KnYq_sLMtW+@m@zwxi;JP<^ZCS<sx7sk8+ornMtW-h{{5MOKmZc4joQb1
z#uurXZsxxR8R;niZKhA3z9ke2K}%e!R;zV)R#w&r)I_%nUx$qJ7J!b!hYvp;4u_#7
zE?3_1-{K+7)JS)V-hhns*tKid98;!D*;86t3N0Q~+>_#Lo@7oIbw=+MzX=)XDES|7
z&*jUPuc@l4`i-9epd|(sn*iRBiwD)6Yyul}zvL~*NY9BK#<_Fne&+q-p7Qc?G^F+(
zEi5d=gTPxdklq8(hV{H~;ll9h>gp}O{PN4Kii!#}<hS74jFo=$+aJ>nTL6@kl->vJ
z$oxl-9v#1E(W1?~Pdz+n(4brVbO7Oxp<kZ<YfV}0!*EAxtpRwGea8&U&&q40vJRwD
jsZ=VJN~Kb%T5taWpKeFf#L#+e00000NkvXXu0mjf@+I#m

diff --git a/resources/sprite/login_2x/Phabricator.png b/resources/sprite/login_2x/Phabricator.png
index 89c0372fbc8bac4cc66fef40bec2ecf626e50797..3792f723fc14a7780cbe430dd09a230961e7c4a6 100644
GIT binary patch
delta 1080
zcmV-81jqZP2h0eNBYy-FNkl<ZXo2mT+lx<86vsb|NHON-et8_Z-zh~N#60jua-R`n
z^1$RtNm4wx#GfFNB)10<F%t?YiBaS-GstByh}<$94{LsPoY|K(bIvi!`PP2;o!?&H
zwZ8ke&)#dV{euh{GGxe*;r~UKl==Gs<ALG8FrWbF3Va4$0e_ExI^bT)aU_aDpb9vL
z2niJJ4zLrL&<XLXQ3UJ;KA{t3YiEI(e>rw9DuEBg6Bcdzf&93E#eE0!fFr;HN1u9R
z3O)wj0zZ+!hX5miNv%94Gyw~ND>38j5DJ02m`A@Ed8Z~Tcm@KifvXm-09cZ6>|PWD
zPb|S~1A29kcYi+iL0c6sWIYOjMneF1fiVgB*k|AmfbxX+t+0tZpMtMSgP&AI761(f
zhnLfGh)he9$Q4ODDnM4lsH0c-SK`H(7m3-(3hBcxgWp6&_Cc0-lanbP+Y6z-YeUax
zhMr#odU|;7S^O_=hYln9Ao-$+{IJ44y7_MhHX68wcz<}tSz?GKvNv{d0nlH;aou5`
zYrlZ*3a*O|j&|>p`M?7Q;TZ)-DUyk3(y}rIUzvwvsY)5LNk8<E*+%R%a1*!zd{>Ig
zwd24k;22P1;O+vv_i!xM2)wNbX0XAoN@3Tc6u#dQ+ewA(^sqtK2*G+_tY-k80M8B2
zeJkMxWPe}=Axr!>N8f3d=eImQ01mmntiwM-wGR7D78}!^HQmzp8FKnJVYwo{z$NgD
z!uXVnfVLZRgQM@|NZ*%8I%vZ@MSLH_2GJ?1IUhPl2${lRym$0%GJJOR_xbk1c2o(s
z8i)NXWCWuN%TPn#Jld{`Ex=|6|1w2<&OxYF7=PQQ++2rE9kRIO(3?NgxM<sp`INs!
z5nrQAAn1O@K?b{(9-D8#Q6$BC=jq!5bTjxkp@?mUPhdXglS8=KHq@I)&E<z85Lc_V
z@cRZvotGA1KS2aY#$rMqQe)|l9EaX01=RpkTbr$pGsnYGt`!#++2A1Tr{Fl~2`bk#
z1%Kc34*L$D4T~_BC;~hgLo1F&Y+fVhzbMyy56@^z3;|Hl4n0QL>M#K?(PMic)b}Y;
zjRP6+FpsOQ3ib>uwzwRMTLX+bc;T@t0k$Id6wxVNiDWXBxXX+?41NPrC?ncL)+X&J
z1Y7QzT8*>>Nrs~i&!*t3!r&)Bs^F=j7=N?K+rWr~eAp^!sf){@FJ_Sel1}-~hBlNT
zXFe0}ns_0%AFj)nCS-9Kui)v6q<NPtTpilPbNCzAXAh9+TaRQm;p?+e$n{wdi)}No
z2&t%bD$=+BJ&Yt8{|t(OJ;cAlzKG<p|164tb;x<|D>_m4kt?&QNe7em-$(`^i7|93
y^3LV{M)C#8OY4y|>`uyYWXO;qLxv3hC4K{Wo#P+SwBjEC0000<MNUMnLSTX_f%~`s

delta 913
zcmV;C18)4x2&M;+BYy*JNkl<ZcmeFe0RaF21OqVrQ;PxLRsaA1do(rn5WPndg<<?;
zY}>YN+qUhQ*tS=(ZQIzy$;7s8<IS_Ui+k#P)qiX8`%v{ZZoB%Gx4t?7PoW$JV>ymO
z&U%bPUA%$w3PNFbqBb@{fumT8Mc4}kj-V}`&yR)OjCPQ-1b?;gCa%Sa!8DiQS(L^k
z$Qg+j@=I}*A*Umriez8HhmpQJP$$^CZE=2H6?Q8o2Zh}lWFEwDd}IFw+3y=L7Vihs
zoQE2a*@8E6ySVpp%pHoaL~@ry*p2Qu0-+~nLipOUg;H$5k&r2yTgCkYnRYlS=)VE$
z(GuU|5R{-CN`GP_UQDsP(k|OFr;GCoD;&vOhHX$_H^yT$)<=qcAu`X`a2P`OoGR{L
z$b1~hTw>pKUG^aU#(6>Z6D)JNvDSWBWZt)92ZZ+7UEI5n`6QCL0K#_chp-2?y383k
z-~B%wvmvtq!jlQNqeBpCXIF7ILgwFu+$9(aIj_0?#(&s_gBXOX-E_wwGX;+(Ea!2T
z{USRGTm_+RI`b<b%y(_wpujquYW?jXEA;eqEaO+mT$`2Rdb{%@t!yPshfD)&zY2=@
z#xmbPW)a$^V|fiAtjbD(|3m1Lj_fGNspg(g6j9tVpFz&{bS&>b2+B%<7vQL0nS|`w
zILBQmhJRXnA*_xRc&%m1yF>I*oRh|~o`%fxSv?2efXqv2WS_%kx3cG3`@L8Z+&aDw
z&s*~?PEER)xvO-|?7EVcg3R5K%oR{ztm`j?&+t7ickT6|z#EZeoQlN|24wfWumyyD
zxGR$R4xgYaWCq}h6xmbI(B)>}P5g}$BE?OEFn=Ydo@P3@!RgBhxn7X74_)vt{y;OV
z4KlM(C^ElmFb~4)@cB1K_M|DAqW^w(pBsduP=ax8*!5kC`Mv4Jh!b&oZj2}@LZ%O{
z4EkTir8qZuB_ZRVTwb+l-U;991m|b>yciSifp7>#Qw*J6a>J@CA#)9Wh~0i@`xr}I
zzJF9+jp{E$Z^*1cVO;Dorw7lYecb;G-R~3e1tvmf8Xn6J?`1x~EXe7EFL7cT)4pnj
zZ-UHL{Ffi!u6=~jP+%)&p+9<K3f4h^+4vi0=J)rbH=zi6VFMJg7sF8r4<Bz2jtKw&
n01yV*KeZ)x0s{a5fXD$Mo_>^S>|0&{015yANkvXXu0mjfBcZ$>

diff --git a/resources/sprite/login_2x/Yahoo.png b/resources/sprite/login_2x/Yahoo.png
deleted file mode 100644
index 5aa8c4fe74f0ad536806194ceef3f3235dbb0a10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp0008dNkl<ZcmeFe
zfdBvi0Dz$VsTZjN004lwuLoE;+9-_U*RE|_ac$eSZQFK(+6Zdfwrza1?bCmgd+$!(
z<Xz5e+i#LzurqVcKEpG=mr@lPh)L!np#}dhGn%6?il8L2A=udh&+ryc@EqcV*Z2?5
zB7MO$#J3<|Q5?dhNSAR2hjGlA0%cGErBN33u?$}|;eKE#il9uSD#(E#3j&tMV+d5=
z-7T5{!|@*ks;$WBphhCpMi+yQXoJ>@Hj(SPqD!PA@JBJ+hA2K@lcz^-5MF3PZbNE2
z`)0v5h?@o@5Ct^>@1n1#0TW;fK0_4mFdOmUtJyy{x}giYVI^Kd3_jr=W}+p!p*!M4
z-9nmxr;yvzfWF9%r4YqWJVy&eX!Z|42m%lntMCP4Fcp~)j$ni!6uyx)N^1h{MSvMM
zxj%B_D1Jf|w^7nTjVxGzr;teZ(G1BQ>{}8yl%8KO!^|g{AIcdUDRv=;X5Vtyjqi|1
z$59i3PV}yhw@SY|Xk*1t&>4?3A*Uj#VcQ7Q!x4zV4wQAFXLHTvncIqh0T_?h5XEEk
zKp2vtopLaqV*|3d*t3;pYKmpmXqOmsG=sni)WvLkgy07rVl0B)=+{ymG&HXVQ}4(8
z*bY&A!#jM&PYCXzEy7%Cqz`xx^{pPzgHaKW@B^Z80@anv$<u(_kk1=mAu%x&A2i|C
zqMY)sG9%z5#PdeL0F=aQO~6(r_2~#PXzi`<$PiS+8%@CW2s5EiB^<#yoJan@C13}H
zo7gWcG9dha7f@aPHvuDuhN_r>3D}3i-V9m7&O@e&3H9S(0>0us1huUUlnyzN3Ar)S
z&TC=@3Lzu1M#_aS7y8A=LWn^*D}n_gBNkvQR$?DMK{USOI96bNq@5^(02ki1U2zZx
zun5_$2$%q)@EYQwk(Le0zuJQX0RR91073rNgIsL^000ns*M$s#tf<uh0000<MNUMn
GLSTaT@={v>

diff --git a/resources/sprite/manifest/login.json b/resources/sprite/manifest/login.json
index f5d15dd890..e9bbb9f2cb 100644
--- a/resources/sprite/manifest/login.json
+++ b/resources/sprite/manifest/login.json
@@ -21,11 +21,6 @@
       "rule": ".login-Disqus",
       "hash": "77b29d56329a3c30b79d6b6673b0e39b"
     },
-    "login-Dropbox": {
-      "name": "login-Dropbox",
-      "rule": ".login-Dropbox",
-      "hash": "5eaf07ae4598227fbbba3474675d18c7"
-    },
     "login-Facebook": {
       "name": "login-Facebook",
       "rule": ".login-Facebook",
@@ -61,21 +56,11 @@
       "rule": ".login-LDAP",
       "hash": "e31df2e9faf8ca0925ef93128a82fa7a"
     },
-    "login-Linkedin": {
-      "name": "login-Linkedin",
-      "rule": ".login-Linkedin",
-      "hash": "b7ee1e92c923462531f3a34093e57127"
-    },
     "login-MediaWiki": {
       "name": "login-MediaWiki",
       "rule": ".login-MediaWiki",
       "hash": "f1f0a9382434081a9a84e7584828c2dd"
     },
-    "login-Openid": {
-      "name": "login-Openid",
-      "rule": ".login-Openid",
-      "hash": "886f65ad44435344a1fa1c13e7758155"
-    },
     "login-PayPal": {
       "name": "login-PayPal",
       "rule": ".login-PayPal",
@@ -84,7 +69,7 @@
     "login-Phabricator": {
       "name": "login-Phabricator",
       "rule": ".login-Phabricator",
-      "hash": "d0f830803593bbcc025d7d5a29ee3ecd"
+      "hash": "54f5ddae4b9d138c438ec00ed42544d2"
     },
     "login-Slack": {
       "name": "login-Slack",
@@ -120,11 +105,6 @@
       "name": "login-WordPressCOM",
       "rule": ".login-WordPressCOM",
       "hash": "9eae4205dbed0c42a18ee4f8e0fa151b"
-    },
-    "login-Yahoo": {
-      "name": "login-Yahoo",
-      "rule": ".login-Yahoo",
-      "hash": "f37822c769f6b8ebd1dda6b3ac89b83b"
     }
   },
   "scales": [
diff --git a/webroot/rsrc/css/sprite-login.css b/webroot/rsrc/css/sprite-login.css
index 72638120f2..ec4e082031 100644
--- a/webroot/rsrc/css/sprite-login.css
+++ b/webroot/rsrc/css/sprite-login.css
@@ -14,7 +14,7 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5),
 only screen and (min-resolution: 1.5dppx) {
   .sprite-login {
     background-image: url(/rsrc/image/sprite-login-X2.png);
-    background-size: 145px 174px;
+    background-size: 145px 145px;
   }
 }
 
@@ -35,28 +35,24 @@ only screen and (min-resolution: 1.5dppx) {
   background-position: -87px 0px;
 }
 
-.login-Dropbox {
+.login-Facebook {
   background-position: -116px 0px;
 }
 
-.login-Facebook {
+.login-Generic {
   background-position: 0px -29px;
 }
 
-.login-Generic {
+.login-Github {
   background-position: -29px -29px;
 }
 
-.login-Github {
+.login-Google {
   background-position: -58px -29px;
 }
 
-.login-Google {
-  background-position: -87px -29px;
-}
-
 .login-HTTP {
-  background-position: -116px -29px;
+  background-position: -87px -29px;
 }
 
 .login-Jira {
@@ -67,54 +63,42 @@ only screen and (min-resolution: 1.5dppx) {
   background-position: -29px -58px;
 }
 
-.login-Linkedin {
+.login-MediaWiki {
   background-position: -58px -58px;
 }
 
-.login-MediaWiki {
+.login-PayPal {
   background-position: -87px -58px;
 }
 
-.login-Openid {
-  background-position: -116px -58px;
-}
-
-.login-PayPal {
+.login-Phabricator {
   background-position: 0px -87px;
 }
 
-.login-Phabricator {
-  background-position: -58px -87px;
-}
-
 .login-Slack {
-  background-position: -87px -87px;
+  background-position: -29px -87px;
 }
 
 .login-Stripe {
-  background-position: -116px -87px;
+  background-position: -58px -87px;
 }
 
 .login-TestPayment {
-  background-position: 0px -116px;
+  background-position: -87px -87px;
 }
 
 .login-TwitchTV {
-  background-position: -29px -116px;
+  background-position: 0px -116px;
 }
 
 .login-Twitter {
-  background-position: -58px -116px;
+  background-position: -29px -116px;
 }
 
 .login-WePay {
-  background-position: -87px -116px;
+  background-position: -58px -116px;
 }
 
 .login-WordPressCOM {
-  background-position: -116px -116px;
-}
-
-.login-Yahoo {
-  background-position: 0px -145px;
+  background-position: -87px -116px;
 }
diff --git a/webroot/rsrc/image/sprite-login-X2.png b/webroot/rsrc/image/sprite-login-X2.png
index 78a044ee72c12b5629e558f7d02cb7a45df9d330..2d3c1187456bb482a0aa5895e05947eb9eb355b9 100644
GIT binary patch
literal 29253
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

literal 48709
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
YR?Q>PFJxWL2Z4XDWK^U}B~1eU156+@_5c6?

diff --git a/webroot/rsrc/image/sprite-login.png b/webroot/rsrc/image/sprite-login.png
index a877ad3754388ade3087df076adf8d7ecaf9b50b..2f79e7ad8a700a2b0082adc9bce457a0cfe82e10 100644
GIT binary patch
literal 12792
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
Dpf;!d

literal 20480
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


From 13ddb15bbcfb107580cdfdb6fa1677479d5640c9 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 09:28:05 -0700
Subject: [PATCH 06/46] Remove legacy `withStatus()` method from RevisionQuery

Summary: Ref T2543. All callsites are now in terms of `withStatuses()`.

Test Plan:
  - Called `differential.query` and `differential.find` from Conduit API.
  - Grepped through all `withStatus()` callsites.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18396
---
 .../DifferentialFindConduitAPIMethod.php      |  4 +--
 .../DifferentialQueryConduitAPIMethod.php     |  5 ++-
 .../constants/DifferentialLegacyQuery.php     |  4 +--
 .../query/DifferentialRevisionQuery.php       | 32 ++-----------------
 4 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php
index a199f599e8..8a8b8c8198 100644
--- a/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php
@@ -52,12 +52,12 @@ final class DifferentialFindConduitAPIMethod
     switch ($type) {
       case 'open':
         $query
-          ->withStatus(DifferentialLegacyQuery::STATUS_OPEN)
+          ->withIsOpen(true)
           ->withAuthors($guids);
         break;
       case 'committable':
         $query
-          ->withStatus(DifferentialLegacyQuery::STATUS_ACCEPTED)
+          ->withStatuses(DifferentialRevisionStatus::ACCEPTED)
           ->withAuthors($guids);
         break;
       case 'revision-ids':
diff --git a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
index 329a44c857..0064e70665 100644
--- a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
@@ -150,7 +150,10 @@ final class DifferentialQueryConduitAPIMethod
     }
 
     if ($status) {
-      $query->withStatus($status);
+      $statuses = DifferentialLegacyQuery::getModernValues($status);
+      if ($statuses) {
+        $query->withStatuses($statuses);
+      }
     }
     if ($order) {
       $query->setOrder($order);
diff --git a/src/applications/differential/constants/DifferentialLegacyQuery.php b/src/applications/differential/constants/DifferentialLegacyQuery.php
index 6a87688e99..ca254918e0 100644
--- a/src/applications/differential/constants/DifferentialLegacyQuery.php
+++ b/src/applications/differential/constants/DifferentialLegacyQuery.php
@@ -15,7 +15,7 @@ final class DifferentialLegacyQuery
     return array_keys(self::getMap());
   }
 
-  public static function getQueryValues($status) {
+  public static function getModernValues($status) {
     if ($status === self::STATUS_ANY) {
       return null;
     }
@@ -28,7 +28,7 @@ final class DifferentialLegacyQuery
           $status));
     }
 
-    return self::getLegacyValues($map[$status]);
+    return $map[$status];
   }
 
   public static function getLegacyValues(array $modern_values) {
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index 8d8169a66e..39bba8112d 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -10,8 +10,6 @@ final class DifferentialRevisionQuery
 
   private $pathIDs = array();
 
-  private $status             = 'status-any';
-
   private $authors = array();
   private $draftAuthors = array();
   private $ccs = array();
@@ -135,19 +133,6 @@ final class DifferentialRevisionQuery
     return $this;
   }
 
-  /**
-   * Filter results to revisions with a given status. Provide a class constant,
-   * such as `DifferentialLegacyQuery::STATUS_OPEN`.
-   *
-   * @param const Class STATUS constant, like STATUS_OPEN.
-   * @return this
-   * @task config
-   */
-  public function withStatus($status_constant) {
-    $this->status = $status_constant;
-    return $this;
-  }
-
   public function withStatuses(array $statuses) {
     $this->statuses = $statuses;
     return $this;
@@ -706,17 +691,6 @@ final class DifferentialRevisionQuery
         $this->updatedEpochMax);
     }
 
-    // NOTE: Although the status constants are integers in PHP, the column is a
-    // string column in MySQL, and MySQL won't use keys on string columns if
-    // you put integers in the query.
-    $statuses = DifferentialLegacyQuery::getQueryValues($this->status);
-    if ($statuses !== null) {
-      $where[] = qsprintf(
-        $conn_r,
-        'r.status IN (%Ls)',
-        $statuses);
-    }
-
     if ($this->statuses !== null) {
       $where[] = qsprintf(
         $conn_r,
@@ -726,16 +700,16 @@ final class DifferentialRevisionQuery
 
     if ($this->isOpen !== null) {
       if ($this->isOpen) {
-        $statuses = DifferentialLegacyQuery::getQueryValues(
+        $statuses = DifferentialLegacyQuery::getModernValues(
           DifferentialLegacyQuery::STATUS_OPEN);
       } else {
-        $statuses = DifferentialLegacyQuery::getQueryValues(
+        $statuses = DifferentialLegacyQuery::getModernValues(
           DifferentialLegacyQuery::STATUS_CLOSED);
       }
       $where[] = qsprintf(
         $conn_r,
         'r.status in (%Ls)',
-        $statuses);
+        DifferentialLegacyQuery::getLegacyValues($statuses));
     }
 
     $where[] = $this->buildWhereClauseParts($conn_r);

From 42020e135767583d001452de1b170686262d90dd Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 09:33:24 -0700
Subject: [PATCH 07/46] Completely remove "differential.find" Conduit API
 method

Summary:
Ref T2543. I believe there have been no upstream callsites of this method since D1646, in February 2012.

The method works, and we can revert this if needbe, but this seems like a good time to remove support.

Test Plan: Grepped for `differential.find`.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18397
---
 src/__phutil_library_map__.php                |  2 -
 .../DifferentialFindConduitAPIMethod.php      | 99 -------------------
 2 files changed, 101 deletions(-)
 delete mode 100644 src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 703962b2ae..40a38b732c 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -445,7 +445,6 @@ phutil_register_library_map(array(
     'DifferentialExactUserFunctionDatasource' => 'applications/differential/typeahead/DifferentialExactUserFunctionDatasource.php',
     'DifferentialFieldParseException' => 'applications/differential/exception/DifferentialFieldParseException.php',
     'DifferentialFieldValidationException' => 'applications/differential/exception/DifferentialFieldValidationException.php',
-    'DifferentialFindConduitAPIMethod' => 'applications/differential/conduit/DifferentialFindConduitAPIMethod.php',
     'DifferentialGetAllDiffsConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetAllDiffsConduitAPIMethod.php',
     'DifferentialGetCommitMessageConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php',
     'DifferentialGetCommitPathsConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetCommitPathsConduitAPIMethod.php',
@@ -5419,7 +5418,6 @@ phutil_register_library_map(array(
     'DifferentialExactUserFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'DifferentialFieldParseException' => 'Exception',
     'DifferentialFieldValidationException' => 'Exception',
-    'DifferentialFindConduitAPIMethod' => 'DifferentialConduitAPIMethod',
     'DifferentialGetAllDiffsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
     'DifferentialGetCommitMessageConduitAPIMethod' => 'DifferentialConduitAPIMethod',
     'DifferentialGetCommitPathsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
diff --git a/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php
deleted file mode 100644
index 8a8b8c8198..0000000000
--- a/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-final class DifferentialFindConduitAPIMethod
-  extends DifferentialConduitAPIMethod {
-
-  public function getAPIMethodName() {
-    return 'differential.find';
-  }
-
-  public function getMethodStatus() {
-    return self::METHOD_STATUS_DEPRECATED;
-  }
-
-  public function getMethodStatusDescription() {
-    return pht("Replaced by '%s'.", 'differential.query');
-  }
-
-  public function getMethodDescription() {
-    return pht('Query Differential revisions which match certain criteria.');
-  }
-
-  protected function defineParamTypes() {
-    $types = array(
-      'open',
-      'committable',
-      'revision-ids',
-      'phids',
-    );
-
-    return array(
-      'query' => 'required '.$this->formatStringConstants($types),
-      'guids' => 'required nonempty list<guids>',
-    );
-  }
-
-  protected function defineReturnType() {
-    return 'nonempty list<dict>';
-  }
-
-  protected function execute(ConduitAPIRequest $request) {
-    $type = $request->getValue('query');
-    $guids = $request->getValue('guids');
-
-    $results = array();
-    if (!$guids) {
-      return $results;
-    }
-
-    $query = id(new DifferentialRevisionQuery())
-      ->setViewer($request->getUser());
-
-    switch ($type) {
-      case 'open':
-        $query
-          ->withIsOpen(true)
-          ->withAuthors($guids);
-        break;
-      case 'committable':
-        $query
-          ->withStatuses(DifferentialRevisionStatus::ACCEPTED)
-          ->withAuthors($guids);
-        break;
-      case 'revision-ids':
-        $query
-          ->withIDs($guids);
-        break;
-      case 'owned':
-        $query->withAuthors($guids);
-        break;
-      case 'phids':
-        $query
-          ->withPHIDs($guids);
-        break;
-    }
-
-    $revisions = $query->execute();
-
-    foreach ($revisions as $revision) {
-      $diff = $revision->loadActiveDiff();
-      if (!$diff) {
-        continue;
-      }
-      $id = $revision->getID();
-      $results[] = array(
-        'id'          => $id,
-        'phid'        => $revision->getPHID(),
-        'name'        => $revision->getTitle(),
-        'uri'         => PhabricatorEnv::getProductionURI('/D'.$id),
-        'dateCreated' => $revision->getDateCreated(),
-        'authorPHID'  => $revision->getAuthorPHID(),
-        'statusName'  => $revision->getStatusDisplayName(),
-        'sourcePath'  => $diff->getSourcePath(),
-      );
-    }
-
-    return $results;
-  }
-
-}

From 153e4d8a383c752923c255916c51a416d13ab875 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 09:41:35 -0700
Subject: [PATCH 08/46] Remove old reviewer double writes to legacy edge table
 in Differential

Summary:
Ref T2543. Ref T10967. This isn't precisely related to "draft" status, but while I'm churning this stuff anyway, get rid of the old double writes to clean the code up a bit.

These were added in T10967 to make sure the migration was reversible/recoverable, but we haven't seen any issues with it in several months so I believe they can now be removed safely. Nothing has read this table since ~April.

Test Plan: Took various review actions on revisions (accept, reject, resign, comment, etc). If this change is correct, there should be no visible effect.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10967, T2543

Differential Revision: https://secure.phabricator.com/D18398
---
 .../editor/DifferentialTransactionEditor.php  | 141 ------------------
 .../DifferentialRevisionAcceptTransaction.php |   2 +-
 .../DifferentialRevisionReviewTransaction.php |  31 +---
 ...fferentialRevisionReviewersTransaction.php |  34 -----
 4 files changed, 3 insertions(+), 205 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 9204a1aadb..2d75a25724 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -257,7 +257,6 @@ final class DifferentialTransactionEditor
 
     $status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
 
-    $edge_reviewer = DifferentialRevisionHasReviewerEdgeType::EDGECONST;
     $edge_ref_task = DifferentialRevisionHasTaskEdgeType::EDGECONST;
 
     $is_sticky_accept = PhabricatorEnv::getEnvConfig(
@@ -297,48 +296,6 @@ final class DifferentialTransactionEditor
     $old_accept = DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER;
     $old_reject = DifferentialReviewerStatus::STATUS_REJECTED_OLDER;
 
-    if ($downgrade_rejects || $downgrade_accepts) {
-      // When a revision is updated, change all "reject" to "rejected older
-      // revision". This means we won't immediately push the update back into
-      // "needs review", but outstanding rejects will still block it from
-      // moving to "accepted".
-
-      // We also do this for "Request Review", even though the diff is not
-      // updated directly. Essentially, this acts like an update which doesn't
-      // actually change the diff text.
-
-      $edits = array();
-      foreach ($object->getReviewers() as $reviewer) {
-        if ($downgrade_rejects) {
-          if ($reviewer->getReviewerStatus() == $new_reject) {
-            $edits[$reviewer->getReviewerPHID()] = array(
-              'data' => array(
-                'status' => $old_reject,
-              ),
-            );
-          }
-        }
-
-        if ($downgrade_accepts) {
-          if ($reviewer->getReviewerStatus() == $new_accept) {
-            $edits[$reviewer->getReviewerPHID()] = array(
-              'data' => array(
-                'status' => $old_accept,
-              ),
-            );
-          }
-        }
-      }
-
-      if ($edits) {
-        $results[] = id(new DifferentialTransaction())
-          ->setTransactionType($type_edge)
-          ->setMetadataValue('edge:type', $edge_reviewer)
-          ->setIgnoreOnNoEffect(true)
-          ->setNewValue(array('+' => $edits));
-      }
-    }
-
     $downgrade = array();
     if ($downgrade_accepts) {
       $downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
@@ -397,43 +354,6 @@ final class DifferentialTransactionEditor
         }
         break;
 
-      case PhabricatorTransactions::TYPE_COMMENT:
-        // When a user leaves a comment, upgrade their reviewer status from
-        // "added" to "commented" if they're also a reviewer. We may further
-        // upgrade this based on other actions in the transaction group.
-
-        if ($this->hasReviewTransaction) {
-          // If we're also applying a review transaction, skip this.
-          break;
-        }
-
-        $status_added = DifferentialReviewerStatus::STATUS_ADDED;
-        $status_commented = DifferentialReviewerStatus::STATUS_COMMENTED;
-
-        $data = array(
-          'status' => $status_commented,
-        );
-
-        $edits = array();
-        foreach ($object->getReviewers() as $reviewer) {
-          if ($reviewer->getReviewerPHID() == $actor_phid) {
-            if ($reviewer->getReviewerStatus() == $status_added) {
-              $edits[$actor_phid] = array(
-                'data' => $data,
-              );
-            }
-          }
-        }
-
-        if ($edits) {
-          $results[] = id(new DifferentialTransaction())
-            ->setTransactionType($type_edge)
-            ->setMetadataValue('edge:type', $edge_reviewer)
-            ->setIgnoreOnNoEffect(true)
-            ->setNewValue(array('+' => $edits));
-        }
-        break;
-
       case DifferentialRevisionCommandeerTransaction::TRANSACTIONTYPE:
         $is_commandeer = true;
         break;
@@ -575,33 +495,6 @@ final class DifferentialTransactionEditor
     return parent::applyBuiltinExternalTransaction($object, $xaction);
   }
 
-  protected function mergeEdgeData($type, array $u, array $v) {
-    $result = parent::mergeEdgeData($type, $u, $v);
-
-    switch ($type) {
-      case DifferentialRevisionHasReviewerEdgeType::EDGECONST:
-        // When the same reviewer has their status updated by multiple
-        // transactions, we want the strongest status to win. An example of
-        // this is when a user adds a comment and also accepts a revision which
-        // they are a reviewer on. The comment creates a "commented" status,
-        // while the accept creates an "accepted" status. Since accept is
-        // stronger, it should win and persist.
-
-        $u_status = idx($u, 'status');
-        $v_status = idx($v, 'status');
-        $u_str = DifferentialReviewerStatus::getStatusStrength($u_status);
-        $v_str = DifferentialReviewerStatus::getStatusStrength($v_status);
-        if ($u_str > $v_str) {
-          $result['status'] = $u_status;
-        } else {
-          $result['status'] = $v_status;
-        }
-        break;
-    }
-
-    return $result;
-  }
-
   protected function applyFinalEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
@@ -748,40 +641,6 @@ final class DifferentialTransactionEditor
 
     foreach ($xactions as $xaction) {
       switch ($type) {
-        case PhabricatorTransactions::TYPE_EDGE:
-          switch ($xaction->getMetadataValue('edge:type')) {
-            case DifferentialRevisionHasReviewerEdgeType::EDGECONST:
-
-              // Prevent the author from becoming a reviewer.
-
-              // NOTE: This is pretty gross, but this restriction is unusual.
-              // If we end up with too much more of this, we should try to clean
-              // this up -- maybe by moving validation to after transactions
-              // are adjusted (so we can just examine the final value) or adding
-              // a second phase there?
-
-              $author_phid = $object->getAuthorPHID();
-              $new = $xaction->getNewValue();
-
-              $add = idx($new, '+', array());
-              $eq = idx($new, '=', array());
-              $phids = array_keys($add + $eq);
-
-              foreach ($phids as $phid) {
-                if (($phid == $author_phid) &&
-                    !$allow_self_accept &&
-                    !$xaction->getIsCommandeerSideEffect()) {
-                  $errors[] =
-                    new PhabricatorApplicationTransactionValidationError(
-                      $type,
-                      pht('Invalid'),
-                      pht('The author of a revision can not be a reviewer.'),
-                      $xaction);
-                }
-              }
-              break;
-          }
-          break;
         case DifferentialTransaction::TYPE_UPDATE:
           $diff = $this->loadDiff($xaction->getNewValue());
           if (!$diff) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
index 9b6aad3ad1..f01ce4b487 100644
--- a/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionAcceptTransaction.php
@@ -103,7 +103,7 @@ final class DifferentialRevisionAcceptTransaction
         if ($reviewer->isAccepted($diff_phid)) {
           // If a reviewer is already in a full "accepted" state, don't
           // include that reviewer as an option unless we're listing all
-          // reviwers, including reviewers who have already accepted.
+          // reviewers, including reviewers who have already accepted.
           continue;
         }
       }
diff --git a/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
index c30514b9ab..b112eb638f 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReviewTransaction.php
@@ -210,34 +210,6 @@ abstract class DifferentialRevisionReviewTransaction
       $map = array_select_keys($map, $value);
     }
 
-    // Convert reviewer statuses into edge data.
-    foreach ($map as $reviewer_phid => $reviewer_status) {
-      $map[$reviewer_phid] = array(
-        'data' => array(
-          'status' => $reviewer_status,
-        ),
-      );
-    }
-
-    // This is currently double-writing: to the old (edge) store and the new
-    // (reviewer) store. Do the old edge write first.
-
-    $src_phid = $revision->getPHID();
-    $edge_type = DifferentialRevisionHasReviewerEdgeType::EDGECONST;
-
-    $editor = new PhabricatorEdgeEditor();
-    foreach ($map as $dst_phid => $edge_data) {
-      if ($status == DifferentialReviewerStatus::STATUS_RESIGNED) {
-        // TODO: For now, we just remove these reviewers. In the future, we will
-        // store resignations explicitly.
-        $editor->removeEdge($src_phid, $edge_type, $dst_phid);
-      } else {
-        $editor->addEdge($src_phid, $edge_type, $dst_phid, $edge_data);
-      }
-    }
-
-    $editor->save();
-
     // Now, do the new write.
 
     if ($map) {
@@ -249,6 +221,7 @@ abstract class DifferentialRevisionReviewTransaction
       }
 
       $table = new DifferentialReviewer();
+      $src_phid = $revision->getPHID();
 
       $reviewers = $table->loadAllWhere(
         'revisionPHID = %s AND reviewerPHID IN (%Ls)',
@@ -256,7 +229,7 @@ abstract class DifferentialRevisionReviewTransaction
         array_keys($map));
       $reviewers = mpull($reviewers, null, 'getReviewerPHID');
 
-      foreach ($map as $dst_phid => $edge_data) {
+      foreach (array_keys($map) as $dst_phid) {
         $reviewer = idx($reviewers, $dst_phid);
         if (!$reviewer) {
           $reviewer = id(new DifferentialReviewer())
diff --git a/src/applications/differential/xaction/DifferentialRevisionReviewersTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReviewersTransaction.php
index a7122f9de4..8b1f9807c1 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReviewersTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReviewersTransaction.php
@@ -106,43 +106,9 @@ final class DifferentialRevisionReviewersTransaction
   public function applyExternalEffects($object, $value) {
     $src_phid = $object->getPHID();
 
-    // This is currently double-writing: to the old (edge) store and the new
-    // (reviewer) store. Do the old edge write first.
-
     $old = $this->generateOldValue($object);
     $new = $value;
-    $edge_type = DifferentialRevisionHasReviewerEdgeType::EDGECONST;
-
-    $editor = new PhabricatorEdgeEditor();
-
     $rem = array_diff_key($old, $new);
-    foreach ($rem as $dst_phid => $status) {
-      $editor->removeEdge($src_phid, $edge_type, $dst_phid);
-    }
-
-    foreach ($new as $dst_phid => $status) {
-      $old_status = idx($old, $dst_phid);
-      if ($old_status === $status) {
-        continue;
-      }
-
-      $data = array(
-        'data' => array(
-          'status' => $status,
-
-          // TODO: This seemes like it's buggy before the Modular Transactions
-          // changes. Figure out what's going on here? We don't have a very
-          // clean way to get the active diff ID right now.
-          'diffID' => null,
-        ),
-      );
-
-      $editor->addEdge($src_phid, $edge_type, $dst_phid, $data);
-    }
-
-    $editor->save();
-
-    // Now, do the new write.
 
     $table = new DifferentialReviewer();
     $table_name = $table->getTableName();

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

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

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

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

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

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

From 36197bf783e48cbe6000307d6a57c0a6f6e09ac0 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 09:52:06 -0700
Subject: [PATCH 10/46] Provide revision status information via API all
 "differential.revision.search"

Summary: Ref T2543. Now that the integer status constants are banished to the internals, we can expose status information from "differential.revision.search".

Test Plan:
Searched for revisions.

{F5093873}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18400
---
 .../constants/DifferentialRevisionStatus.php        |  4 ++++
 .../differential/storage/DifferentialRevision.php   | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
index e5ef7d6a24..7afadfc9b1 100644
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -32,6 +32,10 @@ final class DifferentialRevisionStatus extends Phobject {
     return idx($this->spec, 'color.tag', 'bluegrey');
   }
 
+  public function getANSIColor() {
+    return idx($this->spec, 'color.ansi');
+  }
+
   public function getDisplayName() {
     return idx($this->spec, 'name');
   }
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index a6ce99080a..8c96786a89 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -897,13 +897,26 @@ final class DifferentialRevision extends DifferentialDAO
         ->setKey('authorPHID')
         ->setType('phid')
         ->setDescription(pht('Revision author PHID.')),
+      id(new PhabricatorConduitSearchFieldSpecification())
+        ->setKey('status')
+        ->setType('map<string, wild>')
+        ->setDescription(pht('Information about revision status.')),
     );
   }
 
   public function getFieldValuesForConduit() {
+    $status = $this->getStatusObject();
+    $status_info = array(
+      'value' => $status->getKey(),
+      'name' => $status->getDisplayName(),
+      'closed' => $status->isClosedStatus(),
+      'color.ansi' => $status->getANSIColor(),
+    );
+
     return array(
       'title' => $this->getTitle(),
       'authorPHID' => $this->getAuthorPHID(),
+      'status' => $status_info,
     );
   }
 

From 77bf2456370407b634c945702b07ebc8f4e0ab5a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 13:23:41 -0700
Subject: [PATCH 11/46] Continue reducing callsites to
 ArcanistDifferentialRevisionStatus in transactions

Summary: Ref T2543. Cleans up some more references to ArcanistDifferentialRevisionStatus, moving toward getting rid of it completely.

Test Plan: Planned changes, requested review, inspected the "close" one since it isn't trivial to trigger.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18408
---
 .../xaction/DifferentialRevisionCloseTransaction.php      | 8 ++------
 .../DifferentialRevisionPlanChangesTransaction.php        | 3 +--
 .../DifferentialRevisionRequestReviewTransaction.php      | 3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
index 30bfd5044f..30ca39a362 100644
--- a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
@@ -35,15 +35,11 @@ final class DifferentialRevisionCloseTransaction
   }
 
   public function applyInternalEffects($object, $value) {
+    $was_accepted = $object->isAccepted();
+
     $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
-    $status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
-
-    $old_status = $object->getStatus();
-
     $object->setStatus($status_closed);
 
-    $was_accepted = ($old_status == $status_accepted);
-
     $object->setProperty(
       DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED,
       $was_accepted);
diff --git a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
index 58152bdb67..043071dc96 100644
--- a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
@@ -46,8 +46,7 @@ final class DifferentialRevisionPlanChangesTransaction
   }
 
   public function generateOldValue($object) {
-    $status_planned = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
-    return ($object->getStatus() == $status_planned);
+    return $object->isChangePlanned();
   }
 
   public function applyInternalEffects($object, $value) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
index 65b96d6d8e..2dae24b6fa 100644
--- a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
@@ -27,8 +27,7 @@ final class DifferentialRevisionRequestReviewTransaction
   }
 
   public function generateOldValue($object) {
-    $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
-    return ($object->getStatus() == $status_review);
+    return $object->isNeedsReview();
   }
 
   public function applyInternalEffects($object, $value) {

From 3b14c1fdd1cf500ad42a095780edb176826d3788 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 11 Aug 2017 15:16:59 -0700
Subject: [PATCH 12/46] Update AphlictClientServer to support ws2 or ws3

Summary: This lets us support either ws2 or ws3. Fixes T12755

Test Plan: Update server to version 3, send message, watch debug log. Downgrade to 2.x, send messages, watch debug log. Everything seems OK

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12755

Differential Revision: https://secure.phabricator.com/D18411
---
 support/aphlict/server/lib/AphlictClientServer.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/support/aphlict/server/lib/AphlictClientServer.js b/support/aphlict/server/lib/AphlictClientServer.js
index 0d23d4f4f1..989b3f1db1 100644
--- a/support/aphlict/server/lib/AphlictClientServer.js
+++ b/support/aphlict/server/lib/AphlictClientServer.js
@@ -92,8 +92,14 @@ JX.install('AphlictClientServer', {
       var server = this._server.listen.apply(this._server, arguments);
       var wss = new WebSocket.Server({server: server});
 
-      wss.on('connection', function(ws) {
-        var path = url.parse(ws.upgradeReq.url).pathname;
+      // This function checks for upgradeReq which is only available in
+      // ws2 by default, not ws3. See T12755 for more information.
+      wss.on('connection', function(ws, request) {
+        if ('upgradeReq' in ws) {
+          request = ws.upgradeReq;
+        }
+
+        var path = url.parse(request.url).pathname;
         var instance = self._parseInstanceFromPath(path);
 
         var listener = self.getListenerList(instance).addListener(ws);

From 19bc91fd208d7aad363812a8e72140331476ff52 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 14:13:25 -0700
Subject: [PATCH 13/46] Modularize the Differential "status" transaction and
 move away from ArcanistDifferentialRevisionStatus

Summary:
Ref T2543. Converts the TYPE_STATUS transaction (used to render "This revision now requires changes to proceed.", "This revision is accepted and ready to land.", etc) to ModularTransactions.

Also, continue consolidating all the status-related information (here, more colors and icons) into a single place. By the end of this, we may learn that NEEDS_REVIEW uses //every// color.

Test Plan:
Reviewed old status transactions (unchanged) and created new ones (looked the same as the old ones).

(I plan to migrate all of these a few diffs from now, around when I change the storage format.)

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18410
---
 src/__phutil_library_map__.php                |  2 +
 .../constants/DifferentialRevisionStatus.php  | 18 +++++
 .../editor/DifferentialTransactionEditor.php  |  4 +-
 .../storage/DifferentialTransaction.php       | 69 +++++------------
 .../DifferentialRevisionStatusTransaction.php | 74 +++++++++++++++++++
 5 files changed, 116 insertions(+), 51 deletions(-)
 create mode 100644 src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 40a38b732c..1b328c1ec3 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -575,6 +575,7 @@ phutil_register_library_map(array(
     'DifferentialRevisionStatus' => 'applications/differential/constants/DifferentialRevisionStatus.php',
     'DifferentialRevisionStatusDatasource' => 'applications/differential/typeahead/DifferentialRevisionStatusDatasource.php',
     'DifferentialRevisionStatusFunctionDatasource' => 'applications/differential/typeahead/DifferentialRevisionStatusFunctionDatasource.php',
+    'DifferentialRevisionStatusTransaction' => 'applications/differential/xaction/DifferentialRevisionStatusTransaction.php',
     'DifferentialRevisionSummaryHeraldField' => 'applications/differential/herald/DifferentialRevisionSummaryHeraldField.php',
     'DifferentialRevisionSummaryTransaction' => 'applications/differential/xaction/DifferentialRevisionSummaryTransaction.php',
     'DifferentialRevisionTestPlanTransaction' => 'applications/differential/xaction/DifferentialRevisionTestPlanTransaction.php',
@@ -5571,6 +5572,7 @@ phutil_register_library_map(array(
     'DifferentialRevisionStatus' => 'Phobject',
     'DifferentialRevisionStatusDatasource' => 'PhabricatorTypeaheadDatasource',
     'DifferentialRevisionStatusFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
+    'DifferentialRevisionStatusTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionSummaryHeraldField' => 'DifferentialRevisionHeraldField',
     'DifferentialRevisionSummaryTransaction' => 'DifferentialRevisionTransactionType',
     'DifferentialRevisionTestPlanTransaction' => 'DifferentialRevisionTransactionType',
diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
index 7afadfc9b1..96554780bd 100644
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -32,6 +32,14 @@ final class DifferentialRevisionStatus extends Phobject {
     return idx($this->spec, 'color.tag', 'bluegrey');
   }
 
+  public function getTimelineIcon() {
+    return idx($this->spec, 'icon.timeline');
+  }
+
+  public function getTimelineColor() {
+    return idx($this->spec, 'color.timeline');
+  }
+
   public function getANSIColor() {
     return idx($this->spec, 'color.ansi');
   }
@@ -56,6 +64,10 @@ final class DifferentialRevisionStatus extends Phobject {
     return ($this->key === self::NEEDS_REVIEW);
   }
 
+  public function isNeedsRevision() {
+    return ($this->key === self::NEEDS_REVISION);
+  }
+
   public function isPublished() {
     return ($this->key === self::PUBLISHED);
   }
@@ -116,19 +128,23 @@ final class DifferentialRevisionStatus extends Phobject {
         'name' => pht('Needs Review'),
         'legacy' => 0,
         'icon' => 'fa-code',
+        'icon.timeline' => 'fa-undo',
         'closed' => false,
         'color.icon' => 'grey',
         'color.tag' => 'bluegrey',
         'color.ansi' => 'magenta',
+        'color.timeline' => 'orange',
       ),
       self::NEEDS_REVISION => array(
         'name' => pht('Needs Revision'),
         'legacy' => 1,
         'icon' => 'fa-refresh',
+        'icon.timeline' => 'fa-times',
         'closed' => false,
         'color.icon' => 'red',
         'color.tag' => 'red',
         'color.ansi' => 'red',
+        'color.timeline' => 'red',
       ),
       self::CHANGES_PLANNED => array(
         'name' => pht('Changes Planned'),
@@ -143,10 +159,12 @@ final class DifferentialRevisionStatus extends Phobject {
         'name' => pht('Accepted'),
         'legacy' => 2,
         'icon' => 'fa-check',
+        'icon.timeline' => 'fa-check',
         'closed' => $close_on_accept,
         'color.icon' => 'green',
         'color.tag' => 'green',
         'color.ansi' => 'green',
+        'color.timeline' => 'green',
       ),
       self::PUBLISHED => array(
         'name' => pht('Closed'),
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 2d75a25724..9390d1d2af 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -71,7 +71,6 @@ final class DifferentialTransactionEditor
 
     $types[] = DifferentialTransaction::TYPE_ACTION;
     $types[] = DifferentialTransaction::TYPE_INLINE;
-    $types[] = DifferentialTransaction::TYPE_STATUS;
     $types[] = DifferentialTransaction::TYPE_UPDATE;
 
     return $types;
@@ -606,7 +605,8 @@ final class DifferentialTransactionEditor
 
         if ($new_status !== null && ($new_status != $old_status)) {
           $xaction = id(new DifferentialTransaction())
-            ->setTransactionType(DifferentialTransaction::TYPE_STATUS)
+            ->setTransactionType(
+                DifferentialRevisionStatusTransaction::TRANSACTIONTYPE)
             ->setOldValue($old_status)
             ->setNewValue($new_status);
 
diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index c6c55e0cdd..b4670fffb2 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -8,7 +8,6 @@ final class DifferentialTransaction
   const TYPE_INLINE  = 'differential:inline';
   const TYPE_UPDATE  = 'differential:update';
   const TYPE_ACTION  = 'differential:action';
-  const TYPE_STATUS  = 'differential:status';
 
   const MAILTAG_REVIEWERS      = 'differential-reviewers';
   const MAILTAG_CLOSED         = 'differential-committed';
@@ -42,6 +41,10 @@ final class DifferentialTransaction
       }
     }
 
+    if ($xaction_type == 'differential:status') {
+      return new DifferentialRevisionStatusTransaction();
+    }
+
     return parent::newFallbackModularTransactionType();
   }
 
@@ -305,15 +308,6 @@ final class DifferentialTransaction
             return DifferentialAction::getBasicStoryText($new, $author_handle);
         }
         break;
-      case self::TYPE_STATUS:
-        switch ($this->getNewValue()) {
-          case ArcanistDifferentialRevisionStatus::ACCEPTED:
-            return pht('This revision is now accepted and ready to land.');
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
-            return pht('This revision now requires changes to proceed.');
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
-            return pht('This revision now requires review to proceed.');
-        }
      }
 
     return parent::getTitle();
@@ -457,21 +451,6 @@ final class DifferentialTransaction
               $object_link);
         }
         break;
-      case self::TYPE_STATUS:
-        switch ($this->getNewValue()) {
-          case ArcanistDifferentialRevisionStatus::ACCEPTED:
-            return pht(
-              '%s is now accepted and ready to land.',
-              $object_link);
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
-            return pht(
-              '%s now requires changes to proceed.',
-              $object_link);
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
-            return pht(
-              '%s now requires review to proceed.',
-              $object_link);
-        }
      }
 
     return parent::getTitleForFeed();
@@ -483,16 +462,6 @@ final class DifferentialTransaction
         return 'fa-comment';
       case self::TYPE_UPDATE:
         return 'fa-refresh';
-      case self::TYPE_STATUS:
-        switch ($this->getNewValue()) {
-          case ArcanistDifferentialRevisionStatus::ACCEPTED:
-            return 'fa-check';
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
-            return 'fa-times';
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
-            return 'fa-undo';
-        }
-        break;
       case self::TYPE_ACTION:
         switch ($this->getNewValue()) {
           case DifferentialAction::ACTION_CLOSE:
@@ -530,14 +499,12 @@ final class DifferentialTransaction
     // Never group status changes with other types of actions, they're indirect
     // and don't make sense when combined with direct actions.
 
-    $type_status = self::TYPE_STATUS;
-
-    if ($this->getTransactionType() == $type_status) {
+    if ($this->isStatusTransaction($this)) {
       return false;
     }
 
     foreach ($group as $xaction) {
-      if ($xaction->getTransactionType() == $type_status) {
+      if ($this->isStatusTransaction($xaction)) {
         return false;
       }
     }
@@ -545,21 +512,25 @@ final class DifferentialTransaction
     return parent::shouldDisplayGroupWith($group);
   }
 
+  private function isStatusTransaction($xaction) {
+    $old_status = 'differential:status';
+    if ($xaction->getTransactionType() == $old_status) {
+      return true;
+    }
+
+    $new_status = DifferentialRevisionStatusTransaction::TRANSACTIONTYPE;
+    if ($xaction->getTransactionType() == $new_status) {
+      return true;
+    }
+
+    return false;
+  }
+
 
   public function getColor() {
     switch ($this->getTransactionType()) {
       case self::TYPE_UPDATE:
         return PhabricatorTransactions::COLOR_SKY;
-      case self::TYPE_STATUS:
-        switch ($this->getNewValue()) {
-          case ArcanistDifferentialRevisionStatus::ACCEPTED:
-            return PhabricatorTransactions::COLOR_GREEN;
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
-            return PhabricatorTransactions::COLOR_RED;
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
-            return PhabricatorTransactions::COLOR_ORANGE;
-        }
-        break;
       case self::TYPE_ACTION:
         switch ($this->getNewValue()) {
           case DifferentialAction::ACTION_CLOSE:
diff --git a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
new file mode 100644
index 0000000000..05c0a69aa1
--- /dev/null
+++ b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
@@ -0,0 +1,74 @@
+<?php
+
+final class DifferentialRevisionStatusTransaction
+  extends DifferentialRevisionTransactionType {
+
+  const TRANSACTIONTYPE = 'differential.revision.status';
+
+  public function generateOldValue($object) {
+    return $object->getStatus();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $object->setStatus($value);
+  }
+
+  public function getTitle() {
+    $new = $this->getNewValue();
+    $status = DifferentialRevisionStatus::newForLegacyStatus($new);
+
+    if ($status->isAccepted()) {
+      return pht('This revision is now accepted and ready to land.');
+    }
+
+    if ($status->isNeedsRevision()) {
+      return pht('This revision now requires changes to proceed.');
+    }
+
+    if ($status->isNeedsReview()) {
+      return pht('This revision now requires review to proceed.');
+    }
+
+    return null;
+  }
+
+  public function getTitleForFeed() {
+    $status = $this->newStatusObject();
+
+    if ($status->isAccepted()) {
+      return pht(
+        '%s is now accepted and ready to land.',
+        $this->renderObject());
+    }
+
+    if ($status->isNeedsRevision()) {
+      return pht(
+        '%s now requires changes to proceed.',
+        $this->renderObject());
+    }
+
+    if ($status->isNeedsReview()) {
+      return pht(
+        '%s now requires review to proceed.',
+        $this->renderObject());
+    }
+
+    return null;
+  }
+
+  public function getIcon() {
+    $status = $this->newStatusObject();
+    return $status->getTimelineIcon();
+  }
+
+  public function getColor() {
+    $status = $this->newStatusObject();
+    return $status->getTimelineColor();
+  }
+
+  private function newStatusObject() {
+    $new = $this->getNewValue();
+    return DifferentialRevisionStatus::newForLegacyStatus($new);
+  }
+
+}

From 2b9838b482af694f9577be80b7aac80fd8fb0117 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 14:47:39 -0700
Subject: [PATCH 14/46] Modularize remaining TYPE_ACTION transactions in
 Differential, reducing calls to ArcanistDifferentialRevisionStatus

Summary:
Ref T2543. This cleans up a couple of remaining rough edges:

  - We could do an older TYPE_ACTION "close" via the daemons.
  - We could do an older TYPE_ACTION "close" via `arc close-revision`, explicitly or implicitly in `arc land`, via API (`differential.close`).
  - We could do an older TYPE_ACTION "rethink" ("Plan Changes") via the API, via `arc diff --plan-changes` (`differential.createcomment`).

Move these to modern modular transactions, then get rid of all the validation and application logic for them. This nukes a bunch of `ArcanistDifferentialRevision::...` junk.

Test Plan:
  - Used `bin/repository reparse --message rXYZ...` to reparse a commit, closing a corresponding revision.
  - Used `differential.close` to close a revision.
  - Used `differential.createcomment` to plan changes to a revision.
  - Reviewed transaction log for full "closed by commit" message (linking to commit and mentioning author).
  - Grepped for `::TYPE_ACTION` to look for remaining callsites, didn't find any.
  - Grepped for `differential.close` and `differential.createcomment` in `arcanist/` to look for anything suspicious, seemed clean.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18412
---
 .../DifferentialCloseConduitAPIMethod.php     |   5 +-
 ...ferentialCreateCommentConduitAPIMethod.php |   8 +-
 .../editor/DifferentialTransactionEditor.php  | 239 ------------------
 .../DifferentialRevisionCloseTransaction.php  |  53 +++-
 ...torRepositoryCommitMessageParserWorker.php |   8 +-
 5 files changed, 63 insertions(+), 250 deletions(-)

diff --git a/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php
index 30f8a5e5b7..12ecda1262 100644
--- a/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php
@@ -52,8 +52,9 @@ final class DifferentialCloseConduitAPIMethod
 
     $xactions = array();
     $xactions[] = id(new DifferentialTransaction())
-      ->setTransactionType(DifferentialTransaction::TYPE_ACTION)
-      ->setNewValue(DifferentialAction::ACTION_CLOSE);
+      ->setTransactionType(
+        DifferentialRevisionCloseTransaction::TRANSACTIONTYPE)
+      ->setNewValue(true);
 
     $content_source = $request->newContentSource();
 
diff --git a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
index 943c3e7702..21b055a1e4 100644
--- a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
@@ -63,6 +63,7 @@ final class DifferentialCreateCommentConduitAPIMethod
       'resign' => DifferentialRevisionResignTransaction::TRANSACTIONTYPE,
       'request_review' =>
         DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE,
+      'rethink' => DifferentialRevisionPlanChangesTransaction::TRANSACTIONTYPE,
     );
 
     $action = $request->getValue('action');
@@ -76,9 +77,10 @@ final class DifferentialCreateCommentConduitAPIMethod
         case 'none':
           break;
         default:
-          $xactions[] = id(new DifferentialTransaction())
-            ->setTransactionType(DifferentialTransaction::TYPE_ACTION)
-            ->setNewValue($action);
+          throw new Exception(
+            pht(
+              'Unsupported action "%s".',
+              $action));
           break;
       }
     }
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 9390d1d2af..8089438ab9 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -69,7 +69,6 @@ final class DifferentialTransactionEditor
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
     $types[] = PhabricatorTransactions::TYPE_INLINESTATE;
 
-    $types[] = DifferentialTransaction::TYPE_ACTION;
     $types[] = DifferentialTransaction::TYPE_INLINE;
     $types[] = DifferentialTransaction::TYPE_UPDATE;
 
@@ -81,8 +80,6 @@ final class DifferentialTransactionEditor
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
-      case DifferentialTransaction::TYPE_ACTION:
-        return null;
       case DifferentialTransaction::TYPE_INLINE:
         return null;
       case DifferentialTransaction::TYPE_UPDATE:
@@ -101,7 +98,6 @@ final class DifferentialTransactionEditor
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
-      case DifferentialTransaction::TYPE_ACTION:
       case DifferentialTransaction::TYPE_UPDATE:
         return $xaction->getNewValue();
       case DifferentialTransaction::TYPE_INLINE:
@@ -120,28 +116,6 @@ final class DifferentialTransactionEditor
     switch ($xaction->getTransactionType()) {
       case DifferentialTransaction::TYPE_INLINE:
         return $xaction->hasComment();
-      case DifferentialTransaction::TYPE_ACTION:
-        $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
-        $status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
-        $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
-        $status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
-        $status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
-
-        $action_type = $xaction->getNewValue();
-        switch ($action_type) {
-          case DifferentialAction::ACTION_CLOSE:
-            return ($object->getStatus() != $status_closed);
-          case DifferentialAction::ACTION_ABANDON:
-            return ($object->getStatus() != $status_abandoned);
-          case DifferentialAction::ACTION_RECLAIM:
-            return ($object->getStatus() == $status_abandoned);
-          case DifferentialAction::ACTION_REOPEN:
-            return ($object->getStatus() == $status_closed);
-          case DifferentialAction::ACTION_RETHINK:
-            return ($object->getStatus() != $status_plan);
-          case DifferentialAction::ACTION_CLAIM:
-            return ($actor_phid != $object->getAuthorPHID());
-        }
     }
 
     return parent::transactionHasEffect($object, $xaction);
@@ -183,38 +157,6 @@ final class DifferentialTransactionEditor
 
         // TODO: Update the `diffPHID` once we add that.
         return;
-      case DifferentialTransaction::TYPE_ACTION:
-        switch ($xaction->getNewValue()) {
-          case DifferentialAction::ACTION_ABANDON:
-            $object->setStatus(ArcanistDifferentialRevisionStatus::ABANDONED);
-            return;
-          case DifferentialAction::ACTION_RETHINK:
-            $object->setStatus($status_plan);
-            return;
-          case DifferentialAction::ACTION_RECLAIM:
-            $object->setStatus($status_review);
-            return;
-          case DifferentialAction::ACTION_REOPEN:
-            $object->setStatus($status_review);
-            return;
-          case DifferentialAction::ACTION_CLOSE:
-            $old_status = $object->getStatus();
-            $object->setStatus(ArcanistDifferentialRevisionStatus::CLOSED);
-            $was_accepted = ($old_status == $status_accepted);
-            $object->setProperty(
-              DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED,
-              $was_accepted);
-            return;
-          case DifferentialAction::ACTION_CLAIM:
-            $object->setAuthorPHID($this->getActingAsPHID());
-            return;
-          default:
-            throw new Exception(
-              pht(
-                'Differential action "%s" is not a valid action!',
-                $xaction->getNewValue()));
-        }
-        break;
     }
 
     return parent::applyCustomInternalTransaction($object, $xaction);
@@ -356,16 +298,6 @@ final class DifferentialTransactionEditor
       case DifferentialRevisionCommandeerTransaction::TRANSACTIONTYPE:
         $is_commandeer = true;
         break;
-
-      case DifferentialTransaction::TYPE_ACTION:
-        $action_type = $xaction->getNewValue();
-
-        switch ($action_type) {
-          case DifferentialAction::ACTION_CLAIM:
-            $is_commandeer = true;
-            break;
-        }
-      break;
     }
 
     if ($is_commandeer) {
@@ -375,7 +307,6 @@ final class DifferentialTransactionEditor
     if (!$this->didExpandInlineState) {
       switch ($xaction->getTransactionType()) {
         case PhabricatorTransactions::TYPE_COMMENT:
-        case DifferentialTransaction::TYPE_ACTION:
         case DifferentialTransaction::TYPE_UPDATE:
         case DifferentialTransaction::TYPE_INLINE:
           $this->didExpandInlineState = true;
@@ -421,8 +352,6 @@ final class DifferentialTransactionEditor
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
-      case DifferentialTransaction::TYPE_ACTION:
-        return;
       case DifferentialTransaction::TYPE_INLINE:
         $reply = $xaction->getComment()->getReplyToComment();
         if ($reply && !$reply->getHasReplies()) {
@@ -660,172 +589,12 @@ final class DifferentialTransactionEditor
               $xaction);
           }
           break;
-        case DifferentialTransaction::TYPE_ACTION:
-          $error = $this->validateDifferentialAction(
-            $object,
-            $type,
-            $xaction,
-            $xaction->getNewValue());
-          if ($error) {
-            $errors[] = new PhabricatorApplicationTransactionValidationError(
-              $type,
-              pht('Invalid'),
-              $error,
-              $xaction);
-          }
-          break;
       }
     }
 
     return $errors;
   }
 
-  private function validateDifferentialAction(
-    DifferentialRevision $revision,
-    $type,
-    DifferentialTransaction $xaction,
-    $action) {
-
-    $author_phid = $revision->getAuthorPHID();
-    $actor_phid = $this->getActingAsPHID();
-    $actor_is_author = ($author_phid == $actor_phid);
-
-    $config_abandon_key = 'differential.always-allow-abandon';
-    $always_allow_abandon = PhabricatorEnv::getEnvConfig($config_abandon_key);
-
-    $config_close_key = 'differential.always-allow-close';
-    $always_allow_close = PhabricatorEnv::getEnvConfig($config_close_key);
-
-    $config_reopen_key = 'differential.allow-reopen';
-    $allow_reopen = PhabricatorEnv::getEnvConfig($config_reopen_key);
-
-    $config_self_accept_key = 'differential.allow-self-accept';
-    $allow_self_accept = PhabricatorEnv::getEnvConfig($config_self_accept_key);
-
-    $revision_status = $revision->getStatus();
-
-    $status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
-    $status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
-    $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
-
-    switch ($action) {
-      case DifferentialAction::ACTION_CLAIM:
-        // You can claim a revision if you're not the owner. If you are, this
-        // is a no-op rather than invalid.
-
-        if ($revision_status == $status_closed) {
-          return pht(
-            'You can not commandeer this revision because it has already been '.
-            'closed.');
-        }
-        break;
-
-      case DifferentialAction::ACTION_ABANDON:
-        if (!$actor_is_author && !$always_allow_abandon) {
-          return pht(
-            'You can not abandon this revision because you do not own it. '.
-            'You can only abandon revisions you own.');
-        }
-
-        if ($revision_status == $status_closed) {
-          return pht(
-            'You can not abandon this revision because it has already been '.
-            'closed.');
-        }
-
-        // NOTE: Abandons of already-abandoned revisions are treated as no-op
-        // instead of invalid. Other abandons are OK.
-
-        break;
-
-      case DifferentialAction::ACTION_RECLAIM:
-        if (!$actor_is_author) {
-          return pht(
-            'You can not reclaim this revision because you do not own '.
-            'it. You can only reclaim revisions you own.');
-        }
-
-        if ($revision_status == $status_closed) {
-          return pht(
-            'You can not reclaim this revision because it has already been '.
-            'closed.');
-        }
-
-        // NOTE: Reclaims of other non-abandoned revisions are treated as no-op
-        // instead of invalid.
-
-        break;
-
-      case DifferentialAction::ACTION_REOPEN:
-        if (!$allow_reopen) {
-          return pht(
-            'The reopen action is not enabled on this Phabricator install. '.
-            'Adjust your configuration to enable it.');
-        }
-
-        // NOTE: If the revision is not closed, this is caught as a no-op
-        // instead of an invalid transaction.
-
-        break;
-
-      case DifferentialAction::ACTION_RETHINK:
-        if (!$actor_is_author) {
-          return pht(
-            'You can not plan changes to this revision because you do not '.
-            'own it. To plan changes to a revision, you must be its owner.');
-        }
-
-        switch ($revision_status) {
-          case ArcanistDifferentialRevisionStatus::ACCEPTED:
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
-          case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
-            // These are OK.
-            break;
-          case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
-            // Let this through, it's a no-op.
-            break;
-          case ArcanistDifferentialRevisionStatus::ABANDONED:
-            return pht(
-              'You can not plan changes to this revision because it has '.
-              'been abandoned.');
-          case ArcanistDifferentialRevisionStatus::CLOSED:
-            return pht(
-              'You can not plan changes to this revision because it has '.
-              'already been closed.');
-          default:
-            throw new Exception(
-              pht(
-                'Encountered unexpected revision status ("%s") when '.
-                'validating "%s" action.',
-                $revision_status,
-                $action));
-        }
-        break;
-
-      case DifferentialAction::ACTION_CLOSE:
-        // We force revisions closed when we discover a corresponding commit.
-        // In this case, revisions are allowed to transition to closed from
-        // any state. This is an automated action taken by the daemons.
-
-        if (!$this->getIsCloseByCommit()) {
-          if (!$actor_is_author && !$always_allow_close) {
-            return pht(
-              'You can not close this revision because you do not own it. To '.
-              'close a revision, you must be its owner.');
-          }
-
-          if ($revision_status != $status_accepted) {
-            return pht(
-              'You can not close this revision because it has not been '.
-              'accepted. You can only close accepted revisions.');
-          }
-        }
-        break;
-    }
-
-    return null;
-  }
-
   protected function sortTransactions(array $xactions) {
     $xactions = parent::sortTransactions($xactions);
 
@@ -1233,14 +1002,6 @@ final class DifferentialTransactionEditor
           // When users commandeer revisions, we may need to trigger
           // signatures or author-based rules.
           return true;
-        case DifferentialTransaction::TYPE_ACTION:
-          switch ($xaction->getNewValue()) {
-            case DifferentialAction::ACTION_CLAIM:
-              // When users commandeer revisions, we may need to trigger
-              // signatures or author-based rules.
-              return true;
-          }
-          break;
       }
     }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
index 30ca39a362..203b84a191 100644
--- a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
@@ -46,6 +46,12 @@ final class DifferentialRevisionCloseTransaction
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
+    if ($this->getEditor()->getIsCloseByCommit()) {
+      // If we're closing a revision because we discovered a commit, we don't
+      // care what state it was in.
+      return;
+    }
+
     if ($object->isClosed()) {
       throw new Exception(
         pht(
@@ -74,9 +80,50 @@ final class DifferentialRevisionCloseTransaction
   }
 
   public function getTitle() {
-    return pht(
-      '%s closed this revision.',
-      $this->renderAuthor());
+    if (!$this->getMetadataValue('isCommitClose')) {
+      return pht(
+        '%s closed this revision.',
+        $this->renderAuthor());
+    }
+
+    $commit_phid = $this->getMetadataValue('commitPHID');
+    $committer_phid = $this->getMetadataValue('committerPHID');
+    $author_phid = $this->getMetadataValue('authorPHID');
+
+    if ($committer_phid) {
+      $committer_name = $this->renderHandle($committer_phid);
+    } else {
+      $committer_name = $this->getMetadataValue('committerName');
+    }
+
+    if ($author_phid) {
+      $author_name = $this->renderHandle($author_phid);
+    } else {
+      $author_name = $this->getMetadatavalue('authorName');
+    }
+
+    $same_phid =
+      strlen($committer_phid) &&
+      strlen($author_phid) &&
+      ($committer_phid == $author_phid);
+
+    $same_name =
+      !strlen($committer_phid) &&
+      !strlen($author_phid) &&
+      ($committer_name == $author_name);
+
+    if ($same_name || $same_phid) {
+      return pht(
+        'Closed by commit %s (authored by %s).',
+        $this->renderHandle($commit_phid),
+        $author_name);
+    } else {
+      return pht(
+        'Closed by commit %s (authored by %s, committed by %s).',
+        $this->renderHandle($commit_phid),
+        $author_name,
+        $committer_name);
+    }
   }
 
   public function getTitleForFeed() {
diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
index ab11a83b38..0d0ff28d95 100644
--- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
+++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
@@ -205,9 +205,11 @@ abstract class PhabricatorRepositoryCommitMessageParserWorker
 
         $should_close = !$revision->isPublished() && $should_autoclose;
         if ($should_close) {
-           $commit_close_xaction = id(new DifferentialTransaction())
-            ->setTransactionType(DifferentialTransaction::TYPE_ACTION)
-            ->setNewValue(DifferentialAction::ACTION_CLOSE)
+          $type_close = DifferentialRevisionCloseTransaction::TRANSACTIONTYPE;
+
+          $commit_close_xaction = id(new DifferentialTransaction())
+            ->setTransactionType($type_close)
+            ->setNewValue(true)
             ->setMetadataValue('isCommitClose', true);
 
           $commit_close_xaction->setMetadataValue(

From 7f743c14d532b4998a9d3c4fbd54c7a4db66d697 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 15:31:58 -0700
Subject: [PATCH 15/46] Remove remaining ArcanistDifferentialRevisionStatus
 references in revision state logic

Summary: Ref T2543. This cleans up all the "when no one is rejecting/blocking and someone accepted, mark the revision overall as accepted" logic to use more modern status stuff instead of `ArcanistDifferentialRevisionStatus`.

Test Plan:
  - Updated revisions, saw them go to "Needs Review".
  - Accepted, requested changes to revisions.
  - Updated one with changes requested, saw it go to "needs review" again.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18413
---
 .../editor/DifferentialTransactionEditor.php  | 215 +++++++++---------
 .../storage/DifferentialRevision.php          |  19 ++
 2 files changed, 128 insertions(+), 106 deletions(-)

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 8089438ab9..e7123c92a1 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -125,23 +125,16 @@ final class DifferentialTransactionEditor
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
-    $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
-    $status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
-    $status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
-    $status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
-    $status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
-
     switch ($xaction->getTransactionType()) {
       case DifferentialTransaction::TYPE_INLINE:
         return;
       case DifferentialTransaction::TYPE_UPDATE:
         if (!$this->getIsCloseByCommit()) {
-          switch ($object->getStatus()) {
-            case $status_revision:
-            case $status_plan:
-            case $status_abandoned:
-              $object->setStatus($status_review);
-              break;
+          if ($object->isNeedsRevision() ||
+              $object->isChangePlanned() ||
+              $object->isAbandoned()) {
+            $object->setModernRevisionStatus(
+              DifferentialRevisionStatus::NEEDS_REVIEW);
           }
         }
 
@@ -196,8 +189,6 @@ final class DifferentialTransactionEditor
     $actor_phid = $this->getActingAsPHID();
     $type_edge = PhabricatorTransactions::TYPE_EDGE;
 
-    $status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
-
     $edge_ref_task = DifferentialRevisionHasTaskEdgeType::EDGECONST;
 
     $is_sticky_accept = PhabricatorEnv::getEnvConfig(
@@ -220,7 +211,7 @@ final class DifferentialTransactionEditor
         case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
           $downgrade_rejects = true;
           if ((!$is_sticky_accept) ||
-              ($object->getStatus() != $status_plan)) {
+              (!$object->isChangePlanned())) {
             // If the old state isn't "changes planned", downgrade the accepts.
             // This exception allows an accepted revision to go through
             // "Plan Changes" -> "Request Review" and return to "accepted" if
@@ -462,102 +453,114 @@ final class DifferentialTransactionEditor
       }
     }
 
-    $status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
-    $status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
-    $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
-
-    $is_sticky_accept = PhabricatorEnv::getEnvConfig(
-      'differential.sticky-accept');
-
-    $old_status = $object->getStatus();
-    $active_diff = $object->getActiveDiff();
-    switch ($old_status) {
-      case $status_accepted:
-      case $status_revision:
-      case $status_review:
-        // Try to move a revision to "accepted". We look for:
-        //
-        //   - at least one accepting reviewer who is a user; and
-        //   - no rejects; and
-        //   - no rejects of older diffs; and
-        //   - no blocking reviewers.
-
-        $has_accepting_user = false;
-        $has_rejecting_reviewer = false;
-        $has_rejecting_older_reviewer = false;
-        $has_blocking_reviewer = false;
-        foreach ($object->getReviewers() as $reviewer) {
-          $reviewer_status = $reviewer->getReviewerStatus();
-          switch ($reviewer_status) {
-            case DifferentialReviewerStatus::STATUS_REJECTED:
-              $active_phid = $active_diff->getPHID();
-              if ($reviewer->isRejected($active_phid)) {
-                $has_rejecting_reviewer = true;
-              } else {
-                $has_rejecting_older_reviewer = true;
-              }
-              break;
-            case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:
-              $has_rejecting_older_reviewer = true;
-              break;
-            case DifferentialReviewerStatus::STATUS_BLOCKING:
-              $has_blocking_reviewer = true;
-              break;
-            case DifferentialReviewerStatus::STATUS_ACCEPTED:
-              if ($reviewer->isUser()) {
-                $active_phid = $active_diff->getPHID();
-                if ($reviewer->isAccepted($active_phid)) {
-                  $has_accepting_user = true;
-                }
-              }
-              break;
-          }
-        }
-
-        $new_status = null;
-        if ($has_accepting_user &&
-            !$has_rejecting_reviewer &&
-            !$has_rejecting_older_reviewer &&
-            !$has_blocking_reviewer) {
-          $new_status = $status_accepted;
-        } else if ($has_rejecting_reviewer) {
-          // This isn't accepted, and there's at least one rejecting reviewer,
-          // so the revision needs changes. This usually happens after a
-          // "reject".
-          $new_status = $status_revision;
-        } else if ($old_status == $status_accepted) {
-          // This revision was accepted, but it no longer satisfies the
-          // conditions for acceptance. This usually happens after an accepting
-          // reviewer resigns or is removed.
-          $new_status = $status_review;
-        }
-
-        if ($new_status !== null && ($new_status != $old_status)) {
-          $xaction = id(new DifferentialTransaction())
-            ->setTransactionType(
-                DifferentialRevisionStatusTransaction::TRANSACTIONTYPE)
-            ->setOldValue($old_status)
-            ->setNewValue($new_status);
-
-          $xaction = $this->populateTransaction($object, $xaction)->save();
-
-          $xactions[] = $xaction;
-
-          $object->setStatus($new_status)->save();
-        }
-        break;
-      default:
-        // Revisions can't transition out of other statuses (like closed or
-        // abandoned) as a side effect of reviewer status changes.
-        break;
-    }
-
-
+    $xactions = $this->updateReviewStatus($object, $xactions);
     $this->markReviewerComments($object, $xactions);
 
     return $xactions;
   }
 
+  private function updateReviewStatus(
+    DifferentialRevision $revision,
+    array $xactions) {
+
+    $was_accepted = $revision->isAccepted();
+    $was_revision = $revision->isNeedsRevision();
+    $was_review = $revision->isNeedsReview();
+    if (!$was_accepted && !$was_revision && !$was_review) {
+      // Revisions can't transition out of other statuses (like closed or
+      // abandoned) as a side effect of reviewer status changes.
+      return $xactions;
+    }
+
+    // Try to move a revision to "accepted". We look for:
+    //
+    //   - at least one accepting reviewer who is a user; and
+    //   - no rejects; and
+    //   - no rejects of older diffs; and
+    //   - no blocking reviewers.
+
+    $has_accepting_user = false;
+    $has_rejecting_reviewer = false;
+    $has_rejecting_older_reviewer = false;
+    $has_blocking_reviewer = false;
+
+    $active_diff = $revision->getActiveDiff();
+    foreach ($revision->getReviewers() as $reviewer) {
+      $reviewer_status = $reviewer->getReviewerStatus();
+      switch ($reviewer_status) {
+        case DifferentialReviewerStatus::STATUS_REJECTED:
+          $active_phid = $active_diff->getPHID();
+          if ($reviewer->isRejected($active_phid)) {
+            $has_rejecting_reviewer = true;
+          } else {
+            $has_rejecting_older_reviewer = true;
+          }
+          break;
+        case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:
+          $has_rejecting_older_reviewer = true;
+          break;
+        case DifferentialReviewerStatus::STATUS_BLOCKING:
+          $has_blocking_reviewer = true;
+          break;
+        case DifferentialReviewerStatus::STATUS_ACCEPTED:
+          if ($reviewer->isUser()) {
+            $active_phid = $active_diff->getPHID();
+            if ($reviewer->isAccepted($active_phid)) {
+              $has_accepting_user = true;
+            }
+          }
+          break;
+      }
+    }
+
+    $new_status = null;
+    if ($has_accepting_user &&
+        !$has_rejecting_reviewer &&
+        !$has_rejecting_older_reviewer &&
+        !$has_blocking_reviewer) {
+      $new_status = DifferentialRevisionStatus::ACCEPTED;
+    } else if ($has_rejecting_reviewer) {
+      // This isn't accepted, and there's at least one rejecting reviewer,
+      // so the revision needs changes. This usually happens after a
+      // "reject".
+      $new_status = DifferentialRevisionStatus::NEEDS_REVISION;
+    } else if ($was_accepted) {
+      // This revision was accepted, but it no longer satisfies the
+      // conditions for acceptance. This usually happens after an accepting
+      // reviewer resigns or is removed.
+      $new_status = DifferentialRevisionStatus::NEEDS_REVIEW;
+    }
+
+    if ($new_status === null) {
+      return $xactions;
+    }
+
+    $old_legacy_status = $revision->getStatus();
+    $revision->setModernRevisionStatus($new_status);
+    $new_legacy_status = $revision->getStatus();
+    if ($new_legacy_status == $old_legacy_status) {
+      return $xactions;
+    }
+
+    $xaction = id(new DifferentialTransaction())
+      ->setTransactionType(
+          DifferentialRevisionStatusTransaction::TRANSACTIONTYPE)
+      ->setOldValue($old_legacy_status)
+      ->setNewValue($new_legacy_status);
+
+    $xaction = $this->populateTransaction($revision, $xaction)
+      ->save();
+    $xactions[] = $xaction;
+
+    // Save the status adjustment we made earlier.
+    // TODO: This can be a little cleaner and more obvious once storage
+    // migrates.
+    $revision->save();
+
+    return $xactions;
+  }
+
+
   protected function validateTransaction(
     PhabricatorLiskDAO $object,
     $type,
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 8c96786a89..d7a8145644 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -612,6 +612,21 @@ final class DifferentialRevision extends DifferentialDAO
     return $this;
   }
 
+  public function setModernRevisionStatus($status) {
+    $status_object = DifferentialRevisionStatus::newForStatus($status);
+
+    if ($status_object->getKey() != $status) {
+      throw new Exception(
+        pht(
+          'Trying to set revision to invalid status "%s".',
+          $status));
+    }
+
+    $legacy_status = $status_object->getLegacyKey();
+
+    return $this->setStatus($legacy_status);
+  }
+
   public function isClosed() {
     return $this->getStatusObject()->isClosedStatus();
   }
@@ -628,6 +643,10 @@ final class DifferentialRevision extends DifferentialDAO
     return $this->getStatusObject()->isNeedsReview();
   }
 
+  public function isNeedsRevision() {
+    return $this->getStatusObject()->isNeedsRevision();
+  }
+
   public function isChangePlanned() {
     return $this->getStatusObject()->isChangePlanned();
   }

From 895f0cde1f0a38a0c834a476a072bee51102f19c Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 15:44:51 -0700
Subject: [PATCH 16/46] Use modern revision statuses when bucketing revisions
 on the Differential dashboard

Summary: Ref T2543. Swaps these over to modern constants.

Test Plan: Viewed dashboard, no chagnes to bucketing.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18414
---
 ...rentialRevisionRequiredActionResultBucket.php | 16 +++++++---------
 .../storage/DifferentialRevision.php             |  4 ++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
index 3e6daa6317..195a430b1c 100644
--- a/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
+++ b/src/applications/differential/query/DifferentialRevisionRequiredActionResultBucket.php
@@ -151,9 +151,8 @@ final class DifferentialRevisionRequiredActionResultBucket
 
   private function filterShouldUpdate(array $phids) {
     $statuses = array(
-      ArcanistDifferentialRevisionStatus::NEEDS_REVISION,
-      ArcanistDifferentialRevisionStatus::CHANGES_PLANNED,
-      ArcanistDifferentialRevisionStatus::IN_PREPARATION,
+      DifferentialRevisionStatus::NEEDS_REVISION,
+      DifferentialRevisionStatus::CHANGES_PLANNED,
     );
     $statuses = array_fuse($statuses);
 
@@ -161,7 +160,7 @@ final class DifferentialRevisionRequiredActionResultBucket
 
     $results = array();
     foreach ($objects as $key => $object) {
-      if (empty($statuses[$object->getStatus()])) {
+      if (empty($statuses[$object->getModernRevisionStatus()])) {
         continue;
       }
 
@@ -190,10 +189,9 @@ final class DifferentialRevisionRequiredActionResultBucket
 
   private function filterWaitingOnAuthors(array $phids) {
     $statuses = array(
-      ArcanistDifferentialRevisionStatus::ACCEPTED,
-      ArcanistDifferentialRevisionStatus::NEEDS_REVISION,
-      ArcanistDifferentialRevisionStatus::CHANGES_PLANNED,
-      ArcanistDifferentialRevisionStatus::IN_PREPARATION,
+      DifferentialRevisionStatus::ACCEPTED,
+      DifferentialRevisionStatus::NEEDS_REVISION,
+      DifferentialRevisionStatus::CHANGES_PLANNED,
     );
     $statuses = array_fuse($statuses);
 
@@ -201,7 +199,7 @@ final class DifferentialRevisionRequiredActionResultBucket
 
     $results = array();
     foreach ($objects as $key => $object) {
-      if (empty($statuses[$object->getStatus()])) {
+      if (empty($statuses[$object->getModernRevisionStatus()])) {
         continue;
       }
 
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index d7a8145644..1e69e5661a 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -627,6 +627,10 @@ final class DifferentialRevision extends DifferentialDAO
     return $this->setStatus($legacy_status);
   }
 
+  public function getModernRevisionStatus() {
+    return $this->getStatusObject()->getKey();
+  }
+
   public function isClosed() {
     return $this->getStatusObject()->isClosedStatus();
   }

From cd15c2d545ad3de172395ab3bd278f71143ee019 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 15:49:05 -0700
Subject: [PATCH 17/46] Swap transactions and initialization over to modern
 status constants

Summary: Ref T2543. Update these for the modern stuff.

Test Plan: Created a new revision, got a revision in the right state ("Needs Review"). Accepted, planned, requested, abandoned revision; state transitions looked good.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18415
---
 .../differential/storage/DifferentialRevision.php             | 2 +-
 .../xaction/DifferentialRevisionAbandonTransaction.php        | 3 ++-
 .../xaction/DifferentialRevisionCloseTransaction.php          | 4 ++--
 .../xaction/DifferentialRevisionPlanChangesTransaction.php    | 4 ++--
 .../xaction/DifferentialRevisionReclaimTransaction.php        | 3 ++-
 .../xaction/DifferentialRevisionReopenTransaction.php         | 3 ++-
 .../xaction/DifferentialRevisionRequestReviewTransaction.php  | 4 ++--
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 1e69e5661a..c856436fd8 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -72,7 +72,7 @@ final class DifferentialRevision extends DifferentialDAO
       ->attachRepository(null)
       ->attachActiveDiff(null)
       ->attachReviewers(array())
-      ->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVIEW);
+      ->setModernRevisionStatus(DifferentialRevisionStatus::NEEDS_REVIEW);
   }
 
   protected function getConfiguration() {
diff --git a/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php b/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
index 2f221bd8c6..b7b0e7f123 100644
--- a/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionAbandonTransaction.php
@@ -47,7 +47,8 @@ final class DifferentialRevisionAbandonTransaction
   }
 
   public function applyInternalEffects($object, $value) {
-    $object->setStatus(ArcanistDifferentialRevisionStatus::ABANDONED);
+    $status_abandoned = DifferentialRevisionStatus::ABANDONED;
+    $object->setModernRevisionStatus($status_abandoned);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
index 203b84a191..8d01f48eff 100644
--- a/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionCloseTransaction.php
@@ -37,8 +37,8 @@ final class DifferentialRevisionCloseTransaction
   public function applyInternalEffects($object, $value) {
     $was_accepted = $object->isAccepted();
 
-    $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
-    $object->setStatus($status_closed);
+    $status_published = DifferentialRevisionStatus::PUBLISHED;
+    $object->setModernRevisionStatus($status_published);
 
     $object->setProperty(
       DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED,
diff --git a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
index 043071dc96..6e584ceb36 100644
--- a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
@@ -50,8 +50,8 @@ final class DifferentialRevisionPlanChangesTransaction
   }
 
   public function applyInternalEffects($object, $value) {
-    $status_planned = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
-    $object->setStatus($status_planned);
+    $status_planned = DifferentialRevisionStatus::CHANGES_PLANNED;
+    $object->setModernRevisionStatus($status_planned);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
index 1f2f6a8d6c..4767924445 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReclaimTransaction.php
@@ -47,7 +47,8 @@ final class DifferentialRevisionReclaimTransaction
   }
 
   public function applyInternalEffects($object, $value) {
-    $object->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVIEW);
+    $status_review = DifferentialRevisionStatus::NEEDS_REVIEW;
+    $object->setModernRevisionStatus($status_review);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
index 7ba20772c7..1d28433429 100644
--- a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
@@ -35,7 +35,8 @@ final class DifferentialRevisionReopenTransaction
   }
 
   public function applyInternalEffects($object, $value) {
-    $object->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVIEW);
+    $status_review = DifferentialRevisionStatus::NEEDS_REVIEW;
+    $object->setModernRevisionStatus($status_review);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
index 2dae24b6fa..d102b0c0c2 100644
--- a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
@@ -31,8 +31,8 @@ final class DifferentialRevisionRequestReviewTransaction
   }
 
   public function applyInternalEffects($object, $value) {
-    $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
-    $object->setStatus($status_review);
+    $status_review = DifferentialRevisionStatus::NEEDS_REVIEW;
+    $object->setModernRevisionStatus($status_review);
   }
 
   protected function validateAction($object, PhabricatorUser $viewer) {

From 0b1d6a3f6ec6bb571ff69f7203d15f9f9d2aaa03 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 15:55:48 -0700
Subject: [PATCH 18/46] Convert straggling Herald rules to modern revision
 status constants

Summary:
Ref T2543. These are the last `ArcanistDifferentialRevisionStatus` callsites.

This removes the very old legacy `precommitRevisionStatus` field, which has no other readers. This was obsoleted by the `CLOSED_FROM_ACCEPTED` stuff, but retained for compatibility.

Test Plan:
  - Poked these with the test console, although they're a little tricky to be sure about.
  - Grepped for `ArcanistDifferentialRevisionStatus`, no more hits.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18416
---
 ...usionCommitRevisionAcceptedHeraldField.php | 33 ++++---------------
 ...mmitContentRevisionAcceptedHeraldField.php | 18 +++++-----
 ...torRepositoryCommitMessageParserWorker.php |  5 ---
 3 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php
index 810b58f2a1..a125b580eb 100644
--- a/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php
@@ -19,36 +19,15 @@ final class DiffusionCommitRevisionAcceptedHeraldField
       return null;
     }
 
-    $status = $revision->getStatus();
-
-    switch ($status) {
-      case ArcanistDifferentialRevisionStatus::ACCEPTED:
-        return $revision->getPHID();
-      case ArcanistDifferentialRevisionStatus::CLOSED:
-        if ($revision->hasRevisionProperty(
-            DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED)) {
-
-          if ($revision->getProperty(
-              DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED)) {
-            return $revision->getPHID();
-          } else {
-            return null;
-          }
-        } else {
-          // continue on to old-style precommitRevisionStatus
-          break;
-        }
-      default:
-        return null;
+    if ($revision->isAccepted()) {
+      return $revision->getPHID();
     }
 
-    $data = $object->getCommitData();
-    $status = $data->getCommitDetail('precommitRevisionStatus');
-
-    switch ($status) {
-      case ArcanistDifferentialRevisionStatus::ACCEPTED:
-      case ArcanistDifferentialRevisionStatus::CLOSED:
+    $was_accepted = DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED;
+    if ($revision->isPublished()) {
+      if ($revision->getProperty($was_accepted)) {
         return $revision->getPHID();
+      }
     }
 
     return null;
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php
index e19878e627..63dac6baa6 100644
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php
@@ -15,21 +15,19 @@ final class DiffusionPreCommitContentRevisionAcceptedHeraldField
 
   public function getHeraldFieldValue($object) {
     $revision = $this->getAdapter()->getRevision();
-
     if (!$revision) {
       return null;
     }
 
-    switch ($revision->getStatus()) {
-      case ArcanistDifferentialRevisionStatus::ACCEPTED:
-        return $revision->getPHID();
-      case ArcanistDifferentialRevisionStatus::CLOSED:
-        if ($revision->getProperty(
-          DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED)) {
+    if ($revision->isAccepted()) {
+      return $revision->getPHID();
+    }
 
-          return $revision->getPHID();
-        }
-        break;
+    $was_accepted = DifferentialRevision::PROPERTY_CLOSED_FROM_ACCEPTED;
+    if ($revision->isPublished()) {
+      if ($revision->getProperty($was_accepted)) {
+        return $revision->getPHID();
+      }
     }
 
     return null;
diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
index 0d0ff28d95..fe8abd5925 100644
--- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
+++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
@@ -186,11 +186,6 @@ abstract class PhabricatorRepositoryCommitMessageParserWorker
       $revision = $revision_query->executeOne();
 
       if ($revision) {
-        if (!$data->getCommitDetail('precommitRevisionStatus')) {
-          $data->setCommitDetail(
-            'precommitRevisionStatus',
-            $revision->getStatus());
-        }
         $commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST;
         id(new PhabricatorEdgeEditor())
           ->addEdge($commit->getPHID(), $commit_drev, $revision->getPHID())

From 5348f34c9eec27704da5b30a9356a20fc60e7f0b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 16:21:28 -0700
Subject: [PATCH 19/46] Make all revision status readers explicitly read modern
 or legacy status

Summary: Ref T2543. All writers now write modern statuses. Make all readers explicit about whether they are reading modern or legacy statuses, so I can swap the storage format.

Test Plan:
  - Grepped for `getStatus()`, scanned the list. Other applications have methods with this name so it's possible I missed something.
  - Browed around, changed revision statuses.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18417
---
 .../conduit/DifferentialGetRevisionConduitAPIMethod.php    | 2 +-
 .../conduit/DifferentialQueryConduitAPIMethod.php          | 2 +-
 .../differential/editor/DifferentialTransactionEditor.php  | 4 ++--
 .../differential/phid/DifferentialRevisionPHIDType.php     | 7 ++-----
 .../differential/storage/DifferentialRevision.php          | 4 ++++
 .../xaction/DifferentialRevisionStatusTransaction.php      | 4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
index 9109849292..a8dd8c4d56 100644
--- a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
@@ -82,7 +82,7 @@ final class DifferentialGetRevisionConduitAPIMethod
       'authorPHID' => $revision->getAuthorPHID(),
       'uri' => PhabricatorEnv::getURI('/D'.$revision->getID()),
       'title' => $revision->getTitle(),
-      'status' => $revision->getStatus(),
+      'status' => $revision->getLegacyRevisionStatus(),
       'statusName'  => $revision->getStatusDisplayName(),
       'summary' => $revision->getSummary(),
       'testPlan' => $revision->getTestPlan(),
diff --git a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
index 0064e70665..0b26db0655 100644
--- a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
@@ -218,7 +218,7 @@ final class DifferentialQueryConduitAPIMethod
         'dateCreated'         => $revision->getDateCreated(),
         'dateModified'        => $revision->getDateModified(),
         'authorPHID'          => $revision->getAuthorPHID(),
-        'status'              => $revision->getStatus(),
+        'status'              => $revision->getLegacyRevisionStatus(),
         'statusName'          => $revision->getStatusDisplayName(),
         'properties' => $revision->getProperties(),
         'branch'              => $diff->getBranch(),
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index e7123c92a1..570bc51957 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -535,9 +535,9 @@ final class DifferentialTransactionEditor
       return $xactions;
     }
 
-    $old_legacy_status = $revision->getStatus();
+    $old_legacy_status = $revision->getLegacyRevisionStatus();
     $revision->setModernRevisionStatus($new_status);
-    $new_legacy_status = $revision->getStatus();
+    $new_legacy_status = $revision->getLegacyRevisionStatus();
     if ($new_legacy_status == $old_legacy_status) {
       return $xactions;
     }
diff --git a/src/applications/differential/phid/DifferentialRevisionPHIDType.php b/src/applications/differential/phid/DifferentialRevisionPHIDType.php
index d652a8c056..a117690d66 100644
--- a/src/applications/differential/phid/DifferentialRevisionPHIDType.php
+++ b/src/applications/differential/phid/DifferentialRevisionPHIDType.php
@@ -33,7 +33,6 @@ final class DifferentialRevisionPHIDType extends PhabricatorPHIDType {
       $revision = $objects[$phid];
 
       $title = $revision->getTitle();
-      $status = $revision->getStatus();
       $monogram = $revision->getMonogram();
       $uri = $revision->getURI();
 
@@ -46,10 +45,8 @@ final class DifferentialRevisionPHIDType extends PhabricatorPHIDType {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
 
-      $status = $revision->getStatus();
-
-      $icon = $revision->getStatusIcon($status);
-      $color = $revision->getStatusIconColor($status);
+      $icon = $revision->getStatusIcon();
+      $color = $revision->getStatusIconColor();
       $name = $revision->getStatusDisplayName();
 
       $handle
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index c856436fd8..69334bc01d 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -631,6 +631,10 @@ final class DifferentialRevision extends DifferentialDAO
     return $this->getStatusObject()->getKey();
   }
 
+  public function getLegacyRevisionStatus() {
+    return $this->getStatus();
+  }
+
   public function isClosed() {
     return $this->getStatusObject()->isClosedStatus();
   }
diff --git a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
index 05c0a69aa1..0c38bd6d84 100644
--- a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
@@ -6,11 +6,11 @@ final class DifferentialRevisionStatusTransaction
   const TRANSACTIONTYPE = 'differential.revision.status';
 
   public function generateOldValue($object) {
-    return $object->getStatus();
+    return $object->getLegacyRevisionStatus();
   }
 
   public function applyInternalEffects($object, $value) {
-    $object->setStatus($value);
+    $object->setLegacyRevisionStatus($value);
   }
 
   public function getTitle() {

From 7b695aa43bd19400036cefa3a94bd5522f96e1d2 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 16:27:38 -0700
Subject: [PATCH 20/46] Migrate revision storage to modern status constants
 ("accepted") instead of legacy numeric values ("2")

Summary:
Ref T2543. Rewrites all the storage to use constants.

Note that transactions still use legacy values, I'll migrate and update them separately.

Test Plan:
  - Ran migration.
  - Browsed around, changed revision states, viewed dashboard, etc.
  - Selected `DISTINCT()` and `GROUP_CONCAT()` of the `status` field in the database, saw sane/expected before and after values.
  - Verified that old Conduit methods still return numeric constants for compatibility.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18418
---
 .../20170811.differential.02.modernstatus.sql | 17 +++++++++++++++++
 .../constants/DifferentialLegacyQuery.php     | 15 ---------------
 .../query/DifferentialRevisionQuery.php       |  4 ++--
 .../storage/DifferentialRevision.php          | 19 ++++---------------
 .../DifferentialRevisionStatusTransaction.php |  3 +--
 5 files changed, 24 insertions(+), 34 deletions(-)
 create mode 100644 resources/sql/autopatches/20170811.differential.02.modernstatus.sql

diff --git a/resources/sql/autopatches/20170811.differential.02.modernstatus.sql b/resources/sql/autopatches/20170811.differential.02.modernstatus.sql
new file mode 100644
index 0000000000..a305206411
--- /dev/null
+++ b/resources/sql/autopatches/20170811.differential.02.modernstatus.sql
@@ -0,0 +1,17 @@
+UPDATE {$NAMESPACE}_differential.differential_revision
+  SET status = "needs-review" WHERE status = "0";
+
+UPDATE {$NAMESPACE}_differential.differential_revision
+  SET status = "needs-revision" WHERE status = "1";
+
+UPDATE {$NAMESPACE}_differential.differential_revision
+  SET status = "accepted" WHERE status = "2";
+
+UPDATE {$NAMESPACE}_differential.differential_revision
+  SET status = "published" WHERE status = "3";
+
+UPDATE {$NAMESPACE}_differential.differential_revision
+  SET status = "abandoned" WHERE status = "4";
+
+UPDATE {$NAMESPACE}_differential.differential_revision
+  SET status = "changes-planned" WHERE status = "5";
diff --git a/src/applications/differential/constants/DifferentialLegacyQuery.php b/src/applications/differential/constants/DifferentialLegacyQuery.php
index ca254918e0..26d2c4aee2 100644
--- a/src/applications/differential/constants/DifferentialLegacyQuery.php
+++ b/src/applications/differential/constants/DifferentialLegacyQuery.php
@@ -31,21 +31,6 @@ final class DifferentialLegacyQuery
     return $map[$status];
   }
 
-  public static function getLegacyValues(array $modern_values) {
-    $values = array();
-    foreach ($modern_values as $status_constant) {
-      $status_object = DifferentialRevisionStatus::newForStatus(
-        $status_constant);
-
-      $legacy_key = $status_object->getLegacyKey();
-      if ($legacy_key !== null) {
-        $values[] = $legacy_key;
-      }
-    }
-
-    return $values;
-  }
-
   private static function getMap() {
     $all = array(
       DifferentialRevisionStatus::NEEDS_REVIEW,
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
index 39bba8112d..8e6e23776a 100644
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -695,7 +695,7 @@ final class DifferentialRevisionQuery
       $where[] = qsprintf(
         $conn_r,
         'r.status in (%Ls)',
-        DifferentialLegacyQuery::getLegacyValues($this->statuses));
+        $this->statuses);
     }
 
     if ($this->isOpen !== null) {
@@ -709,7 +709,7 @@ final class DifferentialRevisionQuery
       $where[] = qsprintf(
         $conn_r,
         'r.status in (%Ls)',
-        DifferentialLegacyQuery::getLegacyValues($statuses));
+        $statuses);
     }
 
     $where[] = $this->buildWhereClauseParts($conn_r);
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
index 69334bc01d..eaf856fd80 100644
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -613,26 +613,15 @@ final class DifferentialRevision extends DifferentialDAO
   }
 
   public function setModernRevisionStatus($status) {
-    $status_object = DifferentialRevisionStatus::newForStatus($status);
-
-    if ($status_object->getKey() != $status) {
-      throw new Exception(
-        pht(
-          'Trying to set revision to invalid status "%s".',
-          $status));
-    }
-
-    $legacy_status = $status_object->getLegacyKey();
-
-    return $this->setStatus($legacy_status);
+    return $this->setStatus($status);
   }
 
   public function getModernRevisionStatus() {
-    return $this->getStatusObject()->getKey();
+    return $this->getStatus();
   }
 
   public function getLegacyRevisionStatus() {
-    return $this->getStatus();
+    return $this->getStatusObject()->getLegacyKey();
   }
 
   public function isClosed() {
@@ -677,7 +666,7 @@ final class DifferentialRevision extends DifferentialDAO
 
   public function getStatusObject() {
     $status = $this->getStatus();
-    return DifferentialRevisionStatus::newForLegacyStatus($status);
+    return DifferentialRevisionStatus::newForStatus($status);
   }
 
   public function getFlag(PhabricatorUser $viewer) {
diff --git a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
index 0c38bd6d84..75e85bc037 100644
--- a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
@@ -14,8 +14,7 @@ final class DifferentialRevisionStatusTransaction
   }
 
   public function getTitle() {
-    $new = $this->getNewValue();
-    $status = DifferentialRevisionStatus::newForLegacyStatus($new);
+    $status = $this->newStatusObject();
 
     if ($status->isAccepted()) {
       return pht('This revision is now accepted and ready to land.');

From 48a74de0b64901538feb878e2f12e18e605ca76a Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 11 Aug 2017 16:57:44 -0700
Subject: [PATCH 21/46] Move all revision status transactions to modern values
 and mechanics

Summary:
Ref T2543. This updates and migrates the status change transactions:

  - All storage now records the modern modular transaction ("differential.revision.status"), not the obsolete non-modular transaction ("differential:status").
  - All storage now records the modern constants ("accepted"), not the obsolete numeric values ("2").

Test Plan:
  - Selected all the relevant rows before/after migration, data looked sane.
  - Browsed around, reviewed timelines, no changes after migration.
  - Changed revision states, saw appropriate new transactions in the database and timeline rendering.
  - Grepped for `differential:status`.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T2543

Differential Revision: https://secure.phabricator.com/D18419
---
 ...20170811.differential.03.modernxaction.php | 38 +++++++++++++++++++
 .../constants/DifferentialRevisionStatus.php  | 21 ----------
 .../editor/DifferentialTransactionEditor.php  | 16 ++++----
 .../storage/DifferentialTransaction.php       | 13 +------
 .../DifferentialRevisionStatusTransaction.php |  6 +--
 5 files changed, 50 insertions(+), 44 deletions(-)
 create mode 100644 resources/sql/autopatches/20170811.differential.03.modernxaction.php

diff --git a/resources/sql/autopatches/20170811.differential.03.modernxaction.php b/resources/sql/autopatches/20170811.differential.03.modernxaction.php
new file mode 100644
index 0000000000..e84e3ce95b
--- /dev/null
+++ b/resources/sql/autopatches/20170811.differential.03.modernxaction.php
@@ -0,0 +1,38 @@
+<?php
+
+$map = array(
+  '0' => 'needs-review',
+  '1' => 'needs-revision',
+  '2' => 'accepted',
+  '3' => 'published',
+  '4' => 'abandoned',
+  '5' => 'changes-planned',
+);
+
+$table = new DifferentialTransaction();
+$conn = $table->establishConnection('w');
+
+foreach (new LiskMigrationIterator($table) as $xaction) {
+  $type = $xaction->getTransactionType();
+
+  if (($type != 'differential:status') &&
+      ($type != 'differential.revision.status')) {
+    continue;
+  }
+
+  $old = $xaction->getOldValue();
+  $new = $xaction->getNewValue();
+
+  $old = idx($map, $old, $old);
+  $new = idx($map, $new, $new);
+
+  queryfx(
+    $conn,
+    'UPDATE %T SET transactionType = %s, oldValue = %s, newValue = %s
+      WHERE id = %d',
+    $table->getTableName(),
+    'differential.revision.status',
+    json_encode($old),
+    json_encode($new),
+    $xaction->getID());
+}
diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
index 96554780bd..b4b291f9c4 100644
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -88,27 +88,6 @@ final class DifferentialRevisionStatus extends Phobject {
     return $result;
   }
 
-  public static function newForLegacyStatus($legacy_status) {
-    $result = new self();
-
-    $map = self::getMap();
-    foreach ($map as $key => $spec) {
-      if (!isset($spec['legacy'])) {
-        continue;
-      }
-
-      if ($spec['legacy'] != $legacy_status) {
-        continue;
-      }
-
-      $result->key = $key;
-      $result->spec = $spec;
-      break;
-    }
-
-    return $result;
-  }
-
   public static function getAll() {
     $result = array();
 
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
index 570bc51957..af246feeb0 100644
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -535,27 +535,25 @@ final class DifferentialTransactionEditor
       return $xactions;
     }
 
-    $old_legacy_status = $revision->getLegacyRevisionStatus();
-    $revision->setModernRevisionStatus($new_status);
-    $new_legacy_status = $revision->getLegacyRevisionStatus();
-    if ($new_legacy_status == $old_legacy_status) {
+    $old_status = $revision->getModernRevisionStatus();
+    if ($new_status == $old_status) {
       return $xactions;
     }
 
     $xaction = id(new DifferentialTransaction())
       ->setTransactionType(
           DifferentialRevisionStatusTransaction::TRANSACTIONTYPE)
-      ->setOldValue($old_legacy_status)
-      ->setNewValue($new_legacy_status);
+      ->setOldValue($old_status)
+      ->setNewValue($new_status);
 
     $xaction = $this->populateTransaction($revision, $xaction)
       ->save();
     $xactions[] = $xaction;
 
     // Save the status adjustment we made earlier.
-    // TODO: This can be a little cleaner and more obvious once storage
-    // migrates.
-    $revision->save();
+    $revision
+      ->setModernRevisionStatus($new_status)
+      ->save();
 
     return $xactions;
   }
diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index b4670fffb2..1cd1f2b062 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -41,10 +41,6 @@ final class DifferentialTransaction
       }
     }
 
-    if ($xaction_type == 'differential:status') {
-      return new DifferentialRevisionStatusTransaction();
-    }
-
     return parent::newFallbackModularTransactionType();
   }
 
@@ -513,13 +509,8 @@ final class DifferentialTransaction
   }
 
   private function isStatusTransaction($xaction) {
-    $old_status = 'differential:status';
-    if ($xaction->getTransactionType() == $old_status) {
-      return true;
-    }
-
-    $new_status = DifferentialRevisionStatusTransaction::TRANSACTIONTYPE;
-    if ($xaction->getTransactionType() == $new_status) {
+    $status_type = DifferentialRevisionStatusTransaction::TRANSACTIONTYPE;
+    if ($xaction->getTransactionType() == $status_type) {
       return true;
     }
 
diff --git a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
index 75e85bc037..c08eb9d187 100644
--- a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php
@@ -6,11 +6,11 @@ final class DifferentialRevisionStatusTransaction
   const TRANSACTIONTYPE = 'differential.revision.status';
 
   public function generateOldValue($object) {
-    return $object->getLegacyRevisionStatus();
+    return $object->getModernRevisionStatus();
   }
 
   public function applyInternalEffects($object, $value) {
-    $object->setLegacyRevisionStatus($value);
+    $object->setModernRevisionStatus($value);
   }
 
   public function getTitle() {
@@ -67,7 +67,7 @@ final class DifferentialRevisionStatusTransaction
 
   private function newStatusObject() {
     $new = $this->getNewValue();
-    return DifferentialRevisionStatus::newForLegacyStatus($new);
+    return DifferentialRevisionStatus::newForStatus($new);
   }
 
 }

From 8c3243ef687036fd55e0785bcf3ec9d01aee2100 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 14 Aug 2017 08:58:32 -0700
Subject: [PATCH 22/46] Lightly modernize NamedQueryQuery

Summary: Ref T12956. No real behavioral changes here, just slightly more modern code.

Test Plan: Reviewed named queries in Maniphest and "Edit Queries...".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12956

Differential Revision: https://secure.phabricator.com/D18420
---
 .../query/PhabricatorNamedQueryQuery.php      | 43 ++++++++-----------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/applications/search/query/PhabricatorNamedQueryQuery.php b/src/applications/search/query/PhabricatorNamedQueryQuery.php
index ce54ae9a84..3decff5494 100644
--- a/src/applications/search/query/PhabricatorNamedQueryQuery.php
+++ b/src/applications/search/query/PhabricatorNamedQueryQuery.php
@@ -28,55 +28,46 @@ final class PhabricatorNamedQueryQuery
     return $this;
   }
 
-  protected function loadPage() {
-    $table = new PhabricatorNamedQuery();
-    $conn_r = $table->establishConnection('r');
-
-    $data = queryfx_all(
-      $conn_r,
-      'SELECT * FROM %T %Q %Q %Q',
-      $table->getTableName(),
-      $this->buildWhereClause($conn_r),
-      $this->buildOrderClause($conn_r),
-      $this->buildLimitClause($conn_r));
-
-    return $table->loadAllFromArray($data);
+  public function newResultObject() {
+    return new PhabricatorNamedQuery();
   }
 
-  protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
-    $where = array();
+  protected function loadPage() {
+    return $this->loadStandardPage($this->newResultObject());
+  }
 
-    if ($this->ids) {
+  protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+    $where = parent::buildWhereClauseParts($conn);
+
+    if ($this->ids !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'id IN (%Ld)',
         $this->ids);
     }
 
-    if ($this->engineClassNames) {
+    if ($this->engineClassNames !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'engineClassName IN (%Ls)',
         $this->engineClassNames);
     }
 
-    if ($this->userPHIDs) {
+    if ($this->userPHIDs !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'userPHID IN (%Ls)',
         $this->userPHIDs);
     }
 
-    if ($this->queryKeys) {
+    if ($this->queryKeys !== null) {
       $where[] = qsprintf(
-        $conn_r,
+        $conn,
         'queryKey IN (%Ls)',
         $this->queryKeys);
     }
 
-    $where[] = $this->buildPagingClause($conn_r);
-
-    return $this->formatWhereClause($where);
+    return $where;
   }
 
   public function getQueryApplicationClass() {

From 07c0032491e660d9f5542b67628a03ddb3207efa Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 14 Aug 2017 11:05:10 -0700
Subject: [PATCH 23/46] Add a link directly to Browse in Diffusion

Summary: Getting to the straight browse view went away, this adds a link back. I'll look at more long term solution for getting to grep search.

Test Plan: Click on header, get take to browse view.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18421
---
 resources/celerity/map.php                             |  4 ++--
 .../controller/DiffusionRepositoryController.php       | 10 +++++++++-
 webroot/rsrc/css/application/diffusion/diffusion.css   |  6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index feab818559..fdb002f335 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -75,7 +75,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
-    'rsrc/css/application/diffusion/diffusion.css' => '67bd971b',
+    'rsrc/css/application/diffusion/diffusion.css' => '59f4ac67',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -570,7 +570,7 @@ return array(
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-css' => '67bd971b',
+    'diffusion-css' => '59f4ac67',
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index 39877317df..dcbd95fef7 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -546,8 +546,16 @@ final class DiffusionRepositoryController extends DiffusionController {
     $browse_uri = $drequest->generateURI(array('action' => 'browse'));
     $pager->setURI($browse_uri, 'offset');
 
+    $header = phutil_tag(
+      'a',
+      array(
+        'href' => $browse_uri,
+        'class' => 'diffusion-view-browse-header',
+      ),
+      $repository->getName());
+
     return id(new PHUIObjectBoxView())
-      ->setHeaderText($repository->getName())
+      ->setHeaderText($header)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setTable($browse_table)
       ->setPager($pager);
diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css
index 4d18e3dcb7..d05c0b26ca 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion.css
@@ -60,6 +60,12 @@
   padding: 0;
 }
 
+.diffusion-view-browse-header {
+  display: block;
+  padding: 2px 0;
+  font-size: {$biggestfontsize};
+}
+
 /* - List Styles  ------------------------------------------------------------*/
 
 .diffusion-history-list .phui-oi-link {

From bd1d22baa21e84264b576c01814ad26bf3ad5b8a Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 14 Aug 2017 11:18:29 -0700
Subject: [PATCH 24/46] Touch up typeahead behavior in locate-file

Summary: Uses `fire`, `underline`. Sets text that overflows to ellipsis.

Test Plan:
Test searching for CMS in Phabricator. Check other typeaheads, tokenizers.

{F5098496}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index fdb002f335..de5b571252 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' => 'b5b51108',
-    'core.pkg.css' => '038ad839',
+    'core.pkg.css' => '03047373',
     'core.pkg.js' => '5d80e0db',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -36,7 +36,7 @@ return array(
     'rsrc/css/aphront/tokenizer.css' => '15d5ff71',
     'rsrc/css/aphront/tooltip.css' => '173b9431',
     'rsrc/css/aphront/typeahead-browse.css' => 'f2818435',
-    'rsrc/css/aphront/typeahead.css' => '4434bc8a',
+    'rsrc/css/aphront/typeahead.css' => 'a4a21016',
     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
     'rsrc/css/application/auth/auth.css' => '0877ed6e',
     'rsrc/css/application/base/main-menu-view.css' => '16053029',
@@ -546,7 +546,7 @@ return array(
     'aphront-table-view-css' => 'a3aa6910',
     'aphront-tokenizer-control-css' => '15d5ff71',
     'aphront-tooltip-css' => '173b9431',
-    'aphront-typeahead-control-css' => '4434bc8a',
+    'aphront-typeahead-control-css' => 'a4a21016',
     'application-search-view-css' => '66ee5d46',
     'auth-css' => '0877ed6e',
     'bulk-job-css' => 'df9c1d4a',
diff --git a/webroot/rsrc/css/aphront/typeahead.css b/webroot/rsrc/css/aphront/typeahead.css
index 92970386bf..05fec1e70c 100644
--- a/webroot/rsrc/css/aphront/typeahead.css
+++ b/webroot/rsrc/css/aphront/typeahead.css
@@ -28,6 +28,9 @@ div.jx-typeahead-results a.jx-result {
   color: {$darkgreytext};
   display: block;
   font-size: {$normalfontsize};
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 div.jx-typeahead-results a.jx-result + a.jx-result {
@@ -68,7 +71,8 @@ div.jx-typeahead-results a.diffusion-locate-file {
 }
 
 .diffusion-locate-file strong {
-  color: {$blue};
+  color: {$fire};
+  text-decoration: underline;
 }
 
 .diffusion-locate-file .phui-icon-view {

From 766ecf8d6b7093502d1f6575a05eec8496496cf3 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 14 Aug 2017 11:15:57 -0700
Subject: [PATCH 25/46] Update "Reporting Bugs" documentation for removal of
 free instances

Summary: I wrote "free" since "test" only give us 7 days to confirm the issue, but "free" no longer exists and "test" should be good enough.

Test Plan: o_O

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D18423
---
 src/docs/contributor/bug_reports.diviner | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/contributor/bug_reports.diviner b/src/docs/contributor/bug_reports.diviner
index eec9569dc6..fcf3eac5c5 100644
--- a/src/docs/contributor/bug_reports.diviner
+++ b/src/docs/contributor/bug_reports.diviner
@@ -140,7 +140,7 @@ Reproducibility
 
 The most important part of your report content is instructions on how to
 reproduce the issue. What did you do? If you do it again, does it still break?
-Does it depend on a specific browser? Can you reproduce the issue on a free
+Does it depend on a specific browser? Can you reproduce the issue on a test
 instance on `admin.phabricator.com`?
 
 It is nearly impossible for us to resolve many issues if we can not reproduce

From 37489865d4bb4681aba87f582c9800b608c5c553 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 14 Aug 2017 18:58:25 +0000
Subject: [PATCH 26/46] Remove "File Name" search tool

Summary: Removing this cleanly in event we want to put it back later. 99% of these cases are likely workable either by command line or the typeahead. Will gauge feedback if users notice.

Test Plan: Reload page, perform file grep search.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18425
---
 .../controller/DiffusionBrowseController.php  | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 63dc6c3c86..d1800bc771 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -449,18 +449,6 @@ final class DiffusionBrowseController extends DiffusionController {
               'limit' => $pager->getPageSize() + 1,
               'offset' => $pager->getOffset(),
             ));
-        } else { // Filename search.
-          $search_mode = 'find';
-          $query_string = $request->getStr('find');
-          $results = $this->callConduitWithDiffusionRequest(
-            'diffusion.querypaths',
-            array(
-              'pattern' => $query_string,
-              'commit' => $drequest->getStableCommit(),
-              'path' => $drequest->getPath(),
-              'limit' => $pager->getPageSize() + 1,
-              'offset' => $pager->getOffset(),
-            ));
         }
         break;
     }
@@ -472,12 +460,6 @@ final class DiffusionBrowseController extends DiffusionController {
         'File content matching "%s" under "%s"',
         $query_string,
         nonempty($drequest->getPath(), '/'));
-    } else {
-      $table = $this->renderFindResults($results);
-      $header = pht(
-        'Paths matching "%s" under "%s"',
-        $query_string,
-        nonempty($drequest->getPath(), '/'));
     }
 
     return id(new PHUIObjectBoxView())
@@ -1595,13 +1577,6 @@ final class DiffusionBrowseController extends DiffusionController {
           ->appendChild(pht('Search is not available in Subversion.'));
         break;
       default:
-        $forms[] = id(clone $form)
-          ->appendChild(
-            id(new AphrontFormTextWithSubmitControl())
-              ->setLabel(pht('File Name'))
-              ->setSubmitLabel(pht('Search File Names'))
-              ->setName('find')
-              ->setValue($this->getRequest()->getStr('find')));
         $forms[] = id(clone $form)
           ->appendChild(
             id(new AphrontFormTextWithSubmitControl())

From 0a9ad6d5e7d1807710eaafc6144a25854cbfaa77 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 14 Aug 2017 16:29:27 -0700
Subject: [PATCH 27/46] Move pattern search into Diffusion header

Summary: This is only on browse pages, but I think could be global (home) also. Moves it from a button, field, to just a field.

Test Plan:
Review search on desktop, mobile.

{F5098886}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18428
---
 resources/celerity/map.php                    |  4 +-
 .../controller/DiffusionBrowseController.php  | 84 +++++++++++--------
 .../css/application/diffusion/diffusion.css   | 34 ++++++++
 3 files changed, 84 insertions(+), 38 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index de5b571252..e379a6acf6 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -75,7 +75,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
-    'rsrc/css/application/diffusion/diffusion.css' => '59f4ac67',
+    'rsrc/css/application/diffusion/diffusion.css' => '8a6eb632',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -570,7 +570,7 @@ return array(
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-css' => '59f4ac67',
+    'diffusion-css' => '8a6eb632',
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index d1800bc771..429c20e4c0 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -22,8 +22,7 @@ final class DiffusionBrowseController extends DiffusionController {
     // list.
 
     $grep = $request->getStr('grep');
-    $find = $request->getStr('find');
-    if (strlen($grep) || strlen($find)) {
+    if (strlen($grep)) {
       return $this->browseSearch();
     }
 
@@ -58,13 +57,15 @@ final class DiffusionBrowseController extends DiffusionController {
     $drequest = $this->getDiffusionRequest();
     $header = $this->buildHeaderView($drequest);
 
-    $search_form = $this->renderSearchForm();
     $search_results = $this->renderSearchResults();
+    $search_form = $this->renderSearchForm();
 
-    $search_form = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Search'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->appendChild($search_form);
+    $search_form = phutil_tag(
+      'div',
+      array(
+        'class' => 'diffusion-mobile-search-form',
+      ),
+      $search_form);
 
     $crumbs = $this->buildCrumbs(
       array(
@@ -329,8 +330,6 @@ final class DiffusionBrowseController extends DiffusionController {
     $header = $this->buildHeaderView($drequest);
     $header->setHeaderIcon('fa-folder-open');
 
-    $search_form = $this->renderSearchForm();
-
     $empty_result = null;
     $browse_panel = null;
     $branch_panel = null;
@@ -369,12 +368,6 @@ final class DiffusionBrowseController extends DiffusionController {
         ->setTable($browse_table)
         ->setPager($pager);
 
-      $browse_panel->setShowHide(
-        array(pht('Show Search')),
-        pht('Hide Search'),
-        $search_form,
-        '#');
-
       $path = $drequest->getPath();
       $is_branch = (!strlen($path) && $repository->supportsBranchComparison());
       if ($is_branch) {
@@ -1565,32 +1558,48 @@ final class DiffusionBrowseController extends DiffusionController {
 
   protected function renderSearchForm() {
     $drequest = $this->getDiffusionRequest();
-
-    $forms = array();
-    $form = id(new AphrontFormView())
-      ->setUser($this->getViewer())
-      ->setMethod('GET');
-
+    $viewer = $this->getViewer();
     switch ($drequest->getRepository()->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
-        $forms[] = id(clone $form)
-          ->appendChild(pht('Search is not available in Subversion.'));
-        break;
-      default:
-        $forms[] = id(clone $form)
-          ->appendChild(
-            id(new AphrontFormTextWithSubmitControl())
-              ->setLabel(pht('Pattern'))
-              ->setSubmitLabel(pht('Grep File Content'))
-              ->setName('grep')
-              ->setValue($this->getRequest()->getStr('grep')));
-        break;
+        return null;
     }
 
+    $search_term = $this->getRequest()->getStr('grep');
     require_celerity_resource('diffusion-icons-css');
-    $form_box = phutil_tag_div('diffusion-search-boxen', $forms);
+    require_celerity_resource('diffusion-css');
 
-    return $form_box;
+    $bar = javelin_tag(
+      'input',
+      array(
+        'type' => 'text',
+        'id' => 'diffusion-search-input',
+        'name' => 'grep',
+        'class' => 'diffusion-search-input',
+        'sigil' => 'diffusion-search-input',
+        'placeholder' => pht('Pattern Search'),
+        'value' => $search_term,
+      ));
+
+    $form = phabricator_form(
+      $viewer,
+      array(
+        'method' => 'GET',
+        'sigil' => 'diffusion-search-form',
+        'class' => 'diffusion-search-form',
+        'id' => 'diffusion-search-form',
+      ),
+      array(
+        $bar,
+      ));
+
+    $form_view = phutil_tag(
+      'div',
+      array(
+        'class' => 'diffusion-search-form-view',
+      ),
+      $form);
+
+    return $form_view;
   }
 
   protected function markupText($text) {
@@ -1612,11 +1621,14 @@ final class DiffusionBrowseController extends DiffusionController {
     $viewer = $this->getViewer();
 
     $tag = $this->renderCommitHashTag($drequest);
+    $search = $this->renderSearchForm();
 
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setHeader($this->renderPathLinks($drequest, $mode = 'browse'))
-      ->addTag($tag);
+      ->addActionItem($search)
+      ->addTag($tag)
+      ->addClass('diffusion-browse-header');
 
     return $header;
   }
diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css
index d05c0b26ca..7c1c9eebf5 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion.css
@@ -122,6 +122,40 @@
   color: {$darkbluetext};
 }
 
+/* - Search Input ------------------------------------------------------------*/
+
+.diffusion-search-form-view {
+  width: 240px;
+}
+
+.diffusion-search-form-view .diffusion-search-input {
+  width: 240px;
+  border-radius: 20px;
+  padding-left: 12px;
+}
+
+.device-phone .diffusion-browse-header .diffusion-search-form-view {
+  display: none;
+}
+
+.diffusion-mobile-search-form {
+  display: none;
+}
+
+.device-phone .diffusion-mobile-search-form {
+  display: block;
+}
+
+.device-phone .diffusion-search-form-view {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.device-phone .diffusion-search-form-view .diffusion-search-input {
+  width: 100%;
+}
+
+
 /* - Phone Style  ------------------------------------------------------------*/
 
 .device-phone.diffusion-history-view  .phui-two-column-view

From 4d335b7befbf671d83d5668048f20fb631ec64cb Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 14 Aug 2017 20:50:06 -0700
Subject: [PATCH 28/46] Build a basic DiffusionPatternSearchView

Summary: Roughs this in a little, kinda basic. Allows for grouping results by page. A bit better on mobile. Would like more content return from conduit though.

Test Plan:
Test `CMS`, `cms`, and `OMGLOLWTFBBQ`, desktop and mobile

{F5099081}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18429
---
 resources/celerity/map.php                    |   8 +-
 src/__phutil_library_map__.php                |   2 +
 .../controller/DiffusionBrowseController.php  | 139 ++++--------------
 .../view/DiffusionPatternSearchView.php       | 124 ++++++++++++++++
 .../css/application/diffusion/diffusion.css   |   5 +
 .../css/application/search/search-results.css |   5 +-
 6 files changed, 166 insertions(+), 117 deletions(-)
 create mode 100644 src/applications/diffusion/view/DiffusionPatternSearchView.php

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index e379a6acf6..e21ba4bf8b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -75,7 +75,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
-    'rsrc/css/application/diffusion/diffusion.css' => '8a6eb632',
+    'rsrc/css/application/diffusion/diffusion.css' => 'd0fbb996',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -111,7 +111,7 @@ return array(
     'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
     'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae',
     'rsrc/css/application/search/application-search-view.css' => '66ee5d46',
-    'rsrc/css/application/search/search-results.css' => '8f8e08ed',
+    'rsrc/css/application/search/search-results.css' => '505dd8cf',
     'rsrc/css/application/slowvote/slowvote.css' => 'a94b7230',
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
@@ -570,7 +570,7 @@ return array(
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-css' => '8a6eb632',
+    'diffusion-css' => 'd0fbb996',
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
@@ -798,7 +798,7 @@ return array(
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'c5af80a2',
     'phabricator-remarkup-css' => 'cad18339',
-    'phabricator-search-results-css' => '8f8e08ed',
+    'phabricator-search-results-css' => '505dd8cf',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
     'phabricator-source-code-view-css' => 'aea41829',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1b328c1ec3..5d8d7c3543 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -776,6 +776,7 @@ phutil_register_library_map(array(
     'DiffusionPathQueryTestCase' => 'applications/diffusion/query/pathid/__tests__/DiffusionPathQueryTestCase.php',
     'DiffusionPathTreeController' => 'applications/diffusion/controller/DiffusionPathTreeController.php',
     'DiffusionPathValidateController' => 'applications/diffusion/controller/DiffusionPathValidateController.php',
+    'DiffusionPatternSearchView' => 'applications/diffusion/view/DiffusionPatternSearchView.php',
     'DiffusionPhpExternalSymbolsSource' => 'applications/diffusion/symbol/DiffusionPhpExternalSymbolsSource.php',
     'DiffusionPreCommitContentAffectedFilesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php',
     'DiffusionPreCommitContentAuthorHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php',
@@ -5776,6 +5777,7 @@ phutil_register_library_map(array(
     'DiffusionPathQueryTestCase' => 'PhabricatorTestCase',
     'DiffusionPathTreeController' => 'DiffusionController',
     'DiffusionPathValidateController' => 'DiffusionController',
+    'DiffusionPatternSearchView' => 'DiffusionView',
     'DiffusionPhpExternalSymbolsSource' => 'DiffusionExternalSymbolsSource',
     'DiffusionPreCommitContentAffectedFilesHeraldField' => 'DiffusionPreCommitContentHeraldField',
     'DiffusionPreCommitContentAuthorHeraldField' => 'DiffusionPreCommitContentHeraldField',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 429c20e4c0..44c518e5c9 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -447,136 +447,53 @@ final class DiffusionBrowseController extends DiffusionController {
     }
     $results = $pager->sliceResults($results);
 
+    $table = null;
+    $header = null;
     if ($search_mode == 'grep') {
       $table = $this->renderGrepResults($results, $query_string);
-      $header = pht(
+      $title = pht(
         'File content matching "%s" under "%s"',
         $query_string,
         nonempty($drequest->getPath(), '/'));
+      $header = id(new PHUIHeaderView())
+        ->setHeader($title)
+        ->addClass('diffusion-search-result-header');
     }
 
-    return id(new PHUIObjectBoxView())
-      ->setHeaderText($header)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setTable($table)
-      ->setPager($pager);
+    return array($header, $table, $pager);
 
   }
 
   private function renderGrepResults(array $results, $pattern) {
     $drequest = $this->getDiffusionRequest();
-
     require_celerity_resource('phabricator-search-results-css');
 
-    $rows = array();
-    foreach ($results as $result) {
-      list($path, $line, $string) = $result;
-
-      $href = $drequest->generateURI(array(
-        'action' => 'browse',
-        'path' => $path,
-        'line' => $line,
-      ));
-
-      $matches = null;
-      $count = @preg_match_all(
-        '('.$pattern.')u',
-        $string,
-        $matches,
-        PREG_OFFSET_CAPTURE);
-
-      if (!$count) {
-        $output = ltrim($string);
-      } else {
-        $output = array();
-        $cursor = 0;
-        $length = strlen($string);
-        foreach ($matches[0] as $match) {
-          $offset = $match[1];
-          if ($cursor != $offset) {
-            $output[] = array(
-              'text' => substr($string, $cursor, $offset),
-              'highlight' => false,
-            );
-          }
-          $output[] = array(
-            'text' => $match[0],
-            'highlight' => true,
-          );
-          $cursor = $offset + strlen($match[0]);
-        }
-        if ($cursor != $length) {
-          $output[] = array(
-            'text' => substr($string, $cursor),
-            'highlight' => false,
-          );
-        }
-
-        if ($output) {
-          $output[0]['text'] =  ltrim($output[0]['text']);
-        }
-
-        foreach ($output as $key => $segment) {
-          if ($segment['highlight']) {
-            $output[$key] = phutil_tag('strong', array(), $segment['text']);
-          } else {
-            $output[$key] = $segment['text'];
-          }
-        }
-      }
-
-      $string = phutil_tag(
-        'pre',
-        array('class' => 'PhabricatorMonospaced phui-source-fragment'),
-        $output);
-
-      $path = Filesystem::readablePath($path, $drequest->getPath());
-
-      $rows[] = array(
-        phutil_tag('a', array('href' => $href), $path),
-        $line,
-        $string,
-      );
+    if (!$results) {
+      return id(new PHUIInfoView())
+        ->setSeverity(PHUIInfoView::SEVERITY_NODATA)
+        ->appendChild(
+          pht(
+            'The pattern you searched for was not found in the content of any '.
+            'files.'));
     }
 
-    $table = id(new AphrontTableView($rows))
-      ->setClassName('remarkup-code')
-      ->setHeaders(array(pht('Path'), pht('Line'), pht('String')))
-      ->setColumnClasses(array('', 'n', 'wide'))
-      ->setNoDataString(
-        pht(
-          'The pattern you searched for was not found in the content of any '.
-          'files.'));
-
-    return $table;
-  }
-
-  private function renderFindResults(array $results) {
-    $drequest = $this->getDiffusionRequest();
-
-    $rows = array();
-    foreach ($results as $result) {
-      $href = $drequest->generateURI(array(
-        'action' => 'browse',
-        'path' => $result,
-      ));
-
-      $readable = Filesystem::readablePath($result, $drequest->getPath());
-
-      $rows[] = array(
-        phutil_tag('a', array('href' => $href), $readable),
-      );
+    $grouped = array();
+    foreach ($results as $file) {
+      list($path, $line, $string) = $file;
+      $grouped[$path][] = array($line, $string);
     }
 
-    $table = id(new AphrontTableView($rows))
-      ->setHeaders(array(pht('Path')))
-      ->setColumnClasses(array('wide'))
-      ->setNoDataString(
-        pht(
-          'The pattern you searched for did not match the names of any '.
-          'files.'));
+    $view = array();
+    foreach ($grouped as $path => $matches) {
+      $view[] = id(new DiffusionPatternSearchView())
+        ->setPath($path)
+        ->setMatches($matches)
+        ->setPattern($pattern)
+        ->setDiffusionRequest($drequest)
+        ->render();
+    }
 
-    return $table;
+    return $view;
   }
 
   private function loadLintMessages() {
diff --git a/src/applications/diffusion/view/DiffusionPatternSearchView.php b/src/applications/diffusion/view/DiffusionPatternSearchView.php
new file mode 100644
index 0000000000..a679b51400
--- /dev/null
+++ b/src/applications/diffusion/view/DiffusionPatternSearchView.php
@@ -0,0 +1,124 @@
+<?php
+
+final class DiffusionPatternSearchView extends DiffusionView {
+
+  private $path;
+  private $matches;
+  private $pattern;
+
+  public function setPath($path) {
+    $this->path = $path;
+    return $this;
+  }
+
+  public function setMatches(array $matches) {
+    $this->matches = $matches;
+    return $this;
+  }
+
+  public function setPattern($pattern) {
+    $this->pattern = $pattern;
+    return $this;
+  }
+
+  public function render() {
+    $drequest = $this->getDiffusionRequest();
+    $path = $this->path;
+    $pattern = $this->pattern;
+    $rows = array();
+
+    foreach ($this->matches as $result) {
+      list($line, $string) = $result;
+
+      $matches = null;
+      $count = @preg_match_all(
+        '('.$pattern.')u',
+        $string,
+        $matches,
+        PREG_OFFSET_CAPTURE);
+
+      if (!$count) {
+        $output = ltrim($string);
+      } else {
+        $output = array();
+        $cursor = 0;
+        $length = strlen($string);
+        foreach ($matches[0] as $match) {
+          $offset = $match[1];
+          if ($cursor != $offset) {
+            $output[] = array(
+              'text' => substr($string, $cursor, $offset),
+              'highlight' => false,
+            );
+          }
+          $output[] = array(
+            'text' => $match[0],
+            'highlight' => true,
+          );
+          $cursor = $offset + strlen($match[0]);
+        }
+        if ($cursor != $length) {
+          $output[] = array(
+            'text' => substr($string, $cursor),
+            'highlight' => false,
+          );
+        }
+
+        if ($output) {
+          $output[0]['text'] =  ltrim($output[0]['text']);
+        }
+
+        foreach ($output as $key => $segment) {
+          if ($segment['highlight']) {
+            $output[$key] = phutil_tag('strong', array(), $segment['text']);
+          } else {
+            $output[$key] = $segment['text'];
+          }
+        }
+      }
+
+      $string = phutil_tag(
+        'pre',
+        array('class' => 'PhabricatorMonospaced phui-source-fragment'),
+        $output);
+
+      $href = $drequest->generateURI(array(
+        'action' => 'browse',
+        'path' => $path,
+        'line' => $line,
+      ));
+
+      $rows[] = array(
+        phutil_tag('a', array('href' => $href), $line),
+        $string,
+      );
+    }
+
+    $path_title = Filesystem::readablePath($this->path, $drequest->getPath());
+
+    $href = $drequest->generateURI(array(
+      'action' => 'browse',
+      'path' => $path_title,
+    ));
+
+    $title = phutil_tag('a', array('href' => $href), $path_title);
+
+
+    $table = id(new AphrontTableView($rows))
+      ->setClassName('remarkup-code')
+      ->setHeaders(array(pht('Line'), pht('String')))
+      ->setColumnClasses(array('n', 'wide'));
+
+    $header = id(new PHUIHeaderView())
+      ->setHeader($title);
+
+    $box = id(new PHUIObjectBoxView())
+      ->setHeader($header)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setTable($table);
+
+    return $box->render();
+  }
+
+
+}
diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css
index 7c1c9eebf5..024407da00 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion.css
@@ -122,6 +122,11 @@
   color: {$darkbluetext};
 }
 
+.diffusion-search-result-header.phui-header-shell {
+  border: none;
+  padding-bottom: 24px;
+}
+
 /* - Search Input ------------------------------------------------------------*/
 
 .diffusion-search-form-view {
diff --git a/webroot/rsrc/css/application/search/search-results.css b/webroot/rsrc/css/application/search/search-results.css
index 02d40fa179..86a0cc075a 100644
--- a/webroot/rsrc/css/application/search/search-results.css
+++ b/webroot/rsrc/css/application/search/search-results.css
@@ -12,9 +12,10 @@
 }
 
 .phui-source-fragment strong {
-  background-color: {$lightyellow};
-  font-weight: normal;
+  background-color: {$gentle.highlight};
+  font-weight: 600;
   color: {$blacktext};
+  letter-spacing: 0.02em;
 }
 
 .phui-fulltext-tokens {

From 3a50ea4f473cb250d3a66d53a67585de1b3a99f7 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Tue, 15 Aug 2017 11:01:59 -0700
Subject: [PATCH 29/46] Simplify Create Repository page

Summary: Also adds images, nice images.

Test Plan: Create a repository, test mobile, tablet, desktop layouts.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18430
---
 resources/celerity/map.php                    |  4 ++--
 .../DiffusionRepositoryEditController.php     | 19 ++++++++++++-------
 .../constants/PhabricatorRepositoryType.php   |  3 +++
 .../css/application/diffusion/diffusion.css   | 12 ++++++++++++
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index e21ba4bf8b..d6f97cdd54 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -75,7 +75,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
-    'rsrc/css/application/diffusion/diffusion.css' => 'd0fbb996',
+    'rsrc/css/application/diffusion/diffusion.css' => 'a5296e3c',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -570,7 +570,7 @@ return array(
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-css' => 'd0fbb996',
+    'diffusion-css' => 'a5296e3c',
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
index d3801fa206..bf3f389806 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
@@ -37,9 +37,6 @@ final class DiffusionRepositoryEditController
     $crumbs->setBorder(true);
 
     $title = pht('Choose Repository Type');
-    $header = id(new PHUIHeaderView())
-      ->setHeader(pht('Create Repository'))
-      ->setHeaderIcon('fa-plus-square');
 
     $layout = id(new AphrontMultiColumnView())
       ->setFluidLayout(true);
@@ -47,8 +44,10 @@ final class DiffusionRepositoryEditController
     $create_uri = $request->getRequestURI();
 
     foreach ($vcs_types as $vcs_key => $vcs_type) {
+      $image = idx($vcs_type, 'image');
+      $image = PhabricatorFile::loadBuiltin($viewer, $image);
       $action = id(new PHUIActionPanelView())
-        ->setIcon(idx($vcs_type, 'icon'))
+        ->setImage($image->getBestURI())
         ->setHeader(idx($vcs_type, 'create.header'))
         ->setHref($create_uri->alter('vcs', $vcs_key))
         ->setSubheader(idx($vcs_type, 'create.subheader'));
@@ -62,9 +61,12 @@ final class DiffusionRepositoryEditController
     $observe_href = PhabricatorEnv::getDoclink(
       'Diffusion User Guide: Existing Repositories');
 
+    require_celerity_resource('diffusion-css');
+
+    $image = PhabricatorFile::loadBuiltin($viewer, 'repo/repo.png');
     $hints->addColumn(
       id(new PHUIActionPanelView())
-        ->setIcon('fa-book')
+        ->setImage($image->getBestURI())
         ->setHeader(pht('Import or Observe an Existing Repository'))
         ->setHref($observe_href)
         ->setSubheader(
@@ -72,12 +74,15 @@ final class DiffusionRepositoryEditController
             'Review the documentation describing how to import or observe an '.
             'existing repository.')));
 
+    $layout = id(new PHUIBoxView())
+      ->addClass('diffusion-create-repo')
+      ->appendChild($layout);
+
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
+      ->setFixed(true)
       ->setFooter(
         array(
           $layout,
-          phutil_tag('br'),
           $hints,
         ));
 
diff --git a/src/applications/repository/constants/PhabricatorRepositoryType.php b/src/applications/repository/constants/PhabricatorRepositoryType.php
index 998bff0d2e..593732ddd8 100644
--- a/src/applications/repository/constants/PhabricatorRepositoryType.php
+++ b/src/applications/repository/constants/PhabricatorRepositoryType.php
@@ -26,18 +26,21 @@ final class PhabricatorRepositoryType extends Phobject {
       self::REPOSITORY_TYPE_GIT => array(
         'name' => pht('Git'),
         'icon' => 'fa-git',
+        'image' => 'repo/repo-git.png',
         'create.header' => pht('Create Git Repository'),
         'create.subheader' => pht('Create a new Git repository.'),
       ),
       self::REPOSITORY_TYPE_MERCURIAL => array(
         'name' => pht('Mercurial'),
         'icon' => 'fa-code-fork',
+        'image' => 'repo/repo-hg.png',
         'create.header' => pht('Create Mercurial Repository'),
         'create.subheader' => pht('Create a new Mercurial repository.'),
       ),
       self::REPOSITORY_TYPE_SVN => array(
         'name' => pht('Subversion'),
         'icon' => 'fa-database',
+        'image' => 'repo/repo-svn.png',
         'create.header' => pht('Create Subversion Repository'),
         'create.subheader' => pht('Create a new Subversion repository.'),
       ),
diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css
index 024407da00..5cfeaf6bed 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion.css
@@ -160,6 +160,18 @@
   width: 100%;
 }
 
+/* - Create Repository -------------------------------------------------------*/
+
+.diffusion-create-repo {
+  margin-top: 32px;
+  margin-bottom: 20px;
+}
+
+.device .diffusion-create-repo {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
 
 /* - Phone Style  ------------------------------------------------------------*/
 

From f4fdb92e13dda17370ae3cb58235eb88effbcda2 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Tue, 15 Aug 2017 11:32:54 -0700
Subject: [PATCH 30/46] Move Diffusion Actions into action bar on home

Summary: Moving this down the the "bar" to allow pattern search on home. Rebuilds the mobile layout a little.

Test Plan:
Test actions on mobile, desktop, tablet.

{F5100460}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18431
---
 resources/celerity/map.php                          |  4 ++--
 .../controller/DiffusionRepositoryController.php    | 13 ++++++++++---
 .../rsrc/css/application/diffusion/diffusion.css    |  6 ++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d6f97cdd54..02ca184ac2 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -75,7 +75,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
-    'rsrc/css/application/diffusion/diffusion.css' => 'a5296e3c',
+    'rsrc/css/application/diffusion/diffusion.css' => 'dc8d51d0',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -570,7 +570,7 @@ return array(
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-css' => 'a5296e3c',
+    'diffusion-css' => 'dc8d51d0',
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index dcbd95fef7..2faa8bc13a 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -31,8 +31,6 @@ final class DiffusionRepositoryController extends DiffusionController {
     $description = $this->buildDescriptionView($repository);
     $locate_file = $this->buildLocateFile();
 
-    $header->setActionList($actions);
-
     // Before we do any work, make sure we're looking at a some content: we're
     // on a valid branch, and the repository is not empty.
     $page_has_content = false;
@@ -113,6 +111,15 @@ final class DiffusionRepositoryController extends DiffusionController {
       $clone_text = pht('Clone');
     }
 
+    $actions_button = id(new PHUIButtonView())
+      ->setTag('a')
+      ->setText(pht('Actions'))
+      ->setIcon('fa-bars')
+      ->addClass('mmr')
+      ->setColor(PHUIButtonView::GREY)
+      ->setDropdown(true)
+      ->setDropdownMenu($actions);
+
     $clone_button = id(new PHUIButtonView())
       ->setTag('a')
       ->setText($clone_text)
@@ -123,7 +130,7 @@ final class DiffusionRepositoryController extends DiffusionController {
 
     $bar = id(new PHUILeftRightView())
       ->setLeft($locate_file)
-      ->setRight(array($this->branchButton, $clone_button))
+      ->setRight(array($this->branchButton, $actions_button, $clone_button))
       ->addClass('diffusion-action-bar');
 
     $view = id(new PHUITwoColumnView())
diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css
index 5cfeaf6bed..abfc4c474f 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion.css
@@ -33,6 +33,12 @@
   display: block;
 }
 
+.device-phone .diffusion-action-bar .button .phui-button-text {
+  visibility: hidden;
+  width: 0;
+  margin-left: 8px;
+}
+
 .diffusion-profile-locate .phui-form-view {
   margin: 0;
   padding: 0;

From 7bbd26427f8c360e4c3796d2f5305518f3da4a9e Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Tue, 15 Aug 2017 14:14:08 -0700
Subject: [PATCH 31/46] Add pattern search to diffusion home

Summary: Moves the method up to DiffusionController, so it can be more universally used. Also now center aligns tabs on mobile. Still todo, get search nicely toggled on mobile

Test Plan: Test mobile, desktop. Test search from home, from browse, and browsing a specific path.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18432
---
 resources/celerity/map.php                    | 10 ++--
 .../controller/DiffusionBrowseController.php  | 52 ++-----------------
 .../controller/DiffusionController.php        | 52 +++++++++++++++++++
 .../DiffusionRepositoryController.php         |  3 ++
 .../css/application/diffusion/diffusion.css   |  7 ++-
 .../rsrc/css/phui/phui-two-column-view.css    |  9 ++++
 6 files changed, 79 insertions(+), 54 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 02ca184ac2..f020ce521a 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' => 'b5b51108',
-    'core.pkg.css' => '03047373',
+    'core.pkg.css' => 'dd8bcea0',
     'core.pkg.js' => '5d80e0db',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -75,7 +75,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
-    'rsrc/css/application/diffusion/diffusion.css' => 'dc8d51d0',
+    'rsrc/css/application/diffusion/diffusion.css' => '34d507b9',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -178,7 +178,7 @@ return array(
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
     'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
     'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca',
-    'rsrc/css/phui/phui-two-column-view.css' => 'ae38a939',
+    'rsrc/css/phui/phui-two-column-view.css' => '81b0f3ce',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
     'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
@@ -570,7 +570,7 @@ return array(
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-css' => 'dc8d51d0',
+    'diffusion-css' => '34d507b9',
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
@@ -874,7 +874,7 @@ return array(
     'phui-tag-view-css' => 'b4719c50',
     'phui-theme-css' => '9f261c6b',
     'phui-timeline-view-css' => 'f21db7ca',
-    'phui-two-column-view-css' => 'ae38a939',
+    'phui-two-column-view-css' => '81b0f3ce',
     'phui-workboard-color-css' => '783cdff5',
     'phui-workboard-view-css' => '3bc85455',
     'phui-workcard-view-css' => 'cca5fa92',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 44c518e5c9..a9f97d5387 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -56,9 +56,10 @@ final class DiffusionBrowseController extends DiffusionController {
   private function browseSearch() {
     $drequest = $this->getDiffusionRequest();
     $header = $this->buildHeaderView($drequest);
+    $path = nonempty(basename($drequest->getPath()), '/');
 
     $search_results = $this->renderSearchResults();
-    $search_form = $this->renderSearchForm();
+    $search_form = $this->renderSearchForm($path);
 
     $search_form = phutil_tag(
       'div',
@@ -1473,52 +1474,6 @@ final class DiffusionBrowseController extends DiffusionController {
     return "{$summary}\n{$date} \xC2\xB7 {$author}";
   }
 
-  protected function renderSearchForm() {
-    $drequest = $this->getDiffusionRequest();
-    $viewer = $this->getViewer();
-    switch ($drequest->getRepository()->getVersionControlSystem()) {
-      case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
-        return null;
-    }
-
-    $search_term = $this->getRequest()->getStr('grep');
-    require_celerity_resource('diffusion-icons-css');
-    require_celerity_resource('diffusion-css');
-
-    $bar = javelin_tag(
-      'input',
-      array(
-        'type' => 'text',
-        'id' => 'diffusion-search-input',
-        'name' => 'grep',
-        'class' => 'diffusion-search-input',
-        'sigil' => 'diffusion-search-input',
-        'placeholder' => pht('Pattern Search'),
-        'value' => $search_term,
-      ));
-
-    $form = phabricator_form(
-      $viewer,
-      array(
-        'method' => 'GET',
-        'sigil' => 'diffusion-search-form',
-        'class' => 'diffusion-search-form',
-        'id' => 'diffusion-search-form',
-      ),
-      array(
-        $bar,
-      ));
-
-    $form_view = phutil_tag(
-      'div',
-      array(
-        'class' => 'diffusion-search-form-view',
-      ),
-      $form);
-
-    return $form_view;
-  }
-
   protected function markupText($text) {
     $engine = PhabricatorMarkupEngine::newDiffusionMarkupEngine();
     $engine->setConfig('viewer', $this->getRequest()->getUser());
@@ -1538,7 +1493,8 @@ final class DiffusionBrowseController extends DiffusionController {
     $viewer = $this->getViewer();
 
     $tag = $this->renderCommitHashTag($drequest);
-    $search = $this->renderSearchForm();
+    $path = nonempty(basename($drequest->getPath()), '/');
+    $search = $this->renderSearchForm($path);
 
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
index 8de17c03a2..2a52a73269 100644
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -410,6 +410,58 @@ abstract class DiffusionController extends PhabricatorController {
       ->setContent($readme_corpus);
   }
 
+  protected function renderSearchForm($path = '/') {
+    $drequest = $this->getDiffusionRequest();
+    $viewer = $this->getViewer();
+    switch ($drequest->getRepository()->getVersionControlSystem()) {
+      case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
+        return null;
+    }
+
+    $search_term = $this->getRequest()->getStr('grep');
+    require_celerity_resource('diffusion-icons-css');
+    require_celerity_resource('diffusion-css');
+
+    $href = $drequest->generateURI(array(
+      'action' => 'browse',
+      'path' => $path,
+    ));
+
+    $bar = javelin_tag(
+      'input',
+      array(
+        'type' => 'text',
+        'id' => 'diffusion-search-input',
+        'name' => 'grep',
+        'class' => 'diffusion-search-input',
+        'sigil' => 'diffusion-search-input',
+        'placeholder' => pht('Pattern Search'),
+        'value' => $search_term,
+      ));
+
+    $form = phabricator_form(
+      $viewer,
+      array(
+        'method' => 'GET',
+        'action' => $href,
+        'sigil' => 'diffusion-search-form',
+        'class' => 'diffusion-search-form',
+        'id' => 'diffusion-search-form',
+      ),
+      array(
+        $bar,
+      ));
+
+    $form_view = phutil_tag(
+      'div',
+      array(
+        'class' => 'diffusion-search-form-view',
+      ),
+      $form);
+
+    return $form_view;
+  }
+
   protected function buildTabsView($key) {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index 2faa8bc13a..0b2a964ef1 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -300,6 +300,8 @@ final class DiffusionRepositoryController extends DiffusionController {
 
   private function buildHeaderView(PhabricatorRepository $repository) {
     $viewer = $this->getViewer();
+    $search = $this->renderSearchForm();
+
     $header = id(new PHUIHeaderView())
       ->setHeader($repository->getName())
       ->setUser($viewer)
@@ -307,6 +309,7 @@ final class DiffusionRepositoryController extends DiffusionController {
       ->setProfileHeader(true)
       ->setImage($repository->getProfileImageURI())
       ->setImageEditURL('/diffusion/picture/'.$repository->getID().'/')
+      ->addActionItem($search)
       ->addClass('diffusion-profile-header');
 
     if (!$repository->isTracked()) {
diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css
index abfc4c474f..b9f6c99442 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion.css
@@ -12,6 +12,10 @@
   display: block;
 }
 
+.device-phone .diffusion-profile-header .phui-header-col1 {
+  display: none;
+}
+
 .diffusion-action-bar {
   margin-bottom: 16px;
 }
@@ -145,7 +149,8 @@
   padding-left: 12px;
 }
 
-.device-phone .diffusion-browse-header .diffusion-search-form-view {
+.device-phone .diffusion-browse-header .diffusion-search-form-view,
+.device-phone .diffusion-profile-header .diffusion-search-form-view {
   display: none;
 }
 
diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css
index 2957528929..9aaff1de28 100644
--- a/webroot/rsrc/css/phui/phui-two-column-view.css
+++ b/webroot/rsrc/css/phui/phui-two-column-view.css
@@ -185,6 +185,15 @@
   padding: 0 12px;
 }
 
+.device-phone .phui-two-column-tabs .phui-list-view.phui-list-tabbar {
+  text-align: center;
+}
+
+.device-phone .phui-two-column-tabs .phui-list-view.phui-list-tabbar > li {
+  float: none;
+  display: inline-block;
+}
+
 /* Info View */
 
 .phui-two-column-view .phui-info-view {

From 19dae887285195bdc8a50a4fde1b930283489c48 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Wed, 16 Aug 2017 12:07:14 -0700
Subject: [PATCH 32/46] Add branch, tag info to Diffusion Headers

Summary: Improves overall UX of browsing Diffusion. Clarifies branch and tag when possible, changes 'home' to 'code', uses tabs in more locations. Fixes T12837

Test Plan: Review branchs, tags, git, hg, search, browse, history.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12837

Differential Revision: https://secure.phabricator.com/D18434
---
 resources/celerity/map.php                    |  4 +-
 .../DiffusionBranchTableController.php        |  5 +++
 .../controller/DiffusionBrowseController.php  | 18 ++++++++-
 .../controller/DiffusionController.php        | 40 +++++++++++++++++--
 .../controller/DiffusionGraphController.php   |  7 ++++
 .../controller/DiffusionHistoryController.php | 12 ++++++
 .../DiffusionRepositoryController.php         | 11 ++++-
 .../controller/DiffusionTagListController.php |  6 +++
 .../css/application/diffusion/diffusion.css   |  6 +++
 9 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index f020ce521a..db0e057ab2 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -75,7 +75,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
-    'rsrc/css/application/diffusion/diffusion.css' => '34d507b9',
+    'rsrc/css/application/diffusion/diffusion.css' => '58e0704b',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -570,7 +570,7 @@ return array(
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-css' => '34d507b9',
+    'diffusion-css' => '58e0704b',
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
diff --git a/src/applications/diffusion/controller/DiffusionBranchTableController.php b/src/applications/diffusion/controller/DiffusionBranchTableController.php
index 04d00f0306..801b45a450 100644
--- a/src/applications/diffusion/controller/DiffusionBranchTableController.php
+++ b/src/applications/diffusion/controller/DiffusionBranchTableController.php
@@ -71,6 +71,11 @@ final class DiffusionBranchTableController extends DiffusionController {
       ->setHeader(pht('Branches'))
       ->setHeaderIcon('fa-code-fork');
 
+    if (!$repository->isSVN()) {
+      $branch_tag = $this->renderBranchTag($drequest);
+      $header->addTag($branch_tag);
+    }
+
     $tabs = $this->buildTabsView('branch');
 
     $view = id(new PHUITwoColumnView())
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index a9f97d5387..346891cfb2 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -76,8 +76,11 @@ final class DiffusionBrowseController extends DiffusionController {
       ));
     $crumbs->setBorder(true);
 
+    $tabs = $this->buildTabsView('code');
+
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
+      ->setTabs($tabs)
       ->setFooter(
         array(
           $search_form,
@@ -291,9 +294,11 @@ final class DiffusionBrowseController extends DiffusionController {
     $crumbs->setBorder(true);
 
     $basename = basename($this->getDiffusionRequest()->getPath());
+    $tabs = $this->buildTabsView('code');
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
+      ->setTabs($tabs)
       ->setCurtain($curtain)
       ->setMainColumn(array(
         $content,
@@ -387,9 +392,11 @@ final class DiffusionBrowseController extends DiffusionController {
       ));
 
     $crumbs->setBorder(true);
+    $tabs = $this->buildTabsView('code');
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
+      ->setTabs($tabs)
       ->setFooter(
         array(
           $branch_panel,
@@ -1491,8 +1498,10 @@ final class DiffusionBrowseController extends DiffusionController {
 
   protected function buildHeaderView(DiffusionRequest $drequest) {
     $viewer = $this->getViewer();
+    $repository = $drequest->getRepository();
+
+    $commit_tag = $this->renderCommitHashTag($drequest);
 
-    $tag = $this->renderCommitHashTag($drequest);
     $path = nonempty(basename($drequest->getPath()), '/');
     $search = $this->renderSearchForm($path);
 
@@ -1500,9 +1509,14 @@ final class DiffusionBrowseController extends DiffusionController {
       ->setUser($viewer)
       ->setHeader($this->renderPathLinks($drequest, $mode = 'browse'))
       ->addActionItem($search)
-      ->addTag($tag)
+      ->addTag($commit_tag)
       ->addClass('diffusion-browse-header');
 
+    if (!$repository->isSVN()) {
+      $branch_tag = $this->renderBranchTag($drequest);
+      $header->addTag($branch_tag);
+    }
+
     return $header;
   }
 
diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
index 2a52a73269..d79c4fb7eb 100644
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -343,6 +343,38 @@ abstract class DiffusionController extends PhabricatorController {
     return $tag;
   }
 
+  protected function renderBranchTag(DiffusionRequest $drequest) {
+    $branch = $drequest->getBranch();
+    $branch = id(new PhutilUTF8StringTruncator())
+      ->setMaximumGlyphs(24)
+      ->truncateString($branch);
+
+    $tag = id(new PHUITagView())
+      ->setName($branch)
+      ->setColor(PHUITagView::COLOR_INDIGO)
+      ->setBorder(PHUITagView::BORDER_NONE)
+      ->setType(PHUITagView::TYPE_OUTLINE)
+      ->addClass('diffusion-header-branch-tag');
+
+    return $tag;
+  }
+
+  protected function renderSymbolicCommit(DiffusionRequest $drequest) {
+    $symbolic_tag = $drequest->getSymbolicCommit();
+    $symbolic_tag = id(new PhutilUTF8StringTruncator())
+      ->setMaximumGlyphs(24)
+      ->truncateString($symbolic_tag);
+
+    $tag = id(new PHUITagView())
+      ->setName($symbolic_tag)
+      ->setIcon('fa-tag')
+      ->setColor(PHUITagView::COLOR_INDIGO)
+      ->setBorder(PHUITagView::BORDER_NONE)
+      ->setType(PHUITagView::TYPE_SHADE);
+
+    return $tag;
+  }
+
   protected function renderDirectoryReadme(DiffusionBrowseResultSet $browse) {
     $readme_path = $browse->getReadmePath();
     if ($readme_path === null) {
@@ -470,15 +502,15 @@ abstract class DiffusionController extends PhabricatorController {
 
     $view->addMenuItem(
       id(new PHUIListItemView())
-        ->setKey('home')
-        ->setName(pht('Home'))
-        ->setIcon('fa-home')
+        ->setKey('code')
+        ->setName(pht('Code'))
+        ->setIcon('fa-code')
         ->setHref($drequest->generateURI(
           array(
             'action' => 'branch',
             'path' => '/',
           )))
-        ->setSelected($key == 'home'));
+        ->setSelected($key == 'code'));
 
     if (!$repository->isSVN()) {
       $view->addMenuItem(
diff --git a/src/applications/diffusion/controller/DiffusionGraphController.php b/src/applications/diffusion/controller/DiffusionGraphController.php
index 8ec909139a..5062fe9765 100644
--- a/src/applications/diffusion/controller/DiffusionGraphController.php
+++ b/src/applications/diffusion/controller/DiffusionGraphController.php
@@ -11,6 +11,7 @@ final class DiffusionGraphController extends DiffusionController {
     if ($response) {
       return $response;
     }
+    require_celerity_resource('diffusion-css');
 
     $viewer = $this->getViewer();
     $drequest = $this->getDiffusionRequest();
@@ -83,6 +84,7 @@ final class DiffusionGraphController extends DiffusionController {
 
   private function buildHeader(DiffusionRequest $drequest) {
     $viewer = $this->getViewer();
+    $repository = $drequest->getRepository();
 
     $no_path = !strlen($drequest->getPath());
     if ($no_path) {
@@ -96,6 +98,11 @@ final class DiffusionGraphController extends DiffusionController {
       ->setHeader($header_text)
       ->setHeaderIcon('fa-code-fork');
 
+    if (!$repository->isSVN()) {
+      $branch_tag = $this->renderBranchTag($drequest);
+      $header->addTag($branch_tag);
+    }
+
     return $header;
 
   }
diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php
index fde35133cc..f50e73295f 100644
--- a/src/applications/diffusion/controller/DiffusionHistoryController.php
+++ b/src/applications/diffusion/controller/DiffusionHistoryController.php
@@ -11,6 +11,7 @@ final class DiffusionHistoryController extends DiffusionController {
     if ($response) {
       return $response;
     }
+    require_celerity_resource('diffusion-css');
 
     $viewer = $this->getViewer();
     $drequest = $this->getDiffusionRequest();
@@ -78,6 +79,7 @@ final class DiffusionHistoryController extends DiffusionController {
 
   private function buildHeader(DiffusionRequest $drequest) {
     $viewer = $this->getViewer();
+    $repository = $drequest->getRepository();
 
     $no_path = !strlen($drequest->getPath());
     if ($no_path) {
@@ -91,6 +93,16 @@ final class DiffusionHistoryController extends DiffusionController {
       ->setHeader($header_text)
       ->setHeaderIcon('fa-clock-o');
 
+    if (!$repository->isSVN()) {
+      $branch_tag = $this->renderBranchTag($drequest);
+      $header->addTag($branch_tag);
+    }
+
+    if ($drequest->getSymbolicCommit()) {
+      $symbolic_tag = $this->renderSymbolicCommit($drequest);
+      $header->addTag($symbolic_tag);
+    }
+
     return $header;
 
   }
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index 0b2a964ef1..435ee3f71d 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -98,7 +98,7 @@ final class DiffusionRepositoryController extends DiffusionController {
         ->setErrors(array($empty_message));
     }
 
-    $tabs = $this->buildTabsView('home');
+    $tabs = $this->buildTabsView('code');
 
     $clone_uri = $drequest->generateURI(
       array(
@@ -300,6 +300,7 @@ final class DiffusionRepositoryController extends DiffusionController {
 
   private function buildHeaderView(PhabricatorRepository $repository) {
     $viewer = $this->getViewer();
+    $drequest = $this->getDiffusionRequest();
     $search = $this->renderSearchForm();
 
     $header = id(new PHUIHeaderView())
@@ -325,6 +326,14 @@ final class DiffusionRepositoryController extends DiffusionController {
       $header->setStatus('fa-check', 'bluegrey', pht('Active'));
     }
 
+    if (!$repository->isSVN()) {
+      $default = $repository->getDefaultBranch();
+      if ($default != $drequest->getBranch()) {
+        $branch_tag = $this->renderBranchTag($drequest);
+        $header->addTag($branch_tag);
+      }
+    }
+
     return $header;
   }
 
diff --git a/src/applications/diffusion/controller/DiffusionTagListController.php b/src/applications/diffusion/controller/DiffusionTagListController.php
index f7cd032e1a..15b8dc93ae 100644
--- a/src/applications/diffusion/controller/DiffusionTagListController.php
+++ b/src/applications/diffusion/controller/DiffusionTagListController.php
@@ -11,6 +11,7 @@ final class DiffusionTagListController extends DiffusionController {
     if ($response) {
       return $response;
     }
+    require_celerity_resource('diffusion-css');
 
     $viewer = $this->getViewer();
     $drequest = $this->getDiffusionRequest();
@@ -50,6 +51,11 @@ final class DiffusionTagListController extends DiffusionController {
       ->setHeader(pht('Tags'))
       ->setHeaderIcon('fa-tags');
 
+    if (!$repository->isSVN()) {
+      $branch_tag = $this->renderBranchTag($drequest);
+      $header->addTag($branch_tag);
+    }
+
     if (!$tags) {
       $content = $this->renderStatusMessage(
         pht('No Tags'),
diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css
index b9f6c99442..7625e9fb88 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion.css
@@ -122,6 +122,12 @@
   margin-right: 4px;
 }
 
+.diffusion-header-branch-tag.phui-tag-view.phui-tag-type-outline
+  .phui-tag-core {
+    padding: 3px 12px 2px;
+    font-size: {$normalfontsize};
+}
+
 /* - Browse Styles  ----------------------------------------------------------*/
 
 .diffusion-browse-table .commit-detail {

From 5019960b6159a18c7ed157e7c708f23357d64657 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Tue, 15 Aug 2017 18:58:21 -0700
Subject: [PATCH 33/46] Set border on crumbs on Lint page

Summary: Minor, sets the border, corrects a page header.

Test Plan: View lint pages

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

diff --git a/src/applications/diffusion/controller/DiffusionLintController.php b/src/applications/diffusion/controller/DiffusionLintController.php
index 980dc8d27c..af3ed571ce 100644
--- a/src/applications/diffusion/controller/DiffusionLintController.php
+++ b/src/applications/diffusion/controller/DiffusionLintController.php
@@ -167,6 +167,7 @@ final class DiffusionLintController extends DiffusionController {
         'path'   => true,
         'view'   => 'lint',
       ));
+    $crumbs->setBorder(true);
 
     if ($drequest) {
       $title[] = $drequest->getRepository()->getDisplayName();
@@ -178,7 +179,7 @@ final class DiffusionLintController extends DiffusionController {
       $branch = $drequest->loadBranch();
 
       $header = id(new PHUIHeaderView())
-        ->setHeader($this->renderPathLinks($drequest, 'lint'))
+        ->setHeader(pht('Lint: %s', $this->renderPathLinks($drequest, 'lint')))
         ->setUser($viewer)
         ->setHeaderIcon('fa-code');
       $actions = $this->buildActionView($drequest);
@@ -465,6 +466,7 @@ final class DiffusionLintController extends DiffusionController {
         'path'   => true,
         'view'   => 'lint',
       ));
+    $crumbs->setBorder(true);
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Lint: %s', $drequest->getRepository()->getDisplayName()))

From dc10bb1f4980b0cc646c4d89b8d8db472521505d Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Wed, 16 Aug 2017 20:12:19 -0700
Subject: [PATCH 34/46] Update Settings to use TwoColumn fixed layout

Summary: Simplifies the page, adds base support for PHUITwoColumn fixed from Instances (which I'll delete css there).

Test Plan:
click on every settings page, UI seems in tact, check mobile, desktop, mobile menus.

{F5102572}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18436
---
 resources/celerity/map.php                    |  6 +--
 .../PhabricatorSettingsMainController.php     |  8 +--
 ...torConpherencePreferencesSettingsPanel.php |  2 +-
 .../editengine/PhabricatorEditEngine.php      | 13 +++--
 .../rsrc/css/phui/phui-two-column-view.css    | 51 +++++++++++++++++++
 5 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index db0e057ab2..774e6c0778 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' => 'b5b51108',
-    'core.pkg.css' => 'dd8bcea0',
+    'core.pkg.css' => 'cf953851',
     'core.pkg.js' => '5d80e0db',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -178,7 +178,7 @@ return array(
     'rsrc/css/phui/phui-status.css' => 'd5263e49',
     'rsrc/css/phui/phui-tag-view.css' => 'b4719c50',
     'rsrc/css/phui/phui-timeline-view.css' => 'f21db7ca',
-    'rsrc/css/phui/phui-two-column-view.css' => '81b0f3ce',
+    'rsrc/css/phui/phui-two-column-view.css' => '76dcd3d4',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => '783cdff5',
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
     'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
@@ -874,7 +874,7 @@ return array(
     'phui-tag-view-css' => 'b4719c50',
     'phui-theme-css' => '9f261c6b',
     'phui-timeline-view-css' => 'f21db7ca',
-    'phui-two-column-view-css' => '81b0f3ce',
+    'phui-two-column-view-css' => '76dcd3d4',
     'phui-workboard-color-css' => '783cdff5',
     'phui-workboard-view-css' => '3bc85455',
     'phui-workcard-view-css' => 'cca5fa92',
diff --git a/src/applications/settings/controller/PhabricatorSettingsMainController.php b/src/applications/settings/controller/PhabricatorSettingsMainController.php
index 4c1bfab6f1..1e4d4a0b70 100644
--- a/src/applications/settings/controller/PhabricatorSettingsMainController.php
+++ b/src/applications/settings/controller/PhabricatorSettingsMainController.php
@@ -121,18 +121,18 @@ final class PhabricatorSettingsMainController
     }
 
     $header = id(new PHUIHeaderView())
-      ->setHeader($header_text)
-      ->setHeaderIcon('fa-pencil');
+      ->setHeader($header_text);
 
     $title = $panel->getPanelName();
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
-      ->setFooter($response);
+      ->setFixed(true)
+      ->setNavigation($nav)
+      ->setMainColumn($response);
 
     return $this->newPage()
       ->setTitle($title)
-      ->setNavigation($nav)
       ->setCrumbs($crumbs)
       ->appendChild($view);
 
diff --git a/src/applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php
index 87643a08ad..6ed6325d67 100644
--- a/src/applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php
@@ -6,7 +6,7 @@ final class PhabricatorConpherencePreferencesSettingsPanel
   const PANELKEY = 'conpherence';
 
   public function getPanelName() {
-    return pht('Conpherence Preferences');
+    return pht('Conpherence');
   }
 
   public function getPanelGroupKey() {
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index c9d8a6887f..d09e2450a1 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1141,10 +1141,8 @@ abstract class PhabricatorEditEngine
 
     if ($this->getIsCreate()) {
       $header_text = $this->getFormHeaderText($object);
-      $header_icon = 'fa-plus-square';
     } else {
       $header_text = $this->getObjectEditTitleText($object);
-      $header_icon = 'fa-pencil';
     }
 
     $show_preview = !$request->isAjax();
@@ -1185,8 +1183,7 @@ abstract class PhabricatorEditEngine
     $crumbs = $this->buildCrumbs($object, $final = true);
 
     $header = id(new PHUIHeaderView())
-      ->setHeader($header_text)
-      ->setHeaderIcon($header_icon);
+      ->setHeader($header_text);
     $crumbs->setBorder(true);
 
     if ($action_button) {
@@ -1216,8 +1213,6 @@ abstract class PhabricatorEditEngine
       $view->setHeader($header);
     }
 
-    $view->setFooter($content);
-
     $page = $controller->newPage()
       ->setTitle($header_text)
       ->setCrumbs($crumbs)
@@ -1225,7 +1220,11 @@ abstract class PhabricatorEditEngine
 
     $navigation = $this->getNavigation();
     if ($navigation) {
-      $page->setNavigation($navigation);
+      $view->setFixed(true);
+      $view->setNavigation($navigation);
+      $view->setMainColumn($content);
+    } else {
+      $view->setFooter($content);
     }
 
     return $page;
diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css
index 9aaff1de28..dba1519597 100644
--- a/webroot/rsrc/css/phui/phui-two-column-view.css
+++ b/webroot/rsrc/css/phui/phui-two-column-view.css
@@ -244,3 +244,54 @@
   .phui-document-view {
     margin: 0 0 20px 0;
 }
+
+/*- Fixed Styles with Navigation -------------------------------------------- */
+
+.phui-two-column-fixed.phui-two-column-view .phui-two-column-header {
+  background: transparent;
+  border: none;
+  margin-bottom: 0;
+}
+
+.phui-two-column-fixed.phui-two-column-view .phui-side-column
+  .phui-box-border {
+    background: transparent;
+    border: none;
+    padding: 0;
+    width: 180px;
+}
+
+.device-desktop
+  .phui-two-column-fixed.phui-two-column-view.phui-side-column-left
+  .phui-side-column {
+    width: 200px;
+}
+
+.device-desktop
+  .phui-two-column-fixed.phui-two-column-view.phui-side-column-left
+  .phui-main-column {
+    width: calc(100% - 200px)
+}
+
+.phui-two-column-fixed.phui-two-column-view .phui-basic-nav
+  .phabricator-side-menu {
+    background: transparent;
+}
+
+.phui-two-column-fixed.phui-two-column-view
+  .phui-basic-nav .phabricator-side-menu .phui-list-item-selected {
+    border-radius: 3px;
+    background-color: #f5f9ff;
+    border: 1px solid {$sky};
+    padding-left: 3px;
+}
+
+.phui-two-column-fixed.phui-two-column-view .phui-basic-nav
+  .phabricator-side-menu .phui-list-item-href {
+    border-radius: 3px;
+}
+
+.phui-two-column-fixed.phui-two-column-view .phui-header-action-links
+  .phui-mobile-menu {
+    display: block;
+}

From 053cab4d59b7ef07b9ac8fb91ab79dfb65232770 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Wed, 16 Aug 2017 19:33:25 -0700
Subject: [PATCH 35/46] Update VCS Password settings page

Summary: Use proper background.

Test Plan: Visit page, see correct background.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

diff --git a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
index 4c84d430cf..a41f322a3d 100644
--- a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
+++ b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php
@@ -233,6 +233,7 @@ final class DiffusionSetPasswordSettingsPanel extends PhabricatorSettingsPanel {
 
     $object_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($form)
       ->setFormErrors($errors);
 
@@ -258,6 +259,7 @@ final class DiffusionSetPasswordSettingsPanel extends PhabricatorSettingsPanel {
 
     $remove_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Remove VCS Password'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setForm($remove_form);
 
     $saved = null;

From c9986fd5dee6e8efb162720d05cc6bd0c259f151 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 17 Aug 2017 09:41:37 -0700
Subject: [PATCH 36/46] Don't fatal in ElasticSearch setup check if no "master"
 database is configured

Summary:
Ref T12965. See that task for discussion, and PHI36 for context.

This sweeps the fatal under the rug by skipping it, letting things move forward for now.

Test Plan: Followed instructions in T12965, got a read-only recovery after restart instead of a fatal.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12965

Differential Revision: https://secure.phabricator.com/D18440
---
 .../config/check/PhabricatorElasticsearchSetupCheck.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php b/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php
index 157db5e141..cd29ecdc78 100644
--- a/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php
+++ b/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php
@@ -7,6 +7,12 @@ final class PhabricatorElasticsearchSetupCheck extends PhabricatorSetupCheck {
   }
 
   protected function executeChecks() {
+    // TODO: Avoid fataling if we don't have a master database configured
+    // but have the MySQL search index configured. See T12965.
+    if (PhabricatorEnv::isReadOnly()) {
+      return;
+    }
+
     $services = PhabricatorSearchService::getAllServices();
 
     foreach ($services as $service) {

From 68008dce609b1ad4327430039630458fb534d722 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 17 Aug 2017 11:24:23 -0700
Subject: [PATCH 37/46] Fix a possible database ref fatal during MySQL setup
 checks if a host is unreachable

Summary:
Ref T12966. See that task for a description and reproduction steps.

If you put Phabricator in a master/replica configuration and then restart it, we may fatal here if the master is unreachable. Instead, we should survive setup checks.

Test Plan: Put Phabricator in a master/replica configuration, explicitly disabled the master by misconfiguring the port, restarted Phabricator. Before: fatal; after: login screen in read-only mode.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12966

Differential Revision: https://secure.phabricator.com/D18442
---
 .../config/check/PhabricatorMySQLSetupCheck.php           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/applications/config/check/PhabricatorMySQLSetupCheck.php b/src/applications/config/check/PhabricatorMySQLSetupCheck.php
index 8e2f39a504..dad9ba6d7b 100644
--- a/src/applications/config/check/PhabricatorMySQLSetupCheck.php
+++ b/src/applications/config/check/PhabricatorMySQLSetupCheck.php
@@ -9,7 +9,13 @@ final class PhabricatorMySQLSetupCheck extends PhabricatorSetupCheck {
   protected function executeChecks() {
     $refs = PhabricatorDatabaseRef::getActiveDatabaseRefs();
     foreach ($refs as $ref) {
-      $this->executeRefChecks($ref);
+      try {
+        $this->executeRefChecks($ref);
+      } catch (AphrontConnectionQueryException $ex) {
+        // If we're unable to connect to a host, just skip the checks for it.
+        // This can happen if we're restarting during a cluster incident. See
+        // T12966 for discussion.
+      }
     }
   }
 

From 281fc19f3f10c80081d3d3a86fe0324866757d01 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 17 Aug 2017 12:09:10 -0700
Subject: [PATCH 38/46] Add more information to Branch status page in Manage
 Repository

Summary: Adds an icon for default branch, status for branch status

Test Plan: Review `hg` and `git` repositories, change default branch, etc.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18443
---
 ...usionRepositoryBranchesManagementPanel.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php b/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
index a735b8d580..0ef9d9b030 100644
--- a/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
+++ b/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
@@ -117,23 +117,44 @@ final class DiffusionRepositoryBranchesManagementPanel
         $tracking = $repository->shouldTrackBranch($branch_name);
         $autoclosing = $repository->shouldAutocloseBranch($branch_name);
 
+        $default = $repository->getDefaultBranch();
+        $icon = null;
+        if ($default == $branch->getShortName()) {
+          $icon = id(new PHUIIconView())
+            ->setIcon('fa-code-fork');
+        }
+
+        $fields = $branch->getRawFields();
+        $closed = idx($fields, 'closed');
+        if ($closed) {
+          $status = pht('Closed');
+        } else {
+          $status = pht('Open');
+        }
+
         $rows[] = array(
+          $icon,
           $branch_name,
           $tracking ? pht('Tracking') : pht('Off'),
           $autoclosing ? pht('Autoclose On') : pht('Off'),
+          $status,
         );
       }
       $branch_table = new AphrontTableView($rows);
       $branch_table->setHeaders(
         array(
+          '',
           pht('Branch'),
           pht('Track'),
           pht('Autoclose'),
+          pht('Status'),
         ));
       $branch_table->setColumnClasses(
         array(
+          '',
           'pri',
           'narrow',
+          'narrow',
           'wide',
         ));
 

From 864dd9a196a2e0a7ff0b1393de8d312e84fc498f Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 17 Aug 2017 12:15:43 -0700
Subject: [PATCH 39/46] List branch on main repository view

Summary: This is in the crumbs, but a little hidden. Puts branch name at the top of the browse table header.

Test Plan: Review a few branchs, change branch, see new name.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18441
---
 .../diffusion/controller/DiffusionController.php          | 2 +-
 .../controller/DiffusionRepositoryController.php          | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
index d79c4fb7eb..7ae67c2b5d 100644
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -148,7 +148,7 @@ abstract class DiffusionController extends PhabricatorController {
 
     if (!$spec['commit'] && !$spec['tags'] && !$spec['branches']) {
       $branch_name = $drequest->getBranch();
-      if ($branch_name) {
+      if (strlen($branch_name)) {
         $repository_name .= ' ('.$branch_name.')';
       }
     }
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index 435ee3f71d..120dd0d344 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -565,13 +565,19 @@ final class DiffusionRepositoryController extends DiffusionController {
     $browse_uri = $drequest->generateURI(array('action' => 'browse'));
     $pager->setURI($browse_uri, 'offset');
 
+    $repository_name = $repository->getName();
+    $branch_name = $drequest->getBranch();
+    if (strlen($branch_name)) {
+      $repository_name .= ' ('.$branch_name.')';
+    }
+
     $header = phutil_tag(
       'a',
       array(
         'href' => $browse_uri,
         'class' => 'diffusion-view-browse-header',
       ),
-      $repository->getName());
+      $repository_name);
 
     return id(new PHUIObjectBoxView())
       ->setHeaderText($header)

From 60df67af53adb978393f580d433642ebad2edcef Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 17 Aug 2017 09:02:43 -0700
Subject: [PATCH 40/46] Give mobile page tabs more space

Summary: These can wrap on iPhone 5 screens, no need for so much padding.

Test Plan: iPhone 5 simulator, tablet and mobile.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18437
---
 resources/celerity/map.php                               | 6 +++---
 webroot/rsrc/css/application/base/standard-page-view.css | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 774e6c0778..5a5d94479e 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' => 'b5b51108',
-    'core.pkg.css' => 'cf953851',
+    'core.pkg.css' => 'fe4effd6',
     'core.pkg.js' => '5d80e0db',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -42,7 +42,7 @@ return array(
     'rsrc/css/application/base/main-menu-view.css' => '16053029',
     'rsrc/css/application/base/notification-menu.css' => '73fefdfa',
     'rsrc/css/application/base/phui-theme.css' => '9f261c6b',
-    'rsrc/css/application/base/standard-page-view.css' => 'c581d2ac',
+    'rsrc/css/application/base/standard-page-view.css' => '34ee718b',
     'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
     'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
     'rsrc/css/application/config/config-options.css' => 'd55ed093',
@@ -802,7 +802,7 @@ return array(
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-slowvote-css' => 'a94b7230',
     'phabricator-source-code-view-css' => 'aea41829',
-    'phabricator-standard-page-view' => 'c581d2ac',
+    'phabricator-standard-page-view' => '34ee718b',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
     'phabricator-tooltip' => '358b8c04',
diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css
index d930a73797..755ed1d59c 100644
--- a/webroot/rsrc/css/application/base/standard-page-view.css
+++ b/webroot/rsrc/css/application/base/standard-page-view.css
@@ -186,6 +186,7 @@ a.handle-status-closed:hover {
 
 .device .phabricator-standard-page-tabs {
   margin-bottom: 20px;
+  padding: 0 12px;
 }
 
 .device-phone .phabricator-standard-page-tabs {

From 295c8062199160f2588926abc6d44b77bcc3c497 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 17 Aug 2017 13:28:51 -0700
Subject: [PATCH 41/46] Hide branch status if repository is not hg

Summary: Better table layouts here for branches view

Test Plan: Test git, hg repositories. See column go away.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

diff --git a/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php b/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
index 0ef9d9b030..17ee506b16 100644
--- a/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
+++ b/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
@@ -110,6 +110,7 @@ final class DiffusionRepositoryBranchesManagementPanel
         ->execute();
       $branches = DiffusionRepositoryRef::loadAllFromDictionaries($branches);
       $branches = $pager->sliceResults($branches);
+      $can_close_branches = ($repository->isHg());
 
       $rows = array();
       foreach ($branches as $branch) {
@@ -135,9 +136,9 @@ final class DiffusionRepositoryBranchesManagementPanel
         $rows[] = array(
           $icon,
           $branch_name,
+          $status,
           $tracking ? pht('Tracking') : pht('Off'),
           $autoclosing ? pht('Autoclose On') : pht('Off'),
-          $status,
         );
       }
       $branch_table = new AphrontTableView($rows);
@@ -145,9 +146,9 @@ final class DiffusionRepositoryBranchesManagementPanel
         array(
           '',
           pht('Branch'),
+          pht('Status'),
           pht('Track'),
           pht('Autoclose'),
-          pht('Status'),
         ));
       $branch_table->setColumnClasses(
         array(
@@ -157,6 +158,14 @@ final class DiffusionRepositoryBranchesManagementPanel
           'narrow',
           'wide',
         ));
+      $branch_table->setColumnVisibility(
+        array(
+          true,
+          true,
+          $can_close_branches,
+          true,
+          true,
+        ));
 
       $box = id(new PHUIObjectBoxView())
         ->setHeaderText(pht('Branch Status'))

From d2a3f2da73a0f4c5520f54f83849421703cc87b2 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 21 Aug 2017 08:51:39 -0700
Subject: [PATCH 42/46] Add indication of hg branch open/closed in branch list

Summary: Adds some basic UI for open / closed state when viewing a list of branches in Mercurial. Fixes T12838

Test Plan: Close and open branches, view list.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12838

Differential Revision: https://secure.phabricator.com/D18447
---
 .../view/DiffusionBranchListView.php          | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/applications/diffusion/view/DiffusionBranchListView.php b/src/applications/diffusion/view/DiffusionBranchListView.php
index 1a9df42e05..a2ba34893e 100644
--- a/src/applications/diffusion/view/DiffusionBranchListView.php
+++ b/src/applications/diffusion/view/DiffusionBranchListView.php
@@ -74,14 +74,6 @@ final class DiffusionBranchListView extends DiffusionView {
         }
       }
 
-      $fields = $branch->getRawFields();
-      $closed = idx($fields, 'closed');
-      if ($closed) {
-        $status = pht('Closed');
-      } else {
-        $status = pht('Open');
-      }
-
       $browse_href = $drequest->generateURI(
         array(
           'action' => 'browse',
@@ -129,6 +121,18 @@ final class DiffusionBranchListView extends DiffusionView {
       }
       $item->addAttribute(array($datetime));
 
+      if ($can_close_branches) {
+        $fields = $branch->getRawFields();
+        $closed = idx($fields, 'closed');
+        if ($closed) {
+          $status = pht('Branch Closed');
+          $item->setDisabled(true);
+        } else {
+          $status = pht('Branch Open');
+        }
+        $item->addAttribute($status);
+      }
+
       $list->addItem($item);
 
     }

From a145d00be698e97d6a2c7f4ef41ae514b67d0608 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Mon, 21 Aug 2017 13:07:38 -0700
Subject: [PATCH 43/46] Update Diffusion File UI for single column

Summary: Moves browseFile to single column, implements Owners as a list under the file (and now directory as well), improved information listed in Owners, and moves actions into the Diffusion action bar instead of the header.

Test Plan:
Test browsing directories, files, text, images, binaries, enabling blame. Mobile and desktop.

{F5111045}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18448
---
 resources/celerity/map.php                    |   8 +-
 .../controller/DiffusionBrowseController.php  | 267 +++++++++++-------
 .../css/application/diffusion/diffusion.css   |  10 +
 webroot/rsrc/css/phui/phui-left-right.css     |   8 +
 4 files changed, 183 insertions(+), 110 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 5a5d94479e..87b45c9dc6 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -75,7 +75,7 @@ return array(
     'rsrc/css/application/diffusion/diffusion-readme.css' => '419dd5b6',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'ee6f20ec',
     'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
-    'rsrc/css/application/diffusion/diffusion.css' => '58e0704b',
+    'rsrc/css/application/diffusion/diffusion.css' => 'ceacf994',
     'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
     'rsrc/css/application/files/global-drag-and-drop.css' => 'b556a948',
     'rsrc/css/application/flag/flag.css' => 'bba8f811',
@@ -165,7 +165,7 @@ return array(
     'rsrc/css/phui/phui-image-mask.css' => 'a8498f9c',
     'rsrc/css/phui/phui-info-view.css' => 'e1b4ec37',
     'rsrc/css/phui/phui-invisible-character-view.css' => '6993d9f0',
-    'rsrc/css/phui/phui-left-right.css' => 'f60c67e7',
+    'rsrc/css/phui/phui-left-right.css' => '75227a4d',
     'rsrc/css/phui/phui-lightbox.css' => '0a035e40',
     'rsrc/css/phui/phui-list.css' => '38f8c9bd',
     'rsrc/css/phui/phui-object-box.css' => '9cff003c',
@@ -570,7 +570,7 @@ return array(
     'differential-revision-history-css' => '0e8eb855',
     'differential-revision-list-css' => 'f3c47d33',
     'differential-table-of-contents-css' => 'ae4b7a55',
-    'diffusion-css' => '58e0704b',
+    'diffusion-css' => 'ceacf994',
     'diffusion-icons-css' => '0c15255e',
     'diffusion-readme-css' => '419dd5b6',
     'diffusion-repository-css' => 'ee6f20ec',
@@ -854,7 +854,7 @@ return array(
     'phui-info-view-css' => 'e1b4ec37',
     'phui-inline-comment-view-css' => '65ae3bc2',
     'phui-invisible-character-view-css' => '6993d9f0',
-    'phui-left-right-css' => 'f60c67e7',
+    'phui-left-right-css' => '75227a4d',
     'phui-lightbox-css' => '0a035e40',
     'phui-list-view-css' => '38f8c9bd',
     'phui-object-box-css' => '9cff003c',
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 346891cfb2..9ab7f194bf 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -5,6 +5,7 @@ final class DiffusionBrowseController extends DiffusionController {
   private $lintCommit;
   private $lintMessages;
   private $coverage;
+  private $corpusButtons = array();
 
   public function shouldAllowPublic() {
     return true;
@@ -240,50 +241,47 @@ final class DiffusionBrowseController extends DiffusionController {
     require_celerity_resource('diffusion-source-css');
 
     // Render the page.
-    $curtain = $this->buildCurtain($drequest, $show_blame, $show_editor);
-    $properties = $this->buildPropertyView($drequest);
+    $bar = $this->buildButtonBar($drequest, $show_blame, $show_editor);
     $header = $this->buildHeaderView($drequest);
     $header->setHeaderIcon('fa-file-code-o');
 
-    $content = array();
-
     $follow  = $request->getStr('follow');
+    $follow_notice = null;
     if ($follow) {
-      $notice = new PHUIInfoView();
-      $notice->setSeverity(PHUIInfoView::SEVERITY_WARNING);
-      $notice->setTitle(pht('Unable to Continue'));
+      $follow_notice = id(new PHUIInfoView())
+        ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
+        ->setTitle(pht('Unable to Continue'));
       switch ($follow) {
         case 'first':
-          $notice->appendChild(
+          $follow_notice->appendChild(
             pht(
               'Unable to continue tracing the history of this file because '.
               'this commit is the first commit in the repository.'));
           break;
         case 'created':
-          $notice->appendChild(
+          $follow_notice->appendChild(
             pht(
               'Unable to continue tracing the history of this file because '.
               'this commit created the file.'));
           break;
       }
-      $content[] = $notice;
     }
 
     $renamed = $request->getStr('renamed');
+    $renamed_notice = null;
     if ($renamed) {
-      $notice = new PHUIInfoView();
-      $notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
-      $notice->setTitle(pht('File Renamed'));
-      $notice->appendChild(
-        pht(
-          'File history passes through a rename from "%s" to "%s".',
-          $drequest->getPath(),
-          $renamed));
-      $content[] = $notice;
+      $renamed_notice = id(new PHUIInfoView())
+        ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
+        ->setTitle(pht('File Renamed'))
+        ->appendChild(
+          pht(
+            'File history passes through a rename from "%s" to "%s".',
+            $drequest->getPath(),
+            $renamed));
     }
 
-    $content[] = $corpus;
-    $content[] = $this->buildOpenRevisions();
+    $open_revisions = $this->buildOpenRevisions();
+    $owners_list = $this->buildOwnersList($drequest);
 
     $crumbs = $this->buildCrumbs(
       array(
@@ -295,18 +293,19 @@ final class DiffusionBrowseController extends DiffusionController {
 
     $basename = basename($this->getDiffusionRequest()->getPath());
     $tabs = $this->buildTabsView('code');
+    $bar->setRight($this->corpusButtons);
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->setTabs($tabs)
-      ->setCurtain($curtain)
-      ->setMainColumn(array(
-        $content,
-        ));
-
-    if ($properties) {
-      $view->addPropertySection(pht('Details'), $properties);
-    }
+      ->setFooter(array(
+        $bar,
+        $follow_notice,
+        $renamed_notice,
+        $corpus,
+        $open_revisions,
+        $owners_list,
+      ));
 
     $title = array($basename, $repository->getDisplayName());
 
@@ -330,7 +329,7 @@ final class DiffusionBrowseController extends DiffusionController {
 
     $reason = $results->getReasonForEmptyResultSet();
 
-    $actions = $this->getActions($drequest);
+    $this->buildActionButtons($drequest, true);
     $details = $this->buildPropertyView($drequest);
 
     $header = $this->buildHeaderView($drequest);
@@ -366,7 +365,7 @@ final class DiffusionBrowseController extends DiffusionController {
 
       $title = nonempty(basename($drequest->getPath()), '/');
       $icon = 'fa-folder-open';
-      $browse_header = $this->buildPanelHeaderView($title, $icon, $actions);
+      $browse_header = $this->buildPanelHeaderView($title, $icon);
 
       $browse_panel = id(new PHUIObjectBoxView())
         ->setHeader($browse_header)
@@ -393,16 +392,22 @@ final class DiffusionBrowseController extends DiffusionController {
 
     $crumbs->setBorder(true);
     $tabs = $this->buildTabsView('code');
+    $owners_list = $this->buildOwnersList($drequest);
+    $bar = id(new PHUILeftRightView())
+      ->setRight($this->corpusButtons)
+      ->addClass('diffusion-action-bar');
 
     $view = id(new PHUITwoColumnView())
       ->setHeader($header)
       ->setTabs($tabs)
       ->setFooter(
         array(
+          $bar,
           $branch_panel,
           $empty_result,
           $browse_panel,
           $open_revisions,
+          $owners_list,
           $readme,
         ));
 
@@ -637,14 +642,13 @@ final class DiffusionBrowseController extends DiffusionController {
 
     Javelin::initBehavior('load-blame', array('id' => $id));
 
-    $file = $this->renderFileButton();
+    $this->corpusButtons[] = $this->renderFileButton();
     $title = basename($this->getDiffusionRequest()->getPath());
     $icon = 'fa-file-code-o';
     $drequest = $this->getDiffusionRequest();
-    $actions = $this->getActions($drequest);
+    $this->buildActionButtons($drequest);
 
-    $header = $this->buildPanelHeaderView($title, $icon, $actions);
-    $header->addActionLink($file);
+    $header = $this->buildPanelHeaderView($title, $icon);
 
     $corpus = id(new PHUIObjectBoxView())
       ->setHeader($header)
@@ -683,12 +687,11 @@ final class DiffusionBrowseController extends DiffusionController {
     return $corpus;
   }
 
-  private function buildCurtain(
+  private function buildButtonBar(
     DiffusionRequest $drequest,
     $show_blame,
     $show_editor) {
 
-    $curtain = $this->newCurtainView($drequest);
     $viewer = $this->getViewer();
     $base_uri = $this->getRequest()->getRequestURI();
 
@@ -696,19 +699,21 @@ final class DiffusionBrowseController extends DiffusionController {
     $repository = $drequest->getRepository();
     $path = $drequest->getPath();
     $line = nonempty((int)$drequest->getLine(), 1);
+    $buttons = array();
 
     $editor_link = $user->loadEditorLink($path, $line, $repository);
     $template = $user->loadEditorLink($path, '%l', $repository);
 
-    $curtain->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Show Last Change'))
+    $buttons[] =
+      id(new PHUIButtonView())
+        ->setText(pht('Last Change'))
+        ->setColor(PHUIButtonView::GREY)
         ->setHref(
           $drequest->generateURI(
             array(
               'action' => 'change',
             )))
-        ->setIcon('fa-backward'));
+        ->setIcon('fa-backward');
 
     if ($show_blame) {
       $blame_text = pht('Disable Blame');
@@ -720,48 +725,76 @@ final class DiffusionBrowseController extends DiffusionController {
       $blame_value = 1;
     }
 
-    $curtain->addAction(
-      id(new PhabricatorActionView())
-        ->setName($blame_text)
-        ->setHref($base_uri->alter('blame', $blame_value))
-        ->setIcon($blame_icon)
-        ->setUser($viewer)
-        ->setRenderAsForm($viewer->isLoggedIn()));
+    $blame = id(new PHUIButtonView())
+      ->setText($blame_text)
+      ->setIcon($blame_icon)
+      ->setUser($viewer)
+      ->setColor(PHUIButtonView::GREY);
 
-    $curtain->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Open in Editor'))
-        ->setHref($editor_link)
-        ->setIcon('fa-pencil')
-        ->setID('editor_link')
-        ->setMetadata(array('link_template' => $template))
-        ->setDisabled(!$editor_link));
+    if ($viewer->isLoggedIn()) {
+      $blame = phabricator_form(
+        $viewer,
+        array(
+          'action' => $base_uri->alter('blame', $blame_value),
+          'method' => 'POST',
+          'style' => 'display: inline-block;',
+        ),
+        $blame);
+    } else {
+      $blame->setTag('a');
+      $blame->setHref($base_uri->alter('blame', $blame_value));
+    }
+    $buttons[] = $blame;
+
+    if ($editor_link) {
+      $buttons[] =
+        id(new PHUIButtonView())
+          ->setTag('a')
+          ->setText(pht('Open File'))
+          ->setHref($editor_link)
+          ->setIcon('fa-pencil')
+          ->setID('editor_link')
+          ->setMetadata(array('link_template' => $template))
+          ->setDisabled(!$editor_link)
+          ->setColor(PHUIButtonView::GREY);
+    }
 
     $href = null;
+    $show_lint = true;
     if ($this->getRequest()->getStr('lint') !== null) {
-      $lint_text = pht('Hide %d Lint Message(s)', count($this->lintMessages));
+      $lint_text = pht('Hide Lint');
       $href = $base_uri->alter('lint', null);
 
     } else if ($this->lintCommit === null) {
-      $lint_text = pht('Lint not Available');
+      $show_lint = false;
     } else {
-      $lint_text = pht(
-        'Show %d Lint Message(s)',
-        count($this->lintMessages));
+      $lint_text = pht('Show Lint');
       $href = $this->getDiffusionRequest()->generateURI(array(
         'action' => 'browse',
         'commit' => $this->lintCommit,
       ))->alter('lint', '');
     }
 
-    $curtain->addAction(
-      id(new PhabricatorActionView())
-        ->setName($lint_text)
-        ->setHref($href)
-        ->setIcon('fa-exclamation-triangle')
-        ->setDisabled(!$href));
+    if ($show_lint) {
+      $buttons[] =
+        id(new PHUIButtonView())
+          ->setTag('a')
+          ->setText($lint_text)
+          ->setHref($href)
+          ->setIcon('fa-exclamation-triangle')
+          ->setDisabled(!$href)
+          ->setColor(PHUIButtonView::GREY);
+    }
 
+    $bar = id(new PHUILeftRightView())
+      ->setLeft($buttons)
+      ->addClass('diffusion-action-bar full-mobile-buttons');
+    return $bar;
+  }
 
+  private function buildOwnersList(DiffusionRequest $drequest) {
+
+    $viewer = $this->getViewer();
     $repository = $drequest->getRepository();
 
     $owners = 'PhabricatorOwnersApplication';
@@ -781,30 +814,54 @@ final class DiffusionBrowseController extends DiffusionController {
         $repository->getPHID(),
         $drequest->getPath());
 
+      $ownership = id(new PHUIObjectItemListView())
+        ->setUser($viewer)
+        ->setNoDataString(pht('No Owners'));
+
       if ($packages) {
-        $ownership = id(new PHUIStatusListView())
-          ->setUser($viewer);
-
         foreach ($packages as $package) {
-          $icon = 'fa-list-alt';
-          $color = 'grey';
+          $item = id(new PHUIObjectItemView())
+            ->setObject($package)
+            ->setObjectName($package->getMonogram())
+            ->setHeader($package->getName())
+            ->setHref($package->getURI());
 
-          $item = id(new PHUIStatusItemView())
-            ->setIcon($icon, $color)
-            ->setTarget($viewer->renderHandle($package->getPHID()));
+          $owners = $package->getOwners();
+          if ($owners) {
+            $owner_list = $viewer->renderHandleList(
+              mpull($owners, 'getUserPHID'));
+          } else {
+            $owner_list = phutil_tag('em', array(), pht('None'));
+          }
+          $item->addAttribute(pht('Owners: %s', $owner_list));
+
+          $auto = $package->getAutoReview();
+          $autoreview_map = PhabricatorOwnersPackage::getAutoreviewOptionsMap();
+          $spec = idx($autoreview_map, $auto, array());
+          $name = idx($spec, 'name', $auto);
+          $item->addIcon('fa-code', $name);
+
+          if ($package->getAuditingEnabled()) {
+            $item->addIcon('fa-check', pht('Auditing Enabled'));
+          } else {
+            $item->addIcon('fa-ban', pht('No Auditing'));
+          }
+
+          if ($package->isArchived()) {
+            $item->setDisabled(true);
+          }
 
           $ownership->addItem($item);
         }
-      } else {
-        $ownership = phutil_tag('em', array(), pht('None'));
       }
 
-      $curtain->newPanel()
-        ->setHeaderText(pht('Owners'))
-        ->appendChild($ownership);
+      $view = id(new PHUIObjectBoxView())
+        ->setHeaderText(pht('Owner Packages'))
+        ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+        ->setObjectList($ownership);
     }
 
-    return $curtain;
+    return $view;
   }
 
   private function renderFileButton($file_uri = null, $label = null) {
@@ -812,11 +869,11 @@ final class DiffusionBrowseController extends DiffusionController {
     $base_uri = $this->getRequest()->getRequestURI();
 
     if ($file_uri) {
-      $text = pht('Download Raw');
+      $text = pht('Download File');
       $href = $file_uri;
       $icon = 'fa-download';
     } else {
-      $text = pht('View Raw');
+      $text = pht('Raw File');
       $href = $base_uri->alter('view', 'raw');
       $icon = 'fa-file-text';
     }
@@ -829,7 +886,8 @@ final class DiffusionBrowseController extends DiffusionController {
       ->setTag('a')
       ->setText($text)
       ->setHref($href)
-      ->setIcon($icon);
+      ->setIcon($icon)
+      ->setColor(PHUIButtonView::GREY);
 
     return $button;
   }
@@ -1258,13 +1316,12 @@ final class DiffusionBrowseController extends DiffusionController {
           'src' => $file_uri,
         )));
 
-    $file = $this->renderFileButton($file_uri);
+    $this->corpusButtons[] = $this->renderFileButton($file_uri);
     $title = basename($this->getDiffusionRequest()->getPath());
     $icon = 'fa-file-image-o';
     $drequest = $this->getDiffusionRequest();
-    $actions = $this->getActions($drequest);
-    $header = $this->buildPanelHeaderView($title, $icon, $actions);
-    $header->addActionLink($file);
+    $this->buildActionButtons($drequest);
+    $header = $this->buildPanelHeaderView($title, $icon);
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
@@ -1279,13 +1336,12 @@ final class DiffusionBrowseController extends DiffusionController {
       ->addPadding(PHUI::PADDING_LARGE)
       ->appendChild($text);
 
-    $file = $this->renderFileButton($file_uri);
+    $this->corpusButtons[] = $this->renderFileButton($file_uri);
     $title = basename($this->getDiffusionRequest()->getPath());
     $icon = 'fa-file';
     $drequest = $this->getDiffusionRequest();
-    $actions = $this->getActions($drequest);
-    $header = $this->buildPanelHeaderView($title, $icon, $actions);
-    $header->addActionLink($file);
+    $this->buildActionButtons($drequest);
+    $header = $this->buildPanelHeaderView($title, $icon);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
@@ -1520,23 +1576,21 @@ final class DiffusionBrowseController extends DiffusionController {
     return $header;
   }
 
-  protected function buildPanelHeaderView($title, $icon, array $actions) {
+  protected function buildPanelHeaderView($title, $icon) {
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setHeaderIcon($icon)
       ->addClass('diffusion-panel-header-view');
 
-    foreach ($actions as $action_link) {
-      if ($action_link) {
-        $header->addActionLink($action_link);
-      }
-    }
     return $header;
 
   }
 
-  protected function getActions(DiffusionRequest $drequest) {
+  protected function buildActionButtons(
+    DiffusionRequest $drequest,
+    $is_directory = false) {
+
     $viewer = $this->getViewer();
     $repository = $drequest->getRepository();
     $history_uri = $drequest->generateURI(array('action' => 'history'));
@@ -1548,7 +1602,7 @@ final class DiffusionBrowseController extends DiffusionController {
         'action' => 'browse',
       ));
 
-    if ($repository->supportsBranchComparison()) {
+    if ($repository->supportsBranchComparison() && $is_directory) {
       $compare_uri = $drequest->generateURI(array('action' => 'compare'));
       $compare = id(new PHUIButtonView())
         ->setText(pht('Compare'))
@@ -1557,6 +1611,7 @@ final class DiffusionBrowseController extends DiffusionController {
         ->setTag('a')
         ->setHref($compare_uri)
         ->setColor(PHUIButtonView::GREY);
+      $this->corpusButtons[] = $compare;
     }
 
     $head = null;
@@ -1566,6 +1621,7 @@ final class DiffusionBrowseController extends DiffusionController {
         ->setHref($head_uri)
         ->setIcon('fa-home')
         ->setColor(PHUIButtonView::GREY);
+      $this->corpusButtons[] = $head;
     }
 
     $history = id(new PHUIButtonView())
@@ -1574,8 +1630,8 @@ final class DiffusionBrowseController extends DiffusionController {
       ->setTag('a')
       ->setIcon('fa-history')
       ->setColor(PHUIButtonView::GREY);
+    $this->corpusButtons[] = $history;
 
-    return array($history, $compare, $head);
   }
 
   protected function buildPropertyView(
@@ -1779,8 +1835,8 @@ final class DiffusionBrowseController extends DiffusionController {
     $title = basename($this->getDiffusionRequest()->getPath());
     $icon = 'fa-archive';
     $drequest = $this->getDiffusionRequest();
-    $actions = $this->getActions($drequest);
-    $header = $this->buildPanelHeaderView($title, $icon, $actions);
+    $this->buildActionButtons($drequest);
+    $header = $this->buildPanelHeaderView($title, $icon);
 
     $severity = PHUIInfoView::SEVERITY_NOTICE;
 
@@ -1792,14 +1848,13 @@ final class DiffusionBrowseController extends DiffusionController {
     try {
       $file = $this->loadGitLFSFile($ref);
       $data = $this->renderGitLFSButton();
-      $header->addActionLink($data);
     } catch (Exception $ex) {
       $severity = PHUIInfoView::SEVERITY_ERROR;
       $messages[] = pht('The data for this file could not be loaded.');
     }
 
-    $raw = $this->renderFileButton(null, pht('View Raw LFS Pointer'));
-    $header->addActionLink($raw);
+    $this->corpusButtons[] = $this->renderFileButton(
+      null, pht('View Raw LFS Pointer'));
 
     $corpus = id(new PHUIObjectBoxView())
       ->setHeader($header)
diff --git a/webroot/rsrc/css/application/diffusion/diffusion.css b/webroot/rsrc/css/application/diffusion/diffusion.css
index 7625e9fb88..2f7754f9f8 100644
--- a/webroot/rsrc/css/application/diffusion/diffusion.css
+++ b/webroot/rsrc/css/application/diffusion/diffusion.css
@@ -43,6 +43,16 @@
   margin-left: 8px;
 }
 
+.device-phone .full-mobile-buttons.diffusion-action-bar .phui-lr-container
+  .phui-left-view {
+    display: inline-block;
+}
+
+.device-phone .full-mobile-buttons.diffusion-action-bar .phui-lr-container
+  .phui-right-view {
+    display: inline-block;
+}
+
 .diffusion-profile-locate .phui-form-view {
   margin: 0;
   padding: 0;
diff --git a/webroot/rsrc/css/phui/phui-left-right.css b/webroot/rsrc/css/phui/phui-left-right.css
index 2d260758b4..ac092cd226 100644
--- a/webroot/rsrc/css/phui/phui-left-right.css
+++ b/webroot/rsrc/css/phui/phui-left-right.css
@@ -21,6 +21,14 @@
   text-align: right;
 }
 
+.phui-left-view .button {
+  margin-right: 8px;
+}
+
+.phui-right-view .button {
+  margin-left: 8px;
+}
+
 .phui-lr-view-top .phui-left-view,
 .phui-lr-view-top .phui-right-view {
   vertical-align: top;

From 39d19c33ec9c5819ab4330e8ac203ef1a06db723 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Fri, 18 Aug 2017 09:19:31 -0700
Subject: [PATCH 44/46] Redirect users back to where they added an SSH Key

Summary: Ref T12964. This feels like a cheat, but works well. Just redirect the user back to the form they came from instead of to the key page.

Test Plan: Add a key to a user profile, add a key to an Alamanac device. Grep for PhabricatorAuthSSHKeyTableView and check all locations.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12964

Differential Revision: https://secure.phabricator.com/D18445
---
 .../auth/controller/PhabricatorAuthSSHKeyEditController.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/auth/controller/PhabricatorAuthSSHKeyEditController.php b/src/applications/auth/controller/PhabricatorAuthSSHKeyEditController.php
index 1023b0cd75..6dfc957f48 100644
--- a/src/applications/auth/controller/PhabricatorAuthSSHKeyEditController.php
+++ b/src/applications/auth/controller/PhabricatorAuthSSHKeyEditController.php
@@ -93,7 +93,7 @@ final class PhabricatorAuthSSHKeyEditController
 
       try {
         $editor->applyTransactions($key, $xactions);
-        return id(new AphrontRedirectResponse())->setURI($key->getURI());
+        return id(new AphrontRedirectResponse())->setURI($cancel_uri);
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
         $validation_exception = $ex;
         $e_name = $ex->getShortMessage($type_name);

From e40c002a6dfedf87e77cd284fa8089b4fbb53c06 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Sun, 20 Aug 2017 15:05:28 -0700
Subject: [PATCH 45/46] Add a basic view count to Phame

Summary: This adds a very very basic view count to Phame, so bloggers can get some idea which posts are more popular than others. Anything more than this I think should be Facts or Google Analytics.

Test Plan: Write a new post, see post count. Reload page, post count goes up. Archive post, post count stays the same.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18446
---
 .../20170820.phame.01.post.views.sql          |  2 ++
 .../20170820.phame.02.post.views.sql          |  2 ++
 src/__phutil_library_map__.php                |  2 ++
 .../post/PhamePostViewController.php          | 24 +++++++++++++++++++
 .../phame/editor/PhamePostEditor.php          |  6 +++++
 src/applications/phame/storage/PhamePost.php  |  5 +++-
 .../xaction/PhamePostViewsTransaction.php     | 18 ++++++++++++++
 7 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 resources/sql/autopatches/20170820.phame.01.post.views.sql
 create mode 100644 resources/sql/autopatches/20170820.phame.02.post.views.sql
 create mode 100644 src/applications/phame/xaction/PhamePostViewsTransaction.php

diff --git a/resources/sql/autopatches/20170820.phame.01.post.views.sql b/resources/sql/autopatches/20170820.phame.01.post.views.sql
new file mode 100644
index 0000000000..f5f72294f6
--- /dev/null
+++ b/resources/sql/autopatches/20170820.phame.01.post.views.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_phame.phame_post
+  ADD views INTEGER NOT NULL;
diff --git a/resources/sql/autopatches/20170820.phame.02.post.views.sql b/resources/sql/autopatches/20170820.phame.02.post.views.sql
new file mode 100644
index 0000000000..00b9b29203
--- /dev/null
+++ b/resources/sql/autopatches/20170820.phame.02.post.views.sql
@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_phame.phame_post
+  SET views = 0;
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 5d8d7c3543..070f56d5c8 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4417,6 +4417,7 @@ phutil_register_library_map(array(
     'PhamePostTransactionQuery' => 'applications/phame/query/PhamePostTransactionQuery.php',
     'PhamePostTransactionType' => 'applications/phame/xaction/PhamePostTransactionType.php',
     'PhamePostViewController' => 'applications/phame/controller/post/PhamePostViewController.php',
+    'PhamePostViewsTransaction' => 'applications/phame/xaction/PhamePostViewsTransaction.php',
     'PhamePostVisibilityTransaction' => 'applications/phame/xaction/PhamePostVisibilityTransaction.php',
     'PhameSchemaSpec' => 'applications/phame/storage/PhameSchemaSpec.php',
     'PhameSite' => 'applications/phame/site/PhameSite.php',
@@ -10041,6 +10042,7 @@ phutil_register_library_map(array(
     'PhamePostTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhamePostTransactionType' => 'PhabricatorModularTransactionType',
     'PhamePostViewController' => 'PhameLiveController',
+    'PhamePostViewsTransaction' => 'PhamePostTransactionType',
     'PhamePostVisibilityTransaction' => 'PhamePostTransactionType',
     'PhameSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'PhameSite' => 'PhabricatorSite',
diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
index 63adedb7ae..7dbaddc17a 100644
--- a/src/applications/phame/controller/post/PhamePostViewController.php
+++ b/src/applications/phame/controller/post/PhamePostViewController.php
@@ -18,6 +18,25 @@ final class PhamePostViewController
     $is_live = $this->getIsLive();
     $is_external = $this->getIsExternal();
 
+    // Register a blog "view" count
+    //
+    if (!$post->isDraft() && !$post->isArchived()) {
+      $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+      $xactions = array();
+      $xactions[] = id(new PhamePostTransaction())
+        ->setTransactionType(PhamePostViewsTransaction::TRANSACTIONTYPE)
+        ->setNewValue(null);
+
+      $editor = id(new PhamePostEditor())
+        ->setActor($viewer)
+        ->setContentSourceFromRequest($request)
+        ->setContinueOnMissingFields(true)
+        ->setContinueOnNoEffect(true);
+
+      $editor->applyTransactions($post, $xactions);
+      unset($unguarded);
+    }
+
     $header = id(new PHUIHeaderView())
       ->addClass('phame-header-bar')
       ->setUser($viewer);
@@ -151,6 +170,11 @@ final class PhamePostViewController
       ->setUser($viewer)
       ->setObject($post);
 
+    $views = id(new PhutilNumber($post->getViews()));
+    $properties->addProperty(
+      pht('Views'),
+      pht('%s', $views));
+
     $is_live = $this->getIsLive();
     $is_external = $this->getIsExternal();
     $next_view = new PhameNextPostView();
diff --git a/src/applications/phame/editor/PhamePostEditor.php b/src/applications/phame/editor/PhamePostEditor.php
index 488d7a4938..845538dc12 100644
--- a/src/applications/phame/editor/PhamePostEditor.php
+++ b/src/applications/phame/editor/PhamePostEditor.php
@@ -41,6 +41,12 @@ final class PhamePostEditor
     if ($object->isDraft() || $object->isArchived()) {
       return false;
     }
+    foreach ($xactions as $xaction) {
+      switch ($xaction->getTransactionType()) {
+        case PhamePostViewsTransaction::TRANSACTIONTYPE:
+        return false;
+      }
+    }
     return true;
   }
 
diff --git a/src/applications/phame/storage/PhamePost.php b/src/applications/phame/storage/PhamePost.php
index a9525e0be7..c3ec4d4608 100644
--- a/src/applications/phame/storage/PhamePost.php
+++ b/src/applications/phame/storage/PhamePost.php
@@ -22,6 +22,7 @@ final class PhamePost extends PhameDAO
   protected $phameTitle;
   protected $body;
   protected $visibility;
+  protected $views;
   protected $configData;
   protected $datePublished;
   protected $blogPHID;
@@ -40,7 +41,8 @@ final class PhamePost extends PhameDAO
       ->setBlogPHID($blog->getPHID())
       ->attachBlog($blog)
       ->setDatePublished(PhabricatorTime::getNow())
-      ->setVisibility(PhameConstants::VISIBILITY_PUBLISHED);
+      ->setVisibility(PhameConstants::VISIBILITY_PUBLISHED)
+      ->setViews(0);
 
     return $post;
   }
@@ -128,6 +130,7 @@ final class PhamePost extends PhameDAO
         'subtitle' => 'text64',
         'phameTitle' => 'sort64?',
         'visibility' => 'uint32',
+        'views' => 'uint32',
         'mailKey' => 'bytes20',
         'headerImagePHID' => 'phid?',
 
diff --git a/src/applications/phame/xaction/PhamePostViewsTransaction.php b/src/applications/phame/xaction/PhamePostViewsTransaction.php
new file mode 100644
index 0000000000..2260a1d752
--- /dev/null
+++ b/src/applications/phame/xaction/PhamePostViewsTransaction.php
@@ -0,0 +1,18 @@
+<?php
+
+final class PhamePostViewsTransaction
+  extends PhamePostTransactionType {
+
+  const TRANSACTIONTYPE = 'phame.post.views';
+
+  public function generateOldValue($object) {
+    return $object->getViews();
+  }
+
+  public function applyInternalEffects($object, $value) {
+    $views = $object->getViews();
+    $views++;
+    $object->setViews($views);
+  }
+
+}

From df21391b8e7b23de4fe18193b19b5b252da3efd1 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 21 Aug 2017 14:04:08 -0700
Subject: [PATCH 46/46] When "apcu_clear_cache()" exists, prefer it as a cache
 clear callback over "apc_clear_cache()"

Summary:
See PHI36. APCu originally had `apc_` methods, but at some point dropped these and only provides `apcu_` methods.

When the `apcu_` method is present, use it. It may not be present for older versions of APCu, so keep the fallback.

Test Plan:
  - With modern APCu, clicked "Purge Caches" in Config > Caches.
  - Before: fatal on bad `apc_clear_caches` call.
  - After: Valid cache clear.

Reviewers: chad

Reviewed By: chad

Differential Revision: https://secure.phabricator.com/D18449
---
 src/applications/cache/spec/PhabricatorDataCacheSpec.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/applications/cache/spec/PhabricatorDataCacheSpec.php b/src/applications/cache/spec/PhabricatorDataCacheSpec.php
index 482af00d00..bf6a495f7f 100644
--- a/src/applications/cache/spec/PhabricatorDataCacheSpec.php
+++ b/src/applications/cache/spec/PhabricatorDataCacheSpec.php
@@ -50,9 +50,15 @@ final class PhabricatorDataCacheSpec extends PhabricatorCacheSpec {
       ->setVersion(phpversion('apcu'));
 
     if (ini_get('apc.enabled')) {
+      if (function_exists('apcu_clear_cache')) {
+        $clear_callback = 'apcu_clear_cache';
+      } else {
+        $clear_callback = 'apc_clear_cache';
+      }
+
       $this
         ->setIsEnabled(true)
-        ->setClearCacheCallback('apc_clear_cache');
+        ->setClearCacheCallback($clear_callback);
       $this->initAPCCommonSpec();
     } else {
       $this->setIsEnabled(false);