Page MenuHomePhabricator
Files F15332846

D18743.diff
No OneTemporary
Actions

D18743.diff
View Options

diff --git a/src/differential/ArcanistDifferentialCommitMessage.php b/src/differential/ArcanistDifferentialCommitMessage.php
--- a/src/differential/ArcanistDifferentialCommitMessage.php
+++ b/src/differential/ArcanistDifferentialCommitMessage.php
@@ -38,6 +38,13 @@
return $this->revisionID;
}
+ public function getRevisionMonogram() {
+ if ($this->revisionID) {
+ return 'D'.$this->revisionID;
+ }
+ return null;
+ }
+
public function pullDataFromConduit(
ConduitClient $conduit,
$partial = false) {
diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -190,6 +190,16 @@
'param' => 'revision_id',
'help' => pht('Always update a specific revision.'),
),
+ 'draft' => array(
+ 'help' => pht(
+ 'Hold this revision as a draft instead of submitting it for '.
+ 'review.'),
+ 'conflicts' => array(
+ 'edit' => null,
+ 'only' => null,
+ 'update' => null,
+ ),
+ ),
'nounit' => array(
'help' => pht('Do not run unit tests.'),
),
@@ -511,9 +521,21 @@
$this->openURIsInBrowser(array($diff_info['uri']));
}
} else {
+ $is_draft = $this->getArgument('draft');
$revision['diffid'] = $this->getDiffID();
if ($commit_message->getRevisionID()) {
+ if ($is_draft) {
+ // TODO: In at least some cases, we could raise this earlier in the
+ // workflow to save users some time before the workflow aborts.
+ throw new ArcanistUsageException(
+ pht(
+ 'You are updating a revision ("%s") but have specified '.
+ 'the "--draft" flag. Only newly created revisions can be '.
+ 'held as drafts.',
+ $commit_message->getRevisionMonogram()));
+ }
+
$result = $conduit->callMethodSynchronous(
'differential.updaterevision',
$revision);
@@ -524,6 +546,9 @@
$this->writeScratchJSONFile($file, $messages);
}
+ $result_uri = $result['uri'];
+ $result_id = $result['revisionid'];
+
echo pht('Updated an existing Differential revision:')."\n";
} else {
// NOTE: We're either using "differential.revision.edit" (preferred)
@@ -537,6 +562,13 @@
'value' => $diff_info['phid'],
);
+ if ($is_draft) {
+ $xactions[] = array(
+ 'type' => 'draft',
+ 'value' => true,
+ );
+ }
+
$result = $conduit->callMethodSynchronous(
'differential.revision.edit',
array(
@@ -556,6 +588,14 @@
$result_uri = id(new PhutilURI($this->getConduitURI()))
->setPath('/D'.$result_id);
} else {
+ if ($is_draft) {
+ throw new ArcanistUsageException(
+ pht(
+ 'You have specified "--draft", but the version of Phabricator '.
+ 'on the server is too old to support draft revisions. Omit '.
+ 'the flag or upgrade the server software.'));
+ }
+
$revision = $this->dispatchWillCreateRevisionEvent($revision);
$result = $conduit->callMethodSynchronous(

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 8, 9:01 PM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7384401
Default Alt Text
D18743.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility