From 8f4e01f90e28ab519cdaafb02cf3e3daa3ccfbf2 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 27 Sep 2012 20:53:22 +0900 Subject: [PATCH] Add missing mail template examples to site init Add a few mail templates that were not being extracted during the site init. Also add missing mail template documentation. Change-Id: I66773ad1ca74d834b29bd6a7f3ee190633e30dc1 --- Documentation/config-mail.txt | 13 +++++++++++++ .../google/gerrit/pgm/init/SitePathInitializer.java | 3 +++ 2 files changed, 16 insertions(+) diff --git a/Documentation/config-mail.txt b/Documentation/config-mail.txt index bdf0c3a01a..ad0704f0f6 100644 --- a/Documentation/config-mail.txt +++ b/Documentation/config-mail.txt @@ -72,6 +72,13 @@ The `NewChange.vm` template will determine the contents of the email related to a user submitting a new change for review. It is a `ChangeEmail`: see `ChangeSubject.vm` and `ChangeFooter.vm`. +RebasedPatchSet.vm +~~~~~~~~~~~~~~~~~~ + +The `RebasedPatchSet.vm` template will determine the contents of the email +related to a user rebasing a patchset for a change through the Gerrit UI. +It is a `ChangeEmail`: see `ChangeSubject.vm` and `ChangeFooter.vm`. + RegisterNewEmail.vm ~~~~~~~~~~~~~~~~~~~ @@ -92,6 +99,12 @@ The `Restored.vm` template will determine the contents of the email related to a change being restored. It is a `ChangeEmail`: see `ChangeSubject.vm` and `ChangeFooter.vm`. +Reverted.vm +~~~~~~~~~~~ + +The `Reverted.vm` template will determine the contents of the email related +to a change being reverted. It is a `ChangeEmail`: see `ChangeSubject.vm` and +`ChangeFooter.vm`. Mail Variables and Methods diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java index ee3030d082..f8ef6370c5 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java @@ -92,8 +92,11 @@ public class SitePathInitializer { extractMailExample("Merged.vm"); extractMailExample("MergeFail.vm"); extractMailExample("NewChange.vm"); + extractMailExample("RebasedPatchSet.vm"); extractMailExample("RegisterNewEmail.vm"); extractMailExample("ReplacePatchSet.vm"); + extractMailExample("Restored.vm"); + extractMailExample("Reverted.vm"); if (!ui.isBatch()) { System.err.println();