Milo buildbot: Add in the rest of the blame/commits information.

milo/appengine/buildbot/build.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 buildbot
 
 import (
         "encoding/json"
         "errors"
         "fmt"
@@ skipping 362 matching lines @@
         sort.Strings(groupNames)
         for _, k := range groupNames {
                 group := groups[k]
                 // Also take this oppertunity to sort the properties within the groups.
                 sort.Sort(group)
                 result = append(result, group)
         }
         return
 }
 
+type bbFile struct {

[nodir, 2017/04/19 18:37:48]

what is this? i don't see its usage

[hinoka, 2017/04/20 22:09:43]

Oops, this wasn't supposed to be here.

+        Name string      `json:"name"`
+        Url  interface{} `json:"url"`
+}
+
 // blame extracts the commit and blame information from a buildbot build and
 // returns it as a list of Commits.
 func blame(b *buildbotBuild) (result []*resp.Commit) {
         for _, c := range b.Sourcestamp.Changes {
-                files := make([]string, len(c.Files))
-                for i, f := range c.Files {
-                        // Buildbot stores files both as a string, or as a dict with a single entry
-                        // named "name".  It doesn't matter to us what the type is, but we need
-                        // to reflect on the type anyways.
-                        if fn, ok := f.(string); ok {
-                                files[i] = fn
-                        } else if fn, ok := f.(struct{ Name string }); ok {
-                                files[i] = fn.Name
-                        }
-                }
+                files := c.GetFiles()
                 result = append(result, &resp.Commit{
                         AuthorEmail: c.Who,
                         Repo:        c.Repository,
-                        Revision:    c.Revision,
+                        CommitTime:  time.Unix(int64(c.When), 0),
+                        Revision: &resp.Link{
+                                URL:   c.Revlink,
+                                Label: c.Revision,
+                        },
                         Description: c.Comments,
                         Title:       strings.Split(c.Comments, "\n")[0],
                         File:        files,
                 })
         }
         return
 }
 
 // sourcestamp extracts the source stamp from various parts of a buildbot build,
 // including the properties.
 func sourcestamp(c context.Context, b *buildbotBuild) *resp.SourceStamp {
         ss := &resp.SourceStamp{}
         rietveld := ""
+        got_revision := ""
+        repository := ""
         issue := int64(-1)
         // TODO(hinoka): Gerrit URLs.
         for _, prop := range b.Properties {
                 switch prop.Name {
                 case "rietveld":
                         if v, ok := prop.Value.(string); ok {
                                 rietveld = v
                         } else {
                                 logging.Warningf(c, "Field rietveld is not a string: %#v", prop.Value)
                         }
                 case "issue":
                         if v, ok := prop.Value.(float64); ok {
                                 issue = int64(v)
                         } else {
                                 logging.Warningf(c, "Field issue is not a float: %#v", prop.Value)
                         }
 
                 case "got_revision":
                         if v, ok := prop.Value.(string); ok {
-                                ss.Revision = v
+                                got_revision = v
                         } else {
                                 logging.Warningf(c, "Field got_revision is not a string: %#v", prop.Value)
                         }
 
+                case "repository":
+                        if v, ok := prop.Value.(string); ok {
+                                repository = v
+                        }
                 }
         }
         if issue != -1 {
                 if rietveld != "" {
                         rietveld = strings.TrimRight(rietveld, "/")
                         ss.Changelist = &resp.Link{
                                 Label: fmt.Sprintf("Issue %d", issue),
                                 URL:   fmt.Sprintf("%s/%d", rietveld, issue),
                         }
                 } else {
                         logging.Warningf(c, "Found issue but not rietveld property.")
                 }
         }
+        if got_revision != "" {
+                ss.Revision = &resp.Link{
+                        Label: got_revision,
+                }
+                if repository != "" {
+                        ss.Revision.URL = repository + "/+/" + got_revision
+                }
+        }
         return ss
 }
 
 func getDebugBuild(c context.Context, builder string, buildNum int) (*buildbotBuild, error) {
         fname := fmt.Sprintf("%s.%d.json", builder, buildNum)
         // ../buildbot below assumes that
         // - this code is not executed by tests outside of this dir
         // - this dir is a sibling of frontend dir
         path := filepath.Join("..", "buildbot", "testdata", fname)
         raw, err := ioutil.ReadFile(path)
@@ skipping 168 matching lines @@
         var newAliases map[string][]*buildbotLinkAlias
         if l := remainingAliases.Len(); l > 0 {
                 newAliases = make(map[string][]*buildbotLinkAlias, l)
                 remainingAliases.Iter(func(v string) bool {
                         newAliases[v] = s.Aliases[v]
                         return true
                 })
         }
         s.Aliases = newAliases
 }