revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-21 13:00:56 +01:00
Code Issues Releases Wiki Activity

Allow discovered but unparsed commits to be requested in Releeph

Browse source 
Summary:
Ref T3662. Releeph blocks users from requsting unparsed commits, but there's no real technical reason for this.

The `releephwork.getorigcommitmessage` method assumes data exists, but should be replaced with `diffusion.querycommits` anyway.

Test Plan: Ran `diffusion.querycommits`. Requested a commit.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T3662

Differential Revision: https://secure.phabricator.com/D8823
This commit is contained in:
epriestley 2014-04-20 11:55:29 -07:00
parent 1a3ac09975
commit 65913162e7
4 changed files with 20 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/__phutil_library_map__.php
View file

@ -239,7 +239,6 @@ phutil_register_library_map(array(
'ConduitAPI_releephwork_getbranch_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php',
'ConduitAPI_releephwork_getbranchcommitmessage_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php',
'ConduitAPI_releephwork_getcommitmessage_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php',
'ConduitAPI_releephwork_getorigcommitmessage_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_getorigcommitmessage_Method.php',
'ConduitAPI_releephwork_nextrequest_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php',
'ConduitAPI_releephwork_record_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php',
'ConduitAPI_releephwork_recordpickstatus_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php',
@ -2827,7 +2826,6 @@ phutil_register_library_map(array(
'ConduitAPI_releephwork_getbranch_Method' => 'ConduitAPI_releeph_Method',
'ConduitAPI_releephwork_getbranchcommitmessage_Method' => 'ConduitAPI_releeph_Method',
'ConduitAPI_releephwork_getcommitmessage_Method' => 'ConduitAPI_releeph_Method',
'ConduitAPI_releephwork_getorigcommitmessage_Method' => 'ConduitAPI_releeph_Method',
'ConduitAPI_releephwork_nextrequest_Method' => 'ConduitAPI_releeph_Method',
'ConduitAPI_releephwork_record_Method' => 'ConduitAPI_releeph_Method',
'ConduitAPI_releephwork_recordpickstatus_Method' => 'ConduitAPI_releeph_Method',

21
src/applications/diffusion/conduit/ConduitAPI_diffusion_querycommits_Method.php
View file

@ -17,6 +17,7 @@ final class ConduitAPI_diffusion_querycommits_Method
'phids' => 'optional list<phid>',
'names' => 'optional list<string>',
'repositoryPHID' => 'optional phid',
'needMessages' => 'optional bool',
) + $this->getPagerParamTypes();
}
@ -25,9 +26,15 @@ final class ConduitAPI_diffusion_querycommits_Method
}
protected function execute(ConduitAPIRequest $request) {
$need_messages = $request->getValue('needMessages');
$query = id(new DiffusionCommitQuery())
->setViewer($request->getUser());
if ($need_messages) {
$query->needCommitData(true);
}
$repository_phid = $request->getValue('repositoryPHID');
if ($repository_phid) {
$repository = id(new PhabricatorRepositoryQuery())
@ -67,7 +74,7 @@ final class ConduitAPI_diffusion_querycommits_Method
$uri = '/r'.$callsign.$identifier;
$uri = PhabricatorEnv::getProductionURI($uri);
$data[$commit->getPHID()] = array(
$dict = array(
'id' => $commit->getID(),
'phid' => $commit->getPHID(),
'repositoryPHID' => $commit->getRepository()->getPHID(),
@ -75,7 +82,19 @@ final class ConduitAPI_diffusion_querycommits_Method
'epoch' => $commit->getEpoch(),
'uri' => $uri,
'isImporting' => !$commit->isImported(),
'summary' => $commit->getSummary(),
);
if ($need_messages) {
$commit_data = $commit->getCommitData();
if ($commit_data) {
$dict['message'] = $commit_data->getCommitMessage();
} else {
$dict['message'] = null;
}
}
$data[$commit->getPHID()] = $dict;
}
$result = array(

35
src/applications/releeph/conduit/work/ConduitAPI_releephwork_getorigcommitmessage_Method.php
View file

@ -1,35 +0,0 @@
<?php
final class ConduitAPI_releephwork_getorigcommitmessage_Method
extends ConduitAPI_releeph_Method {
public function getMethodStatus() {
return self::METHOD_STATUS_UNSTABLE;
}
public function getMethodDescription() {
return "Return the original commit message for the given commit.";
}
public function defineParamTypes() {
return array(
'commitPHID' => 'required string',
);
}
public function defineReturnType() {
return 'nonempty string';
}
public function defineErrorTypes() {
return array();
}
protected function execute(ConduitAPIRequest $request) {
$commit = id(new PhabricatorRepositoryCommit())
->loadOneWhere('phid = %s', $request->getValue('commitPHID'));
$commit_data = $commit->loadCommitData();
$commit_message = $commit_data->getCommitMessage();
return trim($commit_message);
}
}

9
src/applications/releeph/controller/request/ReleephRequestEditController.php
View file

@ -109,15 +109,6 @@ final class ReleephRequestEditController extends ReleephBranchController {
$errors[] = $e->getMessage();
}
$pr_commit_data = null;
if (!$errors) {
$pr_commit_data = $pr_commit->loadCommitData();
if (!$pr_commit_data) {
$e_request_identifier = 'Not parsed yet';
$errors[] = "The requested commit hasn't been parsed yet.";
}
}
if (!$errors) {
$object_phid = $finder->getRequestedObjectPHID();
if (!$object_phid) {