From c9ebbd24639c8fb9f7fd2a36032614830e1e5285 Mon Sep 17 00:00:00 2001
From: rmistry <rmistry@google.com>
Date: Fri, 14 Oct 2016 12:35:54 -0700
Subject: [PATCH] Fix logic to detect Gerrit CL in CQ

BUG=chromium:656042

Review-Url: https://codereview.chromium.org/2419123002
---
 git_cl.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/git_cl.py b/git_cl.py
index 174d46b3be..a61bb91446 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2337,8 +2337,15 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
     cq_label = data['labels'].get('Commit-Queue', {})
     if cq_label:
-      # Vote value is a stringified integer, which we expect from 0 to 2.
-      vote_value = cq_label.get('value', '0')
+      votes = cq_label.get('all', [])
+      highest_vote = 0
+      for v in votes:
+        highest_vote = max(highest_vote, v.get('value', 0))
+      vote_value = str(highest_vote)
+      if vote_value != '0':
+        # Add a '+' if the value is not 0 to match the values in the label.
+        # The cq_label does not have negatives.
+        vote_value = '+' + vote_value
       vote_text = cq_label.get('values', {}).get(vote_value, '')
       if vote_text.lower() == 'commit':
         return 'commit'