(stable) Promote 2018 Week 34

resources/celerity/map.php

@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => '15191c65',
-    'core.pkg.css' => 'f515619b',
+    'core.pkg.css' => 'fc4839c8',
     'core.pkg.js' => '2058ec09',
     'differential.pkg.css' => '06dc617c',
     'differential.pkg.js' => 'c1cfa143',
@@ -151,7 +151,7 @@ return array(
     'rsrc/css/phui/phui-document.css' => '878c2f52',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
     'rsrc/css/phui/phui-fontkit.css' => '1320ed01',
-    'rsrc/css/phui/phui-form-view.css' => 'ae9f8d16',
+    'rsrc/css/phui/phui-form-view.css' => 'f808e5be',
     'rsrc/css/phui/phui-form.css' => '7aaa04e3',
     'rsrc/css/phui/phui-head-thing.css' => 'fd311e5f',
     'rsrc/css/phui/phui-header-view.css' => 'edeb9252',
@@ -819,7 +819,7 @@ return array(
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
     'phui-form-css' => '7aaa04e3',
-    'phui-form-view-css' => 'ae9f8d16',
+    'phui-form-view-css' => 'f808e5be',
     'phui-head-thing-view-css' => 'fd311e5f',
     'phui-header-view-css' => 'edeb9252',
     'phui-hovercard' => '1bd28176',

src/applications/config/option/PhabricatorPHDConfigOptions.php

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

src/applications/differential/controller/DifferentialRevisionViewController.php

@@ -463,7 +463,7 @@ final class DifferentialRevisionViewController
       }
     }
 
-    $tab_group = id(new PHUITabGroupView());
+    $tab_group = new PHUITabGroupView();
 
     if ($toc_view) {
       $tab_group->addTab(
@@ -473,17 +473,30 @@ final class DifferentialRevisionViewController
           ->appendChild($toc_view));
     }
 
-    $tab_group
-      ->addTab(
-        id(new PHUITabView())
-          ->setName(pht('History'))
-          ->setKey('history')
-          ->appendChild($history))
-      ->addTab(
-        id(new PHUITabView())
-          ->setName(pht('Commits'))
-          ->setKey('commits')
-          ->appendChild($local_table));
+    $tab_group->addTab(
+      id(new PHUITabView())
+        ->setName(pht('History'))
+        ->setKey('history')
+        ->appendChild($history));
+
+    $filetree_on = $viewer->compareUserSetting(
+      PhabricatorShowFiletreeSetting::SETTINGKEY,
+      PhabricatorShowFiletreeSetting::VALUE_ENABLE_FILETREE);
+
+    $collapsed_key = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
+    $filetree_collapsed = (bool)$viewer->getUserSetting($collapsed_key);
+
+    // See PHI811. If the viewer has the file tree on, the files tab with the
+    // table of contents is redundant, so default to the "History" tab instead.
+    if ($filetree_on && !$filetree_collapsed) {
+      $tab_group->selectTab('history');
+    }
+
+    $tab_group->addTab(
+      id(new PHUITabView())
+        ->setName(pht('Commits'))
+        ->setKey('commits')
+        ->appendChild($local_table));
 
     $stack_graph = id(new DifferentialRevisionGraph())
       ->setViewer($viewer)
@@ -601,22 +614,15 @@ final class DifferentialRevisionViewController
     $crumbs->addTextCrumb($monogram);
     $crumbs->setBorder(true);
 
-    $filetree_on = $viewer->compareUserSetting(
-      PhabricatorShowFiletreeSetting::SETTINGKEY,
-      PhabricatorShowFiletreeSetting::VALUE_ENABLE_FILETREE);
-
     $nav = null;
     if ($filetree_on && !$this->isVeryLargeDiff()) {
-      $collapsed_key = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
-      $collapsed_value = $viewer->getUserSetting($collapsed_key);
-
       $width_key = PhabricatorFiletreeWidthSetting::SETTINGKEY;
       $width_value = $viewer->getUserSetting($width_key);
 
       $nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
         ->setTitle($monogram)
         ->setBaseURI(new PhutilURI($revision->getURI()))
-        ->setCollapsed((bool)$collapsed_value)
+        ->setCollapsed($filetree_collapsed)
         ->setWidth((int)$width_value)
         ->build($changesets);
     }

src/applications/differential/editor/DifferentialTransactionEditor.php

@@ -671,7 +671,7 @@ final class DifferentialTransactionEditor
 
     $this->addCustomFieldsToMailBody($body, $object, $xactions);
 
-    if (!$this->getIsNewObject()) {
+    if (!$this->isFirstBroadcast()) {
       $body->addLinkSection(pht('CHANGES SINCE LAST ACTION'), $new_uri);
     }
 

src/applications/diffusion/protocol/DiffusionMercurialWireProtocol.php

@@ -23,12 +23,16 @@ final class DiffusionMercurialWireProtocol extends Phobject {
       'listkeys' => array('namespace'),
       'lookup' => array('key'),
       'pushkey' => array('namespace', 'key', 'old', 'new'),
+      'protocaps' => array('caps'),
       'stream_out' => array(''),
       'unbundle' => array('heads'),
     );
 
     if (!isset($commands[$command])) {
-      throw new Exception(pht("Unknown Mercurial command '%s!", $command));
+      throw new Exception(
+        pht(
+          'Unknown Mercurial command "%s"!',
+          $command));
     }
 
     return $commands[$command];
@@ -49,6 +53,7 @@ final class DiffusionMercurialWireProtocol extends Phobject {
       'known' => true,
       'listkeys' => true,
       'lookup' => true,
+      'protocaps' => true,
       'stream_out' => true,
     );
 

src/applications/maniphest/xaction/ManiphestTaskPriorityTransaction.php

@@ -172,4 +172,33 @@ final class ManiphestTaskPriorityTransaction
     return $errors;
   }
 
+  public function getTransactionTypeForConduit($xaction) {
+    return 'priority';
+  }
+
+  public function getFieldValuesForConduit($xaction, $data) {
+    $old = $xaction->getOldValue();
+    if ($old !== null) {
+      $old = (int)$old;
+      $old_name = ManiphestTaskPriority::getTaskPriorityName($old);
+    } else {
+      $old_name = null;
+    }
+
+    $new = $xaction->getNewValue();
+    $new = (int)$new;
+    $new_name = ManiphestTaskPriority::getTaskPriorityName($new);
+
+    return array(
+      'old' => array(
+        'value' => $old,
+        'name' => $old_name,
+      ),
+      'new' => array(
+        'value' => $new,
+        'name' => $new_name,
+      ),
+    );
+  }
+
 }

webroot/rsrc/css/phui/phui-form-view.css

@@ -546,7 +546,8 @@ properly, and submit values. */
 }
 
 .phui-form-static-action {
-  padding: 4px;
+  height: 28px;
+  line-height: 28px;
   color: {$bluetext};
 }