Skip tracking status in map-branches when -v flag is not supplied.

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 92 matching lines @@
   """A class which constructs output representing the tree's branch structure.
 
   Attributes:
     __tracking_info: a map of branches to their TrackingInfo objects which
       consist of the branch hash, upstream and ahead/behind status.
     __gone_branches: a set of upstreams which are not fetchable by git"""
 
   def __init__(self):
     self.verbosity = 0
     self.output = OutputManager()
-    self.__tracking_info = get_all_tracking_info()
     self.__gone_branches = set()

[Matt Giuca, 2014/09/03 03:21:55]

Make sure all the fields are initialized in the constructor:
self.__tracking_info = None
self.parent_map = collections.defaultdict(list) (move from start).
self.__current_branch = None
self.__current_hash = None
self.__tag_set = None

[calamity, 2014/09/03 04:38:53]

Done.

-    self.__roots = set()
+
+  def start(self):
+    self.__tracking_info = get_all_tracking_info(
+        include_tracking_status=self.verbosity >= 1)
+    roots = set()
 
     # A map of parents to a list of their children.
     self.parent_map = collections.defaultdict(list)
     for branch, branch_info in self.__tracking_info.iteritems():
       if not branch_info:
         continue
 
       parent = branch_info.upstream
       if parent and not self.__tracking_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 tracking info is a root.
-        self.__roots.add(parent)
+        roots.add(parent)
 
       self.parent_map[parent].append(branch)
 
     self.__current_branch = current_branch()
     self.__current_hash = self.__tracking_info[self.__current_branch].hash
     self.__tag_set = tags()
 
-  def start(self):
-    for root in sorted(self.__roots):
+    for root in sorted(roots):
       self.__append_branch(root)
 
   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 self.__is_invalid_parent(branch) or branch in self.__tag_set:
       color = Fore.MAGENTA
@@ skipping 96 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))