GTTF: Make gclient recover gracefully from an interrupted checkout

gclient_scm.py

 # Copyright (c) 2011 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 748 matching lines @@
       from_info = scm.SVN.CaptureInfo(os.path.join(self.checkout_path, '.'))
     except (gclient_utils.Error, subprocess2.CalledProcessError):
       raise gclient_utils.Error(
           ('Can\'t update/checkout %s if an unversioned directory is present. '
            'Delete the directory and try again.') % self.checkout_path)
 
     # Look for locked directories.
     dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
     for d in dir_info:
       if d[0][2] == 'L':
-        self._Run(['cleanup', d[1]], options)
+        try:
+          self._Run(['cleanup', d[1]], options)
+        except subprocess2.CalledProcessError, e:
+          # Only remove the directory automatically if it's not versioned
+          # and --force is used.
+          if d[0][0] in ('?', '!') and options.force:

[M-A Ruel, 2011/09/19 20:36:25]

I don't see why you'd get the status '? L   '.

I don't think it'd work in practice.
And the more I think about it, the less you should try to cleanup each
individual file. It should try to cleanup the root directory in any case.

[Paweł Hajdan Jr., 2011/09/19 20:40:06]

I was getting '! L   '.
This has solved the problem on my machine. Which means I can no longer repro. Or
maybe I can try to break things again.

[M-A Ruel, 2011/09/19 20:43:59]

In that case, it's because the root directory is not versionned or a checkout
from a different repository than the one expected. In any case, it should
probably
"svn cleanup self.checkout_path" and then if it fails at updating, delete all
the files that are in the way that are '!' or '?'.

svn cleanup self.checkout_path is recursive so I'm not sure it'd a good idea to
run it on individual items. When svn cleanup fails, then rm the files '!' or '? 
L'.

+            print 'Removing troublesome path %s' % d[1]
+            gclient_utils.rmtree(d[1])
+          else:
+            print 'Not removing troublesome path %s automatically.' % d[1]
+            print 'If the directory is not versioned you can use --force.'
+            raise e
 
     # Retrieve the current HEAD version because svn is slow at null updates.
     if options.manually_grab_svn_rev and not revision:
       from_info_live = scm.SVN.CaptureInfo(from_info['URL'])
       revision = str(from_info_live['Revision'])
       rev_str = ' at %s' % revision
 
     if from_info['URL'] != base_url:
       # The repository url changed, need to switch.
       try:
@@ skipping 159 matching lines @@
 
     This method returns a new list to be used as a command."""
     new_command = command[:]
     if revision:
       new_command.extend(['--revision', str(revision).strip()])
     # --force was added to 'svn update' in svn 1.5.
     if ((options.force or options.manually_grab_svn_rev) and
         scm.SVN.AssertVersion("1.5")[0]):
       new_command.append('--force')
     return new_command