diff --git a/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php index c070d358df..652f93fa63 100644 --- a/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php @@ -1,155 +1,122 @@ '; } protected function defineParamTypes() { return array( 'ids' => 'optional list', 'phids' => 'optional list', 'names' => 'optional list', 'repositoryPHID' => 'optional phid', 'needMessages' => 'optional bool', 'bypassCache' => 'optional bool', ) + $this->getPagerParamTypes(); } protected function execute(ConduitAPIRequest $request) { $need_messages = $request->getValue('needMessages'); - $bypass_cache = $request->getValue('bypassCache'); $viewer = $request->getUser(); $query = id(new DiffusionCommitQuery()) ->setViewer($viewer) ->needCommitData(true); $repository_phid = $request->getValue('repositoryPHID'); if ($repository_phid) { $repository = id(new PhabricatorRepositoryQuery()) ->setViewer($viewer) ->withPHIDs(array($repository_phid)) ->executeOne(); if ($repository) { $query->withRepository($repository); - if ($bypass_cache) { - id(new DiffusionRepositoryClusterEngine()) - ->setViewer($viewer) - ->setRepository($repository) - ->synchronizeWorkingCopyBeforeRead(); - } } } $names = $request->getValue('names'); if ($names) { $query->withIdentifiers($names); } $ids = $request->getValue('ids'); if ($ids) { $query->withIDs($ids); } $phids = $request->getValue('phids'); if ($phids) { $query->withPHIDs($phids); } $pager = $this->newPager($request); $commits = $query->executeWithCursorPager($pager); $map = $query->getIdentifierMap(); $map = mpull($map, 'getPHID'); $data = array(); foreach ($commits as $commit) { $commit_data = $commit->getCommitData(); $uri = $commit->getURI(); $uri = PhabricatorEnv::getProductionURI($uri); $dict = array( 'id' => $commit->getID(), 'phid' => $commit->getPHID(), 'repositoryPHID' => $commit->getRepository()->getPHID(), 'identifier' => $commit->getCommitIdentifier(), 'epoch' => $commit->getEpoch(), 'authorEpoch' => $commit_data->getCommitDetail('authorEpoch'), 'uri' => $uri, 'isImporting' => !$commit->isImported(), 'summary' => $commit->getSummary(), 'authorPHID' => $commit->getAuthorPHID(), 'committerPHID' => $commit_data->getCommitDetail('committerPHID'), 'author' => $commit_data->getAuthorName(), 'authorName' => $commit_data->getCommitDetail('authorName'), 'authorEmail' => $commit_data->getCommitDetail('authorEmail'), 'committer' => $commit_data->getCommitDetail('committer'), 'committerName' => $commit_data->getCommitDetail('committerName'), 'committerEmail' => $commit_data->getCommitDetail('committerEmail'), 'hashes' => array(), ); - if ($bypass_cache) { - $lowlevel_commitref = id(new DiffusionLowLevelCommitQuery()) - ->setRepository($commit->getRepository()) - ->withIdentifier($commit->getCommitIdentifier()) - ->execute(); - - $dict['authorEpoch'] = $lowlevel_commitref->getAuthorEpoch(); - $dict['author'] = $lowlevel_commitref->getAuthor(); - $dict['authorName'] = $lowlevel_commitref->getAuthorName(); - $dict['authorEmail'] = $lowlevel_commitref->getAuthorEmail(); - $dict['committer'] = $lowlevel_commitref->getCommitter(); - $dict['committerName'] = $lowlevel_commitref->getCommitterName(); - $dict['committerEmail'] = $lowlevel_commitref->getCommitterEmail(); - - if ($need_messages) { - $dict['message'] = $lowlevel_commitref->getMessage(); - } - - foreach ($lowlevel_commitref->getHashes() as $hash) { - $dict['hashes'][] = array( - 'type' => $hash->getHashType(), - 'value' => $hash->getHashValue(), - ); - } - } - - if ($need_messages && !$bypass_cache) { + if ($need_messages) { $dict['message'] = $commit_data->getCommitMessage(); } $data[$commit->getPHID()] = $dict; } $result = array( 'data' => $data, 'identifierMap' => nonempty($map, (object)array()), ); return $this->addPagerResults($result, $pager); } }