Fix map-branches issues and add coloring for 'branch-heads',

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
   cool_feature
     dependent_feature
     other_dependent_feature
   other_feature
 
 Branches are colorized as follows:
   * Red - a remote branch (usually the root of all local branches)
   * Cyan - a local branch which is the same as HEAD
     * Note that multiple branches may be Cyan, if they are all on the same
       commit, and you have that commit checked out.
   * Green - a local branch
   * Magenta - a tag
   * Magenta '{NO UPSTREAM}' - If you have local branches which do not track any
     upstream, then you will see this.
 """
 
 import argparse
 import collections
 import sys
+import subprocess2
 
 from third_party import colorama
 from third_party.colorama import Fore, Style
 
 from git_common import current_branch, upstream, tags, get_branches_info
 from git_common import get_git_version, MIN_UPSTREAM_TRACK_GIT_VERSION, hash_one
 
 DEFAULT_SEPARATOR = ' ' * 4
 
 
@@ skipping 79 matching lines @@
     self.__branches_info = get_branches_info(
         include_tracking_status=self.verbosity >= 1)
     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 parent and not self.__branches_info[parent]:
+      if not self.__branches_info[parent]:
         branch_upstream = upstream(branch)
         # If git can't find the upstream, mark the upstream as gone.
         if branch_upstream:
           parent = branch_upstream
         else:
           self.__gone_branches.add(parent)
         # A parent that isn't in the branches info is a root.
         roots.add(parent)
 
       self.__parent_map[parent].append(branch)
 
     self.__current_branch = current_branch()
     self.__current_hash = hash_one('HEAD', short=True)
     self.__tag_set = tags()
 
     if roots:
       for root in sorted(roots):
         self.__append_branch(root)
     else:
       no_branches = OutputLine()
       no_branches.append('No User Branches')
       self.output.append(no_branches)
 
   def __is_invalid_parent(self, parent):
     return not parent or parent in self.__gone_branches
 
   def __color_for_branch(self, branch, branch_hash):
     if branch.startswith('origin'):
       color = Fore.RED
+    elif branch.startswith('branch-heads'):
+      color = Fore.BLUE

[iannucci, 2014/09/23 00:42:01]

could you regenerate the manpage to show this, too?

[calamity, 2014/09/23 03:28:01]

Done.

     elif self.__is_invalid_parent(branch) or branch in self.__tag_set:
       color = Fore.MAGENTA
     elif self.__current_hash.startswith(branch_hash):
       color = Fore.CYAN
     else:
       color = Fore.GREEN
 
-    if self.__current_hash.startswith(branch_hash):
+    if branch_hash and self.__current_hash.startswith(branch_hash):
       color += Style.BRIGHT
     else:
       color += Style.NORMAL
 
     return color
 
   def __append_branch(self, branch, depth=0):
     """Recurses through the tree structure and appends an OutputLine to the
     OutputManager for each branch."""
     branch_info = self.__branches_info[branch]
     if branch_info:
       branch_hash = branch_info.hash
     else:
-      branch_hash = hash_one(branch, short=True)
+      try:
+        branch_hash = hash_one(branch, short=True)
+      except subprocess2.CalledProcessError:
+        branch_hash = None
 
     line = OutputLine()
 
     # The branch name with appropriate indentation.
     suffix = ''
     if branch == self.__current_branch or (
         self.__current_branch == 'HEAD' and branch == self.__current_hash):
       suffix = ' *'
     branch_string = branch
     if branch in self.__gone_branches:
@@ skipping 35 matching lines @@
       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
       none_text = '' if self.__is_invalid_parent(branch) else 'None'
-      url = git_cl.Changelist(branchref=branch).GetIssueURL()
+      url = git_cl.Changelist(
+          branchref=branch_hash).GetIssueURL() if branch_hash else None
       line.append(url or none_text, color=Fore.BLUE if url else Fore.WHITE)
 
     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()
@@ skipping 14 matching lines @@
   opts = parser.parse_args(argv[1:])
 
   mapper = BranchMapper()
   mapper.verbosity = opts.v
   mapper.output.nocolor = opts.nocolor
   mapper.start()
   print mapper.output.as_formatted_string()
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))