Abort gclient sync when a svn command fails.

scm.py

 # Copyright (c) 2006-2009 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.
 
 """SCM-specific utility classes."""
 
 import os
 import re
 import shutil
 import subprocess
@@ skipping 315 matching lines @@
     pattern = {
           'checkout': update_pattern,
           'status':   status_pattern,
           'update':   update_pattern,
         }[args[0]]
     compiled_pattern = re.compile(pattern)
     # Place an upper limit.
     for i in range(1, 10):
       previous_list_len = len(file_list)
       failure = []
+
       def CaptureMatchingLines(line):
         match = compiled_pattern.search(line)
         if match:
           file_list.append(match.group(1))
         if line.startswith('svn: '):
           # We can't raise an exception. We can't alias a variable. Use a cheap
           # way.
           failure.append(True)
+
       try:
         SVN.RunAndFilterOutput(args,
                                in_directory,
                                options.verbose,
                                True,
                                CaptureMatchingLines)
       except gclient_utils.Error:
         # We enforce that some progress has been made.
         if len(failure) and len(file_list) > previous_list_len:
           if args[0] == 'checkout':
             args = args[:]
             # An aborted checkout is now an update.
             args[0] = 'update'
           continue
+        # No progress was made, bail out.
+        raise
       break
 
   @staticmethod
   def RunAndFilterOutput(args,
                          in_directory,
                          print_messages,
                          print_stdout,
                          filter):
     """Runs a command, optionally outputting to stdout.
 
@@ skipping 329 matching lines @@
     if not cur_dir_repo_root:
       return None
 
     while True:
       parent = os.path.dirname(directory)
       if (SVN.CaptureInfo(parent, print_error=False).get(
               "Repository Root") != cur_dir_repo_root):
         break
       directory = parent
     return directory