From c2713185777832936fc2242780a9bf09594f3874 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Wed, 1 May 2013 11:05:51 +0900
Subject: [PATCH] Remove `--force-message` option from the `review` command

Since 8c850ec the review message is always added even if labels
could not be applied, making the `--force-message` option redundant.

Remove the option from the command and the documentation.

Change-Id: Id10f8f4dc77988670584dea622e6708942320780
---
 Documentation/cmd-review.txt                    | 17 -----------------
 .../gerrit/sshd/commands/ReviewCommand.java     |  4 ----
 2 files changed, 21 deletions(-)

diff --git a/Documentation/cmd-review.txt b/Documentation/cmd-review.txt
index 65c21db838..70213da41a 100644
--- a/Documentation/cmd-review.txt
+++ b/Documentation/cmd-review.txt
@@ -11,7 +11,6 @@ SYNOPSIS
 'ssh' -p <port> <host> 'gerrit review'
   [--project <PROJECT> | -p <PROJECT>]
   [--message <MESSAGE> | -m <MESSAGE>]
-  [--force-message]
   [--submit | -s]
   [--abandon | --restore]
   [--publish]
@@ -51,22 +50,6 @@ OPTIONS
 	Optional cover letter to include as part of the message
 	sent to reviewers when the approval states are updated.
 
---force-message::
-	Option which allows Gerrit to publish the --message, even
-	when the labels could not be applied due to the change being
-	closed.
-+
-Used by some scripts/CI-systems, where the results (or links
-to the result) are posted as a message after completion of a
-build (often together with a label-change, indicating the success
-of the build).
-+
-If the message is posted successfully, the command will return
-successfully, even if the label could not be changed.
-+
-This option will not force the message to be posted if the command
-fails because the user is not permitted to change the label.
-
 --help::
 -h::
 	Display site-specific usage information, including the
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
index 5769a22bdb..ffbd251c84 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
@@ -105,10 +105,6 @@ public class ReviewCommand extends SshCommand {
   @Option(name = "--submit", aliases = "-s", usage = "submit the specified patch set(s)")
   private boolean submitChange;
 
-  @Option(name = "--force-message", usage = "publish the message, "
-      + "even if the label score cannot be applied due to the change being closed")
-  private boolean forceMessage = false;
-
   @Option(name = "--publish", usage = "publish the specified draft patch set(s)")
   private boolean publishPatchSet;