branch heads fix

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."""
 
 from __future__ import print_function
 
 import logging
 import os
@@ skipping 714 matching lines @@
     return base_url[:base_url.rfind('/')] + url
 
   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
-    mirror_kwargs = { 'print_func': self.filter }
+    mirror_kwargs = {
+        'print_func': self.filter,
+        'refs': []
+    }
     if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
-      mirror_kwargs['refs'] = ['refs/tags/lkgr', 'refs/tags/lkcr']
+      mirror_kwargs['refs'].extend(['refs/tags/lkgr', 'refs/tags/lkcr'])
+    if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
+      mirror_kwargs['refs'].append('refs/branch-heads/*')
     mirror = git_cache.Mirror(url, **mirror_kwargs)
     mirror.populate(verbose=options.verbose, bootstrap=True)
     mirror.unlock()
     return mirror.mirror_path if mirror.exists() else None
 
   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
@@ skipping 708 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