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

Convert diffusion.looksoon to use repository identifiers instead of callsigns

Browse source 
Summary:
Ref T4245. Like everything else, accept more identifiers.

This needs a change in `arc`, which I've made a note about elsewhere.

Test Plan: Used "Update Now" from web UI, saw update get scheduled.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T4245

Differential Revision: https://secure.phabricator.com/D14932
This commit is contained in:
epriestley 2016-01-02 12:03:08 -08:00
parent be5b89687e
commit 9febfb26a0
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/applications/differential/controller/DifferentialRevisionLandController.php
View file

@ -146,7 +146,7 @@ final class DifferentialRevisionLandController extends DifferentialController {
$looksoon = new ConduitCall( $looksoon = new ConduitCall(
'diffusion.looksoon', 'diffusion.looksoon',
array( array(
'callsigns' => array($repository->getCallsign()), 'repositories' => array($repository->getPHID()),
)); ));
$looksoon->setUser($request->getUser()); $looksoon->setUser($request->getUser());
$looksoon->execute(); $looksoon->execute();
@ -155,7 +155,7 @@ final class DifferentialRevisionLandController extends DifferentialController {
} }
private function lockRepository($repository) { private function lockRepository($repository) {
$lock_name = __CLASS__.':'.($repository->getCallsign()); $lock_name = __CLASS__.':'.($repository->getPHID());
$lock = PhabricatorGlobalLock::newLock($lock_name); $lock = PhabricatorGlobalLock::newLock($lock_name);
$lock->lock(); $lock->lock();
return $lock; return $lock;

14
src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php
View file

@ -24,7 +24,8 @@ final class DiffusionLookSoonConduitAPIMethod
protected function defineParamTypes() { protected function defineParamTypes() {
return array( return array(
'callsigns' => 'required list<string>', 'callsigns' => 'optional list<string> (deprecated)',
'repositories' => 'optional list<string>',
'urgency' => 'optional string', 'urgency' => 'optional string',
); );
} }
@ -33,14 +34,19 @@ final class DiffusionLookSoonConduitAPIMethod
// NOTE: The "urgency" parameter does nothing, it is just a hilarious joke // NOTE: The "urgency" parameter does nothing, it is just a hilarious joke
// which exemplifies the boundless clever wit of this project. // which exemplifies the boundless clever wit of this project.
$callsigns = $request->getValue('callsigns'); $identifiers = $request->getValue('repositories');
if (!$callsigns) {
if (!$identifiers) {
$identifiers = $request->getValue('callsigns');
}
if (!$identifiers) {
return null; return null;
} }
$repositories = id(new PhabricatorRepositoryQuery()) $repositories = id(new PhabricatorRepositoryQuery())
->setViewer($request->getUser()) ->setViewer($request->getUser())
->withCallsigns($callsigns) ->withIdentifiers($identifiers)
->execute(); ->execute();
foreach ($repositories as $repository) { foreach ($repositories as $repository) {

2
src/applications/diffusion/controller/DiffusionController.php
View file

@ -212,7 +212,7 @@ abstract class DiffusionController extends PhabricatorController {
'path' => '', 'path' => '',
)), )),
), ),
'r'.$drequest->getRepository()->getCallsign()); $drequest->getRepository()->getDisplayName());
$links[] = $divider; $links[] = $divider;
$accum = ''; $accum = '';
$last_key = last_key($path_parts); $last_key = last_key($path_parts);

4
src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php
View file

@ -25,8 +25,8 @@ final class DiffusionRepositoryEditUpdateController
if ($request->isFormPost()) { if ($request->isFormPost()) {
$params = array( $params = array(
'callsigns' => array( 'repositories' => array(
$repository->getCallsign(), $repository->getPHID(),
), ),
); );