From 37340ffc2f341e23f031cf2c33e6dc1a7836250b Mon Sep 17 00:00:00 2001
From: Andrew Gerrand <adg@golang.org>
Date: Fri, 12 Sep 2014 11:14:03 +1000
Subject: [PATCH] go.tools/dashboard: use shorter notification template for cl
 updates

LGTM=dvyukov
R=dvyukov
CC=golang-codereviews
https://golang.org/cl/139320043
---
 dashboard/app/build/notify.go       | 14 +++++++++++---
 dashboard/app/build/perf_notify.txt |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dashboard/app/build/notify.go b/dashboard/app/build/notify.go
index 429dfc1c..bb12b21b 100644
--- a/dashboard/app/build/notify.go
+++ b/dashboard/app/build/notify.go
@@ -323,10 +323,10 @@ func sendPerfMailFunc(c appengine.Context, com *Commit, prevCommitHash, builder
 
 	u := fmt.Sprintf("http://%v/perfdetail?commit=%v&commit0=%v&kind=builder&builder=%v", domain, com.Hash, prevCommitHash, builder)
 
-	// prepare mail message
+	// Prepare mail message (without Commit, for updateCL).
 	var body bytes.Buffer
 	err := sendPerfMailTmpl.Execute(&body, map[string]interface{}{
-		"Builder": builder, "Commit": com, "Hostname": domain, "Url": u, "Benchmarks": benchmarks,
+		"Builder": builder, "Hostname": domain, "Url": u, "Benchmarks": benchmarks,
 	})
 	if err != nil {
 		c.Errorf("rendering perf mail template: %v", err)
@@ -339,7 +339,15 @@ func sendPerfMailFunc(c appengine.Context, com *Commit, prevCommitHash, builder
 		return
 	}
 
-	// Otherwise, send mail.
+	// Otherwise, send mail (with Commit, for independent mail message).
+	body.Reset()
+	err = sendPerfMailTmpl.Execute(&body, map[string]interface{}{
+		"Builder": builder, "Commit": com, "Hostname": domain, "Url": u, "Benchmarks": benchmarks,
+	})
+	if err != nil {
+		c.Errorf("rendering perf mail template: %v", err)
+		return
+	}
 	subject := fmt.Sprintf("Perf changes on %s by %s", builder, shortDesc(com.Desc))
 	msg := &mail.Message{
 		Sender:  mailFrom,
diff --git a/dashboard/app/build/perf_notify.txt b/dashboard/app/build/perf_notify.txt
index 1e5e2bb7..c5e8ebe2 100644
--- a/dashboard/app/build/perf_notify.txt
+++ b/dashboard/app/build/perf_notify.txt
@@ -1,8 +1,10 @@
-Change {{shortHash .Commit.Hash}} caused perf changes on {{.Builder}}:
+{{if .Commit}}Change {{shortHash .Commit.Hash}} caused perf changes on {{.Builder}}:
 
 {{.Commit.Desc}}
 
 http://code.google.com/p/go/source/detail?r={{shortHash .Commit.Hash}}
+{{else}}This changed caused perf changes on {{.Builder}}:
+{{end}}
 {{range $b := .Benchmarks}}
 {{printf "%-16s %12s %12s %10s" $b.Name "old" "new" "delta"}}
 {{range $m := $b.Metrics}}{{printf "%-16s %12v %12v %+10.2f" $m.Name $m.Old $m.New $m.Delta}}