Merge branch 'stable-2.13'
* stable-2.13:
Add project name to commit received hook
Always return the output from ref-update hook
Change-Id: Id86c2c7acf94e2a7b2e1a3e3af7c3637b054f65f
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/CommitReceived.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/CommitReceived.java
index 8f8ea57..bca5ab6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/CommitReceived.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/CommitReceived.java
@@ -17,6 +17,7 @@
import static com.google.gerrit.reviewdb.client.RefNames.REFS_CHANGES;
import static org.eclipse.jgit.lib.Constants.R_HEADS;
+import com.google.common.collect.ImmutableList;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.events.CommitReceivedEvent;
import com.google.gerrit.server.git.validators.CommitValidationException;
@@ -63,15 +64,22 @@
}
HookArgs args = hookFactory.createArgs();
- args.add("--project", receiveEvent.project.getName());
+ String projectName = receiveEvent.project.getName();
+ args.add("--project", projectName);
args.add("--refname", refname);
args.add("--uploader", user.getNameEmail());
args.add("--oldrev", old.name());
args.add("--newrev", receiveEvent.commit.name());
- HookResult result = hook.run(args);
- if (result != null && result.getExitValue() != 0) {
- throw new CommitValidationException(result.toString().trim());
+ HookResult result = hook.run(projectName, args);
+ if (result != null) {
+ String output = result.toString();
+ if (result.getExitValue() != 0) {
+ throw new CommitValidationException(output);
+ }
+ if (!output.isEmpty()) {
+ return ImmutableList.of(new CommitValidationMessage(output, false));
+ }
}
return Collections.emptyList();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/HookResult.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/HookResult.java
index c9711db..36dab41 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/HookResult.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/HookResult.java
@@ -57,6 +57,6 @@
sb.append(executionError);
}
- return sb.toString();
+ return sb.toString().trim();
}
}
