Prevent draft changes from being abandoned

When a draft change is abandoned it is currently published to all
users by setting the status to ABANDONED.  Restoring the change will
effectively publish the change as /restore sets the status to NEW.

To not complicate the workflow, prevent draft changes from being
abandoned.

Change-Id: If747264fa66a2139e0d8f13987125d853ec3bed9

1 files changed, 3 insertions, 0 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java
index 4959cfb0e3..b406af01a1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java
@@ -85,6 +85,8 @@ public class Abandon implements RestModifyView<ChangeResource, Input>,
       throw new AuthException("abandon not permitted");
     } else if (!change.getStatus().isOpen()) {
       throw new ResourceConflictException("change is " + status(change));
+    } else if (change.getStatus() == Change.Status.DRAFT) {
+      throw new ResourceConflictException("draft changes cannot be abandoned");
     }
 
     ChangeMessage message;
@@ -141,6 +143,7 @@ public class Abandon implements RestModifyView<ChangeResource, Input>,
       .setLabel("Abandon")
       .setTitle("Abandon the change")
       .setVisible(resource.getChange().getStatus().isOpen()
+          && resource.getChange().getStatus() != Change.Status.DRAFT
           && resource.getControl().canAbandon());
   }