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

Allow pre-commit adapter to use custom actions

Browse source 
Summary: Looks like I missed this when implementing custom actions and hence you can't currently use custom actions on the pre-commit adapters.

Test Plan: Added a custom action to a pre-commit Herald rule.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D10316
This commit is contained in:
James Rhodes 2014-08-28 10:59:30 +10:00
parent b163883d88
commit 2fd395e859
5 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/applications/diffusion/herald/HeraldPreCommitAdapter.php
View file

@ -72,16 +72,20 @@ abstract class HeraldPreCommitAdapter extends HeraldAdapter {
switch ($rule_type) {
case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
return array(
self::ACTION_BLOCK,
self::ACTION_EMAIL,
self::ACTION_NOTHING
);
return array_merge(
array(
self::ACTION_BLOCK,
self::ACTION_EMAIL,
self::ACTION_NOTHING,
),
parent::getActions($rule_type));
case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
return array(
self::ACTION_EMAIL,
self::ACTION_NOTHING,
);
return array_merge(
array(
self::ACTION_EMAIL,
self::ACTION_NOTHING,
),
parent::getActions($rule_type));
}
}
@ -118,7 +122,15 @@ abstract class HeraldPreCommitAdapter extends HeraldAdapter {
pht('Blocked push.'));
break;
default:
throw new Exception(pht('No rules to handle action "%s"!', $action));
$custom_result = parent::handleCustomHeraldEffect($effect);
if ($custom_result === null) {
throw new Exception(pht(
"No rules to handle action '%s'.",
$action));
}
$result[] = $custom_result;
break;
}
}

4
src/applications/herald/adapter/HeraldCommitAdapter.php
View file

@ -544,7 +544,9 @@ final class HeraldCommitAdapter extends HeraldAdapter {
default:
$custom_result = parent::handleCustomHeraldEffect($effect);
if ($custom_result === null) {
throw new Exception("No rules to handle action '{$action}'.");
throw new Exception(pht(
"No rules to handle action '%s'.",
$action));
}
$result[] = $custom_result;

4
src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
View file

@ -422,7 +422,9 @@ final class HeraldDifferentialRevisionAdapter
default:
$custom_result = parent::handleCustomHeraldEffect($effect);
if ($custom_result === null) {
throw new Exception("No rules to handle action '{$action}'.");
throw new Exception(pht(
"No rules to handle action '%s'.",
$action));
}
$result[] = $custom_result;

4
src/applications/herald/adapter/HeraldManiphestTaskAdapter.php
View file

@ -207,7 +207,9 @@ final class HeraldManiphestTaskAdapter extends HeraldAdapter {
default:
$custom_result = parent::handleCustomHeraldEffect($effect);
if ($custom_result === null) {
throw new Exception("No rules to handle action '{$action}'.");
throw new Exception(pht(
"No rules to handle action '%s'.",
$action));
}
$result[] = $custom_result;

4
src/applications/herald/adapter/HeraldPholioMockAdapter.php
View file

@ -139,7 +139,9 @@ final class HeraldPholioMockAdapter extends HeraldAdapter {
default:
$custom_result = parent::handleCustomHeraldEffect($effect);
if ($custom_result === null) {
throw new Exception("No rules to handle action '{$action}'.");
throw new Exception(pht(
"No rules to handle action '%s'.",
$action));
}
$result[] = $custom_result;