Fix deps2git cache bootstrapping and make it more verbose

deps2git.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """Convert SVN based DEPS into .DEPS.git for use with NewGit."""
 
 import collections
 from cStringIO import StringIO
 import json
@@ skipping 47 matching lines @@
   url_split = url.split('@')
   scm_url = url_split[0]
   scm_rev = 'HEAD'
   if len(url_split) == 2:
     scm_rev = url_split[1]
   return (scm_url, scm_rev)
 
 
 def SvnRevToGitHash(
     svn_rev, git_url, repos_path, workspace, dep_path, git_host,
-    svn_branch_name=None, cache_dir=None, outbuf=None, shallow=None):
+    svn_branch_name=None, cache_dir=None, outbuf=None, shallow=None,
+    print_fn=None):
   """Convert a SVN revision to a Git commit id."""
   git_repo = None
   if git_url.startswith(git_host):
     git_repo = git_url.replace(git_host, '')
   else:
     raise RuntimeError('Unknown git server %s, host %s' % (git_url, git_host))
   if repos_path is None and workspace is None and cache_dir is None:
     # We're running without a repository directory (i.e. no -r option).
     # We cannot actually find the commit id, but this mode is useful
     # just for testing the URL mappings.  Produce an output file that
     # can't actually be used, but can be eyeballed for correct URLs.
     return 'xxx-r%s' % svn_rev
   if repos_path:
     mirror = True
     git_repo_path = os.path.join(repos_path, git_repo)
     if not os.path.exists(git_repo_path) or not os.listdir(git_repo_path):
       git_tools.Clone(git_url, git_repo_path, mirror, outbuf)
   elif cache_dir:
     mirror = True
-    git_repo_path = git_tools.PopulateCache(git_url, shallow)
+    git_repo_path = git_tools.PopulateCache(git_url, shallow, print_fn=print_fn)
   else:
     mirror = False
     git_repo_path = os.path.join(workspace, dep_path)
     if (os.path.exists(git_repo_path) and
         not os.path.exists(os.path.join(git_repo_path, '.git'))):
       # shutil.rmtree is unreliable on windows
       if sys.platform == 'win32':
         for _ in xrange(3):
           if not subprocess.call(['cmd.exe', '/c', 'rd', '/q', '/s',
                                   os.path.normcase(git_repo_path)]):
@@ skipping 83 matching lines @@
     git_hash = ''
     if dep_rev != 'HEAD':
       # Pass-through the hash for Git repositories. Resolve the hash for
       # subversion repositories.
       if dep_url.endswith('.git'):
         git_hash = '@%s' % dep_rev
       else:
         try:
           git_hash = '@%s' % SvnRevToGitHash(
               dep_rev, git_url, options.repos, options.workspace, path,
-              git_host, svn_branch, options.cache_dir)
+              git_host, svn_branch, options.cache_dir, print_fn=_print)
         except Exception as e:
           if options.no_fail_fast:
             results.bad_git_hash.append(e)
             continue
           raise
 
     # If this is webkit, we need to add the var for the hash.
     if dep == 'src/third_party/WebKit' and dep_rev:
       results.deps_vars['webkit_rev'] = git_hash
       git_hash = 'VAR_WEBKIT_REV'
@@ skipping 223 matching lines @@
     return 0
 
   # Write the DEPS file to disk.
   deps_utils.WriteDeps(options.out, deps_vars, results.new_deps, deps_os,
                        include_rules, skip_child_includes, hooks)
   return 0
 
 
 if '__main__' == __name__:
   sys.exit(main())