Page MenuHomePhabricator
Files F15334852

D8425.diff
No OneTemporary
Actions

D8425.diff
View Options

Index: src/applications/differential/conduit/ConduitAPI_differential_Method.php
===================================================================
--- src/applications/differential/conduit/ConduitAPI_differential_Method.php
+++ src/applications/differential/conduit/ConduitAPI_differential_Method.php
@@ -1,8 +1,5 @@
<?php
-/**
- * @group conduit
- */
abstract class ConduitAPI_differential_Method extends ConduitAPIMethod {
public function getApplication() {
Index: src/applications/differential/conduit/ConduitAPI_differential_close_Method.php
===================================================================
--- src/applications/differential/conduit/ConduitAPI_differential_close_Method.php
+++ src/applications/differential/conduit/ConduitAPI_differential_close_Method.php
@@ -1,13 +1,10 @@
<?php
-/**
- * @group conduit
- */
final class ConduitAPI_differential_close_Method
- extends ConduitAPIMethod {
+ extends ConduitAPI_differential_Method {
public function getMethodDescription() {
- return "Close a Differential revision.";
+ return pht("Close a Differential revision.");
}
public function defineParamTypes() {
@@ -27,40 +24,34 @@
}
protected function execute(ConduitAPIRequest $request) {
+ $viewer = $request->getUser();
$id = $request->getValue('revisionID');
$revision = id(new DifferentialRevisionQuery())
->withIDs(array($id))
- ->setViewer($request->getUser())
- ->needRelationships(true)
+ ->setViewer($viewer)
->needReviewerStatus(true)
->executeOne();
if (!$revision) {
throw new ConduitException('ERR_NOT_FOUND');
}
- if ($revision->getStatus() == ArcanistDifferentialRevisionStatus::CLOSED) {
- // This can occur if someone runs 'close-revision' and hits a race, or
- // they have a remote hook installed but don't have the
- // 'remote_hook_installed' flag set, or similar. In any case, just treat
- // it as a no-op rather than adding another "X closed this revision"
- // message to the revision comments.
- return;
- }
+ $xactions = array();
+ $xactions[] = id(new DifferentialTransaction())
+ ->setTransactionType(DifferentialTransaction::TYPE_ACTION)
+ ->setNewValue(DifferentialAction::ACTION_CLOSE);
$content_source = PhabricatorContentSource::newForSource(
PhabricatorContentSource::SOURCE_CONDUIT,
array());
- $editor = new DifferentialCommentEditor(
- $revision,
- DifferentialAction::ACTION_CLOSE);
- $editor->setContentSource($content_source);
- $editor->setActor($request->getUser());
- $editor->save();
+ $editor = id(new DifferentialTransactionEditor())
+ ->setActor($viewer)
+ ->setContentSourceFromConduitRequest($request)
+ ->setContinueOnMissingFields(true)
+ ->setContinueOnNoEffect(true);
- $revision->setStatus(ArcanistDifferentialRevisionStatus::CLOSED);
- $revision->save();
+ $editor->applyTransactions($revision, $xactions);
return;
}
Index: src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
===================================================================
--- src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -450,6 +450,16 @@
PhabricatorContentSource::newFromRequest($request));
}
+ public function setContentSourceFromConduitRequest(
+ ConduitAPIRequest $request) {
+
+ $content_source = PhabricatorContentSource::newForSource(
+ PhabricatorContentSource::SOURCE_CONDUIT,
+ array());
+
+ return $this->setContentSource($content_source);
+ }
+
public function getContentSource() {
return $this->contentSource;
}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 9, 12:41 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7382987
Default Alt Text
D8425.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility