Get rid of UpdateSubmoduleConfig.

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 256 matching lines @@
 
     The patch file is generated from a diff of the merge base of HEAD and
     its upstream branch.
     """
     merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
     gclient_utils.CheckCallAndFilter(
         ['git', 'diff', merge_base],
         cwd=self.checkout_path,
         filter_fn=GitDiffFilterer(self.relpath).Filter, print_func=self.Print)
 
-  def UpdateSubmoduleConfig(self):
-    submod_cmd = ['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']

[jochen (gone - plz use gerrit), 2014/10/20 10:48:25]

autosetupmerge wasn't really related to submodules, was it?

is it now setup somewhere else?

-    cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
-    kwargs = {'cwd': self.checkout_path,
-              'print_stdout': False,
-              'filter_fn': lambda x: None}
-    try:
-      gclient_utils.CheckCallAndFilter(cmd, **kwargs)
-      gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
-    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)
-    except subprocess2.CalledProcessError:
-      gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
-
-    gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
-
   def _FetchAndReset(self, revision, file_list, options):
     """Equivalent to git fetch; git reset."""
     quiet = []
     if not options.verbose:
       quiet = ['--quiet']
     self._UpdateBranchHeads(options, fetch=False)
 
     cfg = gclient_utils.DefaultIndexPackConfig(self.url)
     fetch_cmd = cfg + ['fetch', self.remote, '--prune']
     self._Run(fetch_cmd + quiet, options, retry=True)
     self._Run(['reset', '--hard', revision] + quiet, options)
-    self.UpdateSubmoduleConfig()
     if file_list is not None:
       files = self._Capture(['ls-files']).splitlines()
       file_list.extend([os.path.join(self.checkout_path, f) for f in files])
 
   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:
@@ skipping 50 matching lines @@
       rev_type = "hash"
 
     if (not os.path.exists(self.checkout_path) or
         (os.path.isdir(self.checkout_path) and
          not os.path.exists(os.path.join(self.checkout_path, '.git')))):
       if (os.path.isdir(self.checkout_path) and
           not os.path.exists(os.path.join(self.checkout_path, '.git'))):
         self._DeleteOrMove(options.force)
       self._Clone(revision, url, options)
       self._UpdateBranchHeads(options, fetch=True)
-      self.UpdateSubmoduleConfig()
       if file_list is not None:
         files = self._Capture(['ls-files']).splitlines()
         file_list.extend([os.path.join(self.checkout_path, f) for f in files])
       if not verbose:
         # Make the output a little prettier. It's nice to have some whitespace
         # between projects when cloning.
         self.Print('')
       return self._Capture(['rev-parse', '--verify', 'HEAD'])
 
     if not managed:
       self._UpdateBranchHeads(options, fetch=False)
-      self.UpdateSubmoduleConfig()
       self.Print('________ unmanaged solution; skipping %s' % self.relpath)
       return self._Capture(['rev-parse', '--verify', 'HEAD'])
 
     # See if the url has changed (the unittests use git://foo for the url, let
     # that through).
     current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
     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.
@@ skipping 175 matching lines @@
         if not re.match('Already up-to-date.', merge_output) or verbose:
           if not printed_path:
             self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
             printed_path = True
           self.Print(merge_output.strip())
           if not verbose:
             # Make the output a little prettier. It's nice to have some
             # whitespace between projects when syncing.
             self.Print('')
 
-    self.UpdateSubmoduleConfig()
     if file_list is not None:
       file_list.extend([os.path.join(self.checkout_path, f) for f in files])
 
     # If the rebase generated a conflict, abort and ask user to fix
     if self._IsRebasing():
       raise gclient_utils.Error('\n____ %s%s\n'
                                 '\nConflict while rebasing this branch.\n'
                                 'Fix the conflict and run gclient again.\n'
                                 'See man git-rebase for details.\n'
                                 % (self.relpath, rev_str))
@@ skipping 878 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