Use shell_utils' log_in_real_time=False for some git commands

slave/skia_slave_scripts/utils/gclient_utils.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """This module contains utilities for managing gclient checkouts."""
 
 
 from common import find_depot_tools
 
 import os
 import shell_utils
-import subprocess
-import time
 
 
 GIT = 'git.bat' if os.name == 'nt' else 'git'
 WHICH = 'where' if os.name == 'nt' else 'which'
 SKIA_TRUNK = 'skia'
 
 
 def _GetGclientPy():
   """ Return the path to the gclient.py file. """
   path_to_gclient = find_depot_tools.add_depot_tools_to_path()
@@ skipping 63 matching lines @@
 
 def GetCheckedOutHash():
   """ Determine what commit we actually got. If there are local modifications,
   raise an exception. """
   config = _GetLocalConfig()
   current_directory = os.path.abspath(os.curdir)
 
   # Get the checked-out commit hash for the first gclient solution.
   os.chdir(config[0]['name'])
   try:
-    for i in xrange(30):
-      # "git rev-parse HEAD" returns the commit hash for HEAD.
-      cmd = [GIT, 'rev-parse', 'HEAD']
-      print cmd
-      proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                              stderr=subprocess.STDOUT)
-      if proc.wait() == 0:
-        commit_hash = proc.communicate()[0].rstrip('\n')
-        print commit_hash
-        if commit_hash:
-          # Break out of the retry loop if we have a non-empty commit hash.
-          break
-      else:
-        print 'Command exited with non-zero code.'
-      # Sleep for 1 second and hope the next iteration finds the commit hash.
-      print 'Could not find a non-empty commit_hash, retrying.. #%s' % (i + 1)
-      time.sleep(1)
+    # "git rev-parse HEAD" returns the commit hash for HEAD.
+    return shell_utils.Bash([GIT, 'rev-parse', 'HEAD'],
+                            log_in_real_time=False).rstrip('\n')
   finally:
     os.chdir(current_directory)
-  return commit_hash
 
 
 def Revert():
   shell_utils.Bash([GIT, 'clean', '-f', '-d'])
   shell_utils.Bash([GIT, 'reset', '--hard', 'HEAD'])