Make gclient fetch git repos recursively. This is needed when adding a git repo through DEPS. If th…

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 logging
 import os
 import posixpath
 import re
@@ skipping 183 matching lines @@
         cwd=self.checkout_path,
         filter_fn=GitDiffFilterer(self.relpath).Filter)
 
   def UpdateSubmoduleConfig(self):
     submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
                   'submodule.$name.ignore', '||',
                   'git', 'config', '-f', '$toplevel/.git/config',
                   'submodule.$name.ignore', 'all']
     cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
     cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
-    cmd3 = ['git', 'config', 'branch.autosetupmerge']
+    cmd3 = ['git', 'config', 'diff.recurseSubmodules', 'true']
+    cmd4 = ['git', 'config', 'branch.autosetupmerge']
     kwargs = {'cwd': self.checkout_path,
               'print_stdout': False,
               'filter_fn': lambda x: None}
     try:
       gclient_utils.CheckCallAndFilter(cmd, **kwargs)
       gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
+      gclient_utils.CheckCallAndFilter(cmd3, **kwargs)

[szager1, 2013/03/18 22:04:46]

I think this should be outside the try/except clause.  If it fails, the error
should be surfaced.  Unlike the other commands, if it fails, you could wind up
with a bad state in your checkout.

[jam, 2013/03/18 22:10:24]

Done.

     except subprocess2.CalledProcessError:
       # Not a fatal error, or even very interesting in a non-git-submodule
       # world.  So just keep it quiet.
       pass
     try:
-      gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
+      gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
     except subprocess2.CalledProcessError:
-      gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
+      gclient_utils.CheckCallAndFilter(cmd4 + ['always'], **kwargs)
 
   def update(self, options, args, file_list):
     """Runs git to update or transparently checkout the working copy.
 
     All updated files will be appended to file_list.
 
     Raises:
       Error: if can't get URL for relative path.
     """
     if args:
@@ skipping 420 matching lines @@
 
     clone_cmd = ['clone', '--progress']
     if revision.startswith('refs/heads/'):
       clone_cmd.extend(['-b', revision.replace('refs/heads/', '')])
       detach_head = False
     else:
       detach_head = True
     if options.verbose:
       clone_cmd.append('--verbose')
     clone_cmd.extend([url, self.checkout_path])
+    clone_cmd.append('--recursive')
 
     # If the parent directory does not exist, Git clone on Windows will not
     # create it, so we need to do it manually.
     parent_dir = os.path.dirname(self.checkout_path)
     if not os.path.exists(parent_dir):
       gclient_utils.safe_makedirs(parent_dir)
 
     percent_re = re.compile('.* ([0-9]{1,2})% .*')
     def _GitFilter(line):
       # git uses an escape sequence to clear the line; elide it.
@@ skipping 581 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