Add internal buckets for bootstrapping internal repos

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 125 matching lines @@
     except WinErr:
       pass
 
 
 class Mirror(object):
 
   git_exe = 'git.bat' if sys.platform.startswith('win') else 'git'
   gsutil_exe = os.path.join(
     os.path.dirname(os.path.abspath(__file__)),
     'third_party', 'gsutil', 'gsutil')
-  bootstrap_bucket = 'chromium-git-cache'
 
   def __init__(self, url, refs=None, print_func=None):
     self.url = url
     self.refs = refs or []
     self.basedir = self.UrlToCacheDir(url)
     self.mirror_path = os.path.join(self.GetCachePath(), self.basedir)
     self.print = print_func or print
 
+  def bootstrap_bucket(self):

[agable, 2014/06/05 00:45:27]

make it an @property?

+    if 'chrome-internal' in self.url:
+      return 'chrome-git-cache'
+    else:
+      return 'chromium-git-cache'
+
   @classmethod
   def FromPath(cls, path):
     return cls(cls.CacheDirToUrl(path))
 
   @staticmethod
   def UrlToCacheDir(url):
     """Convert a git url to a normalized form for the cache dir path."""
     parsed = urlparse.urlparse(url)
     norm_url = parsed.netloc + parsed.path
     if norm_url.endswith('.git'):
@@ skipping 73 matching lines @@
 
     python_fallback = False
     if sys.platform.startswith('win') and not self.FindExecutable('7z'):
       python_fallback = True
     elif sys.platform.startswith('darwin'):
       # The OSX version of unzip doesn't support zip64.
       python_fallback = True
     elif not self.FindExecutable('unzip'):
       python_fallback = True
 
-    gs_folder = 'gs://%s/%s' % (self.bootstrap_bucket, self.basedir)
+    gs_folder = 'gs://%s/%s' % (self.bootstrap_bucket(), self.basedir)

[agable, 2014/06/05 00:45:27]

Then this could go away

     gsutil = Gsutil(
         self.gsutil_exe, boto_path=os.devnull, bypass_prodaccess=True)
     # Get the most recent version of the zipfile.
     _, ls_out, _ = gsutil.check_call('ls', gs_folder)
     ls_out_sorted = sorted(ls_out.splitlines())
     if not ls_out_sorted:
       # This repo is not on Google Storage.
       return False
     latest_checkout = ls_out_sorted[-1]
 
@@ skipping 87 matching lines @@
     # 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)
+        self.bootstrap_bucket(), self.basedir, gen_number)
     gsutil.call('cp', tmp_zipfile, dest_name)
     os.remove(tmp_zipfile)
 
 
   @staticmethod
   def BreakLocks(path):
     did_unlock = False
     lf = Lockfile(path)
     if lf.break_lock():
       did_unlock = True
@@ skipping 156 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:]))