libv8 7.3.492.27.1 → 8.4.255.0

data/vendor/depot_tools/recipes/recipe_modules/bot_update/resources/bot_update.py

@@ -5,11 +5,14 @@
 
 # TODO(hinoka): Use logging.
 
+from __future__ import print_function
+
 import cStringIO
 import codecs
 from contextlib import contextmanager
 import copy
 import ctypes
+from datetime import datetime
 import json
 import optparse
 import os
@@ -30,6 +33,11 @@ import os.path as path
 # How many bytes at a time to read from pipes.
 BUF_SIZE = 256
 
+# How many seconds of no stdout activity before process is considered stale. Can
+# be overridden via environmnet variable `STALE_PROCESS_DURATION`. If set to 0,
+# process won't be terminated.
+STALE_PROCESS_DURATION = 1200
+
 # Define a bunch of directory paths.
 # Relative to this script's filesystem path.
 THIS_DIR = path.dirname(path.abspath(__file__))
@@ -78,9 +86,6 @@ cache_dir = r%(cache_dir)s
 """
 
 
-# How many times to try before giving up.
-ATTEMPTS = 5
-
 GIT_CACHE_PATH = path.join(DEPOT_TOOLS_DIR, 'git_cache.py')
 GCLIENT_PATH = path.join(DEPOT_TOOLS_DIR, 'gclient.py')
 
@@ -108,17 +113,34 @@ OK = object()
 FAIL = object()
 
 
-class PsPrinter(object):
+class ProcessObservers(object):
+  """ProcessObservers allows monitoring of child process."""
+
+  def poke(self):
+    """poke is called when child process sent `BUF_SIZE` data to stdout."""
+    pass
+
+  def cancel(self):
+    """cancel is called once proc exists successfully."""
+    pass
+
+
+class PsPrinter(ProcessObservers):
   def __init__(self, interval=300):
     self.interval = interval
     self.active = sys.platform.startswith('linux2')
     self.thread = None
 
-  @staticmethod
-  def print_pstree():
+  def print_pstree(self):
     """Debugging function used to print "ps auxwwf" for stuck processes."""
+    # Add new line for cleaner output
+    print()
     subprocess.call(['ps', 'auxwwf'])
 
+    # Restart timer, we want to continue printing until the process is
+    # terminated.
+    self.poke()
+
   def poke(self):
     if self.active:
       self.cancel()
@@ -131,6 +153,30 @@ class PsPrinter(object):
       self.thread = None
 
 
+class StaleProcess(ProcessObservers):
+  '''StaleProcess terminates process if there is no poke call in `interval`. '''
+
+  def __init__(self, interval, proc):
+    self.interval = interval
+    self.proc = proc
+    self.thread = None
+
+  def _terminate_process(self):
+    print('Terminating stale process...')
+    self.proc.terminate()
+
+  def poke(self):
+    self.cancel()
+    if self.interval > 0:
+      self.thread = threading.Timer(self.interval, self._terminate_process)
+      self.thread.start()
+
+  def cancel(self):
+    if self.thread is not None:
+      self.thread.cancel()
+      self.thread = None
+
+
 def call(*args, **kwargs):  # pragma: no cover
   """Interactive subprocess call."""
   kwargs['stdout'] = subprocess.PIPE
@@ -147,22 +193,25 @@ def call(*args, **kwargs):  # pragma: no cover
   kwargs['env'] = env
 
   if new_env:
-    print '===Injecting Environment Variables==='
+    print('===Injecting Environment Variables===')
     for k, v in sorted(new_env.items()):
-      print '%s: %s' % (k, v)
-  print '===Running %s ===' % (' '.join(args),)
-  print 'In directory: %s' % cwd
+      print('%s: %s' % (k, v))
+  print('%s ===Running %s ===' % (datetime.now(), ' '.join(args),))
+  print('In directory: %s' % cwd)
   start_time = time.time()
   proc = subprocess.Popen(args, **kwargs)
   if stdin_data:
     proc.stdin.write(stdin_data)
     proc.stdin.close()
-  psprinter = PsPrinter()
+  stale_process_duration = env.get('STALE_PROCESS_DURATION',
+                                   STALE_PROCESS_DURATION)
+  observers = [PsPrinter(), StaleProcess(int(stale_process_duration), proc)]
   # This is here because passing 'sys.stdout' into stdout for proc will
   # produce out of order output.
   hanging_cr = False
   while True:
-    psprinter.poke()
+    for observer in observers:
+      observer.poke()
     buf = proc.stdout.read(BUF_SIZE)
     if not buf:
       break
@@ -177,20 +226,23 @@ def call(*args, **kwargs):  # pragma: no cover
   if hanging_cr:
     sys.stdout.write('\n')
     out.write('\n')
-  psprinter.cancel()
+  for observer in observers:
+    observer.cancel()
 
   code = proc.wait()
   elapsed_time = ((time.time() - start_time) / 60.0)
   outval = out.getvalue()
   if code:
-    print '===Failed in %.1f mins of %s ===' % (elapsed_time, ' '.join(args))
-    print
+    print('%s ===Failed in %.1f mins of %s ===' %
+          (datetime.now(), elapsed_time, ' '.join(args)))
+    print()
     raise SubprocessFailed('%s failed with code %d in %s.' %
                            (' '.join(args), code, cwd),
                            code, outval)
 
-  print '===Succeeded in %.1f mins of %s ===' % (elapsed_time, ' '.join(args))
-  print
+  print('%s ===Succeeded in %.1f mins of %s ===' %
+        (datetime.now(), elapsed_time, ' '.join(args)))
+  print()
   return outval
 
 
@@ -222,36 +274,36 @@ def get_gclient_spec(solutions, target_os, target_os_only, target_cpu,
 
 def solutions_printer(solutions):
   """Prints gclient solution to stdout."""
-  print 'Gclient Solutions'
-  print '================='
+  print('Gclient Solutions')
+  print('=================')
   for solution in solutions:
     name = solution.get('name')
     url = solution.get('url')
-    print '%s (%s)' % (name, url)
+    print('%s (%s)' % (name, url))
     if solution.get('deps_file'):
-      print '  Dependencies file is %s' % solution['deps_file']
+      print('  Dependencies file is %s' % solution['deps_file'])
     if 'managed' in solution:
-      print '  Managed mode is %s' % ('ON' if solution['managed'] else 'OFF')
+      print('  Managed mode is %s' % ('ON' if solution['managed'] else 'OFF'))
     custom_vars = solution.get('custom_vars')
     if custom_vars:
-      print '  Custom Variables:'
-      for var_name, var_value in sorted(custom_vars.iteritems()):
-        print '    %s = %s' % (var_name, var_value)
+      print('  Custom Variables:')
+      for var_name, var_value in sorted(custom_vars.items()):
+        print('    %s = %s' % (var_name, var_value))
     custom_deps = solution.get('custom_deps')
     if 'custom_deps' in solution:
-      print '  Custom Dependencies:'
-      for deps_name, deps_value in sorted(custom_deps.iteritems()):
+      print('  Custom Dependencies:')
+      for deps_name, deps_value in sorted(custom_deps.items()):
         if deps_value:
-          print '    %s -> %s' % (deps_name, deps_value)
+          print('    %s -> %s' % (deps_name, deps_value))
         else:
-          print '    %s: Ignore' % deps_name
-    for k, v in solution.iteritems():
+          print('    %s: Ignore' % deps_name)
+    for k, v in solution.items():
       # Print out all the keys we don't know about.
       if k in ['name', 'url', 'deps_file', 'custom_vars', 'custom_deps',
                'managed']:
         continue
-      print '  %s is %s' % (k, v)
-    print
+      print('  %s is %s' % (k, v))
+    print()
 
 
 def modify_solutions(input_solutions):
@@ -270,8 +322,8 @@ def modify_solutions(input_solutions):
     # We don't want gclient to be using a safesync URL. Instead it should
     # using the lkgr/lkcr branch/tags.
     if 'safesync_url' in solution:
-      print 'Removing safesync url %s from %s' % (solution['safesync_url'],
-                                                  parsed_path)
+      print('Removing safesync url %s from %s' % (solution['safesync_url'],
+                                                  parsed_path))
       del solution['safesync_url']
 
   return solutions
@@ -283,11 +335,11 @@ def remove(target, cleanup_dir):
     os.makedirs(cleanup_dir)
   dest = path.join(cleanup_dir, '%s_%s' % (
       path.basename(target), uuid.uuid4().hex))
-  print 'Marking for removal %s => %s' % (target, dest)
+  print('Marking for removal %s => %s' % (target, dest))
   try:
     os.rename(target, dest)
   except Exception as e:
-    print 'Error renaming %s to %s: %s' % (target, dest, str(e))
+    print('Error renaming %s to %s: %s' % (target, dest, str(e)))
     raise
 
 
@@ -299,9 +351,9 @@ def ensure_no_checkout(dir_names, cleanup_dir):
   if has_checkout:
     for filename in os.listdir(build_dir):
       deletion_target = path.join(build_dir, filename)
-      print '.git detected in checkout, deleting %s...' % deletion_target,
+      print('.git detected in checkout, deleting %s...' % deletion_target,)
       remove(deletion_target, cleanup_dir)
-      print 'done'
+      print('done')
 
 
 def call_gclient(*args, **kwargs):
@@ -313,6 +365,8 @@ def call_gclient(*args, **kwargs):
   """
   cmd = [sys.executable, '-u', GCLIENT_PATH]
   cmd.extend(args)
+  # Disable metrics collection on bots, since it's not supported anyway.
+  kwargs.setdefault('env', {})['DEPOT_TOOLS_METRICS'] = '0'
   return call(*cmd, **kwargs)
 
 
@@ -361,7 +415,7 @@ def gclient_sync(
     args += ['--break_repo_locks']
   if disable_syntax_validation:
     args += ['--disable-syntax-validation']
-  for name, revision in sorted(revisions.iteritems()):
+  for name, revision in sorted(revisions.items()):
     if revision.upper() == 'HEAD':
       revision = 'origin/master'
     args.extend(['--revision', '%s@%s' % (name, revision)])
@@ -430,13 +484,13 @@ def create_manifest_old():
         'revision': match.group(3),
       }
     else:
-      print "WARNING: Couldn't match revinfo line:\n%s" % line
+      print("WARNING: Couldn't match revinfo line:\n%s" % line)
   return manifest
 
 
 # TODO(hinoka): Include patch revision.
 def create_manifest(gclient_output, patch_root):
-  """Return the JSONPB equivilent of the source manifest proto.
+  """Return the JSONPB equivalent of the source manifest proto.
 
   The source manifest proto is defined here:
   https://chromium.googlesource.com/infra/luci/recipes-py/+/master/recipe_engine/source_manifest.proto
@@ -454,7 +508,7 @@ def create_manifest(gclient_output, patch_root):
   dirs = {}
   if patch_root:
     patch_root = patch_root.strip('/')  # Normalize directory names.
-  for directory, info in gclient_output.get('solutions', {}).iteritems():
+  for directory, info in gclient_output.get('solutions', {}).items():
     directory = directory.strip('/')  # Normalize the directory name.
     # The format of the url is "https://repo.url/blah.git@abcdefabcdef" or
     # just "https://repo.url/blah.git"
@@ -615,11 +669,11 @@ def _maybe_break_locks(checkout_path, tries=3):
       for filename in filenames:
         if filename.endswith('.lock'):
           to_break = os.path.join(dirpath, filename)
-          print 'breaking lock: %s' % to_break
+          print('breaking lock: %s' % to_break)
           try:
             os.remove(to_break)
           except OSError as ex:
-            print 'FAILED to break lock: %s: %s' % (to_break, ex)
+            print('FAILED to break lock: %s: %s' % (to_break, ex))
             raise
 
   for _ in xrange(tries):
@@ -631,12 +685,14 @@ def _maybe_break_locks(checkout_path, tries=3):
 
 
 
-def git_checkouts(solutions, revisions, refs, git_cache_dir, cleanup_dir):
+def git_checkouts(solutions, revisions, refs, no_fetch_tags, git_cache_dir,
+                  cleanup_dir):
   build_dir = os.getcwd()
   first_solution = True
   for sln in solutions:
     sln_dir = path.join(build_dir, sln['name'])
-    _git_checkout(sln, sln_dir, revisions, refs, git_cache_dir, cleanup_dir)
+    _git_checkout(sln, sln_dir, revisions, refs, no_fetch_tags, git_cache_dir,
+                  cleanup_dir)
     if first_solution:
       git_ref = git('log', '--format=%H', '--max-count=1',
                     cwd=path.join(build_dir, sln['name'])
@@ -645,11 +701,14 @@ def git_checkouts(solutions, revisions, refs, git_cache_dir, cleanup_dir):
   return git_ref
 
 
-def _git_checkout(sln, sln_dir, revisions, refs, git_cache_dir, cleanup_dir):
+def _git_checkout(sln, sln_dir, revisions, refs, no_fetch_tags, git_cache_dir,
+                  cleanup_dir):
   name = sln['name']
   url = sln['url']
   populate_cmd = (['cache', 'populate', '--ignore_locks', '-v',
                    '--cache-dir', git_cache_dir, url, '--reset-fetch-config'])
+  if no_fetch_tags:
+    populate_cmd.extend(['--no-fetch-tags'])
   for ref in refs:
     populate_cmd.extend(['--ref', ref])
 
@@ -686,14 +745,14 @@ def _git_checkout(sln, sln_dir, revisions, refs, git_cache_dir, cleanup_dir):
       # Only kick in deadline after second attempt to ensure we retry at least
       # once after initial fetch from not-yet-replicated server.
       if attempt >= 2 and overrun > 0:
-        print 'Ran %s seconds past deadline. Aborting.' % (overrun,)
+        print('Ran %s seconds past deadline. Aborting.' % (overrun,))
         # TODO(tandrii): raise exception immediately here, instead of doing
         # useless step 2 trying to fetch something that we know doesn't exist
         # in cache **after production data gives us confidence to do so**.
         break
 
       sleep_secs = min(60, 2**attempt)
-      print 'waiting %s seconds and trying to fetch again...' % sleep_secs
+      print('waiting %s seconds and trying to fetch again...' % sleep_secs)
       time.sleep(sleep_secs)
 
   # Step 2: populate a checkout from local cache. All operations are local.
@@ -705,13 +764,15 @@ def _git_checkout(sln, sln_dir, revisions, refs, git_cache_dir, cleanup_dir):
       # If repo deletion was aborted midway, it may have left .git in broken
       # state.
       if path.exists(sln_dir) and is_broken_repo_dir(sln_dir):
-        print 'Git repo %s appears to be broken, removing it' % sln_dir
+        print('Git repo %s appears to be broken, removing it' % sln_dir)
         remove(sln_dir, cleanup_dir)
 
       # Use "tries=1", since we retry manually in this loop.
       if not path.isdir(sln_dir):
         git('clone', '--no-checkout', '--local', '--shared', mirror_dir,
             sln_dir)
+        # Detach HEAD to be consistent with the non-clone case
+        git('checkout', 'master', '--detach', cwd=sln_dir)
         _git_disable_gc(sln_dir)
       else:
         _git_disable_gc(sln_dir)
@@ -732,8 +793,8 @@ def _git_checkout(sln, sln_dir, revisions, refs, git_cache_dir, cleanup_dir):
       git('clean', '-dff', cwd=sln_dir)
       return
     except SubprocessFailed as e:
-      # Exited abnormally, theres probably something wrong.
-      print 'Something failed: %s.' % str(e)
+      # Exited abnormally, there's probably something wrong.
+      print('Something failed: %s.' % str(e))
       if first_try:
         first_try = False
         # Lets wipe the checkout and try again.
@@ -747,16 +808,6 @@ def _git_disable_gc(cwd):
   git('config', 'gc.autopacklimit', '0', cwd=cwd)
 
 
-def _download(url):
-  """Fetch url and return content, with retries for flake."""
-  for attempt in xrange(ATTEMPTS):
-    try:
-      return urllib2.urlopen(url).read()
-    except Exception:
-      if attempt == ATTEMPTS - 1:
-        raise
-
-
 def get_commit_position(git_path, revision='HEAD'):
   """Dumps the 'git' log for a specific revision and parses out the commit
   position.
@@ -781,9 +832,9 @@ def parse_got_revision(gclient_output, got_revision_mapping):
   solutions_output = {
       # Make sure path always ends with a single slash.
       '%s/' % path.rstrip('/') : solution_output for path, solution_output
-      in gclient_output['solutions'].iteritems()
+      in gclient_output['solutions'].items()
   }
-  for property_name, dir_name in got_revision_mapping.iteritems():
+  for property_name, dir_name in got_revision_mapping.items():
     # Make sure dir_name always ends with a single slash.
     dir_name = '%s/' % dir_name.rstrip('/')
     if dir_name not in solutions_output:
@@ -816,15 +867,16 @@ def emit_json(out_file, did_run, gclient_output=None, **kwargs):
 
 
 def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
-                    target_cpu, patch_root, patch_refs,
-                    gerrit_rebase_patch_ref, refs, git_cache_dir,
-                    cleanup_dir, gerrit_reset, disable_syntax_validation):
+                    target_cpu, patch_root, patch_refs, gerrit_rebase_patch_ref,
+                    no_fetch_tags, refs, git_cache_dir, cleanup_dir,
+                    gerrit_reset, disable_syntax_validation):
   # Get a checkout of each solution, without DEPS or hooks.
   # Calling git directly because there is no way to run Gclient without
   # invoking DEPS.
-  print 'Fetching Git checkout'
+  print('Fetching Git checkout')
 
-  git_checkouts(solutions, revisions, refs, git_cache_dir, cleanup_dir)
+  git_checkouts(solutions, revisions, refs, no_fetch_tags, git_cache_dir,
+                cleanup_dir)
 
   # Ensure our build/ directory is set up with the correct .gclient file.
   gclient_configure(solutions, target_os, target_os_only, target_cpu,
@@ -836,7 +888,7 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
   # We want to pass all non-solution revisions into the gclient sync call.
   solution_dirs = {sln['name'] for sln in solutions}
   gc_revisions = {
-      dirname: rev for dirname, rev in revisions.iteritems()
+      dirname: rev for dirname, rev in revisions.items()
       if dirname not in solution_dirs}
   # Gclient sometimes ignores "unmanaged": "False" in the gclient solution
   # if --revision <anything> is passed (for example, for subrepos).
@@ -844,20 +896,20 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
   for solution_name in list(solution_dirs):
     gc_revisions[solution_name] = 'unmanaged'
 
-  with git_config_if_not_set('user.name', 'chrome-bot'):
-    with git_config_if_not_set('user.email', 'chrome-bot@chromium.org'):
-      # Let gclient do the DEPS syncing.
-      # The branch-head refspec is a special case because its possible Chrome
-      # src, which contains the branch-head refspecs, is DEPSed in.
-      gclient_output = gclient_sync(
-          BRANCH_HEADS_REFSPEC in refs,
-          TAGS_REFSPEC in refs,
-          gc_revisions,
-          break_repo_locks,
-          disable_syntax_validation,
-          patch_refs,
-          gerrit_reset,
-          gerrit_rebase_patch_ref)
+  with git_config_if_not_set('user.name', 'chrome-bot'), \
+       git_config_if_not_set('user.email', 'chrome-bot@chromium.org'):
+    # Let gclient do the DEPS syncing.
+    # The branch-head refspec is a special case because it's possible Chrome
+    # src, which contains the branch-head refspecs, is DEPSed in.
+    gclient_output = gclient_sync(
+        BRANCH_HEADS_REFSPEC in refs,
+        TAGS_REFSPEC in refs,
+        gc_revisions,
+        break_repo_locks,
+        disable_syntax_validation,
+        patch_refs,
+        gerrit_reset,
+        gerrit_rebase_patch_ref)
 
   # Now that gclient_sync has finished, we should revert any .DEPS.git so that
   # presubmit doesn't complain about it being modified.
@@ -901,7 +953,7 @@ def parse_revisions(revisions, root):
         if not normalized_root.endswith('.git'):
           normalized_root += '.git'
       elif parsed_root.scheme:
-        print 'WARNING: Unrecognized scheme %s, ignoring' % parsed_root.scheme
+        print('WARNING: Unrecognized scheme %s, ignoring' % parsed_root.scheme)
         continue
       else:
         # This is probably a local path.
@@ -934,6 +986,12 @@ def parse_args():
                         'Can prepend root@<rev> to specify which repository, '
                         'where root is either a filesystem path or git https '
                         'url. To specify Tip of Tree, set rev to HEAD. ')
+  parse.add_option(
+      '--no_fetch_tags',
+      action='store_true',
+      help=('Don\'t fetch tags from the server for the git checkout. '
+            'This can speed up fetch considerably when '
+            'there are many tags.'))
   # TODO(machenbach): Remove the flag when all uses have been removed.
   parse.add_option('--output_manifest', action='store_true',
                    help=('Deprecated.'))
@@ -990,10 +1048,9 @@ def parse_args():
     with open(options.revision_mapping_file, 'r') as f:
       options.revision_mapping = json.load(f)
   except Exception as e:
-    print (
-        'WARNING: Caught execption while parsing revision_mapping*: %s'
-        % (str(e),)
-    )
+    print(
+        'WARNING: Caught exception while parsing revision_mapping*: %s'
+        % (str(e),))
 
   # Because we print CACHE_DIR out into a .gclient file, and then later run
   # eval() on it, backslashes need to be escaped, otherwise "E:\b\build" gets
@@ -1024,26 +1081,36 @@ def prepare(options, git_slns, active):
   first_sln = dir_names[0]
 
   # Split all the revision specifications into a nice dict.
-  print 'Revisions: %s' % options.revision
+  print('Revisions: %s' % options.revision)
   revisions = parse_revisions(options.revision, first_sln)
-  print 'Fetching Git checkout at %s@%s' % (first_sln, revisions[first_sln])
+  print('Fetching Git checkout at %s@%s' % (first_sln, revisions[first_sln]))
   return revisions, step_text
 
 
 def checkout(options, git_slns, specs, revisions, step_text):
-  print 'Using Python version: %s' % (sys.version,)
-  print 'Checking git version...'
+  print('Using Python version: %s' % (sys.version,))
+  print('Checking git version...')
   ver = git('version').strip()
-  print 'Using %s' % ver
+  print('Using %s' % ver)
 
   try:
     protocol = git('config', '--get', 'protocol.version')
-    print 'Using git protocol version %s' % protocol
+    print('Using git protocol version %s' % protocol)
   except SubprocessFailed as e:
-    print 'git protocol version is not specified.'
+    print('git protocol version is not specified.')
 
   first_sln = git_slns[0]['name']
   dir_names = [sln.get('name') for sln in git_slns if 'name' in sln]
+  dirty_path = '.dirty_bot_checkout'
+  if os.path.exists(dirty_path):
+    ensure_no_checkout(dir_names, options.cleanup_dir)
+
+  with open(dirty_path, 'w') as f:
+    # create file, no content
+    pass
+
+  should_delete_dirty_file = False
+
   try:
     # Outer try is for catching patch failures and exiting gracefully.
     # Inner try is for catching gclient failures and retrying gracefully.
@@ -1066,6 +1133,9 @@ def checkout(options, git_slns, specs, revisions, step_text):
           patch_refs=options.patch_refs,
           gerrit_rebase_patch_ref=not options.gerrit_no_rebase_patch_ref,
 
+          # Control how the fetch step will occur.
+          no_fetch_tags=options.no_fetch_tags,
+
           # Finally, extra configurations cleanup dir location.
           refs=options.refs,
           git_cache_dir=options.git_cache_dir,
@@ -1073,10 +1143,12 @@ def checkout(options, git_slns, specs, revisions, step_text):
           gerrit_reset=not options.gerrit_no_reset,
           disable_syntax_validation=options.disable_syntax_validation)
       gclient_output = ensure_checkout(**checkout_parameters)
+      should_delete_dirty_file = True
     except GclientSyncFailed:
-      print 'We failed gclient sync, lets delete the checkout and retry.'
+      print('We failed gclient sync, lets delete the checkout and retry.')
       ensure_no_checkout(dir_names, options.cleanup_dir)
       gclient_output = ensure_checkout(**checkout_parameters)
+      should_delete_dirty_file = True
   except PatchFailed as e:
     # Tell recipes information such as root, got_revision, etc.
     emit_json(options.output_json,
@@ -1088,7 +1160,15 @@ def checkout(options, git_slns, specs, revisions, step_text):
               failed_patch_body=e.output,
               step_text='%s PATCH FAILED' % step_text,
               fixed_revisions=revisions)
+    should_delete_dirty_file = True
     raise
+  finally:
+    if should_delete_dirty_file:
+      try:
+        os.remove(dirty_path)
+      except OSError:
+        print('Dirty file %s has been removed by a different process.' %
+              dirty_path)
 
   # Take care of got_revisions outputs.
   revision_mapping = GOT_REVISION_MAPPINGS.get(git_slns[0]['url'], {})
@@ -1124,14 +1204,14 @@ def checkout(options, git_slns, specs, revisions, step_text):
 
 
 def print_debug_info():
-  print "Debugging info:"
+  print("Debugging info:")
   debug_params = {
     'CURRENT_DIR': path.abspath(os.getcwd()),
     'THIS_DIR': THIS_DIR,
     'DEPOT_TOOLS_DIR': DEPOT_TOOLS_DIR,
   }
-  for k, v in sorted(debug_params.iteritems()):
-    print "%s: %r" % (k, v)
+  for k, v in sorted(debug_params.items()):
+    print("%s: %r" % (k, v))
 
 
 def main():
@@ -1141,7 +1221,7 @@ def main():
   # Check if this script should activate or not.
   active = True
 
-  # Print a helpful message to tell developers whats going on with this step.
+  # Print a helpful message to tell developers what's going on with this step.
   print_debug_info()
 
   # Parse, manipulate, and print the gclient solutions.
@@ -1152,21 +1232,14 @@ def main():
 
   solutions_printer(git_slns)
 
-  # Creating hardlinks during a build can interact with git reset in
-  # unfortunate ways if git's index isn't refreshed beforehand. (See
-  # crbug.com/330461#c13 for an explanation.)
-  try:
-    call_gclient('recurse', '-v', 'git', 'update-index', '--refresh')
-  except SubprocessFailed:
-    # Failure here (and nowhere else) may have adverse effects on the
-    # compile time of the build but shouldn't affect its ability to
-    # successfully complete.
-    print 'WARNING: Failed to update git indices.'
-
   try:
     # Dun dun dun, the main part of bot_update.
-    revisions, step_text = prepare(options, git_slns, active)
-    checkout(options, git_slns, specs, revisions, step_text)
+    # gn creates hardlinks during the build. By default, this makes
+    # `git reset` overwrite the sources of the hardlinks, which causes
+    # unnecessary rebuilds. (See crbug.com/330461#c13 for an explanation.)
+    with git_config_if_not_set('core.trustctime', 'false'):
+      revisions, step_text = prepare(options, git_slns, active)
+      checkout(options, git_slns, specs, revisions, step_text)
 
   except PatchFailed as e:
     # Return a specific non-zero exit code for patch failure (because it is