Revert "Add (another) argument to break git locks in gclient."

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 errno
 import logging
@@ skipping 309 matching lines @@
     hook_dir = os.path.join(self.checkout_path, '.git', 'hooks')
     if not os.path.isdir(hook_dir):
       return
     for f in os.listdir(hook_dir):
       if not f.endswith('.sample') and not f.endswith('.disabled'):
         disabled_hook_path = os.path.join(hook_dir, f + '.disabled')
         if os.path.exists(disabled_hook_path):
           os.remove(disabled_hook_path)
         os.rename(os.path.join(hook_dir, f), disabled_hook_path)
 
-  def _maybe_break_locks(self, options):
-    """This removes all .lock files from this repo's .git directory, if the
-    user passed the --break_repo_locks command line flag.
-
-    In particular, this will cleanup index.lock files, as well as ref lock
-    files.
-    """
-    if options.break_repo_locks:
-      git_dir = os.path.join(self.checkout_path, '.git')
-      for path, _, filenames in os.walk(git_dir):
-        for filename in filenames:
-          if filename.endswith('.lock'):
-            to_break = os.path.join(path, filename)
-            self.Print('breaking lock: %s' % (to_break,))
-            try:
-              os.remove(to_break)
-            except OSError as ex:
-              self.Print('FAILED to break lock: %s: %s' % (to_break, ex))
-              raise
-
-
   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:
       raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
@@ skipping 86 matching lines @@
         # 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.Print('________ unmanaged solution; skipping %s' % self.relpath)
       return self._Capture(['rev-parse', '--verify', 'HEAD'])
 
-    self._maybe_break_locks(options)
-
     if mirror:
       self._UpdateMirror(mirror, options)
 
     # 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 1244 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