Use CLs more consistently instead of branch names

git_map_branches.py

Index: git_map_branches.py
diff --git a/git_map_branches.py b/git_map_branches.py
index 016a0330f732a9e76286c79fdea08ef4ed10ec33..a07688df58da49b0ef6cccd367b10880d03c68f9 100755
--- a/git_map_branches.py
+++ b/git_map_branches.py
@@ -128,17 +128,20 @@ class BranchMapper(object):
         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()]
+      status_info = get_cl_statuses(change_cls,
                                     fine_grained=self.verbosity > 2,
                                     max_processes=self.maxjobs)
 
       for _ in xrange(len(self.__branches_info)):

[tandrii(chromium), 2016/05/20 20:56:06]

for _ in self.__branches_info:

would work just fine. I think even simpler one below works:

for cl, status in status_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))
+        (cl, status) = status_info.next()
+        self.__status_info[cl.GetBranch()] = (cl.GetIssueURL(),
+                                              color_for_status(status))
 
     roots = set()