Merge branch 'master' into phutil_tag

(Sync.)

src/applications/diffusion/controller/DiffusionCommitController.php

@@ -116,10 +116,18 @@ final class DiffusionCommitController extends DiffusionController {
     $content[] = $this->buildAuditTable($commit, $audit_requests);
     $content[] = $this->buildComments($commit);
 
+    $hard_limit = 1000;
+
     $change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
       $drequest);
+    $change_query->setLimit($hard_limit + 1);
     $changes = $change_query->loadChanges();
 
+    $was_limited = (count($changes) > $hard_limit);
+    if ($was_limited) {
+      $changes = array_slice($changes, 0, $hard_limit);
+    }
+
     $content[] = $this->buildMergesTable($commit);
 
     $owners_paths = array();
@@ -151,7 +159,6 @@ final class DiffusionCommitController extends DiffusionController {
         'r'.$callsign.$commit->getCommitIdentifier());
     }
 
-    $pane_id = null;
     if ($bad_commit) {
       $error_panel = new AphrontErrorView();
       $error_panel->setTitle('Bad Commit');
@@ -175,11 +182,20 @@ final class DiffusionCommitController extends DiffusionController {
         "This commit hasn't been fully parsed yet (or doesn't affect any ".
         "paths).");
       $content[] = $no_changes;
+    } else if ($was_limited) {
+      $huge_commit = new AphrontErrorView();
+      $huge_commit->setSeverity(AphrontErrorView::SEVERITY_WARNING);
+      $huge_commit->setTitle(pht('Enormous Commit'));
+      $huge_commit->appendChild(
+        pht(
+          'This commit is enormous, and affects more than %d files. '.
+          'Changes are not shown.',
+          $hard_limit));
+      $content[] = $huge_commit;
     } else {
       $change_panel = new AphrontPanelView();
       $change_panel->setHeader("Changes (".number_format($count).")");
       $change_panel->setID('toc');
-
       if ($count > self::CHANGES_LIMIT) {
         $show_all_button = phutil_tag(
           'a',
@@ -296,28 +312,11 @@ final class DiffusionCommitController extends DiffusionController {
       }
       $change_table->setRenderingReferences($change_references);
 
-      // TODO: This is pretty awkward, unify the CSS between Diffusion and
-      // Differential better.
-      require_celerity_resource('differential-core-view-css');
-      $pane_id = celerity_generate_unique_node_id();
-      $add_comment_view = $this->renderAddCommentPanel($commit,
-                                                       $audit_requests,
-                                                       $pane_id);
-      $main_pane = phutil_render_tag(
-        'div',
-        array(
-          'id'    => $pane_id
-        ),
-        $change_list->render().
-        id(new PhabricatorAnchorView())
-        ->setAnchorName('comment')
-        ->setNavigationMarker(true)
-        ->render().
-        $add_comment_view);
-
-      $content[] = $main_pane;
+      $content[] = $change_list->render();
     }
 
+    $content[] = $this->renderAddCommentPanel($commit, $audit_requests);
+
     $commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
     $short_name = DiffusionView::nameCommit(
       $repository,
@@ -577,13 +576,13 @@ final class DiffusionCommitController extends DiffusionController {
 
   private function renderAddCommentPanel(
     PhabricatorRepositoryCommit $commit,
-    array $audit_requests,
-    $pane_id = null) {
+    array $audit_requests) {
     assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
     $user = $this->getRequest()->getUser();
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
 
+    $pane_id = celerity_generate_unique_node_id();
     Javelin::initBehavior(
       'differential-keyboard-navigation',
       array(
@@ -693,14 +692,26 @@ final class DiffusionCommitController extends DiffusionController {
         </div>
       </div>';
 
-    return
+    // TODO: This is pretty awkward, unify the CSS between Diffusion and
+    // Differential better.
+    require_celerity_resource('differential-core-view-css');
+
+    return phutil_render_tag(
+      'div',
+      array(
+        'id' => $pane_id,
+      ),
       phutil_render_tag(
         'div',
         array(
           'class' => 'differential-add-comment-panel',
         ),
+        id(new PhabricatorAnchorView())
+          ->setAnchorName('comment')
+          ->setNavigationMarker(true)
+          ->render().
         $panel->render().
-        $preview_panel);
+        $preview_panel));
   }
 
   /**