Use CLs more consistently instead of branch names
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300132
Review-Url: https://codereview.chromium.org/1893563002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300673 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/git_map_branches.py b/git_map_branches.py
index 016a033..f595169 100755
--- a/git_map_branches.py
+++ b/git_map_branches.py
@@ -128,17 +128,19 @@
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()
@@ -258,9 +260,9 @@
# 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: