(stable) Promote 2015 Week 41

.gitignore

@@ -34,3 +34,7 @@
 
 # NPM local packages
 /support/aphlict/server/node_modules/
+
+# Places for users to add custom resources.
+/resources/cows/custom/*
+/resources/figlet/custom/*

resources/celerity/map.php

@@ -13,7 +13,7 @@ return array(
     'differential.pkg.css' => '2de124c9',
     'differential.pkg.js' => '6223dd9d',
     'diffusion.pkg.css' => 'f45955ed',
-    'diffusion.pkg.js' => '0115b37c',
+    'diffusion.pkg.js' => 'ca1c8b5a',
     'maniphest.pkg.css' => '4845691a',
     'maniphest.pkg.js' => '3ec6a6d5',
     'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
@@ -371,7 +371,7 @@ return array(
     'rsrc/js/application/diffusion/behavior-jump-to.js' => '73d09eef',
     'rsrc/js/application/diffusion/behavior-load-blame.js' => '42126667',
     'rsrc/js/application/diffusion/behavior-locate-file.js' => '6d3e1947',
-    'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => '2b228192',
+    'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => 'e5822781',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8ef9ab58',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
@@ -574,7 +574,7 @@ return array(
     'javelin-behavior-diffusion-commit-graph' => '9007c197',
     'javelin-behavior-diffusion-jump-to' => '73d09eef',
     'javelin-behavior-diffusion-locate-file' => '6d3e1947',
-    'javelin-behavior-diffusion-pull-lastmodified' => '2b228192',
+    'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
     'javelin-behavior-doorkeeper-tag' => 'e5822781',
     'javelin-behavior-durable-column' => 'c72aa091',
     'javelin-behavior-error-log' => '6882e80a',
@@ -998,13 +998,6 @@ return array(
       'javelin-install',
       'javelin-util',
     ),
-    '2b228192' => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-util',
-      'javelin-workflow',
-      'javelin-json',
-    ),
     '2b8de964' => array(
       'javelin-install',
       'javelin-util',
@@ -1939,6 +1932,13 @@ return array(
       'javelin-install',
       'javelin-util',
     ),
+    'f01586dc' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-util',
+      'javelin-workflow',
+      'javelin-json',
+    ),
     'f24a53cb' => array(
       'phui-fontkit-css',
     ),

src/__phutil_library_map__.php

@@ -1011,6 +1011,7 @@ phutil_register_library_map(array(
     'HarbormasterController' => 'applications/harbormaster/controller/HarbormasterController.php',
     'HarbormasterCreateArtifactConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterCreateArtifactConduitAPIMethod.php',
     'HarbormasterDAO' => 'applications/harbormaster/storage/HarbormasterDAO.php',
+    'HarbormasterDrydockBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php',
     'HarbormasterDrydockCommandBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterDrydockCommandBuildStepImplementation.php',
     'HarbormasterDrydockLeaseArtifact' => 'applications/harbormaster/artifact/HarbormasterDrydockLeaseArtifact.php',
     'HarbormasterExecFuture' => 'applications/harbormaster/future/HarbormasterExecFuture.php',
@@ -4813,6 +4814,7 @@ phutil_register_library_map(array(
     'HarbormasterController' => 'PhabricatorController',
     'HarbormasterCreateArtifactConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
     'HarbormasterDAO' => 'PhabricatorLiskDAO',
+    'HarbormasterDrydockBuildStepGroup' => 'HarbormasterBuildStepGroup',
     'HarbormasterDrydockCommandBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterDrydockLeaseArtifact' => 'HarbormasterArtifact',
     'HarbormasterExecFuture' => 'Future',

src/applications/diffusion/controller/DiffusionLastModifiedController.php

@@ -98,12 +98,10 @@ final class DiffusionLastModifiedController extends DiffusionController {
       $modified = DiffusionView::linkCommit(
         $drequest->getRepository(),
         $commit->getCommitIdentifier());
-      $date = phabricator_date($epoch, $viewer);
+      $date = phabricator_datetime($epoch, $viewer);
-      $time = phabricator_time($epoch, $viewer);
     } else {
       $modified = '';
       $date = '';
-      $time = '';
     }
 
     $data = $commit->getCommitData();
@@ -137,7 +135,6 @@ final class DiffusionLastModifiedController extends DiffusionController {
     $return = array(
       'commit'    => $modified,
       'date'      => $date,
-      'time'      => $time,
       'author'    => $author,
       'details'   => $details,
     );

src/applications/diffusion/view/DiffusionBranchTableView.php

@@ -21,6 +21,11 @@ final class DiffusionBranchTableView extends DiffusionView {
     $drequest = $this->getDiffusionRequest();
     $current_branch = $drequest->getBranch();
     $repository = $drequest->getRepository();
+    $commits = $this->commits;
+    $viewer = $this->getUser();
+
+    $buildables = $this->loadBuildables($commits);
+    $have_builds = false;
 
     $can_close_branches = ($repository->isHg());
 
@@ -31,13 +36,21 @@ final class DiffusionBranchTableView extends DiffusionView {
     $rows = array();
     $rowc = array();
     foreach ($this->branches as $branch) {
-      $commit = idx($this->commits, $branch->getCommitIdentifier());
+      $commit = idx($commits, $branch->getCommitIdentifier());
       if ($commit) {
         $details = $commit->getSummary();
-        $datetime = phabricator_datetime($commit->getEpoch(), $this->user);
+        $datetime = phabricator_datetime($commit->getEpoch(), $viewer);
+        $buildable = idx($buildables, $commit->getPHID());
+        if ($buildable) {
+          $build_status = $this->renderBuildable($buildable);
+          $have_builds = true;
+        } else {
+          $build_status = null;
+        }
       } else {
         $datetime = null;
         $details = null;
+        $build_status = null;
       }
 
       switch ($repository->shouldSkipAutocloseBranch($branch->getShortName())) {
@@ -86,16 +99,7 @@ final class DiffusionBranchTableView extends DiffusionView {
       }
 
       $rows[] = array(
-        phutil_tag(
+        $this->linkBranchHistory($branch->getShortName()),
-          'a',
-          array(
-            'href' => $drequest->generateURI(
-              array(
-                'action' => 'history',
-                'branch' => $branch->getShortName(),
-              )),
-          ),
-          pht('History')),
         phutil_tag(
           'a',
           array(
@@ -109,10 +113,11 @@ final class DiffusionBranchTableView extends DiffusionView {
         self::linkCommit(
           $drequest->getRepository(),
           $branch->getCommitIdentifier()),
+        $build_status,
         $status,
+        AphrontTableView::renderSingleDisplayLine($details),
         $status_icon,
         $datetime,
-        AphrontTableView::renderSingleDisplayLine($details),
       );
       if ($branch->getShortName() == $current_branch) {
         $rowc[] = 'highlighted';
@@ -124,33 +129,37 @@ final class DiffusionBranchTableView extends DiffusionView {
     $view = new AphrontTableView($rows);
     $view->setHeaders(
       array(
-        pht('History'),
+        null,
         pht('Branch'),
         pht('Head'),
+        null,
         pht('State'),
-        pht(''),
-        pht('Modified'),
         pht('Details'),
+        null,
+        pht('Committed'),
       ));
     $view->setColumnClasses(
       array(
         '',
         'pri',
         '',
-        '',
+        'icon',
-        '',
         '',
         'wide',
+        '',
+        '',
       ));
     $view->setColumnVisibility(
       array(
         true,
         true,
         true,
+        $have_builds,
         $can_close_branches,
       ));
     $view->setRowClasses($rowc);
     return $view->render();
   }
 
+
 }

src/applications/diffusion/view/DiffusionBrowseTableView.php

@@ -31,6 +31,8 @@ final class DiffusionBrowseTableView extends DiffusionView {
     $show_edit = false;
     foreach ($this->paths as $path) {
 
+      $history_link = $this->linkHistory($path->getPath());
+
       $dir_slash = null;
       $file_type = $path->getFileType();
       if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
@@ -67,7 +69,6 @@ final class DiffusionBrowseTableView extends DiffusionView {
         'lint'      => celerity_generate_unique_node_id(),
         'commit'    => celerity_generate_unique_node_id(),
         'date'      => celerity_generate_unique_node_id(),
-        'time'      => celerity_generate_unique_node_id(),
         'author'    => celerity_generate_unique_node_id(),
         'details'   => celerity_generate_unique_node_id(),
       );
@@ -78,13 +79,13 @@ final class DiffusionBrowseTableView extends DiffusionView {
       }
 
       $rows[] = array(
+        $history_link,
         $browse_link,
         idx($dict, 'lint'),
         $dict['commit'],
         $dict['author'],
         $dict['details'],
         $dict['date'],
-        $dict['time'],
       );
     }
 
@@ -108,29 +109,29 @@ final class DiffusionBrowseTableView extends DiffusionView {
     $view = new AphrontTableView($rows);
     $view->setHeaders(
       array(
+        null,
         pht('Path'),
         ($lint ? $lint : pht('Lint')),
         pht('Modified'),
         pht('Author/Committer'),
         pht('Details'),
-        pht('Date'),
+        pht('Committed'),
-        pht('Time'),
       ));
     $view->setColumnClasses(
       array(
+        'nudgeright',
+        '',
+        '',
         '',
-        'n',
-        'n',
         '',
         'wide',
         '',
-        'right',
       ));
     $view->setColumnVisibility(
       array(
         true,
-        $show_lint,
         true,
+        $show_lint,
         true,
         true,
         true,
@@ -140,11 +141,11 @@ final class DiffusionBrowseTableView extends DiffusionView {
     $view->setDeviceVisibility(
       array(
         true,
-        false,
         true,
         false,
         true,
         false,
+        true,
         false,
       ));
 

src/applications/diffusion/view/DiffusionHistoryTableView.php

@@ -7,12 +7,10 @@ final class DiffusionHistoryTableView extends DiffusionView {
   private $handles = array();
   private $isHead;
   private $parents;
-  private $buildCache;
 
   public function setHistory(array $history) {
     assert_instances_of($history, 'DiffusionPathChange');
     $this->history = $history;
-    $this->buildCache = null;
     return $this;
   }
 
@@ -62,33 +60,14 @@ final class DiffusionHistoryTableView extends DiffusionView {
     return $this;
   }
 
-  public function loadBuildablesOnDemand() {
-    if ($this->buildCache !== null) {
-      return $this->buildCache;
-    }
-
-    $commits_to_builds = array();
-
-    $commits = mpull($this->history, 'getCommit');
-
-    $commit_phids = mpull($commits, 'getPHID');
-
-    $buildables = id(new HarbormasterBuildableQuery())
-      ->setViewer($this->getUser())
-      ->withBuildablePHIDs($commit_phids)
-      ->withManualBuildables(false)
-      ->execute();
-
-    $this->buildCache = mpull($buildables, null, 'getBuildablePHID');
-
-    return $this->buildCache;
-  }
-
   public function render() {
     $drequest = $this->getDiffusionRequest();
 
     $viewer = $this->getUser();
 
+    $buildables = $this->loadBuildables(mpull($this->history, 'getCommit'));
+    $has_any_build = false;
+
     $show_revisions = PhabricatorApplication::isClassInstalledForViewer(
       'PhabricatorDifferentialApplication',
       $viewer);
@@ -110,11 +89,9 @@ final class DiffusionHistoryTableView extends DiffusionView {
       $epoch = $history->getEpoch();
 
       if ($epoch) {
-        $date = phabricator_date($epoch, $this->user);
+        $committed = phabricator_datetime($epoch, $viewer);
-        $time = phabricator_time($epoch, $this->user);
       } else {
-        $date = null;
+        $committed = null;
-        $time = null;
       }
 
       $data = $history->getCommitData();
@@ -160,36 +137,9 @@ final class DiffusionHistoryTableView extends DiffusionView {
 
       $build = null;
       if ($show_builds) {
-        $buildable_lookup = $this->loadBuildablesOnDemand();
+        $buildable = idx($buildables, $commit->getPHID());
-        $buildable = idx($buildable_lookup, $commit->getPHID());
         if ($buildable !== null) {
-          $icon = HarbormasterBuildable::getBuildableStatusIcon(
+          $build = $this->renderBuildable($buildable);
-            $buildable->getBuildableStatus());
-          $color = HarbormasterBuildable::getBuildableStatusColor(
-            $buildable->getBuildableStatus());
-          $name = HarbormasterBuildable::getBuildableStatusName(
-            $buildable->getBuildableStatus());
-
-          $icon_view = id(new PHUIIconView())
-            ->setIconFont($icon.' '.$color);
-
-          $tooltip_view = javelin_tag(
-            'span',
-            array(
-              'sigil' => 'has-tooltip',
-              'meta' => array('tip' => $name),
-            ),
-            $icon_view);
-
-          Javelin::initBehavior('phabricator-tooltips');
-
-          $href_view = phutil_tag(
-            'a',
-            array('href' => '/'.$buildable->getMonogram()),
-            $tooltip_view);
-
-          $build = $href_view;
-
           $has_any_build = true;
         }
       }
@@ -214,8 +164,7 @@ final class DiffusionHistoryTableView extends DiffusionView {
           null),
         $author,
         $summary,
-        $date,
+        $committed,
-        $time,
       );
     }
 
@@ -226,30 +175,28 @@ final class DiffusionHistoryTableView extends DiffusionView {
         null,
         pht('Commit'),
         null,
-        pht('Revision'),
+        null,
         pht('Author/Committer'),
         pht('Details'),
-        pht('Date'),
+        pht('Committed'),
-        pht('Time'),
       ));
     $view->setColumnClasses(
       array(
         'threads',
         'nudgeright',
-        'n',
+        '',
         'icon',
-        'n',
+        '',
         '',
         'wide',
         '',
-        'right',
       ));
     $view->setColumnVisibility(
       array(
         $graph ? true : false,
         true,
         true,
-        true,
+        $has_any_build,
         $show_revisions,
       ));
     $view->setDeviceVisibility(
@@ -262,7 +209,6 @@ final class DiffusionHistoryTableView extends DiffusionView {
         false,
         true,
         false,
-        false,
       ));
     return $view->render();
   }

src/applications/diffusion/view/DiffusionTagListView.php

@@ -29,6 +29,8 @@ final class DiffusionTagListView extends DiffusionView {
     $drequest = $this->getDiffusionRequest();
     $repository = $drequest->getRepository();
 
+    $buildables = $this->loadBuildables($this->commits);
+    $has_builds = false;
 
     $rows = array();
     foreach ($this->tags as $tag) {
@@ -80,30 +82,56 @@ final class DiffusionTagListView extends DiffusionView {
         }
       }
 
+      $build = null;
+      if ($commit) {
+        $buildable = idx($buildables, $commit->getPHID());
+        if ($buildable) {
+          $build = $this->renderBuildable($buildable);
+          $has_builds = true;
+        }
+      }
+
+      $history = $this->linkTagHistory($tag->getName());
+
       $rows[] = array(
+        $history,
         $tag_link,
         $commit_link,
-        $description,
+        $build,
         $author,
+        $description,
         phabricator_datetime($tag->getEpoch(), $this->user),
       );
     }
 
-    $table = new AphrontTableView($rows);
+    $table = id(new AphrontTableView($rows))
-    $table->setHeaders(
+      ->setHeaders(
         array(
+          null,
           pht('Tag'),
           pht('Commit'),
-        pht('Description'),
+          null,
           pht('Author'),
+          pht('Description'),
           pht('Created'),
-      ));
+        ))
-    $table->setColumnClasses(
+      ->setColumnClasses(
         array(
+          'nudgeright',
           'pri',
           '',
+          '',
+          '',
           'wide',
+        ))
+      ->setColumnVisibility(
+        array(
+          true,
+          true,
+          true,
+          $has_builds,
         ));
+
     return $table->render();
   }
 

src/applications/diffusion/view/DiffusionView.php

@@ -20,6 +20,30 @@ abstract class DiffusionView extends AphrontView {
         'path'   => $path,
       ));
 
+    return $this->renderHistoryLink($href);
+  }
+
+  final public function linkBranchHistory($branch) {
+    $href = $this->getDiffusionRequest()->generateURI(
+      array(
+        'action' => 'history',
+        'branch' => $branch,
+      ));
+
+    return $this->renderHistoryLink($href);
+  }
+
+  final public function linkTagHistory($tag) {
+    $href = $this->getDiffusionRequest()->generateURI(
+      array(
+        'action' => 'history',
+        'commit' => $tag,
+      ));
+
+    return $this->renderHistoryLink($href);
+  }
+
+  private function renderHistoryLink($href) {
     return javelin_tag(
       'a',
       array(
@@ -31,7 +55,7 @@ abstract class DiffusionView extends AphrontView {
           'align' => 'E',
         ),
       ),
-      id(new PHUIIconView())->setIconFont('fa-list-ul blue'));
+      id(new PHUIIconView())->setIconFont('fa-history bluegrey'));
   }
 
   final public function linkBrowse($path, array $details = array()) {
@@ -170,4 +194,58 @@ abstract class DiffusionView extends AphrontView {
     return hsprintf('%s', $name);
   }
 
+  final protected function renderBuildable(HarbormasterBuildable $buildable) {
+    $status = $buildable->getBuildableStatus();
+
+    $icon = HarbormasterBuildable::getBuildableStatusIcon($status);
+    $color = HarbormasterBuildable::getBuildableStatusColor($status);
+    $name = HarbormasterBuildable::getBuildableStatusName($status);
+
+    $icon_view = id(new PHUIIconView())
+      ->setIconFont($icon.' '.$color);
+
+    $tooltip_view = javelin_tag(
+      'span',
+      array(
+        'sigil' => 'has-tooltip',
+        'meta' => array('tip' => $name),
+      ),
+      $icon_view);
+
+    Javelin::initBehavior('phabricator-tooltips');
+
+    return phutil_tag(
+      'a',
+      array('href' => '/'.$buildable->getMonogram()),
+      $tooltip_view);
+  }
+
+  final protected function loadBuildables(array $commits) {
+    assert_instances_of($commits, 'PhabricatorRepositoryCommit');
+
+    if (!$commits) {
+      return array();
+    }
+
+    $viewer = $this->getUser();
+
+    $harbormaster_app = 'PhabricatorHarbormasterApplication';
+    $have_harbormaster = PhabricatorApplication::isClassInstalledForViewer(
+      $harbormaster_app,
+      $viewer);
+
+    if ($have_harbormaster) {
+      $buildables = id(new HarbormasterBuildableQuery())
+        ->setViewer($viewer)
+        ->withBuildablePHIDs(mpull($commits, 'getPHID'))
+        ->withManualBuildables(false)
+        ->execute();
+      $buildables = mpull($buildables, null, 'getBuildablePHID');
+    } else {
+      $buildables = array();
+    }
+
+    return $buildables;
+  }
+
 }

src/applications/drydock/blueprint/DrydockAlmanacServiceHostBlueprintImplementation.php

@@ -262,13 +262,14 @@ final class DrydockAlmanacServiceHostBlueprintImplementation
           array(
             DrydockResourceStatus::STATUS_PENDING,
             DrydockResourceStatus::STATUS_ACTIVE,
+            DrydockResourceStatus::STATUS_BROKEN,
             DrydockResourceStatus::STATUS_RELEASED,
           ))
         ->execute();
 
       $allocated_phids = array();
       foreach ($pool as $resource) {
-        $allocated_phids[] = $resource->getAttribute('almanacDevicePHID');
+        $allocated_phids[] = $resource->getAttribute('almanacBindingPHID');
       }
       $allocated_phids = array_fuse($allocated_phids);
 

src/applications/drydock/blueprint/DrydockBlueprintImplementation.php

@@ -19,6 +19,10 @@ abstract class DrydockBlueprintImplementation extends Phobject {
     return array();
   }
 
+  public function getViewer() {
+    return PhabricatorUser::getOmnipotentUser();
+  }
+
 
 /* -(  Lease Acquisition  )-------------------------------------------------- */
 
@@ -288,7 +292,7 @@ abstract class DrydockBlueprintImplementation extends Phobject {
   }
 
   protected function newLease(DrydockBlueprint $blueprint) {
-    return id(new DrydockLease());
+    return DrydockLease::initializeNewLease();
   }
 
   protected function requireActiveLease(DrydockLease $lease) {
@@ -310,4 +314,67 @@ abstract class DrydockBlueprintImplementation extends Phobject {
     }
   }
 
+
+  /**
+   * Apply standard limits on resource allocation rate.
+   *
+   * @param DrydockBlueprint The blueprint requesting an allocation.
+   * @return bool True if further allocations should be limited.
+   */
+  protected function shouldLimitAllocatingPoolSize(
+    DrydockBlueprint $blueprint) {
+
+    // TODO: If this mechanism sticks around, these values should be
+    // configurable by the blueprint implementation.
+
+    // Limit on total number of active resources.
+    $total_limit = 1;
+
+    // Always allow at least this many allocations to be in flight at once.
+    $min_allowed = 1;
+
+    // Allow this fraction of allocating resources as a fraction of active
+    // resources.
+    $growth_factor = 0.25;
+
+    $resource = new DrydockResource();
+    $conn_r = $resource->establishConnection('r');
+
+    $counts = queryfx_all(
+      $conn_r,
+      'SELECT status, COUNT(*) N FROM %T WHERE blueprintPHID = %s',
+      $resource->getTableName(),
+      $blueprint->getPHID());
+    $counts = ipull($counts, 'N', 'status');
+
+    $n_alloc = idx($counts, DrydockResourceStatus::STATUS_PENDING, 0);
+    $n_active = idx($counts, DrydockResourceStatus::STATUS_ACTIVE, 0);
+    $n_broken = idx($counts, DrydockResourceStatus::STATUS_BROKEN, 0);
+    $n_released = idx($counts, DrydockResourceStatus::STATUS_RELEASED, 0);
+
+    // If we're at the limit on total active resources, limit additional
+    // allocations.
+    $n_total = ($n_alloc + $n_active + $n_broken + $n_released);
+    if ($n_total >= $total_limit) {
+      return true;
+    }
+
+    // If the number of in-flight allocations is fewer than the minimum number
+    // of allowed allocations, don't impose a limit.
+    if ($n_alloc < $min_allowed) {
+      return false;
+    }
+
+    $allowed_alloc = (int)ceil($n_active * $growth_factor);
+
+    // If the number of in-flight allocation is fewer than the number of
+    // allowed allocations according to the pool growth factor, don't impose
+    // a limit.
+    if ($n_alloc < $allowed_alloc) {
+      return false;
+    }
+
+    return true;
+  }
+
 }

src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php

@@ -29,6 +29,17 @@ final class DrydockWorkingCopyBlueprintImplementation
   public function canAllocateResourceForLease(
     DrydockBlueprint $blueprint,
     DrydockLease $lease) {
+    $viewer = $this->getViewer();
+
+    if ($this->shouldLimitAllocatingPoolSize($blueprint)) {
+      return false;
+    }
+
+    // TODO: If we have a pending resource which is compatible with the
+    // configuration for this lease, prevent a new allocation? Otherwise the
+    // queue can fill up with copies of requests from the same lease. But
+    // maybe we can deal with this with "pre-leasing"?
+
     return true;
   }
 
@@ -37,6 +48,12 @@ final class DrydockWorkingCopyBlueprintImplementation
     DrydockResource $resource,
     DrydockLease $lease) {
 
+    // Don't hand out leases on working copies which have not activated, since
+    // it may take an arbitrarily long time for them to acquire a host.
+    if (!$resource->isActive()) {
+      return false;
+    }
+
     $need_map = $lease->getAttribute('repositories.map');
     if (!is_array($need_map)) {
       return false;
@@ -104,8 +121,13 @@ final class DrydockWorkingCopyBlueprintImplementation
     $host_lease = $this->newLease($blueprint)
       ->setResourceType('host')
       ->setOwnerPHID($resource_phid)
-      ->setAttribute('workingcopy.resourcePHID', $resource_phid)
+      ->setAttribute('workingcopy.resourcePHID', $resource_phid);
-      ->queueForActivation();
+
+    $resource
+      ->setAttribute('host.leasePHID', $host_lease->getPHID())
+      ->save();
+
+    $host_lease->queueForActivation();
 
     // TODO: Add some limits to the number of working copies we can have at
     // once?
@@ -121,7 +143,6 @@ final class DrydockWorkingCopyBlueprintImplementation
 
     return $resource
       ->setAttribute('repositories.map', $map)
-      ->setAttribute('host.leasePHID', $host_lease->getPHID())
       ->allocateResource();
   }
 
@@ -165,7 +186,13 @@ final class DrydockWorkingCopyBlueprintImplementation
     DrydockBlueprint $blueprint,
     DrydockResource $resource) {
 
+    try {
       $lease = $this->loadHostLease($resource);
+    } catch (Exception $ex) {
+      // If we can't load the lease, assume we don't need to take any actions
+      // to destroy it.
+      return;
+    }
 
     // Destroy the lease on the host.
     $lease->releaseOnDestruction();
@@ -310,8 +337,10 @@ final class DrydockWorkingCopyBlueprintImplementation
   }
 
   private function loadRepositories(array $phids) {
+    $viewer = $this->getViewer();
+
     $repositories = id(new PhabricatorRepositoryQuery())
-      ->setViewer(PhabricatorUser::getOmnipotentUser())
+      ->setViewer($viewer)
       ->withPHIDs($phids)
       ->execute();
     $repositories = mpull($repositories, null, 'getPHID');
@@ -343,7 +372,7 @@ final class DrydockWorkingCopyBlueprintImplementation
   }
 
   private function loadHostLease(DrydockResource $resource) {
-    $viewer = PhabricatorUser::getOmnipotentUser();
+    $viewer = $this->getViewer();
 
     $lease_phid = $resource->getAttribute('host.leasePHID');
 

src/applications/drydock/logtype/DrydockLeaseWaitingForResourcesLogType.php

@@ -19,7 +19,7 @@ final class DrydockLeaseWaitingForResourcesLogType extends DrydockLogType {
 
     return pht(
       'Waiting for available resources from: %s.',
-      $viewer->renderHandleList($blueprint_phids));
+      $viewer->renderHandleList($blueprint_phids)->render());
   }
 
 }

src/applications/drydock/storage/DrydockLease.php

@@ -19,6 +19,16 @@ final class DrydockLease extends DrydockDAO
   private $activateWhenAcquired = false;
   private $slotLocks = array();
 
+  public static function initializeNewLease() {
+    $lease = new DrydockLease();
+
+    // Pregenerate a PHID so that the caller can set something up to release
+    // this lease before queueing it for activation.
+    $lease->setPHID($lease->generatePHID());
+
+    return $lease;
+  }
+
   /**
    * Flag this lease to be released when its destructor is called. This is
    * mostly useful if you have a script which acquires, uses, and then releases
@@ -232,6 +242,7 @@ final class DrydockLease extends DrydockDAO
     }
 
     $this->openTransaction();
+
     try {
       DrydockSlotLock::acquireLocks($this->getPHID(), $this->slotLocks);
       $this->slotLocks = array();
@@ -247,16 +258,12 @@ final class DrydockLease extends DrydockDAO
       throw $ex;
     }
 
-    try {
     $this
       ->setResourcePHID($resource->getPHID())
       ->attachResource($resource)
       ->setStatus($new_status)
       ->save();
-    } catch (Exception $ex) {
+
-      $this->killTransaction();
-      throw $ex;
-    }
     $this->saveTransaction();
 
     $this->isAcquired = true;
@@ -295,13 +302,25 @@ final class DrydockLease extends DrydockDAO
 
     $this->openTransaction();
 
+    try {
+      DrydockSlotLock::acquireLocks($this->getPHID(), $this->slotLocks);
+      $this->slotLocks = array();
+    } catch (DrydockSlotLockException $ex) {
+      $this->killTransaction();
+
+      $this->logEvent(
+        DrydockSlotLockFailureLogType::LOGCONST,
+        array(
+          'locks' => $ex->getLockMap(),
+        ));
+
+      throw $ex;
+    }
+
     $this
       ->setStatus(DrydockLeaseStatus::STATUS_ACTIVE)
       ->save();
 
-      DrydockSlotLock::acquireLocks($this->getPHID(), $this->slotLocks);
-      $this->slotLocks = array();
-
     $this->saveTransaction();
 
     $this->isActivated = true;

src/applications/drydock/storage/DrydockResource.php

@@ -113,13 +113,6 @@ final class DrydockResource extends DrydockDAO
   }
 
   public function allocateResource() {
-    if ($this->getID()) {
-      throw new Exception(
-        pht(
-          'Trying to allocate a resource which has already been persisted. '.
-          'Only new resources may be allocated.'));
-    }
-
     // We expect resources to have a pregenerated PHID, as they should have
     // been created by a call to DrydockBlueprint->newResourceTemplate().
     if (!$this->getPHID()) {
@@ -155,9 +148,14 @@ final class DrydockResource extends DrydockDAO
     } catch (DrydockSlotLockException $ex) {
       $this->killTransaction();
 
-      // NOTE: We have to log this on the blueprint, as the resource is not
+      if ($this->getID()) {
-      // going to be saved so the PHID will vanish.
+        $log_target = $this;
-      $this->getBlueprint()->logEvent(
+      } else {
+        // If we don't have an ID, we have to log this on the blueprint, as the
+        // resource is not going to be saved so the PHID will vanish.
+        $log_target = $this->getBlueprint();
+      }
+      $log_target->logEvent(
         DrydockSlotLockFailureLogType::LOGCONST,
         array(
           'locks' => $ex->getLockMap(),
@@ -166,14 +164,9 @@ final class DrydockResource extends DrydockDAO
       throw $ex;
     }
 
-    try {
     $this
       ->setStatus($new_status)
       ->save();
-    } catch (Exception $ex) {
-      $this->killTransaction();
-      throw $ex;
-    }
 
     $this->saveTransaction();
 
@@ -210,13 +203,25 @@ final class DrydockResource extends DrydockDAO
 
     $this->openTransaction();
 
+    try {
+      DrydockSlotLock::acquireLocks($this->getPHID(), $this->slotLocks);
+      $this->slotLocks = array();
+    } catch (DrydockSlotLockException $ex) {
+      $this->killTransaction();
+
+      $this->logEvent(
+        DrydockSlotLockFailureLogType::LOGCONST,
+        array(
+          'locks' => $ex->getLockMap(),
+        ));
+
+      throw $ex;
+    }
+
     $this
       ->setStatus(DrydockResourceStatus::STATUS_ACTIVE)
       ->save();
 
-      DrydockSlotLock::acquireLocks($this->getPHID(), $this->slotLocks);
-      $this->slotLocks = array();
-
     $this->saveTransaction();
 
     $this->isActivated = true;
@@ -288,6 +293,15 @@ final class DrydockResource extends DrydockDAO
     }
   }
 
+  public function isActive() {
+    switch ($this->getStatus()) {
+      case DrydockResourceStatus::STATUS_ACTIVE:
+        return true;
+    }
+
+    return false;
+  }
+
   public function logEvent($type, array $data = array()) {
     $log = id(new DrydockLog())
       ->setEpoch(PhabricatorTime::getNow())

src/applications/drydock/storage/DrydockSlotLock.php

@@ -149,6 +149,7 @@ final class DrydockSlotLock extends DrydockDAO {
       // time we should be able to figure out which locks are already held.
       $held = self::loadHeldLocks($locks);
       $held = mpull($held, 'getOwnerPHID', 'getLockKey');
+
       throw new DrydockSlotLockException($held);
     }
   }

src/applications/drydock/worker/DrydockLeaseUpdateWorker.php

@@ -535,7 +535,7 @@ final class DrydockLeaseUpdateWorker extends DrydockWorker {
     // If this lease has been acquired but not activated, queue a task to
     // activate it.
     if ($lease->getStatus() == DrydockLeaseStatus::STATUS_ACQUIRED) {
-      PhabricatorWorker::scheduleTask(
+      $this->queueTask(
         __CLASS__,
         array(
           'leasePHID' => $lease->getPHID(),
@@ -691,7 +691,14 @@ final class DrydockLeaseUpdateWorker extends DrydockWorker {
       ->setStatus(DrydockLeaseStatus::STATUS_BROKEN)
       ->save();
 
-    $lease->scheduleUpdate();
+    $this->queueTask(
+      __CLASS__,
+      array(
+        'leasePHID' => $lease->getPHID(),
+      ),
+      array(
+        'objectPHID' => $lease->getPHID(),
+      ));
 
     $lease->logEvent(
       DrydockLeaseActivationFailureLogType::LOGCONST,

src/applications/harbormaster/artifact/HarbormasterDrydockLeaseArtifact.php

@@ -29,7 +29,9 @@ abstract class HarbormasterDrydockLeaseArtifact
   }
 
   public function willCreateArtifact(PhabricatorUser $actor) {
-    $this->loadArtifactLease($actor);
+    // We don't load the lease here because it's expected that artifacts are
+    // created before leases actually exist. This guarantees that the leases
+    // will be cleaned up.
   }
 
   public function loadArtifactLease(PhabricatorUser $viewer) {
@@ -51,7 +53,15 @@ abstract class HarbormasterDrydockLeaseArtifact
   }
 
   public function releaseArtifact(PhabricatorUser $actor) {
+    try {
       $lease = $this->loadArtifactLease($actor);
+    } catch (Exception $ex) {
+      // If we can't load the lease, treat it as already released. Artifacts
+      // are generated before leases are queued, so it's possible to arrive
+      // here under normal conditions.
+      return;
+    }
+
     if (!$lease->canRelease()) {
       return;
     }

src/applications/harbormaster/controller/HarbormasterPlanEditController.php

@@ -61,7 +61,7 @@ final class HarbormasterPlanEditController extends HarbormasterPlanController {
     $is_new = (!$plan->getID());
     if ($is_new) {
       $title = pht('New Build Plan');
-      $cancel_uri = $this->getApplicationURI();
+      $cancel_uri = $this->getApplicationURI('plan/');
       $save_button = pht('Create Build Plan');
     } else {
       $id = $plan->getID();

src/applications/harbormaster/step/HarbormasterDrydockCommandBuildStepImplementation.php

@@ -12,7 +12,7 @@ final class HarbormasterDrydockCommandBuildStepImplementation
   }
 
   public function getBuildStepGroupKey() {
-    return HarbormasterPrototypeBuildStepGroup::GROUPKEY;
+    return HarbormasterDrydockBuildStepGroup::GROUPKEY;
   }
 
   public function getDescription() {

src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php

@@ -12,7 +12,7 @@ final class HarbormasterLeaseWorkingCopyBuildStepImplementation
   }
 
   public function getBuildStepGroupKey() {
-    return HarbormasterPrototypeBuildStepGroup::GROUPKEY;
+    return HarbormasterDrydockBuildStepGroup::GROUPKEY;
   }
 
   public function execute(
@@ -41,7 +41,7 @@ final class HarbormasterLeaseWorkingCopyBuildStepImplementation
       $working_copy_type = id(new DrydockWorkingCopyBlueprintImplementation())
         ->getType();
 
-      $lease = id(new DrydockLease())
+      $lease = DrydockLease::initializeNewLease()
         ->setResourceType($working_copy_type)
         ->setOwnerPHID($build_target->getPHID());
 
@@ -54,6 +54,18 @@ final class HarbormasterLeaseWorkingCopyBuildStepImplementation
         $lease->setAwakenTaskIDs(array($task_id));
       }
 
+      // TODO: Maybe add a method to mark artifacts like this as pending?
+
+      // Create the artifact now so that the lease is always disposed of, even
+      // if this target is aborted.
+      $build_target->createArtifact(
+        $viewer,
+        $settings['name'],
+        HarbormasterWorkingCopyArtifact::ARTIFACTCONST,
+        array(
+          'drydockLeasePHID' => $lease->getPHID(),
+        ));
+
       $lease->queueForActivation();
 
       $build_target
@@ -73,14 +85,6 @@ final class HarbormasterLeaseWorkingCopyBuildStepImplementation
           'Lease "%s" never activated.',
           $lease->getPHID()));
     }
-
-    $artifact = $build_target->createArtifact(
-      $viewer,
-      $settings['name'],
-      HarbormasterWorkingCopyArtifact::ARTIFACTCONST,
-      array(
-        'drydockLeasePHID' => $lease->getPHID(),
-      ));
   }
 
   public function getArtifactOutputs() {

src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php

@@ -0,0 +1,25 @@
+<?php
+
+final class HarbormasterDrydockBuildStepGroup
+  extends HarbormasterBuildStepGroup {
+
+  const GROUPKEY = 'harbormaster.drydock';
+
+  public function getGroupName() {
+    return pht('Drydock');
+  }
+
+  public function getGroupOrder() {
+    return 3000;
+  }
+
+  public function isEnabled() {
+    $drydock_class = 'PhabricatorDrydockApplication';
+    return PhabricatorApplication::isClassInstalled($drydock_class);
+  }
+
+  public function shouldShowIfEmpty() {
+    return false;
+  }
+
+}

src/applications/ponder/view/PonderAnswerView.php

@@ -77,10 +77,17 @@ final class PonderAnswerView extends AphrontTagView {
       ->setIconFont('fa-bars')
       ->setDropdownMenu($actions);
 
+    $header_name = phutil_tag(
+      'a',
+      array(
+        'href' => $handle->getURI(),
+      ),
+      $handle->getName());
+
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setEpoch($answer->getDateModified())
-      ->setHeader($handle->getName())
+      ->setHeader($header_name)
       ->addActionLink($action_button)
       ->setImage($handle->getImageURI())
       ->setImageURL($handle->getURI());

src/infrastructure/daemon/workers/PhabricatorWorker.php

@@ -160,8 +160,7 @@ abstract class PhabricatorWorker extends Phobject {
         try {
           $worker->doWork();
           foreach ($worker->getQueuedTasks() as $queued_task) {
-            list($queued_class, $queued_data, $queued_priority) = $queued_task;
+            list($queued_class, $queued_data, $queued_options) = $queued_task;
-            $queued_options = array('priority' => $queued_priority);
             self::scheduleTask($queued_class, $queued_data, $queued_options);
           }
           break;
@@ -220,11 +219,14 @@ abstract class PhabricatorWorker extends Phobject {
    *
    * @param string    Task class to queue.
    * @param array     Data for the followup task.
-   * @param int|null  Priority for the followup task.
+   * @param array Options for the followup task.
    * @return this
    */
-  final protected function queueTask($class, array $data, $priority = null) {
+  final protected function queueTask(
-    $this->queuedTasks[] = array($class, $data, $priority);
+    $class,
+    array $data,
+    array $options = array()) {
+    $this->queuedTasks[] = array($class, $data, $options);
     return $this;
   }
 

src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementExecuteWorkflow.php

@@ -42,7 +42,8 @@ final class PhabricatorWorkerManagementExecuteWorkflow
         $task->getDataID());
       $task->setData($task_data->getData());
 
-      $console->writeOut(
+      echo tsprintf(
+        "%s\n",
         pht(
           'Executing task %d (%s)...',
           $task->getID(),

src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php

@@ -217,13 +217,14 @@ final class PhabricatorWorkerActiveTask extends PhabricatorWorkerTask {
     // so execute it out here and just let the exception escape.
     if ($did_succeed) {
       foreach ($worker->getQueuedTasks() as $task) {
-        list($class, $data) = $task;
+        list($class, $data, $options) = $task;
-        PhabricatorWorker::scheduleTask(
+
-          $class,
+        // Default the new task priority to our own priority.
-          $data,
+        $options = $options + array(
-          array(
           'priority' => (int)$this->getPriority(),
-          ));
+        );
+
+        PhabricatorWorker::scheduleTask($class, $data, $options);
       }
     }
 

src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php

@@ -1398,6 +1398,11 @@ final class PhabricatorUSEnglishTranslation
         'Setting retention policy for "%s" to %s days.',
       ),
 
+      'Waiting %s second(s) for lease to activate.' => array(
+        'Waiting a second for lease to activate.',
+        'Waiting %s seconds for lease to activate.',
+      ),
+
     );
   }
 

src/infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php

@@ -28,10 +28,16 @@ final class PhabricatorRemarkupCowsayBlockInterpreter
       ->setText($content)
       ->renderCow();
 
-    if ($this->getEngine()->isTextMode()) {
+    $engine = $this->getEngine();
+
+    if ($engine->isTextMode()) {
       return $result;
     }
 
+    if ($engine->isHTMLMailMode()) {
+      return phutil_tag('pre', array(), $result);
+    }
+
     return phutil_tag(
       'div',
       array(

src/infrastructure/markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php

@@ -27,10 +27,16 @@ final class PhabricatorRemarkupFigletBlockInterpreter
 
     $result = $figlet->lineEcho($content);
 
-    if ($this->getEngine()->isTextMode()) {
+    $engine = $this->getEngine();
+
+    if ($engine->isTextMode()) {
       return $result;
     }
 
+    if ($engine->isHTMLMailMode()) {
+      return phutil_tag('pre', array(), $result);
+    }
+
     return phutil_tag(
       'div',
       array(

src/infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php

@@ -60,9 +60,9 @@ final class PhabricatorStorageManagementProbeWorkflow
         $overall);
 
       $table->addRow(array(
-        'name' => phutil_console_format('**%s**', $db),
+        'name' => tsprintf('**%s**', $db),
-        'size' => phutil_console_format('**%s**', $database_size),
+        'size' => tsprintf('**%s**', $database_size),
-        'percentage' => phutil_console_format('**%s**', $database_percentage),
+        'percentage' => tsprintf('**%s**', $database_percentage),
       ));
       $data[$db] = isort($data[$db], '_totalSize');
       foreach ($data[$db] as $table_name => $info) {
@@ -82,9 +82,9 @@ final class PhabricatorStorageManagementProbeWorkflow
       $overall,
       $overall);
     $table->addRow(array(
-      'name' => phutil_console_format('**%s**', pht('TOTAL')),
+      'name' => tsprintf('**%s**', pht('TOTAL')),
-      'size' => phutil_console_format('**%s**', $overall_size),
+      'size' => tsprintf('**%s**', $overall_size),
-      'percentage' => phutil_console_format('**%s**', $overall_percentage),
+      'percentage' => tsprintf('**%s**', $overall_percentage),
     ));
 
     $table->draw();

webroot/rsrc/js/application/diffusion/behavior-pull-lastmodified.js

@@ -16,7 +16,16 @@ JX.behavior('diffusion-pull-lastmodified', function(config) {
           if (!config.map[k][l]) {
             continue;
           }
+          try {
             JX.DOM.setContent(JX.$(config.map[k][l]), JX.$H(r[k][l]));
+          } catch (ex) {
+            // The way this works is weird and sometimes the components get
+            // out of sync. Fail gently until we can eventually improve the
+            // underlying mechanism.
+
+            // In particular, we currently may generate lint information
+            // without generating a lint column. See T9524.
+          }
         }
       }
     })