Use CLs more consistently instead of branch names

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 110 matching lines @@
     self.__current_branch = None
     self.__current_hash = None
     self.__tag_set = None
     self.__status_info = {}
 
   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, color_for_status
+      from git_cl import get_cl_statuses, color_for_status, Changelist
 
-      status_info = get_cl_statuses(self.__branches_info.keys(),
+      change_cls = [Changelist(branchref='refs/heads/'+b)
+                    for b in self.__branches_info.keys() if b]
+      status_info = get_cl_statuses(change_cls,
                                     fine_grained=self.verbosity > 2,
                                     max_processes=self.maxjobs)
 
-      for _ in xrange(len(self.__branches_info)):
-        # This is a blocking get which waits for the remote CL status to be
-        # retrieved.
-        (branch, url, status) = status_info.next()
-        self.__status_info[branch] = (url, color_for_status(status))
+      # This is a blocking get which waits for the remote CL status to be
+      # retrieved.
+      for cl, status in status_info:
+        self.__status_info[cl.GetBranch()] = (cl.GetIssueURL(),
+                                              color_for_status(status))
 
     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]:
@@ skipping 99 matching lines @@
           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:
-      none_text = '' if self.__is_invalid_parent(branch) else 'None'
-      (url, color) = self.__status_info[branch]
-      line.append(url or none_text, color=color)
+      (url, color) = ('', '') if self.__is_invalid_parent(branch) \
+                              else self.__status_info[branch]
+      line.append(url or '', color=color)
 
     # The subject of the most recent commit on the branch.
     if self.show_subject:
       line.append(run('log', '-n1', '--format=%s', branch))
 
     self.output.append(line)
 
     for child in sorted(self.__parent_map.pop(branch, ())):
       self.__append_branch(child, depth=depth + 1)
 
@@ skipping 29 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)