Merge "Clarify error msg when user's not allowed to '--force push'."

gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java

@@ -15,6 +15,7 @@
 package com.google.gerrit.common.data;
 
 public class PermissionRule implements Comparable<PermissionRule> {
+  public static final String FORCE_PUSH = "Force Push";
   public static enum Action {
     ALLOW, DENY, BLOCK,
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionRuleEditor.java

@@ -137,6 +137,7 @@ public class PermissionRuleEditor extends Composite implements
       String ref = section.getName();
       canForce = !ref.startsWith("refs/for/") && !ref.startsWith("^refs/for/");
     }
+    force.setText(PermissionRule.FORCE_PUSH);
     force.setVisible(canForce);
     force.setEnabled(!readOnly);
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionRuleEditor.ui.xml

@@ -80,14 +80,7 @@ limitations under the License.
 
   <q:Hyperlink ui:field='groupNameLink' styleName='{style.groupName}'/>
   <span ui:field='groupNameSpan' styleName='{style.groupName}'/>
-
+  <g:CheckBox ui:field='force' addStyleNames='{style.forcePush}'/>
-  <g:CheckBox
-      ui:field='force'
-      addStyleNames='{style.forcePush}'
-      text='Force Push'>
-    <ui:attribute name='text'/>
-  </g:CheckBox>
-
   <g:Anchor
       ui:field='deleteRule'
       href='javascript:void'

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

@@ -19,6 +19,7 @@ import com.google.gerrit.common.PageLinks;
 import com.google.gerrit.common.data.ApprovalType;
 import com.google.gerrit.common.data.ApprovalTypes;
 import com.google.gerrit.common.data.Capable;
+import com.google.gerrit.common.data.PermissionRule;
 import com.google.gerrit.common.errors.NoSuchAccountException;
 import com.google.gerrit.reviewdb.Account;
 import com.google.gerrit.reviewdb.ApprovalCategory;
@@ -597,7 +598,8 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
     if (ctl.canForceUpdate()) {
       // Let the core receive process handle it
     } else {
-      cmd.setResult(ReceiveCommand.Result.REJECTED_NONFASTFORWARD);
+      cmd.setResult(ReceiveCommand.Result.REJECTED_NONFASTFORWARD, " need '"
+          + PermissionRule.FORCE_PUSH + "' privilege.");
     }
   }