From eaa565747ec78e5e9e2dd3658c273d7acad653d5 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 1 Feb 2012 14:32:43 -0800 Subject: [PATCH] Run 'mark-committed' from 'arc land' Summary: - Remove "new and experimental" because arc land is super awesome and great. - Run the 'mark-committed' finalize workflow after pushing for untracked repo setups. Test Plan: Ran "arc mark-committed --quiet --finalize 123". Will run "arc land" on this. so lazy Reviewers: cpiro, btrahan Reviewed By: cpiro CC: aran, epriestley Maniphest Tasks: T819 Differential Revision: https://secure.phabricator.com/D1538 --- src/workflow/land/ArcanistLandWorkflow.php | 13 +++++++++---- .../ArcanistMarkCommittedWorkflow.php | 15 ++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/workflow/land/ArcanistLandWorkflow.php b/src/workflow/land/ArcanistLandWorkflow.php index 742896d1..f81f7349 100644 --- a/src/workflow/land/ArcanistLandWorkflow.php +++ b/src/workflow/land/ArcanistLandWorkflow.php @@ -81,10 +81,6 @@ EOTEXT } public function run() { - $this->writeStatusMessage( - phutil_console_format( - "**WARNING:** 'arc land' is new and experimental.\n")); - $branch = $this->getArgument('branch'); if (count($branch) !== 1) { throw new ArcanistUsageException( @@ -257,6 +253,15 @@ EOTEXT throw new ArcanistUsageException("'git push' failed."); } + $mark_workflow = $this->buildChildWorkflow( + 'mark-committed', + array( + '--finalize', + '--quiet', + $revision['id'], + )); + $mark_workflow->run(); + echo "\n"; } diff --git a/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php b/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php index 6d4a326d..e8bbfa2f 100644 --- a/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php +++ b/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php @@ -45,6 +45,9 @@ EOTEXT "revision is accepted. Continue even if the mark can't happen. This ". "is a soft version of 'mark-committed' used by other workflows.", ), + 'quiet' => array( + 'help' => 'Do not print a success message.', + ), '*' => 'revision', ); } @@ -149,11 +152,13 @@ EOTEXT $is_finalized = false; } - if ($is_finalized) { - $message = $this->getRepositoryAPI()->getFinalizedRevisionMessage(); - echo phutil_console_wrap($message)."\n"; - } else { - echo "Done.\n"; + if (!$this->getArgument('quiet')) { + if ($is_finalized) { + $message = $this->getRepositoryAPI()->getFinalizedRevisionMessage(); + echo phutil_console_wrap($message)."\n"; + } else { + echo "Done.\n"; + } } return 0;