Page MenuHomePhabricator
Files F14748682

D18628.diff
No OneTemporary
Actions

D18628.diff
View Options

diff --git a/src/applications/config/editor/PhabricatorConfigEditor.php b/src/applications/config/editor/PhabricatorConfigEditor.php
--- a/src/applications/config/editor/PhabricatorConfigEditor.php
+++ b/src/applications/config/editor/PhabricatorConfigEditor.php
@@ -107,9 +107,11 @@
return parent::transactionHasEffect($object, $xaction);
}
- protected function didApplyTransactions(array $xactions) {
+ protected function didApplyTransactions($object, array $xactions) {
// Force all the setup checks to run on the next page load.
PhabricatorSetupCheck::deleteSetupCheckCache();
+
+ return $xactions;
}
public static function storeNewValue(
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1528,4 +1528,102 @@
return array_reverse($xactions);
}
+
+ protected function didApplyTransactions($object, array $xactions) {
+ // If a draft revision has no outstanding builds and we're automatically
+ // making drafts public after builds finish, make the revision public.
+ $auto_undraft = true;
+
+ if ($object->isDraft() && $auto_undraft) {
+ $active_builds = $this->hasActiveBuilds($object);
+ if (!$active_builds) {
+ $xaction = $object->getApplicationTransactionTemplate()
+ ->setTransactionType(
+ DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE)
+ ->setOldValue(false)
+ ->setNewValue(true);
+
+ $xaction = $this->populateTransaction($object, $xaction);
+
+ // If we're creating this revision and immediately moving it out of
+ // the draft state, mark this as a create transaction so it gets
+ // hidden in the timeline and mail, since it isn't interesting: it
+ // is as though the draft phase never happened.
+ if ($this->getIsNewObject()) {
+ $xaction->setIsCreateTransaction(true);
+ }
+
+ $object->openTransaction();
+ $object
+ ->setStatus(DifferentialRevisionStatus::NEEDS_REVIEW)
+ ->save();
+
+ $xaction->save();
+ $object->saveTransaction();
+
+ $xactions[] = $xaction;
+ }
+ }
+
+ return $xactions;
+ }
+
+ private function hasActiveBuilds($object) {
+ $viewer = $this->requireActor();
+ $diff = $object->getActiveDiff();
+
+ $buildables = id(new HarbormasterBuildableQuery())
+ ->setViewer($viewer)
+ ->withContainerPHIDs(array($object->getPHID()))
+ ->withBuildablePHIDs(array($diff->getPHID()))
+ ->withManualBuildables(false)
+ ->execute();
+ if (!$buildables) {
+ return false;
+ }
+
+ $builds = id(new HarbormasterBuildQuery())
+ ->setViewer($viewer)
+ ->withBuildablePHIDs(mpull($buildables, 'getPHID'))
+ ->withBuildStatuses(
+ array(
+ HarbormasterBuildStatus::STATUS_INACTIVE,
+ HarbormasterBuildStatus::STATUS_PENDING,
+ HarbormasterBuildStatus::STATUS_BUILDING,
+ HarbormasterBuildStatus::STATUS_FAILED,
+ HarbormasterBuildStatus::STATUS_ABORTED,
+ HarbormasterBuildStatus::STATUS_ERROR,
+ HarbormasterBuildStatus::STATUS_PAUSED,
+ HarbormasterBuildStatus::STATUS_DEADLOCKED,
+ ))
+ ->needBuildTargets(true)
+ ->execute();
+ if (!$builds) {
+ return false;
+ }
+
+ $active = array();
+ foreach ($builds as $key => $build) {
+ foreach ($build->getBuildTargets() as $target) {
+ if ($target->isAutotarget()) {
+ // Ignore autotargets when looking for active of failed builds. If
+ // local tests fail and you continue anyway, you don't need to
+ // double-confirm them.
+ continue;
+ }
+
+ // This build has at least one real target that's doing something.
+ $active[$key] = $build;
+ break;
+ }
+ }
+
+ if (!$active) {
+ return false;
+ }
+
+ return true;
+ }
+
+
}
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
@@ -1105,7 +1105,7 @@
$this->heraldForcedEmailPHIDs = $adapter->getForcedEmailPHIDs();
}
- $this->didApplyTransactions($xactions);
+ $xactions = $this->didApplyTransactions($object, $xactions);
if ($object instanceof PhabricatorCustomFieldInterface) {
// Maybe this makes more sense to move into the search index itself? For
@@ -1234,9 +1234,9 @@
return $xactions;
}
- protected function didApplyTransactions(array $xactions) {
+ protected function didApplyTransactions($object, array $xactions) {
// Hook for subclasses.
- return;
+ return $xactions;
}

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 11:01 AM (6 h, 26 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7031008
Default Alt Text
D18628.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility