Page MenuHomePhabricator
Files F15408059

D18341.id.diff
No OneTemporary
Actions

D18341.id.diff
View Options

diff --git a/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php
--- a/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php
+++ b/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php
@@ -69,7 +69,7 @@
throw new ConduitException('ERR_BAD_REVISION');
}
- if ($revision->getStatus() == ArcanistDifferentialRevisionStatus::CLOSED) {
+ if ($revision->isPublished()) {
throw new ConduitException('ERR_CLOSED');
}
diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -44,6 +44,14 @@
return ($this->key === self::NEEDS_REVIEW);
}
+ public function isPublished() {
+ return ($this->key === self::PUBLISHED);
+ }
+
+ public function isChangePlanned() {
+ return ($this->key === self::CHANGES_PLANNED);
+ }
+
public static function newForLegacyStatus($legacy_status) {
$result = new self();
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -628,6 +628,14 @@
return $this->getStatusObject()->isNeedsReview();
}
+ public function isChangePlanned() {
+ return $this->getStatusObject()->isChangePlanned();
+ }
+
+ public function isPublished() {
+ return $this->getStatusObject()->isPublished();
+ }
+
public function getStatusIcon() {
return $this->getStatusObject()->getIcon();
}
diff --git a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
--- a/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionPlanChangesTransaction.php
@@ -56,9 +56,7 @@
}
protected function validateAction($object, PhabricatorUser $viewer) {
- $status_planned = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;
-
- if ($object->getStatus() == $status_planned) {
+ if ($object->isChangePlanned()) {
throw new Exception(
pht(
'You can not request review of this revision because this '.
diff --git a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
--- a/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionReopenTransaction.php
@@ -39,10 +39,7 @@
}
protected function validateAction($object, PhabricatorUser $viewer) {
- // Note that we're testing for "Closed", exactly, not just any closed
- // status.
- $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
- if ($object->getStatus() != $status_closed) {
+ if ($object->isPublished()) {
throw new Exception(
pht(
'You can not reopen this revision because it is not closed. '.
diff --git a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
--- a/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
+++ b/src/applications/differential/xaction/DifferentialRevisionRequestReviewTransaction.php
@@ -37,8 +37,7 @@
}
protected function validateAction($object, PhabricatorUser $viewer) {
- $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
- if ($object->getStatus() == $status_review) {
+ if ($object->isNeedsReview()) {
throw new Exception(
pht(
'You can not request review of this revision because this '.
diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
--- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
+++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
@@ -203,10 +203,7 @@
$revision->getID(),
$commit->getPHID());
- $status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
- $should_close = ($revision->getStatus() != $status_closed) &&
- $should_autoclose;
-
+ $should_close = !$revision->isPublished() && $should_autoclose;
if ($should_close) {
$commit_close_xaction = id(new DifferentialTransaction())
->setTransactionType(DifferentialTransaction::TYPE_ACTION)

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 9:11 PM (14 h, 2 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7688730
Default Alt Text
D18341.id.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility