From 1b9a36a091e774a83b6cdd307ced193281d62fad Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Wed, 9 Apr 2014 13:48:41 +0200 Subject: [PATCH] Always auto confirm adding reviewers for set-reviewers SSH command If a group contains more than 'addreviewer.maxWithoutConfirmation' members adding it as reviewer to a change requires a confirmation. A user should only be asked for the confirmation when reviewers are added from the WebUI but not when the set-reviewers SSH command is used. This is also how 'addreviewer.maxWithoutConfirmation' is documented in 'config-gerrit.txt'. Bug: issue 2599 Change-Id: Ieab601e573115a0b034e1dcebe1c602adda6770b Signed-off-by: Edwin Kempin --- .../java/com/google/gerrit/server/change/PostReviewers.java | 2 +- .../com/google/gerrit/sshd/commands/SetReviewersCommand.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java index 13deeb06b8..faec4f7283 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java @@ -77,7 +77,7 @@ public class PostReviewers implements RestModifyView { public static class Input { @DefaultInput public String reviewer; - Boolean confirmed; + public Boolean confirmed; boolean confirmed() { return Objects.firstNonNull(confirmed, false); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java index 6dc79fff0e..c1facef5a8 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java @@ -139,6 +139,7 @@ public class SetReviewersCommand extends SshCommand { for (String reviewer : toAdd) { PostReviewers.Input input = new PostReviewers.Input(); input.reviewer = reviewer; + input.confirmed = true; String error; try { error = post.apply(changeRsrc, input).error;