Restore 103787 (fix git progress message), and update test expectations.

gclient_scm.py

 # Copyright (c) 2011 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.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 476 matching lines @@
     Once we've cloned the repo, we checkout a working branch if the specified
     revision is a branch head. If it is a tag or a specific commit, then we
     leave HEAD detached as it makes future updates simpler -- in this case the
     user should first create a new branch or switch to an existing branch before
     making changes in the repo."""
     if not options.verbose:
       # git clone doesn't seem to insert a newline properly before printing
       # to stdout
       print('')
 
-    clone_cmd = ['clone']
+    clone_cmd = ['clone', '--progress']
     if revision.startswith('refs/heads/'):
       clone_cmd.extend(['-b', revision.replace('refs/heads/', '')])
       detach_head = False
     else:
       detach_head = True
     if options.verbose:
       clone_cmd.append('--verbose')
     clone_cmd.extend([url, self.checkout_path])
 
     # If the parent directory does not exist, Git clone on Windows will not
     # create it, so we need to do it manually.
     parent_dir = os.path.dirname(self.checkout_path)
     if not os.path.exists(parent_dir):
       os.makedirs(parent_dir)
 
+    percent_re = re.compile('.* ([0-9]{1,2})% .*')
+    def _GitFilter(line):
+      # git uses an escape sequence to clear the line; elide it.
+      esc = line.find(unichr(033))
+      if esc > -1:
+        line = line[:esc]
+      match = percent_re.match(line)
+      if not match or not int(match.group(1)) % 10:
+        print '%s' % line
+
     for _ in range(3):
       try:
-        self._Run(clone_cmd, options, cwd=self._root_dir)
+        self._Run(clone_cmd, options, cwd=self._root_dir, filter_fn=_GitFilter,
+                  print_stdout=False)
         break
       except subprocess2.CalledProcessError, e:
         # Too bad we don't have access to the actual output yet.
         # We should check for "transfer closed with NNN bytes remaining to
         # read". In the meantime, just make sure .git exists.
         if (e.returncode == 128 and
             os.path.exists(os.path.join(self.checkout_path, '.git'))):
           print(str(e))
           print('Retrying...')
           continue
@@ skipping 146 matching lines @@
     return branch
 
   def _Capture(self, args):
     return subprocess2.check_output(
         ['git'] + args,
         stderr=subprocess2.PIPE,
         cwd=self.checkout_path).strip()
 
   def _Run(self, args, options, **kwargs):
     kwargs.setdefault('cwd', self.checkout_path)
-    gclient_utils.CheckCallAndFilterAndHeader(['git'] + args,
-        always=options.verbose, **kwargs)
+    kwargs.setdefault('print_stdout', True)
+    stdout = kwargs.get('stdout', sys.stdout)
+    stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
+                 ' '.join(args), kwargs['cwd']))
+    gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
 
 
 class SVNWrapper(SCMWrapper):
   """ Wrapper for SVN """
 
   def GetRevisionDate(self, revision):
     """Returns the given revision's date in ISO-8601 format (which contains the
     time zone)."""
     date = scm.SVN.Capture(['propget', '--revprop', 'svn:date', '-r', revision,
                             os.path.join(self.checkout_path, '.')])
@@ skipping 284 matching lines @@
 
     This method returns a new list to be used as a command."""
     new_command = command[:]
     if revision:
       new_command.extend(['--revision', str(revision).strip()])
     # --force was added to 'svn update' in svn 1.5.
     if ((options.force or options.manually_grab_svn_rev) and
         scm.SVN.AssertVersion("1.5")[0]):
       new_command.append('--force')
     return new_command