When switching to/from a cache git dir, try to reuse as much data as possible.

gclient_scm.py

 # 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.
 
 """Gclient-specific SCM-specific operations."""
 
 import collections
 import logging
 import os
 import posixpath
@@ skipping 364 matching lines @@
       raise gclient_utils.Error('\n____ %s%s\n'
                                 '\tPath is not a git repo. No .git dir.\n'
                                 '\tTo resolve:\n'
                                 '\t\trm -rf %s\n'
                                 '\tAnd run gclient sync again\n'
                                 % (self.relpath, rev_str, self.relpath))
 
     # See if the url has changed (the unittests use git://foo for the url, let
     # that through).
     current_url = self._Capture(['config', 'remote.origin.url'])
+    return_early = False
     # TODO(maruel): Delete url != 'git://foo' since it's just to make the
     # unit test pass. (and update the comment above)
     # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
     # This allows devs to use experimental repos which have a different url
     # but whose branch(s) are the same as official repos.
     if (current_url != url and
         url != 'git://foo' and
         subprocess2.capture(
             ['git', 'config', 'remote.origin.gclient-auto-fix-url'],
             cwd=self.checkout_path).strip() != 'False'):
       print('_____ switching %s to a new upstream' % self.relpath)
       # Make sure it's clean
       self._CheckClean(rev_str)
       # Switch over to the new upstream
       self._Run(['remote', 'set-url', 'origin', url], options)
       self._FetchAndReset(revision, file_list, options)
+      return_early = True
+
+    # Need to do this in the normal path as well as in the post-remote-switch
+    # path.
+    self._PossiblySwitchCache(url, options)
+
+    if return_early:
       return
 
     if not self._IsValidGitRepo():
       # .git directory is hosed for some reason, set it back up.
       print('_____ %s/.git is corrupted, rebuilding' % self.relpath)
       self._Run(['init'], options)
       self._Run(['remote', 'set-url', 'origin', url], options)
 
     if not self._HasHead():
       # Previous checkout was aborted before branches could be created in repo,
@@ skipping 317 matching lines @@
   @staticmethod
   def _NormalizeGitURL(url):
     '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
     idx = url.find('://')
     if idx != -1:
       url = url[idx+3:]
     if not url.endswith('.git'):
       url += '.git'
     return url
 
+  def _PossiblySwitchCache(self, url, options):
+    """Handles switching a repo from with-cache to direct, or vice versa.
+
+    When we go from direct to with-cache, the remote url changes from the
+    'real' url to the local file url (in cache_dir). Therefore, this function
+    assumes that |url| points to the correctly-switched-over local file url, if
+    we're in cache_mode.
+
+    When we go from with-cache to direct, assume that the normal url-switching
+    code already flipped the remote over, and we just need to repack and break
+    the dependency to the cache.
+    """
+
+    altfile = os.path.join(
+        self.checkout_path, '.git', 'objects', 'info', 'alternates')
+    if self.cache_dir:
+      if not os.path.exists(altfile):
+        try:
+          with open(altfile, 'wa') as f:
+            f.write(os.path.join(url, 'objects'))
+          # pylint: disable=C0301
+          # This dance is necessary according to emperical evidence, also at:
+          # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html
+          self._Run(['repack', '-ad'], options)
+          self._Run(['repack', '-adl'], options)
+        except Exception:
+          # If something goes wrong, try to remove the altfile so we'll go down
+          # this path again next time.
+          try:
+            os.remove(altfile)
+          except Exception:
+            pass
+          raise
+    else:
+      if os.path.exists(altfile):
+        self._Run(['repack', '-a'], options)
+        os.remove(altfile)
+
   def _CreateOrUpdateCache(self, url, options):
     """Make a new git mirror or update existing mirror for |url|, and return the
     mirror URI to clone from.
 
     If no cache-dir is specified, just return |url| unchanged.
     """
     if not self.cache_dir:
       return url
 
     # Replace - with -- to avoid ambiguity. / with - to flatten folder structure
     folder = os.path.join(
       self.cache_dir,
       self._NormalizeGitURL(url).replace('-', '--').replace('/', '-'))
+    altfile = os.path.join(folder, 'objects', 'info', 'alternates')
+
+    # If we're bringing an old cache up to date or cloning a new cache, and the
+    # existing repo is currently a direct clone, use its objects to help out
+    # the fetch here.
+    checkout_objects = os.path.join(self.checkout_path, '.git', 'objects')
+    checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates')
+    use_reference = (
+        os.path.exists(checkout_objects) and
+        not os.path.exists(checkout_altfile))
 
     v = ['-v'] if options.verbose else []
     filter_fn = lambda l: '[up to date]' not in l
     with self.cache_locks[folder]:
       gclient_utils.safe_makedirs(self.cache_dir)
       if not os.path.exists(os.path.join(folder, 'config')):
         gclient_utils.rmtree(folder)
-        self._Run(['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
-                                   '--progress', '--mirror', url, folder],
+        cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
+                               '--progress', '--mirror']
+
+        if use_reference:
+          cmd += ['--reference', os.path.abspath(self.checkout_path)]
+
+        self._Run(cmd + [url, folder],
                   options, git_filter=True, filter_fn=filter_fn,
                   cwd=self.cache_dir)
       else:
         # For now, assert that host/path/to/repo.git is identical. We may want
         # to relax this restriction in the future to allow for smarter cache
         # repo update schemes (such as pulling the same repo, but from a
         # different host).
         existing_url = self._Capture(['config', 'remote.origin.url'],
                                      cwd=folder)
         assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url)
 
+        if use_reference:
+          with open(altfile) as f:

[szager1, 2013/07/17 21:43:06]

open(altfile, 'w')

+            f.write(os.path.abspath(checkout_objects))
+
         # Would normally use `git remote update`, but it doesn't support
         # --progress, so use fetch instead.
         self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
                   options, git_filter=True, filter_fn=filter_fn, cwd=folder)
+
+      # If the clone has an object dependency on the existing repo, break it
+      # with repack and remove the linkage.
+      if os.path.exists(altfile):
+        self._Run(['repack', '-a'], options, cwd=folder)
+        os.remove(altfile)
     return folder
 
   def _Clone(self, revision, url, options):
     """Clone a git repository from the given URL.
 
     Once we've cloned the repo, we checkout a working branch if the specified
     revision is a branch head. If it is a tag or a specific commit, then we
     leave HEAD detached as it makes future updates simpler -- in this case the
     user should first create a new branch or switch to an existing branch before
     making changes in the repo."""
@@ skipping 650 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command