diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -861,7 +861,6 @@ 'DiffusionGitWireProtocolCapabilities' => 'applications/diffusion/protocol/DiffusionGitWireProtocolCapabilities.php', 'DiffusionGitWireProtocolRef' => 'applications/diffusion/protocol/DiffusionGitWireProtocolRef.php', 'DiffusionGitWireProtocolRefList' => 'applications/diffusion/protocol/DiffusionGitWireProtocolRefList.php', - 'DiffusionGraphController' => 'applications/diffusion/controller/DiffusionGraphController.php', 'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php', 'DiffusionHistoryListView' => 'applications/diffusion/view/DiffusionHistoryListView.php', 'DiffusionHistoryQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php', @@ -6955,7 +6954,6 @@ 'DiffusionGitWireProtocolCapabilities' => 'Phobject', 'DiffusionGitWireProtocolRef' => 'Phobject', 'DiffusionGitWireProtocolRefList' => 'Phobject', - 'DiffusionGraphController' => 'DiffusionController', 'DiffusionHistoryController' => 'DiffusionController', 'DiffusionHistoryListView' => 'DiffusionHistoryView', 'DiffusionHistoryQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php --- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php +++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php @@ -52,7 +52,6 @@ 'change/(?P.*)' => 'DiffusionChangeController', 'clone/' => 'DiffusionCloneController', 'history/(?P.*)' => 'DiffusionHistoryController', - 'graph/(?P.*)' => 'DiffusionGraphController', 'browse/(?P.*)' => 'DiffusionBrowseController', 'document/(?P.*)' => 'DiffusionDocumentController', diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php --- a/src/applications/diffusion/controller/DiffusionController.php +++ b/src/applications/diffusion/controller/DiffusionController.php @@ -210,9 +210,6 @@ case 'history': $view_name = pht('History'); break; - case 'graph': - $view_name = pht('Graph'); - break; case 'browse': $view_name = pht('Browse'); break; @@ -553,17 +550,6 @@ ))) ->setSelected($key == 'history')); - $view->addMenuItem( - id(new PHUIListItemView()) - ->setKey('graph') - ->setName(pht('Graph')) - ->setIcon('fa-code-fork') - ->setHref($drequest->generateURI( - array( - 'action' => 'graph', - ))) - ->setSelected($key == 'graph')); - return $view; } diff --git a/src/applications/diffusion/controller/DiffusionGraphController.php b/src/applications/diffusion/controller/DiffusionGraphController.php deleted file mode 100644 --- a/src/applications/diffusion/controller/DiffusionGraphController.php +++ /dev/null @@ -1,110 +0,0 @@ -loadDiffusionContext(); - if ($response) { - return $response; - } - require_celerity_resource('diffusion-css'); - - $viewer = $this->getViewer(); - $drequest = $this->getDiffusionRequest(); - $repository = $drequest->getRepository(); - - $pager = id(new PHUIPagerView()) - ->readFromRequest($request); - - $params = array( - 'commit' => $drequest->getCommit(), - 'path' => $drequest->getPath(), - 'offset' => $pager->getOffset(), - 'limit' => $pager->getPageSize() + 1, - ); - - $history_results = $this->callConduitWithDiffusionRequest( - 'diffusion.historyquery', - $params); - $history = DiffusionPathChange::newFromConduit( - $history_results['pathChanges']); - - $history = $pager->sliceResults($history); - - $graph = id(new DiffusionHistoryTableView()) - ->setViewer($viewer) - ->setDiffusionRequest($drequest) - ->setHistory($history); - - $show_graph = !strlen($drequest->getPath()); - if ($show_graph) { - $graph->setParents($history_results['parents']); - $graph->setIsHead(!$pager->getOffset()); - $graph->setIsTail(!$pager->getHasMorePages()); - } - - $header = $this->buildHeader($drequest); - - $crumbs = $this->buildCrumbs( - array( - 'branch' => true, - 'path' => true, - 'view' => 'graph', - )); - $crumbs->setBorder(true); - - $title = array( - pht('Graph'), - $repository->getDisplayName(), - ); - - $graph_view = id(new PHUIObjectBoxView()) - ->setHeaderText(pht('History Graph')) - ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) - ->setTable($graph) - ->addClass('diffusion-mobile-view') - ->setPager($pager); - - $tabs = $this->buildTabsView('graph'); - - $view = id(new PHUITwoColumnView()) - ->setHeader($header) - ->setTabs($tabs) - ->setFooter($graph_view); - - return $this->newPage() - ->setTitle($title) - ->setCrumbs($crumbs) - ->appendChild($view); - } - - private function buildHeader(DiffusionRequest $drequest) { - $viewer = $this->getViewer(); - $repository = $drequest->getRepository(); - - $no_path = !strlen($drequest->getPath()); - if ($no_path) { - $header_text = pht('Graph'); - } else { - $header_text = $this->renderPathLinks($drequest, $mode = 'history'); - } - - $header = id(new PHUIHeaderView()) - ->setUser($viewer) - ->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/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php --- a/src/applications/repository/storage/PhabricatorRepository.php +++ b/src/applications/repository/storage/PhabricatorRepository.php @@ -682,7 +682,6 @@ $action = idx($params, 'action'); switch ($action) { case 'history': - case 'graph': case 'clone': case 'blame': case 'browse': @@ -763,7 +762,6 @@ switch ($action) { case 'change': case 'history': - case 'graph': case 'blame': case 'browse': case 'document':