From 28eae6082139ccde5b2c98c9cf3fbda0059813e4 Mon Sep 17 00:00:00 2001 From: Nick Harper Date: Thu, 10 Nov 2011 16:02:40 -0800 Subject: [PATCH] Check that rev is accepted in arc mark-committed --finalize Summary: If arc amend is run on a rev that isn't accepted, it runs arc mark-committed --finalize. The rev shouldn't be marked as committed if it hasn't been accepted, so this diff adds in that check. Test Plan: Ran arc amend on a rev that hasn't been accepted, checked that it didn't get marked as completed. Reviewers: jungejason, epriestley Reviewed By: epriestley CC: aran, epriestley, nh Differential Revision: 1104 --- src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php b/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php index 654b9718..a83b5f25 100644 --- a/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php +++ b/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php @@ -121,7 +121,7 @@ EOTEXT array( 'name' => $this->getWorkingCopy()->getProjectID(), )); - if ($project_info['tracked']) { + if ($project_info['tracked'] || $revision['statusName'] != 'Accepted') { $actually_mark = false; } }