Factor out Changelist GetStatus() for eventual use by other tools

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."""
 
 from distutils.version import LooseVersion
@@ skipping 821 matching lines @@
     return presubmit_support.GitChange(
         name,
         description,
         absroot,
         files,
         issue,
         patchset,
         author,
         upstream=upstream_branch)
 
+  def GetStatus(self):
+    """Returns None or a string describing the issue's review or CQ status:
+      * None      - no issue
+      * 'error'   - error from review tool (including deleted issues)
+      * 'unsent'  - not sent for review
+      * 'waiting' - waiting for review
+      * 'reply'   - waiting for owner to reply to review
+      * 'lgtm'    - LGTM'ed
+      * 'commit'  - in the commit queue
+      * 'closed'  - closed
+    """
+    if not self.GetIssue():
+      return None
+
+    try:
+      props = self.GetIssueProperties()
+      reviewers = self.GetApprovingReviewers()

[iannucci, 2014/09/10 19:10:57]

since this makes a second HTTP request (I think), let's do this after we pass
the first block of returns.

[jsbell, 2014/09/10 22:00:27]

Done.

+    except urllib2.HTTPError:
+      return 'error'
+
+    if props.get('closed'):
+      # Issue is closed.
+      return 'closed'
+    if props.get('commit'):
+      # Issue is in the commit queue.
+      return 'commit'
+    if reviewers:
+      # Was LGTM'ed.
+      return 'lgtm'
+
+    messages = props.get('messages') or []
+
+    if not messages:
+      # No message was sent.
+      return 'unsent'
+    if messages[-1]['sender'] != props.get('owner_email'):
+      # Non-LGTM reply from non-owner
+      return 'reply'
+    return 'waiting'
+
   def RunHook(self, committing, may_prompt, verbose, change):
     """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
 
     try:
       return presubmit_support.DoPresubmitChecks(change, committing,
           verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
           default_presubmit=None, may_prompt=may_prompt,
           rietveld_obj=self.RpcServer())
     except presubmit_support.PresubmitFailure, e:
       DieWithError(
@@ skipping 417 matching lines @@
   # Adhoc thread pool to request data concurrently.
   output = Queue.Queue()
 
   # Silence upload.py otherwise it becomes unweldly.
   upload.verbosity = 0
 
   if not options.fast:
     def fetch(b):
       """Fetches information for an issue and returns (branch, issue, color)."""
       c = Changelist(branchref=b)
+      status = c.GetStatus()
       i = c.GetIssueURL()
-      props = {}
-      r = None
-      if i:
-        try:
-          props = c.GetIssueProperties()
-          r = c.GetApprovingReviewers() if i else None
-        except urllib2.HTTPError:
-          # The issue probably doesn't exist anymore.
-          i += ' (broken)'
 
-      msgs = props.get('messages') or []
-
-      if not i:
+      if not status or status == 'error':
+        # The issue probably doesn't exist anymore.
+        i += ' (broken)'
         color = Fore.WHITE
-      elif props.get('closed'):
-        # Issue is closed.
-        color = Fore.CYAN
-      elif props.get('commit'):
-        # Issue is in the commit queue.
-        color = Fore.MAGENTA
-      elif r:
-        # Was LGTM'ed.
-        color = Fore.GREEN
-      elif not msgs:
-        # No message was sent.
-        color = Fore.RED
-      elif msgs[-1]['sender'] != props.get('owner_email'):
-        color = Fore.YELLOW
       else:
-        color = Fore.BLUE
+        color = {
+          'unsent': Fore.RED,
+          'waiting': Fore.BLUE,
+          'reply': Fore.YELLOW,
+          'lgtm': Fore.GREEN,
+          'commit': Fore.MAGENTA,
+          'closed': Fore.CYAN,
+        }[status]

[iannucci, 2014/09/10 19:10:57]

let's factor this list out too so that git-map-branches can use it

[jsbell, 2014/09/10 22:00:27]

Done.

       output.put((b, i, color))
 
     # Process one branch synchronously to work through authentication, then
     # spawn threads to process all the other branches in parallel.
     if branches:
       fetch(branches[0])
     threads = [
       threading.Thread(target=fetch, args=(b,)) for b in branches[1:]]
     for t in threads:
       t.daemon = True
@@ skipping 1517 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))