Merge "Table of Contents", "Local Commits", "Update History" and "Similar Revisions"

Summary: Ref T10628. Turn these into tabs in a single box, since "local commits" and "similar revisions" are of particularly rare use.

Test Plan: {F1707196}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10628

Differential Revision: https://secure.phabricator.com/D16209

src/applications/differential/controller/DifferentialController.php

@@ -28,8 +28,8 @@ abstract class DifferentialController extends PhabricatorController {
     $viewer = $this->getViewer();
 
     $toc_view = id(new PHUIDiffTableOfContentsListView())
-      ->setUser($viewer)
+      ->setViewer($viewer)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
+      ->setBare(true);
 
     $have_owners = PhabricatorApplication::isClassInstalledForViewer(
       'PhabricatorOwnersApplication',

src/applications/differential/controller/DifferentialRevisionViewController.php

@@ -292,7 +292,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
         '/differential/comment/inline/edit/'.$revision->getID().'/');
     }
 
-    $diff_history = id(new DifferentialRevisionUpdateHistoryView())
+    $history = id(new DifferentialRevisionUpdateHistoryView())
       ->setUser($viewer)
       ->setDiffs($diffs)
       ->setSelectedVersusDiffID($diff_vs)
@@ -300,7 +300,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
       ->setSelectedWhitespace($whitespace)
       ->setCommitsForLinks($commits_for_links);
 
-    $local_view = id(new DifferentialLocalCommitsView())
+    $local_table = id(new DifferentialLocalCommitsView())
       ->setUser($viewer)
       ->setLocalCommits(idx($props, 'local:commits'))
       ->setCommitsForLinks($commits_for_links);
@@ -324,6 +324,36 @@ final class DifferentialRevisionViewController extends DifferentialController {
       $visible_changesets,
       $target->loadCoverageMap($viewer));
 
+    $tab_group = id(new PHUITabGroupView())
+      ->addTab(
+        id(new PHUITabView())
+          ->setName(pht('Files'))
+          ->setKey('files')
+          ->appendChild($toc_view))
+      ->addTab(
+        id(new PHUITabView())
+          ->setName(pht('History'))
+          ->setKey('history')
+          ->appendChild($history))
+      ->addTab(
+        id(new PHUITabView())
+          ->setName(pht('Commits'))
+          ->setKey('commits')
+          ->appendChild($local_table));
+
+    if ($other_view) {
+      $tab_group->addTab(
+        id(new PHUITabView())
+          ->setName(pht('Similar'))
+          ->setKey('similar')
+          ->appendChild($other_view));
+    }
+
+    $tab_view = id(new PHUIObjectBoxView())
+      ->setHeaderText(pht('Revision Contents'))
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->addTabGroup($tab_group);
+
     $comment_form = null;
     if (!$viewer_is_anonymous) {
       $comment_form = $this->buildCommentForm($revision, $field_list);
@@ -348,15 +378,16 @@ final class DifferentialRevisionViewController extends DifferentialController {
             'The content of this revision is hidden until the author has '.
             'signed all of the required legal agreements.'));
     } else {
-      $footer[] =
+      $anchor = id(new PhabricatorAnchorView())
-        array(
+        ->setAnchorName('toc')
-          $diff_history,
+        ->setNavigationMarker(true);
-          $warning,
+
-          $local_view,
+      $footer[] = array(
-          $toc_view,
+        $anchor,
-          $other_view,
+        $warning,
-          $changeset_view,
+        $tab_view,
-        );
+        $changeset_view,
+      );
     }
 
     if ($comment_form) {
@@ -870,9 +901,9 @@ final class DifferentialRevisionViewController extends DifferentialController {
       ->setHeader(pht('Recent Similar Revisions'));
 
     $view = id(new DifferentialRevisionListView())
-      ->setHeader($header)
       ->setRevisions($revisions)
       ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setNoBox(true)
       ->setUser($viewer);
 
     $phids = $view->getRequiredHandlePHIDs();

src/applications/differential/view/DifferentialLocalCommitsView.php

@@ -125,10 +125,7 @@ final class DifferentialLocalCommitsView extends AphrontView {
     $headers[] = pht('Date');
     $table->setHeaders($headers);
 
-    return id(new PHUIObjectBoxView())
+    return $table;
-      ->setHeaderText(pht('Local Commits'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setTable($table);
   }
 
   private static function formatCommit($commit) {

src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php

@@ -303,10 +303,7 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
         $show_diff,
       ));
 
-    return id(new PHUIObjectBoxView())
+    return $content;
-      ->setHeaderText(pht('Revision Update History'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setTable($content);
   }
 
   const STAR_NONE = 'none';

src/infrastructure/diff/view/PHUIDiffTableOfContentsListView.php

@@ -7,6 +7,7 @@ final class PHUIDiffTableOfContentsListView extends AphrontView {
   private $header;
   private $infoView;
   private $background;
+  private $bare;
 
   public function addItem(PHUIDiffTableOfContentsItemView $item) {
     $this->items[] = $item;
@@ -38,6 +39,15 @@ final class PHUIDiffTableOfContentsListView extends AphrontView {
     return $this;
   }
 
+  public function setBare($bare) {
+    $this->bare = $bare;
+    return $this;
+  }
+
+  public function getBare() {
+    return $this->bare;
+  }
+
   public function render() {
     $this->requireResource('differential-core-view-css');
     $this->requireResource('differential-table-of-contents-css');
@@ -160,6 +170,10 @@ final class PHUIDiffTableOfContentsListView extends AphrontView {
       ->setAnchorName('toc')
       ->setNavigationMarker(true);
 
+    if ($this->bare) {
+      return $table;
+    }
+
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Table of Contents'));