Allow pruning other files when uploading bootstrap tarball

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 328 matching lines @@
           [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:
           logging.warn('Fetch of %s failed' % spec)
       if tempdir:
         os.rename(tempdir, self.mirror_path)
 
-  def update_bootstrap(self):
+  def update_bootstrap(self, prune=False):
     # The files are named <git number>.zip
     gen_number = subprocess.check_output(
         [self.git_exe, 'number', 'master'], cwd=self.mirror_path).strip()
     self.RunGit(['gc'])  # Run Garbage Collect to compress packfile.
     # Creating a temp file and then deleting it ensures we can use this name.
     _, tmp_zipfile = tempfile.mkstemp(suffix='.zip')
     os.remove(tmp_zipfile)
     subprocess.call(['zip', '-r', tmp_zipfile, '.'], cwd=self.mirror_path)
     gsutil = Gsutil(path=self.gsutil_exe, boto_path=None)
-    dest_name = 'gs://%s/%s/%s.zip' % (
-        self.bootstrap_bucket, self.basedir, gen_number)
+    gs_folder = 'gs://%s/%s' % (self.bootstrap_bucket, self.basedir)
+    dest_name = '%s/%s.zip' % (gs_folder, gen_number)
     gsutil.call('cp', tmp_zipfile, dest_name)
     os.remove(tmp_zipfile)
 
+    # Remove all other files in the same directory.
+    if prune:
+      _, ls_out, _ = gsutil.check_call('ls', gs_folder)
+      for filename in ls_out.splitlines():
+        if filename == dest_name:
+          continue
+        gsutil.call('rm', filename)
+
   @staticmethod
   def DeleteTmpPackFiles(path):
     pack_dir = os.path.join(path, 'objects', 'pack')
     pack_files = [f for f in os.listdir(pack_dir) if
                   f.startswith('.tmp-') or f.startswith('tmp_pack_')]
     for f in pack_files:
       f = os.path.join(pack_dir, f)
       try:
         os.remove(f)
         logging.warn('Deleted stale temporary pack file %s' % f)
@@ skipping 50 matching lines @@
 
 
 @subcommand.usage('[url of repo to create a bootstrap zip file]')
 def CMDupdate_bootstrap(parser, args):
   """Create and uploads a bootstrap tarball."""
   # Lets just assert we can't do this on Windows.
   if sys.platform.startswith('win'):
     print('Sorry, update bootstrap will not work on Windows.', file=sys.stderr)
     return 1
 
+  parser.add_option('--prune', action='store_true',
+                    help='Prune all other cached zipballs of the same repo.')
+
   # First, we need to ensure the cache is populated.
   populate_args = args[:]
   populate_args.append('--no_bootstrap')
   CMDpopulate(parser, populate_args)
 
   # Get the repo directory.
-  _, args = parser.parse_args(args)
+  options, args = parser.parse_args(args)
   url = args[0]
   mirror = Mirror(url)
-  mirror.update_bootstrap()
+  mirror.update_bootstrap(options.prune)
   return 0
 
 
 @subcommand.usage('[url of repo to add to or update in cache]')
 def CMDpopulate(parser, args):
   """Ensure that the cache has all up-to-date objects for the given repo."""
   parser.add_option('--depth', type='int',
                     help='Only cache DEPTH commits of history')
   parser.add_option('--shallow', '-s', action='store_true',
                     help='Only cache 10000 commits of history')
@@ skipping 85 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:]))