Make bot_update on win more resilient

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 252 matching lines @@
   def GetCheckoutRoot(self):
     return scm.GIT.GetCheckoutRoot(self.checkout_path)
 
   def GetRevisionDate(self, _revision):
     """Returns the given revision's date in ISO-8601 format (which contains the
     time zone)."""
     # TODO(floitsch): get the time-stamp of the given revision and not just the
     # time-stamp of the currently checked out revision.
     return self._Capture(['log', '-n', '1', '--format=%ai'])
 
-  @staticmethod
-  def cleanup(options, args, file_list):
-    """'Cleanup' the repo.
+  def cleanup(self, options, args, file_list):
+    """'Cleanup' the repo."""
+    self._maybe_break_locks(options)

[agable, 2016/10/28 16:55:34]

I think you can set the flag directly on the options object, rather than
actually having to include it as a flag in gclient.py.

[katthomas, 2016/10/28 23:40:29]

Done.

 
-    There's no real git equivalent for the svn cleanup command, do a no-op.
-    """
 
   def diff(self, options, _args, _file_list):
     try:
       merge_base = [self._Capture(['merge-base', 'HEAD', self.remote])]
     except subprocess2.CalledProcessError:
       merge_base = []
     self._Run(['diff'] + merge_base, options)
 
   def pack(self, _options, _args, _file_list):
     """Generates a patch file which can be applied to the root of the
@@ skipping 886 matching lines @@
     kwargs.setdefault('cwd', self.checkout_path)
     kwargs.setdefault('stdout', self.out_fh)
     kwargs['filter_fn'] = self.filter
     kwargs.setdefault('print_stdout', False)
     env = scm.GIT.ApplyEnvVars(kwargs)
     cmd = ['git'] + args
     if show_header:
       gclient_utils.CheckCallAndFilterAndHeader(cmd, env=env, **kwargs)
     else:
       gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)