Make git-map-branches -vvv show CL status colors.

git_map_branches.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Provides a short mapping of all the branches in your local repo, organized
 by their upstream ('tracking branch') layout.
 
 Example:
 origin/master
@@ skipping 98 matching lines @@
 
   def __init__(self):
     self.verbosity = 0
     self.output = OutputManager()
     self.__gone_branches = set()
     self.__branches_info = None
     self.__parent_map = collections.defaultdict(list)
     self.__current_branch = None
     self.__current_hash = None
     self.__tag_set = None
+    self.__status_info = None

[iannucci, 2015/03/03 01:00:14]

why not default to `{}`?

[calamity, 2015/03/03 04:58:12]

Done.

 
   def start(self):
     self.__branches_info = get_branches_info(
         include_tracking_status=self.verbosity >= 1)
+    if (self.verbosity >= 2):
+      # Avoid heavy import unless necessary.
+      from git_cl import get_cl_statuses
+
+      self.__status_info = {}

[iannucci, 2015/03/03 01:00:14]

then you can skip this

[calamity, 2015/03/03 04:58:12]

Done.

+      status_info = get_cl_statuses(self.__branches_info.keys(),
+                                    self.verbosity == 2)
+
+      for _ in xrange(len(self.__branches_info)):
+        # This is a blocking get which waits for the remote CL status to be
+        # retrieved.
+        (branch, url, color) = status_info.get()
+        self.__status_info[branch] = (url, color);
+
     roots = set()
 
     # A map of parents to a list of their children.
     for branch, branch_info in self.__branches_info.iteritems():
       if not branch_info:
         continue
 
       parent = branch_info.upstream
       if not self.__branches_info[parent]:
         branch_upstream = upstream(branch)
@@ skipping 97 matching lines @@
         if ahead and behind:
           center_separator = '|'
 
       line.append(front_separator, separator=' ')
       line.append(ahead_string, separator=' ', color=Fore.MAGENTA)
       line.append(center_separator, separator=' ')
       line.append(behind_string, separator=' ', color=Fore.MAGENTA)
       line.append(back_separator)
 
     # The Rietveld issue associated with the branch.
-    if self.verbosity >= 2:
-      import git_cl  # avoid heavy import cost unless we need it
+    if self.__status_info:

[iannucci, 2015/03/03 01:00:14]

and this would still work, but in general you wouldn't need the if statement at
all

[calamity, 2015/03/03 04:58:12]

Reverted to a verbosity check.

       none_text = '' if self.__is_invalid_parent(branch) else 'None'
-      url = git_cl.Changelist(
-          branchref=branch).GetIssueURL() if branch_hash else None
-      line.append(url or none_text, color=Fore.BLUE if url else Fore.WHITE)
+      (url, color) = self.__status_info[branch]
+      line.append(url or none_text, color=color)
 
     self.output.append(line)
 
     for child in sorted(self.__parent_map.pop(branch, ())):
       self.__append_branch(child, depth=depth + 1)
 
 
 def main(argv):
   colorama.init()
   if get_git_version() < MIN_UPSTREAM_TRACK_GIT_VERSION:
@@ skipping 18 matching lines @@
   mapper.start()
   print mapper.output.as_formatted_string()
   return 0
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)