From d60c8f03e22f35aa12c00ec69ff8e6b14c7d7f86 Mon Sep 17 00:00:00 2001
From: Wyatt Allen <wyatta@google.com>
Date: Fri, 24 Feb 2017 13:09:37 -0800
Subject: [PATCH] Show unified diff in ReplacePatchSet emails

Bug: Issue 5599
Change-Id: I33eb769843d9a634cdb63d6240bfb0dfda65d0fe
---
 .../com/google/gerrit/server/mail/ReplacePatchSet.soy      | 7 +++++++
 .../com/google/gerrit/server/mail/ReplacePatchSetHtml.soy  | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
index e41bdda0b7..93c1c3b33e 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
@@ -60,4 +60,11 @@
         {$patchSet.refName}
     {\n}
   {/if}
+
+  {if $email.includeDiff}
+    {\n}
+    {\n}
+    {$email.unifiedDiff}
+    {\n}
+  {/if}
 {/template}
\ No newline at end of file
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
index 05c60a1f38..23a76309a0 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
@@ -49,4 +49,8 @@
           {$patchSet.refName}
     {/param}{/call}
   {/if}
+
+  {if $email.includeDiff}
+    {call .Pre}{param content: $email.unifiedDiff /}{/call}
+  {/if}
 {/template}