From 535cd5e0ac5559a3624dd89622eac78a7c20fcc2 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Wed, 11 Nov 2015 16:26:08 -0700 Subject: [PATCH] Move doRefUpdatedHook to validateForReceiveCommits This means that doRefUpdatedHook() will be called for every commit pushed in chain instead of once for the whole chain. This is not ideal, and likely slow. This is being done in anticipation of moving hooks to a plugin, which requires making them fire off of events. There are already 2 validating event types for commits, and we don't really want to make a third. This at least allows it to run from a plugin. Change-Id: I5905c44c7df448a353263cbc0a79a48776cb0965 --- .../google/gerrit/server/git/ReceiveCommits.java | 13 ------------- .../server/git/validators/CommitValidators.java | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 4d2880bc59..4e4a9933b1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -897,19 +897,6 @@ public class ReceiveCommits { continue; } - HookResult result = hooks.doRefUpdateHook(project, cmd.getRefName(), - user.getAccount(), cmd.getOldId(), - cmd.getNewId()); - - if (result != null) { - final String message = result.toString().trim(); - if (result.getExitValue() != 0) { - reject(cmd, message); - continue; - } - rp.sendMessage(message); - } - if (MagicBranch.isMagicBranch(cmd.getRefName())) { parseMagicBranch(cmd); continue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java index a48260e461..db57af7f2e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -131,6 +131,7 @@ public class CommitValidators { validators.add(new ConfigValidator(refControl, repo)); validators.add(new BannedCommitsValidator(rejectCommits)); validators.add(new PluginCommitValidationListener(commitValidationListeners)); + validators.add(new ChangeHookValidator(refControl, hooks)); List messages = new LinkedList<>();