Have git cache bootstrap repo if repo is corrupt

git_cache.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.
 
 """A git command for managing a local cache of git repositories."""
 
 from __future__ import print_function
 import errno
 import logging
@@ skipping 292 matching lines @@
       self.print(
           'Extracting bootstrap zipfile %s failed.\n'
           'Resuming normal operations.' % filename)
       return False
     return True
 
   def exists(self):
     return os.path.isfile(os.path.join(self.mirror_path, 'config'))
 
   def populate(self, depth=None, shallow=False, bootstrap=False,
-               verbose=False, ignore_lock=False):
+               verbose=False, ignore_lock=False, recurse=False):
     assert self.GetCachePath()
     if shallow and not depth:
       depth = 10000
     gclient_utils.safe_makedirs(self.GetCachePath())
 
     v = []
     if verbose:
       v = ['-v', '--progress']
 
     d = []
@@ skipping 43 matching lines @@
       rundir = tempdir or self.mirror_path
       self.config(rundir)
       fetch_cmd = ['fetch'] + v + d + ['origin']
       fetch_specs = subprocess.check_output(
           [self.git_exe, 'config', '--get-all', 'remote.origin.fetch'],
           cwd=rundir).strip().splitlines()
       for spec in fetch_specs:
         try:
           self.RunGit(fetch_cmd + [spec], cwd=rundir, retry=True)
         except subprocess.CalledProcessError:
+          if spec == '+refs/heads/*:refs/heads/*':
+            if not recurse:
+              # We definitely want to fail if the main refspec fails to fetch.
+              raise
+            # The cache is corrupt, bootstrap it.

[agable, 2014/06/24 00:49:37]

What does recursion have to do with it? And nothing sets recurse=True, so we'll
always hit the codepath above and never re-bootstrap.

[Ryan Tseng, 2014/06/24 01:02:10]

Oops, that was supposed to default to recurse=True, fixed.

+            os.remove(config_file)
+            self.populate(depth, shallow, True, verbose, ignore_lock, False)
           logging.warn('Fetch of %s failed' % spec)
       if tempdir:
         os.rename(tempdir, self.mirror_path)
     finally:
       if not ignore_lock:
         lockfile.unlock()
 
   def update_bootstrap(self, prune=False):
     # The files are named <git number>.zip
     gen_number = subprocess.check_output(
@@ skipping 208 matching lines @@
     return options, args
 
 
 def main(argv):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParser(), argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))