Milo: Fix Gerrit CL reporting in buildbucket view

milo/appengine/buildbucket/common.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package buildbucket
 
 import (
         "fmt"
         "net/http"
         "strings"
@@ skipping 86 matching lines @@
                 default:
                         return 0, fmt.Errorf("unexpected buildbucket build result %q", build.Result)
                 }
 
         default:
                 return 0, fmt.Errorf("unexpected buildbucket build status %q", build.Status)
         }
 }
 
 // getChangeList tries to extract CL information from a buildbucket build.
-func getChangeList(build *buildbucket.ApiBuildMessage, params *buildParameters, resultDetails *resultDetails) *resp.Commit {
-        var result *resp.Commit
+func getChangeList(
+        build *buildbucket.ApiBuildMessage, params *buildParameters,
+        resultDetails *resultDetails) (result *resp.Commit) {
 
         prop := &params.Properties
         switch prop.PatchStorage {
         case "rietveld":
                 if prop.RietveldURL != "" && prop.Issue != 0 {
                         result = &resp.Commit{
                                 Revision:        resultDetails.Properties.GotRevision,
                                 RequestRevision: prop.Revision,
                                 Changelist: &resp.Link{
                                         Label: fmt.Sprintf("Rietveld CL %d", prop.Issue),
                                         URL:   fmt.Sprintf("%s/%d/#ps%d", prop.RietveldURL, prop.Issue, prop.PatchSet),
                                 },
                         }
                 }
 
         case "gerrit":
-                if prop.GerritURL != "" && prop.GerritChangeNumber != 0 {
+                if prop.GerritPatchURL != "" && prop.GerritPatchIssue != 0 {
+                        path := fmt.Sprintf("%d", prop.GerritPatchIssue)
+                        if prop.GerritPatchSet != 0 {
+                                path = fmt.Sprintf("%d/%d", prop.GerritPatchIssue, prop.GerritPatchSet)
+                        }
                         result = &resp.Commit{
-                                Revision:        prop.GerritPatchRef,
-                                RequestRevision: prop.GerritPatchRef,
                                 Changelist: &resp.Link{
-                                        Label: fmt.Sprintf("Gerrit CL %d", prop.GerritChangeNumber),
-                                        URL:   prop.GerritChangeURL,
+                                        Label: fmt.Sprintf("Gerrit CL %d", prop.GerritPatchIssue),
+                                        URL: fmt.Sprintf(
+                                                "%s/c/%s", prop.GerritPatchURL, path),
                                 },
                         }
                 }
         }
 
         if result != nil && len(params.Changes) != 0 {
                 // tryjobs have one change and it is the CL author
                 result.AuthorEmail = params.Changes[0].Author.Email
         }
 
-        return result
+        return
 }