Fix logic to detect Gerrit CL in CQ

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 2319 matching lines @@
     try:
       data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
     except (httplib.HTTPException, GerritIssueNotExists):
       return 'error'
 
     if data['status'] in ('ABANDONED', 'MERGED'):
       return 'closed'
 
     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'
 
     lgtm_label = data['labels'].get('Code-Review', {})
     if lgtm_label:
       if 'rejected' in lgtm_label:
         return 'not lgtm'
       if 'approved' in lgtm_label:
         return 'lgtm'
@@ skipping 3013 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)