Index: src/applications/diffusion/controller/DiffusionBranchTableController.php =================================================================== --- src/applications/diffusion/controller/DiffusionBranchTableController.php +++ src/applications/diffusion/controller/DiffusionBranchTableController.php @@ -9,7 +9,7 @@ public function processRequest() { $drequest = $this->getDiffusionRequest(); $request = $this->getRequest(); - $user = $request->getUser(); + $viewer = $request->getUser(); $repository = $drequest->getRepository(); @@ -29,21 +29,19 @@ $content = null; if (!$branches) { - $content = new AphrontErrorView(); - $content->setTitle(pht('No Branches')); - $content->appendChild(pht('This repository has no branches.')); - $content->setSeverity(AphrontErrorView::SEVERITY_NODATA); + $content = $this->renderStatusMessage( + pht('No Branches'), + pht('This repository has no branches.')); } else { - $commits = id(new PhabricatorAuditCommitQuery()) - ->withIdentifiers( - $drequest->getRepository()->getID(), - mpull($branches, 'getHeadCommitIdentifier')) - ->needCommitData(true) + $commits = id(new DiffusionCommitQuery()) + ->setViewer($viewer) + ->withIdentifiers(mpull($branches, 'getHeadCommitIdentifier')) + ->withRepositoryIDs(array($repository->getID())) ->execute(); $view = id(new DiffusionBranchTableView()) + ->setUser($viewer) ->setBranches($branches) - ->setUser($user) ->setCommits($commits) ->setDiffusionRequest($drequest); @@ -67,8 +65,8 @@ ), array( 'title' => array( - 'Branches', - $repository->getCallsign().' Repository', + pht('Branches'), + 'r'.$repository->getCallsign(), ), )); }