diff --git a/Documentation/config-hooks.txt b/Documentation/config-hooks.txt index 0f4d0945cb..4635f805e9 100644 --- a/Documentation/config-hooks.txt +++ b/Documentation/config-hooks.txt @@ -41,7 +41,7 @@ This is called whenever a patchset is created (this includes new changes and drafts). ==== - patchset-created --change --is-draft --change-url --project --branch --topic --uploader --commit --patchset + patchset-created --change --is-draft --change-url --change-owner --project --branch --topic --uploader --commit --patchset ==== === draft-published @@ -49,7 +49,7 @@ changes and drafts). This is called whenever a draft change is published. ==== - draft-published --change --change-url --project --branch --topic --uploader --commit --patchset + draft-published --change --change-url --change-owner --project --branch --topic --uploader --commit --patchset ==== === comment-added @@ -57,7 +57,7 @@ This is called whenever a draft change is published. This is called whenever a comment is added to a change. ==== - comment-added --change --is-draft --change-url --project --branch --topic --author --commit --comment [-- -- ...] + comment-added --change --is-draft --change-url --change-owner --project --branch --topic --author --commit --comment [-- -- ...] ==== === change-merged @@ -65,7 +65,7 @@ This is called whenever a comment is added to a change. Called whenever a change has been merged. ==== - change-merged --change --change-url --project --branch --topic --submitter --commit + change-merged --change --change-url --change-owner --project --branch --topic --submitter --commit ==== === merge-failed @@ -73,7 +73,7 @@ Called whenever a change has been merged. Called whenever a change has failed to merge. ==== - merge-failed --change --change-url --project --branch --topic --submitter --commit --reason + merge-failed --change --change-url --change-owner --project --branch --topic --submitter --commit --reason ==== === change-abandoned @@ -81,7 +81,7 @@ Called whenever a change has failed to merge. Called whenever a change has been abandoned. ==== - change-abandoned --change --change-url --project --branch --topic --abandoner --commit --reason + change-abandoned --change --change-url --change-owner --project --branch --topic --abandoner --commit --reason ==== === change-restored @@ -89,7 +89,7 @@ Called whenever a change has been abandoned. Called whenever a change has been restored. ==== - change-restored --change --change-url --project --branch --topic --restorer --commit --reason + change-restored --change --change-url --change-owner --project --branch --topic --restorer --commit --reason ==== === ref-updated @@ -105,7 +105,7 @@ Called whenever a ref has been updated. Called whenever a reviewer is added to a change. ==== - reviewer-added --change --change-url --project --branch --reviewer + reviewer-added --change --change-url --change-owner --project --branch --reviewer ==== === topic-changed @@ -113,7 +113,7 @@ Called whenever a reviewer is added to a change. Called whenever a change's topic is changed from the Web UI or via the REST API. ==== - topic-changed --change --project --branch --changer --old-topic --new-topic + topic-changed --change --change-owner --project --branch --changer --old-topic --new-topic ==== === cla-signed diff --git a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java index 17940c0806..09cdc852ca 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java @@ -349,6 +349,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final ReviewDb db) throws OrmException { final PatchSetCreatedEvent event = new PatchSetCreatedEvent(); final AccountState uploader = accountCache.get(patchSet.getUploader()); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.patchSet = eventFactory.asPatchSetAttribute(patchSet); @@ -359,6 +360,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { addArg(args, "--change", event.change.id); addArg(args, "--is-draft", patchSet.isDraft() ? "true" : "false"); addArg(args, "--change-url", event.change.url); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--topic", event.change.topic); @@ -373,6 +375,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final ReviewDb db) throws OrmException { final DraftPublishedEvent event = new DraftPublishedEvent(); final AccountState uploader = accountCache.get(patchSet.getUploader()); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.patchSet = eventFactory.asPatchSetAttribute(patchSet); @@ -382,6 +385,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final List args = new ArrayList(); addArg(args, "--change", event.change.id); addArg(args, "--change-url", event.change.url); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--topic", event.change.topic); @@ -396,6 +400,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final PatchSet patchSet, final String comment, final Map approvals, final ReviewDb db) throws OrmException { final CommentAddedEvent event = new CommentAddedEvent(); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.author = eventFactory.asAccountAttribute(account); @@ -417,6 +422,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { addArg(args, "--change", event.change.id); addArg(args, "--is-draft", patchSet.isDraft() ? "true" : "false"); addArg(args, "--change-url", event.change.url); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--topic", event.change.topic); @@ -436,6 +442,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { public void doChangeMergedHook(final Change change, final Account account, final PatchSet patchSet, final ReviewDb db) throws OrmException { final ChangeMergedEvent event = new ChangeMergedEvent(); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.submitter = eventFactory.asAccountAttribute(account); @@ -445,6 +452,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final List args = new ArrayList(); addArg(args, "--change", event.change.id); addArg(args, "--change-url", event.change.url); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--topic", event.change.topic); @@ -458,6 +466,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final PatchSet patchSet, final String reason, final ReviewDb db) throws OrmException { final MergeFailedEvent event = new MergeFailedEvent(); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.submitter = eventFactory.asAccountAttribute(account); @@ -468,6 +477,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final List args = new ArrayList(); addArg(args, "--change", event.change.id); addArg(args, "--change-url", event.change.url); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--topic", event.change.topic); @@ -482,6 +492,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final PatchSet patchSet, final String reason, final ReviewDb db) throws OrmException { final ChangeAbandonedEvent event = new ChangeAbandonedEvent(); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.abandoner = eventFactory.asAccountAttribute(account); @@ -492,6 +503,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final List args = new ArrayList(); addArg(args, "--change", event.change.id); addArg(args, "--change-url", event.change.url); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--topic", event.change.topic); @@ -506,6 +518,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final PatchSet patchSet, final String reason, final ReviewDb db) throws OrmException { final ChangeRestoredEvent event = new ChangeRestoredEvent(); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.restorer = eventFactory.asAccountAttribute(account); @@ -516,6 +529,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final List args = new ArrayList(); addArg(args, "--change", event.change.id); addArg(args, "--change-url", event.change.url); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--topic", event.change.topic); @@ -554,6 +568,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { public void doReviewerAddedHook(final Change change, final Account account, final PatchSet patchSet, final ReviewDb db) throws OrmException { final ReviewerAddedEvent event = new ReviewerAddedEvent(); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.patchSet = eventFactory.asPatchSetAttribute(patchSet); @@ -563,6 +578,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final List args = new ArrayList(); addArg(args, "--change", event.change.id); addArg(args, "--change-url", event.change.url); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--reviewer", getDisplayName(account)); @@ -574,6 +590,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final String oldTopic, final ReviewDb db) throws OrmException { final TopicChangedEvent event = new TopicChangedEvent(); + final AccountState owner = accountCache.get(change.getOwner()); event.change = eventFactory.asChangeAttribute(change); event.changer = eventFactory.asAccountAttribute(account); @@ -582,6 +599,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final List args = new ArrayList(); addArg(args, "--change", event.change.id); + addArg(args, "--change-owner", getDisplayName(owner.getAccount())); addArg(args, "--project", event.change.project); addArg(args, "--branch", event.change.branch); addArg(args, "--changer", getDisplayName(account));