Add retry on svn cat.

gcl.py

 #!/usr/bin/python
 # 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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 115 matching lines @@
     except gclient_utils.Error:
       return None
     if (not os.path.exists(cached_file) or
         (time.time() - os.stat(cached_file).st_mtime) > max_age):
       dir_info = SVN.CaptureInfo(".")
       repo_root = dir_info["Repository Root"]
       if use_root:
         url_path = repo_root
       else:
         url_path = dir_info["URL"]
-      content = ""
       while True:
         # Look in the repository at the current level for the file.
-        svn_path = url_path + "/" + filename
-        content, rc = RunShellWithReturnCode(["svn", "cat", svn_path])
-        if not rc:
-          # Exit the loop if the file was found. Override content.
+        for _ in range(5):
+          content = ""
+          try:
+            # Take advantage of the fact that svn won't output to stderr in case
+            # of success but will do in case of failure so don't mind putting
+            # stderr into content_array.
+            content_array = []
+            svn_path = url_path + "/" + filename
+            SVN.RunAndFilterOutput(['cat', svn_path, '--non-interactive'], '.',
+                                   False, False, content_array.append)
+            # Exit the loop if the file was found. Override content.
+            content = '\n'.join(content_array)
+            break
+          except gclient_utils.Error, e:
+            if content_array[0].startswith(
+                'svn: Can\'t get username or password'):
+              ErrorExit('Your svn credentials expired. Please run svn log to '

[nsylvain, 2010/08/19 15:47:07]

what about svn ls ? Svn log is evil

+                        'fix the cached credentials')
+            if not content_array[0].startswith('svn: File not found:'):
+              # Try again.
+              continue
+        if content:
           break
-        # Make sure to mark settings as empty if not found.
-        content = ""
         if url_path == repo_root:
           # Reached the root. Abandoning search.
           break
         # Go up one level to try again.
         url_path = os.path.dirname(url_path)
       # Write a cached version even if there isn't a file, so we don't try to
       # fetch it each time.
       gclient_utils.FileWrite(cached_file, content)
     else:
       content = gclient_utils.FileRead(cached_file, 'r')
@@ skipping 29 matching lines @@
 def ErrorExit(msg):
   print >> sys.stderr, msg
   sys.exit(1)
 
 
 def RunShellWithReturnCode(command, print_output=False):
   """Executes a command and returns the output and the return code."""
   # Use a shell for subcommands on Windows to get a PATH search, and because svn
   # may be a batch file.
   use_shell = sys.platform.startswith("win")
+  env = os.environ.copy()
+  env['LANGUAGE'] = 'en'
   p = subprocess.Popen(command, stdout=subprocess.PIPE,
-                       stderr=subprocess.STDOUT, shell=use_shell,
+                       stderr=subprocess.STDOUT, shell=use_shell, env=env,
                        universal_newlines=True)
   if print_output:
     output_array = []
     while True:
       line = p.stdout.readline()
       if not line:
         break
       if print_output:
         print line.strip('\n')
       output_array.append(line)
@@ skipping 1092 matching lines @@
     if command:
       return command(argv[1:])
     # Unknown command, try to pass that to svn
     return CMDpassthru(argv)
   except gclient_utils.Error, e:
     print('Got an exception')
     print(str(e))
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))