Multiple improvements to windows bash integration.

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
   * Blue - a 'branch-heads' 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 os
 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
 from git_common import run
 
@@ skipping 224 matching lines @@
     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)
 
 
 def main(argv):
-  colorama.init()
+  colorama.init(wrap="TERM" not in os.environ)
   if get_git_version() < MIN_UPSTREAM_TRACK_GIT_VERSION:
     print >> sys.stderr, (
         'This tool will not show all tracking information for git version '
         'earlier than ' +
         '.'.join(str(x) for x in MIN_UPSTREAM_TRACK_GIT_VERSION) +
         '. Please consider upgrading.')
 
   parser = argparse.ArgumentParser(
       description='Print a a tree of all branches parented by their upstreams')
   parser.add_argument('-v', action='count',
@@ skipping 16 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)