Page MenuHomePhabricator
Files F15446379

D19280.diff
No OneTemporary
Actions

D19280.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -659,6 +659,7 @@
'DiffusionCommitAutocloseHeraldField' => 'applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php',
'DiffusionCommitBranchesController' => 'applications/diffusion/controller/DiffusionCommitBranchesController.php',
'DiffusionCommitBranchesHeraldField' => 'applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php',
+ 'DiffusionCommitBuildableTransaction' => 'applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php',
'DiffusionCommitCommitterHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php',
'DiffusionCommitCommitterProjectsHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php',
'DiffusionCommitConcernTransaction' => 'applications/diffusion/xaction/DiffusionCommitConcernTransaction.php',
@@ -5908,6 +5909,7 @@
'DiffusionCommitAutocloseHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitBranchesController' => 'DiffusionController',
'DiffusionCommitBranchesHeraldField' => 'DiffusionCommitHeraldField',
+ 'DiffusionCommitBuildableTransaction' => 'DiffusionCommitTransactionType',
'DiffusionCommitCommitterHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitCommitterProjectsHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitConcernTransaction' => 'DiffusionCommitAuditTransaction',
diff --git a/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php b/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
--- a/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
+++ b/src/applications/diffusion/harbormaster/DiffusionBuildableEngine.php
@@ -1,4 +1,37 @@
<?php
final class DiffusionBuildableEngine
- extends HarbormasterBuildableEngine {}
+ extends HarbormasterBuildableEngine {
+
+ public function publishBuildable(
+ HarbormasterBuildable $old,
+ HarbormasterBuildable $new) {
+
+ // Don't publish manual buildables.
+ if ($new->getIsManualBuildable()) {
+ return;
+ }
+
+ // Don't publish anything if the buildable status has not changed. At
+ // least for now, Diffusion handles buildable status exactly the same
+ // way that Harbormaster does.
+ $old_status = $old->getBuildableStatus();
+ $new_status = $new->getBuildableStatus();
+ if ($old_status === $new_status) {
+ return;
+ }
+
+ // Don't publish anything if the buildable is still building.
+ if ($new->isBuilding()) {
+ return;
+ }
+
+ $xaction = $this->newTransaction()
+ ->setMetadataValue('harbormaster:buildablePHID', $new->getPHID())
+ ->setTransactionType(DiffusionCommitBuildableTransaction::TRANSACTIONTYPE)
+ ->setNewValue($new->getBuildableStatus());
+
+ $this->applyTransactions(array($xaction));
+ }
+
+}
diff --git a/src/applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php b/src/applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php
new file mode 100644
--- /dev/null
+++ b/src/applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php
@@ -0,0 +1,89 @@
+<?php
+
+final class DiffusionCommitBuildableTransaction
+ extends DiffusionCommitTransactionType {
+
+ // NOTE: This uses an older constant for compatibility. We should perhaps
+ // migrate these at some point.
+ const TRANSACTIONTYPE = 'harbormaster:buildable';
+
+ public function generateNewValue($object, $value) {
+ return $value;
+ }
+
+ public function generateOldValue($object) {
+ return null;
+ }
+
+ public function getIcon() {
+ return $this->newBuildableStatus()->getIcon();
+ }
+
+ public function getColor() {
+ return $this->newBuildableStatus()->getColor();
+ }
+
+ public function getActionName() {
+ return $this->newBuildableStatus()->getActionName();
+ }
+
+ public function shouldHideForFeed() {
+ return !$this->newBuildableStatus()->isFailed();
+ }
+
+ public function shouldHideForMail() {
+ return !$this->newBuildableStatus()->isFailed();
+ }
+
+ public function getTitle() {
+ $new = $this->getNewValue();
+ $buildable_phid = $this->getBuildablePHID();
+
+ switch ($new) {
+ case HarbormasterBuildableStatus::STATUS_PASSED:
+ return pht(
+ '%s completed building %s.',
+ $this->renderAuthor(),
+ $this->renderHandle($buildable_phid));
+ case HarbormasterBuildableStatus::STATUS_FAILED:
+ return pht(
+ '%s failed to build %s!',
+ $this->renderAuthor(),
+ $this->renderHandle($buildable_phid));
+ }
+
+ return null;
+ }
+
+ public function getTitleForFeed() {
+ $new = $this->getNewValue();
+ $buildable_phid = $this->getBuildablePHID();
+
+ switch ($new) {
+ case HarbormasterBuildableStatus::STATUS_PASSED:
+ return pht(
+ '%s completed building %s for %s.',
+ $this->renderAuthor(),
+ $this->renderHandle($buildable_phid),
+ $this->renderObject());
+ case HarbormasterBuildableStatus::STATUS_FAILED:
+ return pht(
+ '%s failed to build %s for %s!',
+ $this->renderAuthor(),
+ $this->renderHandle($buildable_phid),
+ $this->renderObject());
+ }
+
+ return null;
+ }
+
+ private function newBuildableStatus() {
+ $new = $this->getNewValue();
+ return HarbormasterBuildableStatus::newBuildableStatusObject($new);
+ }
+
+ private function getBuildablePHID() {
+ return $this->getMetadataValue('harbormaster:buildablePHID');
+ }
+
+}
diff --git a/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php b/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
--- a/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
+++ b/src/applications/harbormaster/constants/HarbormasterBuildableStatus.php
@@ -39,6 +39,10 @@
return $this->getProperty('name');
}
+ public function getActionName() {
+ return $this->getProperty('name.action');
+ }
+
public function getColor() {
return $this->getProperty('color');
}
@@ -47,6 +51,14 @@
return ($this->key === self::STATUS_PREPARING);
}
+ public function isBuilding() {
+ return ($this->key === self::STATUS_BUILDING);
+ }
+
+ public function isFailed() {
+ return ($this->key === self::STATUS_FAILED);
+ }
+
public static function getOptionMap() {
return ipull(self::getSpecifications(), 'name');
}
@@ -57,21 +69,25 @@
'name' => pht('Preparing'),
'color' => 'blue',
'icon' => 'fa-hourglass-o',
+ 'name.action' => pht('Build Preparing'),
),
self::STATUS_BUILDING => array(
'name' => pht('Building'),
'color' => 'blue',
'icon' => 'fa-chevron-circle-right',
+ 'name.action' => pht('Build Started'),
),
self::STATUS_PASSED => array(
'name' => pht('Passed'),
'color' => 'green',
'icon' => 'fa-check-circle',
+ 'name.action' => pht('Build Passed'),
),
self::STATUS_FAILED => array(
'name' => pht('Failed'),
'color' => 'red',
'icon' => 'fa-times-circle',
+ 'name.action' => pht('Build Failed'),
),
);
}
@@ -86,6 +102,7 @@
'name' => pht('Unknown ("%s")', $status),
'icon' => 'fa-question-circle',
'color' => 'bluegrey',
+ 'name.action' => pht('Build Status'),
);
}
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
--- a/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildableEngine.php
@@ -45,7 +45,7 @@
return $this->object;
}
- final public function publishBuildable(
+ public function publishBuildable(
HarbormasterBuildable $old,
HarbormasterBuildable $new) {
return;
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -233,6 +233,10 @@
return $this->getBuildableStatusObject()->isPreparing();
}
+ public function isBuilding() {
+ return $this->getBuildableStatusObject()->isBuilding();
+ }
+
/* -( Messages )----------------------------------------------------------- */
diff --git a/src/applications/transactions/constants/PhabricatorTransactions.php b/src/applications/transactions/constants/PhabricatorTransactions.php
--- a/src/applications/transactions/constants/PhabricatorTransactions.php
+++ b/src/applications/transactions/constants/PhabricatorTransactions.php
@@ -9,7 +9,6 @@
const TYPE_JOIN_POLICY = 'core:join-policy';
const TYPE_EDGE = 'core:edge';
const TYPE_CUSTOMFIELD = 'core:customfield';
- const TYPE_BUILDABLE = 'harbormaster:buildable';
const TYPE_TOKEN = 'token:give';
const TYPE_INLINESTATE = 'core:inlinestate';
const TYPE_SPACE = 'core:space';
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -313,10 +313,6 @@
$types[] = PhabricatorTransactions::TYPE_CUSTOMFIELD;
}
- if ($this->object instanceof HarbormasterBuildableInterface) {
- $types[] = PhabricatorTransactions::TYPE_BUILDABLE;
- }
-
if ($this->object instanceof PhabricatorTokenReceiverInterface) {
$types[] = PhabricatorTransactions::TYPE_TOKEN;
}
@@ -469,7 +465,6 @@
case PhabricatorTransactions::TYPE_VIEW_POLICY:
case PhabricatorTransactions::TYPE_EDIT_POLICY:
case PhabricatorTransactions::TYPE_JOIN_POLICY:
- case PhabricatorTransactions::TYPE_BUILDABLE:
case PhabricatorTransactions::TYPE_TOKEN:
case PhabricatorTransactions::TYPE_INLINESTATE:
case PhabricatorTransactions::TYPE_SUBTYPE:
@@ -610,7 +605,6 @@
return $field->applyApplicationTransactionInternalEffects($xaction);
case PhabricatorTransactions::TYPE_CREATE:
case PhabricatorTransactions::TYPE_SUBTYPE:
- case PhabricatorTransactions::TYPE_BUILDABLE:
case PhabricatorTransactions::TYPE_TOKEN:
case PhabricatorTransactions::TYPE_VIEW_POLICY:
case PhabricatorTransactions::TYPE_EDIT_POLICY:
@@ -673,7 +667,6 @@
case PhabricatorTransactions::TYPE_CREATE:
case PhabricatorTransactions::TYPE_SUBTYPE:
case PhabricatorTransactions::TYPE_EDGE:
- case PhabricatorTransactions::TYPE_BUILDABLE:
case PhabricatorTransactions::TYPE_TOKEN:
case PhabricatorTransactions::TYPE_VIEW_POLICY:
case PhabricatorTransactions::TYPE_EDIT_POLICY:
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -54,7 +54,6 @@
public function shouldGenerateOldValue() {
switch ($this->getTransactionType()) {
- case PhabricatorTransactions::TYPE_BUILDABLE:
case PhabricatorTransactions::TYPE_TOKEN:
case PhabricatorTransactions::TYPE_CUSTOMFIELD:
case PhabricatorTransactions::TYPE_INLINESTATE:
@@ -339,12 +338,6 @@
break;
case PhabricatorTransactions::TYPE_TOKEN:
break;
- case PhabricatorTransactions::TYPE_BUILDABLE:
- $phid = $this->getMetadataValue('harbormaster:buildablePHID');
- if ($phid) {
- $phids[] = array($phid);
- }
- break;
}
if ($this->getComment()) {
@@ -470,8 +463,6 @@
return 'fa-ambulance';
}
return 'fa-link';
- case PhabricatorTransactions::TYPE_BUILDABLE:
- return 'fa-wrench';
case PhabricatorTransactions::TYPE_TOKEN:
return 'fa-trophy';
case PhabricatorTransactions::TYPE_SPACE:
@@ -515,14 +506,6 @@
return 'sky';
}
break;
- case PhabricatorTransactions::TYPE_BUILDABLE:
- switch ($this->getNewValue()) {
- case HarbormasterBuildableStatus::STATUS_PASSED:
- return 'green';
- case HarbormasterBuildableStatus::STATUS_FAILED:
- return 'red';
- }
- break;
}
return null;
}
@@ -679,15 +662,6 @@
switch ($this->getTransactionType()) {
case PhabricatorTransactions::TYPE_TOKEN:
return true;
- case PhabricatorTransactions::TYPE_BUILDABLE:
- switch ($this->getNewValue()) {
- case HarbormasterBuildableStatus::STATUS_FAILED:
- // For now, only ever send mail when builds fail. We might let
- // you customize this later, but in most cases this is probably
- // completely uninteresting.
- return false;
- }
- return true;
case PhabricatorTransactions::TYPE_EDGE:
$edge_type = $this->getMetadataValue('edge:type');
switch ($edge_type) {
@@ -742,16 +716,6 @@
switch ($this->getTransactionType()) {
case PhabricatorTransactions::TYPE_TOKEN:
return true;
- case PhabricatorTransactions::TYPE_BUILDABLE:
- switch ($this->getNewValue()) {
- case HarbormasterBuildableStatus::STATUS_FAILED:
- // For now, don't notify on build passes either. These are pretty
- // high volume and annoying, with very little present value. We
- // might want to turn them back on in the specific case of
- // build successes on the current document?
- return false;
- }
- return true;
case PhabricatorTransactions::TYPE_EDGE:
$edge_type = $this->getMetadataValue('edge:type');
switch ($edge_type) {
@@ -1027,30 +991,6 @@
$this->renderHandleLink($author_phid));
}
- case PhabricatorTransactions::TYPE_BUILDABLE:
- switch ($this->getNewValue()) {
- case HarbormasterBuildableStatus::STATUS_BUILDING:
- return pht(
- '%s started building %s.',
- $this->renderHandleLink($author_phid),
- $this->renderHandleLink(
- $this->getMetadataValue('harbormaster:buildablePHID')));
- case HarbormasterBuildableStatus::STATUS_PASSED:
- return pht(
- '%s completed building %s.',
- $this->renderHandleLink($author_phid),
- $this->renderHandleLink(
- $this->getMetadataValue('harbormaster:buildablePHID')));
- case HarbormasterBuildableStatus::STATUS_FAILED:
- return pht(
- '%s failed to build %s!',
- $this->renderHandleLink($author_phid),
- $this->renderHandleLink(
- $this->getMetadataValue('harbormaster:buildablePHID')));
- default:
- return null;
- }
-
case PhabricatorTransactions::TYPE_INLINESTATE:
$done = 0;
$undone = 0;
@@ -1239,32 +1179,6 @@
$this->renderHandleLink($author_phid),
$this->renderHandleLink($object_phid));
}
- case PhabricatorTransactions::TYPE_BUILDABLE:
- switch ($this->getNewValue()) {
- case HarbormasterBuildableStatus::STATUS_BUILDING:
- return pht(
- '%s started building %s for %s.',
- $this->renderHandleLink($author_phid),
- $this->renderHandleLink(
- $this->getMetadataValue('harbormaster:buildablePHID')),
- $this->renderHandleLink($object_phid));
- case HarbormasterBuildableStatus::STATUS_PASSED:
- return pht(
- '%s completed building %s for %s.',
- $this->renderHandleLink($author_phid),
- $this->renderHandleLink(
- $this->getMetadataValue('harbormaster:buildablePHID')),
- $this->renderHandleLink($object_phid));
- case HarbormasterBuildableStatus::STATUS_FAILED:
- return pht(
- '%s failed to build %s for %s.',
- $this->renderHandleLink($author_phid),
- $this->renderHandleLink(
- $this->getMetadataValue('harbormaster:buildablePHID')),
- $this->renderHandleLink($object_phid));
- default:
- return null;
- }
case PhabricatorTransactions::TYPE_COLUMNS:
$moves = $this->getInterestingMoves($new);
@@ -1421,15 +1335,6 @@
return pht('Changed Policy');
case PhabricatorTransactions::TYPE_SUBSCRIBERS:
return pht('Changed Subscribers');
- case PhabricatorTransactions::TYPE_BUILDABLE:
- switch ($this->getNewValue()) {
- case HarbormasterBuildableStatus::STATUS_PASSED:
- return pht('Build Passed');
- case HarbormasterBuildableStatus::STATUS_FAILED:
- return pht('Build Failed');
- default:
- return pht('Build Status');
- }
default:
return pht('Updated');
}
diff --git a/src/applications/transactions/storage/PhabricatorModularTransaction.php b/src/applications/transactions/storage/PhabricatorModularTransaction.php
--- a/src/applications/transactions/storage/PhabricatorModularTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransaction.php
@@ -100,6 +100,14 @@
return parent::shouldHideForFeed();
}
+ /* final */ public function shouldHideForMail(array $xactions) {
+ if ($this->getTransactionImplementation()->shouldHideForMail()) {
+ return true;
+ }
+
+ return parent::shouldHideForMail($xactions);
+ }
+
/* final */ public function getIcon() {
$icon = $this->getTransactionImplementation()->getIcon();
if ($icon !== null) {
diff --git a/src/applications/transactions/storage/PhabricatorModularTransactionType.php b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
--- a/src/applications/transactions/storage/PhabricatorModularTransactionType.php
+++ b/src/applications/transactions/storage/PhabricatorModularTransactionType.php
@@ -51,6 +51,10 @@
return false;
}
+ public function shouldHideForMail() {
+ return false;
+ }
+
public function getIcon() {
return null;
}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 28, 6:46 PM (6 d, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7707059
Default Alt Text
D19280.diff (18 KB)

Event Timeline

Phabricator · Built by Phacility