cmd/cl: fix is:xxx queries and include status in json output
Change-Id: I5c3f6ffcf7d80cb76f3f2d186d14bbc201e6c4f4
Reviewed-on: https://go-review.googlesource.com/19497
Reviewed-by: Andrew Gerrand <adg@golang.org>
diff --git a/cmd/cl/cl.go b/cmd/cl/cl.go
index e34e772..2e8d4ea 100644
--- a/cmd/cl/cl.go
+++ b/cmd/cl/cl.go
@@ -122,7 +122,11 @@
c := gerrit.NewClient("https://go-review.googlesource.com", gerrit.NoAuth)
query := strings.Join(flag.Args(), " ")
- cis, err := c.QueryChanges("is:open -project:scratch -message:do-not-review "+query, gerrit.QueryChangesOpt{
+ open := "is:open"
+ if strings.Contains(query, " is:") || strings.HasPrefix(query, "is:") {
+ open = ""
+ }
+ cis, err := c.QueryChanges(open+" -project:scratch -message:do-not-review "+query, gerrit.QueryChangesOpt{
N: 5000,
Fields: []string{
"LABELS",
@@ -222,6 +226,7 @@
Issues []int // issues referenced by commit message
Scores map[string]int // current review scores
Files []string // files changed in CL
+ Status string // "new", "submitted", "merged", ...
}
func (cl *CL) Age() time.Duration {
@@ -342,6 +347,7 @@
Author: shorten(ci.Owner.Email),
AuthorEmail: ci.Owner.Email,
Scores: scores,
+ Status: strings.ToLower(ci.Status),
}
// Determine reviewer, in priorty order.
